[3/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-08-10 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d769f0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d769f0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d769f0c

Branch: refs/heads/trunk
Commit: 2d769f0c5721be06a7401c69f45cfddf4d8fc736
Parents: 8458e4e 465def8
Author: Tyler Hobbs 
Authored: Wed Aug 10 11:12:18 2016 -0500
Committer: Tyler Hobbs 
Committed: Wed Aug 10 11:12:18 2016 -0500

--
 CHANGES.txt |  2 ++
 src/java/org/apache/cassandra/net/MessageOut.java   |  2 +-
 src/java/org/apache/cassandra/net/MessagingService.java | 10 ++
 3 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d769f0c/CHANGES.txt
--
diff --cc CHANGES.txt
index 8fbd774,86746ad..9f7631d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -22,48 -17,6 +22,50 @@@ Merged from 3.0
 to connect with too low of a protocol version (CASSANDRA-11464)
   * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
   * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 +Merged from 2.2:
 + * Fix hanging stream session (CASSANDRA-10992)
 + * Fix INSERT JSON, fromJson() support of smallint, tinyint types 
(CASSANDRA-12371)
 + * Release sstables of failed stream sessions only when outgoing transfers 
are finished (CASSANDRA-11345)
 + * Wait for tracing events before returning response and query at same 
consistency level client side (CASSANDRA-11465)
 + * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 +Merged from 2.1:
 + * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
 + * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
 +
 +
 +3.8
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
++ * Fix potential bad messaging service message for paged range reads
++   within mixed-version 3.x clusters (CASSANDRA-12249)
   * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
   * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d769f0c/src/java/org/apache/cassandra/net/MessageOut.java
--

[3/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-26 Thread jbellis 
Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fe02b31
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fe02b31
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fe02b31

Branch: refs/heads/trunk
Commit: 5fe02b313144b3ccf71454d9aeb6a41384d9d989
Parents: addf9c2 1608699
Author: Jonathan Ellis 
Authored: Tue Jul 26 10:59:09 2016 -0500
Committer: Jonathan Ellis 
Committed: Tue Jul 26 10:59:09 2016 -0500

--

--

[3/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-15 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into cassandra-3.9


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/136f6b1c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/136f6b1c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/136f6b1c

Branch: refs/heads/trunk
Commit: 136f6b1c740184da6377ffc3afc9d3f03ba1a14e
Parents: b0ab12f 557c596
Author: Tyler Hobbs 
Authored: Fri Jul 15 17:56:32 2016 -0500
Committer: Tyler Hobbs 
Committed: Fri Jul 15 17:56:32 2016 -0500

--
 src/java/org/apache/cassandra/db/ReadResponse.java | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/136f6b1c/src/java/org/apache/cassandra/db/ReadResponse.java
--
diff --cc src/java/org/apache/cassandra/db/ReadResponse.java
index 140652d,2304cb4..05ebd00
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@@ -282,12 -282,17 +282,17 @@@ public abstract class ReadRespons
  
  // Pre-3.0, we didn't have a way to express exclusivity 
for non-composite comparators, so all slices were
  // inclusive on both ends. If we have exclusive slice 
ends, we need to filter the results here.
+ UnfilteredRowIterator iterator;
  if (!command.metadata().isCompound())
- return ThriftResultsMerger.maybeWrap(
- 
partition.unfilteredIterator(command.columnFilter(), 
filter.getSlices(command.metadata()), filter.isReversed()), command.nowInSec());
- 
- return ThriftResultsMerger.maybeWrap(
- 
partition.unfilteredIterator(command.columnFilter(), Slices.ALL, 
filter.isReversed()), command.nowInSec());
 -iterator = 
filter.filter(partition.sliceableUnfilteredIterator(command.columnFilter(), 
filter.isReversed()));
++iterator = 
partition.unfilteredIterator(command.columnFilter(), 
filter.getSlices(command.metadata()), filter.isReversed());
+ else
+ iterator = 
partition.unfilteredIterator(command.columnFilter(), Slices.ALL, 
filter.isReversed());
+ 
+ // Wrap results with a ThriftResultMerger only if they're 
intended for the thrift command.
+ if (command.isForThrift())
+ return ThriftResultsMerger.maybeWrap(iterator, 
command.nowInSec());
+ else
+ return iterator;
  }
  };
  }