Commit Graph

21285 Commits

Author SHA1 Message Date
Sylvain Lebresne 472a7c55bc Merge branch 'cassandra-3.9' into trunk
* cassandra-3.9:
  AssertionError with MVs on updating a row that isn't indexed due to a null value
2016-07-27 11:29:56 +02:00
Sylvain Lebresne e9e6a0d4e8 Merge branch 'cassandra-3.0' into cassandra-3.9
* cassandra-3.0:
  AssertionError with MVs on updating a row that isn't indexed due to a null value
2016-07-27 11:28:17 +02:00
Sylvain Lebresne 8d020e25c0 AssertionError with MVs on updating a row that isn't indexed due to a null value
patch by Sylvain Lebresne; reviewed by Carl Yeksigian for CASSANDRA-12247
2016-07-27 11:26:10 +02:00
Hiroyuki Nishi a59689ad81 COPY FROM should raise error for non-existing input files
patch by Hiroyuki Nishi; reviewed by Stefania Alborghetti for CASSANDRA-12174
2016-07-27 12:27:44 +08:00
Dave Brosius 6ca39ea424 Merge branch 'cassandra-3.9' into trunk 2016-07-26 20:22:07 -04:00
Dave Brosius aa64e65e1e Merge branch 'cassandra-3.8' into cassandra-3.9
Conflicts:
	CHANGES.txt
