http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalSecondAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalSecondAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalSecondAccessor.java index 815db31..0ff039d 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalSecondAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalSecondAccessor.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 TemporalSecondAccessor 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/TemporalYearAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalYearAccessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalYearAccessor.java index 187770c..e046260 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalYearAccessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/accessors/TemporalYearAccessor.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; @@ -80,7 +80,7 @@ public class TemporalYearAccessor 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/common/AbstractAsterixListIterator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/AbstractAsterixListIterator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/AbstractAsterixListIterator.java index b293fc9..b929854 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/AbstractAsterixListIterator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/AbstractAsterixListIterator.java @@ -19,7 +19,7 @@ package org.apache.asterix.runtime.evaluators.common; import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; import org.apache.asterix.fuzzyjoin.similarity.IListIterator; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.EnumDeserializer; @@ -108,40 +108,40 @@ public abstract class AbstractAsterixListIterator implements IListIterator { ATypeTag tag = EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(data[startOff + 1]); switch (tag) { case INT64: { - cmp = AqlBinaryComparatorFactoryProvider.LONG_POINTABLE_INSTANCE.createBinaryComparator(); + cmp = BinaryComparatorFactoryProvider.LONG_POINTABLE_INSTANCE.createBinaryComparator(); break; } case INT32: { - cmp = AqlBinaryComparatorFactoryProvider.INTEGER_POINTABLE_INSTANCE.createBinaryComparator(); + cmp = BinaryComparatorFactoryProvider.INTEGER_POINTABLE_INSTANCE.createBinaryComparator(); break; } case INT16: { - cmp = AqlBinaryComparatorFactoryProvider.SHORT_POINTABLE_INSTANCE.createBinaryComparator(); + cmp = BinaryComparatorFactoryProvider.SHORT_POINTABLE_INSTANCE.createBinaryComparator(); break; } case INT8: { - cmp = AqlBinaryComparatorFactoryProvider.BYTE_POINTABLE_INSTANCE.createBinaryComparator(); + cmp = BinaryComparatorFactoryProvider.BYTE_POINTABLE_INSTANCE.createBinaryComparator(); break; } case FLOAT: { - cmp = AqlBinaryComparatorFactoryProvider.FLOAT_POINTABLE_INSTANCE.createBinaryComparator(); + cmp = BinaryComparatorFactoryProvider.FLOAT_POINTABLE_INSTANCE.createBinaryComparator(); break; } case DOUBLE: { - cmp = AqlBinaryComparatorFactoryProvider.DOUBLE_POINTABLE_INSTANCE.createBinaryComparator(); + cmp = BinaryComparatorFactoryProvider.DOUBLE_POINTABLE_INSTANCE.createBinaryComparator(); break; } case STRING: { if (ignoreCase) { - cmp = AqlBinaryComparatorFactoryProvider.UTF8STRING_LOWERCASE_POINTABLE_INSTANCE + cmp = BinaryComparatorFactoryProvider.UTF8STRING_LOWERCASE_POINTABLE_INSTANCE .createBinaryComparator(); } else { - cmp = AqlBinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE.createBinaryComparator(); + cmp = BinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE.createBinaryComparator(); } break; } case BINARY: { - cmp = AqlBinaryComparatorFactoryProvider.BINARY_POINTABLE_INSTANCE.createBinaryComparator(); + cmp = BinaryComparatorFactoryProvider.BINARY_POINTABLE_INSTANCE.createBinaryComparator(); break; } default: { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceCheckEvaluator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceCheckEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceCheckEvaluator.java index b9129a6..fdd0739 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceCheckEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceCheckEvaluator.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.common; import java.io.IOException; import org.apache.asterix.builders.OrderedListBuilder; -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.types.AOrderedListType; @@ -48,7 +48,7 @@ public class EditDistanceCheckEvaluator extends EditDistanceEvaluator { protected final OrderedListBuilder listBuilder; protected ArrayBackedValueStorage listItemVal; @SuppressWarnings("unchecked") - protected final ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + protected final ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); public EditDistanceCheckEvaluator(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/evaluators/common/EditDistanceEvaluator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceEvaluator.java index efab277..150f350 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/EditDistanceEvaluator.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.common; 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.fuzzyjoin.similarity.SimilarityMetricEditDistance; import org.apache.asterix.om.base.AInt64; import org.apache.asterix.om.base.AMutableInt64; @@ -59,7 +59,7 @@ public class EditDistanceEvaluator implements IScalarEvaluator { protected int editDistance = 0; protected final AMutableInt64 aInt64 = new AMutableInt64(-1); @SuppressWarnings("unchecked") - protected final ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + protected final ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); protected ATypeTag itemTypeTag; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardCheckEvaluator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardCheckEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardCheckEvaluator.java index bcbaf0c..7c1ef63 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardCheckEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardCheckEvaluator.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.asterix.builders.OrderedListBuilder; import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer; -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.types.AOrderedListType; import org.apache.asterix.om.types.BuiltinType; @@ -48,7 +48,7 @@ public class SimilarityJaccardCheckEvaluator extends SimilarityJaccardEvaluator protected OrderedListBuilder listBuilder; protected ArrayBackedValueStorage inputVal; @SuppressWarnings("unchecked") - protected final ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + protected final ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); protected final AOrderedListType listType = new AOrderedListType(BuiltinType.ANY, "list"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardEvaluator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardEvaluator.java index 01acf25..f08073c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardEvaluator.java @@ -24,7 +24,7 @@ import java.util.Arrays; import org.apache.asterix.dataflow.data.nontagged.comparators.ListItemBinaryComparatorFactory; import org.apache.asterix.dataflow.data.nontagged.hash.ListItemBinaryHashFunctionFactory; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AFloat; import org.apache.asterix.om.base.AMutableFloat; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -73,7 +73,7 @@ public class SimilarityJaccardEvaluator implements IScalarEvaluator { protected final AMutableFloat aFloat = new AMutableFloat(0); @SuppressWarnings("unchecked") - protected final ISerializerDeserializer<AFloat> floatSerde = AqlSerializerDeserializerProvider.INSTANCE + protected final ISerializerDeserializer<AFloat> floatSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AFLOAT); protected ATypeTag firstTypeTag; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardPrefixEvaluator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardPrefixEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardPrefixEvaluator.java index d1060c6..2c02623 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardPrefixEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/SimilarityJaccardPrefixEvaluator.java @@ -25,7 +25,7 @@ import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AOrderedListSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AUnorderedListSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.fuzzyjoin.IntArray; import org.apache.asterix.fuzzyjoin.similarity.PartialIntersect; import org.apache.asterix.fuzzyjoin.similarity.SimilarityFiltersJaccard; @@ -72,7 +72,7 @@ public class SimilarityJaccardPrefixEvaluator implements IScalarEvaluator { // result protected final AMutableFloat res = new AMutableFloat(0); @SuppressWarnings("unchecked") - protected final ISerializerDeserializer<AFloat> reusSerde = AqlSerializerDeserializerProvider.INSTANCE + protected final ISerializerDeserializer<AFloat> reusSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AFLOAT); public SimilarityJaccardPrefixEvaluator(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/evaluators/comparisons/AbstractComparisonEvaluator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java index 60fc3e0..a1e60a6 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.comparisons; import java.io.DataOutput; -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.base.ANull; import org.apache.asterix.om.types.ATypeTag; @@ -52,10 +52,10 @@ public abstract class AbstractComparisonEvaluator implements IScalarEvaluator { private ComparisonHelper ch = new ComparisonHelper(); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ABoolean> serde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<ABoolean> serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); public AbstractComparisonEvaluator(IScalarEvaluatorFactory evalLeftFactory, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/ComparisonHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/ComparisonHelper.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/ComparisonHelper.java index 4597621..c9be11f 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/ComparisonHelper.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/ComparisonHelper.java @@ -35,7 +35,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.AqlBinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.runtime.exceptions.IncompatibleTypeException; import org.apache.asterix.runtime.exceptions.UnsupportedTypeException; @@ -51,7 +51,7 @@ public class ComparisonHelper implements Serializable { private static final long serialVersionUID = 1L; static final String COMPARISON = "comparison operations (>, >=, <, and <=)"; - private final IBinaryComparator strBinaryComp = AqlBinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE + private final IBinaryComparator strBinaryComp = BinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE .createBinaryComparator(); private final IBinaryComparator circleBinaryComp = ACirclePartialBinaryComparatorFactory.INSTANCE .createBinaryComparator(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ABooleanConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ABooleanConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ABooleanConstructorDescriptor.java index 9eb0563..0d26526 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ABooleanConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ABooleanConstructorDescriptor.java @@ -21,8 +21,8 @@ package org.apache.asterix.runtime.evaluators.constructors; import java.io.DataOutput; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +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; @@ -68,10 +68,10 @@ public class ABooleanConstructorDescriptor extends AbstractScalarFunctionDynamic private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private final byte[] TRUE = UTF8StringUtil.writeStringToBytes("true"); private final byte[] FALSE = UTF8StringUtil.writeStringToBytes("false"); - IBinaryComparator utf8BinaryComparator = AqlBinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE - .createBinaryComparator(); + IBinaryComparator utf8BinaryComparator = + BinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE.createBinaryComparator(); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ACircleConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ACircleConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ACircleConstructorDescriptor.java index 07aed4a..1273151 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ACircleConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ACircleConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.ACircle; import org.apache.asterix.om.base.AMutableCircle; import org.apache.asterix.om.base.AMutablePoint; @@ -70,7 +70,7 @@ public class ACircleConstructorDescriptor extends AbstractScalarFunctionDynamicD private final AMutablePoint aPoint = new AMutablePoint(0, 0); private AMutableCircle aCircle = new AMutableCircle(null, 0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ACircle> circleSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ACircle> circleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ACIRCLE); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADateConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADateConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADateConstructorDescriptor.java index e22f076..51cd3c7 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADateConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADateConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.ADate; import org.apache.asterix.om.base.AMutableDate; import org.apache.asterix.om.base.temporal.ADateParserFactory; @@ -70,7 +70,7 @@ public class ADateConstructorDescriptor extends AbstractScalarFunctionDynamicDes private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private AMutableDate aDate = new AMutableDate(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADate> dateSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADateTimeConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADateTimeConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADateTimeConstructorDescriptor.java index cb16578..b1067ba 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADateTimeConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADateTimeConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.ADateTime; import org.apache.asterix.om.base.AMutableDateTime; import org.apache.asterix.om.base.temporal.ADateParserFactory; @@ -69,7 +69,7 @@ public class ADateTimeConstructorDescriptor extends AbstractScalarFunctionDynami private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private AMutableDateTime aDateTime = new AMutableDateTime(0L); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADateTime> datetimeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADateTime> datetimeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADayTimeDurationConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADayTimeDurationConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADayTimeDurationConstructorDescriptor.java index f8e34de..b417de3 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADayTimeDurationConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADayTimeDurationConstructorDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.constructors; import java.io.DataOutput; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ADayTimeDuration; import org.apache.asterix.om.base.AMutableDayTimeDuration; import org.apache.asterix.om.base.temporal.ADurationParserFactory; @@ -71,8 +71,9 @@ public class ADayTimeDurationConstructorDescriptor extends AbstractScalarFunctio private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private AMutableDayTimeDuration aDayTimeDuration = new AMutableDayTimeDuration(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADayTimeDuration> dayTimeDurationSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADAYTIMEDURATION); + private ISerializerDeserializer<ADayTimeDuration> dayTimeDurationSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer( + BuiltinType.ADAYTIMEDURATION); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADoubleConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADoubleConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADoubleConstructorDescriptor.java index 41fade5..312a136 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADoubleConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADoubleConstructorDescriptor.java @@ -21,8 +21,8 @@ package org.apache.asterix.runtime.evaluators.constructors; import java.io.DataOutput; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +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.om.functions.AsterixBuiltinFunctions; @@ -71,11 +71,11 @@ public class ADoubleConstructorDescriptor extends AbstractScalarFunctionDynamicD private final byte[] POSITIVE_INF = UTF8StringUtil.writeStringToBytes("INF"); private final byte[] NEGATIVE_INF = UTF8StringUtil.writeStringToBytes("-INF"); private final byte[] NAN = UTF8StringUtil.writeStringToBytes("NaN"); - IBinaryComparator utf8BinaryComparator = AqlBinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE - .createBinaryComparator(); + IBinaryComparator utf8BinaryComparator = + BinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE.createBinaryComparator(); private AMutableDouble aDouble = new AMutableDouble(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADouble> doubleSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADouble> doubleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADurationConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADurationConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADurationConstructorDescriptor.java index 0ca4177..8bc8450 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADurationConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ADurationConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.ADuration; import org.apache.asterix.om.base.AMutableDuration; import org.apache.asterix.om.base.temporal.ADurationParserFactory; @@ -69,7 +69,7 @@ public class ADurationConstructorDescriptor extends AbstractScalarFunctionDynami private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private AMutableDuration aDuration = new AMutableDuration(0, 0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADuration> durationSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADuration> durationSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADURATION); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AFloatConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AFloatConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AFloatConstructorDescriptor.java index c514002..752ccb1 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AFloatConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AFloatConstructorDescriptor.java @@ -21,8 +21,8 @@ package org.apache.asterix.runtime.evaluators.constructors; import java.io.DataOutput; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AFloat; import org.apache.asterix.om.base.AMutableFloat; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -71,11 +71,11 @@ public class AFloatConstructorDescriptor extends AbstractScalarFunctionDynamicDe private final byte[] POSITIVE_INF = UTF8StringUtil.writeStringToBytes("INF"); private final byte[] NEGATIVE_INF = UTF8StringUtil.writeStringToBytes("-INF"); private final byte[] NAN = UTF8StringUtil.writeStringToBytes("NaN"); - private IBinaryComparator utf8BinaryComparator = AqlBinaryComparatorFactoryProvider. + private IBinaryComparator utf8BinaryComparator = BinaryComparatorFactoryProvider. UTF8STRING_POINTABLE_INSTANCE.createBinaryComparator(); private AMutableFloat aFloat = new AMutableFloat(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AFloat> floatSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AFloat> floatSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AFLOAT); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt16ConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt16ConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt16ConstructorDescriptor.java index c64dc5b..b5e18eb 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt16ConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt16ConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.AInt16; import org.apache.asterix.om.base.AMutableInt16; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -71,7 +71,7 @@ public class AInt16ConstructorDescriptor extends AbstractScalarFunctionDynamicDe private boolean positive; private AMutableInt16 aInt16 = new AMutableInt16((short) 0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt16> int16Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt16> int16Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT16); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt32ConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt32ConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt32ConstructorDescriptor.java index 533e49e..a205c6a 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt32ConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt32ConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.AInt32; import org.apache.asterix.om.base.AMutableInt32; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -70,7 +70,7 @@ public class AInt32ConstructorDescriptor extends AbstractScalarFunctionDynamicDe private boolean positive; private AMutableInt32 aInt32 = new AMutableInt32(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt32> int32Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt32> int32Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt64ConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt64ConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt64ConstructorDescriptor.java index b380665..0bb8087 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt64ConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt64ConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.functions.AsterixBuiltinFunctions; @@ -70,7 +70,7 @@ public class AInt64ConstructorDescriptor extends AbstractScalarFunctionDynamicDe private boolean positive; private AMutableInt64 aInt64 = new AMutableInt64(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt8ConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt8ConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt8ConstructorDescriptor.java index 5b9f918..e93a7ce 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt8ConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AInt8ConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.AInt8; import org.apache.asterix.om.base.AMutableInt8; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -70,7 +70,7 @@ public class AInt8ConstructorDescriptor extends AbstractScalarFunctionDynamicDes private boolean positive; private AMutableInt8 aInt8 = new AMutableInt8((byte) 0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt8> int8Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt8> int8Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT8); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalConstructorDescriptor.java index 763f409..8806bac 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalConstructorDescriptor.java @@ -24,7 +24,7 @@ import java.io.IOException; 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.ATimeSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AInterval; import org.apache.asterix.om.base.AMutableInterval; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -74,7 +74,7 @@ public class AIntervalConstructorDescriptor extends AbstractScalarFunctionDynami private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); private AMutableInterval aInterval = new AMutableInterval(0L, 0L, (byte) 0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInterval> intervalSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInterval> intervalSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINTERVAL); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromDateConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromDateConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromDateConstructorDescriptor.java index 67966f6..63bef8d 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromDateConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromDateConstructorDescriptor.java @@ -25,7 +25,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.ADateSerializerDeseriali import org.apache.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; 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.AInterval; import org.apache.asterix.om.base.AMutableDuration; import org.apache.asterix.om.base.AMutableInterval; @@ -84,7 +84,7 @@ public class AIntervalStartFromDateConstructorDescriptor extends AbstractScalarF private AMutableInterval aInterval = new AMutableInterval(0L, 0L, (byte) 0); private AMutableDuration aDuration = new AMutableDuration(0, 0L); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInterval> intervalSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInterval> intervalSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINTERVAL); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromDateTimeConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromDateTimeConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromDateTimeConstructorDescriptor.java index 030023e..9cd7e6a 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromDateTimeConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromDateTimeConstructorDescriptor.java @@ -25,7 +25,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.ADateTimeSerializerDeser import org.apache.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; 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.AInterval; import org.apache.asterix.om.base.AMutableDuration; import org.apache.asterix.om.base.AMutableInterval; @@ -82,7 +82,7 @@ public class AIntervalStartFromDateTimeConstructorDescriptor extends AbstractSca private AMutableInterval aInterval = new AMutableInterval(0L, 0L, (byte) 0); private AMutableDuration aDuration = new AMutableDuration(0, 0L); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInterval> intervalSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInterval> intervalSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINTERVAL); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromTimeConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromTimeConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromTimeConstructorDescriptor.java index 7fa0514..36cfbeb 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromTimeConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AIntervalStartFromTimeConstructorDescriptor.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ATimeSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AInterval; import org.apache.asterix.om.base.AMutableDuration; import org.apache.asterix.om.base.AMutableInterval; @@ -82,7 +82,7 @@ public class AIntervalStartFromTimeConstructorDescriptor extends AbstractScalarF private AMutableInterval aInterval = new AMutableInterval(0L, 0L, (byte) 0); private AMutableDuration aDuration = new AMutableDuration(0, 0L); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInterval> intervalSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInterval> intervalSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINTERVAL); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ALineConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ALineConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ALineConstructorDescriptor.java index c3123da..2c6c609 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ALineConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ALineConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.ALine; import org.apache.asterix.om.base.AMutableLine; import org.apache.asterix.om.base.AMutablePoint; @@ -71,7 +71,7 @@ public class ALineConstructorDescriptor extends AbstractScalarFunctionDynamicDes private AMutableLine aLine = new AMutableLine(null, null); private AMutablePoint[] aPoint = { new AMutablePoint(0, 0), new AMutablePoint(0, 0) }; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ALine> lineSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ALine> lineSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ALINE); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ANullConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ANullConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ANullConstructorDescriptor.java index e45efa9..6ed6e5c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ANullConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ANullConstructorDescriptor.java @@ -21,8 +21,8 @@ package org.apache.asterix.runtime.evaluators.constructors; import java.io.DataOutput; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMissing; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.functions.IFunctionDescriptor; @@ -68,10 +68,10 @@ public class ANullConstructorDescriptor extends AbstractScalarFunctionDynamicDes private IPointable inputArg = new VoidPointable(); private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private final byte[] NULL = UTF8StringUtil.writeStringToBytes("null"); - IBinaryComparator utf8BinaryComparator = AqlBinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE - .createBinaryComparator(); + IBinaryComparator utf8BinaryComparator = + BinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE.createBinaryComparator(); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AMissing> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AMissing> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AMISSING); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/APoint3DConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/APoint3DConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/APoint3DConstructorDescriptor.java index a2a77cc..b9f4320 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/APoint3DConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/APoint3DConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.AMutablePoint3D; import org.apache.asterix.om.base.APoint3D; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -69,7 +69,7 @@ public class APoint3DConstructorDescriptor extends AbstractScalarFunctionDynamic private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private AMutablePoint3D aPoint3D = new AMutablePoint3D(0, 0, 0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<APoint3D> point3DSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<APoint3D> point3DSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.APOINT3D); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/APointConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/APointConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/APointConstructorDescriptor.java index c6f1f7b..236a515 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/APointConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/APointConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.AMutablePoint; import org.apache.asterix.om.base.APoint; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -68,7 +68,7 @@ public class APointConstructorDescriptor extends AbstractScalarFunctionDynamicDe private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private AMutablePoint aPoint = new AMutablePoint(0, 0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<APoint> pointSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<APoint> pointSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.APOINT); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ARectangleConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ARectangleConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ARectangleConstructorDescriptor.java index 41419dc..2a7d620 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ARectangleConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ARectangleConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.AMutablePoint; import org.apache.asterix.om.base.AMutableRectangle; import org.apache.asterix.om.base.ARectangle; @@ -70,8 +70,8 @@ public class ARectangleConstructorDescriptor extends AbstractScalarFunctionDynam private AMutableRectangle aRectangle = new AMutableRectangle(null, null); private AMutablePoint[] aPoint = { new AMutablePoint(0, 0), new AMutablePoint(0, 0) }; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ARectangle> rectangle2DSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ARECTANGLE); + private ISerializerDeserializer<ARectangle> rectangle2DSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ARECTANGLE); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ATimeConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ATimeConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ATimeConstructorDescriptor.java index 2aeb6ee..1469efd 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ATimeConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/ATimeConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.AMutableTime; import org.apache.asterix.om.base.ATime; import org.apache.asterix.om.base.temporal.ATimeParserFactory; @@ -70,7 +70,7 @@ public class ATimeConstructorDescriptor extends AbstractScalarFunctionDynamicDes private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private AMutableTime aTime = new AMutableTime(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AUUIDFromStringConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AUUIDFromStringConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AUUIDFromStringConstructorDescriptor.java index bddd9bc..7eb28fe 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AUUIDFromStringConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AUUIDFromStringConstructorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.constructors; 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.AMutableUUID; import org.apache.asterix.om.base.AUUID; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -73,7 +73,7 @@ public class AUUIDFromStringConstructorDescriptor extends AbstractScalarFunction private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private AMutableUUID uuid = new AMutableUUID(); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AUUID> uuidSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AUUID> uuidSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AUUID); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AYearMonthDurationConstructorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AYearMonthDurationConstructorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AYearMonthDurationConstructorDescriptor.java index 889af14..7245b47 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AYearMonthDurationConstructorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/constructors/AYearMonthDurationConstructorDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.constructors; import java.io.DataOutput; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableYearMonthDuration; import org.apache.asterix.om.base.AYearMonthDuration; import org.apache.asterix.om.base.temporal.ADurationParserFactory; @@ -70,8 +70,9 @@ public class AYearMonthDurationConstructorDescriptor extends AbstractScalarFunct private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); private AMutableYearMonthDuration aYearMonthDuration = new AMutableYearMonthDuration(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AYearMonthDuration> yearMonthDurationSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AYEARMONTHDURATION); + private ISerializerDeserializer<AYearMonthDuration> yearMonthDurationSerde = + SerializerDeserializerProvider.INSTANCE + .getSerializerDeserializer(BuiltinType.AYEARMONTHDURATION); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringBoolEval.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringBoolEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringBoolEval.java index 128802d..dce2462 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringBoolEval.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringBoolEval.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions; import java.io.IOException; -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.types.BuiltinType; import org.apache.hyracks.api.exceptions.HyracksDataException; @@ -35,7 +35,7 @@ public abstract class AbstractBinaryStringBoolEval extends AbstractBinaryStringE // For outputting results. @SuppressWarnings({ "rawtypes" }) - private ISerializerDeserializer boolSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer boolSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); public AbstractBinaryStringBoolEval(IHyracksTaskContext context, IScalarEvaluatorFactory evalLeftFactory, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringIntEval.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringIntEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringIntEval.java index 4aecdb8..5aaee4c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringIntEval.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringIntEval.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableInt32; import org.apache.asterix.om.types.BuiltinType; import org.apache.hyracks.api.exceptions.HyracksDataException; @@ -36,7 +36,7 @@ public abstract class AbstractBinaryStringIntEval extends AbstractBinaryStringEv // For outputting results. @SuppressWarnings({ "rawtypes" }) - private ISerializerDeserializer intSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); private AMutableInt32 resultValue = new AMutableInt32(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractNumericArithmeticEval.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractNumericArithmeticEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractNumericArithmeticEval.java index 0dbda8e..3ba696b 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractNumericArithmeticEval.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractNumericArithmeticEval.java @@ -32,7 +32,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ATimeSerializerDeserializer; 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.AMutableDate; import org.apache.asterix.om.base.AMutableDateTime; import org.apache.asterix.om.base.AMutableDouble; @@ -210,7 +210,7 @@ public abstract class AbstractNumericArithmeticEval extends AbstractScalarFuncti double dres; switch (resultType) { case typeInt8: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT8); lres = evaluateInteger(operandsInteger[0], operandsInteger[1]); if (lres > Byte.MAX_VALUE) { @@ -223,7 +223,7 @@ public abstract class AbstractNumericArithmeticEval extends AbstractScalarFuncti serde.serialize(aInt8, out); break; case typeInt16: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT16); lres = evaluateInteger(operandsInteger[0], operandsInteger[1]); if (lres > Short.MAX_VALUE) { @@ -236,7 +236,7 @@ public abstract class AbstractNumericArithmeticEval extends AbstractScalarFuncti serde.serialize(aInt16, out); break; case typeInt32: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); lres = evaluateInteger(operandsInteger[0], operandsInteger[1]); if (lres > Integer.MAX_VALUE) { @@ -249,14 +249,14 @@ public abstract class AbstractNumericArithmeticEval extends AbstractScalarFuncti serde.serialize(aInt32, out); break; case typeInt64: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); lres = evaluateInteger(operandsInteger[0], operandsInteger[1]); aInt64.setValue(lres); serde.serialize(aInt64, out); break; case typeFloat: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AFLOAT); dres = evaluateDouble(operandsFloating[0], operandsFloating[1]); if (dres > Float.MAX_VALUE) { @@ -269,7 +269,7 @@ public abstract class AbstractNumericArithmeticEval extends AbstractScalarFuncti serde.serialize(aFloat, out); break; case typeDouble: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); aDouble.setValue(evaluateDouble(operandsFloating[0], operandsFloating[1])); serde.serialize(aDouble, out); @@ -289,7 +289,7 @@ public abstract class AbstractNumericArithmeticEval extends AbstractScalarFuncti if (rightType == leftType) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADURATION); long leftChronon = 0, rightChronon = 0, dayTime = 0; @@ -342,7 +342,7 @@ public abstract class AbstractNumericArithmeticEval extends AbstractScalarFuncti switch (leftType) { case TIME: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); chronon = ATimeSerializerDeserializer.getChronon(bytes0, offset0 + 1); isTimeOnly = true; @@ -363,14 +363,14 @@ public abstract class AbstractNumericArithmeticEval extends AbstractScalarFuncti } break; case DATE: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); resultType = ATypeTag.DATE; chronon = ADateSerializerDeserializer.getChronon(bytes0, offset0 + 1) * GregorianCalendarSystem.CHRONON_OF_DAY; case DATETIME: if (leftType == ATypeTag.DATETIME) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); resultType = ATypeTag.DATETIME; chronon = ADateTimeSerializerDeserializer.getChronon(bytes0, offset0 + 1); @@ -399,13 +399,13 @@ public abstract class AbstractNumericArithmeticEval extends AbstractScalarFuncti offset0 + 1); switch (rightType) { case DATETIME: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); resultType = ATypeTag.DATETIME; chronon = ADateTimeSerializerDeserializer.getChronon(bytes1, offset1 + 1); break; case DATE: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); resultType = ATypeTag.DATE; chronon = ADateSerializerDeserializer.getChronon(bytes1, offset1 + 1) @@ -426,13 +426,13 @@ public abstract class AbstractNumericArithmeticEval extends AbstractScalarFuncti } switch (rightType) { case DATETIME: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); resultType = ATypeTag.DATETIME; chronon = ADateTimeSerializerDeserializer.getChronon(bytes1, offset1 + 1); break; case DATE: - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); resultType = ATypeTag.DATE; chronon = ADateSerializerDeserializer.getChronon(bytes1, offset1 + 1) @@ -440,7 +440,7 @@ public abstract class AbstractNumericArithmeticEval extends AbstractScalarFuncti break; case TIME: if (yearMonth == 0) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); resultType = ATypeTag.TIME; chronon = ATimeSerializerDeserializer.getChronon(bytes1, offset1 + 1);
