natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,009 Commits 17 Branches 313 Tags 588 MiB
Commit Graph

328 Commits

Author SHA1 Message Date
Sam Tunnicliffe 79e1e80627 Swap all references to 3.0 with 2.2 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-9352
 2015-05-14 17:16:54 +03:00
Jonathan Ellis f45e4a556a Revert "Revert "add Thrift get_multi_slice call"" 
This reverts commit 3f0702509b.
 2015-05-08 12:05:13 -05:00
Jonathan Ellis 3f0702509b Revert "add Thrift get_multi_slice call" 
This reverts commit 60fb923018.

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/thrift/CassandraServer.java
	test/system/test_thrift_server.py
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
	test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
 2015-05-08 11:59:57 -05:00
Jake Luciani 235bae7b30 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	interface/cassandra.thrift
	src/java/org/apache/cassandra/thrift/CassandraServer.java
	test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
 2014-05-28 13:55:32 -04:00
Jake Luciani 7f63b1f958 Backport MultiSliceRequest 
Patch by Ed Capriolo; Reviewed by tjake for CASSANDRA-7027
 2014-05-28 12:50:35 -04:00
Sylvain Lebresne ddd2ff7d63 Merge branch 'cassandra-2.1' into trunk 2014-05-05 09:28:12 +02:00
Sylvain Lebresne 706afc300d Fixup for CASSANDRA-6831 on 2.1 2014-05-05 09:20:18 +02:00
Jonathan Ellis 335aa9f1f6 Merge branch 'cassandra-2.1' into trunk 2014-03-19 12:12:11 -05:00
Jonathan Ellis 6e366e3b26 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-19 12:11:59 -05:00
Jonathan Ellis dd276ebb5d Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-19 12:11:02 -05:00
Jonathan Ellis 73a3eeb6f6 comment CqlRow for #6807 2014-03-19 12:10:52 -05:00
Jonathan Ellis 60fb923018 add Thrift get_multi_slice call 
patch by Ed Capriolo; reviewed by Tyler Hobbs for CASSANDRA-6757
 2014-03-05 08:02:59 -06:00
Aleksey Yeschenko 2621707128 Remove CQL2 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5918
 2014-02-20 22:36:28 +03:00
Aleksey Yeschenko ee477cc4dd Replace index_interval with min/max_index_interval 
patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-6379
 2014-02-14 01:34:47 +03:00
Marcus Eriksson ab6eaed8f6 Make it possible to cache a configurable amount of rows in row cache. 
Patch by pcmanus and marcuse, reviewed by pcmanus for CASSANDRA-5357
 2014-02-06 10:08:55 +01:00
Aleksey Yeschenko 714c423360 New counters implementation 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6504
 2014-01-27 16:37:41 -06:00
Jonathan Ellis f2a82ee731 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-12-06 09:51:59 -06:00
Jonathan Ellis 86e949f321 add describe_local_ring for Hadoop's benefit 
patch by Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-6268
 2013-12-05 20:49:19 -06:00
Jason Brown 5c0c84b3d1 implementing CL.LOCAL_ONE 2013-10-17 13:37:12 -07:00
Jason Brown c9528f9c9c apply local_one changes to 2.0 2013-10-16 15:44:33 -07:00
Aleksey Yeschenko bffd9ea8eb Upgrade Thrift to 0.9.1 
patch by Carl Yeksigian and Jake Farrell; reviewed by Aleksey Yeschenko
for CASSANDRA-5923
 2013-08-30 02:57:12 +03:00
Aleksey Yeschenko 5fe46e145a Add CQL2 deprecation warning 2013-08-22 04:35:29 +03:00
Dave Brosius 6f217f7fe8 unused imports cleanup 2013-07-30 00:58:56 -04:00
Sylvain Lebresne bfd73beaf1 DC-local CAS 
patch by slebresne; reviewed by jbellis for CASSANDRA-5797
 2013-07-26 17:29:26 +02:00
