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

14602 Commits

Author SHA1 Message Date
Jim Witschey 879691dd35 cqlsh: Add tests for INSERT, UPDATE tab completion 
Patch by Jim Witschey; reviewed by Tyler Hobbs for CASSANDRA-9125
 2015-04-07 17:23:11 -05:00
Tyler Hobbs cb8cb5f99d cqlsh: quote column names in COPY FROM inserts 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-9080
 2015-04-07 16:26:42 -05:00
Yuki Morishita 1c0a8d58aa Merge branch 'cassandra-2.0' into cassandra-2.1 2015-04-07 13:09:45 -05:00
Yuki Morishita 59ba098d29 initialize IndexBuilder before updating digest to avoid NPE (follow up CASSANDRA-8979) 2015-04-07 13:01:46 -05:00
Aleksey Yeschenko e8cdaf127a Merge branch 'cassandra-2.0' into cassandra-2.1 2015-04-07 20:56:01 +03:00
Robert Stupp 2641424247 Add generate-idea-files target to build.xml 
Patch by Robert Stupp; Reviewed by T Jake Luciani for CASSANDRA-9123
 2015-04-07 18:12:16 +02:00
Carl Yeksigian 922a2c49b6 Backport CASSANDRA-6863 without digest updates 
patch by Carl Yeksigan; reviewed by Sam Tunnicliffe for CASSANDRA-8989
 2015-04-07 17:07:40 +03:00
Benedict Elliott Smith 2057a34cbb Do not load read meters for offline operations 
patch by benedict; reviewed by tyler for CASSANDRA-9082
 2015-04-03 23:00:59 +01:00
Tyler Hobbs f7162293d2 cqlsh: fix formatting of map keys and values 
Patch by Tyler Hobbs; reviewed by Philip Thompson for CASSANDRA-9114
 2015-04-03 15:17:20 -05:00
Marcus Eriksson e4072cf09f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java
 2015-04-03 20:58:15 +02:00
Marcus Eriksson 67038a32e1 Don't include tmp files in offline relevel 
Patch by marcuse; reviewed by carlyeks for CASSANDRA-9088
 2015-04-03 20:53:23 +02:00
Yuki Morishita 9449a70162 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-04-03 09:19:31 -05:00
Stefan Podkowinski 2e6492a183 Digest will now always updated for non-empty rows 
Also reverted PreCompactedRow.

Another follow up on CASSANDRA-8979
 2015-04-03 08:21:05 -05:00
Sylvain Lebresne 49d64c23ba Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-04-01 21:43:35 +02:00
Sylvain Lebresne c8ab96d170 Use CAS WriteType when replaying previous rounds in Paxos 
patch by Stefan Podkowinski; reviewed by slebresne for CASSANDRA-8672
 2015-04-01 21:27:00 +02:00
Blake Eggleston 2fa18d3a9f Upgraded bundled python driver to 2.5.0 
Patch by Blake Eggleston; reviewed by Tyler Hobbs for CASSANDRA-9081 and
CASSANDRA-8919
 2015-04-01 13:03:20 -05:00
Jeff Jirsa cc672f3615 Fix NPE when deleting/setting by index on null list collection 
Patch by Jeff Jirsa; reviewed by Benjamin Lerer for CASSANDRA-9077
 2015-04-01 12:13:52 -05:00
T Jake Luciani 28af4fa04f fix import spacing 2015-04-01 11:13:18 -04:00
T Jake Luciani 150f827364 Merge branch 'cassandra-2.1.4-build' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	NEWS.txt
 2015-04-01 10:56:05 -04:00
T Jake Luciani beb5ffd078 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-04-01 10:49:53 -04:00
T Jake Luciani 38a04eab6a Merge branch 'cassandra-2.0.14-build' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
 2015-04-01 10:45:51 -04:00
Marcus Eriksson 730cc60640 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
 2015-04-01 14:39:50 +02:00
Marcus Eriksson 2cf4ca3a94 Avoid race in cancelling compactions 
Patch by marcuse; reviewed by yukim for CASSANDRA-9070
 2015-04-01 14:32:47 +02:00
