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

15625 Commits

Author SHA1 Message Date
Philip Thompson cdf80d9d19 (cqlsh) parse_for_table_meta errors out on queries with undefined grammars 
patch by Philip Thompson; reviewed by Mikhail Stepura for CASSANDRA-8262
 2014-11-05 15:49:59 -08:00
Mikhail Stepura 8856934fc8 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	pylib/cqlshlib/cql3handling.py
 2014-11-05 15:37:43 -08:00
Philip Thompson 8515029020 (cqlsh) SELECT ... TOKEN() function broken in C* 2.1.1 
patch by Philip Thompson; reviewed by Mikhail Stepura for CASSANDRA-8258
 2014-11-05 15:31:10 -08:00
Jonathan Ellis a9f65bcf28 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-11-05 16:45:10 -06:00
Jonathan Ellis 65f7990085 Abort liveRatio calculation if the memtable is flushed 
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-8164
 2014-11-05 16:45:01 -06:00
Jake Luciani 19c2d22e93 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	NEWS.txt
	build.xml
 2014-11-05 16:04:24 -05:00
Jake Luciani cea00e9abc Fix News.txt 2014-11-05 16:01:56 -05:00
Jake Luciani 44e9f23d4f Prep for 2.1.2 2014-11-05 15:56:15 -05:00
Jake Luciani 4fd3349e2e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2014-11-05 15:44:03 -05:00
Jake Luciani 4f863be3f7 Fix Cassandra crash when running on JDK8 update 40 
Patch by Michael Schuler; reviewed by Robert Stupp (CASSANDRA-8209)
 2014-11-05 15:28:24 -05:00
Joshua McKenzie 70f1ac680f Merge branch 'cassandra-2.1' into trunk 2014-11-05 12:18:09 -06:00
Joshua McKenzie 6eef6f7856 Optimize partitioner tokens 
Patch by blambov, reviewed by jmckenzie for CASSANDRA-8230
 2014-11-05 12:17:25 -06:00
Aleksey Yeschenko 51bbec7574 Merge branch 'cassandra-2.1' into trunk 2014-11-05 20:35:23 +03:00
Aleksey Yeschenko 82b91aba69 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
 2014-11-05 20:35:08 +03:00
Aleksey Yeschenko 89257bc12d Remove some dead thrift code 2014-11-05 20:27:39 +03:00
Aleksey Yeschenko 5edaa1589b Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java
 2014-11-05 17:06:37 +03:00
Aleksey Yeschenko 40ba9fe2f1 Collapse CFMetaData imports 2014-11-05 17:02:56 +03:00
Aleksey Yeschenko 47099c2786 Merge branch 'cassandra-2.1' into trunk 2014-11-05 16:32:25 +03:00
Aleksey Yeschenko 98acdb8dd1 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java
 2014-11-05 16:31:55 +03:00
Aleksey Yeschenko 32da3c8cda Make CFMetaData.memtableFlushPeriod volatile 2014-11-05 16:30:08 +03:00
Marcus Eriksson af44d1a7c3 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
	src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
	test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
 2014-11-05 09:47:48 +01:00
Marcus Eriksson e16f584e61 Improve compaction of repaired/unrepaired sstables 
Patch by marcuse; reviewed by Aleksey Yeschenko and Sankalp Kohli for CASSANDRA-8004
 2014-11-05 09:35:24 +01:00
Dave Brosius e369ff69b7 oops, fix tabs->spaces 2014-11-05 02:44:17 -05:00
Dave Brosius ea0cd4caad honor the iterator.next() contract for exceptions 2014-11-04 21:55:10 -05:00
Aleksey Yeschenko 87def12cb1 Merge branch 'cassandra-2.1' into trunk 2014-11-05 03:19:27 +03:00
Blake Eggleston 0a0ba84b87 Make cache serializers pluggable 
patch by Blake Eggleston; reviewed by Aleksey Yeschenko for
CASSANDRA-8096
 2014-11-05 03:16:00 +03:00
