You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2016/02/18 18:10:48 UTC
[1/3] cassandra git commit: Handling adding UDT fields in SELECT JSON
and toJson()
Repository: cassandra
Updated Branches:
refs/heads/trunk 36950f289 -> 698c80883
Handling adding UDT fields in SELECT JSON and toJson()
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-11146
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1162071
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1162071
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1162071
Branch: refs/heads/trunk
Commit: c116207160400c94a3db7f08001f889017222b11
Parents: c003951
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu Feb 18 11:09:06 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu Feb 18 11:09:06 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/marshal/UserType.java | 2 +-
.../cql3/validation/entities/JsonTest.java | 19 +++++++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1162071/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7cbfea7..c85fc45 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
* Better error message for cleanup (CASSANDRA-10991)
* cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
* Use cloned TokenMetadata in size estimates to avoid race against membership check
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1162071/src/java/org/apache/cassandra/db/marshal/UserType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/UserType.java b/src/java/org/apache/cassandra/db/marshal/UserType.java
index 40a35b5..6102d26 100644
--- a/src/java/org/apache/cassandra/db/marshal/UserType.java
+++ b/src/java/org/apache/cassandra/db/marshal/UserType.java
@@ -209,7 +209,7 @@ public class UserType extends TupleType
sb.append(Json.quoteAsJsonString(name));
sb.append("\": ");
- ByteBuffer valueBuffer = buffers[i];
+ ByteBuffer valueBuffer = (i >= buffers.length) ? null : buffers[i];
if (valueBuffer == null)
sb.append("null");
else
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1162071/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
index 57df1e6..2c234cb 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
@@ -958,6 +958,25 @@ public class JsonTest extends CQLTester
assertRows(execute("SELECT k, a.a, a.b, a.c, b FROM %s"), row(0, 0, set(1, 2, 3), null, null));
}
+ // done for CASSANDRA-11146
+ @Test
+ public void testAlterUDT() throws Throwable
+ {
+ String typeName = createType("CREATE TYPE %s (a int)");
+ createTable("CREATE TABLE %s (" +
+ "k int PRIMARY KEY, " +
+ "a frozen<" + typeName + ">)");
+
+ execute("INSERT INTO %s JSON ?", "{\"k\": 0, \"a\": {\"a\": 0}}");
+ assertRows(execute("SELECT JSON * FROM %s"), row("{\"k\": 0, \"a\": {\"a\": 0}}"));
+
+ schemaChange("ALTER TYPE " + KEYSPACE + "." + typeName + " ADD b boolean");
+ assertRows(execute("SELECT JSON * FROM %s"), row("{\"k\": 0, \"a\": {\"a\": 0, \"b\": null}}"));
+
+ execute("INSERT INTO %s JSON ?", "{\"k\": 0, \"a\": {\"a\": 0, \"b\": true}}");
+ assertRows(execute("SELECT JSON * FROM %s"), row("{\"k\": 0, \"a\": {\"a\": 0, \"b\": true}}"));
+ }
+
// done for CASSANDRA-11048
@Test
public void testJsonTreadSafety() throws Throwable
[2/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c64d3a53
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c64d3a53
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c64d3a53
Branch: refs/heads/trunk
Commit: c64d3a53b2c79cdc9ad544e7b96c2ef712129382
Parents: 15ac9e8 c116207
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu Feb 18 11:09:52 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu Feb 18 11:09:52 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/marshal/UserType.java | 2 +-
.../cql3/validation/entities/JsonTest.java | 19 +++++++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c64d3a53/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f68eea5,c85fc45..a79a411
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,9 +1,21 @@@
-2.2.6
+3.0.4
+ * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
+ * Add query time validation method on Index (CASSANDRA-11043)
+ * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
+ * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
+ * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156)
+ * Fix wrong rack counting and invalid conditions check for TokenAllocation
+ (CASSANDRA-11139)
+ * Avoid creating empty hint files (CASSANDRA-11090)
+ * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120)
+ * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062)
+ * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
+ * Add dropped_columns to the list of schema table so it gets handled
+ properly (CASSANDRA-11050)
+Merged from 2.2:
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
* Better error message for cleanup (CASSANDRA-10991)
* cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
- * Use cloned TokenMetadata in size estimates to avoid race against membership check
- (CASSANDRA-10736)
* Always persist upsampled index summaries (CASSANDRA-10512)
* (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
* Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c64d3a53/src/java/org/apache/cassandra/db/marshal/UserType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c64d3a53/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ty...@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/698c8088
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/698c8088
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/698c8088
Branch: refs/heads/trunk
Commit: 698c80883dc6a0f6e80bdaa5e8f4f11871e4a461
Parents: 36950f2 c64d3a5
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu Feb 18 11:10:06 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu Feb 18 11:10:06 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/marshal/UserType.java | 2 +-
.../cql3/validation/entities/JsonTest.java | 19 +++++++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/698c8088/CHANGES.txt
----------------------------------------------------------------------