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

11009 Commits

Author SHA1 Message Date
Jonathan Ellis 9e2ccc15df change CRTO default to 5% 2013-10-29 15:41:04 -05:00
Jonathan Ellis 4f0bc89cf4 Merge branch 'cassandra-2.0' into trunk 2013-10-29 15:39:52 -05:00
Jonathan Ellis eb6e4d0f07 update COLD_READS_TO_OMIT_KEY 2013-10-29 15:39:30 -05:00
Jonathan Ellis ecea057559 Merge branch 'cassandra-2.0' into trunk 2013-10-29 15:37:36 -05:00
Jonathan Ellis e5066514f4 add generation back to bucketing (filtering) sort 2013-10-29 15:36:10 -05:00
Jonathan Ellis 2c6a5c000f merge from 2.0 2013-10-29 15:31:10 -05:00
Jonathan Ellis 786672edb6 Compact hottest sstables first and optionally omit coldest 
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-6109
 2013-10-29 15:25:39 -05:00
Sylvain Lebresne e7ff361c83 Merge branch 'cassandra-2.0' into trunk 2013-10-29 11:12:03 +01:00
Sylvain Lebresne 97cbf6ad33 Add CQL-aware SSTableWriter 
patch by slebresne; reviewed by jbellis for CASSANDRA-5894
 2013-10-29 11:11:05 +01:00
Sylvain Lebresne a999b15b88 Fix native protocol spec v2 2013-10-29 11:05:13 +01:00
Brandon Williams 8f6e652605 Merge branch 'cassandra-2.0' into trunk 2013-10-28 14:37:40 -05:00
Brandon Williams 2e84ab16bb Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-28 14:37:31 -05:00
Brandon Williams 7793a85214 Show the root cause when failing to load a class 
Patch by Jackson Chung, reviewed by brandonwilliams for CASSANDRA-6258
 2013-10-28 14:36:42 -05:00
Aleksey Yeschenko 4e5ed3a64c Merge branch 'cassandra-2.0' into trunk 2013-10-28 20:25:09 +03:00
Aleksey Yeschenko b5d563ec3c Ninja: use v1 (time) instead of v4 (random) UUID for the batchlog 2013-10-28 20:21:24 +03:00
Brandon Williams 7950dc31fa Merge branch 'cassandra-2.0' into trunk 2013-10-28 12:00:01 -05:00
Brandon Williams 27da625fb2 Allow overriding max hint ttl 
Patch by Vishy Kasar and brandonwilliams, reviewed by brandonwilliams
for CASSANDRA-5988
 2013-10-28 11:59:15 -05:00
Brandon Williams 4f5edb6479 Merge branch 'cassandra-2.0' into trunk 2013-10-28 11:52:25 -05:00
Brandon Williams 9e47591d3a Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-28 11:52:14 -05:00
Brandon Williams a0831bb6b9 Allow overriding max hin ttl. 
Patch by Vishy Kasar, reviewed by brandonwilliams for CASSANDRA-5988
 2013-10-28 11:46:18 -05:00
Aleksey Yeschenko e5f4fd6128 Merge branch 'cassandra-2.0' into trunk 2013-10-28 16:28:24 +03:00
Aleksey Yeschenko fcd657cde7 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/thrift/CassandraServer.java
 2013-10-28 16:27:28 +03:00
Aleksey Yeschenko 47896c888b Require logging in for Thrift CQL2/3 statement preparation 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6254
 2013-10-28 16:20:35 +03:00
Aleksey Yeschenko 1a301a9cad Merge branch 'cassandra-2.0' into trunk 2013-10-28 15:53:05 +03:00
Aleksey Yeschenko 46f71866a1 Require Permission.SELECT for CAS updates 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6247
 2013-10-28 15:52:16 +03:00
Aleksey Yeschenko eb2c4fe381 Merge branch 'cassandra-2.0' into trunk 2013-10-28 13:39:28 +03:00
Aleksey Yeschenko f1c0524347 Provide hooks around CQL2/CQL3 statement execution 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6252
 2013-10-28 13:38:22 +03:00
Dave Brosius e6b4fcf24c close streams 2013-10-27 21:41:54 -04:00
Dave Brosius 9cdc755f85 use junit assertions for unit tests over java asserts 2013-10-27 21:36:09 -04:00
Aleksey Yeschenko 9fa54cf3b3 Merge branch 'cassandra-2.0' into trunk 2013-10-27 23:35:17 +03:00
Aleksey Yeschenko d280e970e9 Update memtable size while flushing 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6249
 2013-10-27 23:34:10 +03:00
Aleksey Yeschenko 6b3fe5ee7c Add IRequestSink interface 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6248
 2013-10-27 23:28:46 +03:00
Aleksey Yeschenko 55a7748752 Merge branch 'cassandra-2.0' into trunk 2013-10-26 15:33:08 +03:00
Aleksey Yeschenko 18260c5f2c cqlsh: fix LIST USERS output 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6242
 2013-10-26 15:31:47 +03:00
Brandon Williams db5c95cdc5 Merge branch 'cassandra-2.0' into trunk 2013-10-25 15:28:28 -05:00
Brandon Williams 1bd7ac3c4b Only pass UseCondCardMark to 64bit JVMs 
Patch by brandonwilliams, reviewed by eevans for CASSANDRA-6190
 2013-10-25 15:28:22 -05:00
Sylvain Lebresne 0c56a5eced Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	CHANGES.txt
 2013-10-25 19:11:22 +02:00
Sylvain Lebresne 2c4b043f94 Fix updating column_metadata from thrift 
patch by slebresne; reviewed by jbellis for CASSANDRA-6182
 2013-10-25 19:10:07 +02:00
Brandon Williams 0dccea4f36 Merge branch 'cassandra-2.0' into trunk 2013-10-25 11:11:41 -05:00
Brandon Williams 2f248b3f90 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
 2013-10-25 11:11:31 -05:00
Brandon Williams cb506b793c Handle null correctly in CqlStorage 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6180
 2013-10-25 11:10:09 -05:00
Jonathan Ellis 8d1bb07530 Merge branch 'cassandra-2.0' into trunk 2013-10-25 09:47:21 -05:00
Jonathan Ellis 9385cfded7 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-25 09:47:12 -05:00
Jonathan Ellis dcbf35c552 add path to MmappedSegmentedFile assertions 2013-10-25 09:47:00 -05:00
Dave Brosius 2faac19e17 use junit assertions for unit tests over java asserts 2013-10-25 00:41:09 -04:00
Dave Brosius 8fbdc9f82d Merge branch 'cassandra-2.0' into trunk 2013-10-25 00:19:53 -04:00
Dave Brosius 3dc4e65637 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-25 00:19:11 -04:00
Dave Brosius 08a22729af assume python is on path for windows for cqlsh.bat 
patch by mstepura reviewed by dbrosius for cassandra-6145
 2013-10-25 00:14:30 -04:00
Brandon Williams 7233102520 Merge branch 'cassandra-2.0' into trunk 2013-10-24 14:46:33 -05:00
Brandon Williams 8bdd4733bf Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-24 14:46:21 -05:00