Eric Evans
5a5f9aa3d2
use less specific descriptors for Thrift{Address,Port}
...
Patch by eevans; reviewed by gdusbabek for CASSANDRA-811
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911989 13f79535-47bb-0310-9956-ffa450edef68
2010-02-19 21:30:32 +00:00
Gary Dusbabek
b511d0f1b0
Using realy keyspaces in tests so that their replication strategies can be queried. Patch by Gary Dusbabek, reviewed by Stu Hood.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911178 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 21:16:52 +00:00
Eric Evans
c19f8f2048
use ivy for google-collect; remove local copy
...
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911066 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:43:47 +00:00
Eric Evans
5edd6dd836
quiet stderr log output introduced by hadoop-core
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910703 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 21:31:22 +00:00
Jonathan Ellis
5e4c5ce61b
merge from 0.5
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910386 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 03:41:03 +00:00
Jonathan Ellis
9cc51b5f2c
fix range queries and Range/Bounds intersections. patch by jbellis; tested by Jack Culpepper for CASSANDRA-781
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910380 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 02:47:57 +00:00
Jonathan Ellis
128821e5b9
fix SSTableExportTest to work on Windows. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910325 13f79535-47bb-0310-9956-ffa450edef68
2010-02-15 20:06:39 +00:00
Jonathan Ellis
2c6948cb0a
expose token-based range queries to thrift
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-775
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@909617 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 21:42:03 +00:00
Jonathan Ellis
03da50d62c
mv RecoverManager.doRecovery() -> CommitLog.recover()
...
patch by jbellis; reviewed by junrao for CASSANDRA-783
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908831 13f79535-47bb-0310-9956-ffa450edef68
2010-02-11 03:50:40 +00:00
Jonathan Ellis
fdba4279a0
encapsulate commitlog file operations in CommitLogSegment
...
patch by jbellis; reviewed by junrao for CASSANDRA-783
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908830 13f79535-47bb-0310-9956-ffa450edef68
2010-02-11 03:49:49 +00:00
Jonathan Ellis
fbb188f91a
mv commitlog classes into db.commitlog package. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908131 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 17:52:44 +00:00
Gary Dusbabek
c8889a7087
Embedded cassandra service to facilitate testing apps that depend on cassandra. Patch by Ran Tavory, reviewed by Gary Dusbabek. CASSANDRA-740.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908038 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 14:05:00 +00:00
Jonathan Ellis
027c86a873
s/Constants/constants/ in test_server
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907797 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 21:09:31 +00:00
Jonathan Ellis
c325fcab72
expose describe_ methods replacing the get_*_property ones. add TokenRange struct for describe_ring.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-736
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907705 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 15:57:45 +00:00
Jonathan Ellis
2f99e71f30
have RangeSliceCommand take Range or Bounds (client bounds, start-inclusive, non-wrapping)
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-763
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907172 13f79535-47bb-0310-9956-ffa450edef68
2010-02-06 04:15:39 +00:00
Jonathan Ellis
478ba67b49
add Range.intersectsWith. patch by jbellis; reviewed by Stu Hood for CASSANDRA-763
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907171 13f79535-47bb-0310-9956-ffa450edef68
2010-02-06 04:14:44 +00:00
Jonathan Ellis
781aeaae06
format RangeTest. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@906791 13f79535-47bb-0310-9956-ffa450edef68
2010-02-05 03:14:57 +00:00
Gary Dusbabek
979d92fa45
missing file intended for r906521. CASSANDRA-620
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@906528 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 15:41:31 +00:00
Gary Dusbabek
3577fd8252
add per-keyspace replication factor and replication strategy. Patch by Gary Dusbabek, reviewed by Jaakko Laine. CASSANDRA-620
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@906521 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 15:21:31 +00:00
Jonathan Ellis
ecdcc00ff3
add option to skip start key in range query (StorageProxy only for now) and test.
...
patch by jbellis; reviewed by stuhood for CASSANDRA-759
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@906272 13f79535-47bb-0310-9956-ffa450edef68
2010-02-03 22:44:56 +00:00
Jonathan Ellis
30f0216a8f
reformat, cleanup Range. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@906231 13f79535-47bb-0310-9956-ffa450edef68
2010-02-03 20:40:10 +00:00
Jonathan Ellis
7af12623b1
allow wrapped range queries. patch by jbellis; reviewed by stuhood for CASSANDRA-758
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@906209 13f79535-47bb-0310-9956-ffa450edef68
2010-02-03 20:00:46 +00:00
Jonathan Ellis
3852009c14
make CFS.getKeyRange private; replace w/ getRangeSlice in tests. also clean up test imports.
...
patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@906073 13f79535-47bb-0310-9956-ffa450edef68
2010-02-03 14:46:12 +00:00
Jonathan Ellis
77335589c8
r/m SSTR.openedFiles; clean up decorated key iteration
...
patch by jbellis; reviewed by stuhood for CASSANDRA-753
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@905869 13f79535-47bb-0310-9956-ffa450edef68
2010-02-03 02:22:16 +00:00
Jonathan Ellis
4922a87b54
clean up Table iteration; add Table.all, CFS.all
...
patch by jbellis; reviewed by stuhood for CASSANDRA-753
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@905868 13f79535-47bb-0310-9956-ffa450edef68
2010-02-03 02:20:45 +00:00
Jonathan Ellis
210c98ee3f
mv InitiatedFile -> PendingFile
...
patch by jbellis; reviewed by stuhood for CASSANDRA-751
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904933 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 00:30:19 +00:00
Jonathan Ellis
6224d8b25d
move IncomingStreamReader, StreamInitiateMessage, and BootstrapTest to streaming package. r/m 'public' modifier from streaming classes that don't need it
...
patch by jbellis; reviewed by stuhood for CASSANDRA-751
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904932 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 00:29:37 +00:00
Jonathan Ellis
9e695b5765
rename StreamContextManager -> StreamInManager, StreamManger -> StreamOutManager, extract SCM.StreamContext -> InitiatedFile
...
patch by jbellis; reviewed by stuhood for CASSANDRA-751
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904927 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 00:23:19 +00:00
Jonathan Ellis
c14e573cc0
split Streaming into StreamOut and StreamIn; clean up StreamManager
...
patch by jbellis; reviewed by stuhood for CASSANDRA-751
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904925 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 00:22:29 +00:00
Jonathan Ellis
cc9737abaf
centralize streaming code in org.apache.cassandra.streaming; split out verbs & handlers into top-level classes
...
patch by jbellis; reviewed by stuhood for CASSANDRA-751
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904924 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 00:21:36 +00:00
Jonathan Ellis
8b7038b2ac
merge from 0.5
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904687 13f79535-47bb-0310-9956-ffa450edef68
2010-01-30 00:10:56 +00:00
Jonathan Ellis
d6c2bb0907
make empty strings always return the MINIMUM token, and DecoratedKeys containing the MINIMUM token always be considered empty. This is something we probably should be doing anyway for consistency. (It was already true for OPP, but not COPP or RP.)
...
No further special casing should be necessary because we have already abstracted out code that needs to work across multiple partitioners to use IPartitioner.isEmpty, including getRangeSlice.
patch by jbellis; reviewed by Stu Hood for CASSANDRA-745
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904605 13f79535-47bb-0310-9956-ffa450edef68
2010-01-29 19:31:32 +00:00
Eric Evans
542bd7904d
refactor thrift-specific code ...server -> ...thrift
...
This was mostly an IDE-driven effort.
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904540 13f79535-47bb-0310-9956-ffa450edef68
2010-01-29 16:24:28 +00:00
Jonathan Ellis
c3f36eb151
add test making sure we reject ops on empty column names (we do). patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904373 13f79535-47bb-0310-9956-ffa450edef68
2010-01-29 04:10:29 +00:00
Jonathan Ellis
d6682ffb7b
use 0-capacity cache instead of null to indicate no caching; this means we don't need to worry about creating & destroying cache objects from JMX
...
patch by jbellis; reviewed by goffinet for CASSANDRA-708
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@902914 13f79535-47bb-0310-9956-ffa450edef68
2010-01-25 18:36:00 +00:00
Laine Jaakko Olavi
2d7132069c
fixed broken test. CASSANDRA-644
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@902750 13f79535-47bb-0310-9956-ffa450edef68
2010-01-25 09:38:49 +00:00
Jonathan Ellis
6065d714a1
invalidate cache after compaction so we read what's in the new sstable instead of the cache
...
patch by jbellis; reviewed by goffinet for CASSANDRA-719
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@901956 13f79535-47bb-0310-9956-ffa450edef68
2010-01-22 01:14:02 +00:00
Gary Dusbabek
001b80b803
merging from 0.5 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@901915 13f79535-47bb-0310-9956-ffa450edef68
2010-01-21 23:10:23 +00:00
Jonathan Ellis
b41b238e60
enforce already-present requirement that encoded key length not exceed 64K at the thrift level. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@901748 13f79535-47bb-0310-9956-ffa450edef68
2010-01-21 15:46:41 +00:00
Jonathan Ellis
5b522404d6
convert gossip to use tcp. this finishes the removal of nio
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-705
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@901437 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 23:38:20 +00:00
Jonathan Ellis
2126f608ed
make shutdown non-reentrant and make MS a true singleton
...
patch by jbellis; tested by Brandon Williams for CASSANDRA-705
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@901432 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 23:36:32 +00:00
Gary Dusbabek
ea2eded3b8
remove get_key_rang. Patch by Gary Dusbabek, reviewed by Jonathan Ellis. CASSANDRA-710
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@901207 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 13:57:49 +00:00
Jonathan Ellis
3e06414b61
expose failing test by moving it where other tests are not covering it up somehow. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@900964 13f79535-47bb-0310-9956-ffa450edef68
2010-01-19 21:23:08 +00:00
Jonathan Ellis
27101e9626
change RowsCachedFraction option to RowsCached, specified either as an absolute number or as a percentage of rows in the CF
...
patch by jbellis; reviewed by goffinet for CASSANDRA-688
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@900435 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 15:51:26 +00:00
Jonathan Ellis
a2e2c03435
replace instance() accessors with public final fields. patch by Jeff Hodges; reviewed by Gary Dusbabek and jbellis for CASSANDRA-700
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@899791 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 19:54:58 +00:00
Jonathan Ellis
820390faf1
add bin/sstablekeys, listing just the keys from an sstable (actually, from its index file), one per line.
...
patch by Brandon Williams and jbellis for CASSANDRA-679
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@899781 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 19:36:11 +00:00
Jonathan Ellis
e8fa8651d4
merge from 0.5 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@899042 13f79535-47bb-0310-9956-ffa450edef68
2010-01-14 03:18:34 +00:00
Jonathan Ellis
0e276b5ab0
add missing gcBefore parameter to removeDeleted; clone SC from cache before modifying
...
patch by jbellis; reviewed by goffinet for CASSANDRA-689
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@898894 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 19:14:02 +00:00
Jonathan Ellis
70e1ee304c
fix enabling/disabling row cache.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-689
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@898893 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 19:13:39 +00:00
Jonathan Ellis
2ad01352a8
add (back?) 100ms sleep after inserting w/ CL.ZERO in test suite. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@898639 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 03:47:11 +00:00