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

15595 Commits

Author SHA1 Message Date
Benedict Elliott Smith 82a97f52ea Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
 2014-12-19 15:45:33 +00:00
Benedict Elliott Smith 58529c77f4 fix imports 2014-12-19 15:43:38 +00:00
Benedict Elliott Smith 9a51c3c3a8 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
	src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
 2014-12-19 14:31:06 +00:00
Benedict Elliott Smith 871f0039c5 Fix regression in SSTableRewriter causing some rows to become unreadable during compaction 
patch by marcus and benedict for CASSANDRA-8429
 2014-12-19 14:24:47 +00:00
Benedict Elliott Smith 7783f130ce Merge branch 'cassandra-2.1' into trunk 2014-12-19 13:57:26 +00:00
Benedict Elliott Smith bedd97f7ab Merge branch '2.1-fixup' into cassandra-2.1 2014-12-19 13:56:59 +00:00
Marcus Eriksson 31099a1670 Merge branch 'cassandra-2.1' into trunk 2014-12-19 14:21:01 +01:00
Marcus Eriksson c45ed1714e Run major compactions for repaired/unrepaired in parallel 
Patch by marcuse; reviewed by belliottsmith for CASSANDRA-8510
 2014-12-19 14:20:33 +01:00
Sylvain Lebresne 382834d4e4 Fix build 2014-12-19 13:43:00 +01:00
Yuki Morishita 2f072f4d8b Merge branch 'cassandra-2.1' into trunk 2014-12-18 23:09:53 -06:00
blerer a7edaa5210 Force config client mode in CQLSSTableWriter 
Patch by Benjamin Lerer; reviewed by yukim for CASSANDRA-8281
 2014-12-18 23:08:51 -06:00
Tyler Hobbs 507b6c0294 Merge branch 'cassandra-2.1' into trunk 2014-12-18 18:40:14 -06:00
Tyler Hobbs 81d5d6e208 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-12-18 18:39:53 -06:00
Adam Holmberg d8bce5017e Emit MOVED_NODE topology event when a node moves 
Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-8373
 2014-12-18 18:38:35 -06:00
Samuel Klock 3f55c35b8c Support indexing key/value entries in map collections 
Patch by Samuel Klock; reviewed by Tyler Hobbs for CASSANDRA-8473
 2014-12-18 17:30:26 -06:00
Tyler Hobbs a10a2ba815 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	lib/cassandra-driver-internal-only-2.1.2.post.zip
 2014-12-18 12:38:47 -06:00
Tyler Hobbs d2583ce879 Upgrade bundled python driver to 2.1.3 
Patch by Tyler Hobbs. Fixes CASSANDRA-7623, and CASSANDRA-8288, CASSANDRA-8326
 2014-12-18 12:36:46 -06:00
Marcus Eriksson 21bb6d2ef2 Merge branch 'cassandra-2.1' into trunk 2014-12-18 07:34:51 +01:00
Marcus Eriksson 3527099693 Make sure we set lastCompactedKey properly 
Patch by marcuse; reviewed by rbranson for CASSANDRA-8463
 2014-12-18 07:33:24 +01:00
Dave Brosius a7c1729c17 parseLong for primitives 2014-12-17 21:16:49 -05:00
Tyler Hobbs ba6e4239ec Merge branch 'cassandra-2.1' into trunk 2014-12-17 18:04:33 -06:00
Adam Holmberg c8b4d9568e cqlsh: fix CONSISTENCY output 
Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-8507
 2014-12-17 18:03:34 -06:00
Mikhail Stepura 3c955f447c Merge branch 'cassandra-2.1' into trunk 2014-12-17 15:51:12 -08:00
Sam Tunnicliffe f1e2fed8dd cqlsh doesn't handle LIST statements correctly. 
patch by Sam Tunnicliffe; reviewed by Mikhail Stepura for CASSANDRA-8370
 2014-12-17 15:50:59 -08:00
Marcus Eriksson 417563a59b Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/tools/StandaloneScrubber.java
 2014-12-17 12:34:30 +01:00
