cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ifesdj...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Thu, 20 Apr 2017 09:31:59 GMT
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/fc834186
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc834186
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc834186

Branch: refs/heads/cassandra-3.11
Commit: fc834186ff0faa5ff78512637badc59990e51173
Parents: 5f64454 e5c2a18
Author: Alex Petrov <oleksandr.petrov@gmail.com>
Authored: Thu Apr 20 11:29:22 2017 +0200
Committer: Alex Petrov <oleksandr.petrov@gmail.com>
Committed: Thu Apr 20 11:29:22 2017 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../index/internal/CassandraIndexTest.java      | 39 +++++---------------
 2 files changed, 11 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc834186/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 92ecb39,11881e9..8a2926b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,9 +1,36 @@@
 -3.0.14
 +3.11.0
 + * 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)
 +Merged from 3.0:
+  * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 - * Handling partially written hint files (CASSANDRA-12728) 
++ * Handling partially written hint files (CASSANDRA-12728)
   * Interrupt replaying hints on decommission (CASSANDRA-13308)
 -
 -3.0.13
 + * Handling partially written hint files (CASSANDRA-12728)
 + * Fix NPE issue in StorageService (CASSANDRA-13060)
   * Make reading of range tombstones more reliable (CASSANDRA-12811)
   * Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
   * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc834186/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
index bfe3c32,68fe42d..1f8fe71
--- a/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
+++ b/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
@@@ -110,10 -106,9 +107,9 @@@ public class CassandraIndexTest extend
          // No update allowed on primary key columns, so this script has no update expression
          new TestScript().tableDefinition("CREATE TABLE %s (k1 int, k2 int, c1 int, c2 int,
v int, PRIMARY KEY ((k1, k2), c1, c2));")
                          .target("k1")
-                         .indexName("k1_index")
                          .withFirstRow(row(0, 0, 0, 0, 0))
                          .withSecondRow(row(1, 1, 1, 1, 1))
 -                        .missingIndexMessage("Partition key parts: k2 must be restricted
as other parts are")
 +                        .missingIndexMessage(StatementRestrictions.REQUIRES_ALLOW_FILTERING_MESSAGE)
                          .firstQueryExpression("k1=0")
                          .secondQueryExpression("k1=1")
                          .run();
@@@ -125,10 -120,9 +121,9 @@@
          // No update allowed on primary key columns, so this script has no update expression
          new TestScript().tableDefinition("CREATE TABLE %s (k1 int, k2 int, c1 int, c2 int,
v int, PRIMARY KEY ((k1, k2), c1, c2));")
                          .target("k2")
-                         .indexName("k2_index")
                          .withFirstRow(row(0, 0, 0, 0, 0))
                          .withSecondRow(row(1, 1, 1, 1, 1))
 -                        .missingIndexMessage("Partition key parts: k1 must be restricted
as other parts are")
 +                        .missingIndexMessage(StatementRestrictions.REQUIRES_ALLOW_FILTERING_MESSAGE)
                          .firstQueryExpression("k2=0")
                          .secondQueryExpression("k2=1")
                          .run();


Mime
View raw message