Coordinated change for SqlppDeleteRewriteVisitor refactoring
Change-Id: I50cff0948dad342f0d2e5b5250e3247bfd6fcd0c
diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/BADJobService.java b/asterix-bad/src/main/java/org/apache/asterix/bad/BADJobService.java
index 6378ee6..af4ff03 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/BADJobService.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/BADJobService.java
@@ -283,8 +283,7 @@
} else if (procedureStatement.getKind() == Statement.Kind.QUERY) {
return compileQueryJob(statementExecutor, metadataProvider, hcc, (Query) procedureStatement);
} else {
- SqlppDeleteRewriteVisitor visitor = new SqlppDeleteRewriteVisitor(metadataProvider);
- procedureStatement.accept(visitor, null);
+ procedureStatement.accept(SqlppDeleteRewriteVisitor.INSTANCE, metadataProvider);
return ((QueryTranslator) statementExecutor).handleDeleteStatement(metadataProvider, procedureStatement,
hcc, true, null, null);
}
diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java
index de9532c..a63a101 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java
@@ -204,14 +204,14 @@
tempMdProvider.setOutputFile(metadataProvider.getOutputFile());
tempMdProvider.setMaxResultReads(requestParameters.getResultProperties().getMaxReads());
- InsertStatement insert = new InsertStatement(dataverse, new Identifier(subscriptionsDatasetName),
- subscriptionTuple, varCounter, resultVar, accessor);
+ InsertStatement insert = new InsertStatement(dataverse, subscriptionsDatasetName, subscriptionTuple,
+ varCounter, resultVar, accessor);
((QueryTranslator) statementExecutor).handleInsertUpsertStatement(tempMdProvider, insert, hcc,
resultSet, resultDelivery, null, stats, false, requestParameters, null, null);
} else {
//To update an existing subscription
- UpsertStatement upsert = new UpsertStatement(dataverse, new Identifier(subscriptionsDatasetName),
- subscriptionTuple, varCounter, null, null);
+ UpsertStatement upsert = new UpsertStatement(dataverse, subscriptionsDatasetName, subscriptionTuple,
+ varCounter, null, null);
((QueryTranslator) statementExecutor).handleInsertUpsertStatement(tempMdProvider, upsert, hcc,
resultSet, resultDelivery, null, stats, false, requestParameters, null, null);
}
diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java
index e8a381d..fd6cad4 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java
@@ -132,10 +132,9 @@
condition.addOperand(UUIDCall);
- DeleteStatement delete = new DeleteStatement(vars, dataverse, new Identifier(subscriptionsDatasetName),
- condition, varCounter);
- SqlppDeleteRewriteVisitor visitor = new SqlppDeleteRewriteVisitor(metadataProvider);
- delete.accept(visitor, null);
+ DeleteStatement delete =
+ new DeleteStatement(vars, dataverse, subscriptionsDatasetName, condition, varCounter);
+ delete.accept(SqlppDeleteRewriteVisitor.INSTANCE, metadataProvider);
MetadataProvider tempMdProvider = MetadataProvider.create(metadataProvider.getApplicationContext(),
metadataProvider.getDefaultDataverse());
tempMdProvider.getConfig().putAll(metadataProvider.getConfig());
diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
index f45f0b4..fba4aea 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
@@ -199,8 +199,7 @@
((Query) getProcedureBodyStatement()).getBody(), metadataProvider).get(0));
return pair;
} else if (getProcedureBodyStatement().getKind() == Statement.Kind.DELETE) {
- SqlppDeleteRewriteVisitor visitor = new SqlppDeleteRewriteVisitor(metadataProvider);
- getProcedureBodyStatement().accept(visitor, null);
+ getProcedureBodyStatement().accept(SqlppDeleteRewriteVisitor.INSTANCE, metadataProvider);
DeleteStatement delete = (DeleteStatement) getProcedureBodyStatement();
SqlppRewriterFactory fact = new SqlppRewriterFactory();