Marcus Eriksson 6f98c6c4ed Make sstablescrub check both the repaired and unrepaired leveled manifests 
Patch by marcuse; reviewed by cyeksigian for CASSANDRA-8432
 2014-12-17 12:31:40 +01:00
Benedict Elliott Smith e6c5982fa3 Merge branch 'cassandra-2.1' into trunk 2014-12-17 09:28:17 +00:00
Benedict Elliott Smith f852401166 fix up misapply of CASSANDRA-7964 nits 2014-12-17 09:27:47 +00:00
Marcus Eriksson 8a38ce88d5 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
 2014-12-17 08:50:55 +01:00
Marcus Eriksson d5e5f98009 Make sure we don't give out positions from an sstable beyond its first/last keys. 
Patch by marcuse; reviewed by belliottsmith for CASSANDRA-8458
 2014-12-17 08:44:57 +01:00
Aleksey Yeschenko 3e9d345f00 Isolate schema serializaton code 
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-8261
 2014-12-17 01:34:16 +03:00
Joshua McKenzie 32ac6af2ba Merge branch 'cassandra-2.1' into trunk 2014-12-16 15:06:32 -06:00
Joshua McKenzie ffa806733e add missing file 2014-12-16 15:06:02 -06:00
Joshua McKenzie bee53d72a5 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
	src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
	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/WrappingCompactionStrategy.java
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
	src/java/org/apache/cassandra/io/sstable/format/big/BigTableScanner.java
	src/java/org/apache/cassandra/tools/SSTableExport.java
	test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
	test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
	test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
	test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
	test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
	test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java
	test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java
 2014-12-16 15:03:05 -06:00
Joshua McKenzie 1fec4a4281 Fix ref counting race between SSTableScanner and SSTR 
Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8399
 2014-12-16 14:37:07 -06:00
Joshua McKenzie e73fccdcd1 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
 2014-12-16 14:34:14 -06:00
Joshua McKenzie 9871914188 Disable mmap on Windows (2.1 branch) 
Patch by jmckenzie; reviewed by belliottsmith for CASSANDRA-6993
 2014-12-16 14:29:49 -06:00
T Jake Luciani dc1bc81f6a Merge branch 'cassandra-2.1' into trunk 2014-12-16 15:27:43 -05:00
T Jake Luciani 93f679e00f Add missing consistency levels to cassandra-stress 
Patch by Liang Xie; Reviewed by tjake for CASSANDRA-8253
 2014-12-16 15:24:40 -05:00
Sylvain Lebresne 88478c6a60 Merge branch 'cassandra-2.1' into trunk 2014-12-16 20:37:18 +01:00
Sylvain Lebresne b1b9cba2a5 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
 2014-12-16 20:36:10 +01:00
Sylvain Lebresne 345e69e1c1 Fix validation of indexes on composite column components of COMPACT tables 
patch by slebresne; reviewed by thobbs for CASSANDRA-8156
 2014-12-16 20:32:08 +01:00
Joshua McKenzie 847fef8336 Merge branch 'cassandra-2.1' into trunk 2014-12-16 11:17:04 -06:00
Joshua McKenzie d66ae75387 Remove linux-centric references from windows launch scripts 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-8223
 2014-12-16 11:16:14 -06:00
Joshua McKenzie d0e3f45316 Merge branch 'cassandra-2.1' into trunk 2014-12-15 13:14:58 -06:00
Chris Lohfink a6c6d0f60c Expose thread pool max in metrics 
Patch by Chris Lohfink; reviewed by jmckenzie for CASSANDRA-8328
 2014-12-15 13:14:12 -06:00
Joshua McKenzie 574e2652ef merge fixes for CASSANDRA-8452 2014-12-15 11:33:18 -06:00
Joshua McKenzie 3a0dc2c0f7 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/utils/FBUtilities.java
 2014-12-15 11:31:48 -06:00
Blake Eggleston 6d8862b00e Clean up IsWindows check, add hasProc check 
Patch by Blake Eggleston; reviewed by jmckenzie for CASSANDRA-8452
 2014-12-15 11:10:17 -06:00
T Jake Luciani 9acf97a897 Merge branch 'cassandra-2.1' into trunk 2014-12-15 11:39:24 -05:00