You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/08/27 17:34:40 UTC
[1/3] cassandra git commit: Fix Columns.contains()
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 f3e04b0c8 -> ffe53de8d
refs/heads/trunk dffe1a0ef -> 0ca5d5ea7
Fix Columns.contains()
Patch by blerer; reviewed by benedict for CASSANDRA-10178
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffe53de8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffe53de8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffe53de8
Branch: refs/heads/cassandra-3.0
Commit: ffe53de8d4f265ac3b4c5b3e285c6efda3514770
Parents: f3e04b0
Author: blerer <be...@datastax.com>
Authored: Thu Aug 27 09:45:28 2015 +0200
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Aug 27 16:32:46 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Columns.java | 2 +-
.../org/apache/cassandra/db/ColumnsTest.java | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffe53de8/src/java/org/apache/cassandra/db/Columns.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Columns.java b/src/java/org/apache/cassandra/db/Columns.java
index f217fd7..ddb9930 100644
--- a/src/java/org/apache/cassandra/db/Columns.java
+++ b/src/java/org/apache/cassandra/db/Columns.java
@@ -263,7 +263,7 @@ public class Columns implements Iterable<ColumnDefinition>
*/
public boolean contains(Columns other)
{
- if (other.columns.length > columns.length)
+ if (other.columnCount() > columnCount())
return false;
BTreeSearchIterator<ColumnDefinition, ColumnDefinition> iter = BTree.slice(columns, Comparator.naturalOrder(), BTree.Dir.ASC);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffe53de8/test/unit/org/apache/cassandra/db/ColumnsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnsTest.java b/test/unit/org/apache/cassandra/db/ColumnsTest.java
index a0ade96..1a91c3d 100644
--- a/test/unit/org/apache/cassandra/db/ColumnsTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnsTest.java
@@ -123,6 +123,26 @@ public class ColumnsTest
testSerializeSubset(randomColumns);
}
+ @Test
+ public void testContainsColumnsWithLargeNumberOfColumns()
+ {
+ List<String> names = new ArrayList<>();
+ for (int i = 0; i < 50; i++)
+ names.add("clustering_" + i);
+
+ List<ColumnDefinition> defs = new ArrayList<>();
+ addClustering(names, defs);
+
+ Columns columns = Columns.from(new HashSet<>(defs));
+
+ defs = new ArrayList<>();
+ addClustering(names.subList(0, 8), defs);
+
+ Columns subset = Columns.from(new HashSet<>(defs));
+
+ org.junit.Assert.assertTrue(columns.contains(subset));
+ }
+
private void testSerializeSubset(ColumnsCheck input) throws IOException
{
testSerializeSubset(input.columns, input.columns, input.definitions);
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ca5d5ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ca5d5ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ca5d5ea
Branch: refs/heads/trunk
Commit: 0ca5d5ea71d7762b3856b59269d7e5c31ef3d9f1
Parents: dffe1a0 ffe53de
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Aug 27 16:34:13 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Aug 27 16:34:13 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Columns.java | 2 +-
.../org/apache/cassandra/db/ColumnsTest.java | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] cassandra git commit: Fix Columns.contains()
Posted by be...@apache.org.
Fix Columns.contains()
Patch by blerer; reviewed by benedict for CASSANDRA-10178
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffe53de8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffe53de8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffe53de8
Branch: refs/heads/trunk
Commit: ffe53de8d4f265ac3b4c5b3e285c6efda3514770
Parents: f3e04b0
Author: blerer <be...@datastax.com>
Authored: Thu Aug 27 09:45:28 2015 +0200
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Aug 27 16:32:46 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Columns.java | 2 +-
.../org/apache/cassandra/db/ColumnsTest.java | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffe53de8/src/java/org/apache/cassandra/db/Columns.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Columns.java b/src/java/org/apache/cassandra/db/Columns.java
index f217fd7..ddb9930 100644
--- a/src/java/org/apache/cassandra/db/Columns.java
+++ b/src/java/org/apache/cassandra/db/Columns.java
@@ -263,7 +263,7 @@ public class Columns implements Iterable<ColumnDefinition>
*/
public boolean contains(Columns other)
{
- if (other.columns.length > columns.length)
+ if (other.columnCount() > columnCount())
return false;
BTreeSearchIterator<ColumnDefinition, ColumnDefinition> iter = BTree.slice(columns, Comparator.naturalOrder(), BTree.Dir.ASC);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffe53de8/test/unit/org/apache/cassandra/db/ColumnsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnsTest.java b/test/unit/org/apache/cassandra/db/ColumnsTest.java
index a0ade96..1a91c3d 100644
--- a/test/unit/org/apache/cassandra/db/ColumnsTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnsTest.java
@@ -123,6 +123,26 @@ public class ColumnsTest
testSerializeSubset(randomColumns);
}
+ @Test
+ public void testContainsColumnsWithLargeNumberOfColumns()
+ {
+ List<String> names = new ArrayList<>();
+ for (int i = 0; i < 50; i++)
+ names.add("clustering_" + i);
+
+ List<ColumnDefinition> defs = new ArrayList<>();
+ addClustering(names, defs);
+
+ Columns columns = Columns.from(new HashSet<>(defs));
+
+ defs = new ArrayList<>();
+ addClustering(names.subList(0, 8), defs);
+
+ Columns subset = Columns.from(new HashSet<>(defs));
+
+ org.junit.Assert.assertTrue(columns.contains(subset));
+ }
+
private void testSerializeSubset(ColumnsCheck input) throws IOException
{
testSerializeSubset(input.columns, input.columns, input.definitions);