Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[abdullah alamoudi (Code Review)]

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 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());
+

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[Ian Maxon (Code Review)]

Ian Maxon has posted comments on this change.

Change subject: Remove explicit creation of metadata provider config
..


Patch Set 2: Verified+1

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Xikui Wang 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[abdullah alamoudi (Code Review)]

abdullah alamoudi has posted comments on this change.

Change subject: Remove explicit creation of metadata provider config
..


Patch Set 2: Verified+1

Build passed...

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Xikui Wang 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[Xikui Wang (Code Review)]

Xikui Wang has posted comments on this change.

Change subject: Remove explicit creation of metadata provider config
..


Patch Set 2: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Remove explicit creation of metadata provider config
..


Patch Set 2:

Build Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-gerrit/167/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Remove explicit creation of metadata provider config
..


Patch Set 2:

Build Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-gerrit/166/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Remove explicit creation of metadata provider config
..


Patch Set 2:

Build Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-gerrit/165/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Remove explicit creation of metadata provider config
..


Patch Set 2:

Build Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-gerrit/164/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[abdullah alamoudi (Code Review)]

Hello Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1939

to look at the new patch set (#2).

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(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb-bad 
refs/changes/39/1939/2
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-Reviewer: abdullah alamoudi 

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[abdullah alamoudi (Code Review)]

abdullah alamoudi has posted comments on this change.

Change subject: Remove explicit creation of metadata provider config
..


Patch Set 1:

(1 comment)

https://asterix-gerrit.ics.uci.edu/#/c/1939/1/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java
File 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java:

Line 60: MetadataProvider tempMdProvider = new MetadataProvider(appCtx, 
metadataProvider.getDefaultDataverse());
> SetConfig. Note for Abdullah.
Done


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: Yes

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[Xikui Wang (Code Review)]

Xikui Wang has posted comments on this change.

Change subject: Remove explicit creation of metadata provider config
..


Patch Set 1:

(1 comment)

https://asterix-gerrit.ics.uci.edu/#/c/1939/1/asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java
File 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/BADStatementExecutor.java:

Line 60: MetadataProvider tempMdProvider = new MetadataProvider(appCtx, 
metadataProvider.getDefaultDataverse());
SetConfig. Note for Abdullah.


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-HasComments: Yes

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Remove explicit creation of metadata provider config
..


Patch Set 1:

Build Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-gerrit/163/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1939
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I230bf98b9a794480bbce6ec6d4511ce5deb5d07c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb-bad[master]: Remove explicit creation of metadata provider config

[abdullah alamoudi (Code Review)]

abdullah alamoudi has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1939

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, 0 insertions(+), 12 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb-bad 
refs/changes/39/1939/1

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..225ce3a 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,6 @@
 Identifier dvId = ((DataverseDropStatement) stmt).getDataverseName();
 List brokers = BADLangExtension.getBrokers(mdTxnCtx, 
dvId.getValue());
 MetadataProvider tempMdProvider = new MetadataProvider(appCtx, 
metadataProvider.getDefaultDataverse());
-tempMdProvider.setConfig(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..b5e132d 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,6 @@
 
 //Create a metadata provider to use in nested jobs.
 MetadataProvider tempMdProvider = new MetadataProvider(appCtx, 
metadataProvider.getDefaultDataverse());
-tempMdProvider.setConfig(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..c73d930 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,9 @@
 }
 RecordConstructor recordCon = new RecordConstructor(fb);
 subscriptionTuple.setBody(recordCon);
-
 subscriptionTuple.setVarCounter(varCounter);
-
 MetadataProvider tempMdProvider = new 
MetadataProvider(metadataProvider.getApplicationContext(),
 metadataProvider.getDefaultDataverse());
-tempMdProvider.setConfig(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..1462621 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,6 @@
 delete.accept(visitor, null);
 MetadataProvider tempMdProvider = new 
MetadataProvider(metadataProvider.getApplicationContext(),
 metadataProvider.getDefaultDataverse());
-tempMdProvider.setConfig(metadataProvider.getConfig());
 ((QueryTranslator) 
statementExecutor).handleDeleteStatement(tempMdProvider, delete, hcc, false);
 MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
 } catch (Exception e) {
diff --git