Tyler Hobbs 9bf17e15a8 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
	src/java/org/apache/cassandra/cql3/Cql.g
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/Selectable.java
	src/java/org/apache/cassandra/cql3/statements/Selection.java
 2014-11-04 17:26:11 -06:00
Tyler Hobbs a446e80e08 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-11-04 16:43:17 -06:00
Tyler Hobbs 11e657189a Fix non-text comparator col names in cql3 queries 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-8178
 2014-11-04 16:42:05 -06:00
Joshua McKenzie 254cd85a5b Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
	src/java/org/apache/cassandra/db/Memtable.java
 2014-11-04 14:33:44 -06:00
Sankalp Kohli 5acc7a9ed7 Add column update delta histogram (2.1) 
Patch by Sankalp Kohli, review by jmckenzie for CASSANDRA-7979
 2014-11-04 14:30:34 -06:00
Joshua McKenzie f7f4ddbf6f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/db/AtomicSortedColumns.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/Memtable.java
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
 2014-11-04 14:27:25 -06:00
Sankalp Kohli e019760783 Add column update delta histogram 
Patch by Sankalp Kohli, review by jmckenzie for CASSANDRA-7979
 2014-11-04 14:00:41 -06:00
Yuki Morishita bd32104ec2 Merge branch 'cassandra-2.1' into trunk 2014-11-04 13:41:24 -06:00
Yuki Morishita c816a7a49e Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
 2014-11-04 13:41:18 -06:00
Yuki Morishita 7bfb34714a modify test after CASSANDRA-7463 change 2014-11-04 13:39:28 -06:00
Tyler Hobbs 07068e204d Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/index/SecondaryIndex.java
 2014-11-04 12:03:35 -06:00
Tyler Hobbs 2d4a305c5e Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
	test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java
 2014-11-04 12:00:14 -06:00
Tyler Hobbs b3c1e147b5 Ninja: update unit tests for CASSANDRA-8206 2014-11-04 11:56:13 -06:00
Sylvain Lebresne 7647804309 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
	src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
 2014-11-04 18:42:53 +01:00
Sylvain Lebresne c345f81e7f Fix deletion for indexes on primary key columns 
patch by slebresne; reviewed by thobbs for CASSANDRA-8206
 2014-11-04 18:37:25 +01:00
Tyler Hobbs 525ac00c0f Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/cql/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	test/unit/org/apache/cassandra/db/CleanupTest.java
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
	test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
 2014-11-04 10:39:36 -06:00
blerer 5117a5d5ba Consolidate Relation.Type and IndexExpression.Operator 
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8147
 2014-11-04 10:31:12 -06:00
blerer 52a701f295 Fix issues w/ CONTAINS (KEY) queries on 2ary indexes 
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8147
 2014-11-04 10:16:57 -06:00
Tyler Hobbs 72d187c0f3 Merge branch 'cassandra-2.1' into trunk 2014-11-04 09:42:59 -06:00
Tyler Hobbs 684b4f96fa Fix sstable read rate tracking for NamesQueryFilters 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-8239
 2014-11-04 09:40:27 -06:00
T Jake Luciani ee85a31f6f Merge branch 'cassandra-2.1' into trunk 2014-11-04 09:41:55 -05:00
Mikhail Stepura 0bc1ea385e Attach existing sources to "Referenced libraries" in Eclipse 
Patch by Mikhail Stepura; reviewed by tjake for CASSANDRA-8240
 2014-11-04 09:34:05 -05:00
Mikhail Stepura a6c58f8b2f Don't compile Thrift sources in Eclipse, use classes for an ant build 
patch by Mikhail Stepura; reviewed by tjake for CASSANDRA-8250
 2014-11-04 09:23:18 -05:00
Sam Tunnicliffe e95e569c24 Fix default timestamp in QueryOptions 
patch by beobal; reviewed by slebresne for CASSANDRA-8246
 2014-11-04 09:48:24 +01:00