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/37f5005a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37f5005a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37f5005a Branch: refs/heads/trunk Commit: 37f5005a15c9addc3b99c5a35cb72f9fc9c2c912 Parents: 9b1295e fc83418 Author: Alex Petrov <oleksandr.pet...@gmail.com> Authored: Thu Apr 20 11:31:29 2017 +0200 Committer: Alex Petrov <oleksandr.pet...@gmail.com> Committed: Thu Apr 20 11:31:29 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/37f5005a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c742570,8a2926b..2cd4bae --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -80,7 -24,10 +80,9 @@@ * 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) * Interrupt replaying hints on decommission (CASSANDRA-13308) * Handling partially written hint files (CASSANDRA-12728) * Fix NPE issue in StorageService (CASSANDRA-13060) http://git-wip-us.apache.org/repos/asf/cassandra/blob/37f5005a/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java index 2b43f36,1f8fe71..8b9402b --- a/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java +++ b/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java @@@ -658,8 -635,10 +635,10 @@@ public class CassandraIndexTest extend if (updateExpression != null) assertNotNull(postUpdateQueryExpression); - // first, create the table as we need the CFMetaData to build the other cql statements + // first, create the table as we need the Tablemetadata to build the other cql statements - createTable(tableDefinition); + String tableName = createTable(tableDefinition); + + indexName = String.format("index_%s_%d", tableName, indexCounter++); // now setup the cql statements the test will run through. Some are dependent on // the table definition, others are not.
