You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2017/03/08 17:20:06 UTC

[1/6] cassandra git commit: Add a formatted row output to assertEmpty in CQL Tester

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 1ae841951 -> 60d3292b0
  refs/heads/cassandra-3.11 1248d3620 -> 7707a0ed5
  refs/heads/trunk 7755a324e -> b5a5fbe1f


Add a formatted row output to assertEmpty in CQL Tester

Patch by Alex Petrov; reviewed by Jason Brown for CASSANDRA-13238

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

Branch: refs/heads/cassandra-3.0
Commit: 60d3292b04f35f4cd27801448b089110cc7b5b19
Parents: 1ae8419
Author: Alex Petrov <ol...@gmail.com>
Authored: Wed Mar 8 17:53:46 2017 +0100
Committer: Alex Petrov <ol...@gmail.com>
Committed: Wed Mar 8 17:58:46 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                       |  1 +
 .../unit/org/apache/cassandra/cql3/CQLTester.java | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d3292b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7551a7f..0979852 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.13
+ * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 Merged from 2.2:
  * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d3292b/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index 4732ed3..db3652b 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -957,6 +957,22 @@ public abstract class CQLTester
         assert ignoreExtra || expectedRows.size() == actualRows.size();
     }
 
+    private static List<String> makeRowStrings(UntypedResultSet resultSet)
+    {
+        List<List<ByteBuffer>> rows = new ArrayList<>();
+        for (UntypedResultSet.Row row : resultSet)
+        {
+            List<ByteBuffer> values = new ArrayList<>();
+            for (ColumnSpecification columnSpecification : resultSet.metadata())
+            {
+                values.add(row.getBytes(columnSpecification.name.toString()));
+            }
+            rows.add(values);
+        }
+
+        return makeRowStrings(rows, resultSet.metadata());
+    }
+
     private static List<String> makeRowStrings(Iterable<List<ByteBuffer>> rows, List<ColumnSpecification> meta)
     {
         List<String> strings = new ArrayList<>();
@@ -1065,7 +1081,7 @@ public abstract class CQLTester
     protected void assertEmpty(UntypedResultSet result) throws Throwable
     {
         if (result != null && !result.isEmpty())
-            throw new AssertionError(String.format("Expected empty result but got %d rows", result.size()));
+            throw new AssertionError(String.format("Expected empty result but got %d rows: %s \n", result.size(), makeRowStrings(result)));
     }
 
     protected void assertInvalid(String query, Object... values) throws Throwable

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

Posted by if...@apache.org.
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/7707a0ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7707a0ed
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7707a0ed

Branch: refs/heads/trunk
Commit: 7707a0ed59e0f22a864b3c05515df7f1041e3c42
Parents: 1248d36 60d3292
Author: Alex Petrov <ol...@gmail.com>
Authored: Wed Mar 8 18:02:19 2017 +0100
Committer: Alex Petrov <ol...@gmail.com>
Committed: Wed Mar 8 18:02:19 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                       |  1 +
 .../unit/org/apache/cassandra/cql3/CQLTester.java | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707a0ed/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 88599b7,0979852..f73dc12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,10 +1,15 @@@
 -3.0.13
 +3.11.0
 + * 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)
 +Merged from 3.0:
+  * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 -Merged from 2.2:
 - * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 -
 -
 -3.0.12
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707a0ed/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------

[2/6] cassandra git commit: Add a formatted row output to assertEmpty in CQL Tester

Posted by if...@apache.org.
Add a formatted row output to assertEmpty in CQL Tester

Patch by Alex Petrov; reviewed by Jason Brown for CASSANDRA-13238

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

Branch: refs/heads/cassandra-3.11
Commit: 60d3292b04f35f4cd27801448b089110cc7b5b19
Parents: 1ae8419
Author: Alex Petrov <ol...@gmail.com>
Authored: Wed Mar 8 17:53:46 2017 +0100
Committer: Alex Petrov <ol...@gmail.com>
Committed: Wed Mar 8 17:58:46 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                       |  1 +
 .../unit/org/apache/cassandra/cql3/CQLTester.java | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d3292b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7551a7f..0979852 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.13
+ * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 Merged from 2.2:
  * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d3292b/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index 4732ed3..db3652b 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -957,6 +957,22 @@ public abstract class CQLTester
         assert ignoreExtra || expectedRows.size() == actualRows.size();
     }
 
