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

10015 Commits

Author SHA1 Message Date
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
Jonathan Ellis 1db8a221b3 clean up cfstats/cfhistograms output 2013-08-14 11:36:22 -05:00
Jonathan Ellis 82fc871159 NEWS 2013-08-14 11:13:35 -05:00
Yuki Morishita 830507b031 Added lines for BATCH response to v2 spec 2013-08-13 14:51:03 -05:00
Aleksey Yeschenko 56bd81a7a0 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-13 20:56:50 +02:00
Aleksey Yeschenko 82081c7b4b Migrate key_alias->key_aliases on every schema migration (1.2) 
Another follow-up to 5800
 2013-08-13 20:54:24 +02:00
Yuki Morishita 42b260246e Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-13 13:17:13 -05:00
Yuki Morishita e15dee2f4a make sure to release recently added CF metric 2013-08-13 13:16:59 -05:00
Yuki Morishita 2d2099751c make sure to release recently added CF metric 2013-08-13 13:16:28 -05:00
Aleksey Yeschenko 1716054231 Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	src/java/org/apache/cassandra/db/SystemKeyspace.java
 2013-08-12 19:18:28 +02:00
Aleksey Yeschenko 44925ac7ea CASSANDRA-5800 follow-up 
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-5800
 2013-08-12 19:16:01 +02:00
Yuki Morishita a34790085a suppress sending too many progress notifications 2013-08-12 11:10:37 -05:00
Yuki Morishita a0d6ed1290 Improve JMX support for streaming 
patch by yukim; reviewed by thobbs for CASSANDRA-5859
 2013-08-12 11:09:56 -05:00
Aleksey Yeschenko 09a4dc0552 cqlsh: add DESCRIBE FULL SCHEMA variant 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5880
 2013-08-12 17:06:14 +02:00
Aleksey Yeschenko 703bd684ca Fix (some) 2i on composite components omissions 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5851
 2013-08-12 12:55:56 +02:00
Aleksey Yeschenko 1c606bb8af Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java
 2013-08-12 12:39:46 +02:00
Aleksey Yeschenko cb0a0cd2f8 Remove the vestiges of default_{read,write}_consistency 2013-08-12 12:36:43 +02:00
Jonathan Ellis 9a28df0d0f enable vnodes by default (CASSANDRA-5869) 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5869
 2013-08-11 21:32:49 -05:00
Aleksey Yeschenko 298e91df73 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-10 02:42:25 +02:00
Aleksey Yeschenko 2a8379372e Correct timestamp formatting in CQL3 doc 2013-08-10 02:41:58 +02:00
Jonathan Ellis 5a9dd3d993 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-09 15:56:28 -05:00
Jonathan Ellis fd14512fd2 migrate 1.1 schema_columnfamilies.key_alias column to key_aliases 
patch by Alex Liu; reviewed by Tyler Hobbs for CASSANDRA-5800
 2013-08-09 15:56:14 -05:00
Yuki Morishita d62382bfec Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/io/sstable/SSTableReader.java
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
	src/java/org/apache/cassandra/service/CacheService.java
 2013-08-09 14:34:53 -05:00
Yuki Morishita f5d632fa7a Add KeyCacheHitRate metric to CF metrics 
patch by yukim; reviewed by jbellis for CASSANDRA-5868
 2013-08-09 14:10:36 -05:00
Aleksey Yeschenko 2bcfab03c6 Drop CQL3 obsolete keywords support in CREATE 2013-08-09 17:51:53 +02:00
Jonathan Ellis d044fe6b15 merge from 1.2 2013-08-08 17:08:14 -05:00
Jonathan Ellis 73b0ffba82 make scrubbing collection-aware 2013-08-08 17:06:56 -05:00
Jonathan Ellis 5411e5ff85 Merge remote-tracking branch 'origin/cassandra-2.0.0' into cassandra-2.0.0 2013-08-08 15:51:58 -05:00
Jonathan Ellis 9e0efa3dbb Correctly validate sparse composite cells 
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5855
 2013-08-08 15:51:34 -05:00
Jonathan Ellis fdfdd5c12e merge from 1.2 2013-08-08 15:50:08 -05:00
Jonathan Ellis 1143df1aa4 merge from 1.1 2013-08-08 15:46:52 -05:00
Jonathan Ellis eb884a582b Correctly validate sparse composite cells 
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5855
 2013-08-08 15:43:43 -05:00
Pavel Yaskevich 7a8cbb3ea7 add thrift-server and LMAX Disruptor licences 2013-08-08 11:30:02 -07:00
Brandon Williams 50b40e91f0 Remove jvm revision checks.. for now 2013-08-08 13:03:08 -05:00
Brandon Williams 8ee09f7ab3 Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
 2013-08-08 13:01:40 -05:00
Brandon Williams ccb32a8c8d Make SS look at the right piece for expire time. 
Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5857
 2013-08-08 12:58:58 -05:00
Jonathan Ellis f30629b83f merge from 1.2 2013-08-08 11:15:54 -05:00
Jonathan Ellis 23d7bd8575 fix potential overflow in extimatedKeys 2013-08-08 11:15:27 -05:00
Jonathan Ellis 88fea9fe73 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-07 18:04:55 -05:00
Jonathan Ellis 7d45d2bde3 add --migrate optionto sstableupgrade and sstablescrub 
patch by Tyler Hobbs; reviewed by Jeremiah Jordan for CASSANDRA-5831
 2013-08-07 18:03:29 -05:00
Pavel Yaskevich 19767fcd17 fix HsHa to respect max frame size 
patch by Pavel Yaskevich; reviewed by Tyler Hobbs (CASSANDRA-4573)
 2013-08-06 15:20:48 -07:00
Jonathan Ellis af85f2327c Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-06 16:55:53 -05:00