natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,119 Commits 17 Branches 338 Tags 650 MiB
Commit Graph

32119 Commits

Author SHA1 Message Date
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
Jonathan Ellis a3b0c9d0ee r/m entire build dir on clean as suggested in #19 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759336 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 20:41:42 +00:00
Jonathan Ellis 63b5310b6b patch from Jun Rao make Thrift port configureable. Also add sample to config/. fixes #10 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759299 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 18:39:49 +00:00
Jonathan Ellis f4b2a3fc20 move test output & classes to build/test. fixes #18 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759296 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 18:21:55 +00:00
Jonathan Ellis 49e55f3ef0 apply patch from Jun Rao fixing issue #17 (improve the start-server and stop-server script) 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759295 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 18:17:21 +00:00
Jonathan Ellis 7888174d2c comment out broken tests 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759271 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 17:06:29 +00:00
Jonathan Ellis 7e648c89a0 test support. this requires some refactoring so that tests can be independent 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759270 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 17:06:18 +00:00
Jonathan Ellis 7a6f4210c0 start over w/ tests 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759269 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 17:05:21 +00:00
Jonathan Ellis ecfe313d50 finish remove support. Split CFS.resolve() into resolve(), which combines ColumnFamilies, and removeDeleted(), which takes a single ColumnFamily and returns a new one with deleted IColumns removed. Keep deletion information around until removeDeleted is called so that deletion information can properly supress older IColumns. 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759223 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:39:17 +00:00
Jonathan Ellis fe708caa69 clean up getLocalCopy 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759222 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:39:00 +00:00
Jonathan Ellis d20023172e cleanup unused code 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759221 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:38:50 +00:00
Jonathan Ellis c58588945c set normal gossip messages to level `trace` 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759220 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:38:42 +00:00
Jonathan Ellis 340cdf4670 expose concrete serializer 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759219 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:38:34 +00:00
Jonathan Ellis c139871286 use isSuper 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759218 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:38:09 +00:00
Jonathan Ellis 21c1d6b9c7 send back response so blocking calls can work 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759216 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:37:17 +00:00
Jonathan Ellis 2ee9f9e44a rename WriteResponseMessage -> WriteResponse (it has no relationship to Message class) 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759215 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:37:00 +00:00
Jonathan Ellis 9049d5919d fix crash when comparing supercolumns (since they cannot be sorted by time) 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759214 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:36:36 +00:00
Jonathan Ellis 3a6cbb128c add deletion marker support to Column (boolean isMarkedForDelete), SuperColumn, and ColumnFamily (change boolean isMarkedForDelete to long markedForDeleteAt). Column is also made immutable to avoid confusion as to how to handle merging different versions of Columns (you don't, you replace the old one with the new). This also makes concurrency bugs impossible, which remove will rely on. Removed old broken remove/delete support in prepartion for working new code. 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759213 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:36:31 +00:00
Jonathan Ellis 4945acd35a add getColumnFamilyNames. r/m merge() [duplicate of repair] 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759212 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:36:05 +00:00
Jonathan Ellis 4cb9bf678f change Object[] to Object... so passing a single one is easier 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759210 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:35:49 +00:00
Jonathan Ellis 66871216ce add SuperColumn support to forceFlush. split out recovery flushing into flushOnRecovery. 
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759209 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-27 16:35:33 +00:00