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

[ifesdjeen]

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/4734ce7d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4734ce7d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4734ce7d

Branch: refs/heads/trunk
Commit: 4734ce7d94945126e40ec14c8eb2c305e768c6d1
Parents: 3e3d56e ce8c9b5
Author: Alex Petrov 
Authored: Mon Sep 25 09:31:10 2017 +0200
Committer: Alex Petrov 
Committed: Mon Sep 25 09:31:10 2017 +0200

--
 CHANGES.txt |   2 +
 .../org/apache/cassandra/config/CFMetaData.java | 199 +++-
 .../apache/cassandra/cql3/AbstractMarker.java   |   9 +-
 .../apache/cassandra/cql3/ColumnCondition.java  |   6 +
 .../apache/cassandra/cql3/ColumnConditions.java |   6 +
 .../org/apache/cassandra/cql3/Constants.java|   3 +-
 src/java/org/apache/cassandra/cql3/Maps.java|  85 ++
 .../cassandra/cql3/MultiColumnRelation.java |  64 +-
 .../org/apache/cassandra/cql3/Operation.java|  81 ++
 .../org/apache/cassandra/cql3/Relation.java |   9 +
 .../cassandra/cql3/SingleColumnRelation.java|  76 +-
 .../cql3/SuperColumnCompatibility.java  | 763 +++
 .../apache/cassandra/cql3/UpdateParameters.java |   9 +-
 .../org/apache/cassandra/cql3/WhereClause.java  |  13 +-
 .../ClusteringColumnRestrictions.java   |   4 +
 .../restrictions/SingleColumnRestriction.java   | 207 +++-
 .../restrictions/StatementRestrictions.java |  27 +-
 .../cassandra/cql3/restrictions/TermSlice.java  |   2 +-
 .../cql3/statements/CreateViewStatement.java|   2 +
 .../cql3/statements/DeleteStatement.java|  30 +-
 .../cql3/statements/ModificationStatement.java  |  15 +-
 .../cql3/statements/SelectStatement.java|  56 +-
 .../cql3/statements/UpdateStatement.java|  88 +-
 src/java/org/apache/cassandra/db/Columns.java   |   1 +
 .../org/apache/cassandra/db/CompactTables.java  |  46 +-
 .../org/apache/cassandra/db/LegacyLayout.java   |   3 +-
 .../cassandra/db/SerializationHeader.java   |   1 +
 .../cassandra/schema/LegacySchemaMigrator.java  |  39 +-
 .../cassandra/thrift/CassandraServer.java   |   7 +-
 .../cassandra/thrift/ThriftConversion.java  |  14 +-
 .../unit/org/apache/cassandra/SchemaLoader.java |  19 +-
 .../org/apache/cassandra/cql3/ViewTest.java |  29 +
 .../cql3/validation/ThriftIntegrationTest.java  | 942 +++
 .../validation/operations/ThriftCQLTester.java  |  90 ++
 .../db/ColumnFamilyStoreCQLHelperTest.java  |  12 +-
 .../schema/LegacySchemaMigratorTest.java|  13 +-
 36 files changed, 2772 insertions(+), 200 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4734ce7d/CHANGES.txt
--
diff --cc CHANGES.txt
index 8fc72fc,7745e8c..06d62b8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,7 +1,18 @@@
 -3.0.15
 - * Fix support for SuperColumn tables (CASSANDRA-12373)
 +3.11.1
++===
   * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
 - * Fix missing original update in TriggerExecutor (CASSANDRA-13894)
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * 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:
++ * Fix support for SuperColumn tables (CASSANDRA-12373)
   * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
   * Improve short read protection performance (CASSANDRA-13794)
   * Fix sstable reader to support range-tombstone-marker for multi-slices 
(CASSANDRA-13787)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4734ce7d/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 14a605b,fd1c9e5..77cad1a
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ 

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

[paulo]

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/3e3d56ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e3d56ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e3d56ec

