http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/BinaryLengthDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/BinaryLengthDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/BinaryLengthDescriptor.java index 8b0f660..196543a 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/BinaryLengthDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/BinaryLengthDescriptor.java @@ -19,7 +19,7 @@ package org.apache.asterix.runtime.evaluators.functions.binary; -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; @@ -60,7 +60,7 @@ public class BinaryLengthDescriptor extends AbstractScalarFunctionDynamicDescrip private AMutableInt64 result = new AMutableInt64(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> intSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @Override
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/ParseBinaryDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/ParseBinaryDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/ParseBinaryDescriptor.java index dfceccb..aa68ed5 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/ParseBinaryDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/ParseBinaryDescriptor.java @@ -19,7 +19,7 @@ package org.apache.asterix.runtime.evaluators.functions.binary; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ABinary; import org.apache.asterix.om.base.AMutableBinary; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -70,7 +70,7 @@ public class ParseBinaryDescriptor extends AbstractScalarFunctionDynamicDescript return new AbstractBinaryScalarEvaluator(ctx, args) { @SuppressWarnings("unchecked") - private ISerializerDeserializer<ABinary> binarySerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ABinary> binarySerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABINARY); private AMutableBinary aBinary = new AMutableBinary(new byte[0], 0, 0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedEvalFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedEvalFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedEvalFactory.java index e366dce..a6d7b61 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedEvalFactory.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/FieldAccessNestedEvalFactory.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.asterix.common.exceptions.AsterixException; 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.AMissing; import org.apache.asterix.om.base.ANull; import org.apache.asterix.om.base.AString; @@ -79,10 +79,10 @@ public class FieldAccessNestedEvalFactory implements IScalarEvaluatorFactory { private final IPointable[] fieldPointables = new VoidPointable[fieldPath.size()]; private final RuntimeRecordTypeInfo[] recTypeInfos = new RuntimeRecordTypeInfo[fieldPath.size()]; @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AMissing> missingSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AMissing> missingSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AMISSING); { @@ -99,7 +99,7 @@ public class FieldAccessNestedEvalFactory implements IScalarEvaluatorFactory { ArrayBackedValueStorage storage = new ArrayBackedValueStorage(); DataOutput out = storage.getDataOutput(); AString as = new AString(fieldPath.get(i)); - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(as.getType()).serialize(as, + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(as.getType()).serialize(as, out); fieldPointables[i] = new VoidPointable(); fieldPointables[i].set(storage); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java index b99b488..92848b3 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java @@ -28,7 +28,7 @@ import org.apache.asterix.builders.ListBuilderFactory; import org.apache.asterix.builders.OrderedListBuilder; import org.apache.asterix.builders.RecordBuilderFactory; import org.apache.asterix.common.exceptions.AsterixException; -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.AMutableString; import org.apache.asterix.om.base.AString; @@ -73,10 +73,10 @@ public class RecordFieldsUtil { private final static AOrderedListType listType = new AOrderedListType(BuiltinType.ANY, "fields"); //Better not be a static object. @SuppressWarnings("unchecked") - protected final ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + protected final ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); @SuppressWarnings("unchecked") - protected final ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + protected final ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); private final static ARecordType openType = DefaultOpenFieldType.NESTED_OPEN_RECORD_TYPE; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/AbstractIntervalLogicFuncDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/AbstractIntervalLogicFuncDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/AbstractIntervalLogicFuncDescriptor.java index f782602..fb7b235 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/AbstractIntervalLogicFuncDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/AbstractIntervalLogicFuncDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; 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.runtime.exceptions.IncompatibleTypeException; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -67,7 +67,7 @@ public abstract class AbstractIntervalLogicFuncDescriptor extends AbstractScalar // possible output types @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/functions/temporal/CalendarDuartionFromDateDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CalendarDuartionFromDateDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CalendarDuartionFromDateDescriptor.java index 985fd53..ee7d05a 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CalendarDuartionFromDateDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CalendarDuartionFromDateDescriptor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADateSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; -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.DurationArithmeticOperations; @@ -75,7 +75,7 @@ public class CalendarDuartionFromDateDescriptor extends AbstractScalarFunctionDy private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADuration> durationSerde = AqlSerializerDeserializerProvider. + private ISerializerDeserializer<ADuration> durationSerde = SerializerDeserializerProvider. INSTANCE.getSerializerDeserializer(BuiltinType.ADURATION); private AMutableDuration aDuration = new AMutableDuration(0, 0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CalendarDurationFromDateTimeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CalendarDurationFromDateTimeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CalendarDurationFromDateTimeDescriptor.java index cba7f20..727bbfe 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CalendarDurationFromDateTimeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CalendarDurationFromDateTimeDescriptor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADateTimeSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; -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.DurationArithmeticOperations; @@ -92,7 +92,7 @@ public class CalendarDurationFromDateTimeDescriptor extends AbstractScalarFuncti private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADuration> durationSerde = AqlSerializerDeserializerProvider. + private ISerializerDeserializer<ADuration> durationSerde = SerializerDeserializerProvider. INSTANCE.getSerializerDeserializer(BuiltinType.ADURATION); private AMutableDuration aDuration = new AMutableDuration(0, 0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentDateDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentDateDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentDateDescriptor.java index e958a30..044fbc5 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentDateDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentDateDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; -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.GregorianCalendarSystem; @@ -66,7 +66,7 @@ public class CurrentDateDescriptor extends AbstractScalarFunctionDynamicDescript private DataOutput out = resultStorage.getDataOutput(); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADate> dateSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); private 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/functions/temporal/CurrentDateTimeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentDateTimeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentDateTimeDescriptor.java index c8f310a..80537ea 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentDateTimeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentDateTimeDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; -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; @@ -67,7 +67,7 @@ public class CurrentDateTimeDescriptor extends AbstractScalarFunctionDynamicDesc private DataOutput out = resultStorage.getDataOutput(); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADateTime> datetimeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADateTime> datetimeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); private AMutableDateTime aDateTime = new AMutableDateTime(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentTimeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentTimeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentTimeDescriptor.java index be1f877..18440f6 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentTimeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/CurrentTimeDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; -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.GregorianCalendarSystem; @@ -68,7 +68,7 @@ public class CurrentTimeDescriptor extends AbstractScalarFunctionDynamicDescript private DataOutput out = resultStorage.getDataOutput(); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); private 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/functions/temporal/DateFromDatetimeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DateFromDatetimeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DateFromDatetimeDescriptor.java index 869ac7b..c365529 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DateFromDatetimeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DateFromDatetimeDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADateTimeSerializerDeserializer; -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.GregorianCalendarSystem; @@ -72,7 +72,7 @@ public class DateFromDatetimeDescriptor extends AbstractScalarFunctionDynamicDes // possible returning types @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADate> dateSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); private 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/functions/temporal/DateFromUnixTimeInDaysDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DateFromUnixTimeInDaysDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DateFromUnixTimeInDaysDescriptor.java index 58e2213..3893e8c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DateFromUnixTimeInDaysDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DateFromUnixTimeInDaysDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; -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; @@ -70,7 +70,7 @@ public class DateFromUnixTimeInDaysDescriptor extends AbstractScalarFunctionDyna // possible returning types @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADate> dateSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromDateAndTimeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromDateAndTimeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromDateAndTimeDescriptor.java index 96a3e30..73e33df 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromDateAndTimeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromDateAndTimeDescriptor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADateSerializerDeserializer; 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.ADateTime; import org.apache.asterix.om.base.AMutableDateTime; import org.apache.asterix.om.base.temporal.GregorianCalendarSystem; @@ -77,7 +77,7 @@ public class DatetimeFromDateAndTimeDescriptor extends AbstractScalarFunctionDyn // possible returning types @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADateTime> datetimeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADateTime> datetimeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); private AMutableDateTime aDateTime = new AMutableDateTime(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInMsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInMsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInMsDescriptor.java index a5200cd..9af1446 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInMsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInMsDescriptor.java @@ -24,7 +24,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.ADateTime; import org.apache.asterix.om.base.AMutableDateTime; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -78,7 +78,7 @@ public class DatetimeFromUnixTimeInMsDescriptor extends AbstractScalarFunctionDy // possible output types @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADateTime> datetimeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADateTime> datetimeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); private AMutableDateTime aDatetime = new AMutableDateTime(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInSecsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInSecsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInSecsDescriptor.java index b71ac93..1fca88f 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInSecsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInSecsDescriptor.java @@ -24,7 +24,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.ADateTime; import org.apache.asterix.om.base.AMutableDateTime; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -77,7 +77,7 @@ public class DatetimeFromUnixTimeInSecsDescriptor extends AbstractScalarFunction // possible output types @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADateTime> datetimeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADateTime> datetimeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); private AMutableDateTime aDatetime = new AMutableDateTime(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayOfWeekDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayOfWeekDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayOfWeekDescriptor.java index 5993da9..74155dc 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayOfWeekDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayOfWeekDescriptor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADateSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ADateTimeSerializerDeserializer; -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; @@ -75,7 +75,7 @@ public class DayOfWeekDescriptor extends AbstractScalarFunctionDynamicDescriptor // possible returning types @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); private AMutableInt64 aInt64 = 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/functions/temporal/DayTimeDurationComparatorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayTimeDurationComparatorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayTimeDurationComparatorDescriptor.java index 3188b08..0403b52 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayTimeDurationComparatorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayTimeDurationComparatorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; -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.ATypeTag; @@ -68,7 +68,7 @@ public class DayTimeDurationComparatorDescriptor extends AbstractScalarFunctionD private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ABoolean> boolSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ABoolean> boolSerde = 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/functions/temporal/DurationEqualDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationEqualDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationEqualDescriptor.java index 27b3304..a5e5942 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationEqualDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationEqualDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; -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.runtime.exceptions.TypeMismatchException; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -69,7 +69,7 @@ public class DurationEqualDescriptor extends AbstractScalarFunctionDynamicDescri private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ABoolean> boolSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ABoolean> boolSerde = 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/functions/temporal/DurationFromIntervalDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromIntervalDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromIntervalDescriptor.java index d3862b7..058186a 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromIntervalDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromIntervalDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; 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.ADayTimeDuration; import org.apache.asterix.om.base.AMutableDayTimeDuration; import org.apache.asterix.om.base.temporal.GregorianCalendarSystem; @@ -70,8 +70,9 @@ public class DurationFromIntervalDescriptor extends AbstractScalarFunctionDynami private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADayTimeDuration> dayTimeDurationSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADAYTIMEDURATION); + private ISerializerDeserializer<ADayTimeDuration> dayTimeDurationSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer( + BuiltinType.ADAYTIMEDURATION); private AMutableDayTimeDuration aDayTimeDuration = new AMutableDayTimeDuration(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMillisecondsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMillisecondsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMillisecondsDescriptor.java index fa1e681..2e0e7e9 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMillisecondsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMillisecondsDescriptor.java @@ -24,7 +24,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.ADuration; import org.apache.asterix.om.base.AMutableDuration; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -73,7 +73,7 @@ public class DurationFromMillisecondsDescriptor extends AbstractScalarFunctionDy private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADuration> durationSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADuration> durationSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADURATION); AMutableDuration aDuration = new AMutableDuration(0, 0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMonthsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMonthsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMonthsDescriptor.java index 907992b..a4e3979 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMonthsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMonthsDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; -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.functions.AsterixBuiltinFunctions; @@ -68,7 +68,7 @@ public class DurationFromMonthsDescriptor extends AbstractScalarFunctionDynamicD private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADuration> durationSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADuration> durationSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADURATION); AMutableDuration aDuration = new AMutableDuration(0, 0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetDayTimeDurationDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetDayTimeDurationDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetDayTimeDurationDescriptor.java index 3f9616b..ccb37cf 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetDayTimeDurationDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetDayTimeDurationDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; -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.runtime.exceptions.TypeMismatchException; @@ -69,8 +69,9 @@ public class GetDayTimeDurationDescriptor extends AbstractScalarFunctionDynamicD private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADayTimeDuration> dayTimeDurationSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADAYTIMEDURATION); + private ISerializerDeserializer<ADayTimeDuration> dayTimeDurationSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer( + BuiltinType.ADAYTIMEDURATION); AMutableDayTimeDuration aDayTimeDuration = new AMutableDayTimeDuration(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java index 8258df8..9108510 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; -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.base.ANull; @@ -79,11 +79,11 @@ public class GetOverlappingIntervalDescriptor extends AbstractScalarFunctionDyna private final AMutableInterval aInterval = new AMutableInterval(0, 0, (byte) -1); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInterval> intervalSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINTERVAL); + private final ISerializerDeserializer<AInterval> intervalSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINTERVAL); @Override public void evaluate(IFrameTupleReference tuple, IPointable result) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetYearMonthDurationDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetYearMonthDurationDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetYearMonthDurationDescriptor.java index 7224c13..4ffe47c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetYearMonthDurationDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetYearMonthDurationDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; -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.runtime.exceptions.TypeMismatchException; @@ -68,8 +68,9 @@ public class GetYearMonthDurationDescriptor extends AbstractScalarFunctionDynami private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AYearMonthDuration> yearMonthDurationSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AYEARMONTHDURATION); + private ISerializerDeserializer<AYearMonthDuration> yearMonthDurationSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer( + BuiltinType.AYEARMONTHDURATION); AMutableYearMonthDuration aYearMonthDuration = new AMutableYearMonthDuration(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalBinDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalBinDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalBinDescriptor.java index c8b27d5..d5b0c49 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalBinDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalBinDescriptor.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.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.AInterval; import org.apache.asterix.om.base.AMutableInterval; import org.apache.asterix.om.base.temporal.DurationArithmeticOperations; @@ -88,8 +88,8 @@ public class IntervalBinDescriptor extends AbstractScalarFunctionDynamicDescript private final AMutableInterval aInterval = new AMutableInterval(0, 0, (byte) -1); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInterval> intervalSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINTERVAL); + private final ISerializerDeserializer<AInterval> intervalSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINTERVAL); private final GregorianCalendarSystem GREG_CAL = GregorianCalendarSystem.getInstance(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MillisecondsFromDayTimeDurationDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MillisecondsFromDayTimeDurationDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MillisecondsFromDayTimeDurationDescriptor.java index 5c49eed..f72ece6 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MillisecondsFromDayTimeDurationDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MillisecondsFromDayTimeDurationDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializerDeserializer; -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.runtime.exceptions.TypeMismatchException; @@ -68,7 +68,7 @@ public class MillisecondsFromDayTimeDurationDescriptor extends AbstractScalarFun private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); AMutableInt64 aInt64 = 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/functions/temporal/MonthsFromYearMonthDurationDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MonthsFromYearMonthDurationDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MonthsFromYearMonthDurationDescriptor.java index 68b5f33..9a3f180 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MonthsFromYearMonthDurationDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MonthsFromYearMonthDurationDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; 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.runtime.exceptions.TypeMismatchException; @@ -68,7 +68,7 @@ public class MonthsFromYearMonthDurationDescriptor extends AbstractScalarFunctio private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); AMutableInt64 aInt64 = 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/functions/temporal/OverlapBinsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/OverlapBinsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/OverlapBinsDescriptor.java index 79fc90b..b022fd5 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/OverlapBinsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/OverlapBinsDescriptor.java @@ -28,7 +28,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializ import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer; 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.AInterval; import org.apache.asterix.om.base.AMutableInterval; import org.apache.asterix.om.base.temporal.DurationArithmeticOperations; @@ -96,8 +96,8 @@ public class OverlapBinsDescriptor extends AbstractScalarFunctionDynamicDescript private final AMutableInterval aInterval = new AMutableInterval(0, 0, (byte) -1); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInterval> intervalSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINTERVAL); + private final ISerializerDeserializer<AInterval> intervalSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINTERVAL); private final GregorianCalendarSystem gregCalSys = GregorianCalendarSystem.getInstance(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateDescriptor.java index 9aff8c9..9e8ad2d 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; -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.AsterixTemporalTypeParseException; @@ -80,7 +80,7 @@ public class ParseDateDescriptor extends AbstractScalarFunctionDynamicDescriptor private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADate> dateSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); private 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/functions/temporal/ParseDateTimeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateTimeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateTimeDescriptor.java index 24f62ba..1271f7b 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateTimeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateTimeDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; -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.AsterixTemporalTypeParseException; @@ -75,7 +75,7 @@ public class ParseDateTimeDescriptor extends AbstractScalarFunctionDynamicDescri private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADateTime> datetimeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ADateTime> datetimeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); private AMutableDateTime aDateTime = new AMutableDateTime(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseTimeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseTimeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseTimeDescriptor.java index 3b07c98..2439855 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseTimeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseTimeDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; -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.AsterixTemporalTypeParseException; @@ -76,7 +76,7 @@ public class ParseTimeDescriptor extends AbstractScalarFunctionDynamicDescriptor private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); private 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/functions/temporal/TimeFromDatetimeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromDatetimeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromDatetimeDescriptor.java index b7637a6..465695c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromDatetimeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromDatetimeDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADateTimeSerializerDeserializer; -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.GregorianCalendarSystem; @@ -76,7 +76,7 @@ public class TimeFromDatetimeDescriptor extends AbstractScalarFunctionDynamicDes // possible returning types @SuppressWarnings("unchecked") - private ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); private 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/functions/temporal/TimeFromUnixTimeInMsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromUnixTimeInMsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromUnixTimeInMsDescriptor.java index 6420a75..3340e9f 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromUnixTimeInMsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromUnixTimeInMsDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; -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 TimeFromUnixTimeInMsDescriptor extends AbstractScalarFunctionDynami // possible output types @SuppressWarnings("unchecked") - private ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); private 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/functions/temporal/UnixTimeFromDateInDaysDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDateInDaysDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDateInDaysDescriptor.java index db8161c..c74c303 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDateInDaysDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDateInDaysDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADateSerializerDeserializer; -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.runtime.exceptions.TypeMismatchException; @@ -71,7 +71,7 @@ public class UnixTimeFromDateInDaysDescriptor extends AbstractScalarFunctionDyna // possible returning types private AMutableInt64 aInt64 = new AMutableInt64(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInMsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInMsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInMsDescriptor.java index 2f24861..a1722a4 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInMsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInMsDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADateTimeSerializerDeserializer; -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.runtime.exceptions.TypeMismatchException; @@ -69,7 +69,7 @@ public class UnixTimeFromDatetimeInMsDescriptor extends AbstractScalarFunctionDy // possible returning types private AMutableInt64 aInt64 = new AMutableInt64(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInSecsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInSecsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInSecsDescriptor.java index 3f0757b..edda40d 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInSecsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInSecsDescriptor.java @@ -23,7 +23,7 @@ import static org.apache.asterix.om.types.ATypeTag.SERIALIZED_DATETIME_TYPE_TAG; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADateTimeSerializerDeserializer; -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.runtime.exceptions.TypeMismatchException; @@ -75,7 +75,7 @@ public class UnixTimeFromDatetimeInSecsDescriptor extends AbstractScalarFunction // possible returning types private AMutableInt64 aInt64 = new AMutableInt64(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromTimeInMsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromTimeInMsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromTimeInMsDescriptor.java index 7213479..c24584d 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromTimeInMsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromTimeInMsDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; 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.AInt64; import org.apache.asterix.om.base.AMutableInt64; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -71,7 +71,7 @@ public class UnixTimeFromTimeInMsDescriptor extends AbstractScalarFunctionDynami // possible returning types private AMutableInt64 aInt64 = new AMutableInt64(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/YearMonthDurationComparatorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/YearMonthDurationComparatorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/YearMonthDurationComparatorDescriptor.java index 78c40c5..4c18d73 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/YearMonthDurationComparatorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/YearMonthDurationComparatorDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions.temporal; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer; -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.ATypeTag; @@ -68,7 +68,7 @@ public class YearMonthDurationComparatorDescriptor extends AbstractScalarFunctio private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ABoolean> boolSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ABoolean> boolSerde = 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/formats/NonTaggedDataFormat.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java index c046743..85f2c08 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java @@ -28,19 +28,19 @@ import java.util.Map; import org.apache.asterix.common.config.GlobalConfig; import org.apache.asterix.dataflow.data.nontagged.AqlMissingWriterFactory; import org.apache.asterix.formats.base.IDataFormat; -import org.apache.asterix.formats.nontagged.AqlADMPrinterFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlBinaryBooleanInspectorImpl; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlBinaryHashFunctionFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlBinaryHashFunctionFamilyProvider; -import org.apache.asterix.formats.nontagged.AqlBinaryIntegerInspector; -import org.apache.asterix.formats.nontagged.AqlCSVPrinterFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlCleanJSONPrinterFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlLosslessJSONPrinterFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlNormalizedKeyComputerFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlPredicateEvaluatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; -import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; +import org.apache.asterix.formats.nontagged.ADMPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.BinaryBooleanInspector; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.BinaryHashFunctionFactoryProvider; +import org.apache.asterix.formats.nontagged.BinaryHashFunctionFamilyProvider; +import org.apache.asterix.formats.nontagged.BinaryIntegerInspector; +import org.apache.asterix.formats.nontagged.CSVPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.CleanJSONPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.LosslessJSONPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.NormalizedKeyComputerFactoryProvider; +import org.apache.asterix.formats.nontagged.PredicateEvaluatorFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.om.base.ABoolean; import org.apache.asterix.om.base.AInt32; import org.apache.asterix.om.base.AMissing; @@ -162,27 +162,27 @@ public class NonTaggedDataFormat implements IDataFormat { @Override public IBinaryBooleanInspectorFactory getBinaryBooleanInspectorFactory() { - return AqlBinaryBooleanInspectorImpl.FACTORY; + return BinaryBooleanInspector.FACTORY; } @Override public IBinaryComparatorFactoryProvider getBinaryComparatorFactoryProvider() { - return AqlBinaryComparatorFactoryProvider.INSTANCE; + return BinaryComparatorFactoryProvider.INSTANCE; } @Override public IBinaryHashFunctionFactoryProvider getBinaryHashFunctionFactoryProvider() { - return AqlBinaryHashFunctionFactoryProvider.INSTANCE; + return BinaryHashFunctionFactoryProvider.INSTANCE; } @Override public ISerializerDeserializerProvider getSerdeProvider() { - return AqlSerializerDeserializerProvider.INSTANCE; // done + return SerializerDeserializerProvider.INSTANCE; // done } @Override public ITypeTraitProvider getTypeTraitProvider() { - return AqlTypeTraitProvider.INSTANCE; + return TypeTraitProvider.INSTANCE; } @SuppressWarnings("unchecked") @@ -202,7 +202,7 @@ public class NonTaggedDataFormat implements IDataFormat { fieldFound = true; try { AInt32 ai = new AInt32(i); - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(ai.getType()).serialize(ai, + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(ai.getType()).serialize(ai, dos); } catch (HyracksDataException e) { throw new AlgebricksException(e); @@ -219,7 +219,7 @@ public class NonTaggedDataFormat implements IDataFormat { if (fldName.size() == 1) { AString as = new AString(fldName.get(0)); try { - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(as.getType()).serialize(as, + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(as.getType()).serialize(as, dos); } catch (HyracksDataException e) { throw new AlgebricksException(e); @@ -227,7 +227,7 @@ public class NonTaggedDataFormat implements IDataFormat { } else { AOrderedList as = new AOrderedList(fldName); try { - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(as.getType()).serialize(as, + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(as.getType()).serialize(as, dos); } catch (HyracksDataException e) { throw new AlgebricksException(e); @@ -260,7 +260,7 @@ public class NonTaggedDataFormat implements IDataFormat { DataOutput dos1 = abvs1.getDataOutput(); try { AInt32 ai = new AInt32(dimension); - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(ai.getType()).serialize(ai, dos1); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(ai.getType()).serialize(ai, dos1); } catch (HyracksDataException e) { throw new AlgebricksException(e); } @@ -272,7 +272,7 @@ public class NonTaggedDataFormat implements IDataFormat { DataOutput dos2 = abvs2.getDataOutput(); try { AInt32 ai = new AInt32(i); - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(ai.getType()).serialize(ai, dos2); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(ai.getType()).serialize(ai, dos2); } catch (HyracksDataException e) { throw new AlgebricksException(e); } @@ -302,7 +302,7 @@ public class NonTaggedDataFormat implements IDataFormat { DataOutput dos = abvs.getDataOutput(); try { AInt32 ai = new AInt32(i); - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(ai.getType()).serialize(ai, + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(ai.getType()).serialize(ai, dos); } catch (HyracksDataException e) { throw new AlgebricksException(e); @@ -329,7 +329,7 @@ public class NonTaggedDataFormat implements IDataFormat { DataOutput dos = abvs.getDataOutput(); AOrderedList as = new AOrderedList(fldName); try { - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(as.getType()).serialize(as, dos); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(as.getType()).serialize(as, dos); } catch (HyracksDataException e) { throw new AlgebricksException(e); } @@ -621,22 +621,22 @@ public class NonTaggedDataFormat implements IDataFormat { @Override public IPrinterFactoryProvider getADMPrinterFactoryProvider() { - return AqlADMPrinterFactoryProvider.INSTANCE; + return ADMPrinterFactoryProvider.INSTANCE; } @Override public IPrinterFactoryProvider getLosslessJSONPrinterFactoryProvider() { - return AqlLosslessJSONPrinterFactoryProvider.INSTANCE; + return LosslessJSONPrinterFactoryProvider.INSTANCE; } @Override public IPrinterFactoryProvider getCleanJSONPrinterFactoryProvider() { - return AqlCleanJSONPrinterFactoryProvider.INSTANCE; + return CleanJSONPrinterFactoryProvider.INSTANCE; } @Override public IPrinterFactoryProvider getCSVPrinterFactoryProvider() { - return AqlCSVPrinterFactoryProvider.INSTANCE; + return CSVPrinterFactoryProvider.INSTANCE; } @SuppressWarnings("unchecked") @@ -656,7 +656,7 @@ public class NonTaggedDataFormat implements IDataFormat { ArrayBackedValueStorage abvs = new ArrayBackedValueStorage(); DataOutput dos = abvs.getDataOutput(); try { - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(obj.getType()).serialize(obj, dos); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(obj.getType()).serialize(obj, dos); } catch (HyracksDataException e) { throw new AlgebricksException(e); } @@ -665,7 +665,7 @@ public class NonTaggedDataFormat implements IDataFormat { @Override public IBinaryIntegerInspectorFactory getBinaryIntegerInspectorFactory() { - return AqlBinaryIntegerInspector.FACTORY; + return BinaryIntegerInspector.FACTORY; } @Override @@ -733,16 +733,16 @@ public class NonTaggedDataFormat implements IDataFormat { @Override public INormalizedKeyComputerFactoryProvider getNormalizedKeyComputerFactoryProvider() { - return AqlNormalizedKeyComputerFactoryProvider.INSTANCE; + return NormalizedKeyComputerFactoryProvider.INSTANCE; } @Override public IBinaryHashFunctionFamilyProvider getBinaryHashFunctionFamilyProvider() { - return AqlBinaryHashFunctionFamilyProvider.INSTANCE; + return BinaryHashFunctionFamilyProvider.INSTANCE; } @Override public IPredicateEvaluatorFactoryProvider getPredicateEvaluatorFactoryProvider() { - return AqlPredicateEvaluatorFactoryProvider.INSTANCE; + return PredicateEvaluatorFactoryProvider.INSTANCE; } }
