http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/SerializerDeserializerProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/SerializerDeserializerProvider.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/SerializerDeserializerProvider.java new file mode 100644 index 0000000..95937e2 --- /dev/null +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/SerializerDeserializerProvider.java @@ -0,0 +1,202 @@ +/* + * 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.formats.nontagged; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.io.Serializable; + +import org.apache.asterix.dataflow.data.nontagged.serde.ABinarySerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ABooleanSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ACircleSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ADateSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ADateTimeSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ALineSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AMissingSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ANullSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AObjectSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AOrderedListSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.APoint3DSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.APointSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.APolygonSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ARecordSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ARectangleSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AStringSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.ATimeSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AUUIDSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AUnorderedListSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.AYearMonthDurationSerializerDeserializer; +import org.apache.asterix.dataflow.data.nontagged.serde.SerializerDeserializerUtil; +import org.apache.asterix.om.base.AMissing; +import org.apache.asterix.om.base.ANull; +import org.apache.asterix.om.base.IAObject; +import org.apache.asterix.om.types.AOrderedListType; +import org.apache.asterix.om.types.ARecordType; +import org.apache.asterix.om.types.ATypeTag; +import org.apache.asterix.om.types.AUnorderedListType; +import org.apache.asterix.om.types.IAType; +import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException; +import org.apache.hyracks.algebricks.data.ISerializerDeserializerProvider; +import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.dataflow.common.data.marshalling.ShortSerializerDeserializer; +import org.apache.hyracks.util.string.UTF8StringReader; +import org.apache.hyracks.util.string.UTF8StringWriter; + +public class SerializerDeserializerProvider implements ISerializerDeserializerProvider, Serializable { + + private static final long serialVersionUID = 1L; + public static final SerializerDeserializerProvider INSTANCE = new SerializerDeserializerProvider(); + + private SerializerDeserializerProvider() { + } + + // Can't be shared among threads <Stateful> + @SuppressWarnings("rawtypes") + public ISerializerDeserializer getAStringSerializerDeserializer() { + return addTag(new AStringSerializerDeserializer(new UTF8StringWriter(), new UTF8StringReader()), + ATypeTag.STRING); + } + + @SuppressWarnings("rawtypes") + @Override + public ISerializerDeserializer getSerializerDeserializer(Object typeInfo) { + IAType aqlType = (IAType) typeInfo; + if (aqlType == null) { + return null; + } + switch (aqlType.getTypeTag()) { + case ANY: + case UNION: + // we could do smth better for nullable fields + return AObjectSerializerDeserializer.INSTANCE; + default: + return addTag(getNonTaggedSerializerDeserializer(aqlType), aqlType.getTypeTag()); + } + } + + @SuppressWarnings("rawtypes") + public ISerializerDeserializer getNonTaggedSerializerDeserializer(IAType aqlType) { + switch (aqlType.getTypeTag()) { + case CIRCLE: + return ACircleSerializerDeserializer.INSTANCE; + case DATE: + return ADateSerializerDeserializer.INSTANCE; + case DATETIME: + return ADateTimeSerializerDeserializer.INSTANCE; + case DOUBLE: + return ADoubleSerializerDeserializer.INSTANCE; + case FLOAT: + return AFloatSerializerDeserializer.INSTANCE; + case BOOLEAN: + return ABooleanSerializerDeserializer.INSTANCE; + case INT8: + return AInt8SerializerDeserializer.INSTANCE; + case INT16: + return AInt16SerializerDeserializer.INSTANCE; + case INT32: + return AInt32SerializerDeserializer.INSTANCE; + case INT64: + return AInt64SerializerDeserializer.INSTANCE; + case LINE: + return ALineSerializerDeserializer.INSTANCE; + case MISSING: + return AMissingSerializerDeserializer.INSTANCE; + case NULL: + return ANullSerializerDeserializer.INSTANCE; + case STRING: + return AStringSerializerDeserializer.INSTANCE; + case BINARY: + return ABinarySerializerDeserializer.INSTANCE; + case TIME: + return ATimeSerializerDeserializer.INSTANCE; + case DURATION: + return ADurationSerializerDeserializer.INSTANCE; + case YEARMONTHDURATION: + return AYearMonthDurationSerializerDeserializer.INSTANCE; + case DAYTIMEDURATION: + return ADayTimeDurationSerializerDeserializer.INSTANCE; + case INTERVAL: + return AIntervalSerializerDeserializer.INSTANCE; + case ORDEREDLIST: + return new AOrderedListSerializerDeserializer((AOrderedListType) aqlType); + case POINT: + return APointSerializerDeserializer.INSTANCE; + case POINT3D: + return APoint3DSerializerDeserializer.INSTANCE; + case RECTANGLE: + return ARectangleSerializerDeserializer.INSTANCE; + case POLYGON: + return APolygonSerializerDeserializer.INSTANCE; + case RECORD: + return new ARecordSerializerDeserializer((ARecordType) aqlType); + case UNORDEREDLIST: + return new AUnorderedListSerializerDeserializer((AUnorderedListType) aqlType); + case UUID: + return AUUIDSerializerDeserializer.INSTANCE; + case SHORTWITHOUTTYPEINFO: + return ShortSerializerDeserializer.INSTANCE; + default: + throw new NotImplementedException( + "No serializer/deserializer implemented for type " + aqlType.getTypeTag() + " ."); + } + } + + @SuppressWarnings("rawtypes") + private ISerializerDeserializer addTag(final ISerializerDeserializer nonTaggedSerde, final ATypeTag typeTag) { + return new ISerializerDeserializer<IAObject>() { + + private static final long serialVersionUID = 1L; + + @Override + public IAObject deserialize(DataInput in) throws HyracksDataException { + try { + ATypeTag tag = SerializerDeserializerUtil.deserializeTag(in); + //deserialize the tag (move input cursor forward) and check if it's not NULL tag + if (tag == ATypeTag.MISSING) { + return AMissing.MISSING; + } + if (tag == ATypeTag.NULL) { + return ANull.NULL; + } + } catch (IOException e) { + throw new HyracksDataException(e); + } + return (IAObject) nonTaggedSerde.deserialize(in); + } + + @SuppressWarnings("unchecked") + @Override + public void serialize(IAObject instance, DataOutput out) throws HyracksDataException { + SerializerDeserializerUtil.serializeTag(instance, out); + nonTaggedSerde.serialize(instance, out); + } + }; + } +}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/TypeTraitProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/TypeTraitProvider.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/TypeTraitProvider.java new file mode 100644 index 0000000..81bd060 --- /dev/null +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/TypeTraitProvider.java @@ -0,0 +1,106 @@ +/* + * 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.formats.nontagged; + +import org.apache.asterix.om.types.IAType; +import org.apache.hyracks.algebricks.data.ITypeTraitProvider; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; + +public class TypeTraitProvider implements ITypeTraitProvider { + + // WARNING: the byte sizes depend on the serializer! + // currently assuming a serializer that adds a 1-byte type indicator before + // the data + private static final ITypeTraits ONEBYTETYPETRAIT = new TypeTrait(1 + 1); + private static final ITypeTraits TWOBYTETYPETRAIT = new TypeTrait(2 + 1); + private static final ITypeTraits FOURBYTETYPETRAIT = new TypeTrait(4 + 1); + private static final ITypeTraits EIGHTBYTETYPETRAIT = new TypeTrait(8 + 1); + private static final ITypeTraits SIXTEENBYTETYPETRAIT = new TypeTrait(16 + 1); + private static final ITypeTraits SEVENTEENBYTETYPETRAIT = new TypeTrait(17 + 1); + private static final ITypeTraits THIRTYTWOBYTETYPETRAIT = new TypeTrait(32 + 1); + private static final ITypeTraits TWENTYFOURBYTETYPETRAIT = new TypeTrait(24 + 1); + + private static final ITypeTraits VARLENTYPETRAIT = new TypeTrait(false, -1); + + public static final TypeTraitProvider INSTANCE = new TypeTraitProvider(); + + @Override + public ITypeTraits getTypeTrait(Object type) { + IAType aqlType = (IAType) type; + if (aqlType == null) { + return null; + } + switch (aqlType.getTypeTag()) { + case BOOLEAN: + case INT8: + return ONEBYTETYPETRAIT; + case INT16: + return TWOBYTETYPETRAIT; + case INT32: + case FLOAT: + case DATE: + case TIME: + return FOURBYTETYPETRAIT; + case INT64: + case DOUBLE: + case DATETIME: + case DURATION: + return EIGHTBYTETYPETRAIT; + case POINT: + case UUID: + return SIXTEENBYTETYPETRAIT; + case INTERVAL: + return SEVENTEENBYTETYPETRAIT; + case POINT3D: + return TWENTYFOURBYTETYPETRAIT; + case LINE: + return THIRTYTWOBYTETYPETRAIT; + default: { + return VARLENTYPETRAIT; + } + } + } +} + +class TypeTrait implements ITypeTraits { + private static final long serialVersionUID = 1L; + + @Override + public boolean isFixedLength() { + return isFixedLength; + } + + @Override + public int getFixedLength() { + return fixedLength; + } + + private boolean isFixedLength; + private int fixedLength; + + public TypeTrait(boolean isFixedLength, int fixedLength) { + this.isFixedLength = isFixedLength; + this.fixedLength = fixedLength; + } + + public TypeTrait(int fixedLength) { + this.isFixedLength = true; + this.fixedLength = fixedLength; + } +} http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/util/NonTaggedFormatUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/util/NonTaggedFormatUtil.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/util/NonTaggedFormatUtil.java index 6d26bf9..f46e7da 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/util/NonTaggedFormatUtil.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/util/NonTaggedFormatUtil.java @@ -25,9 +25,9 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeser import org.apache.asterix.dataflow.data.nontagged.serde.AOrderedListSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ARecordSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AUnorderedListSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlBinaryTokenizerFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.BinaryTokenizerFactoryProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.AUnionType; @@ -232,11 +232,11 @@ public final class NonTaggedFormatUtil { switch (indexType) { case SINGLE_PARTITION_WORD_INVIX: case LENGTH_PARTITIONED_WORD_INVIX: { - return AqlBinaryTokenizerFactoryProvider.INSTANCE.getWordTokenizerFactory(keyType, false); + return BinaryTokenizerFactoryProvider.INSTANCE.getWordTokenizerFactory(keyType, false); } case SINGLE_PARTITION_NGRAM_INVIX: case LENGTH_PARTITIONED_NGRAM_INVIX: { - return AqlBinaryTokenizerFactoryProvider.INSTANCE.getNGramTokenizerFactory(keyType, gramLength, true, + return BinaryTokenizerFactoryProvider.INSTANCE.getNGramTokenizerFactory(keyType, gramLength, true, false); } default: { @@ -262,11 +262,11 @@ public final class NonTaggedFormatUtil { public static IBinaryComparatorFactory getTokenBinaryComparatorFactory(IAType keyType) throws AlgebricksException { IAType type = getTokenType(keyType); // Ignore case for string types. - return AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(type, true, true); + return BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(type, true, true); } public static ITypeTraits getTokenTypeTrait(IAType keyType) throws AlgebricksException { IAType type = getTokenType(keyType); - return AqlTypeTraitProvider.INSTANCE.getTypeTrait(type); + return TypeTraitProvider.INSTANCE.getTypeTrait(type); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableAvgAggregateFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableAvgAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableAvgAggregateFunction.java index 6d20cca..b5371cc 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableAvgAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableAvgAggregateFunction.java @@ -30,7 +30,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ARecordSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADouble; import org.apache.asterix.om.base.AInt64; import org.apache.asterix.om.base.AMutableDouble; @@ -81,13 +81,13 @@ public abstract class AbstractSerializableAvgAggregateFunction implements ISeria private ClosedRecordConstructorEval recordEval; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADouble> doubleSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADouble> doubleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> longSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> longSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); public AbstractSerializableAvgAggregateFunction(IScalarEvaluatorFactory[] args, IHyracksTaskContext context) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableCountAggregateFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableCountAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableCountAggregateFunction.java index cca0d43..b010735 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableCountAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableCountAggregateFunction.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.aggregates.serializable.std; import java.io.DataOutput; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AInt64; import org.apache.asterix.om.base.AMutableInt64; import org.apache.asterix.om.base.ANull; @@ -47,10 +47,10 @@ public abstract class AbstractSerializableCountAggregateFunction implements ISer private AMutableInt64 result = new AMutableInt64(-1); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); private IPointable inputVal = new VoidPointable(); private IScalarEvaluator eval; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSumAggregateFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSumAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSumAggregateFunction.java index d5670a9..f04c820 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSumAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/AbstractSerializableSumAggregateFunction.java @@ -27,7 +27,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.om.base.AMutableFloat; import org.apache.asterix.om.base.AMutableInt16; @@ -161,43 +161,43 @@ public abstract class AbstractSerializableSumAggregateFunction implements ISeria try { switch (aggType) { case INT8: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT8); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT8); aInt8.setValue((byte) sum); serde.serialize(aInt8, out); break; } case INT16: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT16); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT16); aInt16.setValue((short) sum); serde.serialize(aInt16, out); break; } case INT32: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); aInt32.setValue((int) sum); serde.serialize(aInt32, out); break; } case INT64: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); aInt64.setValue((long) sum); serde.serialize(aInt64, out); break; } case FLOAT: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AFLOAT); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AFLOAT); aFloat.setValue((float) sum); serde.serialize(aFloat, out); break; } case DOUBLE: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADOUBLE); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADOUBLE); aDouble.setValue(sum); serde.serialize(aDouble, out); break; } case NULL: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); serde.serialize(ANull.NULL, out); break; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/SerializableSqlSumAggregateFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/SerializableSqlSumAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/SerializableSqlSumAggregateFunction.java index 2bd1f93..1f2641b 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/SerializableSqlSumAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/SerializableSqlSumAggregateFunction.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.aggregates.serializable.std; import java.io.DataOutput; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ANull; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.types.ATypeTag; @@ -62,7 +62,7 @@ public class SerializableSqlSumAggregateFunction extends AbstractSerializableSum if (isLocalAgg) { out.writeByte(ATypeTag.SYSTEM_NULL.serialize()); } else { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); serde.serialize(ANull.NULL, out); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/SerializableSumAggregateFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/SerializableSumAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/SerializableSumAggregateFunction.java index e076183..87ba292 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/SerializableSumAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/serializable/std/SerializableSumAggregateFunction.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.aggregates.serializable.std; import java.io.DataOutput; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ANull; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.types.ATypeTag; @@ -70,7 +70,7 @@ public class SerializableSumAggregateFunction extends AbstractSerializableSumAgg if (isLocalAgg) { out.writeByte(ATypeTag.SYSTEM_NULL.serialize()); } else { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); serde.serialize(ANull.NULL, out); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractAvgAggregateFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractAvgAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractAvgAggregateFunction.java index a59d461..2c1d0ba 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractAvgAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractAvgAggregateFunction.java @@ -30,7 +30,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ARecordSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADouble; import org.apache.asterix.om.base.AInt64; import org.apache.asterix.om.base.AMutableDouble; @@ -84,13 +84,13 @@ public abstract class AbstractAvgAggregateFunction implements IAggregateEvaluato private ClosedRecordConstructorEval recordEval; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADouble> doubleSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADouble> doubleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> longSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> longSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); public AbstractAvgAggregateFunction(IScalarEvaluatorFactory[] args, IHyracksTaskContext context) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractCountAggregateFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractCountAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractCountAggregateFunction.java index 5814c73..bd0243b 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractCountAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractCountAggregateFunction.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.aggregates.std; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AInt64; import org.apache.asterix.om.base.AMutableInt64; import org.apache.asterix.om.types.ATypeTag; @@ -43,7 +43,7 @@ import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference; public abstract class AbstractCountAggregateFunction implements IAggregateEvaluator { private AMutableInt64 result = new AMutableInt64(-1); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); private IPointable inputVal = new VoidPointable(); private IScalarEvaluator eval; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractMinMaxAggregateFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractMinMaxAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractMinMaxAggregateFunction.java index 1bc8efc..b7c70aa 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractMinMaxAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractMinMaxAggregateFunction.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.aggregates.std; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; import org.apache.asterix.runtime.exceptions.IncompatibleTypeException; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.EnumDeserializer; @@ -81,7 +81,7 @@ public abstract class AbstractMinMaxAggregateFunction implements IAggregateEvalu // First value encountered. Set type, comparator, and initial value. aggType = typeTag; // Set comparator. - IBinaryComparatorFactory cmpFactory = AqlBinaryComparatorFactoryProvider.INSTANCE + IBinaryComparatorFactory cmpFactory = BinaryComparatorFactoryProvider.INSTANCE .getBinaryComparatorFactory(aggType, isMin); cmp = cmpFactory.createBinaryComparator(); // Initialize min value. @@ -100,7 +100,7 @@ public abstract class AbstractMinMaxAggregateFunction implements IAggregateEvalu if (ATypeHierarchy.canPromote(aggType, typeTag)) { tpc = ATypeHierarchy.getTypePromoteComputer(aggType, typeTag); aggType = typeTag; - cmp = AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(aggType, isMin) + cmp = BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(aggType, isMin) .createBinaryComparator(); if (tpc != null) { tempValForCasting.reset(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSumAggregateFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSumAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSumAggregateFunction.java index 87a11a9..1936ae7 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSumAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/AbstractSumAggregateFunction.java @@ -26,7 +26,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.om.base.AMutableFloat; import org.apache.asterix.om.base.AMutableInt16; @@ -149,43 +149,43 @@ public abstract class AbstractSumAggregateFunction implements IAggregateEvaluato try { switch (aggType) { case INT8: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT8); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT8); aInt8.setValue((byte) sum); serde.serialize(aInt8, resultStorage.getDataOutput()); break; } case INT16: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT16); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT16); aInt16.setValue((short) sum); serde.serialize(aInt16, resultStorage.getDataOutput()); break; } case INT32: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); aInt32.setValue((int) sum); serde.serialize(aInt32, resultStorage.getDataOutput()); break; } case INT64: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); aInt64.setValue((long) sum); serde.serialize(aInt64, resultStorage.getDataOutput()); break; } case FLOAT: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AFLOAT); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AFLOAT); aFloat.setValue((float) sum); serde.serialize(aFloat, resultStorage.getDataOutput()); break; } case DOUBLE: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADOUBLE); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADOUBLE); aDouble.setValue(sum); serde.serialize(aDouble, resultStorage.getDataOutput()); break; } case NULL: { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); serde.serialize(ANull.NULL, resultStorage.getDataOutput()); break; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SqlSumAggregateFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SqlSumAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SqlSumAggregateFunction.java index 880c67e..e585d33 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SqlSumAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SqlSumAggregateFunction.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.aggregates.std; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ANull; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.types.ATypeTag; @@ -61,7 +61,7 @@ public class SqlSumAggregateFunction extends AbstractSumAggregateFunction { if (isLocalAgg) { resultStorage.getDataOutput().writeByte(ATypeTag.SYSTEM_NULL.serialize()); } else { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); serde.serialize(ANull.NULL, resultStorage.getDataOutput()); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SumAggregateFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SumAggregateFunction.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SumAggregateFunction.java index 5efe79f..7214a75 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SumAggregateFunction.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/std/SumAggregateFunction.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.aggregates.std; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ANull; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.types.ATypeTag; @@ -67,7 +67,7 @@ public class SumAggregateFunction extends AbstractSumAggregateFunction { if (isLocalAgg) { resultStorage.getDataOutput().writeByte(ATypeTag.SYSTEM_NULL.serialize()); } else { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); serde.serialize(ANull.NULL, resultStorage.getDataOutput()); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/stream/EmptyStreamAggregateDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/stream/EmptyStreamAggregateDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/stream/EmptyStreamAggregateDescriptor.java index 5554e51..35805e0 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/stream/EmptyStreamAggregateDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/stream/EmptyStreamAggregateDescriptor.java @@ -18,7 +18,7 @@ */ package org.apache.asterix.runtime.aggregates.stream; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ABoolean; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.functions.IFunctionDescriptor; @@ -62,7 +62,7 @@ public class EmptyStreamAggregateDescriptor extends AbstractAggregateFunctionDyn private ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); @SuppressWarnings("rawtypes") - private ISerializerDeserializer serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); boolean res = true; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/stream/NonEmptyStreamAggregateDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/stream/NonEmptyStreamAggregateDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/stream/NonEmptyStreamAggregateDescriptor.java index 5f38351..8df7433 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/stream/NonEmptyStreamAggregateDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/aggregates/stream/NonEmptyStreamAggregateDescriptor.java @@ -18,7 +18,7 @@ */ package org.apache.asterix.runtime.aggregates.stream; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ABoolean; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.functions.IFunctionDescriptor; @@ -60,7 +60,7 @@ public class NonEmptyStreamAggregateDescriptor extends AbstractAggregateFunction private ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); @SuppressWarnings("rawtypes") - private ISerializerDeserializer serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); boolean res = false; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleCenterAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleCenterAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleCenterAccessor.java index 37d99c3..1376822 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleCenterAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleCenterAccessor.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.Coordinate; import org.apache.asterix.dataflow.data.nontagged.serde.ACircleSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutablePoint; import org.apache.asterix.om.base.APoint; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -72,7 +72,7 @@ public class CircleCenterAccessor extends AbstractScalarFunctionDynamicDescripto private final IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private final AMutablePoint aPoint = new AMutablePoint(0, 0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<APoint> pointSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<APoint> pointSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.APOINT); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleRadiusAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleRadiusAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleRadiusAccessor.java index 121a426..a2e9bb9 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleRadiusAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/CircleRadiusAccessor.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.serde.ACircleSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADouble; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -70,7 +70,7 @@ public class CircleRadiusAccessor extends AbstractScalarFunctionDynamicDescripto private final IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private final AMutableDouble aDouble = new AMutableDouble(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADouble> doubleSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ADouble> doubleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/LineRectanglePolygonAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/LineRectanglePolygonAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/LineRectanglePolygonAccessor.java index eeaebb2..754d597 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/LineRectanglePolygonAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/LineRectanglePolygonAccessor.java @@ -28,7 +28,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.ALineSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.APolygonSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ARectangleSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutablePoint; import org.apache.asterix.om.base.APoint; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -80,7 +80,7 @@ public class LineRectanglePolygonAccessor extends AbstractScalarFunctionDynamicD private final AOrderedListType pointListType = new AOrderedListType(BuiltinType.APOINT, null); private final AMutablePoint aPoint = new AMutablePoint(0, 0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<APoint> pointSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<APoint> pointSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.APOINT); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointXCoordinateAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointXCoordinateAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointXCoordinateAccessor.java index c69e21c..f16db64 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointXCoordinateAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointXCoordinateAccessor.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.Coordinate; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.APointSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADouble; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -70,7 +70,7 @@ public class PointXCoordinateAccessor extends AbstractScalarFunctionDynamicDescr private final IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private final AMutableDouble aDouble = new AMutableDouble(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADouble> doubleSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ADouble> doubleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointYCoordinateAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointYCoordinateAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointYCoordinateAccessor.java index dc57ff7..4058c4b 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointYCoordinateAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/PointYCoordinateAccessor.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.Coordinate; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.APointSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADouble; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -74,7 +74,7 @@ public class PointYCoordinateAccessor extends AbstractScalarFunctionDynamicDescr private final IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private final AMutableDouble aDouble = new AMutableDouble(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADouble> doubleSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ADouble> doubleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalDayAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalDayAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalDayAccessor.java index 6ab2aa3..646eab4 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalDayAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalDayAccessor.java @@ -25,7 +25,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializ import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AInt64; import org.apache.asterix.om.base.AMutableInt64; import org.apache.asterix.om.base.temporal.GregorianCalendarSystem; @@ -79,7 +79,7 @@ public class TemporalDayAccessor extends AbstractScalarFunctionDynamicDescriptor // for output: type integer @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInt64> intSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AInt64> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); private final AMutableInt64 aMutableInt64 = new AMutableInt64(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalHourAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalHourAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalHourAccessor.java index e915ad6..87aed02 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalHourAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalHourAccessor.java @@ -25,7 +25,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializ import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AInt64; import org.apache.asterix.om.base.AMutableInt64; import org.apache.asterix.om.base.temporal.GregorianCalendarSystem; @@ -81,7 +81,7 @@ public class TemporalHourAccessor extends AbstractScalarFunctionDynamicDescripto // for output: type integer @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInt64> intSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AInt64> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); private final AMutableInt64 aMutableInt64 = new AMutableInt64(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndAccessor.java index a8771ad..7b96f6d 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndAccessor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADate; import org.apache.asterix.om.base.ADateTime; import org.apache.asterix.om.base.AMutableDate; @@ -75,15 +75,15 @@ public class TemporalIntervalEndAccessor extends AbstractScalarFunctionDynamicDe // possible output @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADate> dateSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); private final AMutableDate aDate = new AMutableDate(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADateTime> datetimeSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADATETIME); + private final ISerializerDeserializer<ADateTime> datetimeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADATETIME); private final AMutableDateTime aDateTime = new AMutableDateTime(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); private final AMutableTime aTime = new AMutableTime(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDateAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDateAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDateAccessor.java index 09f7526..8409024 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDateAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDateAccessor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADate; import org.apache.asterix.om.base.AMutableDate; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -71,7 +71,7 @@ public class TemporalIntervalEndDateAccessor extends AbstractScalarFunctionDynam // possible output @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADate> dateSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); private final AMutableDate aDate = new AMutableDate(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDatetimeAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDatetimeAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDatetimeAccessor.java index f1b2511..5639101 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDatetimeAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndDatetimeAccessor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADateTime; import org.apache.asterix.om.base.AMutableDateTime; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -73,8 +73,8 @@ public class TemporalIntervalEndDatetimeAccessor extends AbstractScalarFunctionD // possible output @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADateTime> datetimeSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADATETIME); + private final ISerializerDeserializer<ADateTime> datetimeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADATETIME); private final AMutableDateTime aDateTime = new AMutableDateTime(0); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndTimeAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndTimeAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndTimeAccessor.java index d0af90b..852ebb5 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndTimeAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalEndTimeAccessor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableTime; import org.apache.asterix.om.base.ATime; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -70,7 +70,7 @@ public class TemporalIntervalEndTimeAccessor extends AbstractScalarFunctionDynam // possible output @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); private final AMutableTime aTime = new AMutableTime(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartAccessor.java index b6e1eac..a6d47a3 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartAccessor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADate; import org.apache.asterix.om.base.ADateTime; import org.apache.asterix.om.base.AMutableDate; @@ -75,15 +75,15 @@ public class TemporalIntervalStartAccessor extends AbstractScalarFunctionDynamic // possible output @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADate> dateSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); private final AMutableDate aDate = new AMutableDate(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADateTime> datetimeSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADATETIME); + private final ISerializerDeserializer<ADateTime> datetimeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADATETIME); private final AMutableDateTime aDateTime = new AMutableDateTime(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); private final AMutableTime aTime = new AMutableTime(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDateAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDateAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDateAccessor.java index 3e5a82f..d6fb58c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDateAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDateAccessor.java @@ -24,7 +24,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADate; import org.apache.asterix.om.base.AMutableDate; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -73,7 +73,7 @@ public class TemporalIntervalStartDateAccessor extends AbstractScalarFunctionDyn // possible output @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADate> dateSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); private final AMutableDate aDate = new AMutableDate(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDatetimeAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDatetimeAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDatetimeAccessor.java index 7beff69..d63b56c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDatetimeAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartDatetimeAccessor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADateTime; import org.apache.asterix.om.base.AMutableDateTime; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -70,8 +70,8 @@ public class TemporalIntervalStartDatetimeAccessor extends AbstractScalarFunctio // possible output @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADateTime> datetimeSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADATETIME); + private final ISerializerDeserializer<ADateTime> datetimeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADATETIME); private final AMutableDateTime aDateTime = new AMutableDateTime(0); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartTimeAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartTimeAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartTimeAccessor.java index 0c35e1f..7c1ec7e 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartTimeAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalIntervalStartTimeAccessor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableTime; import org.apache.asterix.om.base.ATime; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -71,7 +71,7 @@ public class TemporalIntervalStartTimeAccessor extends AbstractScalarFunctionDyn // possible output @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); private final AMutableTime aTime = new AMutableTime(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMillisecondAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMillisecondAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMillisecondAccessor.java index f86fe94..f8b469f 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMillisecondAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMillisecondAccessor.java @@ -25,7 +25,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializ import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AInt64; import org.apache.asterix.om.base.AMutableInt64; import org.apache.asterix.om.base.temporal.GregorianCalendarSystem; @@ -79,7 +79,7 @@ public class TemporalMillisecondAccessor extends AbstractScalarFunctionDynamicDe // for output: type integer @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInt64> intSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AInt64> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); private final AMutableInt64 aMutableInt64 = new AMutableInt64(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMinuteAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMinuteAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMinuteAccessor.java index 00fde98..f368187 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMinuteAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMinuteAccessor.java @@ -25,7 +25,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializ import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AInt64; import org.apache.asterix.om.base.AMutableInt64; import org.apache.asterix.om.base.temporal.GregorianCalendarSystem; @@ -82,7 +82,7 @@ public class TemporalMinuteAccessor extends AbstractScalarFunctionDynamicDescrip // for output: type integer @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInt64> intSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AInt64> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); private final AMutableInt64 aMutableInt64 = new AMutableInt64(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMonthAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMonthAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMonthAccessor.java index bbb3cd6..19feaae 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMonthAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalMonthAccessor.java @@ -25,7 +25,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeser import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AYearMonthDurationSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AInt64; import org.apache.asterix.om.base.AMutableInt64; import org.apache.asterix.om.base.temporal.GregorianCalendarSystem; @@ -79,7 +79,7 @@ public class TemporalMonthAccessor extends AbstractScalarFunctionDynamicDescript // for output: type integer @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInt64> intSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AInt64> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); private final AMutableInt64 aMutableInt64 = new AMutableInt64(0);
