http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractQuadStringStringEval.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractQuadStringStringEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractQuadStringStringEval.java index 7814d90..b607309 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractQuadStringStringEval.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractQuadStringStringEval.java @@ -25,7 +25,7 @@ package org.apache.asterix.runtime.evaluators.functions; 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.AMutableString; import org.apache.asterix.runtime.exceptions.TypeMismatchException; import org.apache.asterix.om.types.ATypeTag; @@ -59,7 +59,7 @@ public abstract class AbstractQuadStringStringEval implements IScalarEvaluator { private AMutableString resultBuffer = new AMutableString(""); @SuppressWarnings("rawtypes") - private ISerializerDeserializer strSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer strSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); private final UTF8StringPointable strPtr1st = new UTF8StringPointable();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringBoolEval.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringBoolEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringBoolEval.java index a9196d5..c7d839e 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringBoolEval.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringBoolEval.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.algebricks.core.algebra.functions.FunctionIdentifier; @@ -34,7 +34,7 @@ import org.apache.hyracks.data.std.primitive.UTF8StringPointable; public abstract class AbstractTripleStringBoolEval extends AbstractTripleStringEval { @SuppressWarnings("rawtypes") - private ISerializerDeserializer boolSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer boolSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); public AbstractTripleStringBoolEval(IHyracksTaskContext context, IScalarEvaluatorFactory eval0, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringIntEval.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringIntEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringIntEval.java index c7dc9dc..2aa2f1a 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringIntEval.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringIntEval.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.algebricks.core.algebra.functions.FunctionIdentifier; @@ -35,7 +35,7 @@ import org.apache.hyracks.data.std.primitive.UTF8StringPointable; public abstract class AbstractTripleStringIntEval extends AbstractTripleStringEval { @SuppressWarnings("rawtypes") - private final ISerializerDeserializer intSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); private final 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/AbstractTripleStringStringEval.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringStringEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringStringEval.java index f0a3678..b7bd056 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringStringEval.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringStringEval.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.AMutableString; import org.apache.asterix.om.types.BuiltinType; import org.apache.hyracks.api.exceptions.HyracksDataException; @@ -34,7 +34,7 @@ import org.apache.hyracks.data.std.primitive.UTF8StringPointable; public abstract class AbstractTripleStringStringEval extends AbstractTripleStringEval { @SuppressWarnings("rawtypes") - private final ISerializerDeserializer stringSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); private final AMutableString resultValue = new AMutableString(""); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryNumericFunctionEval.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryNumericFunctionEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryNumericFunctionEval.java index 24c2135..c56d58f 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryNumericFunctionEval.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryNumericFunctionEval.java @@ -28,7 +28,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.om.base.AMutableFloat; import org.apache.asterix.om.base.AMutableInt16; @@ -72,22 +72,22 @@ abstract class AbstractUnaryNumericFunctionEval implements IScalarEvaluator { private final IScalarEvaluator argEval; @SuppressWarnings("rawtypes") - protected ISerializerDeserializer int8Serde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer int8Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT8); @SuppressWarnings("rawtypes") - protected ISerializerDeserializer int16Serde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer int16Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT16); @SuppressWarnings("rawtypes") - protected ISerializerDeserializer int32Serde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer int32Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); @SuppressWarnings("rawtypes") - protected ISerializerDeserializer int64Serde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @SuppressWarnings("rawtypes") - protected ISerializerDeserializer floatSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer floatSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AFLOAT); @SuppressWarnings("rawtypes") - protected ISerializerDeserializer doubleSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer doubleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); // The function identifier, used for error messages. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AndDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AndDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AndDescriptor.java index 1aba0ef..7a7a01c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AndDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AndDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ABooleanSerializerDeserializer; -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.AMissing; import org.apache.asterix.om.base.ANull; @@ -74,13 +74,13 @@ public class AndDescriptor extends AbstractScalarFunctionDynamicDescriptor { return new IScalarEvaluator() { @SuppressWarnings("unchecked") - private ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AMissing> missingSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AMissing> missingSerde = 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/functions/CreateCircleDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateCircleDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateCircleDescriptor.java index 989a246..4f7be32 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateCircleDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateCircleDescriptor.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.Coordinate; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.APointSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ACircle; import org.apache.asterix.om.base.AMutableCircle; import org.apache.asterix.om.base.AMutablePoint; @@ -75,7 +75,7 @@ public class CreateCircleDescriptor extends AbstractScalarFunctionDynamicDescrip private 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); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateLineDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateLineDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateLineDescriptor.java index 2713388..eece49c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateLineDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateLineDescriptor.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.Coordinate; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.APointSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ALine; import org.apache.asterix.om.base.AMutableLine; import org.apache.asterix.om.base.AMutablePoint; @@ -75,7 +75,7 @@ public class CreateLineDescriptor extends AbstractScalarFunctionDynamicDescripto 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); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreatePointDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreatePointDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreatePointDescriptor.java index c01bba2..ddb7c89 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreatePointDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreatePointDescriptor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutablePoint; import org.apache.asterix.om.base.APoint; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -69,7 +69,7 @@ public class CreatePointDescriptor extends AbstractScalarFunctionDynamicDescript private IScalarEvaluator eval1 = args[1].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); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreatePolygonDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreatePolygonDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreatePolygonDescriptor.java index c87277b..2ae29f8 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreatePolygonDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreatePolygonDescriptor.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.APointSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMissing; import org.apache.asterix.om.base.ANull; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -75,9 +75,9 @@ public class CreatePolygonDescriptor extends AbstractScalarFunctionDynamicDescri private final IPointable inputArgList = new VoidPointable(); private final IScalarEvaluator evalList = listEvalFactory.createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); - private final ISerializerDeserializer<AMissing> missingSerde = AqlSerializerDeserializerProvider. + private final ISerializerDeserializer<AMissing> missingSerde = 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/functions/CreateRectangleDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateRectangleDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateRectangleDescriptor.java index 593e71d..82fcd6b 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateRectangleDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateRectangleDescriptor.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.Coordinate; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.APointSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutablePoint; import org.apache.asterix.om.base.AMutableRectangle; import org.apache.asterix.om.base.ARectangle; @@ -75,8 +75,8 @@ public class CreateRectangleDescriptor extends AbstractScalarFunctionDynamicDesc 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); @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/CreateUUIDDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateUUIDDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateUUIDDescriptor.java index d1c40c3..d89ee27 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateUUIDDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/CreateUUIDDescriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions; import java.io.DataOutput; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AGeneratedUUID; import org.apache.asterix.om.base.AUUID; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -56,7 +56,7 @@ public class CreateUUIDDescriptor extends AbstractScalarFunctionDynamicDescripto private static final long serialVersionUID = 1L; @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AUUID> uuidSerDe = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AUUID> uuidSerDe = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AUUID); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/DeepEqualityDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/DeepEqualityDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/DeepEqualityDescriptor.java index dcbfcf1..2d7e1b6 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/DeepEqualityDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/DeepEqualityDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions; 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.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.functions.IFunctionDescriptor; @@ -67,7 +67,7 @@ public class DeepEqualityDescriptor extends AbstractScalarFunctionDynamicDescrip return new IScalarEvaluatorFactory() { private static final long serialVersionUID = 1L; @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ABoolean> boolSerde = AqlSerializerDeserializerProvider.INSTANCE + private final 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/EditDistanceListIsFilterableDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/EditDistanceListIsFilterableDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/EditDistanceListIsFilterableDescriptor.java index a7337a8..903eb2c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/EditDistanceListIsFilterableDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/EditDistanceListIsFilterableDescriptor.java @@ -23,7 +23,7 @@ import java.io.IOException; 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.om.base.ABoolean; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.functions.IFunctionDescriptor; @@ -92,7 +92,7 @@ public class EditDistanceListIsFilterableDescriptor extends AbstractScalarFuncti protected final IScalarEvaluator edThreshEval; @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); public EditDistanceListIsFilterableEvaluator(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/functions/EditDistanceStringIsFilterableEvaluator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/EditDistanceStringIsFilterableEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/EditDistanceStringIsFilterableEvaluator.java index 63584fa..48c49d8 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/EditDistanceStringIsFilterableEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/EditDistanceStringIsFilterableEvaluator.java @@ -22,7 +22,7 @@ package org.apache.asterix.runtime.evaluators.functions; 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.ABoolean; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.types.ATypeTag; @@ -56,7 +56,7 @@ public class EditDistanceStringIsFilterableEvaluator implements IScalarEvaluator protected final IScalarEvaluator usePrePostEval; @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); 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/functions/LenDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/LenDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/LenDescriptor.java index e4c341c..177bfdf 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/LenDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/LenDescriptor.java @@ -23,7 +23,7 @@ import java.io.IOException; 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.om.base.AInt64; import org.apache.asterix.om.base.AMutableInt64; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -71,7 +71,7 @@ public class LenDescriptor extends AbstractScalarFunctionDynamicDescriptor { // result private final AMutableInt64 res = new AMutableInt64(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private final 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/NotDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NotDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NotDescriptor.java index 3771886..ab4b9aa 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NotDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NotDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ABooleanSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.ABoolean; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.functions.IFunctionDescriptor; @@ -71,7 +71,7 @@ public class NotDescriptor extends AbstractScalarFunctionDynamicDescriptor { private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); @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/NumericATan2Descriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericATan2Descriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericATan2Descriptor.java index f5e4144..59538e2 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericATan2Descriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericATan2Descriptor.java @@ -20,7 +20,7 @@ package org.apache.asterix.runtime.evaluators.functions; import java.io.DataOutput; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.functions.IFunctionDescriptor; @@ -72,7 +72,7 @@ public class NumericATan2Descriptor extends AbstractScalarFunctionDynamicDescrip // For the output. private final AMutableDouble aDouble = new AMutableDouble(0.0); @SuppressWarnings("rawtypes") - private final ISerializerDeserializer outputSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer outputSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); private final ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); private final DataOutput out = resultStorage.getDataOutput(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundDescriptor.java index 58e916c..2cf4bbe 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundDescriptor.java @@ -31,7 +31,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.om.base.AMutableFloat; import org.apache.asterix.om.base.AMutableInt16; @@ -102,38 +102,38 @@ public class NumericRoundDescriptor extends AbstractScalarFunctionDynamicDescrip int offset = argPtr.getStartOffset(); if (data[offset] == ATypeTag.SERIALIZED_INT8_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT8); byte val = AInt8SerializerDeserializer.getByte(data, offset + 1); aInt8.setValue(val); serde.serialize(aInt8, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT16_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT16); short val = AInt16SerializerDeserializer.getShort(data, offset + 1); aInt16.setValue(val); serde.serialize(aInt16, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT32_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); int val = AInt32SerializerDeserializer.getInt(data, offset + 1); aInt32.setValue(val); serde.serialize(aInt32, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT64_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); long val = AInt64SerializerDeserializer.getLong(data, offset + 1); aInt64.setValue(val); serde.serialize(aInt64, out); } else if (data[offset] == ATypeTag.SERIALIZED_FLOAT_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AFLOAT); float val = AFloatSerializerDeserializer.getFloat(data, offset + 1); val = Math.round(val); aFloat.setValue(val); serde.serialize(aFloat, out); } else if (data[offset] == ATypeTag.SERIALIZED_DOUBLE_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); double val = ADoubleSerializerDeserializer.getDouble(data, offset + 1); val = Math.round(val); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundHalfToEven2Descriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundHalfToEven2Descriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundHalfToEven2Descriptor.java index 59b3355..9bf0295 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundHalfToEven2Descriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundHalfToEven2Descriptor.java @@ -32,7 +32,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.om.base.AMutableFloat; import org.apache.asterix.om.base.AMutableInt16; @@ -126,31 +126,31 @@ public class NumericRoundHalfToEven2Descriptor extends AbstractScalarFunctionDyn int offset = argValue.getStartOffset(); if (data[offset] == ATypeTag.SERIALIZED_INT8_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT8); byte val = AInt8SerializerDeserializer.getByte(data, offset + 1); aInt8.setValue(val); serde.serialize(aInt8, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT16_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT16); short val = AInt16SerializerDeserializer.getShort(data, offset + 1); aInt16.setValue(val); serde.serialize(aInt16, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT32_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); int val = AInt32SerializerDeserializer.getInt(data, offset + 1); aInt32.setValue(val); serde.serialize(aInt32, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT64_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); long val = AInt64SerializerDeserializer.getLong(data, offset + 1); aInt64.setValue(val); serde.serialize(aInt64, out); } else if (data[offset] == ATypeTag.SERIALIZED_FLOAT_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AFLOAT); float val = AFloatSerializerDeserializer.getFloat(data, offset + 1); if (Float.isNaN(val) || Float.isInfinite(val) || Float.compare(val, -0.0F) == 0 @@ -163,7 +163,7 @@ public class NumericRoundHalfToEven2Descriptor extends AbstractScalarFunctionDyn serde.serialize(aFloat, out); } } else if (data[offset] == ATypeTag.SERIALIZED_DOUBLE_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); double val = ADoubleSerializerDeserializer.getDouble(data, offset + 1); if (Double.isNaN(val) || Double.isInfinite(val) || Double.compare(val, -0.0D) == 0 http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundHalfToEvenDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundHalfToEvenDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundHalfToEvenDescriptor.java index 522c6cb..d8d4c40 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundHalfToEvenDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericRoundHalfToEvenDescriptor.java @@ -31,7 +31,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.om.base.AMutableFloat; import org.apache.asterix.om.base.AMutableInt16; @@ -102,37 +102,37 @@ public class NumericRoundHalfToEvenDescriptor extends AbstractScalarFunctionDyna int offset = argPtr.getStartOffset(); if (data[offset] == ATypeTag.SERIALIZED_INT8_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT8); byte val = AInt8SerializerDeserializer.getByte(data, offset + 1); aInt8.setValue(val); serde.serialize(aInt8, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT16_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT16); short val = AInt16SerializerDeserializer.getShort(data, offset + 1); aInt16.setValue(val); serde.serialize(aInt16, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT32_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); int val = AInt32SerializerDeserializer.getInt(data, offset + 1); aInt32.setValue(val); serde.serialize(aInt32, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT64_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); long val = AInt64SerializerDeserializer.getLong(data, offset + 1); aInt64.setValue(val); serde.serialize(aInt64, out); } else if (data[offset] == ATypeTag.SERIALIZED_FLOAT_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AFLOAT); float val = AFloatSerializerDeserializer.getFloat(data, offset + 1); aFloat.setValue((float) Math.rint(val)); serde.serialize(aFloat, out); } else if (data[offset] == ATypeTag.SERIALIZED_DOUBLE_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); double val = ADoubleSerializerDeserializer.getDouble(data, offset + 1); aDouble.setValue(Math.rint(val)); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericSubtractDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericSubtractDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericSubtractDescriptor.java index 9d02b8d..712a912 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericSubtractDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericSubtractDescriptor.java @@ -26,7 +26,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.om.base.AMutableFloat; import org.apache.asterix.om.base.AMutableInt16; @@ -142,32 +142,32 @@ public class NumericSubtractDescriptor extends AbstractScalarFunctionDynamicDesc } if (metDouble) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); aDouble.setValue(operands[0] - operands[1]); serde.serialize(aDouble, out); } else if (metFloat) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AFLOAT); aFloat.setValue((float) (operands[0] - operands[1])); serde.serialize(aFloat, out); } else if (metInt64) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); aInt64.setValue((long) (operands[0] - operands[1])); serde.serialize(aInt64, out); } else if (metInt32) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); aInt32.setValue((int) (operands[0] - operands[1])); serde.serialize(aInt32, out); } else if (metInt16) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT16); aInt16.setValue((short) (operands[0] - operands[1])); serde.serialize(aInt16, out); } else if (metInt8) { - serde = AqlSerializerDeserializerProvider.INSTANCE + serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT8); aInt8.setValue((byte) (operands[0] - operands[1])); serde.serialize(aInt8, out); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericTruncDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericTruncDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericTruncDescriptor.java index cd7251e..4208b71 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericTruncDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/NumericTruncDescriptor.java @@ -32,7 +32,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableDouble; import org.apache.asterix.om.base.AMutableFloat; import org.apache.asterix.om.base.AMutableInt16; @@ -134,27 +134,27 @@ public class NumericTruncDescriptor extends AbstractScalarFunctionDynamicDescrip int offset = argValue.getStartOffset(); if (data[offset] == ATypeTag.SERIALIZED_INT8_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT8); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT8); byte val = AInt8SerializerDeserializer.getByte(data, offset + 1); aInt8.setValue(val); serde.serialize(aInt8, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT16_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT16); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT16); short val = AInt16SerializerDeserializer.getShort(data, offset + 1); aInt16.setValue(val); serde.serialize(aInt16, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT32_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); int val = AInt32SerializerDeserializer.getInt(data, offset + 1); aInt32.setValue(val); serde.serialize(aInt32, out); } else if (data[offset] == ATypeTag.SERIALIZED_INT64_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); long val = AInt64SerializerDeserializer.getLong(data, offset + 1); aInt64.setValue(val); serde.serialize(aInt64, out); } else if (data[offset] == ATypeTag.SERIALIZED_FLOAT_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AFLOAT); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AFLOAT); float val = AFloatSerializerDeserializer.getFloat(data, offset + 1); if (Float.isNaN(val) || Float.isInfinite(val) || Float.compare(val, -0.0F) == 0 || Float.compare(val, 0.0F) == 0) { @@ -166,7 +166,7 @@ public class NumericTruncDescriptor extends AbstractScalarFunctionDynamicDescrip serde.serialize(aFloat, out); } } else if (data[offset] == ATypeTag.SERIALIZED_DOUBLE_TYPE_TAG) { - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADOUBLE); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADOUBLE); double val = ADoubleSerializerDeserializer.getDouble(data, offset + 1); if (Double.isNaN(val) || Double.isInfinite(val) || Double.compare(val, -0.0D) == 0 || Double.compare(val, 0.0D) == 0) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/OrDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/OrDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/OrDescriptor.java index 6c1ac38..63eb124 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/OrDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/OrDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions; import java.io.DataOutput; import org.apache.asterix.dataflow.data.nontagged.serde.ABooleanSerializerDeserializer; -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.AMissing; import org.apache.asterix.om.base.ANull; @@ -74,13 +74,13 @@ public class OrDescriptor extends AbstractScalarFunctionDynamicDescriptor { private ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); private DataOutput output = resultStorage.getDataOutput(); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AMissing> missingSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AMissing> missingSerde = 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/functions/PrefixLenDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PrefixLenDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PrefixLenDescriptor.java index a4ba6dc..362d808 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PrefixLenDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PrefixLenDescriptor.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.apache.asterix.common.functions.FunctionConstants; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.fuzzyjoin.similarity.SimilarityFilters; import org.apache.asterix.om.base.AInt32; import org.apache.asterix.om.base.AMutableInt32; @@ -80,7 +80,7 @@ public class PrefixLenDescriptor extends AbstractScalarFunctionDynamicDescriptor // result private final AMutableInt32 res = new AMutableInt32(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInt32> int32Serde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AInt32> int32Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PrefixLenJaccardDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PrefixLenJaccardDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PrefixLenJaccardDescriptor.java index bb3a522..eb7e7c8 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PrefixLenJaccardDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PrefixLenJaccardDescriptor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import java.io.IOException; 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.fuzzyjoin.similarity.SimilarityFiltersJaccard; import org.apache.asterix.om.base.AInt32; import org.apache.asterix.om.base.AMutableInt32; @@ -78,7 +78,7 @@ public class PrefixLenJaccardDescriptor extends AbstractScalarFunctionDynamicDes // result private final AMutableInt32 res = new AMutableInt32(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInt32> int32Serde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AInt32> int32Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityDescriptor.java index 5f29fad..385b2c1 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityDescriptor.java @@ -26,7 +26,7 @@ import org.apache.asterix.common.functions.FunctionConstants; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; 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.SimilarityFilters; @@ -94,7 +94,7 @@ public class SimilarityDescriptor extends AbstractScalarFunctionDynamicDescripto // result private final AMutableDouble res = new AMutableDouble(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADouble> doubleSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ADouble> doubleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityJaccardPrefixCheckDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityJaccardPrefixCheckDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityJaccardPrefixCheckDescriptor.java index 97999ef..8b77c80 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityJaccardPrefixCheckDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityJaccardPrefixCheckDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions; 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.base.AFloat; import org.apache.asterix.om.base.AMutableFloat; @@ -73,10 +73,10 @@ public class SimilarityJaccardPrefixCheckDescriptor extends AbstractScalarFuncti private final OrderedListBuilder listBuilder; private ArrayBackedValueStorage inputVal; @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AFloat> floatSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AFloat> floatSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AFLOAT); private final AMutableFloat aFloat = new AMutableFloat(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialCellDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialCellDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialCellDescriptor.java index 1862517..c22eb75 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialCellDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialCellDescriptor.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.asterix.dataflow.data.nontagged.Coordinate; import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.APointSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutablePoint; import org.apache.asterix.om.base.AMutableRectangle; import org.apache.asterix.om.base.ARectangle; @@ -79,8 +79,8 @@ public class SpatialCellDescriptor extends AbstractScalarFunctionDynamicDescript private final AMutablePoint[] aPoint = { new AMutablePoint(0, 0), new AMutablePoint(0, 0) }; @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ARectangle> rectangleSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ARECTANGLE); + private final ISerializerDeserializer<ARectangle> rectangleSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ARECTANGLE); @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/SpatialIntersectDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialIntersectDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialIntersectDescriptor.java index e4704f2..6987ada 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialIntersectDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialIntersectDescriptor.java @@ -29,7 +29,7 @@ import org.apache.asterix.dataflow.data.nontagged.serde.AObjectSerializerDeseria import org.apache.asterix.dataflow.data.nontagged.serde.APointSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.APolygonSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ARectangleSerializerDeserializer; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; import org.apache.asterix.fuzzyjoin.IntArray; import org.apache.asterix.om.base.ABoolean; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -79,8 +79,8 @@ public class SpatialIntersectDescriptor extends AbstractScalarFunctionDynamicDes private final IPointable inputArg1 = new VoidPointable(); private final IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); private final IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); - private final IBinaryComparator ascDoubleComp = AqlBinaryComparatorFactoryProvider.DOUBLE_POINTABLE_INSTANCE - .createBinaryComparator(); + private final IBinaryComparator ascDoubleComp = + BinaryComparatorFactoryProvider.DOUBLE_POINTABLE_INSTANCE.createBinaryComparator(); private final SpatialUtils spatialUtils = new SpatialUtils(); private final IntArray pointsOffsets0 = new IntArray(); private final IntArray pointsOffsets1 = new IntArray(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringConcatDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringConcatDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringConcatDescriptor.java index 1936902..d9efd6b 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringConcatDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringConcatDescriptor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import java.io.IOException; 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.AMissing; import org.apache.asterix.om.base.ANull; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -72,9 +72,9 @@ public class StringConcatDescriptor extends AbstractScalarFunctionDynamicDescrip private final IPointable inputArgList = new VoidPointable(); private final IScalarEvaluator evalList = listEvalFactory.createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); - private ISerializerDeserializer<AMissing> missingSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AMissing> missingSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AMISSING); private final byte[] tempLengthArray = new byte[5]; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringJoinDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringJoinDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringJoinDescriptor.java index 9e69011..59d4535 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringJoinDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringJoinDescriptor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import java.io.IOException; 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.AMissing; import org.apache.asterix.om.base.ANull; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -74,9 +74,9 @@ public class StringJoinDescriptor extends AbstractScalarFunctionDynamicDescripto private final IScalarEvaluator evalList = listEvalFactory.createScalarEvaluator(ctx); private final IScalarEvaluator evalSep = sepEvalFactory.createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); - private ISerializerDeserializer<AMissing> missingSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AMissing> missingSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AMISSING); private final byte[] tempLengthArray = new byte[5]; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringLengthDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringLengthDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringLengthDescriptor.java index 5c73a26..f1c8318 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringLengthDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringLengthDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions; 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.runtime.exceptions.TypeMismatchException; @@ -66,7 +66,7 @@ public class StringLengthDescriptor extends AbstractScalarFunctionDynamicDescrip private IPointable inputArg = new VoidPointable(); private IScalarEvaluator eval = args[0].createScalarEvaluator(ctx); @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/StringToCodePointDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringToCodePointDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringToCodePointDescriptor.java index 1409b65..5f889a2 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringToCodePointDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringToCodePointDescriptor.java @@ -22,7 +22,7 @@ import java.io.DataOutput; 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.AInt64; import org.apache.asterix.om.base.AMutableInt64; import org.apache.asterix.runtime.exceptions.TypeMismatchException; @@ -74,7 +74,7 @@ public class StringToCodePointDescriptor extends AbstractScalarFunctionDynamicDe private ArrayBackedValueStorage inputVal = new ArrayBackedValueStorage(); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); private final 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/UUIDDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/UUIDDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/UUIDDescriptor.java index 2827288..d0d7db6 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/UUIDDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/UUIDDescriptor.java @@ -21,7 +21,7 @@ package org.apache.asterix.runtime.evaluators.functions; import java.io.DataOutput; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AGeneratedUUID; import org.apache.asterix.om.base.AUUID; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -57,7 +57,7 @@ public class UUIDDescriptor extends AbstractScalarFunctionDynamicDescriptor { private static final long serialVersionUID = 1L; @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AUUID> uuidSerDe = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AUUID> uuidSerDe = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AUUID); @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/AbstractFindBinaryEvaluator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/AbstractFindBinaryEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/AbstractFindBinaryEvaluator.java index f0b78bf..a1f097d 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/AbstractFindBinaryEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/AbstractFindBinaryEvaluator.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.types.ATypeTag; @@ -41,7 +41,7 @@ public abstract class AbstractFindBinaryEvaluator extends AbstractBinaryScalarEv protected final ByteArrayPointable wordPtr = new ByteArrayPointable(); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt64> intSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AInt64> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); public AbstractFindBinaryEvaluator(IHyracksTaskContext context, IScalarEvaluatorFactory[] copyEvaluatorFactories, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/BinaryConcatDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/BinaryConcatDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/BinaryConcatDescriptor.java index 1221dc9..b9ccd71 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/BinaryConcatDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/BinaryConcatDescriptor.java @@ -22,7 +22,7 @@ package org.apache.asterix.runtime.evaluators.functions.binary; import java.io.IOException; 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.AMissing; import org.apache.asterix.om.base.ANull; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -72,10 +72,10 @@ public class BinaryConcatDescriptor extends AbstractScalarFunctionDynamicDescrip private final AsterixListAccessor listAccessor = new AsterixListAccessor(); private final byte[] metaBuffer = new byte[5]; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AMissing> missingSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AMissing> missingSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AMISSING); @Override
