Jonathan Ellis
e4f579f717
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@979335 13f79535-47bb-0310-9956-ffa450edef68
2010-07-26 16:04:06 +00:00
Jonathan Ellis
4fb3d18641
r/m bitmask predicates. patch by jbellis; reviewed by gdusbabek for CASSANDRA-1312
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@979139 13f79535-47bb-0310-9956-ffa450edef68
2010-07-26 03:00:08 +00:00
Jonathan Ellis
16a1951ec8
run gen-thrift-java to update thrift Constants.java
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@967193 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 18:34:27 +00:00
Jonathan Ellis
e45966fbd7
rename 'table' to 'keyspace' in thrift CfDef class.
...
patch by Stu Hood and Jon Hermes; reviewed by jbellis for CASSANDRA-1287
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@967192 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 18:33:24 +00:00
Jonathan Ellis
395c3caa0c
make GCGraceSeconds configurable per-columnfamily. patch by Jon Hermes; reviewed by jbellis for CASSANDRA-1276
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@967187 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 18:18:07 +00:00
Gary Dusbabek
d25c336656
avro schema changes for thrift parity. add cfid to cfdef. patch by stuhood, reviewed by gdusbabek. CASSANDRA-1186
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@966276 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 15:13:14 +00:00
Gary Dusbabek
3e3c9d27f0
break out avro generation. patch by stuhood, reviewed by gdusbabek. CASSANDRA-1186
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@966273 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 15:13:49 +00:00
Jonathan Ellis
d849c697a5
upgrade to latest thrift. patch by Nate McCall; reviewed by jbellis for CASSANDRA-1266
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@963928 13f79535-47bb-0310-9956-ffa450edef68
2010-07-14 02:47:03 +00:00
Jonathan Ellis
078c56c631
add single-node support for IndexType.KEYS. patch by jbellis; reviewed by mdennis for CASSANDRA-1154
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@961795 13f79535-47bb-0310-9956-ffa450edef68
2010-07-08 15:17:20 +00:00
Jonathan Ellis
972812c700
switch IndexType to enum. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@960925 13f79535-47bb-0310-9956-ffa450edef68
2010-07-06 15:54:49 +00:00
Jonathan Ellis
9249a6c3bc
add column metadata for validation and (soon) indexing. patch by mdennis and jbellis for CASSANDRA-1153
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@960123 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 22:11:04 +00:00
Eric Evans
ad838b00a5
bring avro up to date w/ CfDef.read_repair_chance
...
And, use CFMetaData defaults in place of those in CassandraServer.
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@955827 13f79535-47bb-0310-9956-ffa450edef68
2010-06-18 03:41:25 +00:00
Jonathan Ellis
bd7a052ae6
bump thrift VERSION for read_repair_chance change. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@955822 13f79535-47bb-0310-9956-ffa450edef68
2010-06-18 03:22:11 +00:00
Eric Evans
86af3709ea
avro multget_slice() + functional tests
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@955759 13f79535-47bb-0310-9956-ffa450edef68
2010-06-17 21:57:50 +00:00
Eric Evans
e24a9aad46
get_count() for avro + system tests
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@955717 13f79535-47bb-0310-9956-ffa450edef68
2010-06-17 19:59:29 +00:00
Eric Evans
9e63ce251a
get_slice() implementation for avro + system tests
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@955675 13f79535-47bb-0310-9956-ffa450edef68
2010-06-17 17:14:25 +00:00
Eric Evans
2e36c660b0
make cassandra.genavro the canonical proto schema
...
cassandra.avpr has been removed from version control is now generated
from cassandra.genavro by ant. Future changes to the protocol schema
should take place in cassandra.genavro; do not hand-edit the .avpr
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@955358 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 19:38:34 +00:00
Eric Evans
059e5f166b
working batch_mutate() for avro server w/ tests
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@955286 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 16:16:25 +00:00
Eric Evans
4b4762e30b
added remove() implementation to avro-based server
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@955050 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 20:57:22 +00:00
Eric Evans
bfd9ce9b39
remove deprecated (and non-working) batch_insert()
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@955049 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 20:57:16 +00:00
Gary Dusbabek
78efa02458
add read_repair_chance to CfDef. Patch by gdusbabek, reviewed by jbellis. CASSANDRA-1180
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@954917 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 14:50:49 +00:00
Gary Dusbabek
38b4b1dcf1
remove keyspace args from some system calls. patch by Matthew Dennis, reviewed by Gary Dusbabek. CASSANDRA-1168
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@952657 13f79535-47bb-0310-9956-ffa450edef68
2010-06-08 14:17:08 +00:00
Johan Oskarsson
7860b138e3
Add support for reconciler classes that decide how to resolve conflicting columns. Patch by Kelvin Kakugawa and johan, review by jbellis. CASSANDRA-1144
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@950099 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 15:03:48 +00:00
Jonathan Ellis
7b845a0cd2
add license headers to generated Thrift files. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@950072 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 13:43:05 +00:00
Eric Evans
3dd229c167
CASSANDRA-798 match genavro to json schema
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@949301 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28 21:27:51 +00:00
Gary Dusbabek
7cd412bba1
merges from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@949268 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28 19:26:53 +00:00
Jonathan Ellis
cba59a81e6
add Clock structure as a prelude to full vector clock support. patch by Sylvain Lebresne and Kelvin Kakugawa for CASSANDRA-1070; reviewed by johano and jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948316 13f79535-47bb-0310-9956-ffa450edef68
2010-05-26 04:45:44 +00:00
Johan Oskarsson
0658589892
Hadoop input format now uses the specified column family to figure out the number of splits instead of the whole keyspace. Patch by johan, review by jbellis. CASSANDRA-1050
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947953 13f79535-47bb-0310-9956-ffa450edef68
2010-05-25 07:40:47 +00:00
Jonathan Ellis
00cf048905
document DatacenterShardStrategy. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947889 13f79535-47bb-0310-9956-ffa450edef68
2010-05-25 01:17:27 +00:00
Jonathan Ellis
00bc8da0f3
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947887 13f79535-47bb-0310-9956-ffa450edef68
2010-05-25 01:10:24 +00:00
Gary Dusbabek
261885ea2a
modify system_* methods to return UUID. patch by gdusbabek, reviewed by jbellis. CASSANDRA-1075
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@946718 13f79535-47bb-0310-9956-ffa450edef68
2010-05-20 17:13:30 +00:00
Gary Dusbabek
ea9dbc8a18
service call to check for schema agreement. patch by gdusbabek, reviewed by jbellis. CASSANDRA-1075
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@946717 13f79535-47bb-0310-9956-ffa450edef68
2010-05-20 17:13:17 +00:00
Eric Evans
31297cb736
renamed get_api_version to describe_version (avro)
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@945846 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 19:44:44 +00:00
Eric Evans
42c84ccfe1
avro implementation of describe_cluster_name()
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@945845 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 19:44:37 +00:00
Jonathan Ellis
df95549498
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@945329 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 19:39:22 +00:00
Eric Evans
124047102e
describe_keyspaces() for avro
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@944044 13f79535-47bb-0310-9956-ffa450edef68
2010-05-13 22:58:58 +00:00
Eric Evans
0701c58690
updated genavro schema
...
Patch eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@943310 13f79535-47bb-0310-9956-ffa450edef68
2010-05-11 21:49:36 +00:00
Eric Evans
7d61634d12
remove useless (and confusing) use of "default"
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@943309 13f79535-47bb-0310-9956-ffa450edef68
2010-05-11 21:49:32 +00:00
Eric Evans
cb347ed50f
avro-based system_add_keyspace()
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@943190 13f79535-47bb-0310-9956-ffa450edef68
2010-05-11 17:20:51 +00:00
Eric Evans
90862ff5c8
bring insert() up to date w/ thrift in trunk
...
* no more keyspace arg
* key is byte[]
* ColumnParent+Column instead of ColumnPath+value
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@943189 13f79535-47bb-0310-9956-ffa450edef68
2010-05-11 17:20:44 +00:00
Eric Evans
45ecc390e5
bring avro get() up to date w/ changes in trunk
...
* refactoring of private methods in light of multiget() removal in trunk
* update get() for keyspace argument remove
* update get() for change to byte[] keys
* added ttl attribute to column schema
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@943188 13f79535-47bb-0310-9956-ffa450edef68
2010-05-11 17:20:37 +00:00
Eric Evans
b540d6962a
set_keyspace() impl (setup for keyspace arg removal)
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@943187 13f79535-47bb-0310-9956-ffa450edef68
2010-05-11 17:20:30 +00:00
Jonathan Ellis
8a3543a1ed
implement truncate. patch by jbellis and Ran Tavory for CASSANDRA-531
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@942817 13f79535-47bb-0310-9956-ffa450edef68
2010-05-10 16:37:28 +00:00
Jonathan Ellis
ff59b8ebda
r/m deprecated batch_insert, get_range_slice methods
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-1065
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@942191 13f79535-47bb-0310-9956-ffa450edef68
2010-05-07 19:45:31 +00:00
Eric Evans
e649d0f4d5
separate assignment of current keyspace from login()
...
This changeset is based on Todd Blose's patch, with some changes:
* Fixed some style nits, (braches on newlines, etc)
* Reinstated debug log statement in CassandraServer.login()
* Reinstated css_.debug test when printing stacktrace in the CLI
* Removed unused _login() function from system tests
* Updated contrib/utils/service/CassandraServiceTest for login() change
* Disabled system_add_keyspace() when authentication is enabled (login()
requires a keyspace).
* Reset access level (force a new login) when keyspace is changed using
set_keyspace().
Patch by Todd Blose and eevans for CASSANDRA-1022
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@940127 13f79535-47bb-0310-9956-ffa450edef68
2010-05-02 00:06:31 +00:00
Jonathan Ellis
87b1b0d52f
r/m multiget
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-739
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@938696 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 22:12:27 +00:00
Eric Evans
cb3455f30e
rm keyspace argument from thrift methods
...
This is Todd Blose's patch (CASSANDRA-714.patch.new) from 4/15, rebased
by me to trunk. Any errors introduced are mine and mine alone.
Patch by eevans and Todd Blose for CASSANDRA-714
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@938170 13f79535-47bb-0310-9956-ffa450edef68
2010-04-26 18:18:54 +00:00
Jonathan Ellis
71c51f11dd
add row cache preload option
...
patch by Vijay Parthasarathy and jbellis for CASSANDRA-946
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@937591 13f79535-47bb-0310-9956-ffa450edef68
2010-04-24 04:30:48 +00:00
Jonathan Ellis
034619317a
r/m now-unused snitch_class from KsDef thrift struct. patch by jbellis for CASSANDRA-986
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@936495 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 20:39:28 +00:00
Gary Dusbabek
bc83a65a61
get_count requires SlicePredicate. adds multi_get_count. Patch by Sylvain Lebresne, reviewed by Gary Dusbabek. CASSANDRA-744
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@935946 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 14:51:57 +00:00