Jonathan Ellis
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
Jonathan Ellis
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
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
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
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
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
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
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
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
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
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
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
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
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
Jonathan Ellis
6ba824e430
add null check to TimeFilter for consistency
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759208 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:34:15 +00:00
Jonathan Ellis
dbf05001b6
make local copy of NamesFilter names; modifying caller's List is buggy
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759206 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:33:25 +00:00
Jonathan Ellis
5ef45143b8
rename createColumn overloads to addColumn to make clear that they are all ultimately doing the same thing
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759205 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:33:17 +00:00
Jonathan Ellis
2f8268cd09
rename serializer2 -> serializerWithIndexers
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759204 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:33:02 +00:00
Jonathan Ellis
7f8f72e25b
r/m redundant name from addColumn(name, IColumn)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759203 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:32:14 +00:00
Jonathan Ellis
574f8b563d
rename getColumnFamilies -> getColumnFamilyMap. Add public Collection<ColumnFamily> getColumnFamilies
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759201 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:31:41 +00:00
Avinash Lakshman
0b6c661e42
Part of the multiget() operation.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759194 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:17:32 +00:00
Avinash Lakshman
d3e63d19aa
Forgot to add this as part of the multiget().
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759189 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:08:53 +00:00
Avinash Lakshman
bd884e4d98
Final changes made to fix a checkin anomaly.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759033 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 06:45:19 +00:00
Avinash Lakshman
1cc4294d34
Basic implementation of multiget() functionality. Fix to how read-repair is done in the ConsistencyManager.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759028 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 05:41:59 +00:00
Avinash Lakshman
52062900ca
Some methods added to aggregate the results from multigets.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759027 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 05:40:42 +00:00
Avinash Lakshman
964dd9bb57
This is a wierd revert to fix some issues. Some changes will need to be re-applied.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759026 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 05:39:40 +00:00
Avinash Lakshman
f5d1a1289c
Changes in here to enable multiget() support.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759025 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 05:34:11 +00:00
Avinash Lakshman
f98301a68d
Added some comments in the code.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759024 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 05:33:45 +00:00
Avinash Lakshman
d19877f286
Re-checking them in to fix some stuff.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759022 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 05:21:26 +00:00
Avinash Lakshman
2b27a9fade
The paritioning related stuff checked in again.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759021 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 05:20:50 +00:00
Jonathan Ellis
2249a6a745
log exceptions trapped by FT's
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759005 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:45:21 +00:00
Jonathan Ellis
1866e3802b
allow user-specified Partitioners
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759004 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:45:18 +00:00
Jonathan Ellis
76f3302753
add error checking of CF names for people migrating old-style configurations
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759003 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:45:12 +00:00
Jonathan Ellis
09bc045e26
add check for OPP
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759002 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:45:02 +00:00
Jonathan Ellis
4c194aa8d1
range query support
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759001 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:44:57 +00:00
Jonathan Ellis
bf684eea95
clean up FileStruct and make it iterable. (this will be used by range queries.)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759000 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:44:49 +00:00
Jonathan Ellis
dd61d5119d
migrate from BigInteger to abstract Token, with BigIntegerToken and StringToken subclasses controlled by Random and OrderPreserving partitioners, respectively
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758999 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:44:44 +00:00
Jonathan Ellis
8ce795a0a9
r/m unused code dealing with Ranges and tokens
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758998 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:44:28 +00:00
Jonathan Ellis
20e081f290
consolidates 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) or only with client keys (everyone else). as part of this, I've merged some overloaded methods with substantially duplicated code to simplify auditing these changes.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758997 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:44:20 +00:00
Jonathan Ellis
ad1cc13f56
r/m unused BigInteger imports (so i can track the rest down)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758996 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:44:10 +00:00
Jonathan Ellis
4cff66a0ee
r/m unused code dealing with hashes
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758995 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:44:05 +00:00
Jonathan Ellis
2aa0bba0d5
add defaultuncaughtexceptionhandler that logs runtime errors
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758994 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:43:57 +00:00
Jonathan Ellis
41598bfead
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@758993 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:43:53 +00:00
Jonathan Ellis
a996c8214b
test support. this requires some refactoring so that tests can be independent
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758992 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:43:46 +00:00
Jonathan Ellis
66dee7aaab
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@758983 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:20:08 +00:00
Jonathan Ellis
c5b1b8ba21
clean up getLocalCopy
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758982 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:20:00 +00:00
Jonathan Ellis
ce8a73f2be
cleanup unused code
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758981 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:19:56 +00:00
Jonathan Ellis
a9c09a8592
set normal gossip messages to level `trace`
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758980 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:19:51 +00:00
Jonathan Ellis
07c2d3c29d
expose concrete serializer
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758979 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:19:45 +00:00
Jonathan Ellis
22c5262720
use isSuper
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758978 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:19:40 +00:00
Jonathan Ellis
def1edd1fe
send back response so blocking calls can work
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758977 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:19:35 +00:00
Jonathan Ellis
8f56a96a69
rename WriteResponseMessage -> WriteResponse (it has no relationship to Message class)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758976 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:19:30 +00:00
Jonathan Ellis
abc75388a3
fix crash when comparing supercolumns (since they cannot be sorted by time)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758975 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:19:24 +00:00
Jonathan Ellis
b6ae87ba00
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@758974 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:19:19 +00:00
Jonathan Ellis
ce55957935
add getColumnFamilyNames. r/m merge() [duplicate of repair]
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758973 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:19:10 +00:00
Jonathan Ellis
fe825730bf
change Object[] to Object... so passing a single one is easier
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758972 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:19:06 +00:00
Jonathan Ellis
39d3f833f9
add SuperColumn support to forceFlush. split out recovery flushing into flushOnRecovery.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758971 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:19:01 +00:00
Jonathan Ellis
e9e08ff6b5
add null check to TimeFilter for consistency
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758970 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:18:54 +00:00
Jonathan Ellis
0ac10a7e3f
make local copy of NamesFilter names; modifying caller's List is buggy
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758969 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:18:50 +00:00
Jonathan Ellis
76bc3cc838
rename createColumn overloads to addColumn to make clear that they are all ultimately doing the same thing
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758968 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:18:39 +00:00
Jonathan Ellis
f4f3ca50d8
rename serializer2 -> serializerWithIndexers
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758967 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:18:34 +00:00
Jonathan Ellis
c08117f4cd
r/m redundant name from addColumn(name, IColumn)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758966 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:18:28 +00:00
Jonathan Ellis
f25041afdd
rename getColumnFamilies -> getColumnFamilyMap. Add public Collection<ColumnFamily> getColumnFamilies
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758965 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:18:20 +00:00
Avinash Lakshman
af47dc8476
Fix the problem in CASSANDRA-9 JIRA
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758143 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 05:25:23 +00:00
Prashant Malik
c25dae0a2f
new thrift file changes
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758048 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 22:09:21 +00:00
Avinash Lakshman
74dcfb263c
Fix for CASSANDRA-9 JIRA.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758044 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 21:55:31 +00:00
Avinash Lakshman
5506a44d0a
Applied the patch for returning a valid Column Sort type.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@757232 13f79535-47bb-0310-9956-ffa450edef68
2009-03-22 18:46:02 +00:00
Avinash Lakshman
01b415a15d
Removed reference to unused class.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@756758 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 21:04:02 +00:00
Avinash Lakshman
0237abc765
Removed some unnecessary functions from this file.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@756736 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 19:50:59 +00:00
Avinash Lakshman
da5c6b8fc6
Removed JDK7 dependencies.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@756732 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 19:49:37 +00:00
Avinash Lakshman
ff2cf35aff
Removed the dependencies for JDK7.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@756731 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 19:49:11 +00:00
Avinash Lakshman
5bea7e1772
Removed references to JDK7 specific things.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@756725 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 19:44:16 +00:00
Avinash Lakshman
283f3a0875
Removed references to JDK7 specific classes.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@756666 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 17:27:03 +00:00
Avinash Lakshman
16f30f1674
Fixed some bugs that resulted from moving sources over.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@756155 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 19:48:21 +00:00
Avinash Lakshman
e90036f6e1
Needed to make these changes to fix an issue with reads w/o column indexes.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@755485 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 06:10:48 +00:00
Prashant Malik
cf56f8f3ac
Add build script and make sure it works
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@749477 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 23:34:21 +00:00
Prashant Malik
1f91e99223
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@749218 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 07:57:22 +00:00