580ac7d708
clean out unused code from TcpConnectionManager; split connections to a node into "command" and "ack", which will allow us to use backpressure on the command socket. patch by gdusbabek; reviewed by jbellis for CASSANDRA-488
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@834143 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 16:57:08 +00:00
3d6d023e68
merge from 0.4
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@833785 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:44:20 +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
d6977789cd
split out onJoin from onChange, so we can pass a single ApplicationState object to onChange to emphasize that it gets called once per AS; rename ApplicationState.getState -> getValue
...
patch by jbellis; reviewed by Jaakko Laine for CASSANDRA-525
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@833578 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 22:17:18 +00:00
1e7b673cbe
make sortedtokens passably efficient
...
patch by jbellis; reviewed by Jaakko Laine for CASSANDRA-525
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@833577 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 22:17:14 +00:00
b3b58932f3
fix TODO in tokenmetadata (bootstrap tokens aren't part of the official ring now). r/m redundant getNextEndPoint method in favor of getSuccessor
...
patch by jbellis; reviewed by Jaakko Laine for CASSANDRA-525
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@833576 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 22:17:09 +00:00
f77ec79a8b
avoid flushing empty binarymemtable
...
patch by jbellis; reviewed by goffinet for CASSANDRA-532
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@833498 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 17:56:35 +00:00
23dd57230d
add synchronized to register/unregister methods and remove unused code. patch by Stu Hood and jbellis for CASSANDRA-527
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@833046 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 13:35:57 +00:00
63a0c9d6c7
add onAlive, onDead methods to gossiper listener interface so listeners don't have to try to infer that by less accurate circumstantial evidence
...
patch by jbellis; reviewed by Jaakko Laine for CASSANDRA-527
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832996 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 05:33:47 +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
98719aa7c6
don't removeDeleted on the whole CF before filtering what the request was for; it's expensive. also, fixes subcolumn queries being counted twice in readStats
...
patch by jbellis; reviewed by gdusbabek for CASSANDRA-510
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832797 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 17:07:42 +00:00
e488d26666
only quorum timeout should be unavailableexception; others should be internal errors. also remove un-thrown InvalidRequest exception from some throws clauses. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832439 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 14:48:18 +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
99954686e1
add sortByProximity and use to prefer bootstrap from closer nodes.
...
patch by jbellis and Vijay Parthasarathy for CASSANDRA-513
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832273 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 02:27:50 +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
7ee47b49c6
add logging, assert
...
patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832269 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 02:24:19 +00:00
46e5f23e1b
fix NPE caused by getToken on endpoint that isn't member of ring yet. add assert to prevent in the future.
...
patch by jbellis for CASSANDRA-522
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832268 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 02:24:12 +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
4d256f6655
scan on startup for orphaned filter and index files and remove them.
...
patch by Gary Dusbabek; reviewed by jbellis for CASSANDRA-432
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832075 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 19:38:25 +00:00
1794fbed23
add updateForeignTokenUnsafe for bulk loader. patch by goffinet; reviewed by jbellis for CASSANDRA-523
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@831433 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 19:45:38 +00:00
f170a9dfad
fix hinted handoff map computation
...
patch by jbellis; tested by Edmond Lau for CASSANDRA-524
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@831414 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 18:27:44 +00:00
ccafdada13
fixes for DQ quorum code. patch by Vijay Parthasarathy; reviewed by jbellis for CASSANDRA-492
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@831339 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 15:42:09 +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
aa0b3d182a
merge from 0.4
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830303 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 19:21:29 +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
160483cd19
rename getRangeMap -> getRangeAddresses; add inverse getAddressRanges
...
patch by jbellis; reviewed by goffinet for CASSANDRA-483
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830213 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 14:40:23 +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
ad01178e37
rename away underscores
...
patch by jbellis; reviewed by goffinet for CASSANDRA-483
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830211 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 14:40:06 +00:00
e006aa51b9
r/m single-use executor in favor of a Thread
...
patch by jbellis; reviewed by goffinet for CASSANDRA-483
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830210 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 14:40:01 +00:00
4d2b25713f
initialize generation to seconds-since-epoch, a value much more likely to be unique than "1"
...
patch by jbellis; reviewed by eevans for CASSANDRA-515
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830046 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 02:25:50 +00:00
d2c2365a78
add dcquorum/dcquorumsync consistency levels, representing "a quorum of the replicas in the current dc" and "a quorum of the replicas in each dc," respectively.
...
patch by Vijay Parthasarathy; reviewed by jbellis for CASSANDRA-492
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@829819 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 15:00:20 +00:00
ed808be3d3
fix regression recognizing local reads from 828148.
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-512
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@829136 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 17:25:58 +00:00
370b0ec2f2
fix outdated comment. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828923 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 03:16:21 +00:00
bb32068268
add checks for obviously bogus values read
...
patch by jbellis; reviewed by junrao for CASSANDRA-466
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828922 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 03:06:46 +00:00
e1b622e869
make compaction able to recover from errors w/in a row
...
patch by jbellis; reviewed by junrao for CASSANDRA-466
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828921 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 03:06:39 +00:00
296f15804c
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828797 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 17:48:43 +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
90caf577b7
catch Throwable on startup rather than Exception
...
patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828154 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 19:29:35 +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
c44e9d05ca
r/m unused "listening" distinction in TcpConnection
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-498
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828127 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 18:25:25 +00:00
9b892b186a
clean up unused code; add comments. patch by jbellis for CASSANDRA-488
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828084 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 16:24:14 +00:00
0a8f46507f
reformat whitespace. patch by jbellis for CASSANDRA-488
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828083 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 16:24:11 +00:00
1f63a4aac1
ignore hidden files in commitlog directory (useful for users on OS X, which likes to add files like ".DS_Store"). patch by gdusbabek; reviewed by jbellis for CASSANDRA-503
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828076 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 16:09:08 +00:00
d5eaa4e141
Make EndPoint objects immmutable, so hashcode can't change (making the EndPoint potentially disappear from a map)
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-497
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828030 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 14:18:24 +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
93b0b062c2
rename nodePicker -> replicationStrategy.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-497
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828028 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 14:18:09 +00:00
dcdb8e1b85
export specific keys passed on command line
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827796 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 21:10:53 +00:00
34207f0a92
CASSANDRA-499 null-out row member on seekTo()
...
Otherwise a later call to IteratingRow.skipRemaining() (from next())
will undermine the seek.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827795 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 21:10:43 +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
e659b06f3a
fix HH to not give up when any node is live
...
patch by jbellis; reviewed by eevans for CASSANDRA-496
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827744 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 17:48:52 +00:00
d4a8f07cd8
inline getNextAvailable
...
patch by jbellis; reviewed by eevans for CASSANDRA-496
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827743 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 17:48:49 +00:00
c1e22db3bf
Avoid using non-existent supercolumn timestamp in delete op. Better conceptual integrity to delete w/ correct system time anyway.
...
patch by jbellis; reviewed by junrao for CASSANDRA-491
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827742 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 17:45:29 +00:00
eeb164e2c0
fix HH of tombstones. patch by jbellis; reviewed by junrao for CASSANDRA-491
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827741 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 17:45:22 +00:00
06bd3f069a
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@826917 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 00:33:00 +00:00
360d3559ec
merge from 0.4
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@826078 13f79535-47bb-0310-9956-ffa450edef68
2009-10-16 20:40:44 +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
079920ae70
convert bytes to hex for BytesType.getString()
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@825619 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 19:02:54 +00:00
417e7c0373
basic json exporter for sstables
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@825618 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 19:02:47 +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
bdb7bda5e0
move callback synchronization into ResponseVerbHandler where it's less likely to be a maintenance problem
...
patch by jbellis for CASSANDRA-478
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824477 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:57:58 +00:00
1782c886fa
r/m unused attachContext.
...
patch by jbellis for CASSANDRA-478
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824476 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:57:52 +00:00
93ad8a2e42
cleanup Message; add asserts
...
patch by jbellis for CASSANDRA-478
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824475 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:57:45 +00:00
78f7a35ae3
logging & cleanup in ConsistencyManager
...
patch by jbellis for CASSANDRA-478
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824474 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:57:40 +00:00
c12b11b566
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824464 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:18:45 +00:00
816a45b62a
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824459 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:08:51 +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
735435be69
add AutoBootstrap config option
...
patch by jbellis. reviewed by goffinet for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824007 13f79535-47bb-0310-9956-ffa450edef68
2009-10-11 03:22:15 +00:00
4a4b8bebf7
fix regressions
...
patch by jbellis reviewed by Eric Evans for CASSANDRA-477
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823617 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 17:07:24 +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
3e3ebc3fb3
expose additional metrics for executors. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-482
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823562 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 14:28:40 +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
ba98fa4797
Fail startup if <seeds> is empty. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-479
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823264 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 18:38:36 +00:00
294bfa9a21
Added the ability to set maxthreshold to zero in nodeprobe, and added a special case to CF.doCompaction to not run compaction when its disabled. patch by goffinet; reviewed by jbellis for CASSANDRA-465
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822931 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 21:47:38 +00:00
3329f5ec98
create new collection when reducing the number of sstables compacted; the lists returned by subList are unmodifiable
...
patch by jbellis; reviewed by goffinet for CASSANDRA-473
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822878 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 19:48:59 +00:00
303951c458
r/m nodeprobe bootstrap
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-438
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822877 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 19:42:01 +00:00
ff3dd4dcec
add autobootstrap
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-438
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822876 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 19:41:47 +00:00
fe1aa5b52d
rename LOCATION_CF -> STATUS_CF. cleanup.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-438
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822875 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 19:41:36 +00:00
5e9b35cc8c
rename getMessagingInstance -> instance; r/m unused methods from FBUtiltities
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822793 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:43 +00:00
103a13c68f
get token on bootstrap that gives us half of the keys from the most heavily-loaded node. (the "splits" approach should also be useful for #342 ; adding it to Thrift is trivial)
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822792 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:31 +00:00
02a569e384
add getLoadMap jmx method; add load info to nodeprobe ring
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822791 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:24 +00:00
d1a8e1322f
use Strings instead of Endpoints in jmx methods. merge cluster info into ring.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822790 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:20 +00:00
ece6e6d459
move javadoc into mbean. inline methods where wrapping is not necessary to satisfy Demeter
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822789 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:14 +00:00
4a0378eb85
make LoadInfo a double instead of going from long -> string -> LoadInfo -> int
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822788 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:10 +00:00
becb0b1c7a
clean up loadinfo and SLB
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822787 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:05 +00:00
4e0c6e600f
use CallerRunsPolicy instead of rejecting runnables on multi-threaded executors w/ blocking queues
...
patch by jbellis; tested by Chris Were for CASSANDRA-471
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822752 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 14:18:20 +00:00
09269836f6
replace one-shot lock w/ synchronized block. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822459 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 19:41:57 +00:00
f82eb0bb54
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@821179 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 21:34:09 +00:00
ce7a610701
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@821137 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 19:31:05 +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
a917588bb2
add MemtableFlushAfterMinutes, a global replacement for the old per-CF FlushPeriodInMinutes setting
...
patch by jbellis; reviewed by junrao for CASSANDRA-463
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@821127 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 18:40:27 +00:00
e7e3d23d26
change instance variables to final where appropriate
...
patch by jbellis; reviewed by junrao for CASSANDRA-463
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@821126 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 18:40:15 +00:00
362178c204
framed transport option for cassandra cli
...
Patch by Dan Di Spaltro; reviewed by eevans for CASSANDRA-464
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@820697 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 16:00:48 +00:00
d50facfb49
don't use token in decoration except for RandomPartioner. patch by jbellis for CASSANDRA-467; tested by dispalt
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@820512 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 02:49:59 +00:00
a215c38bfb
make token, key in DecoratedKey public final in accordance with style guide.
...
patch by jbellis for CASSANDRA-467; tested by dispalt
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@820511 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 02:49:54 +00:00
ce27422729
logging for digests. patch by jbellis for CASSANDRA-462
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@820418 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 19:40:04 +00:00
f48c5b612a
formatting + cleanup. patch by jbellis for CASSANDRA-462
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@820417 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 19:39:57 +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
60839fea85
fix tests
...
patch by jbellis for CASSANDRA-459
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@819827 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 03:48:21 +00:00
fb5082ab3b
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@819826 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 03:42:42 +00:00
de8318315f
Replace DebuggableScheduledThreadPoolExecutor with non-Scheduled Executors and Timers. This allows logging exceptions from repeated tasks, which is basically impossible with STPE.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-455
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@819665 13f79535-47bb-0310-9956-ffa450edef68
2009-09-28 18:45:10 +00:00
ac5a194d4e
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@819662 13f79535-47bb-0310-9956-ffa450edef68
2009-09-28 17:46:48 +00:00
32dc02cad6
fix bit math on column name read
...
patch by jbellis; tested by T Jake Luciani for CASSANDRA-460
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@819612 13f79535-47bb-0310-9956-ffa450edef68
2009-09-28 15:53:40 +00:00
778f1dec9b
r/m unused byte-tracking code
...
patch by jbellis; tested for CASSANDRA-458 by Teodor Sigaev
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@819126 13f79535-47bb-0310-9956-ffa450edef68
2009-09-26 12:54:17 +00:00
aee70135ef
r/m unnecessary SortedFlushable class. Keeping a 2nd reference to the Flushable in question,
...
when it is only used to pass back to that Flushable for the write phase, was unnecessary & confusing.
patch by jbellis; tested for CASSANDRA-458 by Teodor Sigaev
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@819125 13f79535-47bb-0310-9956-ffa450edef68
2009-09-26 12:54:12 +00:00
e849e97773
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@819123 13f79535-47bb-0310-9956-ffa450edef68
2009-09-26 12:48:55 +00:00
d309c5dc77
record gossipped enpoint/token pairs as we see them. also clean up SystemTable code to avoid unnecessary CF fetches. patch by Gary Dusbabek and jbellis for CASSANDRA-437
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@818712 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 04:01:35 +00:00
3a35bc9113
CommitLog and Table.apply/applyNow/load paths use RMs directly instead of converting to Rows first. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-456
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@818607 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 19:55:10 +00:00
1d0cf136f6
remove unused skip argument from anticompaction. change HHM to perform a major compaction instead of anticompaction since that's really what we want there
...
patch by jbellis; reviewed by junrao for CASSANDRA-454
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@818517 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 15:32:21 +00:00
4c0df722db
add back BinaryMemtable tuneable, but remove the hardcoded 50k limit
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@818194 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 18:44:16 +00:00
93df28fcb4
split flusher executor into flushSorter and flushWriter. This is because sorting is CPU-bound, and writing is disk-bound; we want to be able to do both at once.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-401
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@817929 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 01:57:45 +00:00
d7bd37af15
clean up ThreadFactoryImpl and rename to NamedThreadFactory
...
patch by jbellis; reviewed by goffinet for CASSANDRA-401
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@817928 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 01:57:37 +00:00
767467724a
r/m unused commitlogcontext arg to flush. synchronize getTempSSTablePath
...
patch by jbellis; reviewed by goffinet for CASSANDRA-401
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@817927 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 01:57:27 +00:00
e279ccd874
clean out unused code from MessagingService. Inline sink processing into sendOneWay instead of having another executor for that.
...
this sets the stage for backpressuring the client, should we choose to do that
patch by jbellis; reviewed by goffinet for CASSANDRA-401
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@817926 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 01:57:21 +00:00
1c547a2aa9
support multiple flush threads safely. automatically use up to avaiable core count threads for flushing. pause updates when too many unflushed memtables are generated.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-401
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@817925 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 01:57:15 +00:00
aee7b0c4df
Consolidate BMT threshold and object count sizes into getMemtableSize() and getMemtableObjectCount(). patch by Chris Goffinet; reviewed by jbellis for CASSANDRA-433
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@817265 13f79535-47bb-0310-9956-ffa450edef68
2009-09-21 14:20:00 +00:00
767e0235b0
r/m memtableLock; it is redundant wrt flusherLock
...
patch by jbellis; reviewed by junrao for CASSANDRA-444
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@816747 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 19:02:58 +00:00
c8cb217548
cleanup; r/m unused code
...
patch by jbellis; reviewed by junrao for CASSANDRA-444
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@816746 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 19:02:54 +00:00
d293b77bed
serialize row outside of commitlog executor to improve parallelizability
...
patch by jbellis; reviewed by junrao for CASSANDRA-444
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@816745 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 19:02:49 +00:00
6e709a2863
move per-key locking inside Memtable and shard it.
...
patch by jbellis; reviewed by junrao for CASSANDRA-444
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@816744 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 19:02:36 +00:00
4b721abdf3
commitlog may consider writes flushed, that are not yet; patched by junrao; reviewed by jbellis for CASSANDRA-445
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@816453 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 03:20:57 +00:00
3f87f59a6c
add thrift version string.
...
patch by jbellis; reviewed by Michael Greene for CASSANDRA-412
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@816386 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 21:15:49 +00:00
b618106f3c
Replace PriorityQueue mess with a CompactionIterator that efficiently yields compacted Rows from a set of sstables by feeding CollationIterator into a ReducingIterator transform. ("Efficiently" means we never deserialize data until it is needed, so the number of sstables that can be compacted at once is virtually unlimited, and if only one sstable contains a given key that row data will be copied over without an intermediate de/serialize step.) This is a very natural fit for the compaction algorithm and almost entirely gets rid of duplicated code between doFileCompaction and doAntiCompaction.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-436
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@816382 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 21:10:09 +00:00
a45bb97cc0
allow ReducingIterator to reduce from one type to a different one
...
patch by jbellis; reviewed by goffinet for CASSANDRA-436
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@816381 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 21:10:03 +00:00
254e6a2c23
copy FileStruct to SSTableScanner and remove cruft. Migrate getKeyRange to new scanner class.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-436
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@816380 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 21:09:58 +00:00
bb5a2700d7
minor fixes
...
patch by jbellis; reviewed by goffinet for CASSANDRA-436
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@816379 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 21:09:52 +00:00
59c1a4e7a8
rename MINOR-COMPACTION-POOL -> COMPACTION-POOL. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@815930 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 19:21:39 +00:00
0c84342d3a
rename MinorCompactionManager -> CompactionManager. patch by jbellis for CASSANDRA-447
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@815498 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 21:30:26 +00:00
effc0ecee3
add mbean to get/set compaction thresholds. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-447
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@815497 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 21:26:12 +00:00
8ab7772333
add DecoratedKey.java to fix build
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@815442 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 18:41:28 +00:00
c8b1ab49a5
Use DecoratedKey objects in BMt to avoid lots of expensive String parsing operations when sorting. patch by johano; reviewed by jbellis for CASSANDRA-420
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@815434 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 18:17:05 +00:00
91acae3dfb
Fix deserialization bug in TokenUpdateVerbHandler; change TokenUpdater to update one node at a time, and add bin/tokenupdater as a convenience. Patch by Sammy Yu; reviewed for CASSANDRA-363 by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@815373 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 15:47:36 +00:00
dd1688cf85
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@814973 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 02:54:02 +00:00
39982f3649
make anticompaction return a list of the split-out sstables, instead of a mostly-useless boolean
...
patch by jbellis; reviewed by goffinet for CASSANDRA-431
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@814756 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 18:04:46 +00:00
adcbd5b402
Move log level to debug from info when resolve() is called. patch by Chris Goffinet; reviewed by jbellis for CASSANDRA-427
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@814755 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 18:00:47 +00:00
bee816c68a
Replace sstableLock with SSTableTracker, which performs updates to the sstable list atomically
...
without readers ever having to block. (Readers will always either see the old list, or the new.)
We avoid a race on the delete of the old SSTable files on-disk by using a ReferenceQueue:
when the last reference is gone, a PhantomReference is added to the queue and can do cleanup.
In case Cassandra is killed between compaction and this cleanup, a -Compacted empty file
is written to disk; Cassandra removes any files thus tagged on startup.
patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-414
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@813544 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 18:48:35 +00:00
87bd4a24a4
convert ssTables_ to a Set, since the filename is encapsulated in the SSTR object now
...
patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-414
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@813543 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 18:48:26 +00:00
4da540024a
combine addToList and storeLocation; rename to addSSTable
...
patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-414
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@813542 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 18:48:19 +00:00
3e96baefd1
merge with cassandra-0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812698 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 21:21:28 +00:00
40c154ab4b
make compaction code use SSTableReader objects. r/m SSTableReader.get static method
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-424
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812641 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 18:59:28 +00:00
d167464648
rename getIndex -> getGeneration
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-424
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812640 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 18:59:21 +00:00
95e7ed26bb
r/m unused BUFSIZE
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-424
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812639 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 18:59:17 +00:00
bb2c187d20
merged with cassandra-0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812262 13f79535-47bb-0310-9956-ffa450edef68
2009-09-07 19:19:00 +00:00
71b3b3c736
fix compaction bug -- only one of the SSTR constructors was adding to openedFiles. (fixes regression from #413 ).
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-425
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812230 13f79535-47bb-0310-9956-ffa450edef68
2009-09-07 17:18:41 +00:00
313f053ecd
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812228 13f79535-47bb-0310-9956-ffa450edef68
2009-09-07 17:15:48 +00:00
7bfe8df549
Revert "remove sstableLock. re-order a few ops so that we can never "lose" data temporarily -- always remove old sstable references _after_ adding the new ones. so at worst a few read ops will merge data from an sstable that is obsolete -- this is ok and better than Stop The World locking"
...
and "CASSANDRA-414 combine addToList and storeLocation; rename to addSSTable"
These were works in progress (and broken); accidentally committed w/ the 418 fix.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812164 13f79535-47bb-0310-9956-ffa450edef68
2009-09-07 14:47:28 +00:00
dec8490e5e
clean up inaccurate comments; remaining double-increment code.
...
patch by jbellis; reviewed by Sammy Yu for CASSANDRA-418
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812163 13f79535-47bb-0310-9956-ffa450edef68
2009-09-07 14:45:13 +00:00
090b6a21d2
remove sstableLock. re-order a few ops so that we can never "lose" data temporarily -- always remove old sstable references _after_ adding the new ones. so at worst a few read ops will merge data from an sstable that is obsolete -- this is ok and better than Stop The World locking
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812162 13f79535-47bb-0310-9956-ffa450edef68
2009-09-07 14:45:09 +00:00
8be0d7de6a
CASSANDRA-414 combine addToList and storeLocation; rename to addSSTable
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812161 13f79535-47bb-0310-9956-ffa450edef68
2009-09-07 14:45:04 +00:00
67fc385718
merging from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@811489 13f79535-47bb-0310-9956-ffa450edef68
2009-09-04 16:52:43 +00:00
53895adf95
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810997 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 15:33:46 +00:00
204bec65ef
clarify open/get code and r/m unnecessary synchronization; it's confusing. (openedFiles is backed by a NonBlockingHashMap and all our uses of it are threadsafe w/o extra locking)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810695 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 20:30:43 +00:00
ab392a6ee7
remove buggy concurrentlinkedhashmap library and lru cache. too late in 0.4 to try to debug the library -- will revisit for 0.5. patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-405
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810540 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 15:04:16 +00:00
fe28c47406
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810335 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 02:02:30 +00:00
e2af28a6e3
merged from cassandra-0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810282 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 22:25:00 +00:00
64c38a2657
inline BatchMutation into batch_insert params
...
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-403
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809793 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 01:52:03 +00:00
33ac4dddb0
r/m unused code. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809752 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 21:31:25 +00:00
781dfe4b6b
allow setting the logging level at runtime via mbean.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-402
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809746 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 21:14:27 +00:00
7bf57616e6
r/m unused import
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809719 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 19:49:14 +00:00
bbd170187b
organize api methods by type (retrieval or modification). patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809718 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 19:48:24 +00:00
35cd1761f6
change default comparator to BytesType
...
patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-400
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809645 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 16:07:37 +00:00
fa1d99ac96
add forwards-compatible ConsistencyLevel parameter to get_key_range. Currently it is a no-op. patch by Chris Goffinet; reviewed by jbellis for CASSANDRA-322
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809639 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 15:50:58 +00:00
533dcad919
Deadlock with SelectorManager.doProcess and TcpConnection.write; patch by Sammy Yu and junrao; reviewed by Chris Goffinet for CASSANDRA-392
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809629 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 15:44:42 +00:00
eb83251bda
r/m unnecessary IReplicationStrategy interface. r/m LoadVerbHandler and unused endpoint-related code. rename AbstractStrategy -> AbstractReplicationStrategy and getEndpoint methods.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-393
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809586 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 13:35:46 +00:00
86abfe1027
r/m special case of local destination when writing with ConsistencyLevel.ZERO, since it causes blocking for commitlog. (MessagingService still optimizes out the network write/read.) Patch by Chris Goffinet; reviewed by jbellis for CASSANDRA-399
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809216 13f79535-47bb-0310-9956-ffa450edef68
2009-08-29 22:39:58 +00:00
8c3693c6b0
move Map creation into default constructor so we don't waste object creation when the non-default constructor is used
...
patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809001 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 19:33:05 +00:00
dc794169b8
Fixes to make BinaryMemtable useful. Highlights are configurable threads for [binary]memtable flushing and flushAndShutdown JMX/nodeprobe directive.
...
patch by Chris Goffinet; reviewed by jbellis for CASSANDRA-337
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808942 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 16:27:58 +00:00
40641c73a6
remove multiget_count until/unless there is a demonstrated need for it. patch by jbellis for CASSANDRA-70
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808597 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 20:11:49 +00:00
6690c51359
Update AsyncResult to know when it started waiting so you can get() multiple Results in serial but have them wait in parallel. Use this to implement multiget methods. Remove unused MultiAsyncResult code and StorageProxy methods using it.
...
Patch by Chris Goffinet; reviewed by jbellis for CASSANDRA-70
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808589 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 20:07:12 +00:00
ba88f55d1f
fix getUsedDiskSpace to look at data directories recursively. Patch by Sammy Yu; reviewed by jbellis for CASSANDRA-394
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808546 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 17:22:03 +00:00
021ab75a5f
add midpoint method to IPartitioner. patch by Stu Hood; reviewed by jbellis for CASSANDRA-242
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808206 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 22:20:23 +00:00
f8fa6d2431
refactors COPP to use BytesToken. patch by Stu Hood; reviewed by jbellis for CASSANDRA-242
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808205 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 22:20:13 +00:00
847f3b0293
1. Switch bootstrapNodes in TokenMetadata to Map<Token,EndPoint> so RackUnawareStrategy can use it.
...
2. Fix AbstractStrategy and RackUnawareStrategy to incorporate the bootstrapping nodes for
getHintedStorageEndPoints through StorageService.getNStorageEndPointMap (now used by insert and
insertBlocking after 383)
3. Add unit test fot RackUnawareStrategy to test if bootstrapping nodes are being returned correctly.
patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-375
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808161 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 19:04:07 +00:00
489143566d
add more (debug) logging to log recovery process. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808151 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 18:33:46 +00:00
0fc2d87e2b
combine batch_insert and batch_insert_super the way we did get_slice and get_slice_super
...
patch by jbellis. reviewed by Chris Goffinet and Evan Weaver for CASSANDRA-388
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808045 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 15:11:27 +00:00
c4992f48ce
Expose ring map to client for more direct access; patch by junrao; reviewed by jbellis for CASSANDRA-197
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@807431 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 23:39:27 +00:00
a2899de137
[fixed version] avoid opening multiple writers for the current file; the buffered nature of the global logWriter_ could cause problems
...
patch by jbellis; reviewed for CASSANDRA-370 by Sammy Yu
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@807399 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 22:03:35 +00:00
eb49a18acd
need to include column container's deletion status when determining whether to include a column in the live count.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-386
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@807395 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 21:48:20 +00:00
39d97f3892
Revert "CASSANDRA-370 avoid opening multiple writers for the current file; the buffered nature of the global logWriter_ could cause problems"
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@807381 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 21:13:32 +00:00
12cbf75280
read(bytes) doesn't automatically throw EOFException if it reads less than asked for, so we need to check for that.
...
patch by jbellis; reviewed by Sammy Yu for CASSANDRA-370
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@807365 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 20:32:00 +00:00
5fd4ff7747
CASSANDRA-370 avoid opening multiple writers for the current file; the buffered nature of the global logWriter_ could cause problems
...
patch by jbellis; reviewed by Sammy Yu for CASSANDRA-370
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@807364 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 20:31:56 +00:00
3917094f04
allow blocking write to create hints if not enough of the "correct" nodes are live, but enough are to fulfil the requested consistency level. patch by Sandeep Tata; reviewed by jbellis and Michael Greene for CASSANDRA-383
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@807305 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 16:49:21 +00:00
dcabc0e343
print right side of range in nodeprobe ring output
...
Patch by Sammy Yu and Michael Greene; reviewed by eevans for CASSANDRA-382
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806362 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 21:17:59 +00:00
568933f5c4
change LongType to read longs in big endian order to be consistent with network order and the UUID types.
...
patch by jbellis and Evan Weaver; reviewed by Michael Greene for CASSANDRA-384
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806342 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 20:37:45 +00:00
c8dbd6a402
finish removing Groovy. patch by Michael Greene; reviewed by jbellis for CASSANDRA-380
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806305 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 19:00:58 +00:00
51401247c1
remove groovy jar, half-baked Callout code. patch by Michael Greene; reviewed by jbellis for CASSANDRA-380
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806267 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 17:24:33 +00:00
6be6f84d39
sanity check start, finish slice args
...
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-376
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806245 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 16:37:14 +00:00
d7e492410a
remove authorship comments. patch by Michael Greene; reviewed by jbellis for CASSANDRA-379
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806032 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 03:31:24 +00:00
c0df773c99
add getPendingTasks to CommitLogExecutorService
...
patch by jbellis; reviewed by Michael Greene for CASSANDRA-369
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806030 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 03:13:19 +00:00
e959b2c7f6
rename getInitialToken to getToken; it doesn't actually have anything to do w/ initial or default tokens. log token on startup.
...
patch by jbellis; reviewed by Sammy Yu for CASSANDRA-364
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806016 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 01:03:31 +00:00
8a72a27cf1
rename underscores away
...
patch by jbellis; reviewed by Sammy Yu for CASSANDRA-364
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806015 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 01:03:20 +00:00
0c5cd149a3
Add "bootstrap mode" to node startup. This causes the node to tell the
...
nodes that have data it needs to send it the data, and not otherwise
participate in reads or writes until the bootstrap is complete.
patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-195
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@805968 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 20:51:06 +00:00
bb464c1f37
use the subcomparator when toStringing slice commands on subcolumns. this exposes a couple bugs: fix getString in non-string types to accept byte[0], and fix a test to send a long to a LongType subcolumn. patch by jbellis and Evan Weaver for CASSANDRA-377
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@805868 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 16:27:20 +00:00
007df950fc
add missing while loop on periodic commitlog sync thread.
...
patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-367
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@805615 13f79535-47bb-0310-9956-ffa450edef68
2009-08-18 22:49:20 +00:00
0004623029
fix typo setting syncperiod. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@805505 13f79535-47bb-0310-9956-ffa450edef68
2009-08-18 17:24:55 +00:00
db18318c0a
do timed sync if we're not doing it in the executor process()
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@805211 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 23:34:23 +00:00
eb886e9999
make StorageTable.StorageMetadata a singleton, so multiple initMetadatas are safe.
...
patch by Bill de hOra and jbellis; reviewed by Michael Greene for CASSANDRA-358
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@804372 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 21:00:18 +00:00
5f4734eaa8
rename dispatchMessage overload w/ identical erased signature to make JDK7 (and the Java spec) happy. patch by Michael Greene; reviewed by jbellis for CASSNADRA-366
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@804359 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 20:20:50 +00:00
1aeca2b625
add license headers to new-since-0.3 files.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-365
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@804294 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 16:52:55 +00:00
7158863861
Fixes for saving Token in SystemTable. patch by jbellis and Sammy Yu for CASSANDRA-362
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@804045 13f79535-47bb-0310-9956-ffa450edef68
2009-08-13 22:16:01 +00:00
ddf00a509a
give up on trying to optimize startWith -- it's basically impossible when replication factor > 1 b/c of the range wrap point.
...
patch by jbellis; tested by Mark Robson for CASSANDRA-348
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@803716 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 21:27:24 +00:00
cd66ac8326
CASSANDRA-361 cleanup left-over references to Cql
...
Patch by Michael Greene (+ regeneration of thrift code); reviewed
by eevans for CASSANDRA-361
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@803355 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 02:59:55 +00:00
3ec8258db6
expose threadpool's pendingtasks via nodeprobe. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-360
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@803285 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 20:40:10 +00:00
a461792de9
Move CFSerializer into its own file. Rename deserializeEmpty to deserializeFromSSTableNoColumns; add serializeForSSTable and serializeWithIndexes to do the without-metadata serialization. Add SSTableReader.makeColumnFamily to create the CF skeleton w/o reading any data.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-233
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@803284 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 20:34:21 +00:00
ac414f9a52
add back read latency stats for CFS.getColumnFamily. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-359
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@803240 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 18:27:20 +00:00
850e865440
use CFS executor for BMt flushes.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-337
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@803211 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 17:17:21 +00:00
7ea2c96852
add settings for buffer sizes; make unconfigurable ones more sane.
...
patch by jbellis; reviewed by Jun Rao and Eric Evans for CASSANDRA-355
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@803135 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 14:13:47 +00:00
9f570c192d
respect "start" filter argument for subcolumns.
...
patch by jbellis; reviewed by Even Weaver for CASSANDRA-357
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802978 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 02:09:40 +00:00
480650b826
fix typo breaking CompareSubcolumnsWith. fix timeuuid compare with byte[0].
...
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-357
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802977 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 02:09:33 +00:00
7f63092fed
fix build failure. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802969 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 00:50:19 +00:00
6b7a1c300f
switch "!isAscending" for "reversed."
...
patch by jbellis, Carl Bystrom, and Bill de hOra. reviewed by Eric Evans for CASSANDRA-311
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802953 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 23:17:08 +00:00
5a31842278
check column-level bloom filter during name-based slicing.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-325
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802950 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 22:52:08 +00:00
8455ebfe87
CASSANDRA-296 remove CQL
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802911 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 19:35:01 +00:00
38c2556834
CASSANDRA-296 remove CQL support from the CLI
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802909 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 19:34:45 +00:00
e3f6bd529f
CASSANDRA-296 fix grammar breakage
...
Changeset ada820 was an attempt to make hostname parsing less stupid,
(i.e. don't allow underscores; do allow hyphens; allow IP addresses).
It didn't entirely fix the problems it set out to and it broke
parsing of anything that used the "Identifier" lexer, (for example
the thrift {get,set} ... commands).
This changeset partially reverts ada820 until a proper fix to
hostname parsing can be found.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802908 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 19:34:38 +00:00
bf6236ddf6
CASSANDRA-241 optional support for framed transport
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802898 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 18:57:03 +00:00
ceb4a10808
use the existing collectReducedColumns api to make subcolumn slices conform as expected to filter semantics
...
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-356
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802827 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 15:30:12 +00:00
cee37599f6
rename, clean up collectColumns methods
...
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-356
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802826 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 15:29:58 +00:00
15354b4906
Combine thrift slice methods. Now we have one get() method, one get_slice(), and one get_count().
...
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-329
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802640 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 02:51:35 +00:00
9d6f4752b6
reduce buffer sizes for test suite since it forces lots of small flushes. reduces NameSortTest from ~30s back to < 10s.
...
patch by jbellis for CASSANDRA-339
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802276 13f79535-47bb-0310-9956-ffa450edef68
2009-08-08 00:59:14 +00:00
d748648b23
fix broken casts. patch by Bill de hOra; reviewed by jbellis for CASSANDRA-338
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802267 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 23:29:50 +00:00
fa53f58871
make default OPP non-collating (compare is faster).
...
patch by jbellis; reviewed by Sammy Yu for CASSANDRA-339
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802186 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 20:57:08 +00:00
e24925d49e
add SSTableWriter buffer size option; increase default.
...
patch by jbellis; reviewed by Sammy Yu for CASSANDRA-339
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802185 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 20:57:02 +00:00
8a9c25ae0e
- switch from trying to get the next endpoint by increasing offset to asking tokenMetadata for "the next
...
one." this will always be correct where the offset approach will not (usually you want offset to just be 1,
but sometimes you have to keep increasing it if no results are found but the range is still not finished)
- merge results differently when the endpoint responsible for where the ring wraps is involved, since
that endpoint can hold keys from both the beginning and end of the range.
patch by jbellis; tested by Mark Robson for CASSANDRA-348
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802180 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 20:48:45 +00:00
fba03ce691
move getKeyRange to CFS, where it encapsulates better.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-345
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802098 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 17:35:25 +00:00
9a9371d1ef
include index and bloom filter in snapshots. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-353
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802093 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 17:08:16 +00:00
cb0e6a348f
human-readable error for bad CommitLogSyncDelay.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-349
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802092 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 17:03:32 +00:00
d221a41719
tests + fix for bsearch returning not-found-to-the-right
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-351
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802078 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 16:24:54 +00:00
671912ef57
final cleanup of SSTableSliceIterator, now with less unnecessary copying of Columns around
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-332
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802075 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 16:24:25 +00:00
4a0860e4fe
avoid copying variables to ColumnGroupReader that it can get from the parent class. rename underscored variables.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-332
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802074 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 16:24:17 +00:00
c011c67182
move comparator out of IndexInfo
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-332
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802073 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 16:24:12 +00:00
a9c6a1e7d6
always write at least one index (with first and last column of the range) for the columns in row. this vastly simplifies column reading code and makes indexing bugs much more obvious (since there is only one read path each for names / slices now).
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-332
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802072 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 16:24:04 +00:00
0f2a76bb5b
don't serialize unused column count into column index. remove DataInput/Output round-tripping from ColumnGroupReader
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-332
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802071 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 16:23:53 +00:00
449a444c7d
fix range query buglet; add debug logging
...
patch by jbellis; tested by Mark Robson for CASSANDRA-348
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@801676 13f79535-47bb-0310-9956-ffa450edef68
2009-08-06 15:34:22 +00:00
e1e6a6c554
Improve the speed of RandomPartitioner comparator. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-346
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@801493 13f79535-47bb-0310-9956-ffa450edef68
2009-08-06 01:55:29 +00:00
88b0ee7be4
fix more findbugs complaints. patch by Michael Greene; reviewed by jbellis for CASSANDRA-338
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@801228 13f79535-47bb-0310-9956-ffa450edef68
2009-08-05 13:38:40 +00:00
ee3e388a80
fix SC.serializedSize. patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-341
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@801048 13f79535-47bb-0310-9956-ffa450edef68
2009-08-05 02:37:45 +00:00
939709f977
fix NPE on iterator close. patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-341
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@801047 13f79535-47bb-0310-9956-ffa450edef68
2009-08-05 02:37:40 +00:00
7bd9590c07
Rename UUIDType to LexicalUUIDType and add TimeUUIDType.
...
patch by jbellis; reviewed by Michael Koziarski for CASSANDRA-334
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@800573 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 21:27:04 +00:00
6c49231027
Bootstrap code + tests. Patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-213
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@800561 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 20:59:32 +00:00
07330c1cfa
brings findbugs count from 266 -> 250 bugs by fixing some scopes, removing some dead code, and not implementing Serializable unnecessarily. patch by Michael Greene; reviewed for CASSANDRA-338 by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@800547 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 20:33:24 +00:00
6703ecffe1
forgot SSTable part of last.
...
patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-213
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@800442 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 16:03:15 +00:00
b685882535
renames and cleanup for bootstrap-related code.
...
patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-213
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@800440 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 16:01:00 +00:00
2514d6dc64
fix spelling, indents from old SequenceFile code
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799951 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:31:33 +00:00
45514cf1be
remove AbstractWriter. all it was providing was append methods, which are inlined into SSTableWriter now; the rest was all wrappers. also, rename some variables in SST/SSTW.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799950 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:31:24 +00:00
d1f4234d26
r/m SequenceFile. ColumnGroupReader moved to SSTableSliceIterator mostly unchanged for now. (finish cleaning this up in #332 )
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799949 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:31:15 +00:00
28df101aaa
replace SF.next with code in NamesIterator that doesn't rewrite data through an extra layer of DataOutput/Input
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799948 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:31:08 +00:00
b2397a763e
SF shouldn't duplicate position checking that was already done by SSTable. move utility methods to IndexHelper. fix off-by-4 in dataSizeReturned.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799947 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:31:01 +00:00
4c2d91c213
r/m code in SF.next handling being called multiple times, since it can only be called once.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799946 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:30:55 +00:00
8203a6cfb2
r/m special case that no column names=all columns; add test for no-columns cases.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799945 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:30:49 +00:00
0f95411c03
r/m SF.next(DataOutput) in favor of more-efficient IteratingRow.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799944 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:30:40 +00:00
c31d44ae89
move next, getColumnGroupReader out of SSTableReader.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799943 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:30:23 +00:00
22dc26bb9d
make CommitLog use a raw BufferedRandomAccessFile instead of overloading AbstractWriter/IFileReader unnecessarily. the set of AW features used by both CommitLog and SSTable was nil.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799942 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:30:14 +00:00
da9778d509
unmix line endings in Table.java. patch by Jeff Hodges; reviewed by jbellis for CASSANDRA-333
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799743 13f79535-47bb-0310-9956-ffa450edef68
2009-07-31 20:42:54 +00:00
70ce402fdd
Make range queries continue on the next node when necessary.
...
Patch by Arin Sarkissian; reviewed by jbellis for CASSANDRA-212
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799684 13f79535-47bb-0310-9956-ffa450edef68
2009-07-31 18:29:52 +00:00
9164940f41
allow start of [] to mean "start with the largest value" when ascending=false. patch by Jun Rao; reviewed by jbellis for CASSANDRA-263
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799632 13f79535-47bb-0310-9956-ffa450edef68
2009-07-31 15:06:35 +00:00
066ef58a96
run source files through dos2unix to standardize on \n line endings. patch by Jeff Hodges; reviewed by Michael Greene for CASSANDRA-111
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799331 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 15:30:21 +00:00
edf2226079
add CompareSubcolumnsWith to describe_keyspace. patch by Evan Weaver; reviewed by Michael Greene for CASSANDRA-326
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799320 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 15:18:03 +00:00
5782d175a0
table -> keyspace in stress.py. patch by Michael Greene; reviewed by jbellis for CASSANDRA-271
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799313 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 15:11:43 +00:00
572b5f852d
table -> keyspace
...
patch by jbellis; reviewed by Michael Greene for CASSANDRA-271
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799140 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 00:29:28 +00:00
56a846ba1c
Pluggable replicaplacement, endpointsnitch classes (take 2). patch by Sammy Yu; reviewed by jbellis for CASSANDRA-323
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799065 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 20:39:01 +00:00
bd05521131
Revert "Pluggable replicaplacement, endpointsnitch classes." Breaks test suite.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799045 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 20:10:38 +00:00
51dbca6927
Pluggable replicaplacement, endpointsnitch classes. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-323
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799043 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 20:05:46 +00:00
bfb5006420
add isTraceEnabled checks similar to isDebugEnabled. patch by jbellis for CASSANDRA-174
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798980 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 17:05:47 +00:00
f856364274
add more if-isDebugEnabled lines to reduce overhead when logging at INFO or higher. patch by Michael Greene; reviewed by jbellis for CASSANDRA-174
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798979 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 17:00:18 +00:00
8588982b85
combine switchMemtable and enqueueFlush so that they always operate on the same object. move forceFlush guts from MT to CFS since it encapsulates better there
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-320
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798935 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 15:05:07 +00:00
ab6d4b9a64
pass consistency_level param from thrift to internals. patch by Gasol Wu; reviewed by jbellis for CASSANDRA-232
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798509 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 12:51:03 +00:00
acd50bd901
add ConsistencyLevel parameter to read ops. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-232
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798390 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 04:06:56 +00:00
574cb8f549
Use arrayblockingqueue in commitlog executor; this cleans up the code a bit (performance is unaffected since the writes and syncs are far more expensive than any queue ops)
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798373 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:46:11 +00:00
fbe6c4a854
add config options for commitlog syncing
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798372 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:46:27 +00:00
35ff447ba4
custom CommitLogExecutorService that can fsync per multiple CL additions
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798371 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:45:55 +00:00
88a30f182a
move log ops to callables on a threadpoolexecutor instead of synchronizing. this prepares the way to merge multiple add() calls into a single sync.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798370 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:45:50 +00:00
68bd9489b7
naive fsync-after-each-log-entry
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798369 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:46:02 +00:00
5e5d8385be
mv AbstractWriter to its own top-level class and remove redundant IFileWriter
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798368 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:45:40 +00:00
bf9caf8feb
handle incomplete CL entries on recover
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798367 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:45:33 +00:00
1332c0ed65
use CSLS instead of NBHS for memtablesPendingFlush. See explanation here: http://sourceforge.net/tracker/?func=detail&aid=2828100&group_id=194172&atid=948362
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-157
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798316 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 22:40:38 +00:00
d76bbca3e2
add ConsistencyLevel Thrift enum to avoid client having to compute quorum size. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-300
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798298 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 21:44:47 +00:00
e3aef8e0ed
fix bug in comparing-to-empty-array; realize that we need compare-to-empty-array to specify start/finish of slices.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-119
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798273 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 20:19:53 +00:00
38d81587ac
finish snapshot support. patch by Sammy Yu; reviewed by jbellis and Michael Greene for CASSANDRA-279
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798228 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 17:28:57 +00:00
67deae8e40
fix cli/thrift map key regression. patch by Gasol Wu; reviewed by jbellis for CASSANDRA-317
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798019 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 04:15:49 +00:00
227b270134
standardize more method and parameter names on underscores instead of camelcase. patch by Michael Greene; reviewed by jbellis for CASSANDRA-312
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@797674 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 22:32:21 +00:00
cf01ea1c49
Return standard/super designation to introspection and fix typo in DD. patch by Michael Greene; reviewed by jbellis for CASSANDRA-314
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@797209 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 20:11:57 +00:00
8d4b161f09
close temporary logWriters to avoid leaking FD. patch by Brandon Williams; reviewed by jbellis for CASSANDRA-313
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@797173 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 17:57:26 +00:00
058eef0806
return columns from desc query in desc order. patch by Jun Rao; reviewed by jbellis for CASSANDRA-196
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796881 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 21:13:35 +00:00
878991bb32
r/m unwanted logger.debug, pointed out by Michael Greene. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796559 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 22:08:34 +00:00
32d964ff54
better handling of file names with spaces on windows
...
- Quote path names in startup bat file
- Pass File object instead of URI when parsing storage-conf.xml
Patch by Michael Greene; reviewed by eevans for CASSANDRA-307
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796345 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 15:21:59 +00:00
b866f81415
add SubcolumnCompareWith option and subcolumnComparator code.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-304
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796132 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 03:01:55 +00:00
438f387705
add BytesType comparator (like AsciiType but doesn't require that the bytes mean anything)
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-304
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796131 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 03:01:42 +00:00
985d96a52c
rename DD.getType -> getComparator
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-304
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796130 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 03:01:35 +00:00
e425474af2
add get_slice for supercolumn, tests. add back updated TimeSortTest. we need to pass gcBefore to the filters so Slice can count correctly.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-303
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796129 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 02:58:20 +00:00
986cee6806
change String column names to byte[] to allow user-defined ordering.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796108 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 01:36:52 +00:00
8ff63a92ba
r/m time-sorted columns.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796107 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 01:36:10 +00:00
7435fc82c0
introduce column() compatibility layer to make writing tests a little less verbose.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796106 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 01:35:47 +00:00
bad8fb5fae
allow separate config of thrift bind address
...
This patch adds a new configuration directive 'ThriftAddress', an
analogue to ListenAddress for the thrift service.
If left unconfigured, the thrift service will fall back to the same
default as ListenAddress (i.e., InetAddress.getLocalHost). Unlike
ListenAddress, it is OK to set ThriftAddress to 0.0.0.0 which
will result in the service listening on all interfaces.
Patch by eevans; reviewed by Michael Greene for CASSANDRA-288
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@795205 13f79535-47bb-0310-9956-ffa450edef68
2009-07-17 19:45:22 +00:00
f04b9d3ed4
remove ganglia analytics package
...
Patch by eevans; reviewed by Michael Greene for CASSANDRA-297
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794876 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 21:40:59 +00:00
840a64dcb9
move data files into per-table subdirectories. patch by Arin Sarkissian; reviewed by Michael Greene and jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794784 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 19:10:06 +00:00
715b60d147
fix not including tombstone-only keys in keyRange.
...
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-286
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794475 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 00:39:01 +00:00
ff764ff22b
r/m offset from slice api; we could live with being inefficient but not with breaking read repair.
...
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-286
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794474 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 00:38:53 +00:00
0b1aeda97c
missed one: rename column.column_name -> column.name
...
patch by jbellis; reviewed by Evan Weaver and Sandeep Tata for CASSANDRA-139
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794431 13f79535-47bb-0310-9956-ffa450edef68
2009-07-15 22:04:57 +00:00
85ba194e7c
update system tests; fix get_column_count
...
patch by jbellis; reviewed by Evan Weaver and Sandeep Tata for CASSANDRA-139
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794430 13f79535-47bb-0310-9956-ffa450edef68
2009-07-15 22:04:51 +00:00
f2da00fb0f
thrift changes to remove : api.
...
use ColumnPath, ColumnParent, etc. structs to encapsulate optional SuperColumns (and occasionally, optional Columns).
patch by jbellis; reviewed by Evan Weaver and Sandeep Tata for CASSANDRA-139
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794429 13f79535-47bb-0310-9956-ffa450edef68
2009-07-15 22:04:43 +00:00
9c5274b4cd
rename confusing "random" magic number variables. patch by jbellis; reviewed by Michael Greene for CASSANDRA-74
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794079 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 21:46:43 +00:00
4b4459c0d1
r/m ZooKeeper vestiges. patch by Michael Greene; reviewed by jbellis for CASSANDRA-291
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793691 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 20:05:04 +00:00
dd4f4be2b4
add IdentityQueryFilter and finish removing IFilter.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793055 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:49:18 +00:00
7b6fb2b36c
add TimeQueryFilter; remove old TimeFilter.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793054 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:49:06 +00:00
48093358fb
replace namesfilter with NamesQueryFilter. mv filter code into separate package.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793053 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:49:01 +00:00
4d1395e0fa
refactor out QueryFilter, SliceQueryFilter.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793052 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:48:49 +00:00
7762e06571
rename lock_ -> sstableLock_.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793051 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:48:45 +00:00
f5a787af72
r/m unused (and dangerous) RowReadCommand.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793050 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:48:41 +00:00
0e4135933a
add PendingTasks attribute to NodeProbe cfstats output
...
Patch by Sammy Yu; reviewed by Arin Sarkissian for CASSANDRA-285
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792597 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 16:18:39 +00:00
8c04ffd52a
added CFS pending tasks JMX attribute
...
Patch by eevans; reviewed by Arin Sarkissian for CASSANDRA-173
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792343 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 22:49:08 +00:00
aaa6eee87d
expose CF write count/latency via JMX
...
Patch by Sammy Yu; reviewed by Eric Evans for CASSANDRA-272
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792161 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 14:24:25 +00:00
4e3a4404c9
spelling fixes. patch by Michael Greene; reviewed by jbellis for CASSANDRA-281
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792126 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 12:56:23 +00:00
2b18bade55
make get_key_range act on a single CF.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-280
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791961 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 19:57:37 +00:00
23fa1bc0bd
combine range version of get_slice into get_slice itself.
...
patch by jbellis; reviewed by Michael Greene for CASSANDRA-277
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791872 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 15:40:46 +00:00
e324ef9051
disallow specifying ColumnSort on supercolumns. patch by jbellis; reviewed by Evan Weaver for CASSANDRA-251
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791598 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 20:07:52 +00:00
b54de30a02
per-table key cache size.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-259
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791592 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 19:58:13 +00:00
d6c0b0f259
refactor sstable into SSTable, SSTableReader, and SSTableWriter.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-259
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791591 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 19:58:05 +00:00
013d59fc00
add concurrentlinkedhashmap cache and config option. config option is NOT yet wired up to control cache sizes.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-259
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791590 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 19:57:50 +00:00
26aefa2f4a
encapsulate bloom filter access into sstable.getPosition
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-259
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791589 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 19:57:44 +00:00
cdd8b17062
add offset support to get_slice. patch by Jun Rao; reviewed by jbellis for CASSANDRA-261
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791553 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 17:50:16 +00:00
0172497ad2
minor code cleanups. patch by Edward Ribeiro; reviewed by jbellis for CASSANDRA-273
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791059 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 05:55:09 +00:00
ca56a3eab3
more consistent checking of thrift parameters; fixes multiple bugs.
...
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-266
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@789979 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 22:06:56 +00:00
83b203e61e
add test catching buggy update of header on flush; refactor so there is only one version of code doing those writes (the correct one).
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-264
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@789465 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 22:07:49 +00:00
f2cab86892
don't remove commitlog files when replay fails; you lose the chance to fix a bug, as well as your data.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-264
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@789464 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 22:07:41 +00:00
0077af40fd
add isDebugEnabled check for logger.debug for performance. patch by goffinet; reviewed by jbellis for CASSANDRA-174
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788914 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 01:22:49 +00:00
af82ca7ae1
Enhance describeTable to return Map of Column Family so that it can be programatically parsed. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-258
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788895 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 22:37:42 +00:00
261340a342
r/m http server (use cli, nodeprobe, jmx as necessary instead).
...
patch by jbellis and Eric Evans for CASSANDRA-211
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788892 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 22:29:12 +00:00
fe2bd0103f
r/m refactor from CASSANDRA-249 that caused infinite recursion. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788781 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 17:38:22 +00:00
f55dd06ec5
avoid optimization of not checking older memtable and SSTables if we find _an_ answer early on; it causes bugs
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788776 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 17:26:36 +00:00
b9da215e06
some gms tests. patch by johano; reviewed by jbellis for CASSANDRA-249
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788771 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 17:22:40 +00:00
68564e1549
s/intepret/interpret/
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788770 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 17:22:30 +00:00
3a7a33ce0f
fix tombstone bug in get_columns_since.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-217
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788518 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 21:27:00 +00:00
adaff5f215
reformat. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788517 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 21:26:53 +00:00
6342512a34
CASSANDRA-217 rename get_slice_from to get_slice. implement get_slice_super in terms of SliceFrom too.
...
(time-based columns can continue to be sliced with get_columns_since)
patch by jbellis; reviewed by Eric Evans for CASSANDRA-217
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788516 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 21:26:33 +00:00
963a1b3bfd
add tests for supercolumnfamily removal; fix bugs.
...
(both the assert removal and the "if" removal are bug fixes.)
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-255
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788511 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 21:07:45 +00:00
27d66d8269
add asserts. patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-255
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788510 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 21:07:35 +00:00
4e7f8deac0
switch to passing a single filename to open an sstable for writing. this makes open-for-read and open-for-write consistent.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-254
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788473 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 19:14:07 +00:00
4283f0d879
add private constructor that doesn't init writers
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-254
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788472 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 19:13:59 +00:00
064a59cdb0
cleanup CFS.onstart
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-235
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788146 13f79535-47bb-0310-9956-ffa450edef68
2009-06-24 19:25:21 +00:00
b516ce8176
DBManager obscures rather than clarifies what is going on. Remove it.
...
At some point we stopped calling DBManager.instance(), so Table.onStart was
not getting called. Move that into CassandraDaemon so we don't rely on a side
effect to run it.
patch by jbellis; reviewed by Jun Rao for CASSANDRA-235
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788145 13f79535-47bb-0310-9956-ffa450edef68
2009-06-24 19:25:17 +00:00
81dd8ee5f6
use normal Table for system metadata
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-235
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788144 13f79535-47bb-0310-9956-ffa450edef68
2009-06-24 19:25:33 +00:00
682736ee5e
r/m recycle cf and undocumented/incomplete Loader code using it
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-235
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788143 13f79535-47bb-0310-9956-ffa450edef68
2009-06-24 19:25:04 +00:00
5cdc75d760
move Hints cf to SYSTEM_TABLE
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-235
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788142 13f79535-47bb-0310-9956-ffa450edef68
2009-06-24 19:24:56 +00:00
a89e782556
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787767 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:57:04 +00:00
f9a1343d92
make static methods of SSTable that take a filename and then use the cache to grab an sstable object, simple non-static methods instead
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-224
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787762 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:48:18 +00:00
2f322a8bd0
encapsulate sstable bloom filter
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-224
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787761 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:48:08 +00:00
2493c9a565
encapsulate sstable index
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-224
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787760 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:48:18 +00:00
a2f9b40183
refactor read-only constructor to SSTable.open
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-224
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787759 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:47:53 +00:00
d48d8fcbf7
r/m unused code dealing with sstables, and ConcurrentWriter / FastConcurrentWriter. mmap is not faster than write() for sequential I/O, which is what the vast majority of our writes are. mmap _does_ have an advantage when we seek back to the start of a commitlog segment to update the headers after memtable flush, but we do that infrequently enough that it's not worth the disadvantages (primarily, blowing up if we exceed the 4MB size).
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-224
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787758 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:47:45 +00:00
bf660bb97f
fix more null table parameters.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787408 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:18:18 +00:00
509cbb85de
remove table_ from CommitLog and add multitable tests.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787407 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:18:12 +00:00
5ccebd43c9
fix columnfamily id generation in the face of multiple tables and rip out TableMetadata serialization, which only complicates things needlessly.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787406 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:18:02 +00:00
cc373761dc
cleanup of table.open.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787405 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:17:58 +00:00
3673e28186
multitable support.
...
fix CF table dependencies, making CommitLogTest pass. Also fixes CASSANDRA-188 in passing.
fix tablename being null bugs by always parsing tablename from filename.
fix last part of SequenceFile.
patch by jbellis; reviewed by goffinet for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787404 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:17:46 +00:00
9aeef94db8
Pass and write table parameter as needed throughout the codebase to add multitable support.
...
(Many places cheated and just assumed that tables.get(0) was the only table.)
Patch builds but does not yet pass tests.
Patch by goffinet; reviewed by jbellis for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787403 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:17:59 +00:00
1a66c10695
more CommitLog cleanup. patch by jbellis; reviewed by Jun Rao for CASSANDRA-243
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787284 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 15:49:57 +00:00
38f6446d08
rename "end" parameter to "finish" to avoid conflict w/ ruby keyword. patch by Stu Hood; reviewed by jbellis for CASSANDRA-247
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787258 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 14:46:27 +00:00
b6645156bc
replace new Foo(...) with Foo.valueOf. patch by Edward Ribeiro; reviewed by jbellis for CASSANDRA-246
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787249 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 14:38:19 +00:00
1a23f9934f
r/m new String() redundancy. patch by Edward Ribeiro; reviewed by jbellis for CASSANDRA-244
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786888 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 19:22:28 +00:00
d9e69b4024
switch from byte[] to BitSet in CommitLogHeader. patch by jbellis; reviewed by goffinet for CASSANDRA-237
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786245 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 20:22:18 +00:00
5b99a22032
update comments, perform some renames, r/m unused code.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-237
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786244 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 20:22:14 +00:00
a0c2b2a380
add CommitLog and RecoveryManager tests. patch by jbellis; reviewed by goffinet for CASSANDRA-237
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786243 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 20:22:10 +00:00
15955bf03e
minor cleanup of Row code. patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-199
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786242 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 20:17:29 +00:00
03f6f244a3
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786176 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 17:30:04 +00:00
a116ef72e8
rethrow IOException with more details. patch by jbellis; reviewed by Jun Rao for CASSANDRA-202
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786025 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 11:46:39 +00:00
c1545f5214
fix off-by-one error in Range.contains(Token): the endpoint (right) of the range is always supposed to be exclusive, but it was inclusive in the non-wrapping case. patch by Stu Hood; reviewed by jbellis for CASSANDRA-236
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@785697 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 16:08:39 +00:00
01adb7a1aa
add nodeprobe cli tool. patch by Eric Evans; reviewed by jbellis for CASSANDRA-211
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@785178 13f79535-47bb-0310-9956-ffa450edef68
2009-06-16 12:38:30 +00:00
b356537196
r/m CM and CRAF. patch by jbellis; reviewed by Stu Hood for CASSANDRA-230
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@784842 13f79535-47bb-0310-9956-ffa450edef68
2009-06-15 16:20:04 +00:00
24fcbf4a95
switch singleton implementation from double-checked-locking to synchronized (code is not performance-sensitive). patch by Edward Ribeiro; reviewed by jbellis for CASSANDRA-228
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@784780 13f79535-47bb-0310-9956-ffa450edef68
2009-06-15 13:42:30 +00:00
6a2da22975
r/m unused Constants.java. patch by jbellis; reviewed by Edward Ribeiro for CASSANDRA-227
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@784495 13f79535-47bb-0310-9956-ffa450edef68
2009-06-14 01:14:34 +00:00
cd2139ee7c
system.exit on oome. patch by jbellis; reviewed by Eric Evans for CASSANDRA-218
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@783388 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 15:12:18 +00:00
72e6eea9e4
split sstable into data, index, and bloom filter files. this allows us to avoid saving up index chunks
...
in memory until the sstable data is completely written, while still allowing fast scanning of the index
on startup. it also simplifies the sstable/sequencefile code considerably.
patch by jbellis; reviewed by Jun Rao for CASSANDRA-208
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@783077 13f79535-47bb-0310-9956-ffa450edef68
2009-06-09 17:46:42 +00:00
f685f4dec8
expose compaction via JMX. patch by Eric Evans; reviewed by jbellis for CASSANDRA-211
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782774 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 20:37:38 +00:00
b244a2e645
rename Table.doGC to forceCleanup. patch by Eric Evans; reviewed by jbellis for CASSANDRA-211
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782773 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 20:37:31 +00:00
d342288f36
cleanup SSTable-related code. patch by jbellis; reviewed by Jun Rao for CASSANDRA-208
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782744 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 19:45:00 +00:00
f6d0154e23
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782740 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 19:37:57 +00:00
8f9e6a4516
To make available the Cassandra specific information available on the
...
node detail page:
- Exposed the existing StorageService.getLoadInfo()
- Created StorageService.getCurrentGenerationNumber() and added to
MBean interface.
patch by Eric Evans; reviewed by jbellis for CASSANDRA-211
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782629 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 13:59:52 +00:00
7520b4356b
add getRangeToEndPointMap to JMX. Requires making Token and Range Serializable. Patch by Eric Evans; reviewed by jbellis for CASSANDRA-211
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782182 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 02:45:20 +00:00
a087b97c96
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782117 13f79535-47bb-0310-9956-ffa450edef68
2009-06-05 19:52:29 +00:00
76a8f7b551
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782096 13f79535-47bb-0310-9956-ffa450edef68
2009-06-05 18:40:06 +00:00
04dcee09ba
r/m Row.getColumnFamilyMap. replaced with Row.getColumnFamily or .getColumnFamilies as appropriate.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-198
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779773 13f79535-47bb-0310-9956-ffa450edef68
2009-05-28 21:15:24 +00:00
f116a3e4e5
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779771 13f79535-47bb-0310-9956-ffa450edef68
2009-05-28 21:10:07 +00:00
edacc67c26
remove unnecessary List creation in getSliceFrom and move close() cleanup for to the finally block. patch by Jun Rao; reviewed by jbellis for CASSANDRA-201
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779322 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 21:41:04 +00:00
7acfcb0e45
r/m shutdown code (making Cassandra crash-only, which it has been de facto for a while).
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-115
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779290 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 19:59:33 +00:00
bb0d6dfa20
allow specifying a subset of columnfamilies to check for get_key_range.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-152
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779261 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 18:04:56 +00:00
97c022f5ee
short circuits sending a message if the mutation's destination is the local node. does not implement hint handling; takes the full message route if hints are involved. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-132
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@778871 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 20:23:16 +00:00
56b499044b
use cloneMeShallow where appropriate. patch by jbellis for CASSANDRA-79
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@777583 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 15:37:19 +00:00
4ac9118f7c
Add get_slice_from functionality using column indexes for efficiency.
...
Patch by Jun Rao and jbellis for CASSANDRA-172
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@777578 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 15:33:42 +00:00
a432e18077
more cleanup of compaction code.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-184
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@776720 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 14:58:39 +00:00
d03d80b6ed
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@776716 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 14:44:41 +00:00
0ae07f299e
add block_for parameter to insert calls. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-154
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@776365 13f79535-47bb-0310-9956-ffa450edef68
2009-05-19 15:51:10 +00:00
88edbed30c
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775983 13f79535-47bb-0310-9956-ffa450edef68
2009-05-18 15:22:23 +00:00
d52a110974
check for enough endpoints before starting a quorum wait.
...
patch by jbellis; reviewed by Jun Rao and Sandeep Tata for CASSANDRA-180
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775361 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 21:37:45 +00:00
784d968db9
omitted to add Sandeep's SBRRC.java in last commit
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775321 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 20:41:05 +00:00
20f7d032c7
add get_slice_by_name_range command. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-53
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775308 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 20:18:55 +00:00
324c3c32a1
allow specifying initial token. patch by Jun Rao; reviewed by jbellis for CASSANDRA-181
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775203 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 15:55:35 +00:00
3d7203266a
replace executor with locking. the interaction between the executor service terminating and the CFS
...
was inherently unsafe -- you would have to lock anyway to make it safe, the atomic reference wasn't
enough, so at that point you might as well get rid of the executor.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774567 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 22:31:49 +00:00
735008dafc
more log cleanup. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774424 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 16:47:14 +00:00
bd3c6acf33
misc cleanup. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774166 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 02:19:34 +00:00
f86d47c242
to avoid adding work to terminating executor (which will raise an exception) we need to check for threshold violated _first_, and move puts to the new memtable once flush has started. patch by jbellis; reviewed by Eric Evans for CASSANDRA-165
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774165 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 02:17:23 +00:00
3aca0737cb
another workaround for register/select wonkiness. patch by jbellis; tested by Mark Robson for CASSANDRA-156
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774076 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 20:46:36 +00:00
da441aed29
cleanup ssTable filename tracking. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774025 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 19:11:31 +00:00
b460bd71c5
test to more reliably reproduce CME during range. fix by locking out compact during range query.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-161
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774024 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 19:11:27 +00:00
5886b7c9ac
fix race condition in compaction -- it was possible for a read thread to "snapshot" ssTables_, then have
...
the compactor thread delete those (after merging them into a new file) before the read thread checked
them. Since the read thread's "snapshot" doesn't include the new merged sstable, it incorrectly tells
the caller that the key does not exist.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-161
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774023 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 19:11:21 +00:00
41ee512d6f
fix race condition between when memtable is replaced as the active one and when it's added to
...
the set of historical (pending flush) memtables.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-161
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774022 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 19:11:15 +00:00
2fd856de35
unregister mbean on flush. patch by daishi; reviewed by jbellis for CASSANDRA-157
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774002 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 17:56:31 +00:00
5964cd4c04
extract tests that could conflict with each other to a separate test class (= gets own jvm)
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-162
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773941 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 15:26:52 +00:00
ad2cd9a9ba
more cleanup, mostly by reducing nesting level where possible. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773729 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 23:52:17 +00:00
dd1f0972bb
reformat. this is just whitespace changes, automated by the IDE. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773728 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 23:52:10 +00:00
fe3e1a8a09
check for at-end-of-data in iterator init. patch by jbellis; reviewed by Jun Rao for CASSANDRA-153
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773727 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 23:48:34 +00:00
dfa41ec103
cannonicalize all accesses to indexMetadataMap.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-153
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773726 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 23:48:28 +00:00
69bc7e97c8
unit test to expose bug system test is running into. patch by jbellis; reviewed by Jun Rao for CASSANDRA-153
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773725 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 23:48:20 +00:00
761e953afa
clean up compaction code and refactor to allow user-specified threadhold (minimum number of CFs to compact). patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773573 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 14:26:16 +00:00
44a0a3a54d
fix CME during range queries -- keyset call needs to go on the memtable exector.
...
patch by jbellis; tested by Tv for CASSANDRA-153
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773152 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 01:40:16 +00:00
61a8150420
fix iteration bug. it would always return hasNext=false if seekTo was called first. fixing this with maybeInit proved difficult, so init is now done in constructor and iterator itself is created lazily.
...
patch by jbellis; tested by nk11 for CASSANDRA-153
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773017 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:54:27 +00:00
f2260f107b
add more robust sanity checking of get_column arguments. patch by jbellis; reviewed by Jun Rao for CASSANDRA-151
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773016 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:53:25 +00:00
750d0a16b0
more logging cleanout. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772790 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 22:09:13 +00:00
85c7c39ad1
avoid creating empty sstables on recovery flush. (a) empty sstables are still work for the compactor later, and (b) sstable.close errors out when it's empty. patch by jbellis.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772773 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 21:09:51 +00:00
ccfe2d7c9e
make TSD threadsafe; note that BSD is not (since FailureDetector does its own locking). patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772765 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 20:33:55 +00:00
c129b6d5d7
clean up read/write path more; include message id in logging so we can trace what
...
happens to an individual op. patch by jbellis.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772713 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 17:13:05 +00:00
fb347bd3d1
fix CF.digest NPE. patch by jbellis; reviewed by Eric Evans for CASSANDRA-149
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772690 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 16:03:32 +00:00
3395efdb30
use explicit dirty flag instead of trying to cheat and use executor taskcount, which is race-prone. patch by jbellis; reviewed by Eric Evans for CASSANDRA-134
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772680 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 15:30:53 +00:00
4a2ba89fe3
r/m orphaned Leader code. patch by jbellis; reviewed by Eric Evans for CASSANDRA-143
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772455 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 22:40:16 +00:00
c3f0d10a8e
clean up more ad-hoc timing message and move to mbeans. add TimedStatsDeque to
...
simplify tracking load stats over a one-minute window.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-144
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772448 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 22:27:02 +00:00
65f66e982d
force flush when there are pending ops on the memtable executor even when none have finished yet. this fixes test case intermittent failures. patch by jbellis; reviewed by Eric Evans for CASSANDRA-141
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772361 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 17:04:32 +00:00
3ed4e051b8
add pending tasks mbean to all DebuggableTPE. clean out ad-hoc queue length logging.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-135
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772030 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 02:27:54 +00:00
8042a4e441
allow periodic flushing on a per-CF basis for infrequently-updated CFs (i.e.,
...
unlikely to reach the memtable size or object count limits often). this will allow
purging old commitlog segments in a more timely fashion.
patch by Jun Rao; reviewed by jbellis for CASSANDRA-134
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772026 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 01:55:51 +00:00
28e548a31c
initialize configFileName_. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-129
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772020 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 00:35:33 +00:00
362f287c84
refactor IColumn.addColumn to remove redundant name parameter. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-96
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772000 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 22:47:22 +00:00
8dcf76ab27
tombstones take priority over non-tombstones w/ the same timestamp in supercolumn and column. this makes HH management deterministic.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-34
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771935 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 17:03:25 +00:00
f17487c541
A make hint generation include a real timestamp so we can do meaningful deletes
...
B call removeDeleted on the data we read locally to purge tombstones
C because of (B) any supercolumn w/o subcolumns simply won't exist so we know we can skip re-deleting the endpoint data. so deleteKey becomes deleteHintedData.
D because deleted data is not immediately purged, increased the scheduled interval from 20min to 60 to reduce the load of scanning the hint CF.
patch by Jun Rao and jbellis for CASSANDRA-34
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771934 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 17:03:15 +00:00
017b576fba
cleanup and refactor HintedHandOffManager.
...
patch by jbellis and Jun Rao for CASSANDRA-34
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771933 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 17:03:04 +00:00
7779df6ce4
This patch adds ColumnFamilyStore.forceflush to the mbean so that it can be activated through the management agent. patch by Eric Evans; reviewed by jbellis for CASSANDRA-34
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771927 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 16:56:55 +00:00
fce0ee0d7b
This changeset abstracts the logic for placing a flush on the queue into a new method, Memtable.enqueueFlush. enqueueFlush is called from both forceflush and put (when a threshold is exceeded), without the need to apply a special flushKey. patch by Eric Evans; reviewed by jbellis for CASSANDRA-34
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771926 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 16:56:40 +00:00
494de44355
move more gossip log messages to trace and de-obfuscate some variable and method names.
...
patch by jbellis.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771878 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 16:11:07 +00:00
b2e2b1c116
use `block` flag instead of separate _blocking methods. throw exception on error instead of returning bool for success. patch by jbellis; reviewed by Eric Evans for CASSANDRA-131
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771761 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 14:54:05 +00:00
7b2589ddb0
add logging for httpconnection to troubleshoot #133 . patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771591 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 06:57:16 +00:00
62ed2cbc16
user-friendly error when partitioner is missing. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771465 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 22:03:52 +00:00
219293b2b3
clean up logging. move some of it into MBeans. patch by jbellis; reviewed by Eric Evans for CASSANDRA-130
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771412 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 19:26:23 +00:00
49211d5e92
change Message body to byte[]. this reveals where there are problems: everything that is using any of the send messages already needs to be doing that or they're broken. the good ones I just unwrap; the broken ones I fixed except for MoveMessage which doesn't even have a byte[] serializer yet, so I left that one broken. writeResponseResolver is the specific case that caused the bug report.
...
patch by jbellis; reviewed by nk11 for CASSANDRA-120
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771402 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 19:02:23 +00:00
e044410ccd
r/m DataImporter; it's not useful outside of FB
...
patch by jbellis; reviewed by nk11 for CASSANDRA-120
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771401 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 19:02:05 +00:00
bcf4dcc666
refactor HttpConnection to use its own executor instead of abusing MessagingService. This will let us refactor Message body to a byte[].
...
patch by jbellis; reviewed by nk11 for CASSANDRA-120
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771400 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 19:02:01 +00:00
3bc3e4c335
add constructor to DTPE for most commonly used values (single thread, no timeout, LinkedBlockingQueue)
...
patch by jbellis; reviewed by nk11 for CASSANDRA-120
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771399 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 19:01:56 +00:00
3a4a0595da
use getTempFileName / closeRename to avoid problems w/ half-written sstables.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-78
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771340 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 15:59:16 +00:00
f70a5a0c8c
clean up anticompaction code a little.
...
patch by jbellis; reveiewed by Eric Evans for CASSANDRA-78
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771339 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 15:59:12 +00:00
bbe89e795b
do not leave variables uninitialized in ConsistencyManager constructor. fixes regression from #95 . patch by jbellis for CASSANDRA-124
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771325 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 14:59:51 +00:00
93abe8d3e5
make sendMessage only return true after ack by recipient.
...
patch by Jun Rao; reviewed by jbellis for CASSANDRA-34
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771019 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 03:26:07 +00:00
e4e5629b13
make out-of-the-box config 1GB-friendly. patch by jbellis; reviewed by Eric Evans for CASSANDRA-118
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770811 13f79535-47bb-0310-9956-ffa450edef68
2009-05-01 20:14:35 +00:00
22525a8e12
make CassandraServer constructor public
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770688 13f79535-47bb-0310-9956-ffa450edef68
2009-05-01 14:13:11 +00:00
4a5620dea2
avoid raising an exception in SequenceFile.next when a key does not exist (e.g. when bloom filter gives a false positive). patch by Jun Rao; reviewed by jbellis for CASSANDRA-126
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770517 13f79535-47bb-0310-9956-ffa450edef68
2009-05-01 02:24:10 +00:00
ebcbeb5af9
close FileStructs after range query. patch by jbellis; reviewed by Jun Rao for CASSANDRA-71
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770424 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 20:01:31 +00:00
ec291721dd
add string de/serialize code to TokenFactory for ApplicationState's benefit.
...
patch by jbellis; tested by nk11 and MarkR42 for CASSANDRA-114
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770307 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 16:09:38 +00:00
71739ef76a
move src/ to src/java/. patch by johano; reviewed by jbellis for CASSANDRA-112
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@769886 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 19:18:48 +00:00
Jonathan Ellis