Aleksey Yeschenko a9659774b3 fix schema-related trigger issues 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5774
 2013-07-23 01:30:29 +03:00
Sylvain Lebresne bfe1e1cef7 Followup to CASSANDRA-5619 2013-07-03 08:32:59 +02:00
Sylvain Lebresne 0ba5cf12b9 Return current values on failed CAS 
patch by slebresne; reviewed by jbellis for CASSANDRA-5619
 2013-06-21 09:47:50 +02:00
Vijay Parthasarathy 8bf6e1559e patch by Vijay; reviewed by Aleksey Yeschenko for CASSANDRA-5576 2013-06-16 15:56:56 -07: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
Vijay Parthasarathy 72a6cff6e8 Cassandra Triggers! 
patch by Vijay; reviewed by Jonathan Ellis for CASSANDRA-1311
 2013-05-16 18:19:55 -07:00
Aleksey Yeschenko 0637b86749 Update thrift-generated Constants.java 2013-05-06 02:40:44 +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
Dave Brosius 56f35dbf79 unused imports warnings cleanups 2013-04-06 17:57:19 -04:00
Jonathan Ellis d394ab14a9 upgrade to Thrift 0.9 to match lib/ 2013-03-25 15:42:24 -05:00
Brandon Williams 22f515b376 Allow populate_io_cache_on_flush to be set per-CF. 
Patch by Alexey Zotov, reviewed by brandwonwilliams for CASSANDRA-4694
 2013-01-31 17:37:24 -06:00
Brandon Williams 21f63a916d Allow populate_io_cache_on_flush to be set per-CF. 
Patch by Alexey Zotov, reviewed by brandwonwilliams for CASSANDRA-4694
 2013-01-31 15:12:41 -06:00
Vijay Parthasarathy c25a6a14c8 Speculative execution for Reads 
Patch by Vijay, reviewed by jbellis for CASSANDRA-4705
 2013-01-28 21:55:57 -08:00
Jake Luciani b153d45644 Upgrade thrift version to 0.9.0 
Patch by jfarrell; reviewed by tjake for CASSANDRA-3719
 2013-01-14 15:14:04 -05:00
Jonathan Ellis 6a5c9ed879 make index_interval configurable per columnfamily 
patch by Radim Kolar; reviewed by jbellis for CASSANDRA-3961
 2012-12-01 10:03:52 +09:00
Jonathan Ellis 40d2ad14b9 add default_time_to_live 
patch by Kirk True; reviewed by slebresne and jbellis for CASSANDRA-3974
 2012-12-01 05:23:55 +09:00
Jonathan Ellis 60027c4cca add memtable_flush_period_in_ms 
patch by yukim; reviewed by jbellis for CASSANDRA-4237
 2012-11-15 17:03:29 +01:00
Dave Brosius 998131635c simple javadoc fixes 2012-11-02 02:46:31 -04:00
Dave Brosius 95f94a4da0 cleanup unused imports 2012-10-23 23:39:47 -04:00
Jonathan Ellis 81209f1c80 merge from 1.1 2012-10-19 18:35:41 -05:00
Sylvain Lebresne 297f530c24 Move consistency level to the protocol level 
patch by slebresne; reviewed by jbellis for CASSANDRA-4734
 2012-10-16 18:00:36 +02:00
Jonathan Ellis 39570be0fb gen-thrift-java 2012-09-08 22:32:15 -05:00
Jonathan Ellis b38ca2879c add atomic_batch_mutate 
patch by Aleksey Yeschenko; reviewed by jbellis for CASSANDRA-4542
 2012-09-08 22:14:41 -05:00
Jonathan Ellis 5c94432b23 add request tracing 
patch by David Alves; reviewed by jbellis for CASSANDRA-1123
 2012-08-29 13:14:35 -05:00
Pavel Yaskevich 71f5d91ab7 remove schema agreement checking from all external APIs (Thrift, CQL and CQL3) 
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4487
 2012-08-17 01:54:13 +03:00