natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ninja fix table names

This commit is contained in:
Aleksey Yeschenko 2015-07-30 16:40:23 +03:00
parent f9947ff6ac
commit d645bfd464
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/java/org/apache/cassandra/db/SystemKeyspace.java
View File

@ -100,8 +100,8 @@ public final class SystemKeyspace
public static final String SSTABLE_ACTIVITY = "sstable_activity";
public static final String SIZE_ESTIMATES = "size_estimates";
public static final String AVAILABLE_RANGES = "available_ranges";
public static final String MATERIALIZEDVIEWS_BUILDS_IN_PROGRESS = "materializedviews_builds_in_progress";
public static final String BUILT_MATERIALIZEDVIEWS = "built_materializedviews";
public static final String MATERIALIZED_VIEWS_BUILDS_IN_PROGRESS = "materialized_views_builds_in_progress";
public static final String BUILT_MATERIALIZED_VIEWS = "built_materialized_views";
@Deprecated public static final String LEGACY_KEYSPACES = "schema_keyspaces";
@Deprecated public static final String LEGACY_COLUMNFAMILIES = "schema_columnfamilies";
@ -263,7 +263,7 @@ public final class SystemKeyspace
+ "PRIMARY KEY ((keyspace_name)))");
private static final CFMetaData MaterializedViewsBuildsInProgress =
compile(MATERIALIZEDVIEWS_BUILDS_IN_PROGRESS,
compile(MATERIALIZED_VIEWS_BUILDS_IN_PROGRESS,
"materialized views builds current progress",
"CREATE TABLE %s ("
+ "keyspace_name text,"
@ -273,7 +273,7 @@ public final class SystemKeyspace
+ "PRIMARY KEY ((keyspace_name), view_name))");
private static final CFMetaData BuiltMaterializedViews =
compile(BUILT_MATERIALIZEDVIEWS,
compile(BUILT_MATERIALIZED_VIEWS,
"built materialized views",
"CREATE TABLE %s ("
+ "keyspace_name text,"
@ -517,32 +517,32 @@ public final class SystemKeyspace
public static boolean isViewBuilt(String keyspaceName, String viewName)
{
String req = "SELECT view_name FROM %s.\"%s\" WHERE keyspace_name=? AND view_name=?";
UntypedResultSet result = executeInternal(String.format(req, NAME, BUILT_MATERIALIZEDVIEWS), keyspaceName, viewName);
UntypedResultSet result = executeInternal(String.format(req, NAME, BUILT_MATERIALIZED_VIEWS), keyspaceName, viewName);
return !result.isEmpty();
}
public static void setMaterializedViewBuilt(String keyspaceName, String viewName)
{
String req = "INSERT INTO %s.\"%s\" (keyspace_name, view_name) VALUES (?, ?)";
executeInternal(String.format(req, NAME, BUILT_MATERIALIZEDVIEWS), keyspaceName, viewName);
forceBlockingFlush(BUILT_MATERIALIZEDVIEWS);
executeInternal(String.format(req, NAME, BUILT_MATERIALIZED_VIEWS), keyspaceName, viewName);
forceBlockingFlush(BUILT_MATERIALIZED_VIEWS);
}
public static void setMaterializedViewRemoved(String keyspaceName, String viewName)
{
String buildReq = "DELETE FROM %S.%s WHERE keyspace_name = ? AND view_name = ?";
executeInternal(String.format(buildReq, NAME, MATERIALIZEDVIEWS_BUILDS_IN_PROGRESS), keyspaceName, viewName);
forceBlockingFlush(MATERIALIZEDVIEWS_BUILDS_IN_PROGRESS);
executeInternal(String.format(buildReq, NAME, MATERIALIZED_VIEWS_BUILDS_IN_PROGRESS), keyspaceName, viewName);
forceBlockingFlush(MATERIALIZED_VIEWS_BUILDS_IN_PROGRESS);
String builtReq = "DELETE FROM %s.\"%s\" WHERE keyspace_name = ? AND view_name = ?";
executeInternal(String.format(builtReq, NAME, BUILT_MATERIALIZEDVIEWS), keyspaceName, viewName);
forceBlockingFlush(BUILT_MATERIALIZEDVIEWS);
executeInternal(String.format(builtReq, NAME, BUILT_MATERIALIZED_VIEWS), keyspaceName, viewName);
forceBlockingFlush(BUILT_MATERIALIZED_VIEWS);
}
public static void beginMaterializedViewBuild(String ksname, String viewName, int generationNumber)
{
executeInternal(String.format("INSERT INTO system.%s (keyspace_name, view_name, generation_number) VALUES (?, ?, ?)", MATERIALIZEDVIEWS_BUILDS_IN_PROGRESS),
executeInternal(String.format("INSERT INTO system.%s (keyspace_name, view_name, generation_number) VALUES (?, ?, ?)", MATERIALIZED_VIEWS_BUILDS_IN_PROGRESS),
ksname,
viewName,
generationNumber);
@ -556,22 +556,22 @@ public final class SystemKeyspace
// Also, if the build succeeded, but the materialized view build failed, we will be able to skip the
// materialized view build check next boot.
setMaterializedViewBuilt(ksname, viewName);
forceBlockingFlush(BUILT_MATERIALIZEDVIEWS);
executeInternal(String.format("DELETE FROM system.%s WHERE keyspace_name = ? AND view_name = ?", MATERIALIZEDVIEWS_BUILDS_IN_PROGRESS), ksname, viewName);
forceBlockingFlush(MATERIALIZEDVIEWS_BUILDS_IN_PROGRESS);
forceBlockingFlush(BUILT_MATERIALIZED_VIEWS);
executeInternal(String.format("DELETE FROM system.%s WHERE keyspace_name = ? AND view_name = ?", MATERIALIZED_VIEWS_BUILDS_IN_PROGRESS), ksname, viewName);
forceBlockingFlush(MATERIALIZED_VIEWS_BUILDS_IN_PROGRESS);
}
public static void updateMaterializedViewBuildStatus(String ksname, String viewName, Token token)
{
String req = "INSERT INTO system.%s (keyspace_name, view_name, last_token) VALUES (?, ?, ?)";
Token.TokenFactory factory = StorageService.getPartitioner().getTokenFactory();
executeInternal(String.format(req, MATERIALIZEDVIEWS_BUILDS_IN_PROGRESS), ksname, viewName, factory.toString(token));
executeInternal(String.format(req, MATERIALIZED_VIEWS_BUILDS_IN_PROGRESS), ksname, viewName, factory.toString(token));
}
public static Pair<Integer, Token> getMaterializedViewBuildStatus(String ksname, String viewName)
{
String req = "SELECT generation_number, last_token FROM system.%s WHERE keyspace_name = ? AND view_name = ?";
UntypedResultSet queryResultSet = executeInternal(String.format(req, MATERIALIZEDVIEWS_BUILDS_IN_PROGRESS), ksname, viewName);
UntypedResultSet queryResultSet = executeInternal(String.format(req, MATERIALIZED_VIEWS_BUILDS_IN_PROGRESS), ksname, viewName);
if (queryResultSet == null || queryResultSet.isEmpty())
return null;