2016-07-26 20:20:52 -04:00
Dave Brosius b27e2f93cc c* uses commons-lang3, not commons-lang 2016-07-26 20:04:42 -04:00
Yuki Morishita c4c9b05700 Fix wrong buffer size
This is a bug from CASSANDRA-11580.
patch by yukim; reviewed by Stefania Alborghetti for CASSANDRA-12292
2016-07-26 18:08:44 -05:00
T Jake Luciani dc9ed46341 Improve write path performance
Patch by tjake; reviewed by Stefania Alborghetti for CASSANDRA-12269
2016-07-26 14:55:54 -04:00
Jonathan Ellis 2c0edce094 Merge branch 'cassandra-3.9' into trunk 2016-07-26 10:59:15 -05:00
Jonathan Ellis 5fe02b3131 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-26 10:59:09 -05:00
Jonathan Ellis 16086998e1 update cassandra.yaml comments post-CASSANDRA-10243 2016-07-26 10:58:44 -05:00
Jonathan Ellis 1eede6e381 Merge branch 'cassandra-3.9' into trunk 2016-07-26 10:58:21 -05:00
Jonathan Ellis addf9c2c8e Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-26 10:58:13 -05:00
Jonathan Ellis 023d2e98f1 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-26 10:54:55 -05:00
Jonathan Ellis 04ef62cba2 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-07-26 10:54:43 -05:00
Jonathan Ellis 48a45eda50 update cassandra.yaml comments post-CASSANDRA-10243 2016-07-26 10:54:31 -05:00
Carl Yeksigian accf7a4724 Merge branch 'cassandra-3.9' into trunk 2016-07-26 10:00:04 -04:00
Carl Yeksigian 67909ea84c Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-26 09:59:15 -04:00
Carl Yeksigian 6105da3f58 Disable RR and speculative retry with EACH_QUORUM reads
Patch by Carl Yeksigian; reviewed by Aleksey Yeschenko for CASSANDRA-11980
2016-07-26 09:58:06 -04:00
Carl Yeksigian d8ca69c01d Merge branch 'cassandra-3.9' into trunk 2016-07-26 08:59:12 -04:00
Carl Yeksigian 79fbdbe6c8 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-26 08:58:53 -04:00
Carl Yeksigian 0bb133e39d Add option to override compaction space check
Patch by Sankalp Kohli; reviewed by Carl Yeksigian for CASSANDRA-12180
2016-07-26 08:49:56 -04:00
Dave Brosius 0f6461849c push down logging code to where it's used 2016-07-26 00:53:47 -04:00
Yuki Morishita c8a365309c ninja: remove unused imports 2016-07-25 10:46:13 -05:00
Stefania Alborghetti 78a91dbe75 Merge branch 'cassandra-3.9' into trunk 2016-07-25 09:24:46 +08:00
Stefania Alborghetti 9501c64f6d Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-25 09:24:17 +08:00
Stefania Alborghetti 659be5f5e7 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-25 09:23:00 +08:00
Stefania Alborghetti b92ab60f72 cqlsh copyutil should get host metadata by connected address
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11979
2016-07-25 09:21:15 +08:00
Stefania Alborghetti d588af1856 Merge branch 'cassandra-3.9' into trunk 2016-07-25 08:45:56 +08:00
Stefania Alborghetti 7ca3e28cd5 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-25 08:45:04 +08:00
Stefania Alborghetti c3bf2f47b9 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-25 08:41:55 +08:00
Stefania Alborghetti 3a7cfbd19b Merge branch 'cassandra-2.1' into cassandra-2.2 2016-07-25 08:40:35 +08:00
Stefania Alborghetti 3d3359eb95 cannot use cql since upgrading python to 2.7.11+
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11850
2016-07-25 08:39:12 +08:00
Dave Brosius eaa06942a6 fail fast if the system property 'legacy-sstable-root' is not set properly 2016-07-23 20:52:07 -04:00
Dave Brosius e7064b2d49 remove dead field 2016-07-23 00:01:48 -04:00
Dave Brosius 8d317b1d30 bypass key column restriction tests if allowFiltering is true 2016-07-22 19:33:43 -04:00
Dave Brosius 52c81d7b62 use Collections.emptyMap() to more clearly document that that case is a no-op operation 2016-07-22 19:15:59 -04:00
Dave Brosius be24013bd8 fix logging context 2016-07-22 18:47:58 -04:00
Jonathan Ellis 286f6a1435 Remove compaction Severity from DynamicEndpointSnitch
patch by jbellis; reviewed by Jeremiah Jordan for CASSANDRA-11738
2016-07-22 17:24:22 -05:00
Josh McKenzie a8f6a69452 Merge branch 'cassandra-3.9' into trunk 2016-07-22 12:35:24 -04:00
Josh McKenzie ed9014818c Fix CommitLogStressTest timeout
Patch by jmckenzie; reviewed by blambov for CASSANDRA-12207
2016-07-22 12:34:52 -04:00
Jonathan Ellis bfa1acd311 update CHANGES 2016-07-21 10:19:47 -05:00
Jonathan Ellis a5930afa35 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-07-21 10:19:06 -05:00
Jonathan Ellis ad1dcefe8e update CHANGES 2016-07-21 10:18:56 -05:00
Jonathan Ellis c7a25972e9 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-07-21 10:17:57 -05:00
Jonathan Ellis ba068472b3 Revert "Reduce contention getting instances of CompositeType"
This reverts commit fda3d8ee25.

(See thread at https://mail-archives.apache.org/mod_mbox/cassandra-dev/201607.mbox/%3CCALdd-zjg%2Ba73VncPkU2rw_UpFPVsw0yNwO-yBqUQfK8H8FpiKw%40mail.gmail.com%3E)
2016-07-21 10:17:31 -05:00
Jonathan Ellis e865e88753 Revert "Range tombstones that are masked by row tombstones should not be written out"
This reverts commit 98f5f77bb3.

(See thread at https://mail-archives.apache.org/mod_mbox/cassandra-dev/201607.mbox/%3CCALdd-zjg%2Ba73VncPkU2rw_UpFPVsw0yNwO-yBqUQfK8H8FpiKw%40mail.gmail.com%3E)
2016-07-21 10:15:41 -05:00
Aleksey Yeschenko e7dcbd64a8 Merge branch 'cassandra-3.9' into trunk 2016-07-21 15:03:55 +01:00
Aleksey Yeschenko 5e111e64d0 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-21 15:03:45 +01:00