Commit Graph

330 Commits

Author SHA1 Message Date
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
Jonathan Ellis a5fa451c2b avoid treating ttl <= 0 the same as ttl not specified
patch by jbellis; reviewed by Sylvain Lebresne for CASSANDRA-1003

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@935709 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 19:09:06 +00:00
Jonathan Ellis 16ba403a0f Add ExpiringColumn and Column ttl.
patch by Sylvain Lebresne; reviewed by jbellis for CASSANDRA-699

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@935088 13f79535-47bb-0310-9956-ffa450edef68
2010-04-16 22:04:46 +00:00
Gary Dusbabek f3a4e1736b convert thrift to byte keys. Patch by Stu Hood, reviewed by Gary Dusbabek. CASSANDRA-767
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@934155 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 19:53:23 +00:00
Eric Evans fe34d59766 CASSANDRA-965 remove deprecated methods, update dependent code
* removed method defs and regenerated thrift code
 * removed CassandraServer implementations
 * updated cassandra-cli to call new (describe_*) methods
 * updated RingCache to use describe_ring()
 * removed "show config file" from cli (no thrift access for this anymore).
 * updated release notes.

Patch by eevans for CASSANDRA-965

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@932072 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 19:27:25 +00:00
Gary Dusbabek 201b7599b2 thrift changes. Patch by Gary Dusbabek, reviewed by Jonthan Ellis. CASSANDRA-827
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@931201 13f79535-47bb-0310-9956-ffa450edef68
2010-04-06 16:02:10 +00:00
Eric Evans ef749086b0 genavro schema file (not to be used until AVRO-494)
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@930904 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 17:01:34 +00:00
Eric Evans 8e5dba1851 batch_mutate() rpc implementation
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@930903 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 17:01:29 +00:00
Eric Evans cb0415d424 ColumnParent schema and record factory method
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@930902 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 17:01:20 +00:00
Eric Evans 45cad8ca3e avro protocol schema changes for batch_mutate()
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@930901 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 17:01:15 +00:00
Eric Evans 8fb1d3b042 updated api version string for CASSANDRA-900
Patch by eevans for CASSANDRA-900

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@927099 13f79535-47bb-0310-9956-ffa450edef68
2010-03-24 16:02:37 +00:00
Eric Evans 059b0066cd access levels for Thrift authorization
Patch by Ted Zlatanov and eevans for CASSANDRA-900

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@926388 13f79535-47bb-0310-9956-ffa450edef68
2010-03-22 23:11:16 +00:00
Eric Evans 1f9dd393f1 regenerated thrift code to include new enum
Patch by eevans and Ted Zlatanov for CASSANDRA-900

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@926386 13f79535-47bb-0310-9956-ffa450edef68
2010-03-22 23:11:12 +00:00
Jonathan Ellis 405524ee6d merge from 0.6
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@925428 13f79535-47bb-0310-9956-ffa450edef68
2010-03-19 21:22:37 +00:00
Jonathan Ellis fe50b493c5 merge from 0.6
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@924885 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 16:28:00 +00:00
Jonathan Ellis 7d2115bf8b add optional bitmask matching to SliceRange. patch by Ted Zlatanov; reviewed by jbellis for CASSANDRA-764
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@918844 13f79535-47bb-0310-9956-ffa450edef68
2010-03-04 03:42:05 +00:00
Jonathan Ellis 2b69c401cb merge from 0.6
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@917685 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 20:02:34 +00:00
Eric Evans b43c78520e merged to 0.6 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@915430 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 16:58:58 +00:00
Johan Oskarsson 713710b5fe Merge with 0.6 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@915376 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 15:17:42 +00:00
Jonathan Ellis 43b86fe61f sub splits
patch by jbellis; reviewed by Stu Hood for CASSANDRA-342

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@909631 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 22:02:44 +00:00
Jonathan Ellis 2c6948cb0a expose token-based range queries to thrift
patch by jbellis; reviewed by Stu Hood for CASSANDRA-775

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@909617 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 21:42:03 +00:00
Jonathan Ellis 424742134d r/m gen-py, committed accidentally
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907710 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 16:02:07 +00:00
Jonathan Ellis c325fcab72 expose describe_ methods replacing the get_*_property ones. add TokenRange struct for describe_ring.
patch by jbellis; reviewed by Stu Hood for CASSANDRA-736

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907705 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 15:57:45 +00:00
Eric Evans f91c7d318d reorganize thrift code generation to match avro
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904545 13f79535-47bb-0310-9956-ffa450edef68
2010-01-29 16:24:19 +00:00
Eric Evans 1cd17032ea avro rpc schema and code generation
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904542 13f79535-47bb-0310-9956-ffa450edef68
2010-01-29 16:23:54 +00:00
Eric Evans 542bd7904d refactor thrift-specific code ...server -> ...thrift
This was mostly an IDE-driven effort.

Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904540 13f79535-47bb-0310-9956-ffa450edef68
2010-01-29 16:24:28 +00:00
Jonathan Ellis 3bf9c81577 update CHANGELOG, NEWS, and thrift version string. patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904536 13f79535-47bb-0310-9956-ffa450edef68
2010-01-29 16:01:59 +00:00
Gary Dusbabek 0a06292663 Add ConsistencyLevel.ANY for writes. Patch by Gary Dusbabek, reviewed by Jonathan Ellis. CASSANDRA-687
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@902140 13f79535-47bb-0310-9956-ffa450edef68
2010-01-22 16:04:10 +00:00
Jonathan Ellis 5c7f127a27 update CHANGES for trunk
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@901243 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 15:44:18 +00:00
Gary Dusbabek ea2eded3b8 remove get_key_rang. Patch by Gary Dusbabek, reviewed by Jonathan Ellis. CASSANDRA-710
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@901207 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 13:57:49 +00:00
Eric Evans 2f0e62c1a8 authentication and authorization functions
Patch by Ted Zlatanov; reviewed by eevans for CASSANDRA-547

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@900644 13f79535-47bb-0310-9956-ffa450edef68
2010-01-19 02:10:41 +00:00
Eric Evans 3a5b425446 update interface def for new API versioning policy
Patch by eevans; reviewed by jbellis for CASSANDRA-686

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@898006 13f79535-47bb-0310-9956-ffa450edef68
2010-01-11 19:04:29 +00:00
Jonathan Ellis e40894eff1 merge from 0.5 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@896292 13f79535-47bb-0310-9956-ffa450edef68
2010-01-06 00:50:31 +00:00
Eric Evans 04d5ec33b2 regenerate code against thrift r894924
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@896207 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 20:33:44 +00:00
Jonathan Ellis 6e5e284f32 merge from 0.5 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@893836 13f79535-47bb-0310-9956-ffa450edef68
2009-12-25 03:03:07 +00:00
Jonathan Ellis beba91e885 add batch_mutate command. patch by Jeff Hodges; reviewed by jbellis for CASSANDRA-336
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@892382 13f79535-47bb-0310-9956-ffa450edef68
2009-12-18 21:53:27 +00:00
Jonathan Ellis b4cae03720 merge from 0.5 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@889499 13f79535-47bb-0310-9956-ffa450edef68
2009-12-11 04:12:48 +00:00
Eric Evans 4e8691ab1a regenerate thrift code to realize new docstrings
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@888619 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 22:59:52 +00:00
Eric Evans f1a06074cd add documentation to thrift interface
Patch by Gary Dusbabek; reviewed by eevans for CASSANDRA-324

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@888617 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 22:59:20 +00:00
Jonathan Ellis 52dfd5e905 set thrift VERSION to 0.5-beta1
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@882345 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 22:56:49 +00:00
Jonathan Ellis 46a809eef9 expose TimedOutException distinct from UnavailableException
patch by jbellis; reviewed by gdusbabek for CASSANDRA-563

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@882248 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 19:03:47 +00:00
Jonathan Ellis fc518cbb6a add primitive get_range_slice. inefficient, but better than get_key_range + get_slices.
patch by gdusbabek; reviewed by jbellis for CASSANDRA-344

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@881998 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 23:27:14 +00:00
Jonathan Ellis aa0b3d182a merge from 0.4
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830303 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 19:21:29 +00:00
Jonathan Ellis d2c2365a78 add dcquorum/dcquorumsync consistency levels, representing "a quorum of the replicas in the current dc" and "a quorum of the replicas in each dc," respectively.
patch by Vijay Parthasarathy; reviewed by jbellis for CASSANDRA-492

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@829819 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 15:00:20 +00:00
Jonathan Ellis 3f87f59a6c add thrift version string.
patch by jbellis; reviewed by Michael Greene for CASSANDRA-412

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@816386 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 21:15:49 +00:00
Jonathan Ellis dd1688cf85 merge from 0.4 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@814973 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 02:54:02 +00:00
Jonathan Ellis 53895adf95 merge from 0.4 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810997 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 15:33:46 +00:00
Jonathan Ellis 64c38a2657 inline BatchMutation into batch_insert params
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-403

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809793 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 01:52:03 +00:00
Jonathan Ellis bbd170187b organize api methods by type (retrieval or modification). patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809718 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 19:48:24 +00:00
Jonathan Ellis 526af55263 edit comment describing get_string methods. patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809704 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 19:25:26 +00:00
Jonathan Ellis fa1d99ac96 add forwards-compatible ConsistencyLevel parameter to get_key_range. Currently it is a no-op. patch by Chris Goffinet; reviewed by jbellis for CASSANDRA-322
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809639 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 15:50:58 +00:00
Jonathan Ellis ac921c44d3 add "required" to non-optional fields. Thrift sucks.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-308

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808989 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 19:02:46 +00:00
Jonathan Ellis 59ec4109e4 bump thrift version to 808609 to fix regression from THRIFT-562. patch by jbellis for CASSANDRA-387
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808620 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 20:47:21 +00:00
Jonathan Ellis 40641c73a6 remove multiget_count until/unless there is a demonstrated need for it. patch by jbellis for CASSANDRA-70
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808597 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 20:11:49 +00:00
Jonathan Ellis 6690c51359 Update AsyncResult to know when it started waiting so you can get() multiple Results in serial but have them wait in parallel. Use this to implement multiget methods. Remove unused MultiAsyncResult code and StorageProxy methods using it.
Patch by Chris Goffinet; reviewed by jbellis for CASSANDRA-70

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808589 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 20:07:12 +00:00
Jonathan Ellis 0f56a25553 update to thrift trunk and rename jar after the svn revision (806014). inline our map typedef to work around regression introduced in THRIFT-144. add slf4j dependencies (required since THRIFT-558). regenerate thrift structs with new version.
patch by jbellis for CASSANDRA-308, CASSANDRA-387

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808559 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 18:11:58 +00:00
Jonathan Ellis 0fc2d87e2b combine batch_insert and batch_insert_super the way we did get_slice and get_slice_super
patch by jbellis.  reviewed by Chris Goffinet and Evan Weaver for CASSANDRA-388

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808045 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 15:11:27 +00:00
Jonathan Ellis 1aeca2b625 add license headers to new-since-0.3 files.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-365

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@804294 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 16:52:55 +00:00
Eric Evans cd66ac8326 CASSANDRA-361 cleanup left-over references to Cql
Patch by Michael Greene (+ regeneration of thrift code); reviewed
by eevans for CASSANDRA-361

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@803355 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 02:59:55 +00:00
Jonathan Ellis 6b7a1c300f switch "!isAscending" for "reversed."
patch by jbellis, Carl Bystrom, and Bill de hOra. reviewed by Eric Evans for CASSANDRA-311

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802953 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 23:17:08 +00:00
Eric Evans 8455ebfe87 CASSANDRA-296 remove CQL
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802911 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 19:35:01 +00:00
Jonathan Ellis 15354b4906 Combine thrift slice methods. Now we have one get() method, one get_slice(), and one get_count().
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-329

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802640 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 02:51:35 +00:00
Jonathan Ellis 5ed5464e31 add Ruby namespace. patch by Evan Weaver; reviewed by Michael Koziarski and Scott Chacon for CASSANDRA-327
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802639 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 02:49:33 +00:00
Jonathan Ellis 572b5f852d table -> keyspace
patch by jbellis; reviewed by Michael Greene for CASSANDRA-271

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799140 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 00:29:28 +00:00
Jonathan Ellis acd50bd901 add ConsistencyLevel parameter to read ops. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-232
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798390 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 04:06:56 +00:00
Jonathan Ellis d76bbca3e2 add ConsistencyLevel Thrift enum to avoid client having to compute quorum size. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-300
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798298 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 21:44:47 +00:00
Jonathan Ellis 227b270134 standardize more method and parameter names on underscores instead of camelcase. patch by Michael Greene; reviewed by jbellis for CASSANDRA-312
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@797674 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 22:32:21 +00:00
Eric Evans efc9b60686 add perl namespace to thrift interface
Patch by Anthony Molinaro; reviewed by eevans for CASSANDRA-310

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796403 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 17:40:35 +00:00
Jonathan Ellis 986cee6806 change String column names to byte[] to allow user-defined ordering.
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796108 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 01:36:52 +00:00
Jonathan Ellis 8ff63a92ba r/m time-sorted columns.
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796107 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 01:36:10 +00:00
Jonathan Ellis ff764ff22b r/m offset from slice api; we could live with being inefficient but not with breaking read repair.
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-286

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794474 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 00:38:53 +00:00
Jonathan Ellis 0b1aeda97c missed one: rename column.column_name -> column.name
patch by jbellis; reviewed by Evan Weaver and Sandeep Tata for CASSANDRA-139

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794431 13f79535-47bb-0310-9956-ffa450edef68
2009-07-15 22:04:57 +00:00
Jonathan Ellis f2da00fb0f thrift changes to remove : api.
use ColumnPath, ColumnParent, etc. structs to encapsulate optional SuperColumns (and occasionally, optional Columns).
patch by jbellis; reviewed by Evan Weaver and Sandeep Tata for CASSANDRA-139

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794429 13f79535-47bb-0310-9956-ffa450edef68
2009-07-15 22:04:43 +00:00
Jonathan Ellis 1f09fbae03 merge from 0.3 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792200 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 15:59:30 +00:00
Jonathan Ellis 2b18bade55 make get_key_range act on a single CF.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-280

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791961 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 19:57:37 +00:00
Jonathan Ellis 23fa1bc0bd combine range version of get_slice into get_slice itself.
patch by jbellis; reviewed by Michael Greene for CASSANDRA-277

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791872 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 15:40:46 +00:00
Jonathan Ellis cdd8b17062 add offset support to get_slice. patch by Jun Rao; reviewed by jbellis for CASSANDRA-261
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791553 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 17:50:16 +00:00
Jonathan Ellis ef203cf000 default all count args to 100. patch by jbellis for CASSANDRA-262
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791058 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 05:45:49 +00:00
Jonathan Ellis af82ca7ae1 Enhance describeTable to return Map of Column Family so that it can be programatically parsed. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-258
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788895 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 22:37:42 +00:00
Jonathan Ellis 6342512a34 CASSANDRA-217 rename get_slice_from to get_slice. implement get_slice_super in terms of SliceFrom too.
(time-based columns can continue to be sliced with get_columns_since)

