maedhroz commented on code in PR #2329:
URL: https://github.com/apache/cassandra/pull/2329#discussion_r1192838392
##########
test/unit/org/apache/cassandra/cql3/CQLTester.java:
##########
@@ -1031,122 +1034,222 @@ protected void alterTableMayThrow(String query)
throws Throwable
protected void dropTable(String query)
{
- dropFormattedTable(String.format(query, KEYSPACE + "." +
currentTable()));
+ dropTable(KEYSPACE, query);
}
- protected void dropFormattedTable(String formattedQuery)
+ protected void dropTable(String keyspace, String query)
+ {
+ dropFormattedTable(String.format(query, keyspace + "." +
currentTable()));
+ }
+
+ private void dropFormattedTable(String formattedQuery)
{
logger.info(formattedQuery);
schemaChange(formattedQuery);
}
+ /**
+ * Creates a secondary index, waiting for it to become queryable.
+ *
+ * @param query the index creation query
+ * @return the name of the created index
+ */
protected String createIndex(String query)
{
return createIndex(KEYSPACE, query);
}
+ /**
+ * Creates a secondary index, waiting for it to become queryable.
+ *
+ * @param keyspace the keyspace the created index should belong to
+ * @param query the index creation query
+ * @return the name of the created index
+ */
protected String createIndex(String keyspace, String query)
{
String formattedQuery = formatQuery(keyspace, query);
- return createFormattedIndex(formattedQuery);
+ Pair<String, String> qualifiedIndexName =
createFormattedIndex(keyspace, formattedQuery);
+ waitForIndexQueryable(qualifiedIndexName.left,
qualifiedIndexName.right);
+ return qualifiedIndexName.right;
+ }
+
+ /**
+ * Creates a secondary index, without waiting for it to become queryable.
Review Comment:
```suggestion
* Creates a secondary index without waiting for it to become queryable.
```
##########
test/unit/org/apache/cassandra/cql3/CQLTester.java:
##########
@@ -1031,122 +1034,222 @@ protected void alterTableMayThrow(String query)
throws Throwable
protected void dropTable(String query)
{
- dropFormattedTable(String.format(query, KEYSPACE + "." +
currentTable()));
+ dropTable(KEYSPACE, query);
}
- protected void dropFormattedTable(String formattedQuery)
+ protected void dropTable(String keyspace, String query)
+ {
+ dropFormattedTable(String.format(query, keyspace + "." +
currentTable()));
+ }
+
+ private void dropFormattedTable(String formattedQuery)
{
logger.info(formattedQuery);
schemaChange(formattedQuery);
}
+ /**
+ * Creates a secondary index, waiting for it to become queryable.
+ *
+ * @param query the index creation query
+ * @return the name of the created index
+ */
protected String createIndex(String query)
{
return createIndex(KEYSPACE, query);
}
+ /**
+ * Creates a secondary index, waiting for it to become queryable.
+ *
+ * @param keyspace the keyspace the created index should belong to
+ * @param query the index creation query
+ * @return the name of the created index
+ */
protected String createIndex(String keyspace, String query)
{
String formattedQuery = formatQuery(keyspace, query);
- return createFormattedIndex(formattedQuery);
+ Pair<String, String> qualifiedIndexName =
createFormattedIndex(keyspace, formattedQuery);
+ waitForIndexQueryable(qualifiedIndexName.left,
qualifiedIndexName.right);
+ return qualifiedIndexName.right;
+ }
+
+ /**
+ * Creates a secondary index, without waiting for it to become queryable.
+ *
+ * @param query the index creation query
+ * @return the name of the created index
+ */
+ protected String createIndexAsync(String query)
+ {
+ return createIndexAsync(KEYSPACE, query);
+ }
+
+ /**
+ * Creates a secondary index, without waiting for it to become queryable.
Review Comment:
```suggestion
* Creates a secondary index without waiting for it to become queryable.
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
