This is an automated email from the ASF dual-hosted git repository. imaxon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 61aad744bcb446f976bc79a9feedce88256bbc26 Author: Dmitry Lychagin <[email protected]> AuthorDate: Tue Apr 27 12:19:43 2021 -0700 [NO ISSUE][FUN] Remove decode_dataverse_display_name() - user model changes: no - storage format changes: no - interface changes: no Details: - Remove decode_dataverse_display_name() function Change-Id: Iae38424c92ba237b58032958b67a6e2026615f0d Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11203 Integration-Tests: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Tested-by: Jenkins <[email protected]> --- .../special_chars_2/special_chars_2.2.query.sqlpp | 1 - .../special_chars_2/special_chars_2.2.adm | 12 +-- .../asterix/om/functions/BuiltinFunctions.java | 3 - .../DecodeDataverseDisplayNameDescriptor.java | 88 ---------------------- .../runtime/functions/FunctionCollection.java | 2 - 5 files changed, 6 insertions(+), 100 deletions(-) diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/multipart-dataverse/special_chars_2/special_chars_2.2.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/multipart-dataverse/special_chars_2/special_chars_2.2.query.sqlpp index 4dc4e3b..08a41b5 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/multipart-dataverse/special_chars_2/special_chars_2.2.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/multipart-dataverse/special_chars_2/special_chars_2.2.query.sqlpp @@ -18,7 +18,6 @@ */ select DataverseName as CanonicalName, - decode_dataverse_display_name(DataverseName) as DisplayName, decode_dataverse_name(DataverseName) as NameParts from Metadata.`Dataverse` order by DataverseName; \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/multipart-dataverse/special_chars_2/special_chars_2.2.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/multipart-dataverse/special_chars_2/special_chars_2.2.adm index 7edd3eb..805247c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/multipart-dataverse/special_chars_2/special_chars_2.2.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/multipart-dataverse/special_chars_2/special_chars_2.2.adm @@ -1,6 +1,6 @@ -{ "CanonicalName": "A", "DisplayName": "A", "NameParts": [ "A" ] } -{ "CanonicalName": "B/C", "DisplayName": "B.C", "NameParts": [ "B", "C" ] } -{ "CanonicalName": "C.D.E", "DisplayName": "`C.D.E`", "NameParts": [ "C.D.E" ] } -{ "CanonicalName": "Default", "DisplayName": "Default", "NameParts": [ "Default" ] } -{ "CanonicalName": "Metadata", "DisplayName": "Metadata", "NameParts": [ "Metadata" ] } -{ "CanonicalName": "a-A/b_B/c$C/z.Z", "DisplayName": "`a-A`.b_B.c$C.`z.Z`", "NameParts": [ "a-A", "b_B", "c$C", "z.Z" ] } \ No newline at end of file +{ "CanonicalName": "A", "NameParts": [ "A" ] } +{ "CanonicalName": "B/C", "NameParts": [ "B", "C" ] } +{ "CanonicalName": "C.D.E", "NameParts": [ "C.D.E" ] } +{ "CanonicalName": "Default", "NameParts": [ "Default" ] } +{ "CanonicalName": "Metadata", "NameParts": [ "Metadata" ] } +{ "CanonicalName": "a-A/b_B/c$C/z.Z", "NameParts": [ "a-A", "b_B", "c$C", "z.Z" ] } \ No newline at end of file diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java index aac01f9..a2e235e 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java @@ -1592,8 +1592,6 @@ public class BuiltinFunctions { public static final FunctionIdentifier DECODE_DATAVERSE_NAME = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, "decode-dataverse-name", 1); - public static final FunctionIdentifier DECODE_DATAVERSE_DISPLAY_NAME = - new FunctionIdentifier(FunctionConstants.ASTERIX_NS, "decode-dataverse-display-name", 1); static { // first, take care of Algebricks builtin functions @@ -2366,7 +2364,6 @@ public class BuiltinFunctions { addPrivateFunction(META_KEY, AnyTypeComputer.INSTANCE, false); addFunction(DECODE_DATAVERSE_NAME, OrderedListOfAStringTypeComputer.INSTANCE_NULLABLE, true); - addFunction(DECODE_DATAVERSE_DISPLAY_NAME, AStringTypeComputer.INSTANCE_NULLABLE, true); addPrivateFunction(COLLECTION_TO_SEQUENCE, CollectionToSequenceTypeComputer.INSTANCE, true); diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/DecodeDataverseDisplayNameDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/DecodeDataverseDisplayNameDescriptor.java deleted file mode 100644 index fd78b72..0000000 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/DecodeDataverseDisplayNameDescriptor.java +++ /dev/null @@ -1,88 +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.runtime.evaluators.functions; - -import java.io.IOException; - -import org.apache.asterix.common.annotations.MissingNullInOutFunction; -import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.common.metadata.DataverseName; -import org.apache.asterix.om.functions.BuiltinFunctions; -import org.apache.asterix.om.functions.IFunctionDescriptorFactory; -import org.apache.asterix.runtime.evaluators.base.AbstractScalarFunctionDynamicDescriptor; -import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -import org.apache.hyracks.algebricks.runtime.base.IEvaluatorContext; -import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; -import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import org.apache.hyracks.api.exceptions.HyracksDataException; -import org.apache.hyracks.data.std.api.IPointable; -import org.apache.hyracks.data.std.primitive.UTF8StringPointable; - -@MissingNullInOutFunction -public class DecodeDataverseDisplayNameDescriptor extends AbstractScalarFunctionDynamicDescriptor { - private static final long serialVersionUID = 1L; - - public static final IFunctionDescriptorFactory FACTORY = DecodeDataverseDisplayNameDescriptor::new; - - @Override - public IScalarEvaluatorFactory createEvaluatorFactory(IScalarEvaluatorFactory[] args) { - return new IScalarEvaluatorFactory() { - private static final long serialVersionUID = 1L; - - @Override - public IScalarEvaluator createScalarEvaluator(IEvaluatorContext ctx) throws HyracksDataException { - return new AbstractUnaryStringStringEval(ctx, args[0], getIdentifier(), sourceLoc) { - - private final StringBuilder sb = new StringBuilder(); - - @Override - void process(UTF8StringPointable inputString, IPointable resultPointable) throws IOException { - String dataverseCanonicalName = inputString.toString(); - - sb.setLength(0); - try { - DataverseName.getDisplayFormFromCanonicalForm(dataverseCanonicalName, sb); - } catch (AsterixException e) { - return; // writeResult() will emit NULL - } - - resultBuilder.reset(resultArray, inputString.getUTF8Length()); - resultBuilder.appendString(sb); - resultBuilder.finish(); - } - - @Override - void writeResult(IPointable resultPointable) throws IOException { - if (sb.length() == 0) { - PointableHelper.setNull(resultPointable); - } else { - super.writeResult(resultPointable); - } - } - }; - } - }; - } - - @Override - public FunctionIdentifier getIdentifier() { - return BuiltinFunctions.DECODE_DATAVERSE_DISPLAY_NAME; - } -} diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java index 42e27da..e1c9164 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java @@ -331,7 +331,6 @@ import org.apache.asterix.runtime.evaluators.functions.CreatePolygonDescriptor; import org.apache.asterix.runtime.evaluators.functions.CreateQueryUIDDescriptor; import org.apache.asterix.runtime.evaluators.functions.CreateRectangleDescriptor; import org.apache.asterix.runtime.evaluators.functions.CreateUUIDDescriptor; -import org.apache.asterix.runtime.evaluators.functions.DecodeDataverseDisplayNameDescriptor; import org.apache.asterix.runtime.evaluators.functions.DecodeDataverseNameDescriptor; import org.apache.asterix.runtime.evaluators.functions.DeepEqualityDescriptor; import org.apache.asterix.runtime.evaluators.functions.FullTextContainsDescriptor; @@ -1215,7 +1214,6 @@ public final class FunctionCollection implements IFunctionCollection { // Other functions fc.add(DecodeDataverseNameDescriptor.FACTORY); - fc.add(DecodeDataverseDisplayNameDescriptor.FACTORY); fc.add(RandomWithSeedDescriptor.FACTORY); ServiceLoader.load(IFunctionRegistrant.class).iterator().forEachRemaining(c -> c.register(fc));