+    private static List<String> makeRowStrings(UntypedResultSet resultSet)
+    {
+        List<List<ByteBuffer>> rows = new ArrayList<>();
+        for (UntypedResultSet.Row row : resultSet)
+        {
+            List<ByteBuffer> values = new ArrayList<>();
+            for (ColumnSpecification columnSpecification : resultSet.metadata())
+            {
+                values.add(row.getBytes(columnSpecification.name.toString()));
+            }
+            rows.add(values);
+        }
+
+        return makeRowStrings(rows, resultSet.metadata());
+    }
+
     private static List<String> makeRowStrings(Iterable<List<ByteBuffer>> rows, List<ColumnSpecification> meta)
     {
         List<String> strings = new ArrayList<>();
@@ -1065,7 +1081,7 @@ public abstract class CQLTester
     protected void assertEmpty(UntypedResultSet result) throws Throwable
     {
         if (result != null && !result.isEmpty())
-            throw new AssertionError(String.format("Expected empty result but got %d rows", result.size()));
+            throw new AssertionError(String.format("Expected empty result but got %d rows: %s \n", result.size(), makeRowStrings(result)));
     }
 
     protected void assertInvalid(String query, Object... values) throws Throwable

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

Posted by if...@apache.org.
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/7707a0ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7707a0ed
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7707a0ed

Branch: refs/heads/cassandra-3.11
Commit: 7707a0ed59e0f22a864b3c05515df7f1041e3c42
Parents: 1248d36 60d3292
Author: Alex Petrov <ol...@gmail.com>
Authored: Wed Mar 8 18:02:19 2017 +0100
Committer: Alex Petrov <ol...@gmail.com>
Committed: Wed Mar 8 18:02:19 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                       |  1 +
 .../unit/org/apache/cassandra/cql3/CQLTester.java | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707a0ed/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 88599b7,0979852..f73dc12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,10 +1,15 @@@
 -3.0.13
 +3.11.0
 + * 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)
 +Merged from 3.0:
+  * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 -Merged from 2.2:
 - * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 -
 -
 -3.0.12
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707a0ed/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------

[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

Posted by if...@apache.org.
Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: b5a5fbe1f645cfdfab090ae6be4e82192d4e816d
Parents: 7755a32 7707a0e
Author: Alex Petrov <ol...@gmail.com>
Authored: Wed Mar 8 18:11:37 2017 +0100
Committer: Alex Petrov <ol...@gmail.com>
Committed: Wed Mar 8 18:11:37 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                       |  2 ++
 .../unit/org/apache/cassandra/cql3/CQLTester.java | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5a5fbe1/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5a5fbe1/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------

[3/6] cassandra git commit: Add a formatted row output to assertEmpty in CQL Tester

Posted by if...@apache.org.
Add a formatted row output to assertEmpty in CQL Tester

Patch by Alex Petrov; reviewed by Jason Brown for CASSANDRA-13238

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

Branch: refs/heads/trunk
Commit: 60d3292b04f35f4cd27801448b089110cc7b5b19
Parents: 1ae8419
Author: Alex Petrov <ol...@gmail.com>
Authored: Wed Mar 8 17:53:46 2017 +0100
Committer: Alex Petrov <ol...@gmail.com>
Committed: Wed Mar 8 17:58:46 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                       |  1 +
 .../unit/org/apache/cassandra/cql3/CQLTester.java | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d3292b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7551a7f..0979852 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.13
+ * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 Merged from 2.2:
  * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/60d3292b/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index 4732ed3..db3652b 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -957,6 +957,22 @@ public abstract class CQLTester
         assert ignoreExtra || expectedRows.size() == actualRows.size();
     }
 
+    private static List<String> makeRowStrings(UntypedResultSet resultSet)
+    {
+        List<List<ByteBuffer>> rows = new ArrayList<>();
+        for (UntypedResultSet.Row row : resultSet)
+        {
+            List<ByteBuffer> values = new ArrayList<>();
+            for (ColumnSpecification columnSpecification : resultSet.metadata())
+            {
+                values.add(row.getBytes(columnSpecification.name.toString()));
+            }
+            rows.add(values);
+        }
+
+        return makeRowStrings(rows, resultSet.metadata());
+    }
+
     private static List<String> makeRowStrings(Iterable<List<ByteBuffer>> rows, List<ColumnSpecification> meta)
     {
         List<String> strings = new ArrayList<>();
@@ -1065,7 +1081,7 @@ public abstract class CQLTester
     protected void assertEmpty(UntypedResultSet result) throws Throwable
     {
         if (result != null && !result.isEmpty())
-            throw new AssertionError(String.format("Expected empty result but got %d rows", result.size()));
+            throw new AssertionError(String.format("Expected empty result but got %d rows: %s \n", result.size(), makeRowStrings(result)));
     }
 
     protected void assertInvalid(String query, Object... values) throws Throwable