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

316 Commits

Author SHA1 Message Date
Jonathan Ellis c0d189f4f2 update test for separate paxos/commit CLs 2013-08-05 16:27:39 -05:00
Aleksey Yeschenko b60f63d543 Support range tombstones in thrift 
patch by Edward Capriolo and Aleksey Yeschenko for CASSANDRA-5435
 2013-07-15 00:54:54 +03:00
Sylvain Lebresne bfe1e1cef7 Followup to CASSANDRA-5619 2013-07-03 08:32:59 +02:00
Aleksey Yeschenko 37f0c8c91f Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	test/system/test_thrift_server.py
 2013-06-02 02:32:10 +03:00
Aleksey Yeschenko 452b1bef56 Fix test_thrift_server.TestMutations.test_describe_token_map 2013-06-02 00:47:19 +03:00
Jonathan Ellis bc3597d354 Add support for specifying CAS commit ConsistencyLevel 
patch by jbellis; reviewed by aleksey for CASSANDRA-5442
 2013-05-27 14:31:44 -05:00
Aleksey Yeschenko 72231959a6 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	test/unit/org/apache/cassandra/service/CassandraServerTest.java
 2013-05-11 01:52:12 +03:00
Aleksey Yeschenko 26995337b8 Merge branch 'cassandra-1.1' into cassandra-1.2 
Conflicts:
	test/unit/org/apache/cassandra/service/CassandraServerTest.java
 2013-05-11 01:37:00 +03:00
Aleksey Yeschenko ce8bc33d43 Move CassandraServerTest.test_get_count() to thrift server tests 2013-05-11 01:30:17 +03:00
Aleksey Yeschenko 68da4b4689 Ninja-fix 1.2 system tests 2013-05-06 01:56:43 +03:00
Aleksey Yeschenko 81e19fc78b Ninja-unify 1.1/1.2/2.0 system tests 2013-05-06 01:56:43 +03:00
Aleksey Yeschenko 971a95abfc Ninja-unify 1.1/1.2/2.0 system tests 2013-05-06 00:59:10 +03:00
Aleksey Yeschenko b04f03dfae Ninja-fix system tests 2013-05-05 23:45:20 +03:00
Jonathan Ellis 1227751661 add read support for CL.SERIAL 
patch by jbellis; reviewed by slebresne for CASSANDRA-5441
 2013-04-30 12:42:26 -05:00
Jonathan Ellis 8b0e1868e8 initial CAS support 
patch by jbellis and slebresne for CASSANDRA-5062
 2013-04-11 10:57:48 -05:00
Sylvain Lebresne 3a005df397 Replace supercolumns internally by composites 
patch by slebresne; reviewed by Vijay for CASSANDRA-3237
 2013-01-02 13:40:13 +01:00
Brandon Williams eef93e7d68 Add describe_token_map call. 
Patch by Sam Tunnicliffe, reviewed by Nick Bailey and brandonwilliams
for CASSANDRA-4092
 2012-04-10 15:25:57 -05:00
Pavel Yaskevich 651bf35755 fix system tests 
patch by Pavel Yaskevich; reviewed by Brandon Williams for CASSANDRA-3827
 2012-02-07 18:30:43 +03:00
Sylvain Lebresne 3297a96e18 Merge get_indexed_slices with get_range_slices 
patch by slebresne; reviewed by jbellis for CASSANDRA-1600
 2012-01-02 17:03:18 +01:00
Sylvain Lebresne 052e9ff98a merge from 1.0 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1207453 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-28 17:02:42 +00:00
Eric Evans c8512dac53 relocate Python driver 
Moved to: http://code.google.com/a/apache-extras.org/p/cassandra-dbapi2/

Patch by eevans; reviewed by paul cannon for CASSANDRA-3180


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1176070 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-26 21:26:47 +00:00
Sylvain Lebresne 1ee25ee594 Update CQL type names to match expected (SQL) behavior 
patch by jbellis; reviewed by slebresne for CASSANDRA-3149


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1166564 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-08 08:20:18 +00:00
Pavel Yaskevich 44a566d32f fix of the CQL count() behavior 
patch by Jonathan Ellis and Pavel Yaskevich; reviewed by Eric Evans and Pavel Yaskevich for CASSANDRA-3068

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1166273 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-07 17:16:46 +00:00
Jonathan Ellis 055a98ebf1 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1159474 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-19 01:59:22 +00:00
Jonathan Ellis 0bbc22c00d merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1156265 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-10 17:04:39 +00:00
Sylvain Lebresne 98fb5641ed commit from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1155549 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-09 20:26:07 +00:00
Jonathan Ellis ab2fc1f9e4 add paging to get_count 
patch by Byron Clark; reviewed by jbellis for CASSANDRA-2894

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1152545 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-31 04:40:42 +00:00
Sylvain Lebresne 2c000d92f2 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1150748 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-25 15:23:00 +00:00
Jonathan Ellis 647e3e5a31 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1148586 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-20 00:13:25 +00:00
Jonathan Ellis c3566e956a merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1148468 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-19 18:13:51 +00:00
Jonathan Ellis f491265fc5 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1137777 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-20 20:54:24 +00:00
Jonathan Ellis 56997214b6 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135244 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-13 19:40:21 +00:00
Jonathan Ellis 00fd00db5d merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1134431 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-10 20:19:23 +00:00
Eric Evans 21afd783fd merge w/ 0.8 branch 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1133951 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-09 15:46:19 +00:00
Jonathan Ellis f5f96c178d merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1132406 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-05 13:43:22 +00:00
Jonathan Ellis 4f9b1604c7 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1127165 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-24 17:34:36 +00:00
Jonathan Ellis fcd02e3a66 add CQL TTL support 
patch by pyaskevich; reviewed by jbellis for CASSANDRA-2476

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8.1@1101234 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-09 21:40:27 +00:00
Jonathan Ellis 0427c832b0 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8.1@1101228 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-09 21:31:45 +00:00
Jonathan Ellis 835669aee8 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1100900 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-09 07:05:55 +00:00
Jonathan Ellis 5798effe33 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1100471 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-07 07:13:21 +00:00
Jonathan Ellis 4398f831c3 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1100041 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-06 04:17:17 +00:00
Sylvain Lebresne 832a45d89c merge CASSANDRA-2571 from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097884 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-29 16:52:45 +00:00
Sylvain Lebresne d24d7ce6c4 Reject queries with missing mandatory super column and always validate super column name 
patch by jbellis and slebresne for CASSANDRA-2571


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1097852 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-29 15:58:09 +00:00
Jonathan Ellis 8cd4dcd211 add timestamp support to cqlINSERT,UPDATE,and BATCH 
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-2555

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097511 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-28 15:39:52 +00:00
Jonathan Ellis bec125b777 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097145 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-27 15:27:52 +00:00
Jonathan Ellis cd62c0fef1 add support for IN to cql SELECT, UPDATE 
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-2553

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1096804 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-26 17:07:20 +00:00
Jonathan Ellis 299b7be025 add support for insert, delete in cql BATCH 
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-2537

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1096771 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-26 14:53:53 +00:00
Jonathan Ellis 1adcd1c52e merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1095139 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-19 17:13:19 +00:00
Gary Dusbabek 8a6feefe8f merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1092687 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-15 12:48:15 +00:00
Sylvain Lebresne eed330ec08 Merge CASSANDRA-2342 from 0.8. 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1091151 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-11 18:00:23 +00:00