You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by dl...@apache.org on 2019/11/26 19:54:51 UTC
[asterixdb-bad] branch master updated: Coordinated change for
extensible MetadataProvider
This is an automated email from the ASF dual-hosted git repository.
dlych pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb-bad.git
The following commit(s) were added to refs/heads/master by this push:
new d01a64e Coordinated change for extensible MetadataProvider
d01a64e is described below
commit d01a64ed025c01c8abffb1331cf4d4462d7dfefd
Author: Dmitry Lychagin <dm...@couchbase.com>
AuthorDate: Tue Nov 19 13:48:13 2019 -0800
Coordinated change for extensible MetadataProvider
Change-Id: Id7df08806befad531ac071163993b38b25d57847
---
.../java/org/apache/asterix/bad/lang/BADStatementExecutor.java | 8 ++++----
.../apache/asterix/bad/lang/statement/ChannelDropStatement.java | 2 +-
.../asterix/bad/lang/statement/ChannelSubscribeStatement.java | 2 +-
.../asterix/bad/lang/statement/ChannelUnsubscribeStatement.java | 2 +-
.../apache/asterix/bad/lang/statement/CreateChannelStatement.java | 2 +-
.../org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
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 51923ae..3cf2ce6 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
@@ -236,17 +236,17 @@ public class BADStatementExecutor extends QueryTranslator {
MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
metadataProvider.getLocks().unlock();
- metadataProvider = new MetadataProvider(appCtx, activeDataverse);
+ metadataProvider = MetadataProvider.create(appCtx, activeDataverse);
super.handleCreateIndexStatement(metadataProvider, stmt, hcc, requestParameters);
for (Channel channel : usages.first) {
- metadataProvider = new MetadataProvider(appCtx, activeDataverse);
+ metadataProvider = MetadataProvider.create(appCtx, activeDataverse);
BADJobService.redeployJobSpec(channel.getChannelId(), channel.getChannelBody(), metadataProvider, this, hcc,
requestParameters, false);
metadataProvider.getLocks().unlock();
}
for (Procedure procedure : usages.second) {
- metadataProvider = new MetadataProvider(appCtx, activeDataverse);
+ metadataProvider = MetadataProvider.create(appCtx, activeDataverse);
BADJobService.redeployJobSpec(procedure.getEntityId(), procedure.getBody(), metadataProvider, this, hcc,
requestParameters, false);
metadataProvider.getLocks().unlock();
@@ -303,7 +303,7 @@ public class BADStatementExecutor extends QueryTranslator {
MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction();
metadataProvider.setMetadataTxnContext(mdTxnCtx);
DataverseName dvId = ((DataverseDropStatement) stmt).getDataverseName();
- MetadataProvider tempMdProvider = new MetadataProvider(appCtx, metadataProvider.getDefaultDataverse());
+ MetadataProvider tempMdProvider = MetadataProvider.create(appCtx, metadataProvider.getDefaultDataverse());
tempMdProvider.getConfig().putAll(metadataProvider.getConfig());
List<Channel> channels = BADLangExtension.getAllChannels(mdTxnCtx);
for (Channel channel : channels) {
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 3a50777..23b3483 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
@@ -130,7 +130,7 @@ public class ChannelDropStatement extends ExtensionStatement {
}
}
//Create a metadata provider to use in nested jobs.
- MetadataProvider tempMdProvider = new MetadataProvider(appCtx, metadataProvider.getDefaultDataverse());
+ MetadataProvider tempMdProvider = MetadataProvider.create(appCtx, metadataProvider.getDefaultDataverse());
tempMdProvider.getConfig().putAll(metadataProvider.getConfig());
//Drop the Channel Datasets
//TODO: Need to find some way to handle if this fails.
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 2c87711..de9532c 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
@@ -178,7 +178,7 @@ public class ChannelSubscribeStatement extends ExtensionStatement {
RecordConstructor recordCon = new RecordConstructor(fb);
subscriptionTuple.setBody(recordCon);
subscriptionTuple.setVarCounter(varCounter);
- MetadataProvider tempMdProvider = new MetadataProvider(metadataProvider.getApplicationContext(),
+ 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/ChannelUnsubscribeStatement.java b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelUnsubscribeStatement.java
index 4f097c3..e8a381d 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
@@ -136,7 +136,7 @@ public class ChannelUnsubscribeStatement extends ExtensionStatement {
condition, varCounter);
SqlppDeleteRewriteVisitor visitor = new SqlppDeleteRewriteVisitor(metadataProvider);
delete.accept(visitor, null);
- MetadataProvider tempMdProvider = new MetadataProvider(metadataProvider.getApplicationContext(),
+ MetadataProvider tempMdProvider = MetadataProvider.create(metadataProvider.getApplicationContext(),
metadataProvider.getDefaultDataverse());
tempMdProvider.getConfig().putAll(metadataProvider.getConfig());
((QueryTranslator) statementExecutor).handleDeleteStatement(tempMdProvider, delete, hcc, false, null, null);
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 b807cc7..50ddf46 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
@@ -305,7 +305,7 @@ public class CreateChannelStatement extends ExtensionStatement {
if (!push && MetadataManager.INSTANCE.getDataset(mdTxnCtx, dataverseName, resultsTableName) != null) {
throw new AsterixException("The channel name:" + channelName + " is not available.");
}
- MetadataProvider tempMdProvider = new MetadataProvider(metadataProvider.getApplicationContext(),
+ MetadataProvider tempMdProvider = MetadataProvider.create(metadataProvider.getApplicationContext(),
metadataProvider.getDefaultDataverse());
tempMdProvider.getConfig().putAll(metadataProvider.getConfig());
final IResultSet resultSet = requestContext.getResultSet();
diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java b/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
index 6dcf1fd..fe7e511 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
@@ -120,7 +120,7 @@ public class BADGlobalRecoveryManager extends GlobalRecoveryManager {
//Redeploy Jobs
for (Channel channel : channels) {
EntityId entityId = channel.getChannelId();
- metadataProvider = new MetadataProvider(appCtx, MetadataBuiltinEntities.DEFAULT_DATAVERSE);
+ metadataProvider = MetadataProvider.create(appCtx, MetadataBuiltinEntities.DEFAULT_DATAVERSE);
DeployedJobSpecEventListener listener =
new DeployedJobSpecEventListener(appCtx, entityId, channel.getResultsDatasetName().equals("")
? PrecompiledType.PUSH_CHANNEL : PrecompiledType.CHANNEL);
@@ -144,7 +144,7 @@ public class BADGlobalRecoveryManager extends GlobalRecoveryManager {
}
for (Procedure procedure : procedures) {
EntityId entityId = procedure.getEntityId();
- metadataProvider = new MetadataProvider(appCtx, MetadataBuiltinEntities.DEFAULT_DATAVERSE);
+ metadataProvider = MetadataProvider.create(appCtx, MetadataBuiltinEntities.DEFAULT_DATAVERSE);
metadataProvider.setWriterFactory(PrinterBasedWriterFactory.INSTANCE);
metadataProvider.setResultSerializerFactoryProvider(ResultSerializerFactoryProvider.INSTANCE);
DeployedJobSpecEventListener listener =