You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2019/07/16 21:22:14 UTC
[asterixdb] branch master updated: [NO ISSUE][OTH] Make Persisted
Classes List Non-Static
This is an automated email from the ASF dual-hosted git repository.
mhubail pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 2bf5bab [NO ISSUE][OTH] Make Persisted Classes List Non-Static
2bf5bab is described below
commit 2bf5babd9aed9362aa2eed75e1c5b5d90cb878a8
Author: Murtadha Hubail <mh...@apache.org>
AuthorDate: Tue Jul 16 15:52:50 2019 +0300
[NO ISSUE][OTH] Make Persisted Classes List Non-Static
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Make the registered classes list in PersistedResourceRegistry
non-static to prevent concurrent modification in environments
where multiple NCs share the same JVM.
- Use the proper NCApplication life cycle to configure the test
PersistedResourceRegistry rather than setting it after the
NCApplication is initialized.
Change-Id: Id89db7e89c90388ac7e5a1cee87be84e2f7d3c17
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3497
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Reviewed-by: Ali Alsuliman <al...@gmail.com>
---
.../asterix/app/io/PersistedResourceRegistry.java | 203 ++++++++++-----------
.../api/common/AsterixHyracksIntegrationUtil.java | 31 ++--
2 files changed, 114 insertions(+), 120 deletions(-)
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/io/PersistedResourceRegistry.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/io/PersistedResourceRegistry.java
index 894dc18..0681363 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/io/PersistedResourceRegistry.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/io/PersistedResourceRegistry.java
@@ -133,7 +133,7 @@ public class PersistedResourceRegistry implements IPersistedResourceRegistry {
private static final String DESERIALIZATION_METHOD = "fromJson";
private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
- protected static final Map<String, Class<? extends IJsonSerializable>> REGISTERED_CLASSES = new HashMap<>();
+ protected final Map<String, Class<? extends IJsonSerializable>> registeredClasses = new HashMap<>();
public PersistedResourceRegistry() {
registerClasses();
@@ -142,148 +142,147 @@ public class PersistedResourceRegistry implements IPersistedResourceRegistry {
protected void registerClasses() {
/* WARNING: Changing a resource id will break storage format backward compatibility.*/
- REGISTERED_CLASSES.put("Checkpoint", Checkpoint.class);
+ registeredClasses.put("Checkpoint", Checkpoint.class);
// IResource
- REGISTERED_CLASSES.put("LocalResource", LocalResource.class);
- REGISTERED_CLASSES.put("DatasetLocalResource", DatasetLocalResource.class);
- REGISTERED_CLASSES.put("LSMBTreeLocalResource", LSMBTreeLocalResource.class);
- REGISTERED_CLASSES.put("LSMRTreeLocalResource", LSMRTreeLocalResource.class);
- REGISTERED_CLASSES.put("LSMRTreeWithAntiMatterLocalResource", LSMRTreeWithAntiMatterLocalResource.class);
- REGISTERED_CLASSES.put("LSMInvertedIndexLocalResource", LSMInvertedIndexLocalResource.class);
- REGISTERED_CLASSES.put("ExternalBTreeLocalResource", ExternalBTreeLocalResource.class);
- REGISTERED_CLASSES.put("ExternalBTreeWithBuddyLocalResource", ExternalBTreeWithBuddyLocalResource.class);
- REGISTERED_CLASSES.put("ExternalRTreeLocalResource", ExternalRTreeLocalResource.class);
+ registeredClasses.put("LocalResource", LocalResource.class);
+ registeredClasses.put("DatasetLocalResource", DatasetLocalResource.class);
+ registeredClasses.put("LSMBTreeLocalResource", LSMBTreeLocalResource.class);
+ registeredClasses.put("LSMRTreeLocalResource", LSMRTreeLocalResource.class);
+ registeredClasses.put("LSMRTreeWithAntiMatterLocalResource", LSMRTreeWithAntiMatterLocalResource.class);
+ registeredClasses.put("LSMInvertedIndexLocalResource", LSMInvertedIndexLocalResource.class);
+ registeredClasses.put("ExternalBTreeLocalResource", ExternalBTreeLocalResource.class);
+ registeredClasses.put("ExternalBTreeWithBuddyLocalResource", ExternalBTreeWithBuddyLocalResource.class);
+ registeredClasses.put("ExternalRTreeLocalResource", ExternalRTreeLocalResource.class);
// ILSMMergePolicyFactory
- REGISTERED_CLASSES.put("NoMergePolicyFactory", NoMergePolicyFactory.class);
- REGISTERED_CLASSES.put("PrefixMergePolicyFactory", PrefixMergePolicyFactory.class);
- REGISTERED_CLASSES.put("ConstantMergePolicyFactory", ConstantMergePolicyFactory.class);
- REGISTERED_CLASSES.put("CorrelatedPrefixMergePolicyFactory", CorrelatedPrefixMergePolicyFactory.class);
+ registeredClasses.put("NoMergePolicyFactory", NoMergePolicyFactory.class);
+ registeredClasses.put("PrefixMergePolicyFactory", PrefixMergePolicyFactory.class);
+ registeredClasses.put("ConstantMergePolicyFactory", ConstantMergePolicyFactory.class);
+ registeredClasses.put("CorrelatedPrefixMergePolicyFactory", CorrelatedPrefixMergePolicyFactory.class);
// ILSMIOOperationSchedulerProvider
- REGISTERED_CLASSES.put("RuntimeComponentsProvider", RuntimeComponentsProvider.class);
+ registeredClasses.put("RuntimeComponentsProvider", RuntimeComponentsProvider.class);
// ITypeTraits
- REGISTERED_CLASSES.put("FixedLengthTypeTrait", FixedLengthTypeTrait.class);
- REGISTERED_CLASSES.put("VarLengthTypeTrait", VarLengthTypeTrait.class);
+ registeredClasses.put("FixedLengthTypeTrait", FixedLengthTypeTrait.class);
+ registeredClasses.put("VarLengthTypeTrait", VarLengthTypeTrait.class);
// ILSMOperationTrackerFactory
- REGISTERED_CLASSES.put("PrimaryIndexOperationTrackerFactory", PrimaryIndexOperationTrackerFactory.class);
- REGISTERED_CLASSES.put("SecondaryIndexOperationTrackerFactory", SecondaryIndexOperationTrackerFactory.class);
+ registeredClasses.put("PrimaryIndexOperationTrackerFactory", PrimaryIndexOperationTrackerFactory.class);
+ registeredClasses.put("SecondaryIndexOperationTrackerFactory", SecondaryIndexOperationTrackerFactory.class);
// ILSMComponentIdGeneratorFactory
- REGISTERED_CLASSES.put("DatasetLSMComponentIdGeneratorFactory", DatasetLSMComponentIdGeneratorFactory.class);
+ registeredClasses.put("DatasetLSMComponentIdGeneratorFactory", DatasetLSMComponentIdGeneratorFactory.class);
// IDatasetInfoProvider
- REGISTERED_CLASSES.put("DatasetInfoProvider", DatasetInfoProvider.class);
+ registeredClasses.put("DatasetInfoProvider", DatasetInfoProvider.class);
// ILSMOperationTrackerFactory
- REGISTERED_CLASSES.put("NoOpIOOperationCallbackFactory", NoOpIOOperationCallbackFactory.class);
- REGISTERED_CLASSES.put("LSMBTreeIOOperationCallbackFactory", LSMIndexIOOperationCallbackFactory.class);
+ registeredClasses.put("NoOpIOOperationCallbackFactory", NoOpIOOperationCallbackFactory.class);
+ registeredClasses.put("LSMBTreeIOOperationCallbackFactory", LSMIndexIOOperationCallbackFactory.class);
// ILSMIOOperationSchedulerProvider
- REGISTERED_CLASSES.put("AppendOnlyLinkedMetadataPageManagerFactory",
+ registeredClasses.put("AppendOnlyLinkedMetadataPageManagerFactory",
AppendOnlyLinkedMetadataPageManagerFactory.class);
// ILSMIOOperationSchedulerProvider
- REGISTERED_CLASSES.put("AsterixVirtualBufferCacheProvider", AsterixVirtualBufferCacheProvider.class);
+ registeredClasses.put("AsterixVirtualBufferCacheProvider", AsterixVirtualBufferCacheProvider.class);
// IBinaryComparatorFactory
- REGISTERED_CLASSES.put("ACirclePartialBinaryComparatorFactory", ACirclePartialBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("ADurationPartialBinaryComparatorFactory",
- ADurationPartialBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("AIntervalAscPartialBinaryComparatorFactory",
+ registeredClasses.put("ACirclePartialBinaryComparatorFactory", ACirclePartialBinaryComparatorFactory.class);
+ registeredClasses.put("ADurationPartialBinaryComparatorFactory", ADurationPartialBinaryComparatorFactory.class);
+ registeredClasses.put("AIntervalAscPartialBinaryComparatorFactory",
AIntervalAscPartialBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("AIntervalDescPartialBinaryComparatorFactory",
+ registeredClasses.put("AIntervalDescPartialBinaryComparatorFactory",
AIntervalDescPartialBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("ALinePartialBinaryComparatorFactory", ALinePartialBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("AObjectAscBinaryComparatorFactory", AGenericAscBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("AObjectDescBinaryComparatorFactory", AGenericDescBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("APoint3DPartialBinaryComparatorFactory", APoint3DPartialBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("APointPartialBinaryComparatorFactory", APointPartialBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("APolygonPartialBinaryComparatorFactory", APolygonPartialBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("ARectanglePartialBinaryComparatorFactory",
+ registeredClasses.put("ALinePartialBinaryComparatorFactory", ALinePartialBinaryComparatorFactory.class);
+ registeredClasses.put("AObjectAscBinaryComparatorFactory", AGenericAscBinaryComparatorFactory.class);
+ registeredClasses.put("AObjectDescBinaryComparatorFactory", AGenericDescBinaryComparatorFactory.class);
+ registeredClasses.put("APoint3DPartialBinaryComparatorFactory", APoint3DPartialBinaryComparatorFactory.class);
+ registeredClasses.put("APointPartialBinaryComparatorFactory", APointPartialBinaryComparatorFactory.class);
+ registeredClasses.put("APolygonPartialBinaryComparatorFactory", APolygonPartialBinaryComparatorFactory.class);
+ registeredClasses.put("ARectanglePartialBinaryComparatorFactory",
ARectanglePartialBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("AUUIDPartialBinaryComparatorFactory", AUUIDPartialBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("BooleanBinaryComparatorFactory", BooleanBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("ListItemBinaryComparatorFactory", ListItemBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("LongBinaryComparatorFactory", LongBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("RawBinaryComparatorFactory", RawBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("PointableBinaryComparatorFactory", PointableBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("HilbertDoubleComparatorFactory", HilbertDoubleComparatorFactory.class);
- REGISTERED_CLASSES.put("ZCurveDoubleComparatorFactory", ZCurveDoubleComparatorFactory.class);
- REGISTERED_CLASSES.put("ZCurveIntComparatorFactory", ZCurveIntComparatorFactory.class);
- REGISTERED_CLASSES.put("ComponentPosComparatorFactory",
+ registeredClasses.put("AUUIDPartialBinaryComparatorFactory", AUUIDPartialBinaryComparatorFactory.class);
+ registeredClasses.put("BooleanBinaryComparatorFactory", BooleanBinaryComparatorFactory.class);
+ registeredClasses.put("ListItemBinaryComparatorFactory", ListItemBinaryComparatorFactory.class);
+ registeredClasses.put("LongBinaryComparatorFactory", LongBinaryComparatorFactory.class);
+ registeredClasses.put("RawBinaryComparatorFactory", RawBinaryComparatorFactory.class);
+ registeredClasses.put("PointableBinaryComparatorFactory", PointableBinaryComparatorFactory.class);
+ registeredClasses.put("HilbertDoubleComparatorFactory", HilbertDoubleComparatorFactory.class);
+ registeredClasses.put("ZCurveDoubleComparatorFactory", ZCurveDoubleComparatorFactory.class);
+ registeredClasses.put("ZCurveIntComparatorFactory", ZCurveIntComparatorFactory.class);
+ registeredClasses.put("ComponentPosComparatorFactory",
SecondaryCorrelatedTreeIndexOperationsHelper.ComponentPosComparatorFactory.class);
- REGISTERED_CLASSES.put("AnyBinaryComparatorFactory", AnyBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("OrderedBinaryComparatorFactory", OrderedBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("OrderedLinearizeComparatorFactory", OrderedLinearizeComparatorFactory.class);
- REGISTERED_CLASSES.put("ByteBinaryComparatorFactory", ByteBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("ShortBinaryComparatorFactory", ShortBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("IntegerBinaryComparatorFactory", IntegerBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("FloatBinaryComparatorFactory", FloatBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("DoubleBinaryComparatorFactory", DoubleBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("UTF8StringBinaryComparatorFactory", UTF8StringBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("UTF8StringLowercaseBinaryComparatorFactory",
+ registeredClasses.put("AnyBinaryComparatorFactory", AnyBinaryComparatorFactory.class);
+ registeredClasses.put("OrderedBinaryComparatorFactory", OrderedBinaryComparatorFactory.class);
+ registeredClasses.put("OrderedLinearizeComparatorFactory", OrderedLinearizeComparatorFactory.class);
+ registeredClasses.put("ByteBinaryComparatorFactory", ByteBinaryComparatorFactory.class);
+ registeredClasses.put("ShortBinaryComparatorFactory", ShortBinaryComparatorFactory.class);
+ registeredClasses.put("IntegerBinaryComparatorFactory", IntegerBinaryComparatorFactory.class);
+ registeredClasses.put("FloatBinaryComparatorFactory", FloatBinaryComparatorFactory.class);
+ registeredClasses.put("DoubleBinaryComparatorFactory", DoubleBinaryComparatorFactory.class);
+ registeredClasses.put("UTF8StringBinaryComparatorFactory", UTF8StringBinaryComparatorFactory.class);
+ registeredClasses.put("UTF8StringLowercaseBinaryComparatorFactory",
UTF8StringLowercaseBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("UTF8StringLowercaseTokenBinaryComparatorFactory",
+ registeredClasses.put("UTF8StringLowercaseTokenBinaryComparatorFactory",
UTF8StringLowercaseTokenBinaryComparatorFactory.class);
- REGISTERED_CLASSES.put("ByteArrayBinaryComparatorFactory", ByteArrayBinaryComparatorFactory.class);
+ registeredClasses.put("ByteArrayBinaryComparatorFactory", ByteArrayBinaryComparatorFactory.class);
// IPointableFactory
- REGISTERED_CLASSES.put("AIntervalPointableFactory", AIntervalPointable.AIntervalPointableFactory.class);
- REGISTERED_CLASSES.put("AListPointableFactory", AListPointable.AListPointableFactory.class);
- REGISTERED_CLASSES.put("ARecordPointableFactory", ARecordPointable.ARecordPointableFactory.class);
- REGISTERED_CLASSES.put("BooleanPointableFactory", BooleanPointable.BooleanPointableFactory.class);
- REGISTERED_CLASSES.put("ByteArrayPointableFactory", ByteArrayPointable.ByteArrayPointableFactory.class);
- REGISTERED_CLASSES.put("BytePointableFactory", BytePointable.BytePointableFactory.class);
- REGISTERED_CLASSES.put("DoublePointableFactory", DoublePointable.DoublePointableFactory.class);
- REGISTERED_CLASSES.put("FloatPointableFactory", FloatPointable.FloatPointableFactory.class);
- REGISTERED_CLASSES.put("IntegerPointableFactory", IntegerPointable.IntegerPointableFactory.class);
- REGISTERED_CLASSES.put("LongPointableFactory", LongPointable.LongPointableFactory.class);
- REGISTERED_CLASSES.put("RawUTF8StringPointableFactory",
+ registeredClasses.put("AIntervalPointableFactory", AIntervalPointable.AIntervalPointableFactory.class);
+ registeredClasses.put("AListPointableFactory", AListPointable.AListPointableFactory.class);
+ registeredClasses.put("ARecordPointableFactory", ARecordPointable.ARecordPointableFactory.class);
+ registeredClasses.put("BooleanPointableFactory", BooleanPointable.BooleanPointableFactory.class);
+ registeredClasses.put("ByteArrayPointableFactory", ByteArrayPointable.ByteArrayPointableFactory.class);
+ registeredClasses.put("BytePointableFactory", BytePointable.BytePointableFactory.class);
+ registeredClasses.put("DoublePointableFactory", DoublePointable.DoublePointableFactory.class);
+ registeredClasses.put("FloatPointableFactory", FloatPointable.FloatPointableFactory.class);
+ registeredClasses.put("IntegerPointableFactory", IntegerPointable.IntegerPointableFactory.class);
+ registeredClasses.put("LongPointableFactory", LongPointable.LongPointableFactory.class);
+ registeredClasses.put("RawUTF8StringPointableFactory",
RawUTF8StringPointable.RawUTF8StringPointableFactory.class);
- REGISTERED_CLASSES.put("ShortPointableFactory", ShortPointable.ShortPointableFactory.class);
- REGISTERED_CLASSES.put("TaggedValuePointableFactory", TaggedValuePointable.TaggedValuePointableFactory.class);
- REGISTERED_CLASSES.put("UTF8StringLowercasePointableFactory",
+ registeredClasses.put("ShortPointableFactory", ShortPointable.ShortPointableFactory.class);
+ registeredClasses.put("TaggedValuePointableFactory", TaggedValuePointable.TaggedValuePointableFactory.class);
+ registeredClasses.put("UTF8StringLowercasePointableFactory",
UTF8StringLowercasePointable.UTF8StringLowercasePointableFactory.class);
- REGISTERED_CLASSES.put("UTF8StringLowercaseTokenPointableFactory",
+ registeredClasses.put("UTF8StringLowercaseTokenPointableFactory",
UTF8StringLowercaseTokenPointable.UTF8StringLowercaseTokenPointableFactory.class);
- REGISTERED_CLASSES.put("UTF8StringPointableFactory", UTF8StringPointable.UTF8StringPointableFactory.class);
- REGISTERED_CLASSES.put("VoidPointableFactory", VoidPointable.VoidPointableFactory.class);
+ registeredClasses.put("UTF8StringPointableFactory", UTF8StringPointable.UTF8StringPointableFactory.class);
+ registeredClasses.put("VoidPointableFactory", VoidPointable.VoidPointableFactory.class);
// IPrimitiveValueProviderFactory
- REGISTERED_CLASSES.put("DoublePrimitiveValueProviderFactory", DoublePrimitiveValueProviderFactory.class);
- REGISTERED_CLASSES.put("FloatPrimitiveValueProviderFactory", FloatPrimitiveValueProviderFactory.class);
- REGISTERED_CLASSES.put("IntegerPrimitiveValueProviderFactory", IntegerPrimitiveValueProviderFactory.class);
- REGISTERED_CLASSES.put("PointablePrimitiveValueProviderFactory", PointablePrimitiveValueProviderFactory.class);
- REGISTERED_CLASSES.put("PrimitiveValueProviderFactory", PrimitiveValueProviderFactory.class);
+ registeredClasses.put("DoublePrimitiveValueProviderFactory", DoublePrimitiveValueProviderFactory.class);
+ registeredClasses.put("FloatPrimitiveValueProviderFactory", FloatPrimitiveValueProviderFactory.class);
+ registeredClasses.put("IntegerPrimitiveValueProviderFactory", IntegerPrimitiveValueProviderFactory.class);
+ registeredClasses.put("PointablePrimitiveValueProviderFactory", PointablePrimitiveValueProviderFactory.class);
+ registeredClasses.put("PrimitiveValueProviderFactory", PrimitiveValueProviderFactory.class);
// IBinaryTokenizerFactory
- REGISTERED_CLASSES.put("AOrderedListBinaryTokenizerFactory", AOrderedListBinaryTokenizerFactory.class);
- REGISTERED_CLASSES.put("AUnorderedListBinaryTokenizerFactory", AUnorderedListBinaryTokenizerFactory.class);
- REGISTERED_CLASSES.put("NGramUTF8StringBinaryTokenizerFactory", NGramUTF8StringBinaryTokenizerFactory.class);
- REGISTERED_CLASSES.put("DelimitedUTF8StringBinaryTokenizerFactory",
+ registeredClasses.put("AOrderedListBinaryTokenizerFactory", AOrderedListBinaryTokenizerFactory.class);
+ registeredClasses.put("AUnorderedListBinaryTokenizerFactory", AUnorderedListBinaryTokenizerFactory.class);
+ registeredClasses.put("NGramUTF8StringBinaryTokenizerFactory", NGramUTF8StringBinaryTokenizerFactory.class);
+ registeredClasses.put("DelimitedUTF8StringBinaryTokenizerFactory",
DelimitedUTF8StringBinaryTokenizerFactory.class);
// ITokenFactory
- REGISTERED_CLASSES.put("AListElementTokenFactory", AListElementTokenFactory.class);
- REGISTERED_CLASSES.put("HashedUTF8NGramTokenFactory", HashedUTF8NGramTokenFactory.class);
- REGISTERED_CLASSES.put("HashedUTF8WordTokenFactory", HashedUTF8WordTokenFactory.class);
- REGISTERED_CLASSES.put("UTF8NGramTokenFactory", UTF8NGramTokenFactory.class);
- REGISTERED_CLASSES.put("UTF8WordTokenFactory", UTF8WordTokenFactory.class);
- REGISTERED_CLASSES.put("RTreePolicyType", RTreePolicyType.class);
+ registeredClasses.put("AListElementTokenFactory", AListElementTokenFactory.class);
+ registeredClasses.put("HashedUTF8NGramTokenFactory", HashedUTF8NGramTokenFactory.class);
+ registeredClasses.put("HashedUTF8WordTokenFactory", HashedUTF8WordTokenFactory.class);
+ registeredClasses.put("UTF8NGramTokenFactory", UTF8NGramTokenFactory.class);
+ registeredClasses.put("UTF8WordTokenFactory", UTF8WordTokenFactory.class);
+ registeredClasses.put("RTreePolicyType", RTreePolicyType.class);
// IAType
- REGISTERED_CLASSES.put("BuiltinType", BuiltinType.class);
- REGISTERED_CLASSES.put("AOrderedListType", AOrderedListType.class);
- REGISTERED_CLASSES.put("ARecordType", ARecordType.class);
- REGISTERED_CLASSES.put("AUnionType", AUnionType.class);
- REGISTERED_CLASSES.put("AUnorderedListType", AUnorderedListType.class);
+ registeredClasses.put("BuiltinType", BuiltinType.class);
+ registeredClasses.put("AOrderedListType", AOrderedListType.class);
+ registeredClasses.put("ARecordType", ARecordType.class);
+ registeredClasses.put("AUnionType", AUnionType.class);
+ registeredClasses.put("AUnorderedListType", AUnorderedListType.class);
//ICompressorDecompressorFactory
- CompressionManager.registerCompressorDecompressorsFactoryClasses(REGISTERED_CLASSES);
+ CompressionManager.registerCompressorDecompressorsFactoryClasses(registeredClasses);
}
@Override
@@ -334,7 +333,7 @@ public class PersistedResourceRegistry implements IPersistedResourceRegistry {
}
private String getResourceId(Class<? extends IJsonSerializable> clazz) {
- Optional<String> classId = REGISTERED_CLASSES.entrySet().stream()
+ Optional<String> classId = registeredClasses.entrySet().stream()
.filter(entry -> Objects.equals(entry.getValue(), clazz)).map(Map.Entry::getKey).findAny();
if (classId.isPresent()) {
return classId.get();
@@ -343,13 +342,13 @@ public class PersistedResourceRegistry implements IPersistedResourceRegistry {
}
private Class<? extends IJsonSerializable> getResourceClass(String id) {
- return REGISTERED_CLASSES.computeIfAbsent(id, key -> {
+ return registeredClasses.computeIfAbsent(id, key -> {
throw new IllegalStateException(String.format("No class with id %s was registered.", key));
});
}
- protected static void ensureFromJsonMethod() {
- for (Class<?> clazz : REGISTERED_CLASSES.values()) {
+ private void ensureFromJsonMethod() {
+ for (Class<?> clazz : registeredClasses.values()) {
try {
// Ensure fromJson method exists with expected parameters
clazz.getMethod(DESERIALIZATION_METHOD, IPersistedResourceRegistry.class, JsonNode.class);
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index ccbab3c..4837a98 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -183,7 +183,6 @@ public class AsterixHyracksIntegrationUtil {
hcc = new HyracksConnection(cc.getConfig().getClientListenAddress(), cc.getConfig().getClientListenPort(),
cc.getNetworkSecurityManager().getSocketChannelFactory());
this.ncs = nodeControllers.toArray(new NodeControllerService[nodeControllers.size()]);
- setTestPersistedResourceRegistry();
}
private void configureExternalLibDir() {
@@ -247,14 +246,12 @@ public class AsterixHyracksIntegrationUtil {
return ncConfig;
}
- protected INCApplication createNCApplication()
- throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+ protected INCApplication createNCApplication() {
// Instead of using this flag, RecoveryManagerTest should set the desired class in its config file
if (!gracefulShutdown) {
return new UngracefulShutdownNCApplication();
}
- String ncAppClass = (String) configManager.get(NCConfig.Option.APP_CLASS);
- return (INCApplication) Class.forName(ncAppClass).newInstance();
+ return new TestNCApplication();
}
private NCConfig fixupPaths(NCConfig ncConfig) throws IOException, AsterixException, CmdLineException {
@@ -394,14 +391,6 @@ public class AsterixHyracksIntegrationUtil {
opts.clear();
}
- public void setTestPersistedResourceRegistry() {
- for (NodeControllerService nc : ncs) {
- INcApplicationContext runtimeCtx = (INcApplicationContext) nc.getApplicationContext();
- runtimeCtx.getServiceContext()
- .setPersistedResourceRegistry(new AsterixHyracksIntegrationUtil.TestPersistedResourceRegistry());
- }
- }
-
/**
* @return the asterix-app absolute path if found, otherwise the default user path.
*/
@@ -425,7 +414,14 @@ public class AsterixHyracksIntegrationUtil {
}
}
- private class UngracefulShutdownNCApplication extends NCApplication {
+ private class TestNCApplication extends NCApplication {
+ @Override
+ protected void configurePersistedResourceRegistry() {
+ ncServiceCtx.setPersistedResourceRegistry(new TestPersistedResourceRegistry());
+ }
+ }
+
+ private class UngracefulShutdownNCApplication extends TestNCApplication {
@Override
public void stop() throws Exception {
// ungraceful shutdown
@@ -437,11 +433,10 @@ public class AsterixHyracksIntegrationUtil {
@Override
protected void registerClasses() {
super.registerClasses();
- REGISTERED_CLASSES.put("TestLsmBtreeLocalResource", TestLsmBtreeLocalResource.class);
- REGISTERED_CLASSES.put("TestLsmIoOpCallbackFactory", TestLsmIoOpCallbackFactory.class);
- REGISTERED_CLASSES.put("TestPrimaryIndexOperationTrackerFactory",
+ registeredClasses.put("TestLsmBtreeLocalResource", TestLsmBtreeLocalResource.class);
+ registeredClasses.put("TestLsmIoOpCallbackFactory", TestLsmIoOpCallbackFactory.class);
+ registeredClasses.put("TestPrimaryIndexOperationTrackerFactory",
TestPrimaryIndexOperationTrackerFactory.class);
}
}
-
}