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

6394 Commits

Author SHA1 Message Date
Brandon Williams 8a4abdda1e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
 2015-01-13 11:28:07 -06:00
Brandon Williams 359d3bb2a6 Pig: Refactor and deprecate CqlStorage 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-8599
 2015-01-13 11:24:45 -06:00
Marcus Eriksson caeef17407 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
 2015-01-12 18:45:22 +01:00
Marcus Eriksson 75378c204c Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/Directories.java
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
 2015-01-12 18:43:47 +01:00
Marcus Eriksson c20d415833 Check for available disk space before starting a compaction. 
Patch by marcuse; reviewed by JoshuaMcKenzie for CASSANDRA-8562
 2015-01-12 11:35:53 +01:00
Dave Brosius fa0cc90393 Merge branch 'cassandra-2.1' into trunk 2015-01-09 19:59:14 -05:00
Dave Brosius e9061922da Merge branch 'cassandra-2.0' into cassandra-2.1 2015-01-09 19:58:44 -05:00
Dave Brosius e4fc395242 fix hints serialized size calculation 
patch by dbrosius reviewed by thobbs for cassandra-8587
 2015-01-09 19:50:54 -05:00
Christian Spriegel c6525da86e Add ReadFailureException, better TombstoneOE logging 
Patch by Christian Spriegel; reviewed by Tyler Hobbs for CASSANDRA-7886
 2015-01-09 13:30:22 -06:00
Tyler Hobbs 1657b4fbf9 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
 2015-01-09 11:22:33 -06:00
Tyler Hobbs 7f62e29286 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageProxy.java
 2015-01-09 11:19:37 -06:00
Tyler Hobbs dd62f7bf79 Fix DISTINCT queries w/ limits/paging and tombstoned partitions 
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-8490
 2015-01-09 11:14:54 -06:00
Marcus Eriksson d1a552dd78 Merge branch 'cassandra-2.1' into trunk 2015-01-09 07:34:30 +01:00
Marcus Eriksson 14b2d7a16b Don't use the same CleanupStrategy for all sstables 
Patch by marcuse; reviewed by thobbs for CASSANDRA-8537
 2015-01-09 07:33:17 +01:00
Aleksey Yeschenko 2fc3a8934b Merge branch 'cassandra-2.1' into trunk 2015-01-09 04:08:30 +03:00
Aleksey Yeschenko 8c5a959c97 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/auth/Auth.java
	src/java/org/apache/cassandra/service/ClientState.java
 2015-01-09 04:08:05 +03:00
Sam Tunnicliffe e750ab238e Introduce background cache refreshing to permissions cache 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-8194
 2015-01-09 04:02:32 +03:00
Joshua McKenzie 2b4029a763 Switch CommitLogSegment from RandomAccessFile to nio 
Patch by jmckenzie; reviewed by belliottsmith for CASSANDRA-8308
 2015-01-08 11:49:09 -06:00
blerer 493859bf61 Allow mixing token and partition key restrictions 
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-7016
 2015-01-07 14:06:28 -06:00
Benedict Elliott Smith 0a80fe4b57 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/streaming/StreamTransferTask.java
 2015-01-07 20:03:40 +00:00
Benedict Elliott Smith ddca610c9c Fix race condition in StreamTransferTask that could lead to 
infinite loops and premature sstable deletion

patch by benedict; reviewed by yukim for CASSANDRA-7704
 2015-01-07 20:03:17 +00:00
Aleksey Yeschenko 6041d41cd8 Merge branch 'cassandra-2.1' into trunk 2015-01-07 22:52:13 +03:00
Aleksey Yeschenko 561293d132 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/service/MigrationTask.java
 2015-01-07 22:51:42 +03:00
Benedict Elliott Smith eeaa3e0123 Fix race condition in StreamTransferTask that could lead to 
infinite loops and premature sstable deletion

patch by benedict; reviewed by yukim for CASSANDRA-7704
 2015-01-07 19:44:00 +00:00
Aleksey Yeschenko 8078a58f2e Add an extra version check to MigrationTask 
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-8462
 2015-01-07 22:39:00 +03:00
Tyler Hobbs 34f9c97a5e Merge branch 'cassandra-2.1' into trunk 2015-01-07 13:36:12 -06:00
blerer 68be72fdc6 Fix case-sensitivity of index name on CREATE/DROP INDEX 
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8365
 2015-01-07 13:35:20 -06:00
Joshua McKenzie ac27409e1b Merge branch 'cassandra-2.1' into trunk 2015-01-07 12:36:21 -06:00
Joshua McKenzie 905273e3e4 Better detection/logging for corruption in compressed sstables 
Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8192
 2015-01-07 12:35:11 -06:00
Marcus Eriksson 49dea41931 Merge branch 'cassandra-2.1' into trunk 2015-01-07 14:12:15 +01:00
Marcus Eriksson 2afe0e8803 Use the correct repairedAt value when closing writer 
Patch by marcuse; reviewed by benedict for CASSANDRA-8570
 2015-01-07 14:07:48 +01:00
Benedict Elliott Smith 729ebe078a Merge branch 'cassandra-2.1' into trunk 2015-01-07 13:05:33 +00:00
Benedict Elliott Smith 55750e07d2 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
	src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
	src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
	src/java/org/apache/cassandra/io/util/SequentialWriter.java
 2015-01-07 13:05:16 +00:00
Benedict Elliott Smith 3679b1bd27 Ensure SSTableWriter cleans up properly after failure 
patch by benedict; reviewed by marcuse
 2015-01-07 12:54:48 +00:00
Tyler Hobbs 1dcf66b093 Merge branch 'cassandra-2.1' into trunk 2015-01-02 12:15:11 -06:00
Tyler Hobbs aeb7d3f2ee cqlsh: handle schema mismatch on startup 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-8512
 2015-01-02 12:14:24 -06:00
Marcus Eriksson 0ba9c4775f Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
 2015-01-02 18:41:02 +01:00
Marcus Eriksson 4e1e92b310 Fix calculation of expected sstable size during compaction 
Patch by marcuse; reviewed by rstupp for CASSANDRA-8532
 2015-01-02 18:35:22 +01:00
Tyler Hobbs c11e1a9d8a Merge branch 'cassandra-2.1' into trunk 2015-01-02 11:21:57 -06:00
Tyler Hobbs 9f613ab42c Invalidate prepared stmts when table is altered 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7910
 2015-01-02 11:19:57 -06:00
Robert Stupp dcc3bb0541 Schema change events/results for UDFs and aggregates 
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7708
 2014-12-30 12:25:17 -06: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
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 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