[5/7] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-09-11 Thread jjirsa 
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: fadf2e8392bc41e75d475f9c6a141059c9480f6d
Parents: 0fdbcc3 433f24c
Author: Jeff Jirsa 
Authored: Mon Sep 11 09:35:58 2017 -0700
Committer: Jeff Jirsa 
Committed: Mon Sep 11 09:36:20 2017 -0700

--
 CHANGES.txt |   1 +
 .../cql3/statements/BatchStatement.java |  36 --
 .../cql3/statements/CQL3CasRequest.java |  32 ++
 .../cql3/statements/ModificationStatement.java  |  15 ++-
 .../org/apache/cassandra/cql3/BatchTests.java   |  51 +++--
 .../cql3/validation/operations/BatchTest.java   | 111 +++
 6 files changed, 220 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fadf2e83/CHANGES.txt
--
diff --cc CHANGES.txt
index 23e6c8b,76d155e..52775e7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -3.0.15
 +3.11.1
 + * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range 
movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Range deletes in a CAS batch are ignored (CASSANDRA-13655)
 + * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
   * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
   * Better handle corrupt final commitlog segment (CASSANDRA-11995)
   * StreamingHistogram is not thread safe (CASSANDRA-13756)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fadf2e83/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fadf2e83/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
index 5683af4,e14ae6c..47920a4
--- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
@@@ -226,8 -232,14 +232,10 @@@ public class CQL3CasRequest implements 
  PartitionUpdate update = new PartitionUpdate(cfm, key, 
updatedColumns(), conditions.size());
  for (RowUpdate upd : updates)
  upd.applyUpdates(current, update);
+ for (RangeDeletion upd : rangeDeletions)
+ upd.applyUpdates(current, update);
  
  Keyspace.openAndGetStore(cfm).indexManager.validate(update);
 -
 -if (isBatch)
 -BatchStatement.verifyBatchSize(Collections.singleton(update));
 -
  return update;
  }
  
@@@ -260,6 -272,29 +268,30 @@@
  }
  }
  
+ private class RangeDeletion
+ {
+ private final Slice slice;
+ private final ModificationStatement stmt;
+ private final QueryOptions options;
+ private final long timestamp;
+ 
+ private RangeDeletion(Slice slice, ModificationStatement stmt, 
QueryOptions options, long timestamp)
+ {
+ this.slice = slice;
+ this.stmt = stmt;
+ this.options = options;
+ this.timestamp = timestamp;
+ }
+ 
+ public void applyUpdates(FilteredPartition current, PartitionUpdate 
updates) throws InvalidRequestException
+ {
++// No slice statements currently require a read, but this 
maintains consistency with RowUpdate, and future proofs us
+ Map map = stmt.requiresRead() ? 
Collections.singletonMap(key, current) : null;
+ UpdateParameters params = new UpdateParameters(cfm, 
updates.columns(), options, timestamp, stmt.getTimeToLive(options), map);
+ stmt.addUpdateForKey(updates, slice, params);
+ }
+ }
+ 
  private static

[5/7] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2017-05-31 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 2bd135ebd136484766cd1a1083f9fd3ae8bfc8f9
Parents: 54ff619 80b7997
Author: Benjamin Lerer 
Authored: Wed May 31 15:23:46 2017 +0200
Committer: Benjamin Lerer 
Committed: Wed May 31 15:23:46 2017 +0200

--
 CHANGES.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bd135eb/CHANGES.txt
--
diff --cc CHANGES.txt
index 26a8018,6bdb283..4e72464
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,5 +1,42 @@@
 -3.0.14
 +3.11.0
 + * Fix formatting of duration columns in CQLSH (CASSANDRA-13549)
 + * Fix the problem with duplicated rows when using paging with SASI 
(CASSANDRA-13302)
 + * Allow CONTAINS statements filtering on the partition key and it’s parts 
(CASSANDRA-13275)
 + * Fall back to even ranges calculation in clusters with vnodes when tokens 
are distributed unevenly (CASSANDRA-13229)
 + * Fix duration type validation to prevent overflow (CASSANDRA-13218)
 + * Forbid unsupported creation of SASI indexes over partition key columns 
(CASSANDRA-13228)
 + * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369)
 + * UDA fails without input rows (CASSANDRA-13399)
 + * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188)
 + * V5 protocol flags decoding broken (CASSANDRA-13443)
 + * Use write lock not read lock for removing sstables from compaction 
strategies. (CASSANDRA-13422)
 + * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors 
(CASSANDRA-13329)
 + * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
 + * Add charset to Analyser input stream (CASSANDRA-13151)
 + * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
 + * cdc column addition strikes again (CASSANDRA-13382)
 + * Fix static column indexes (CASSANDRA-13277)
 + * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
 + * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
 + * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns 
(CASSANDRA-13247)
 + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern 
(CASSANDRA-13317)
 + * Possible AssertionError in UnfilteredRowIteratorWithLowerBound 
(CASSANDRA-13366)
 + * Support unaligned memory access for AArch64 (CASSANDRA-13326)
 + * Improve SASI range iterator efficiency on intersection with an empty range 
(CASSANDRA-12915).
 + * Fix equality comparisons of columns using the duration type 
(CASSANDRA-13174)
 + * Obfuscate password in stress-graphs (CASSANDRA-12233)
 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
 + * nodetool stopdaemon errors out (CASSANDRA-13030)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 + * Fix primary index calculation for SASI (CASSANDRA-12910)
 + * More fixes to the TokenAllocator (CASSANDRA-12990)
 + * NoReplicationTokenAllocator should work with zero replication factor 
(CASSANDRA-12983)
 + * Address message coalescing regression (CASSANDRA-12676)
 + * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
 + * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
 + * Tracing payload not passed from QueryMessage to tracing session 
(CASSANDRA-12835)
 +Merged from 3.0:
+  * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
   * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
   * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade 
(CASSANDRA-13525)
   * Fix repair process violating start/end token limits for small ranges 
(CASSANDRA-13052)
@@@ -69,35 -33,12 +70,33 @@@
   * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
   * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
   * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 - * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to 
LogRecord absolute path (CASSANDRA-13294)
 + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
 + * Cqlsh copy-from should error out when csv contains invalid data for 
collections (CASSANDRA-13071)
 + * Fix "multiple versions of ant detected..." when running ant test 
(CASSANDRA-13232)
 + * Coalescing strategy sleeps too much (CASSANDRA-13090)
 + * Faster StreamingHistogram (CASSANDRA-13038)
 + * Legacy

[5/7] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

2017-01-11 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 9c2ab25556fad06a6a4d58f4bb652719a8a1bc27
Parents: 1553d86 5774d8e
Author: Benjamin Lerer 
Authored: Wed Jan 11 21:27:28 2017 +0100
Committer: Benjamin Lerer 
Committed: Wed Jan 11 21:28:21 2017 +0100

--
 conf/cassandra-env.ps1 | 37 -
 1 file changed, 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c2ab255/conf/cassandra-env.ps1
--