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
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
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
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
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
6c189f73d7
comment out broken tests
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@759014 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 03:34:34 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
c72b9e85b6
start/stop, log4j.properties
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758964 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:18:11 +00:00
ce8f72e4af
remove unused libraries; update log4j to 1.2.15; add commons-collections
...
and commons-lang; wildcard lib/ in build.xml
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758963 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:18:04 +00:00
03862ea54e
more columnfamilies for testing. set defaults that will work on a single node out of the box.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758957 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 01:44:27 +00:00
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
82f5b6072a
New thrift file added
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758050 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 22:09:59 +00:00
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
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
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
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
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
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