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

14272 Commits

Author SHA1 Message Date
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
Brandon Williams 1cb426b983 Fix loading set types in pig with the 2.1 client driver. 
Patch by Artem Aliev, reviewed by brandonwilliams for CASSANDRA-8577
 2015-01-13 10:23:28 -06:00
Brandon Williams 0757dc72f2 fix errant CPIF references 2015-01-12 11:57:53 -06:00
Yuki Morishita f136bacb92 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-01-12 11:51:00 -06:00
Jimmy Mårdell 9e5a4fad7d Make sstablemetadata work outside install dir 
patch by Jimmy Mårdell; reviewed by yukim for CASSANDRA-8579
 2015-01-12 11:50:25 -06: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 536408380a Include a Maps value type in DropTypeStatement's isUsedBy 
patch by dbrosius reviewed by thobbs for cassandra-8588
 2015-01-09 20:00:16 -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
T Jake Luciani df1f5ead09 fix debian changelog 2015-01-09 15:48:48 -05:00
T Jake Luciani 49d5c8d979 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-01-09 15:23:25 -05:00
T Jake Luciani 5b66997fa8 prep for 2.0.12 release 2015-01-09 15:21:49 -05: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 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
Dave Brosius 818ec33107 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-01-09 00:28:30 -05:00
Dave Brosius ed54e80855 fix typo causing bad format string marker 2015-01-09 00:27:47 -05: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
Tyler Hobbs 5674a96d4c Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
 2015-01-08 14:41:01 -06:00
Tyler Hobbs bd3c47ca73 Avoid expensive string op when trace logging is not enabled 2015-01-08 14:40:09 -06:00
Joshua McKenzie fb95309489 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/db/commitlog/CommitLog.java
	test/unit/org/apache/cassandra/db/CommitLogTest.java
 2015-01-08 12:59:45 -06:00
Bogdan Kanivets 5e797ebbad Prevent CommitLogTest failures from cascading 
Patch by Bogdan Kanivets; reviewed by jmckenzie for CASSANDRA-7713
 2015-01-08 12:56:46 -06:00
Yuki Morishita 5ac5ee666d Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	test/unit/org/apache/cassandra/db/DirectoriesTest.java
 2015-01-07 22:13:15 -06:00
Alan Boudreault ad37533097 Avoid creating dir in DirectoriesTest 
patch by Alan Boudreault; reviewed by yukim for CASSANDRA-6983
 2015-01-07 18:36:01 -06:00
Yuki Morishita dcc90ef35c Merge branch 'cassandra-2.0' into cassandra-2.1 2015-01-07 18:24:09 -06:00
Yuki Morishita 1eea314602 Fix test build 2015-01-07 18:19:28 -06:00
Tyler Hobbs 6afab52b27 ninja: fix column name in SELECT stmt error message 2015-01-07 17:11:01 -06:00
Tyler Hobbs 96365bf551 Ninja: fix minor unit test regression from CASSANDRA-8365 2015-01-07 14:29:07 -06:00
Joshua McKenzie bdbb071f4f Remove ref counting in SSTableScanner, fix CompactionTask ordering 
Patch by jmckenzie; reviewed by belliottsmith as a follow-up for CASSANDRA-8399
 2015-01-07 14:05:40 -06: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 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
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 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 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 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
Aleksey Yeschenko edf48f8173 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-01-07 02:25:59 +03:00
Aleksey Yeschenko e27cdf935c Revert "fix references to defunct CqlPagingInputFormat" 
This reverts commit e550ea6021.
 2015-01-07 02:25:09 +03:00
Yuki Morishita f8b43d4a81 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/service/StorageServiceMBean.java
	src/java/org/apache/cassandra/tools/NodeProbe.java
 2015-01-06 14:26:05 -06:00
Yuki Morishita e20810c7bd Remove C* specific class from JMX API 
This is follow up for CASSANDRA-8193
 2015-01-06 14:24:37 -06:00
Brandon Williams 136042ec39 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-01-06 09:31:05 -06:00
Brandon Williams eb9c5bbcfd Improve FD logging when the arrival time is ignored. 
Patch by Brandon Williams for CASSANDRA-8245
 2015-01-06 09:30:07 -06:00
Brandon Williams e83304ddfe Use lexical comparison for java revisions 
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-8315
 2015-01-06 08:24:48 -06:00
Aleksey Yeschenko 1af8ea5efc Merge branch 'cassandra-2.0' into cassandra-2.1 2015-01-05 22:48:37 +03:00
Aleksey Yeschenko a22308294d Add CONTRIBUTING.md 
See https://github.com/blog/1184-contributing-guidelines
Hopefully this will miminise the amount of pull requests we keep
getting.
 2015-01-05 22:45:53 +03:00
Benedict Elliott Smith c1374ae427 ninja fix CommitLogAllocator error suppression on shutdown for CASSANDRA-8474 2015-01-05 16:20:19 +00:00