Branch: refs/heads/cassandra-3.11
Commit: 3e3d56ecd41f04a31a60a4811702873d9aa57aad
Parents: 0e5c84a 68bdf45
Author: Paulo Motta 
Authored: Mon Sep 25 01:01:31 2017 -0500
Committer: Paulo Motta 
Committed: Mon Sep 25 01:01:47 2017 -0500

--
 CHANGES.txt |   1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |   5 +-
 .../org/apache/cassandra/db/ReadCommand.java|   3 +-
 .../db/SinglePartitionReadCommand.java  |   9 +-
 .../apache/cassandra/db/filter/DataLimits.java  | 111 ---
 .../db/partitions/CachedBTreePartition.java |   3 +-
 .../apache/cassandra/db/rows/AbstractRow.java   |   6 +-
 src/java/org/apache/cassandra/db/rows/Row.java  |   7 +-
 .../cassandra/db/view/ViewUpdateGenerator.java  |   6 +-
 .../composites/ClusteringColumnIndex.java   |   5 +-
 .../internal/composites/PartitionKeyIndex.java  |   4 +-
 .../apache/cassandra/service/DataResolver.java  |   6 +-
 .../apache/cassandra/service/StorageProxy.java  |  12 +-
 .../service/pager/AbstractQueryPager.java   |   4 +-
 .../cassandra/service/pager/QueryPagers.java|   2 +-
 .../org/apache/cassandra/cql3/CachingBench.java |   3 +-
 .../cassandra/cql3/GcCompactionBench.java   |   3 +-
 .../apache/cassandra/cql3/GcCompactionTest.java |   3 +-
 .../apache/cassandra/cql3/ViewComplexTest.java  |  65 ++-
 .../org/apache/cassandra/cql3/ViewTest.java |   2 +
 .../apache/cassandra/db/RangeTombstoneTest.java |  35 --
 .../db/compaction/CompactionsPurgeTest.java |   3 +-
 22 files changed, 226 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e3d56ec/CHANGES.txt
--
diff --cc CHANGES.txt
index eb2ccc0,9cba02b..8fc72fc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,6 +1,16 @@@
 -3.0.15
 +3.11.1
+  * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
 - * Fix missing original update in TriggerExecutor (CASSANDRA-13894)
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is 
a single leaf and overflow collisions (CASSANDRA-13869)
 + * 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:
   * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
   * Improve short read protection performance (CASSANDRA-13794)
   * Fix sstable reader to support range-tombstone-marker for multi-slices 
(CASSANDRA-13787)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e3d56ec/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e3d56ec/src/java/org/apache/cassandra/db/ReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/ReadCommand.java
index bb4d5e8,160b104..4f3c66f
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@@ -462,7 -449,8 +462,8 @@@ public abstract class ReadCommand exten
  private final int failureThreshold = 
DatabaseDescriptor.getTombstoneFailureThreshold();
  private final int warningThreshold = 
DatabaseDescriptor.getTombstoneWarnThreshold();
  
 -private final boolean respectTombstoneThresholds = 
!Schema.isSystemKeyspace(ReadCommand.this.metadata().ksName);
 +private final boolean respectTombstoneThresholds = 
!SchemaConstants.isSystemKeyspace(ReadCommand.this.metadata().ksName);
+ private final boolean enforceStrictLiveness = 
metadata.enforceStrictLiveness();
  
  private int liveRows = 0;
  private int tombstones = 0;

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

[jasobrown]

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/031d76c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/031d76c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/031d76c9

Branch: refs/heads/cassandra-3.11
Commit: 031d76c9b4bcf7a3da735cc15d32b5a88be7aeda
Parents: 35dc3b6 e817c83
Author: Jason Brown 
Authored: Tue Aug 29 08:36:58 2017 -0700
Committer: Jason Brown 
Committed: Tue Aug 29 08:36:58 2017 -0700

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

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

