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

13106 Commits

Author SHA1 Message Date
Jonathan Ellis a14211fbd1 Workaround JVM NPE on JMX bind failure 
patch by Brandon Williams; reviewed by tjake for CASSANDRA-7254
 2014-07-07 00:12:57 -05:00
Jonathan Ellis 48ff36a457 Fix ClassCastException processing expired messages 
patch by Jason Brown; reviewed by tjake for CASSANDRA-7496
 2014-07-07 00:03:18 -05:00
Jonathan Ellis 9b539f966f Fix prepared marker for collections inside UDT 
patch by slebresne; reviewed by thobbs for CASSANDRA-7472
 2014-07-06 23:55:32 -05:00
Aleksey Yeschenko 92cb551ae3 Remove left-over populate_io_cache_on_flush and replicate_on_write uses 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-7493
 2014-07-03 21:35:39 +03:00
Marcus Eriksson 28164849cc Remove left-over rows_per_partition_to_cache 
Patch by marcuse; reviewed by jbellis for CASSANDRA-7493
 2014-07-03 18:42:51 +02:00
Marcus Eriksson 8c4ffbe657 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	NEWS.txt
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
 2014-07-03 14:29:31 +02:00
Marcus Eriksson f39cb073ac Add property to disable stcs in L0 
Patch by marcuse; reviewed by tjake for CASSANDRA-6621
 2014-07-03 14:19:50 +02:00
Jason Brown ea38ddced2 ninja fix to lower the logging level on StreamReader/CSR 2014-07-02 16:01:56 -07:00
Benedict Elliott Smith 0e393c9356 Ensure writes have completed after dropping a table, before recycling commit log segments 
patch by Benedict Elliott Smith; reviewed by Jake Luciani for CASSANDRA-7437
 2014-07-02 23:41:22 +01:00
Sylvain Lebresne 29a9934858 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	src/java/org/apache/cassandra/cql3/CFDefinition.java
 2014-07-02 17:20:07 +02:00
Sylvain Lebresne 4c95d08480 Fix typo in CFDefinition 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-7452
 2014-07-02 17:19:18 +02:00
Sylvain Lebresne 5a658be5ed Versions update for 1.2.18 2014-07-02 11:41:06 +02:00
Sylvain Lebresne f3961a63a1 Merge branch 'cassandra-2.1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1.0 2014-07-02 10:30:14 +02:00
Sylvain Lebresne 3e807b659b Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-07-02 10:29:54 +02:00
Sylvain Lebresne 34252003bf Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/utils/ByteBufferUtil.java
 2014-07-02 10:29:10 +02:00
Sylvain Lebresne 04250f2e5c Changelog 2014-07-02 10:26:44 +02:00
Sylvain Lebresne 135513cf9b Fix compilation with java 6 (JAVA-7147 regression) 2014-07-02 10:23:19 +02:00
Jake Luciani 6aa81a5b37 ninja: Always make a copy in BBU.getArray() 2014-07-01 15:25:13 -04:00
Jake Luciani 3958fc4592 ninja fix: raise default concurrent compactors to 4 to avoid LCS test timeout 2014-07-01 14:39:12 -04:00
Jake Luciani 4c9afde7a8 Clone partition key for ReadCommands to avoid netty corruption 
patch by jake; reviewed by jason brown for CASSANDRA-7465
 2014-07-01 13:35:33 -04:00
Sylvain Lebresne 39925d2487 Merge branch 'cassandra-2.1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1.0 2014-07-01 15:39:10 +02:00
Sylvain Lebresne fcd3cc0eb6 Make sure cql-test only run CQLTester ones 2014-07-01 15:38:51 +02:00
Jonathan Ellis c23eccf3c6 Upgrade to snappy-java 1.0.5.2 2014-06-30 21:12:46 -07:00
Jonathan Ellis d714d6310d Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-06-30 20:48:42 -07:00
vparthasarathy 4112a7fa27 Split out outgoing stream throughput within a DC and inter-DC 
patch by Vijay and benedict for CASSANDRA-6596
 2014-06-30 20:47:58 -07:00
