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

10056 Commits

Author SHA1 Message Date
Aleksey Yeschenko 9a42e28d9f Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	src/java/org/apache/cassandra/cql3/Cql.g
 2013-08-24 03:26:51 +03:00
Aleksey Yeschenko 17186d8254 Correct minor CQL3 grammar rules (USING) 2013-08-24 03:21:52 +03:00
Aleksey Yeschenko b0280cb92d Fix periodic memtable flushing behavior with clean memtables 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5931
 2013-08-24 02:16:29 +03:00
Dave Brosius af9c7074ff Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-22 21:16:53 -04:00
Dave Brosius ddb501df40 fix nodetool getendpoints when the key has a space in it 
patch by gdeangelis reviewed by dbrosius for CASSANDRA-4551
 2013-08-22 21:13:24 -04:00
Sylvain Lebresne 624a7a02f8 Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
 2013-08-22 10:17:54 +02:00
Sylvain Lebresne 39066b7226 Add SSTableSplitter tool to split sstables offline 
patch by slebresne; reviewed by krummas for CASSANDRA-4766
 2013-08-22 10:08:10 +02:00
Vijay Parthasarathy 5774ecb405 Fix for missing filter type in 2.0 branch 2013-08-21 19:32:26 -07:00
Vijay Parthasarathy ed6a5b935d Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 19:23:53 -07:00
Vijay Parthasarathy 9bb4d93e3c additional check for offheap bloom filter size 
patch by Vijay; reviewed by jbellis for CASSANDRA-5903
 2013-08-21 19:21:28 -07:00
Dave Brosius 372af0854f Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 21:50:30 -04:00
Dave Brosius 4bc8c895db remove licenses for jars not used 2013-08-21 21:49:34 -04:00
Aleksey Yeschenko 5fe46e145a Add CQL2 deprecation warning 2013-08-22 04:35:29 +03:00
Dave Brosius 8551ff93e9 update version of snakeyaml to 1.11 for maven for cassandra-5917 2013-08-21 20:45:17 -04:00
Yuki Morishita 72a702a3d4 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 15:41:05 -05:00
Yuki Morishita 0db3413548 add metrics-core license 2013-08-21 15:40:26 -05:00
Yuki Morishita 7d3eef8233 Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	CHANGES.txt
 2013-08-21 15:35:05 -05:00
Yuki Morishita ad8f88e212 Fix LCS L0 compaction may overlap in L1 
patch by yukim; reviewed by jbellis for CASSANDRA-5907
 2013-08-21 15:30:16 -05:00
Jonathan Ellis 9dc4c16d7e merge from 1.2 2013-08-21 12:31:17 -05:00
Jonathan Ellis 572cddc300 use long math on deserialize as well 
patch by Taylan Develioglu; reviewed by jbellis for CASSANDRA-5903
 2013-08-21 12:30:29 -05:00
Aleksey Yeschenko c8b220ba10 Fix CHANGES.txt 2013-08-21 18:46:59 +03:00
Aleksey Yeschenko 26d05352e2 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 18:42:56 +03:00
Aleksey Yeschenko dd65e88a76 Properly handle parsing huge map and set literals 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5893
 2013-08-21 18:37:30 +03:00
Marcus Eriksson 8f367fdf92 Add all sstables to the leveled manifest on startup. 
Patch by marcuse, reviewed by jbellis for CASSANDRA-5908
 2013-08-21 14:50:02 +02:00
Sylvain Lebresne cd47182458 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 12:15:59 +02:00
Sylvain Lebresne 55fed339cb CQL3 documentation fixes (#5878) 2013-08-21 12:15:14 +02:00
Sylvain Lebresne 7a300c2a5e Fix thrift validation when inserting in CQL3 tables 
Fixup for #5138
 2013-08-21 09:00:08 +02:00
Vijay Parthasarathy 667ec27a26 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-20 16:23:58 -07:00
Vijay Parthasarathy 08d22df07d edit changes.txt for CASSANDRA-5903 2013-08-20 16:22:55 -07:00
Vijay Parthasarathy ea7bc14225 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-20 15:53:23 -07:00
Vijay Parthasarathy fcc51ea49b Integer overflow in OffHeapBitSet when bloomfilter > 2GB 
patch by Vijay; reviewed by jbellis for CASSANDRA-5903
 2013-08-20 15:30:28 -07:00
Dave Brosius 33fda2db61 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-20 17:52:43 -04:00
Dave Brosius dbb55ebd68 add a -no-snapshot option to scrub to be able to run in tight disk space scenarios 
patch by ltodorov reviewed by dbrosius for cassandra-5891
 2013-08-20 17:38:52 -04:00
Sylvain Lebresne 3a7d9f873e Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	CHANGES.txt
 2013-08-20 16:47:26 +02:00
Sylvain Lebresne 1df9823a68 Don't announce schema version until we've loaded the changes locally 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5904
 2013-08-20 16:30:24 +02:00
Jonathan Ellis df9d61c98f merge from 1.2 2013-08-19 18:03:51 -05:00
Jonathan Ellis bc98886d4b Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter 
patch by jbellis; reviewed by yukim for CASSANDRA-5900
 2013-08-19 18:01:57 -05:00
Sylvain Lebresne 5bf1fc13fd Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-19 17:21:06 +02:00
Sylvain Lebresne 1d5ecab2fa Comment that 0.0.0.0 may confuse some client drivers 2013-08-19 17:20:32 +02:00
Sylvain Lebresne 3e516a3287 Update versions for 2.0.0 RC2 release 2013-08-19 17:01:20 +02:00
Dave Brosius 1a2208ad12 fix ex message grammar 2013-08-18 01:00:28 -04:00
Jonathan Ellis 3301a51892 add triggers README 2013-08-17 19:13:58 -06:00
Aleksey Yeschenko 21771dfbd4 Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
 2013-08-17 18:47:14 +03:00
Aleksey Yeschenko 3529ac711e Handle CQL3 SELECT duplicate IN restrictions on clustering columns 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5856
 2013-08-17 18:40:09 +03:00
Aleksey Yeschenko 0ad0031fd8 Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2013-08-16 21:50:18 +03:00
Aleksey Yeschenko 41409770d4 cqlsh: add support for multiline comments 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5798
 2013-08-16 21:46:42 +03:00
Aleksey Yeschenko 7e02052e3b Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
 2013-08-16 05:02:32 +03:00
Aleksey Yeschenko ebab9d3919 Authorizer+authenticator configuration sanity check 2013-08-16 05:00:35 +03:00
Aleksey Yeschenko ea712bbbe8 Skip auth setup if AllowAllAuthenticator is used 2013-08-16 04:52:30 +03:00
Aleksey Yeschenko a2006b6d89 Kill a buggy avro vestige 2013-08-14 20:57:57 +03:00