[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/8d98a992
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d98a992
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d98a992

Branch: refs/heads/cassandra-3.11
Commit: 8d98a99231f38102d0ef572ffe948d705169aae4
Parents: 07f cf0b6d1
Author: Benjamin Lerer 
Authored: Thu Aug 24 18:21:08 2017 +0200
Committer: Benjamin Lerer 
Committed: Thu Aug 24 18:22:13 2017 +0200

--
 CHANGES.txt |   1 +
 .../cassandra/db/SerializationHeader.java   |  13 +-
 .../db/rows/AbstractTypeVersionComparator.java  | 121 
 src/java/org/apache/cassandra/db/rows/Row.java  |  18 +-
 src/java/org/apache/cassandra/db/rows/Rows.java |  22 ++-
 .../io/sstable/format/SSTableReader.java|  20 +-
 .../org/apache/cassandra/cql3/CQLTester.java|  20 +-
 .../cql3/validation/entities/UserTypesTest.java | 151 +++
 .../rows/AbstractTypeVersionComparatorTest.java | 188 +++
 9 files changed, 533 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d98a992/CHANGES.txt
--
diff --cc CHANGES.txt
index d39f78c,ba35152..8fb8e2f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -3.0.15
 +3.11.1
 + * 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:
+  * Fix the merging of cells with different user type versions 
(CASSANDRA-13776)
   * Copy session properties on cqlsh.py do_login (CASSANDRA-13640)
   * Potential AssertionError during ReadRepair of range tombstone and 
partition deletions (CASSANDRA-13719)
   * Don't let stress write warmup data if n=0 (CASSANDRA-13773)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d98a992/src/java/org/apache/cassandra/db/SerializationHeader.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d98a992/src/java/org/apache/cassandra/db/rows/Row.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d98a992/src/java/org/apache/cassandra/db/rows/Rows.java
--
diff --cc src/java/org/apache/cassandra/db/rows/Rows.java
index a92bdac,09213a4..3331506
--- a/src/java/org/apache/cassandra/db/rows/Rows.java
+++ b/src/java/org/apache/cassandra/db/rows/Rows.java
@@@ -26,9 -25,7 +26,8 @@@ import org.apache.cassandra.config.CFMe
  import org.apache.cassandra.config.ColumnDefinition;
  import org.apache.cassandra.db.*;
  import org.apache.cassandra.db.partitions.PartitionStatisticsCollector;
- import org.apache.cassandra.db.rows.Row.Deletion;
  import org.apache.cassandra.utils.MergeIterator;
 +import org.apache.cassandra.utils.WrappedInt;
  
  /**
   * Static utilities to work on Row objects.
@@@ -330,78 -312,20 +330,96 @@@ public abstract class Row
  }
  
  /**
 + * Returns a row that is obtained from the given existing row by removing 
everything that is shadowed by data in
 + * the update row. In other words, produces the smallest result row such 
that
 + * {@code merge(result, update, nowInSec) == merge(existing, update, 
nowInSec)} after filtering by rangeDeletion.
 + *
 + * @param existing source row
 + * @param update shadowing row
 + * @param rangeDeletion extra {@code DeletionTime} from covering tombstone
 + * @param nowInSec the current time in seconds (which plays a role during 
reconciliation
 + * because deleted cells always have precedence on timestamp equality and 
deciding if a
 + * cell is a live or not depends on the current time due to expiring 
cells).
 + */
 +public static Row removeShadowedCells(Row existing, Row update, 
DeletionTime rangeDeletion, int nowInSec)
 +{
 +Row.Builder builder = BTreeRow.sortedBuilder();
 +Clustering clustering = existing.clustering();
 +builder.newRow(clustering);
 +
 +DeletionTime deletion = update.deletion().time();
 +if (rangeDeletion.supersedes(deletion))
 +deletion = rangeDeletion;
 +
 +LivenessInfo 

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

[adelapena]

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/47a2839b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47a2839b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47a2839b

Branch: refs/heads/cassandra-3.11
Commit: 47a2839bf094a7fa9bad6de140fba486756c49bf
Parents: 15abe2d 3960260
Author: Andrés de la Peña 
Authored: Tue Aug 8 15:01:04 2017 +0100
Committer: Andrés de la Peña 
Committed: Tue Aug 8 15:01:04 2017 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/config/ColumnDefinition.java  | 19 ---
 .../apache/cassandra/db/rows/AbstractCell.java  |  2 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java  |  2 +-
 .../apache/cassandra/tools/JsonTransformer.java | 31 --
 .../org/apache/cassandra/cql3/ViewTest.java | 33 
 .../cassandra/index/sasi/SASIIndexTest.java | 14 +
 7 files changed, 94 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/47a2839b/CHANGES.txt
--
diff --cc CHANGES.txt
index b8c4bde,1525289..b778df6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -3.0.15
 +3.11.1
 + * "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:
+  * Fix ColumnDefinition.cellValueType() for non-frozen collection and change 
SSTabledump to use type.toJSONString() (CASSANDRA-13573)
   * Skip materialized view addition if the base table doesn't exist 
(CASSANDRA-13737)
   * Drop table should remove corresponding entries in dropped_columns table 
(CASSANDRA-13730)
   * Log warn message until legacy auth tables have been migrated 
(CASSANDRA-13371)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/47a2839b/src/java/org/apache/cassandra/config/ColumnDefinition.java
--
diff --cc src/java/org/apache/cassandra/config/ColumnDefinition.java
index ea508d2,6a0f530..159ea0c
--- a/src/java/org/apache/cassandra/config/ColumnDefinition.java
+++ b/src/java/org/apache/cassandra/config/ColumnDefinition.java
@@@ -446,197 -398,17 +448,206 @@@ public class ColumnDefinition extends C
   */
  public AbstractType cellValueType()
  {
- return type instanceof CollectionType
-  ? ((CollectionType)type).valueComparator()
-  : type;
+ assert !(type instanceof UserType && type.isMultiCell());
+ return type instanceof CollectionType && type.isMultiCell()
+ ? ((CollectionType)type).valueComparator()
+ : type;
+ }
+ 
+ 
+ public boolean isCounterColumn()
+ {
+ if (type instanceof CollectionType) // for thrift
+ return ((CollectionType) type).valueComparator().isCounter();
+ return type.isCounter();
  }
 +
 +public Selector.Factory newSelectorFactory(CFMetaData cfm, 
AbstractType expectedType, List defs, 
VariableSpecifications boundNames) throws InvalidRequestException
 +{
 +return SimpleSelector.newFactory(this, addAndGetIndex(this, defs));
 +}
 +
 +public AbstractType getExactTypeIfKnown(String keyspace)
 +{
 +return type;
 +}
 +
 +/**
 + * Because Thrift-created tables may have a non-text comparator, we 
cannot determine the proper 'key' until
 + * we know the comparator. ColumnDefinition.Raw is a placeholder that can 
be converted to a real ColumnIdentifier
 + * once the comparator is known with prepare(). This should only be used 
with identifiers that are actual
 + * column names. See CASSANDRA-8178 for more background.
 + */
 +public static abstract class Raw extends Selectable.Raw
 +{
 +/**
 + * Creates a {@code ColumnDefinition.Raw} from an unquoted identifier 
string.
 + */
 +public static Raw forUnquoted(String text)
 +{
 +return new Literal(text, false);
 +}
 +
 +/**
 + * Creates a {@code ColumnDefinition.Raw} from a quoted identifier 
string.
 + */
 +public static Raw forQuoted(String text)
 +{
 +return new Literal(text, true);
 +}
 +
 +/**
 + * Creates a {@code ColumnDefinition.Raw} from a pre-existing {@code 
ColumnDefinition}
 + * (useful in the rare cases where we already have the column but need
 + * 

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

[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/7aa89a64
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7aa89a64
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7aa89a64

Branch: refs/heads/trunk
Commit: 7aa89a64e09c57061418c1d83c03ae7cfd0cd745
Parents: bd89f56 e2445cf
Author: Benjamin Lerer 
Authored: Fri Jul 14 17:18:19 2017 +0200
Committer: Benjamin Lerer 
Committed: Fri Jul 14 17:19:38 2017 +0200

--
 CHANGES.txt |   6 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  |   3 +-
 src/java/org/apache/cassandra/db/DataRange.java |   5 +
 .../cassandra/db/PartitionRangeReadCommand.java |   6 +
 .../org/apache/cassandra/db/ReadCommand.java|   2 +-
 src/java/org/apache/cassandra/db/ReadQuery.java |  12 +
 .../db/SinglePartitionReadCommand.java  |  22 +-
 .../apache/cassandra/db/filter/DataLimits.java  |  82 +++---
 .../apache/cassandra/db/filter/RowFilter.java   |  15 +
 .../apache/cassandra/service/CacheService.java  |   2 +-
 .../apache/cassandra/service/DataResolver.java  |   4 +-
 .../apache/cassandra/service/StorageProxy.java  |   8 +-
 .../service/pager/AbstractQueryPager.java   |   2 +-
 .../service/pager/MultiPartitionPager.java  |   9 +-
 .../cassandra/service/pager/QueryPagers.java|   2 +-
 .../org/apache/cassandra/cql3/CQLTester.java|   8 +-
 .../validation/operations/SelectLimitTest.java  | 279 +++
 .../db/rows/UnfilteredRowIteratorsTest.java |  10 +-
 18 files changed, 418 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aa89a64/CHANGES.txt
--
diff --cc CHANGES.txt
index e7ad6fb,c916452..edd66e2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -6,53 -2,16 +6,53 @@@ Merged from 3.0
   * Make concat work with iterators that have different subsets of columns 
(CASSANDRA-13482)
   * Set test.runners based on cores and memory size (CASSANDRA-13078)
   * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 - * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
   * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
   * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
 - Merged from 2.2:
 -  * Fix queries with LIMIT and filtering on clustering columns 
(CASSANDRA-11223)
 -  * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
 -  * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)
 -  * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
 +Merged from 2.2:
-   * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
-   * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)
-   * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
++ * Fix queries with LIMIT and filtering on clustering columns 
(CASSANDRA-11223)
++ * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
++ * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) 
 * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
  
 -3.0.14
 +3.11.0
 + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
 + * Replace string comparison with regex/number checks in MessagingService 
test (CASSANDRA-13216)
 + * 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 

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

[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/5c9db9af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c9db9af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c9db9af

Branch: refs/heads/cassandra-3.11
Commit: 5c9db9af96daeda02610623ccd8587b0a1510d4d
Parents: 88fa169 e22cb27
Author: Benjamin Lerer 
Authored: Thu Jun 1 10:14:19 2017 +0200
Committer: Benjamin Lerer 
Committed: Thu Jun 1 10:17:09 2017 +0200

--
 CHANGES.txt |  1 +
 NEWS.txt|  2 +
 doc/source/operating/metrics.rst|  2 +-
 .../cassandra/db/PartitionRangeReadCommand.java | 20 -
 .../db/SinglePartitionReadCommand.java  | 86 ++--
 .../org/apache/cassandra/db/StorageHook.java| 64 +--
 .../UnfilteredRowIteratorWithLowerBound.java| 10 ++-
 .../io/sstable/format/SSTableReader.java| 72 ++--
 .../io/sstable/format/SSTableReadsListener.java | 82 +++
 .../io/sstable/format/big/BigTableReader.java   | 42 ++
 .../io/sstable/format/big/BigTableScanner.java  | 41 --
 .../miscellaneous/SSTablesIteratedTest.java | 69 +++-
 .../cassandra/db/compaction/TTLExpiryTest.java  |  6 +-
 .../sstable/SSTableCorruptionDetectionTest.java |  8 +-
 .../io/sstable/SSTableScannerTest.java  |  3 +-
 .../cassandra/io/sstable/SSTableWriterTest.java |  8 +-
 .../sstable/format/ClientModeSSTableTest.java   |  7 +-
 17 files changed, 415 insertions(+), 108 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c9db9af/CHANGES.txt
--
diff --cc CHANGES.txt
index b28f75f,4232084..2c96521
--- 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:
+  * Fix the reported number of sstable data files accessed per read 
(CASSANDRA-13120)