Marcus Eriksson 0ba5f2721b Fix merge from CASSANDRA-8359 2015-04-01 13:14:40 +02:00
Marcus Eriksson 52191ebe33 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
 2015-04-01 12:56:21 +02:00
Björn Hegerfors 3d0c4e78c6 More aggressive check for expired sstables in DTCS 
Patch by Björn Hegerfors; reviewed by marcuse for CASSANDRA-8359
 2015-04-01 12:32:09 +02:00
Yuki Morishita c9b83e0a81 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-31 11:57:31 -05:00
Oleg Anastasyev 74bfa773a2 remove unnecessary BB allocatetion; follow up for CASSANDRA-8979 2015-03-31 11:57:14 -05:00
Tyler Hobbs eed27ac3e5 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-31 11:55:49 -05:00
Tyler Hobbs ec958f05e4 Don't set clientMode when bulk-loading 
Backport of CASSANDRA-8238 to 2.0 by Tyler Hobbs
 2015-03-31 11:54:54 -05:00
Tyler Hobbs aaee407ddc Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/cql3/AlterTableTest.java
 2015-03-31 11:26:23 -05:00
Stefania Alborghetti 88b2f38326 Update indexInterval in CFMetadata.apply() 
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-7976
 2015-03-31 11:17:15 -05:00
Brandon Williams 963dd54b71 make default max_hint_window_in_ms 3 hours 
Patch by Jeff Jirsa, reviewed by brandonwilliams for CASSANDRA-9076
 2015-03-31 10:20:39 -05:00
Marcus Eriksson 994eb2fa71 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-03-31 12:53:03 +02:00
Björn Hegerfors f7116c91b2 Don't wait for min_threshold sstables in the same window in DTCS 
Patch by Björn Hegerfors; reviewed by marcuse for CASSANDRA-8360
 2015-03-31 12:51:08 +02:00
Robert Stupp a2b66bf106 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-31 11:21:15 +02:00
Benedict Elliott Smith c94da6c63e java.lang.AssertionError when reading saved cache 
Patch by Benedict Elliott Smith; Reviewed by Robert Stupp for CASSANDRA-8740
 2015-03-31 11:17:58 +02:00
Robert Stupp 3575cd3563 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-31 10:50:06 +02:00
Robert Stupp 1e09482a38 "disk full" when running cleanup (on a far from full disk) 
Patch by Robert Stupp; Reviewed by Yuki Morishita for CASSANDRA-9036
 2015-03-31 10:48:43 +02:00
Yuki Morishita 5abab57b93 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-30 17:02:11 -05:00
Yifu Wang 0ff9c3cb22 Allow reusing snapshot tags across different column families. 
patch by Yifu Wang; reviewed by yukim for CASSANDRA-8056
 2015-03-30 16:59:31 -05:00
T Jake Luciani 2433068c15 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:40:38 -04:00
T Jake Luciani c041ea8b37 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:38:50 -04:00
Carl Yeksigian 6ee4b0989d Fix sorted docs in CQLSSTableWriter 2015-03-30 10:59:55 +03:00
Gustav Munkby d3258f6152 Buffer bloom filter serialization 
patch by Gustav Munkby; reviewed by benedict for CASSANDRA-9066
 2015-03-29 16:19:54 +01:00
Gustav Munkby b0de327099 Fix anti-compaction target bloom filter size 
patch by Gustav Munkby; reviewed by benedict for CASSANDRA-9060
 2015-03-29 16:19:54 +01:00
Robert Stupp 7b1331fed5 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-28 12:20:01 +01:00
Robert Stupp 102f59c649 Add debug level logging to Directories.getWriteableLocation 
Patch by Robert Stupp; Reviewed by Yuki Morishita for CASSANDRA-9050
 2015-03-28 12:19:00 +01:00
Yuki Morishita 8715fff24e Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-27 16:31:03 -05:00
Yuki Morishita 4e7fbfe6d3 Remove unnecessary statement that I forgot to remove... 2015-03-27 16:30:45 -05:00