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/4d6af175 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d6af175 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d6af175 Branch: refs/heads/trunk Commit: 4d6af1752264ef77b144c9fe9d34c244ec5d0242 Parents: 10b397e 48ffad8 Author: Benjamin Lerer <[email protected]> Authored: Fri Jul 7 17:35:57 2017 +0200 Committer: Benjamin Lerer <[email protected]> Committed: Fri Jul 7 17:35:57 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/marshal/AbstractType.java | 11 +- .../apache/cassandra/db/marshal/EmptyType.java | 7 + .../apache/cassandra/db/marshal/ListType.java | 5 +- .../apache/cassandra/db/marshal/MapType.java | 7 +- .../apache/cassandra/db/marshal/TupleType.java | 3 +- .../org/apache/cassandra/cql3/CQLTester.java | 6 + .../cql3/validation/entities/JsonTest.java | 168 +++++++++- .../operations/SelectGroupByTest.java | 7 - .../db/marshal/JsonConversionTest.java | 320 +++++++++++++++++++ 10 files changed, 513 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d6af175/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 569a807,a66f4b3..90fd821 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -96,10 -1,11 +96,11 @@@ 3.11.1 * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) Merged from 3.0: - * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) - * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) - * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) + * 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 toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) * Fix nested Tuples/UDTs validation (CASSANDRA-13646) 3.11.0 http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d6af175/src/java/org/apache/cassandra/db/marshal/AbstractType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d6af175/src/java/org/apache/cassandra/db/marshal/EmptyType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d6af175/src/java/org/apache/cassandra/db/marshal/ListType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d6af175/src/java/org/apache/cassandra/db/marshal/MapType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d6af175/src/java/org/apache/cassandra/db/marshal/TupleType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d6af175/test/unit/org/apache/cassandra/cql3/CQLTester.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java index 6d46a50,2dbcfff..f214c30 --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@@ -43,10 -40,13 +43,11 @@@ import org.slf4j.LoggerFactory import com.datastax.driver.core.*; import com.datastax.driver.core.DataType; import com.datastax.driver.core.ResultSet; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.concurrent.ScheduledExecutors; -import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.schema.*; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.Schema; -import org.apache.cassandra.config.SchemaConstants; import org.apache.cassandra.cql3.functions.FunctionName; import org.apache.cassandra.cql3.functions.ThreadAwareSecurityManager; import org.apache.cassandra.cql3.statements.ParsedStatement; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
