ac398bd0a7
add AntiEntropyService; patched by Stu Hood, reviewed by junrao for CASSANDRA-193
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@887575 13f79535-47bb-0310-9956-ffa450edef68
2009-12-05 18:47:55 +00:00
f62d4ec14c
preparation for AntiEntropyService; patched by Stu Hood, reviewed by junrao for CASSANDRA-193
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@887574 13f79535-47bb-0310-9956-ffa450edef68
2009-12-05 18:46:52 +00:00
c2709044d3
add Merkle tree; patched by Stu Hood, reviewed by junrao for CASSANDRA-193
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@887573 13f79535-47bb-0310-9956-ffa450edef68
2009-12-05 18:44:25 +00:00
e202f1f4e0
preparation for Merkle tree; patched by Stu Hood, reviewed by junrao for CASSANDRA-193
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@887572 13f79535-47bb-0310-9956-ffa450edef68
2009-12-05 18:42:26 +00:00
c9bbba13f5
move resolve, diff out of Row and into CF static methods
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-568
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@887467 13f79535-47bb-0310-9956-ffa450edef68
2009-12-05 00:30:22 +00:00
40ed496b91
zero-pad single hex digits in bytesToHex. patch by Stu Hood; reviewed by gdusbabek for CASSANDRA-602
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@887342 13f79535-47bb-0310-9956-ffa450edef68
2009-12-04 20:19:28 +00:00
83cce240bf
Fix not returning live subcolumns of deleted supercolumns
...
patch by jbellis; reviewed by junrao for CASSANDRA-583
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@886886 13f79535-47bb-0310-9956-ffa450edef68
2009-12-03 19:17:03 +00:00
360d9b6a98
improve testing of StorageService init, and fix shutdown of messagingservice.
...
patch by gdusbabek; reviewed by jbellis for CASSANDRA-535
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@886254 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 18:54:07 +00:00
393cbf15dc
update test for new Super4 column family definition
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@886010 13f79535-47bb-0310-9956-ffa450edef68
2009-12-01 23:48:31 +00:00
e65ce8dcd7
JSON importer/exporter tests
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@885325 13f79535-47bb-0310-9956-ffa450edef68
2009-11-30 03:25:15 +00:00
95cbb3461a
allow serializing null CF; add get_range_slice test exercising this
...
patch by jbellis; tested by Dan Di Spaltro for CASSANDRA-578
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@884333 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 23:16:58 +00:00
994487d755
make Row contain a single, final CF reference
...
patch by jbellis; tested by Dan Di Spaltro for CASSANDRA-578
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@884332 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 23:16:48 +00:00
7c4166444b
r/m unused Row code, and move table variable into callers rather than serializing it redundantly
...
patch by jbellis; tested by Dan Di Spaltro for CASSANDRA-578
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@884331 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 23:16:34 +00:00
fc518cbb6a
add primitive get_range_slice. inefficient, but better than get_key_range + get_slices.
...
patch by gdusbabek; reviewed by jbellis for CASSANDRA-344
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@881998 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 23:27:14 +00:00
e972ec8dfe
add license headers. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@881384 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 17:19:40 +00:00
183f51dc21
r/m unused bootstrap directory and ensure streaming files live to be streamed
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-538
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@835446 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:03:52 +00:00
1bf797b943
various improvements to stress.py (see issue comments). patch by Scott White; reviewed by Brandon Williams for CASSANDRA-542
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@835196 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 02:20:41 +00:00
d0db57ad10
move more generic streaming code into Streaming.java
...
patch by jbellis; reviewed by Jaakko Laine for CASSANDRA-435
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@834939 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 16:11:44 +00:00
93c5afa5c9
r/m unused storageport from ReplicationStrategies. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@834920 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 15:48:45 +00:00
07ad40f249
fix broken functional test (expect Super3 in list of CFs)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@834186 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 19:32:14 +00:00
b294cd555a
consolodate BasicUtilities and FBUtilities
...
Patch by Gary Dusbabek; reviewed by eevans for CASSANDRA-516
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@834185 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 19:32:09 +00:00
5d447035ba
containing isBootstrapping and BootstrapTokenAddress information in TokenMetadata is the wrong level of abstraction. Switch to pendingRanges instead.
...
patch by jbellis and Jaakko Laine for CASSANDRA-525
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@833579 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 22:17:26 +00:00
538dc69515
return clones of supercolumns from memtable so caller can't accidentally mutate them, fixing the failing test.
...
convert removeDeleted on SC to remove-oriented instead of clone-then-add-back to make this hurt performance less.
patch by jbellis; reviewed by gdusbabek for CASSANDRA-510
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832798 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 17:07:49 +00:00
f6b71a507d
add failing test for removing a single subcolumn.
...
patch by jbellis; reviewed by gdusbabek for CASSANDRA-510
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832796 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 17:07:37 +00:00
57f0725560
optimize away unnecessary seeks during range scan
...
patch by Gary Dusbabek; reviewed by jbellis for CASSANDRA-350
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832287 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 03:20:43 +00:00
a08630fce0
prefer bootstrapping into ring sections that are not already being bootstrapped into
...
patch by jbellis; reviewed by Vijay Parthasarathy for CASSANDRA-517
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832285 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 03:12:16 +00:00
e946c63806
refactor getDefaultToken into default checking + getRandomToken. Decorate OPP keys so we don't have to special case IndexedDKs for getSplits.
...
patch by jbellis and Vijay Parthasarathy for CASSANDRA-513
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832272 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 02:27:43 +00:00
3678daa0be
brute-force replacement of throwing maps around with encapsulated TokenMetadata
...
patch by jbellis for CASSANDRA-522
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832267 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 02:24:05 +00:00
242fa0231b
CASSANDRA-522
...
convert replication strategy methods to multimap
patch by jbellis for CASSANDRA-522
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832266 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 02:23:53 +00:00
f6b54dfc6b
merge from 0.4
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@831186 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 02:40:35 +00:00
f21b80836d
improve stress.py client-side throughput by using the accelerated thrift protocol and multiprocessing instead of threads. patch by Brandon Williams; reviewed by jbellis for CASSANDRA-514
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830776 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 22:07:50 +00:00
128cb03a5f
make BootStrapperTest use of TokenMetadata match actual BootStrapper use better. patch by jbellis for CASSANDRA-502
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830218 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 14:53:18 +00:00
4856460f0e
refactor bootstrap to only concern itself with bootstrapping the local node, which greatly simplifies things
...
patch by jbellis; reviewed by goffinet for CASSANDRA-483
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830214 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 14:40:29 +00:00
0287d0dd87
fix the bootstrap interaction with gossip; there were two main problems:
...
1) token and bootstrap state are not guaranteed to be gossiped together; since we only updated TMD.bootstrapNodes on an update of the token, this means we could actually miss the bootstrap notice
2) deletions of state are not actually supported by Gossiper; there is no concept of that at the protocol level. so if we delete state locally it will never get gossiped. Instead, we have a MODE that is either MOVING or NORMAL, corresponding to bootstrap & normal operation.
patch by jbellis; reviewed by goffinet for CASSANDRA-483
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830212 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 14:40:18 +00:00
7518f7ce9f
all rows go through deserialize/removeDeleted so we can GC tombstones.
...
patch by jbellis; reviewed by junrao for CASSANDRA-507
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828755 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 15:41:11 +00:00
26971fb3ff
CLHM, fixed version
...
patch by jbellis; reviewed by goffinet for CASSANDRA-423
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828734 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 14:58:53 +00:00
924c7e5fcb
rename "readstorage" endpoints to "natural," "writestorage" to "write" and "hintedstorage" to "hinted"
...
make ReplicationStrategy deal with List<InetAddress> instead of InetAddress[] -- we use the former both in RS and externally, so forcing RS to convert to [] and external users to convert back to List is silly
patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828148 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 19:18:43 +00:00
b767bf7e7d
convert EndPoint to InetAddress (removes MembershipCleaner, the code to drop a node from the cluster entirely. we're probably going to want to resurrect that at some point)
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-498
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828130 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 18:26:02 +00:00
694a6115c7
r/m uses of EndPoint(port) constructor; rename EndPoint methods to make porting easier; r/m gratuitous uses of getHost
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-498
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828128 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 18:25:35 +00:00
7dbbca6698
make write targets computable independent of replication strategy (i.e., make getReadStorageEndPoints the only method a Strategy needs to implement). we do this by computing the token/endpoint -> Range[] map from the read endpoints, then using that to determine if a bootstrapping node needs to receive a write (if the token being written falls in any of its ranges). Also, make the StorageProxy insert methods aware that bootstrap can entail having extra write targets temporarily, and include those in its consistencylevel calculations.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-497
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828029 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 14:18:18 +00:00
b0e6053b85
add test catching regression; call removeDeleted during compaction.
...
patch by jbellis; reviewed by eevans for CASSANDRA-500
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827761 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 18:41:19 +00:00
b1c5077f44
fix token to cover (left, right] like the rest of Cassandra (and Range.toString). patch by Stu Hood; reviewed by jbellis for CASSANDRA-495
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@825684 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 22:21:15 +00:00
074eef97d6
merging with 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@825333 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 23:07:44 +00:00
c88e13cdc6
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824816 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 15:48:53 +00:00
f6b95bf0e5
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824426 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 17:10:53 +00:00
51ec66cccb
move bootstrap-related code into Bootstrapper
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-477
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823616 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 17:07:14 +00:00
6d070498be
r/m undocumented term aliases in favor of a single 'comment' field.
...
patch by jbellis and Brandon Williams; reviewed by Michael Greene for CASSANDRA-481
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823349 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 22:30:55 +00:00
67ae1ee589
Use DecoratedKey objects in Memtable, SSTableReader/Writer objects.
...
patch by johano; reviewed by jbellis for CASSANDRA-446
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@821134 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 19:04:54 +00:00
370082fae4
fix heisenbug in RecoveryManager2Test where a compaction could add back a new sstable to the "cleared" ColumnFamilyStore
...
patch by jbellis; reviewed by junrao for CASSANDRA-463
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@821128 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 18:40:35 +00:00
15599f78de
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@820408 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 19:26:57 +00:00
Jun Rao