You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@asterixdb.apache.org by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org> on 2017/06/29 14:40:42 UTC

Change in asterixdb[master]: [ASTERIXDB-1962][COMP][RT] Remove FieldAccessNested

Till Westmann has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1858

Change subject: [ASTERIXDB-1962][COMP][RT] Remove FieldAccessNested
......................................................................

[ASTERIXDB-1962][COMP][RT] Remove FieldAccessNested

- user model changes: no
- storage format changes: no
- interface changes: no

Change-Id: Ib124684961c16747a2009ede74a06571a26149f3
---
M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/FunctionCollection.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java
R asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/GetRecordFieldValueResultType.java
D asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedDescriptor.java
D asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedEvalFactory.java
5 files changed, 5 insertions(+), 317 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/58/1858/1

diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/FunctionCollection.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/FunctionCollection.java
index f833692..a21d9b0 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/FunctionCollection.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/FunctionCollection.java
@@ -260,7 +260,6 @@
 import org.apache.asterix.runtime.evaluators.functions.binary.SubBinaryFromToDescriptor;
 import org.apache.asterix.runtime.evaluators.functions.records.FieldAccessByIndexDescriptor;
 import org.apache.asterix.runtime.evaluators.functions.records.FieldAccessByNameDescriptor;
-import org.apache.asterix.runtime.evaluators.functions.records.FieldAccessNestedDescriptor;
 import org.apache.asterix.runtime.evaluators.functions.records.GetRecordFieldValueDescriptor;
 import org.apache.asterix.runtime.evaluators.functions.records.GetRecordFieldsDescriptor;
 import org.apache.asterix.runtime.evaluators.functions.records.RecordAddFieldsDescriptor;
@@ -454,7 +453,6 @@
         // Element accessors.
         functionsToInjectUnkownHandling.add(FieldAccessByIndexDescriptor.FACTORY);
         functionsToInjectUnkownHandling.add(FieldAccessByNameDescriptor.FACTORY);
-        functionsToInjectUnkownHandling.add(FieldAccessNestedDescriptor.FACTORY);
         functionsToInjectUnkownHandling.add(AnyCollectionMemberDescriptor.FACTORY);
         functionsToInjectUnkownHandling.add(GetItemDescriptor.FACTORY);
 
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 dbcef6c..c9aa5a2 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
@@ -63,7 +63,7 @@
 import org.apache.asterix.om.typecomputer.impl.ConcatNonNullTypeComputer;
 import org.apache.asterix.om.typecomputer.impl.FieldAccessByIndexResultType;
 import org.apache.asterix.om.typecomputer.impl.FieldAccessByNameResultType;
-import org.apache.asterix.om.typecomputer.impl.FieldAccessNestedResultType;
+import org.apache.asterix.om.typecomputer.impl.GetRecordFieldValueResultType;
 import org.apache.asterix.om.typecomputer.impl.FullTextContainsResultTypeComputer;
 import org.apache.asterix.om.typecomputer.impl.GetOverlappingInvervalTypeComputer;
 import org.apache.asterix.om.typecomputer.impl.IfMissingOrNullTypeComputer;
@@ -1091,10 +1091,9 @@
         addPrivateFunction(CLOSED_RECORD_CONSTRUCTOR, ClosedRecordConstructorResultType.INSTANCE, true);
         addPrivateFunction(OPEN_RECORD_CONSTRUCTOR, OpenRecordConstructorResultType.INSTANCE, true);
         addPrivateFunction(FIELD_ACCESS_BY_INDEX, FieldAccessByIndexResultType.INSTANCE, true);
-        addPrivateFunction(FIELD_ACCESS_NESTED, FieldAccessNestedResultType.INSTANCE, true);
         addPrivateFunction(FIELD_ACCESS_BY_NAME, FieldAccessByNameResultType.INSTANCE, true);
         addFunction(GET_RECORD_FIELDS, OrderedListOfAnyTypeComputer.INSTANCE, true);
-        addFunction(GET_RECORD_FIELD_VALUE, FieldAccessNestedResultType.INSTANCE, true);
+        addFunction(GET_RECORD_FIELD_VALUE, GetRecordFieldValueResultType.INSTANCE, true);
         addFunction(RECORD_PAIRS, RecordPairsTypeComputer.INSTANCE, true);
 
         // temporal type accessors
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessNestedResultType.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/GetRecordFieldValueResultType.java
similarity index 94%
rename from asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessNestedResultType.java
rename to asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/GetRecordFieldValueResultType.java
index 21593d9..45e9a85 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/FieldAccessNestedResultType.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/GetRecordFieldValueResultType.java
@@ -39,10 +39,10 @@
 import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
 import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
 
