[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5

[slebresne]

Merge branch 'cassandra-3.0' into cassandra-3.5


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

Branch: refs/heads/cassandra-3.5
Commit: 16d1c81163ea67363cdd402dff828e4e4d425998
Parents: ef86d91 db10cb2
Author: Sylvain Lebresne 
Authored: Fri Mar 18 10:54:31 2016 +0100
Committer: Sylvain Lebresne 
Committed: Fri Mar 18 10:54:31 2016 +0100

--

--

[6/6] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.5

[blerer]

Merge branch cassandra-3.0 into cassandra-3.5


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

Branch: refs/heads/cassandra-3.5
Commit: 8c83c8edab4f1c23c382bb0ac076cab44d5f4dda
Parents: a8dc14d 9c3855b
Author: Benjamin Lerer 
Authored: Fri Mar 4 22:12:33 2016 +0100
Committer: Benjamin Lerer 
Committed: Fri Mar 4 22:13:35 2016 +0100

--
 CHANGES.txt |1 +
 .../cassandra/cql3/SingleColumnRelation.java|4 -
 .../restrictions/StatementRestrictions.java |   25 +-
 .../cql3/statements/SelectStatement.java|   12 +-
 .../apache/cassandra/db/filter/RowFilter.java   |   50 +-
 .../index/internal/CassandraIndex.java  |   23 +-
 .../entities/FrozenCollectionsTest.java |3 +-
 .../validation/entities/SecondaryIndexTest.java |3 +-
 .../cql3/validation/operations/DeleteTest.java  |   10 +-
 .../SelectMultiColumnRelationTest.java  |   54 +-
 .../SelectSingleColumnRelationTest.java |   51 +-
 .../cql3/validation/operations/SelectTest.java  | 1063 +-
 .../cql3/validation/operations/UpdateTest.java  |8 +-
 .../apache/cassandra/index/CustomIndexTest.java |4 +-
 .../index/internal/CassandraIndexTest.java  |   34 +-
 15 files changed, 1199 insertions(+), 146 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c83c8ed/CHANGES.txt
--
diff --cc CHANGES.txt
index a6cae21,7204098..4c21d66
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.5
 +3.5
 +Merged from 3.0:
+  * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)
   * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
  Merged from 2.2:
   * Only log yaml config once, at startup (CASSANDRA-11217)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c83c8ed/src/java/org/apache/cassandra/cql3/SingleColumnRelation.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c83c8ed/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c83c8ed/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index d3a79d0,51d675b..2f4d468
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -702,9 -696,8 +696,7 @@@ public class SelectStatement implement
  // we want to include static columns and we're done.
  if (!partition.hasNext())
  {
- if (!staticRow.isEmpty()
- && (!restrictions.hasClusteringColumnsRestriction() || 
cfm.isStaticCompactTable())
- && !restrictions.hasRegularColumnsRestriction())
 -if (!staticRow.isEmpty() && 
(!restrictions.usesSecondaryIndexing() || cfm.isStaticCompactTable())
 -&& !restrictions.hasClusteringColumnsRestriction())
++if (!staticRow.isEmpty() && 
(!restrictions.hasClusteringColumnsRestriction() || cfm.isStaticCompactTable()))
  {
  result.newRow(protocolVersion);
  for (ColumnDefinition def : selection.getColumns())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c83c8ed/src/java/org/apache/cassandra/db/filter/RowFilter.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c83c8ed/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
--
diff --cc src/java/org/apache/cassandra/index/internal/CassandraIndex.java
index f503e59,74d3f5d..c3e75e0
--- a/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
+++ b/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
@@@ -5,12 -5,13 +5,11 @@@ import java.util.*
  import java.util.concurrent.Callable;
  import java.util.concurrent.Future;
  import java.util.function.BiFunction;
 -import java.util.regex.Matcher;
--import java.util.regex.Pattern;
  import java.util.stream.Collectors;
  import java.util.stream.StreamSupport;
  
  import com.google.common.collect.ImmutableSet;
- import org.apache.cassandra.index.TargetParser;
 -import