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/60c20049 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60c20049 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60c20049 Branch: refs/heads/cassandra-3.11 Commit: 60c20049631a2ed5565989c85dd62c2353ac6445 Parents: 6214b1e 8ffdd26 Author: Joel Knighton <j...@apache.org> Authored: Fri May 26 13:53:06 2017 -0500 Committer: Joel Knighton <j...@apache.org> Committed: Fri May 26 13:53:06 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/ColumnDefinition.java | 2 ++ .../org/apache/cassandra/cql3/ColumnIdentifier.java | 2 ++ .../apache/cassandra/cql3/ColumnIdentifierTest.java | 13 +++++++++++++ 4 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/60c20049/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 48f17c2,18dca09..a8e172e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,40 -1,5 +1,41 @@@ -3.0.14 +3.11.0 + * Fix the problem with duplicated rows when using paging with SASI (CASSANDRA-13302) + * Allow CONTAINS statements filtering on the partition key and itâs parts (CASSANDRA-13275) + * Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229) + * Fix duration type validation to prevent overflow (CASSANDRA-13218) + * Forbid unsupported creation of SASI indexes over partition key columns (CASSANDRA-13228) + * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369) + * UDA fails without input rows (CASSANDRA-13399) + * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188) + * V5 protocol flags decoding broken (CASSANDRA-13443) + * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422) + * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329) + * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962) + * Add charset to Analyser input stream (CASSANDRA-13151) + * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820) + * cdc column addition strikes again (CASSANDRA-13382) + * Fix static column indexes (CASSANDRA-13277) + * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298) + * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370) + * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247) + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317) + * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366) + * Support unaligned memory access for AArch64 (CASSANDRA-13326) + * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915). + * 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) + * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417) + * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307) + * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835) +Merged from 3.0: + * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533) * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade (CASSANDRA-13525) * Fix repair process violating start/end token limits for small ranges (CASSANDRA-13052) * Add storage port options to sstableloader (CASSANDRA-13518) http://git-wip-us.apache.org/repos/asf/cassandra/blob/60c20049/src/java/org/apache/cassandra/config/ColumnDefinition.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/ColumnDefinition.java index 61739a3,34840e3..ea508d2 --- a/src/java/org/apache/cassandra/config/ColumnDefinition.java +++ b/src/java/org/apache/cassandra/config/ColumnDefinition.java @@@ -27,16 -26,13 +27,18 @@@ import com.google.common.base.Objects import com.google.common.collect.Collections2; import org.apache.cassandra.cql3.*; +import org.apache.cassandra.cql3.selection.Selectable; +import org.apache.cassandra.cql3.selection.Selector; +import org.apache.cassandra.cql3.selection.SimpleSelector; import org.apache.cassandra.db.rows.*; import org.apache.cassandra.db.marshal.*; +import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.utils.ByteBufferUtil; + import org.github.jamm.Unmetered; + @Unmetered -public class ColumnDefinition extends ColumnSpecification implements Comparable<ColumnDefinition> +public class ColumnDefinition extends ColumnSpecification implements Selectable, Comparable<ColumnDefinition> { public static final Comparator<Object> asymmetricColumnDataComparator = (a, b) -> ((ColumnData) a).column().compareTo((ColumnDefinition) b); http://git-wip-us.apache.org/repos/asf/cassandra/blob/60c20049/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/60c20049/test/unit/org/apache/cassandra/cql3/ColumnIdentifierTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