-public class FieldAccessNestedResultType extends AbstractResultTypeComputer {
-    public static final FieldAccessNestedResultType INSTANCE = new FieldAccessNestedResultType();
+public class GetRecordFieldValueResultType extends AbstractResultTypeComputer {
+    public static final GetRecordFieldValueResultType INSTANCE = new GetRecordFieldValueResultType();
 
-    private FieldAccessNestedResultType() {
+    private GetRecordFieldValueResultType() {
     }
 
     @Override
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedDescriptor.java
deleted file mode 100644
index 95b06f7..0000000
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedDescriptor.java
+++ /dev/null
@@ -1,59 +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.records;
-
-import java.util.List;
-
-import org.apache.asterix.om.functions.BuiltinFunctions;
-import org.apache.asterix.om.functions.IFunctionDescriptor;
-import org.apache.asterix.om.functions.IFunctionDescriptorFactory;
-import org.apache.asterix.om.types.ARecordType;
-import org.apache.asterix.runtime.evaluators.base.AbstractScalarFunctionDynamicDescriptor;
-import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-
-public class FieldAccessNestedDescriptor extends AbstractScalarFunctionDynamicDescriptor {
-
-    private static final long serialVersionUID = 1L;
-    public static final IFunctionDescriptorFactory FACTORY = new IFunctionDescriptorFactory() {
-        public IFunctionDescriptor createFunctionDescriptor() {
-            return new FieldAccessNestedDescriptor();
-        }
-    };
-
-    private ARecordType recType;
-    private List<String> fldName;
-
-    @Override
-    public void setImmutableStates(Object... states) {
-        this.recType = (ARecordType) states[0];
-        this.fldName = (List<String>) states[1];
-    }
-
-    @Override
-    public FunctionIdentifier getIdentifier() {
-        return BuiltinFunctions.FIELD_ACCESS_NESTED;
-    }
-
-    @Override
-    public IScalarEvaluatorFactory createEvaluatorFactory(IScalarEvaluatorFactory[] args) {
-        return new FieldAccessNestedEvalFactory(args[0], recType, fldName);
-    }
-
-}
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedEvalFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedEvalFactory.java
deleted file mode 100644
index 067a458..0000000
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedEvalFactory.java
+++ /dev/null
@@ -1,250 +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.records;
-
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.asterix.dataflow.data.nontagged.serde.ARecordSerializerDeserializer;
-import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
-import org.apache.asterix.om.base.AMissing;
-import org.apache.asterix.om.base.ANull;
-import org.apache.asterix.om.base.AString;
-import org.apache.asterix.om.functions.BuiltinFunctions;
-import org.apache.asterix.om.types.ARecordType;
-import org.apache.asterix.om.types.ATypeTag;
-import org.apache.asterix.om.types.AUnionType;
-import org.apache.asterix.om.types.BuiltinType;
-import org.apache.asterix.om.types.EnumDeserializer;
-import org.apache.asterix.om.types.IAType;
-import org.apache.asterix.om.types.runtime.RuntimeRecordTypeInfo;
-import org.apache.asterix.om.utils.NonTaggedFormatUtil;
-import org.apache.asterix.om.utils.RecordUtil;
-import org.apache.asterix.runtime.exceptions.TypeMismatchException;
-import org.apache.asterix.runtime.exceptions.UnsupportedTypeException;
-import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import org.apache.hyracks.api.context.IHyracksTaskContext;
-import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
-import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.data.std.api.IPointable;
-import org.apache.hyracks.data.std.primitive.VoidPointable;
-import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
-import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
-import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
-
-public class FieldAccessNestedEvalFactory implements IScalarEvaluatorFactory {
-
-    private static final long serialVersionUID = 1L;
-
-    private IScalarEvaluatorFactory recordEvalFactory;
-    private ARecordType recordType;
-    private List<String> fieldPath;
-
-    public FieldAccessNestedEvalFactory(IScalarEvaluatorFactory recordEvalFactory, ARecordType recordType,
-            List<String> fldName) {
-        this.recordEvalFactory = recordEvalFactory;
-        this.recordType = recordType;
-        this.fieldPath = fldName;
-
-    }
-
-    @Override
-    public IScalarEvaluator createScalarEvaluator(final IHyracksTaskContext ctx) throws HyracksDataException {
-        return new IScalarEvaluator() {
-
-            private ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage();
-            private final DataOutput out = resultStorage.getDataOutput();
-            private final ByteArrayAccessibleOutputStream subRecordTmpStream = new ByteArrayAccessibleOutputStream();
-
-            private final IPointable inputArg0 = new VoidPointable();
-            private final IScalarEvaluator eval0 = recordEvalFactory.createScalarEvaluator(ctx);
-            private final IPointable[] fieldPointables = new VoidPointable[fieldPath.size()];
-            private final RuntimeRecordTypeInfo[] recTypeInfos = new RuntimeRecordTypeInfo[fieldPath.size()];
-            @SuppressWarnings("unchecked")
-            private final ISerializerDeserializer<ANull> nullSerde =
-                    SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL);
-            @SuppressWarnings("unchecked")
-            private final ISerializerDeserializer<AMissing> missingSerde =
-                    SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AMISSING);
-
-            {
-                generateFieldsPointables();
-                for (int index = 0; index < fieldPath.size(); ++index) {
-                    recTypeInfos[index] = new RuntimeRecordTypeInfo();
-                }
-
-            }
-
-            @SuppressWarnings("unchecked")
-            private void generateFieldsPointables() throws HyracksDataException {
-                for (int i = 0; i < fieldPath.size(); i++) {
-                    ArrayBackedValueStorage storage = new ArrayBackedValueStorage();
-                    DataOutput out = storage.getDataOutput();
-                    AString as = new AString(fieldPath.get(i));
-                    SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(as.getType()).serialize(as, out);
-                    fieldPointables[i] = new VoidPointable();
-                    fieldPointables[i].set(storage);
-                }
-            }
-
-            @Override
-            public void evaluate(IFrameTupleReference tuple, IPointable result) throws HyracksDataException {
-                try {
-                    resultStorage.reset();
-                    eval0.evaluate(tuple, inputArg0);
-                    byte[] serRecord = inputArg0.getByteArray();
-                    int offset = inputArg0.getStartOffset();
-                    int start = offset;
-                    int len = inputArg0.getLength();
-
-                    if (serRecord[start] != ATypeTag.SERIALIZED_RECORD_TYPE_TAG) {
-                        throw new TypeMismatchException(BuiltinFunctions.FIELD_ACCESS_NESTED, 0, serRecord[start],
-                                ATypeTag.SERIALIZED_RECORD_TYPE_TAG);
-                    }
-
-                    int subFieldIndex = -1;
-                    int subFieldOffset = -1;
-                    int subFieldLength = -1;
-                    int nullBitmapSize = -1;
-
-                    IAType subType = recordType;
-                    recTypeInfos[0].reset(recordType);
-
-                    ATypeTag subTypeTag = ATypeTag.MISSING;
-                    boolean openField = false;
-                    int pathIndex = 0;
-
-                    // Moving through closed fields first.
-                    for (; pathIndex < fieldPointables.length; pathIndex++) {
-                        if (subType.getTypeTag().equals(ATypeTag.UNION)) {
-                            //enforced SubType
-                            subType = ((AUnionType) subType).getActualType();
-                            byte serializedTypeTag = subType.getTypeTag().serialize();
-                            if (serializedTypeTag != ATypeTag.SERIALIZED_RECORD_TYPE_TAG) {
-                                throw new UnsupportedTypeException(BuiltinFunctions.FIELD_ACCESS_NESTED.getName(),
-                                        serializedTypeTag);
-                            }
-                            if (subType.getTypeTag() == ATypeTag.OBJECT) {
-                                recTypeInfos[pathIndex].reset((ARecordType) subType);
-                            }
-                        }
-                        subFieldIndex = recTypeInfos[pathIndex].getFieldIndex(fieldPointables[pathIndex].getByteArray(),
-                                fieldPointables[pathIndex].getStartOffset() + 1,
-                                fieldPointables[pathIndex].getLength() - 1);
-                        if (subFieldIndex == -1) {
-                            break;
-                        }
-                        nullBitmapSize = RecordUtil.computeNullBitmapSize((ARecordType) subType);
-                        subFieldOffset = ARecordSerializerDeserializer.getFieldOffsetById(serRecord, start,
-                                subFieldIndex, nullBitmapSize, ((ARecordType) subType).isOpen());
-                        if (subFieldOffset == 0) {
-                            // the field is null, we checked the null bit map
-                            // any path after null will return null.
-                            nullSerde.serialize(ANull.NULL, out);
-                            result.set(resultStorage);
-                            return;
-                        }
-                        if (subFieldOffset < 0) {
-                            // the field is missing, we checked the missing bit map
-                            // any path after missing will return null.
-                            missingSerde.serialize(AMissing.MISSING, out);
-                            result.set(resultStorage);
-                            return;
-                        }
-                        subType = ((ARecordType) subType).getFieldTypes()[subFieldIndex];
-                        if (subType.getTypeTag() == ATypeTag.OBJECT && pathIndex + 1 < fieldPointables.length) {
-                            // Move to the next Depth
-                            recTypeInfos[pathIndex + 1].reset((ARecordType) subType);
-                        }
-                        if (subType.getTypeTag().equals(ATypeTag.UNION)) {
-                            subTypeTag = ((AUnionType) subType).getActualType().getTypeTag();
-                            subFieldLength = NonTaggedFormatUtil.getFieldValueLength(serRecord, subFieldOffset,
-                                    subTypeTag, false);
-                        } else {
-                            subTypeTag = subType.getTypeTag();
-                            subFieldLength = NonTaggedFormatUtil.getFieldValueLength(serRecord, subFieldOffset,
-                                    subTypeTag, false);
-                        }
-
-                        if (pathIndex < fieldPointables.length - 1) {
-                            //setup next iteration
-                            subRecordTmpStream.reset();
-                            subRecordTmpStream.write(subTypeTag.serialize());
-                            subRecordTmpStream.write(serRecord, subFieldOffset, subFieldLength);
-                            serRecord = subRecordTmpStream.getByteArray();
-                            start = 0;
-                        }
-                        // type check
-                        if (pathIndex < fieldPointables.length - 1
-                                && serRecord[start] != ATypeTag.SERIALIZED_RECORD_TYPE_TAG) {
-                            throw new UnsupportedTypeException(BuiltinFunctions.FIELD_ACCESS_NESTED, serRecord[start]);
-                        }
-                    }
-
-                    // Moving through open fields after we hit the first open field.
-                    for (; pathIndex < fieldPointables.length; pathIndex++) {
-                        openField = true;
-                        subFieldOffset = ARecordSerializerDeserializer.getFieldOffsetByName(serRecord, start, len,
-                                fieldPointables[pathIndex].getByteArray(), fieldPointables[pathIndex].getStartOffset());
-                        if (subFieldOffset < 0) {
-                            out.writeByte(ATypeTag.SERIALIZED_MISSING_TYPE_TAG);
-                            result.set(resultStorage);
-                            return;
-                        }
-
-                        subTypeTag = EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(serRecord[subFieldOffset]);
-                        subFieldLength =
-                                NonTaggedFormatUtil.getFieldValueLength(serRecord, subFieldOffset, subTypeTag, true)
-                                        + 1;
-
-                        if (pathIndex >= fieldPointables.length - 1) {
-                            continue;
-                        }
-                        //setup next iteration
-                        start = subFieldOffset;
-                        len = subFieldLength;
-
-                        // type check
-                        if (serRecord[start] == ATypeTag.SERIALIZED_MISSING_TYPE_TAG) {
-                            missingSerde.serialize(AMissing.MISSING, out);
-                            result.set(resultStorage);
-                            return;
-                        }
-                        if (serRecord[start] != ATypeTag.SERIALIZED_RECORD_TYPE_TAG) {
-                            throw new UnsupportedTypeException(BuiltinFunctions.FIELD_ACCESS_NESTED.getName(),
-                                    serRecord[start]);
-                        }
-                    }
-                    // emit the final result.
-                    if (openField) {
-                        result.set(serRecord, subFieldOffset, subFieldLength);
-                    } else {
-                        out.writeByte(subTypeTag.serialize());
-                        out.write(serRecord, subFieldOffset, subFieldLength);
-                        result.set(resultStorage);
-                    }
-                } catch (IOException e) {
-                    throw HyracksDataException.create(e);
-                }
-            }
-        };
-    }
-}

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1858
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib124684961c16747a2009ede74a06571a26149f3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>