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 650 MiB
Commit Graph

15625 Commits

Author SHA1 Message Date
Dave Brosius cfee3da908 simplify: 2014-12-27 21:09:26 -05:00
Dave Brosius 36b287bea4 Merge branch 'cassandra-2.1' into trunk 2014-12-27 20:40:16 -05:00
Dave Brosius 6124a733cb Merge branch 'cassandra-2.0' into cassandra-2.1 2014-12-27 20:32:20 -05:00
rekhajoshm e550ea6021 fix references to defunct CqlPagingInputFormat 
patch by rjoshi reviewed by dbrosius for CASSANDRA-8541
 2014-12-27 20:23:01 -05:00
Dave Brosius 17d9791d63 Merge branch 'cassandra-2.1' into trunk 2014-12-27 15:19:28 -05:00
Dave Brosius 12b96915c3 move null guard to where it's useful 2014-12-27 15:18:59 -05:00
Dave Brosius b5a232b04e truth in advertising 
define parm types based on what is actually needed for the method to function
 2014-12-25 15:30:33 -05:00
Marcus Eriksson c37e7bfbbf Merge branch 'cassandra-2.1' into trunk 2014-12-24 14:05:55 +01:00
Marcus Eriksson b53fefa731 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
 2014-12-24 14:00:05 +01:00
Marcus Eriksson f981bd5969 Increase bloom filter true positive count on key cache hit 
Patch by marcuse; reviewed by thobbs for CASSANDRA-8525
 2014-12-24 13:57:00 +01:00
Benedict Elliott Smith 20ccf46f18 Merge branch 'cassandra-2.1' into trunk 2014-12-22 15:39:38 +00:00
Benedict Elliott Smith 5cff788efc ninja remove synchronized from MappedFileDataInput.readBytes 2014-12-22 15:39:29 +00:00
T Jake Luciani 977cbddc44 Merge branch 'cassandra-2.1' into trunk 2014-12-22 09:01:01 -05:00
T Jake Luciani 29ff2d26f8 Cassandra stress user defined writes should populate sequentially 
Patch by tjake; reviewed by Benedict for CASSANDRA-8524
 2014-12-22 08:59:12 -05:00
Aleksey Yeschenko bf599fb5b0 More Tracing OCD 2014-12-19 22:19:29 +03:00
Aleksey Yeschenko c0e3f66d60 Bring consistency to TraceKeyspace 2014-12-19 22:08:57 +03:00
Tyler Hobbs f45a1941c5 Merge branch 'cassandra-2.1' into trunk 2014-12-19 13:04:35 -06:00
blerer 9775a9c680 Improve cleanup of tables and types in CQL unit tests 
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8427
 2014-12-19 13:03:15 -06:00
Aleksey Yeschenko 4bfba64099 Merge branch 'cassandra-2.1' into trunk 2014-12-19 21:43:38 +03:00
Aleksey Yeschenko d9f5702d81 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/MeteredFlusher.java
	src/java/org/apache/cassandra/service/CassandraDaemon.java
 2014-12-19 21:42:52 +03:00
Aleksey Yeschenko 5f54285e9e Move MeteredFlusher to its own thread 
patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-8485
 2014-12-19 21:40:25 +03:00
Tyler Hobbs a164de3bee Merge branch 'cassandra-2.1' into trunk 2014-12-19 12:20:02 -06:00
Aleksey Yeschenko 4a88249df0 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/HintedHandOffManager.java
 2014-12-19 21:19:15 +03:00
Tyler Hobbs 6fe6d65d5a Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
	src/java/org/apache/cassandra/db/DataRange.java
	src/java/org/apache/cassandra/db/PagedRangeCommand.java
 2014-12-19 12:11:06 -06:00
Tyler Hobbs 2acbab6516 Fix DISTINCT on static columns with paging 
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-8087
 2014-12-19 12:02:00 -06:00
Aleksey Yeschenko 6f42afa2bb Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/HintedHandOffManager.java
 2014-12-19 20:38:02 +03:00
Aleksey Yeschenko 351e35b64a Move all hints related tasks to hints internal executor 
patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-8285
 2014-12-19 20:27:32 +03:00
Sylvain Lebresne 9616a88f7e Merge branch 'cassandra-2.1' into trunk 2014-12-19 18:07:35 +01:00
Sylvain Lebresne 7c6993f82b Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java
	src/java/org/apache/cassandra/service/pager/QueryPagers.java
 2014-12-19 18:02:01 +01:00
Sylvain Lebresne 621899355a Fix paging with multi-partition IN queries 
patch by thobbs; reviewed by slebresne for CASSANDRA-8408
 2014-12-19 17:53:46 +01:00
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