patch by jbellis; reviewed by Eric Evans for CASSANDRA-217

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788516 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 21:26:33 +00:00
Jonathan Ellis 38f6446d08 rename "end" parameter to "finish" to avoid conflict w/ ruby keyword. patch by Stu Hood; reviewed by jbellis for CASSANDRA-247
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787258 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 14:46:27 +00:00
Jonathan Ellis f6d0154e23 merge from 0.3 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782740 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 19:37:57 +00:00
Jonathan Ellis a087b97c96 merge from 0.3 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782117 13f79535-47bb-0310-9956-ffa450edef68
2009-06-05 19:52:29 +00:00
Jonathan Ellis d800250cbc merge from 0.3 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@780687 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 15:36:59 +00:00
Jonathan Ellis bb0d6dfa20 allow specifying a subset of columnfamilies to check for get_key_range.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-152

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779261 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 18:04:56 +00:00
Jonathan Ellis 4ac9118f7c Add get_slice_from functionality using column indexes for efficiency.
Patch by Jun Rao and jbellis for CASSANDRA-172

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@777578 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 15:33:42 +00:00
Jonathan Ellis 0ae07f299e add block_for parameter to insert calls. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-154
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@776365 13f79535-47bb-0310-9956-ffa450edef68
2009-05-19 15:51:10 +00:00
Jonathan Ellis 20f7d032c7 add get_slice_by_name_range command. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-53
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775308 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 20:18:55 +00:00
Jonathan Ellis b2e2b1c116 use `block` flag instead of separate _blocking methods. throw exception on error instead of returning bool for success. patch by jbellis; reviewed by Eric Evans for CASSANDRA-131
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771761 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 14:54:05 +00:00
Jonathan Ellis 090013252d move py and php to `cassandra` namespace. add csharp as Apache.Cassandra. patch by jbellis for CASSANDRA-121
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770434 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 20:26:51 +00:00
Jonathan Ellis 9db8da81b7 Add range query support, which requires using an OrderPreservingPartitioner. (Keys are returned in the order defined by the partitioner collation.) The fundamental approach (in table.getKeyRange) is simple: create a CollatedIterator that will return unique keys from different sources, each of which is already sorted. Then we just need Iterators for different key sources. For SSTables, this means adding seekTo and an Iterator interface to FileStruct. For Memtable, this means adding a DestructivePQIterator since unlike SSTable keys those are not inherently ordered already. This means that we only do M log N work sorting the memtable keys where M is the number of keys we actually read, and N is the total number of keys, where a naive sort-everything-first iterator would be N log N.
This does not yet implement range queries spanning multiple nodes.

