abdullah alamoudi has submitted this change and it was merged.
Change subject: Remove explicit creation of metadata provider config
......................................................................
Remove explicit creation of metadata provider config
Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
---
M
asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java
M
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java
M
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelSubscribeStatement.java
M
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java
M
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
M
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateProcedureStatement.java
6 files changed, 6 insertions(+), 13 deletions(-)
Approvals:
abdullah alamoudi: Verified
Xikui Wang: Looks good to me, approved
Ian Maxon: Verified
diff --git
a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java
index bc17a7d..56de450 100644
---
a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java
+++
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java
@@ -58,7 +58,7 @@
Identifier dvId = ((DataverseDropStatement) stmt).getDataverseName();
List<Broker> brokers = BADLangExtension.getBrokers(mdTxnCtx,
dvId.getValue());
MetadataProvider tempMdProvider = new MetadataProvider(appCtx,
metadataProvider.getDefaultDataverse());
- tempMdProvider.setConfig(metadataProvider.getConfig());
+ tempMdProvider.getConfig().putAll(metadataProvider.getConfig());
for (Broker broker : brokers) {
tempMdProvider.getLocks().reset();
BrokerDropStatement drop = new BrokerDropStatement(dvId, new
Identifier(broker.getBrokerName()), false);
diff --git
a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java
index 907bd0e..7b676a7 100644
---
a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java
+++
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java
@@ -120,7 +120,7 @@
//Create a metadata provider to use in nested jobs.
MetadataProvider tempMdProvider = new MetadataProvider(appCtx,
metadataProvider.getDefaultDataverse());
- tempMdProvider.setConfig(metadataProvider.getConfig());
+ tempMdProvider.getConfig().putAll(metadataProvider.getConfig());
//Drop the Channel Datasets
//TODO: Need to find some way to handle if this fails.
//TODO: Prevent datasets for Channels from being dropped elsewhere
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 df8dab1..5460d3f 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
@@ -182,13 +182,10 @@
}
RecordConstructor recordCon = new RecordConstructor(fb);
subscriptionTuple.setBody(recordCon);
-
subscriptionTuple.setVarCounter(varCounter);
-
MetadataProvider tempMdProvider = new
MetadataProvider(metadataProvider.getApplicationContext(),
metadataProvider.getDefaultDataverse());
- tempMdProvider.setConfig(metadataProvider.getConfig());
-
+ tempMdProvider.getConfig().putAll(metadataProvider.getConfig());
if (subscriptionId == null) {
//To create a new subscription
VariableExpr resultVar = new VariableExpr(new
VarIdentifier("$result", 0));
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 28d09df..100ff5f 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
@@ -145,7 +145,7 @@
delete.accept(visitor, null);
MetadataProvider tempMdProvider = new
MetadataProvider(metadataProvider.getApplicationContext(),
metadataProvider.getDefaultDataverse());
- tempMdProvider.setConfig(metadataProvider.getConfig());
+ tempMdProvider.getConfig().putAll(metadataProvider.getConfig());
((QueryTranslator)
statementExecutor).handleDeleteStatement(tempMdProvider, delete, hcc, false);
MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
} catch (Exception e) {
diff --git
a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
index a43020f..83dd849 100644
---
a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
+++
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/CreateChannelStatement.java
@@ -160,7 +160,6 @@
durationParser.parse(duration.toCharArray(), 0,
duration.toCharArray().length, outputStream);
this.resultsTableName = resultsTableName;
this.subscriptionsTableName = subscriptionsTableName;
-
}
@Override
@@ -306,7 +305,7 @@
}
MetadataProvider tempMdProvider = new
MetadataProvider(metadataProvider.getApplicationContext(),
metadataProvider.getDefaultDataverse());
- tempMdProvider.setConfig(metadataProvider.getConfig());
+ tempMdProvider.getConfig().putAll(metadataProvider.getConfig());
//Create Channel Datasets
createDatasets(statementExecutor, subscriptionsName, resultsName,
tempMdProvider, hcc, hdc, dataverse);
tempMdProvider.getLocks().reset();
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 1c497a8..e10fea9 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
@@ -226,14 +226,11 @@
if (alreadyActive) {
throw new AsterixException("Procedure " + signature.getName()
+ " is already running");
}
-
procedure = new Procedure(dataverse, signature.getName(),
signature.getArity(), getParamList(),
Function.RETURNTYPE_VOID, getFunctionBody(),
Function.LANGUAGE_AQL, duration);
-
MetadataProvider tempMdProvider = new
MetadataProvider(metadataProvider.getApplicationContext(),
metadataProvider.getDefaultDataverse());
- tempMdProvider.setConfig(metadataProvider.getConfig());
-
+ tempMdProvider.getConfig().putAll(metadataProvider.getConfig());
metadataProvider.setResultSetId(new
ResultSetId(resultSetIdCounter++));
boolean resultsAsync = resultDelivery == ResultDelivery.ASYNC ||
resultDelivery == ResultDelivery.DEFERRED;
metadataProvider.setResultAsyncMode(resultsAsync);
--
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <bamou...@gmail.com>
Gerrit-Reviewer: Ian Maxon <ima...@apache.org>
Gerrit-Reviewer: Xikui Wang <xkk...@gmail.com>
Gerrit-Reviewer: abdullah alamoudi <bamou...@gmail.com>
