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/65a46820 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65a46820 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65a46820 Branch: refs/heads/trunk Commit: 65a46820bb6d28bc6e359807699e8c6ae562e0c4 Parents: 4f4c390 236c47e Author: Aleksey Yeshchenko <alek...@apple.com> Authored: Thu Aug 16 15:44:12 2018 +0100 Committer: Aleksey Yeshchenko <alek...@apple.com> Committed: Thu Aug 16 15:44:12 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 10 +++ doc/cql3/CQL.textile | 2 +- src/java/org/apache/cassandra/db/Columns.java | 22 +++++-- .../org/apache/cassandra/db/ColumnsTest.java | 69 +++++++++++++++++++- 5 files changed, 95 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65a46820/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e2d1681,eccece2..6464667 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.18 +3.11.4 +Merged from 3.0: + * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638) * sstableloader should use discovered broadcast address to connect intra-cluster (CASSANDRA-14522) * Fix reading columns with non-UTF names from schema (CASSANDRA-14468) Merged from 2.2: http://git-wip-us.apache.org/repos/asf/cassandra/blob/65a46820/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index 578e426,29864bc..ea53c36 --- a/NEWS.txt +++ b/NEWS.txt @@@ -42,7 -42,17 +42,17 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. -3.0.18 ++3.11.4 + ====== + + Upgrading + --------- + - The order of static columns in SELECT * has been fixed to match that of 2.0 and 2.1 - they are now sorted + alphabetically again, by their name, just like regular columns are. If you use prepared statements and + SELECT * queries, and have both simple and collection static columns in those tables, and are upgrading from an + earlier 3.0 version, then you might be affected by this change. Please see CASSANDRA-14638 for details. + -3.0.17 +3.11.3 ===== Upgrading http://git-wip-us.apache.org/repos/asf/cassandra/blob/65a46820/doc/cql3/CQL.textile ---------------------------------------------------------------------- diff --cc doc/cql3/CQL.textile index f32e30c,5f35d57..61b9d63 --- a/doc/cql3/CQL.textile +++ b/doc/cql3/CQL.textile @@@ -1115,9 -1079,9 +1115,9 @@@ The @SELECT@ statements reads one or mo h4(#selectSelection). @<select-clause>@ - The @<select-clause>@ determines which columns needs to be queried and returned in the result-set. It consists of either the comma-separated list of <selector> or the wildcard character (@*@) to select all the columns defined for the table. + The @<select-clause>@ determines which columns needs to be queried and returned in the result-set. It consists of either the comma-separated list of <selector> or the wildcard character (@*@) to select all the columns defined for the table. Please note that for wildcard @SELECT@ queries the order of columns returned is not specified and is not guaranteed to be stable between Cassandra versions. -A @<selector>@ is either a column name to retrieve or a @<function>@ of one or more @<term>@s. The function allowed are the same as for @<term>@ and are described in the "function section":#functions. In addition to these generic functions, the @WRITETIME@ (resp. @TTL@) function allows to select the timestamp of when the column was inserted (resp. the time to live (in seconds) for the column (or null if the column has no expiration set)). +A @<selector>@ is either a column name to retrieve or a @<function>@ of one or more @<term>@s. The function allowed are the same as for @<term>@ and are described in the "function section":#functions. In addition to these generic functions, the @WRITETIME@ (resp. @TTL@) function allows to select the timestamp of when the column was inserted (resp. the time to live (in seconds) for the column (or null if the column has no expiration set)) and the "@CAST@":#castFun function can be used to convert one data type to another. Any @<selector>@ can be aliased using @AS@ keyword (see examples). Please note that @<where-clause>@ and @<order-by>@ clause should refer to the columns by their original names and not by their aliases. http://git-wip-us.apache.org/repos/asf/cassandra/blob/65a46820/src/java/org/apache/cassandra/db/Columns.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65a46820/test/unit/org/apache/cassandra/db/ColumnsTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/ColumnsTest.java index d64a5bd,1a245a0..e3b93de --- a/test/unit/org/apache/cassandra/db/ColumnsTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnsTest.java @@@ -33,7 -34,7 +34,8 @@@ import junit.framework.Assert import org.apache.cassandra.MockSchema; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; +import org.apache.cassandra.config.DatabaseDescriptor; + import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.SetType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.io.util.DataInputBuffer; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