patch by jbellis; reviewed by Jun Rao for CASSANDRA-71

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@769874 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 18:57:35 +00:00
Jonathan Ellis 6b5e9404c5 upgrade to latest THRIFT-378 patch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@769166 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 21:14:04 +00:00
Jonathan Ellis 551a1a0840 move thrift-generated code to interface/gen-java. patch by johano; reviewed by jbellis for CASSANDRA-103
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@768589 13f79535-47bb-0310-9956-ffa450edef68
2009-04-25 19:30:13 +00:00
Jonathan Ellis ef293c1a6a return empty lists instead of raising an error where applicable; otherwise, use
NotFoundError instead of CassandraException.  rely on THRIFT-378 to report internal errors.
also, add field numbers to work around thrift bug generating python code.
patch by jbellis; reviewed by Jun Rao for #66

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@768382 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 17:52:25 +00:00
Jonathan Ellis 7b250fa261 move CF checking into CassandraServer. begin to expose InvalidRequestException. r/m unused "del" cfmaps from batch methods.
patch by jbellis; reviewed by Jun Rao for #66

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@768381 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 17:52:07 +00:00
Jonathan Ellis 8eacd24443 change column_t value to binary from string. patch by johano; reviewed by jbellis for #29
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@766136 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 20:08:49 +00:00
Jonathan Ellis 39de2d0d33 expose redone remove to thrift. patch by jbellis; reviewed by Jun Rao for #83
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765680 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 16:23:20 +00:00
Prashant Malik 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