Till Westmann has submitted this change and it was merged. Change subject: ASTERIXDB-1711: remove "Aql" ......................................................................
ASTERIXDB-1711: remove "Aql" - AQLAPIServlet -> FullAPIServlet - AqlPrimitiveValueProviderFactory -> PrimitiveValueProviderFactory - remove AqlLogicalPlanAndMetadataImpl - remore AqlMetadataImplConfig Change-Id: I8e371941ba509d10193649aaed48a74a08d2d1f5 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1447 Tested-by: Jenkins <[email protected]> BAD: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: abdullah alamoudi <[email protected]> --- R asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FullAPIServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java D asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlLogicalPlanAndMetadataImpl.java D asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataImplConfig.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java R asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/PrimitiveValueProviderFactory.java 8 files changed, 19 insertions(+), 106 deletions(-) Approvals: abdullah alamoudi: Looks good to me, approved Jenkins: Verified; No violations found; Verified Objections: Jenkins: Violations found diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/AQLAPIServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FullAPIServlet.java similarity index 93% rename from asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/AQLAPIServlet.java rename to asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FullAPIServlet.java index bbb9dde..0f86ec6 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/AQLAPIServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/FullAPIServlet.java @@ -24,14 +24,14 @@ import org.apache.asterix.lang.common.base.Statement; import org.apache.asterix.translator.IStatementExecutorFactory; -public class AQLAPIServlet extends RESTAPIServlet { +public class FullAPIServlet extends RESTAPIServlet { private static final long serialVersionUID = 1L; private static final String AQL_STMT_PARAM_NAME = "aql"; private static final byte ALLOWED_CATEGORIES = Statement.Category.QUERY | Statement.Category.UPDATE | Statement.Category.DDL | Statement.Category.PROCEDURE; - public AQLAPIServlet(ILangCompilationProvider compilationProvider, + public FullAPIServlet(ILangCompilationProvider compilationProvider, IStatementExecutorFactory statementExecutorFactory) { super(compilationProvider, statementExecutorFactory); } diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java index 1a74e17..a2518ec 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java @@ -39,7 +39,7 @@ import org.apache.asterix.common.ioopcallbacks.LSMBTreeWithBuddyIOOperationCallbackFactory; import org.apache.asterix.common.ioopcallbacks.LSMRTreeIOOperationCallbackFactory; import org.apache.asterix.common.transactions.IResourceFactory; -import org.apache.asterix.dataflow.data.nontagged.valueproviders.AqlPrimitiveValueProviderFactory; +import org.apache.asterix.dataflow.data.nontagged.valueproviders.PrimitiveValueProviderFactory; import org.apache.asterix.external.api.IAdapterFactory; import org.apache.asterix.external.indexing.ExternalFile; import org.apache.asterix.external.indexing.FilesIndexDescription; @@ -601,7 +601,7 @@ secondaryComparatorFactories[i] = BinaryComparatorFactoryProvider.INSTANCE .getBinaryComparatorFactory(nestedKeyType, true); secondaryTypeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(nestedKeyType); - valueProviderFactories[i] = AqlPrimitiveValueProviderFactory.INSTANCE; + valueProviderFactories[i] = PrimitiveValueProviderFactory.INSTANCE; } // Add serializers and comparators for primary index fields. for (int i = 0; i < numPrimaryKeys; i++) { diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java index d6352b7..c96ba4c 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java @@ -31,7 +31,7 @@ import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.ioopcallbacks.LSMRTreeIOOperationCallbackFactory; import org.apache.asterix.common.transactions.IResourceFactory; -import org.apache.asterix.dataflow.data.nontagged.valueproviders.AqlPrimitiveValueProviderFactory; +import org.apache.asterix.dataflow.data.nontagged.valueproviders.PrimitiveValueProviderFactory; import org.apache.asterix.external.indexing.IndexingConstants; import org.apache.asterix.external.operators.ExternalDataScanOperatorDescriptor; import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; @@ -212,7 +212,7 @@ secondaryComparatorFactories[i] = BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(nestedKeyType, true); secondaryTypeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(nestedKeyType); - valueProviderFactories[i] = AqlPrimitiveValueProviderFactory.INSTANCE; + valueProviderFactories[i] = PrimitiveValueProviderFactory.INSTANCE; } // Add serializers and comparators for primary index fields. diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java index 25a5418..19c00db 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java @@ -30,7 +30,7 @@ import org.apache.asterix.active.ActiveLifecycleListener; import org.apache.asterix.api.http.servlet.APIServlet; -import org.apache.asterix.api.http.servlet.AQLAPIServlet; +import org.apache.asterix.api.http.servlet.FullAPIServlet; import org.apache.asterix.api.http.servlet.ClusterAPIServlet; import org.apache.asterix.api.http.servlet.ClusterCCDetailsAPIServlet; import org.apache.asterix.api.http.servlet.ClusterNodeDetailsAPIServlet; @@ -261,7 +261,7 @@ protected Servlet createServlet(Servlets key) { switch (key) { case AQL: - return new AQLAPIServlet(ccExtensionManager.getAqlCompilationProvider(), + return new FullAPIServlet(ccExtensionManager.getAqlCompilationProvider(), ccExtensionManager.getQueryTranslatorFactory()); case AQL_QUERY: return new QueryAPIServlet(ccExtensionManager.getAqlCompilationProvider(), @@ -273,7 +273,7 @@ return new DDLAPIServlet(ccExtensionManager.getAqlCompilationProvider(), ccExtensionManager.getQueryTranslatorFactory()); case SQLPP: - return new AQLAPIServlet(ccExtensionManager.getSqlppCompilationProvider(), + return new FullAPIServlet(ccExtensionManager.getSqlppCompilationProvider(), ccExtensionManager.getQueryTranslatorFactory()); case SQLPP_QUERY: return new QueryAPIServlet(ccExtensionManager.getSqlppCompilationProvider(), diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlLogicalPlanAndMetadataImpl.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlLogicalPlanAndMetadataImpl.java deleted file mode 100644 index 39e2781..0000000 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlLogicalPlanAndMetadataImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.asterix.metadata.declared; - -import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint; -import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan; -import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlanAndMetadata; - -public class AqlLogicalPlanAndMetadataImpl implements ILogicalPlanAndMetadata { - - private ILogicalPlan plan; - private MetadataProvider metadataProvider; - - public AqlLogicalPlanAndMetadataImpl(ILogicalPlan plan, MetadataProvider metadataProvider) { - this.plan = plan; - this.metadataProvider = metadataProvider; - } - - @Override - public ILogicalPlan getPlan() { - return plan; - } - - @Override - public MetadataProvider getMetadataProvider() { - return metadataProvider; - } - - @Override - public AlgebricksPartitionConstraint getClusterLocations() { - return metadataProvider.getClusterLocations(); - } -} diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataImplConfig.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataImplConfig.java deleted file mode 100644 index b17fc20..0000000 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataImplConfig.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.asterix.metadata.declared; - -public class AqlMetadataImplConfig { - private final boolean useInstantLock; - - public AqlMetadataImplConfig(boolean useInstantLock) { - this.useInstantLock = useInstantLock; - } - - public boolean isInstantLock() { - return useInstantLock; - } -} 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 26706c6..bd991fc 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 @@ -47,7 +47,7 @@ import org.apache.asterix.common.transactions.IRecoveryManager.ResourceType; import org.apache.asterix.common.transactions.JobId; import org.apache.asterix.common.utils.StoragePathUtil; -import org.apache.asterix.dataflow.data.nontagged.valueproviders.AqlPrimitiveValueProviderFactory; +import org.apache.asterix.dataflow.data.nontagged.valueproviders.PrimitiveValueProviderFactory; import org.apache.asterix.external.adapter.factory.LookupAdapterFactory; import org.apache.asterix.external.api.IAdapterFactory; import org.apache.asterix.external.api.IDataSourceAdapter; @@ -632,7 +632,7 @@ IPrimitiveValueProviderFactory[] valueProviderFactories = new IPrimitiveValueProviderFactory[numNestedSecondaryKeyFields]; for (int i = 0; i < numNestedSecondaryKeyFields; i++) { - valueProviderFactories[i] = AqlPrimitiveValueProviderFactory.INSTANCE; + valueProviderFactories[i] = PrimitiveValueProviderFactory.INSTANCE; } RecordDescriptor outputRecDesc = JobGenHelper.mkRecordDescriptor(typeEnv, opSchema, context); @@ -1729,7 +1729,7 @@ comparatorFactories[i] = BinaryComparatorFactoryProvider.INSTANCE .getBinaryComparatorFactory(nestedKeyType, true); typeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(nestedKeyType); - valueProviderFactories[i] = AqlPrimitiveValueProviderFactory.INSTANCE; + valueProviderFactories[i] = PrimitiveValueProviderFactory.INSTANCE; } List<List<String>> partitioningKeys = DatasetUtils.getPartitioningKeys(dataset); for (List<String> partitioningKey : partitioningKeys) { diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/AqlPrimitiveValueProviderFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/PrimitiveValueProviderFactory.java similarity index 85% rename from asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/AqlPrimitiveValueProviderFactory.java rename to asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/PrimitiveValueProviderFactory.java index 6944708..62f3312 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/AqlPrimitiveValueProviderFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/PrimitiveValueProviderFactory.java @@ -27,13 +27,13 @@ import org.apache.hyracks.storage.am.rtree.impls.FloatPrimitiveValueProviderFactory; import org.apache.hyracks.storage.am.rtree.impls.IntegerPrimitiveValueProviderFactory; -public class AqlPrimitiveValueProviderFactory implements IPrimitiveValueProviderFactory { +public class PrimitiveValueProviderFactory implements IPrimitiveValueProviderFactory { private static final long serialVersionUID = 1L; - public static final AqlPrimitiveValueProviderFactory INSTANCE = new AqlPrimitiveValueProviderFactory(); + public static final PrimitiveValueProviderFactory INSTANCE = new PrimitiveValueProviderFactory(); - private AqlPrimitiveValueProviderFactory() { + private PrimitiveValueProviderFactory() { } @Override @@ -48,21 +48,16 @@ @Override public double getValue(byte[] bytes, int offset) { - ATypeTag tag = EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(bytes[offset]); switch (tag) { - case INT32: { + case INT32: return intProvider.getValue(bytes, offset + 1); - } - case FLOAT: { + case FLOAT: return floatProvider.getValue(bytes, offset + 1); - } - case DOUBLE: { + case DOUBLE: return doubleProvider.getValue(bytes, offset + 1); - } - default: { + default: throw new NotImplementedException("Value provider for type " + tag + " is not implemented"); - } } } }; -- To view, visit https://asterix-gerrit.ics.uci.edu/1447 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e371941ba509d10193649aaed48a74a08d2d1f5 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
