Commit Graph

339 Commits

Author SHA1 Message Date
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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 19064bb869 apply patch from johano fixing #30 (creates javadoc build target)
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760440 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 13:25:54 +00:00
Jonathan Ellis 0eef9edf1a apply patch from johano fixing #31
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760437 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 13:25:05 +00:00
Jonathan Ellis 6931092e51 clean up patch and test from Sandeep Tata fixing #21
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760006 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 15:24:40 +00:00
Jonathan Ellis 69eee12505 r/m unused code dealing with Ranges and tokens
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760005 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 15:24:23 +00:00
Jonathan Ellis fd95061db0 fix bad merge
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759773 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 20:01:53 +00:00
Jonathan Ellis f3f2be01d3 glean test dirs to cleanup from configuration
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759771 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 19:57:46 +00:00
Jonathan Ellis d24be7d5e7 log exceptions trapped by FT's
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759739 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 18:18:35 +00:00
Jonathan Ellis d85921934a r/m unused BigInteger imports (so i can track the rest down)
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759737 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 18:18:30 +00:00
Jonathan Ellis 983f2cf56c r/m unused code dealing with hashes
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759736 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 18:18:22 +00:00
Jonathan Ellis cbcfb44bbe add defaultuncaughtexceptionhandler that logs runtime errors
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759735 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 18:18:13 +00:00
Jonathan Ellis 9fad316df6 move row mutation factory code into RowMutation; change RM.add(name, cf) to RM.add(cf)
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759734 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 18:18:08 +00:00