a332fad07d
add instrumentation for memtable attributes
...
The current Memtable class implements an MBean interface, but it is not
wired up. Most likely, this is because it would become defunct after
the first flush when the memtable is switched out for a new one.
The solution is to instrument ColumnFamilyStore and expose the memtable
attributes from there.
patch by Eric Evans; reviewed by jbellis for #75
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@764840 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 15:47:51 +00:00
732695503b
fix compaction regression. patch by jbellis; reviewed by Todd Lipcon and Jun Rao
...
for #80 .
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@764679 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 05:12:44 +00:00
a1ef3b5be5
add compaction test showing regression. patch by jbellis; reviewed by Todd Lipcon
...
and Jun Rao for #80 .
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@764678 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 05:12:42 +00:00
50c1987265
fix getCompactionBuckets -- something is broken in NonBlockingHashMap when removing and re-adding the same collection mid-iteration; it ends up with multiple references to that collection. going back to ConcurrentHashMap fixes the problem. (any additional overhead from CHM is negligible here.) patch by jbellis; reviewed by Eric Evans for #57
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@764004 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 19:08:27 +00:00
a7d5c6506b
Remove unused method CF.merge and add more tests to ColumnFamilyTest. patch by Sandeep Tata; review by jbellis for #69
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@763859 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 02:34:17 +00:00
768d2d1493
Clean up FileStruct API and fix key decoration bug in anticompaction. patch by jbellis; reviewed by Jun Rao for #67
...
Also fix calls to isKeyInRanges in anticompaction.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@763820 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 21:40:49 +00:00
db2fdd8740
sanity check configuration before starting. patch by jbellis; reviewed by Eric Evans for #6
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@763387 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 20:49:37 +00:00
f0f5ec427c
don't manually create commitlog directory; cassandra will do it automatically. also put commitlog under cassandra/ with other server artifacts. patch by jbellis; reviewed by Eric Evans for #6
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@763386 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 20:49:33 +00:00
b3d4f4a93d
add log4j.properties for testing; output is to build/test/logs/system.log. patch by jbellis; reviewed by Jun Rao for #64
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762913 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 19:17:54 +00:00
40fa7d4a66
consolidate partition behavior in IPartitioner, so creating a new partitioner should be only a matter of implementing that interface. all the external switch statements on PartitionerType have been folded into that.
...
SSTable is now the only part of the code that cares about the distinction between a 'raw' key and a 'decorated' key. variables in that class have been named clientKey or decoratedKey to show which is which. others don't care either because they only deal with decorated keys (SequenceFile, FileStruct) or only with client keys (everyone else).
patch by jbellis; reviewed by Jun Rao for #58
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762848 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 16:55:30 +00:00
21f4bd568b
add sleep to ColumnFamilyStoreTest to workaround waitForFlush bug. see #59
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762547 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 22:43:50 +00:00
9e027cef72
enable line numbers in test stack traces. patch by johano; reviewed by jbellis for #60
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762508 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 21:23:11 +00:00
29f5255169
add cobertura support ('ant codecoverage -Dcobertura.dir=/path/to/cobertura'). patch by johano; reviewed by jbellis for #55
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762442 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 18:00:43 +00:00
85c9bda653
r/m redundant or unused code. patch by jbellis; reviewed by johano for #56
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762441 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 17:56:01 +00:00
d1e78cbf84
replace .indexOf != -1 with .contains. patch by jbellis; reviewed by johano for #56
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762440 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 17:55:52 +00:00
fc72d43058
merge #54
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762439 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 17:55:44 +00:00
9452cad277
combine overloads of SSTable.next; inline getData. patch by jbellis; reviewed by Jun Rau. see #52
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762383 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 15:10:38 +00:00
e6b830c3be
combine next / getData overloads. patch by jbellis; reviewed by Jun Rau. see #52
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762382 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 15:10:34 +00:00
1068ee7b0c
merge common parts of next(timeRange) and next(columnNames). patch by jbellis; reviewed by Jun Rau. see #52
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762381 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 15:10:30 +00:00
49d75c4303
emphasize that when getting a time-based slice only the CF name is used. patch by jbellis; reviewed by Jun Rau. see #52
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762380 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 15:10:26 +00:00
27013dad79
semantics of TimeFilter (include all columns newer than some timestamp) mean we should use Long.MAX_VALUE as upper range, not current ms. patch by jbellis; reviewed by Jun Rau. see #52
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762379 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 15:10:22 +00:00
28cf5d7330
refactor SF.next(String key, DataOutputBuffer bufOut, String cf, Coordinate section) to call its overload to reduce code duplication. this will make auditing the partitioner changes easier. patch by jbellis; reviewed by Jun Rau. see #52
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762378 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 15:10:19 +00:00
960b9164e6
r/m no-op seeks. patch by jbellis; reviewed by Jun Rau. see #52
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762377 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 15:10:15 +00:00
eec2f8aa03
reformat code (mostly whitespace changes) to keep subsequent patches clean. patch by jbellis; reviewed by Jun Rau. see #52
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762376 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 15:10:12 +00:00
9cdc839ee8
write get_columns_since test to exercise sequenceFile.next(timeRange). patch by jbellis; reviewed by Jun Rau. see #52
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762375 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 15:10:07 +00:00
b61cbd37e8
add antlr-3.1.3 (should have been in r761805
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761820 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 22:18:39 +00:00
b9bc065e3d
upgrade to latest antlr; expunge 2.x. patch by Per Mellqvist, reviewed by jbellis. see #46
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761805 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 21:27:40 +00:00
238758b32a
expunge ConcurrentHashMap in favor of NonBlockingHashMap. patch by jbellis, review by johano. see #50
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761804 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 21:27:34 +00:00
64b69c41b6
add svn:ignore from #25 . suggested by johano, reviewed by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761730 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 16:53:09 +00:00
9017f33e7f
upgrade NBHM to latest version (1.1.1) from sf.net
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761714 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 15:57:58 +00:00
cfb3115f09
simplify 4 if's into 1
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761452 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 22:29:14 +00:00
58fce86d31
use ConcurrentHashMap to simplify ugly loop (normal HashMap you cannot delete from during iteration)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761451 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 22:29:09 +00:00
d800e20940
don't re-run antlr unless the grammar changed. patch by Per Mellqvist
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761427 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 21:07:40 +00:00
7a24b51296
replace getLocalHostName with getHostName. localHostName caused problems when it was not equal to hostName by making endpoints that should be equal, not.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761426 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 21:07:37 +00:00
de2673759a
rename stageOrderedCompaction -> getCompactionBuckets. clean up code to make the algorithm more clear, and to allow grouping with more than just the previous bucket. add getCompactionBucketsTest
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761423 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 20:48:02 +00:00
8ef8b192dd
r/m unused constructors. Use concurrent containers because while get is iterating over columns (EBM is used as the column container by CF) the memtable can continue to modify SuperColumns.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761413 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 20:14:49 +00:00
6fc6e048a3
put returns previous value, so separate get is redundant
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761412 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 20:14:46 +00:00
c386d36a69
pass engine options to the constructor
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761411 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 20:14:43 +00:00
8632f05518
r/m generated files from svn and modify build.xml to build them. added back required jars for generation (antlr 2.7.7 and stringtemplate). patch by Per Mellqvist for #40
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761384 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 19:17:04 +00:00
a5b14b7219
jsvc actually wants the method to be named init, not load (contrary to what their docs state in at least one place)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761346 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 17:07:54 +00:00
b054cf0245
fix package name. patch by Per Mellqvist for #42
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761100 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 22:52:13 +00:00
332f2c8427
Previously I only fixed the deletion marker reading of one of the 3 copies of the next() method. This fixes the other two.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761093 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 22:23:58 +00:00
7a4b0f7423
Adds possibility to use IP-address when invoking "connect" from the command line client. patch by Per Mellqvist for #41
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761059 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 21:02:59 +00:00
41943de4a9
fix thrift port sample back to 9160
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760968 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 17:21:14 +00:00
4a6f633ec2
r/m unused config setting mapOutputDirectories
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760967 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 17:21:10 +00:00
d2929c38c7
2nd missing file from r760679
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760771 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 02:24:46 +00:00
7c0d21f49e
missing file from r760679
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760693 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 22:28:48 +00:00
ce5e583b4b
Move startup code into CassandraDaemon. Drop stdout and stderr. Add hooks for jsvc, which allows more thorough daemonization (such as dropping priviledges and setting process name). New startup script bin/casssandra provides out-of-the-box background mode without hacks like screen or nohup; -f flag restores old foreground mode. Also -p <filename> to log pid. Patch by Eric Evans for #20
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760679 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 22:17:20 +00:00
cd6f16e809
more thorough ColumnFamilyStoreTest, trying to reproduce a report that deletion markers are being deserialized incorrectly
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760665 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 21:36:59 +00:00
e7ef989821
create test dirs and separate test config xml. patch from johano. fixes #22
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760464 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 14:41:55 +00:00
Jonathan Ellis