Brandon Williams 49068a4c0e Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-06-30 14:42:34 -05:00
Brandon Williams 6396a35b4e Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-06-30 14:42:14 -05:00
Brandon Williams 73e1eff683 typo 2014-06-30 14:41:36 -05:00
Sylvain Lebresne 0bbfabb5d6 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
 2014-06-30 16:47:29 +02:00
Marcus Eriksson 4cc4acb7e5 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
 2014-06-30 16:13:14 +02:00
Sylvain Lebresne a9c71e4a20 Fix Assertion errors when using empty clustering with static columns 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-7455
 2014-06-30 15:56:56 +02:00
Benedict Elliott Smith 82aca6dae9 fix CHANGES.txt 2014-06-30 14:42:14 +01:00
Benedict Elliott Smith da3606e180 Merge commit failure policy into 2.1 
patch by Benedict Elliott Smith; reviewed by Marcus Eriksson for CASSANDRA-7429
 2014-06-30 13:00:42 +01:00
Marcus Eriksson fc9eeb99f9 Include high level sstables in lower level compactions if not compacted for a while. 
Patch by marcuse, reviewed by kohlisankalp and yukim for CASSANDRA-7414
 2014-06-30 08:40:37 +02:00
Jonathan Ellis b8ee9da1e8 (Windows) handle spaces in path names 
patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451
 2014-06-27 11:07:47 -05:00
Jonathan Ellis bd6a766f98 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-06-27 10:27:03 -05:00
Jonathan Ellis 536ae7ae98 close CqlRecordWriter clients when finished 
patch by Peter Williams; reviewed by jbellis for CASSANDRA-7459
 2014-06-27 10:26:53 -05:00
Tyler Hobbs e32423159d Properly handle unrecognized opcodes and flags 
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7440
 2014-06-27 09:28:18 -05:00
Jonathan Ellis 8aa2b791d9 merge from 2.0 2014-06-26 21:36:55 -05:00
Jonathan Ellis 2b973b9ed1 Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM 
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7345
 2014-06-26 21:35:50 -05:00
Jonathan Ellis c18e740c8d Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-26 19:18:52 -05:00
Jonathan Ellis 900f29c7f7 Fix race in FileCacheService RemovalListener 
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7278
 2014-06-26 19:17:58 -05:00
Brandon Williams e8500c72c7 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-26 11:02:06 -05:00
Sylvain Lebresne d5e5659e41 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
	debian/changelog
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
 2014-06-26 18:01:35 +02:00
Brandon Williams ac1d5bd56f Document initial_token/num_tokens behavior when both are set 
Patch by Philip Thompson, reviewed by brandonwilliams for CASSANDRA-7411
 2014-06-26 10:54:10 -05:00
Sylvain Lebresne 5b878cebdf Merge commit 'c9cef44a1a6c10036200f410c8a26942e64c8f12' into cassandra-2.0 2014-06-26 10:49:22 +02:00
Sylvain Lebresne c9cef44a1a Support Thrift tables clustering columns on CqlPagingInputFormat 
patch by pauloricardomg; reviewed by alexliu68 for CASSANDRA-7445
 2014-06-26 10:40:22 +02:00
Sylvain Lebresne 79f3874d81 Versions update for 2.0.9 release 2014-06-26 10:34:53 +02:00
Sylvain Lebresne 79a4dd58cd Refuse range queries with strict bounds on compact tables 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-7059
 2014-06-26 10:12:59 +02:00
Sylvain Lebresne 6e4dca02a7 Support DISTINCT for static columns 
This also fix the behaviour when DISTINCT is not used.

patch by slebresne; reviewed by thobbs for CASSANDRA-7305
 2014-06-26 10:12:58 +02:00