You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by am...@apache.org on 2017/08/15 00:37:34 UTC
asterixdb git commit: [ASTERIXDB-2036] Make MetadataProvider Config
final
Repository: asterixdb
Updated Branches:
refs/heads/master 122a73693 -> 98de3eb14
[ASTERIXDB-2036] Make MetadataProvider Config final
- user model changes: no
- storage format changes: no
- interface changes: no
details:
- Make config map final to avoid NullPointerExceptions
Change-Id: I25ed6433a4e1a267deeedbf22d09c119704e8d7d
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1937
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Xikui Wang <xk...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/98de3eb1
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/98de3eb1
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/98de3eb1
Branch: refs/heads/master
Commit: 98de3eb14558ee64da8f2bab4a840dab119df401
Parents: 122a736
Author: Abdullah Alamoudi <ba...@gmail.com>
Authored: Sat Aug 12 23:48:36 2017 -0700
Committer: abdullah alamoudi <ba...@gmail.com>
Committed: Mon Aug 14 17:37:03 2017 -0700
----------------------------------------------------------------------
.../asterix/app/active/ActiveEntityEventsListener.java | 2 --
.../org/apache/asterix/app/translator/QueryTranslator.java | 4 ++--
.../apache/asterix/test/active/ActiveEventsListenerTest.java | 5 -----
.../apache/asterix/metadata/declared/MetadataProvider.java | 8 +++-----
4 files changed, 5 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/98de3eb1/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
index acb1614..e30272c 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java
@@ -21,7 +21,6 @@ package org.apache.asterix.app.active;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.EnumSet;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -112,7 +111,6 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl
this.appCtx = appCtx;
this.clusterStateManager = appCtx.getClusterStateManager();
this.metadataProvider = new MetadataProvider(appCtx, null);
- metadataProvider.setConfig(new HashMap<>());
this.hcc = hcc;
this.entityId = entityId;
this.datasets = datasets;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/98de3eb1/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index 027fbbe..b97c014 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -261,13 +261,13 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen
FileSplit outputFile = null;
IAWriterFactory writerFactory = PrinterBasedWriterFactory.INSTANCE;
IResultSerializerFactoryProvider resultSerializerFactoryProvider = ResultSerializerFactoryProvider.INSTANCE;
- Map<String, String> config = new HashMap<>();
/* Since the system runs a large number of threads, when HTTP requests don't return, it becomes difficult to
* find the thread running the request to determine where it has stopped.
* Setting the thread name helps make that easier
*/
String threadName = Thread.currentThread().getName();
Thread.currentThread().setName(QueryTranslator.class.getSimpleName());
+ Map<String, String> config = new HashMap<>();
try {
for (Statement stmt : statements) {
if (sessionConfig.is(SessionConfig.FORMAT_HTML)) {
@@ -276,10 +276,10 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen
validateOperation(appCtx, activeDataverse, stmt);
rewriteStatement(stmt); // Rewrite the statement's AST.
MetadataProvider metadataProvider = new MetadataProvider(appCtx, activeDataverse);
+ metadataProvider.getConfig().putAll(config);
metadataProvider.setWriterFactory(writerFactory);
metadataProvider.setResultSerializerFactoryProvider(resultSerializerFactoryProvider);
metadataProvider.setOutputFile(outputFile);
- metadataProvider.setConfig(config);
switch (stmt.getKind()) {
case Statement.Kind.SET:
handleSetStatement(stmt, config);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/98de3eb1/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/ActiveEventsListenerTest.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/ActiveEventsListenerTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/ActiveEventsListenerTest.java
index 0a7b444..a256bcf 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/ActiveEventsListenerTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/ActiveEventsListenerTest.java
@@ -21,7 +21,6 @@ package org.apache.asterix.test.active;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
-import java.util.HashMap;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -117,7 +116,6 @@ public class ActiveEventsListenerTest {
Mockito.when(ccService.getExecutor()).thenReturn(executor);
locations = new AlgebricksAbsolutePartitionConstraint(nodes);
metadataProvider = new MetadataProvider(appCtx, null);
- metadataProvider.setConfig(new HashMap<>());
clusterController = new TestClusterControllerActor("CC", handler, allDatasets);
nodeControllers = new TestNodeControllerActor[2];
nodeControllers[0] = new TestNodeControllerActor(nodes[0], clusterController);
@@ -133,7 +131,6 @@ public class ActiveEventsListenerTest {
TestUserActor newUser(String name, CcApplicationContext appCtx) {
MetadataProvider actorMdProvider = new MetadataProvider(appCtx, null);
- actorMdProvider.setConfig(new HashMap<>());
return new TestUserActor("User: " + name, actorMdProvider, clusterController);
}
@@ -1387,8 +1384,6 @@ public class ActiveEventsListenerTest {
Mockito.when(ccService.getExecutor()).thenReturn(executor);
Mockito.when(ccAppCtx.getStorageComponentProvider()).thenReturn(componentProvider);
AlgebricksAbsolutePartitionConstraint locations = new AlgebricksAbsolutePartitionConstraint(nodes);
- MetadataProvider metadataProvider = new MetadataProvider(ccAppCtx, null);
- metadataProvider.setConfig(new HashMap<>());
additionalListeners[i] = listener = new TestEventsListener(clusterController, nodeControllers, jobIdFactory,
entityId, new ArrayList<>(allDatasets), statementExecutor, ccAppCtx, hcc, locations,
new InfiniteRetryPolicyFactory());
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/98de3eb1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
index 7d28a06..8971a90 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
@@ -21,6 +21,7 @@ package org.apache.asterix.metadata.declared;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -143,10 +144,10 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String>
private final StorageProperties storageProperties;
private final Dataverse defaultDataverse;
private final LockList locks;
+ private final Map<String, String> config;
private MetadataTransactionContext mdTxnCtx;
private boolean isWriteTransaction;
- private Map<String, String> config;
private IAWriterFactory writerFactory;
private FileSplit outputFile;
private boolean asyncResults;
@@ -163,16 +164,13 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String>
this.storageComponentProvider = appCtx.getStorageComponentProvider();
storageProperties = appCtx.getStorageProperties();
locks = new LockList();
+ config = new HashMap<>();
}
public String getPropertyValue(String propertyName) {
return config.get(propertyName);
}
- public void setConfig(Map<String, String> config) {
- this.config = config;
- }
-
public void disableBlockingOperator() {
blockingOperatorDisabled = true;
}