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

13395 Commits

Author SHA1 Message Date
Aleksey Yeschenko 69a25cd053 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-08-28 16:36:40 +03:00
Aleksey Yeschenko 36ecc69cbf Forbid re-adding dropped counter columns 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7831
 2014-08-28 16:31:07 +03:00
Tyler Hobbs 58c09cbd42 cqlsh: fix case insensitivity 
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7834
 2014-08-27 14:20:12 -05:00
Tyler Hobbs 3b3afb35cd Fix failure to stream ranges when moving 
Patch by Tyler Hobbs; reviewed by Yuki Morishita for CASSANDRA-7836
 2014-08-27 11:02:24 -05:00
Brandon Williams 0e272c233d Add ability to detect unofficial openjdk builds. 
Patch by brandonwilliams, reviewed by enigmacurry for CASSANDRA-7799
 2014-08-27 10:08:18 -05:00
Jake Luciani ce3fcbe5f8 Avoid recycling CL segments until all writes have been flushed for all keyspaces in segment 
Patch by belliottsmith; reviewed by tjake for CASSANDRA-7437
 2014-08-27 10:59:14 -04:00
Marcus Eriksson 049762b3e4 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-08-27 13:06:54 +02:00
Marcus Eriksson 29befa180b Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ColumnIndex.java
 2014-08-27 13:00:55 +02:00
Marcus Eriksson 7f9e9a8718 Track expired tombstones 
Patch by marcuse; reviewed by slebresne for CASSANDRA-7810
 2014-08-27 12:55:17 +02:00
Aleksey Yeschenko cb4bc2764c Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-08-26 19:13:17 +03:00
Aleksey Yeschenko 9219361b62 Fix CFMetaData#isThriftCompatible() for PK-only tables 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7832
 2014-08-26 18:41:38 +03:00
Brandon Williams 4dc3a6e38c Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	debian/init
 2014-08-26 10:39:59 -05:00
Brandon Williams 6b7697589d Export JVM_OPTS in debian init 
Patch by Matt Robenolt, reviewed by Michael Shuler for CASSANDRA-7802
 2014-08-26 10:33:45 -05:00
Sylvain Lebresne 86e3012633 Fix error messages 2014-08-26 17:26:43 +02:00
Marcus Eriksson d1f38cd27f Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
 2014-08-26 15:36:42 +02:00
Marcus Eriksson 61543b4c00 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
 2014-08-26 15:30:34 +02:00
Marcus Eriksson 1cf986301b Don't clear out range tombstones during compaction. 
Patch by rlow; reviewed by marcuse for CASSANDRA-7808
 2014-08-26 15:23:43 +02:00
Sylvain Lebresne 889f3ac554 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
 2014-08-25 16:41:08 +02:00
Sylvain Lebresne 20150727b4 Always reject inequality on the partition key without token() 
patch by blerer; reviewed by slebresne for CASSANDRA-7722
 2014-08-25 16:34:01 +02:00
Sylvain Lebresne 63c21a32dd Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-08-25 15:57:43 +02:00
Sylvain Lebresne 5d4740c584 Always send Paxos commit to all replicas 
patch by kohlisankalp; reviewed by slebresne for CASSANDRA-7479
 2014-08-25 15:55:43 +02:00
Aleksey Yeschenko baae9b6c12 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-08-23 18:26:34 +03:00
Aleksey Yeschenko 618441b977 Add isDense to CFMetaData#hashCode() 2014-08-23 18:26:10 +03:00
Aleksey Yeschenko 508db1e9dd Fix failing unit tests (bad CASSANDRA-7744 merge) 2014-08-23 01:04:09 +03:00
Aleksey Yeschenko 35cfa61c53 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-08-22 21:55:56 +03:00
Pavel Yaskevich a5617d689c Save source exception in CorruptBlockException 
ninja patch by Pavel Yaskevich; ninja reviewed by Aleksey Yeschenko
 2014-08-22 21:52:11 +03:00
Sylvain Lebresne e28e7bf2b1 Add missing license header 2014-08-22 17:07:25 +02:00
Sylvain Lebresne 8da134377a Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
 2014-08-22 16:15:50 +02:00
Sylvain Lebresne 200b802884 Update java driver to 2.0.5 (for hadoop) 2014-08-22 16:11:44 +02:00
Sylvain Lebresne fd8f5b9f7e Improve error message from 7499 2014-08-22 16:03:38 +02:00
Tyler Hobbs a0923dbc04 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-08-21 14:20:49 -05:00
Tyler Hobbs e4d5edae72 Don't send schema change msg for no-op DDL stmts 
Patch by Tyler Hobbs; review by Mikhail Stepura for CASSANDRA-7600
 2014-08-21 14:20:15 -05:00
Marcus Eriksson a41d5270fb Correctly remove tmplink files 
Patch by marcuse; reviewed by benedict for CASSANDRA-7803
 2014-08-21 10:36:45 +02:00
Benedict Elliott Smith af646fb759 ninja fix cassandra.yaml missing memtable_(off)?heap_size_in_mb 2014-08-21 08:52:40 +07:00
Tyler Hobbs c4191ed1c9 cqlsh: preserve original result column names 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7806
 2014-08-20 17:46:41 -05:00
Aleksey Yeschenko 58554decc2 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-08-20 20:42:48 +03:00
Jacek Lewandowski fe39eb7a9e (Hadoop) fix cluster initialisation for a split fetching 
patch by Jacek Lewandowski; reviewed by Alex Liu for CASSANDRA-7774
 2014-08-20 20:39:12 +03:00
Jonathan Ellis da45786788 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-08-20 10:01:09 -07:00
Jonathan Ellis 44cfd958a4 Configure system.paxos with LeveledCompactionStrategy 
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7753
 2014-08-20 10:00:34 -07:00
Tyler Hobbs d3450570ca Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/cql3/TypeTest.java
 2014-08-20 11:13:44 -05:00
Tyler Hobbs a4e108c40b Fix ReversedType.isCompatibleWith() 
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7797
 2014-08-20 11:01:28 -05:00
Yuki Morishita 45159ae7b3 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
 2014-08-20 10:03:59 -05:00
Yuki Morishita 4fc417c404 Make StreamReceiveTask thread safe and gc friendly 
patch by yukim; reviewed by benedict for CASSANDRA-7795
 2014-08-20 09:49:39 -05:00
Aleksey Yeschenko c8a8bfc1e7 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/DataTracker.java
	src/java/org/apache/cassandra/db/Memtable.java
 2014-08-20 15:47:37 +03:00
Aleksey Yeschenko eeb0d4c901 Stop inheriting liveRatio and liveRatioComputedAt from previous memtables 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-7796
 2014-08-20 15:40:27 +03:00
Marcus Eriksson 39b81967f1 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-08-20 08:25:16 +02:00
Marcus Eriksson 76adf0e12e Throw EOFException if we run out of chunks in compressed file 
Patch by marcuse; reviewed by yukim for CASSANDRA-7664.
 2014-08-20 08:21:43 +02:00
Aleksey Yeschenko af188ed364 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/Constants.java
	src/java/org/apache/cassandra/cql3/UpdateParameters.java
 2014-08-20 02:39:00 +03:00
Aleksey Yeschenko ecf1baebbe Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/Constants.java
 2014-08-20 02:31:45 +03:00
Aleksey Yeschenko 62642fa97e Validate empty cell names from counter updates 
patch by Aleksey Yeschenko; reviewed by Jeremiah Jordan for
CASSANDRA-7798
 2014-08-20 02:25:17 +03:00