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

10220 Commits

Author SHA1 Message Date
Aleksey Yeschenko 349d5dbead Fix CASSANDRA-6000 and CASSANDRA-5990 merges 2013-09-12 18:37:21 +03:00
Aleksey Yeschenko 7cb57dbcc0 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/service/StorageProxy.java
 2013-09-12 18:18:27 +03:00
Aleksey Yeschenko 53e48edc30 Replace the deprecated MapMaker with CacheLoader 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6007
 2013-09-12 18:10:16 +03:00
Jonathan Ellis 7bde2454da Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-12 13:41:01 +02:00
Jonathan Ellis 394b35edf3 enhance UntypedResultSet 
patch by Ben Coverston; reviewed by jbellis for CASSANDRA-6000
 2013-09-12 13:40:40 +02:00
Jonathan Ellis 69c9e031ee merge from 1.2 2013-09-12 13:22:00 +02:00
Jonathan Ellis 8cc28a1477 Fix possible divide-by-zero in HHOM 
patch by jbellis for CASSANDRA-5990
 2013-09-12 13:21:37 +02:00
Brandon Williams 7f117da0ca Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
 2013-09-11 10:18:40 -05:00
Brandon Williams f5618e36dc Support thrift tables in Pig CqlStorage 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5847
 2013-09-11 10:16:19 -05:00
Brandon Williams 1ae996d382 preserve jvm_opts w/jemalloc 2013-09-11 09:36:09 -05:00
Sylvain Lebresne 2c84b1403f Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/cql3/functions/TimeuuidFcts.java
 2013-09-11 08:35:24 +02:00
Sylvain Lebresne 8bedb57207 Support null in CQL3 functions 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5910
 2013-09-11 08:31:05 +02:00
Sylvain Lebresne 9b545caab5 Allow empty CQL3 batches as no-op 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5994
 2013-09-11 08:29:25 +02:00
Aleksey Yeschenko f6fda9c69c Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
 2013-09-11 00:57:01 +03:00
Aleksey Yeschenko fd129664ca Pass the updated cf to the PRSI index() method 
patch by Ben Coverston; reviewed by Aleksey Yeschenko for
CASSANDRA-5999
 2013-09-11 00:43:28 +03:00
Brandon Williams 678aa37af3 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
 2013-09-10 13:44:47 -05:00
Brandon Williams 70297f9ad4 Pig support for CQL collections. 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5867
 2013-09-10 13:28:23 -05:00
Aleksey Yeschenko 1ff0d8e9f6 Fix merge (s/>/>= in CompositesSearcher) 2013-09-10 18:23:03 +03:00
Aleksey Yeschenko 096f2bf920 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
 2013-09-10 17:58:19 +03:00
Aleksey Yeschenko caef32e5d6 Correctly handle limits in CompositesSearcher 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5975
 2013-09-10 17:41:04 +03:00
Dave Brosius 52678a2843 don't declare throwing exceptions that aren't thrown 2013-09-09 18:43:21 -04:00
Jonathan Ellis 04cd81cdbb fix re-propose of earlier, incomplete paxos round to use new ballot 
patch by jbellis; reviewed by slebresne for CASSANDRA-5985
 2013-09-09 23:10:57 +01:00
Jonathan Ellis 41798b6f69 cleanup paxos tracing 2013-09-09 23:09:22 +01:00
Jonathan Ellis ce9d3030b8 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-09 08:57:09 +01:00
Jonathan Ellis 30f5e56131 typo 2013-09-09 08:57:02 +01:00
Aleksey Yeschenko b248b1ae39 Get rid of redundant this references in equals() 2013-09-08 19:40:38 +03:00
Aleksey Yeschenko 233ad183ca Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-07 21:58:57 +03:00
Aleksey Yeschenko b5f4d03d06 Rename in tracing: Index sample -> Partition summary 2013-09-07 21:58:14 +03:00
Jonathan Ellis ad6f00afaa cherry-pick CASSANDRA-5816 2013-09-05 21:12:12 -05:00
Jonathan Ellis 85be04bb20 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-05 11:04:33 -05:00
Jonathan Ellis 3d9c3dd3af update build.xml for metrics-core 2.2.0 2013-09-05 11:04:26 -05:00
Sylvain Lebresne 12671160bd Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-05 16:37:08 +02:00
Sylvain Lebresne 1f6844261a Rename clustering keys to clustering columns in doc 2013-09-05 16:35:18 +02:00
Aleksey Yeschenko edc7531273 Require superuser status for adding triggers 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5963
 2013-09-04 21:50:45 +03:00
Sylvain Lebresne 06dc4d0fd2 Fix broken native protocol serialization methods 2013-09-04 14:54:57 +02:00
Aleksey Yeschenko d1595b2175 Do less work when there are no dropped columns present 2013-09-04 07:43:49 +03:00
Aleksey Yeschenko 3b4984977a Fix diffrence typo in HintedHandoffMetrics 2013-09-04 02:10:18 +03:00
Yuki Morishita 0573d95dee Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/io/sstable/IndexSummary.java
	test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
 2013-09-03 16:16:29 -05:00
Yuki Morishita c49ad3ccf2 Fix loading index summary containing empty key 
patch by yukim; reviewed by jbellis for CASSANDRA-5965
 2013-09-03 16:00:52 -05:00
Jonathan Ellis 31f6ec1bf5 Improve error message when yaml contains invalid properties 
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-5958
 2013-09-03 12:12:47 -05:00
Jonathan Ellis 760e68f77c cleanup 2013-09-03 12:12:47 -05:00
Sylvain Lebresne a3534910e1 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-03 16:36:32 +02:00
Sylvain Lebresne 8c33e72e1f License filename renaming 2013-09-03 16:36:19 +02:00
Sylvain Lebresne 14e7895e59 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-03 16:35:27 +02:00
Sylvain Lebresne c7a835d1f4 Add back updated licenses 2013-09-03 16:30:10 +02:00
Sylvain Lebresne 4ca9217a2b Merge tag 'cassandra-2.0.0' into cassandra-2.0 
Apache Cassandra 2.0.0 release
 2013-09-03 16:28:57 +02:00
Sylvain Lebresne 196038b73e Update netty dependency to 3.6.6 2013-09-02 18:00:27 +02:00
Jonathan Ellis 27df1bdd22 merge from 1.2 2013-09-01 14:34:38 -05:00
Jonathan Ellis 3380fa7baf Allow local batchlog writes for CL.ANY 
patch by jbellis; reviewed by Aleksey for CASSANDRA-5967
 2013-09-01 14:34:11 -05:00
Dave Brosius d4884c76c7 make sure c* returns the correct version when running inside an IDE (for cqlsh) 
patch by dbrosius reviewed by jbellis for cassandra-5964
 2013-09-01 01:20:29 -04:00