You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2020/03/11 10:38:30 UTC
[cassandra] branch cassandra-3.11 updated (b714667 -> 8a5b127)
This is an automated email from the ASF dual-hosted git repository.
samt pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from b714667 Merge branch 'cassandra-3.0' into cassandra-3.11
new c81d7dc Use result size for built index test
new 8a5b127 Merge branch 'cassandra-3.0' into cassandra-3.11
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../index/internal/CassandraIndexTest.java | 23 ++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by sa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
samt pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 8a5b1275ff5ffb8e867a8ffa1558f12923c3f956
Merge: b714667 c81d7dc
Author: Sam Tunnicliffe <sa...@beobal.com>
AuthorDate: Wed Mar 11 10:26:36 2020 +0000
Merge branch 'cassandra-3.0' into cassandra-3.11
.../index/internal/CassandraIndexTest.java | 23 ++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --cc test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
index 23b27b8,7cea9da..b573e6f
--- a/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
+++ b/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
@@@ -515,6 -488,12 +515,12 @@@ public class CassandraIndexTest extend
@Test
public void indexCorrectlyMarkedAsBuildAndRemoved() throws Throwable
{
+ String selectBuiltIndexesQuery = String.format("SELECT * FROM %s.\"%s\"",
- SystemKeyspace.NAME,
++ SchemaConstants.SYSTEM_KEYSPACE_NAME,
+ SystemKeyspace.BUILT_INDEXES);
+ UntypedResultSet rs = execute(selectBuiltIndexesQuery);
+ int initialSize = rs.size();
+
String indexName = "build_remove_test_idx";
String tableName = createTable("CREATE TABLE %s (a int, b int, c int, PRIMARY KEY (a, b))");
createIndex(String.format("CREATE INDEX %s ON %%s(c)", indexName));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org