ASTERIXDB-1711: remove some more Aql-prefixes Change-Id: I041341fe76e9338b7c568a9eacaf826f8fa0ed46 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1360 Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/8a742fd1 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/8a742fd1 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/8a742fd1 Branch: refs/heads/master Commit: 8a742fd19d60e4acc3d2b4d037b7de3c1d27db78 Parents: df268b1 Author: Till Westmann <[email protected]> Authored: Mon Nov 28 20:49:09 2016 -0800 Committer: Till Westmann <[email protected]> Committed: Tue Nov 29 14:43:38 2016 -0800 ---------------------------------------------------------------------- .../optimizer/rules/ConstantFoldingRule.java | 24 +- .../rules/am/InvertedIndexAccessMethod.java | 6 +- .../external/ExternalIndexingOperations.java | 12 +- .../asterix/app/translator/QueryTranslator.java | 4 +- .../file/SecondaryIndexOperationsHelper.java | 28 +-- .../file/SecondaryRTreeOperationsHelper.java | 16 +- .../app/bootstrap/TestNodeController.java | 24 +- .../asterix/external/api/IDataParser.java | 4 +- .../indexing/ExternalFileIndexAccessor.java | 4 +- .../indexing/FileIndexTupleTranslator.java | 8 +- .../external/indexing/FileOffsetIndexer.java | 6 +- .../indexing/FilesIndexDescription.java | 20 +- .../external/indexing/IndexingConstants.java | 24 +- .../indexing/RecordColumnarIndexer.java | 6 +- .../input/record/RecordWithMetadataAndPK.java | 12 +- .../external/library/ExternalFunction.java | 4 +- .../external/library/ResultCollector.java | 4 +- .../external/parser/AbstractDataParser.java | 52 ++--- .../parser/RecordWithMetadataParser.java | 4 +- .../external/classad/test/ClassAdToADMTest.java | 8 +- .../parser/test/RecordWithMetaTest.java | 16 +- .../asterix/lang/aql/util/RangeMapBuilder.java | 16 +- .../lang/common/util/LangRecordParseUtil.java | 12 +- .../apache/asterix/metadata/MetadataNode.java | 20 +- .../metadata/bootstrap/MetadataIndex.java | 20 +- .../metadata/declared/FeedDataSource.java | 6 +- .../metadata/declared/MetadataProvider.java | 34 +-- .../entities/ExternalDatasetDetails.java | 8 +- .../entities/InternalDatasetDetails.java | 10 +- .../AbstractTupleTranslator.java | 8 +- .../CompactionPolicyTupleTranslator.java | 4 +- .../DatasetTupleTranslator.java | 8 +- .../DatasourceAdapterTupleTranslator.java | 4 +- .../DatatypeTupleTranslator.java | 4 +- .../DataverseTupleTranslator.java | 6 +- .../ExternalFileTupleTranslator.java | 10 +- .../FeedPolicyTupleTranslator.java | 8 +- .../FeedTupleTranslator.java | 8 +- .../FunctionTupleTranslator.java | 4 +- .../IndexTupleTranslator.java | 8 +- .../LibraryTupleTranslator.java | 4 +- .../NodeGroupTupleTranslator.java | 4 +- .../NodeTupleTranslator.java | 4 +- .../metadata/feeds/FeedMetadataUtil.java | 12 +- .../asterix/metadata/utils/DatasetUtils.java | 16 +- .../adm/AOptionalFieldPrinterFactory.java | 6 +- .../printers/adm/AUnionPrinterFactory.java | 4 +- .../csv/AOptionalFieldPrinterFactory.java | 6 +- .../printers/csv/AUnionPrinterFactory.java | 4 +- .../clean/AOptionalFieldPrinterFactory.java | 6 +- .../json/clean/AUnionPrinterFactory.java | 4 +- .../lossless/AOptionalFieldPrinterFactory.java | 6 +- .../json/lossless/AUnionPrinterFactory.java | 4 +- .../AOrderedListSerializerDeserializer.java | 10 +- .../serde/ARecordSerializerDeserializer.java | 20 +- .../AUnorderedListSerializerDeserializer.java | 10 +- .../nontagged/ADMPrinterFactoryProvider.java | 153 +++++++++++++ .../nontagged/AqlADMPrinterFactoryProvider.java | 153 ------------- .../AqlBinaryBooleanInspectorImpl.java | 57 ----- .../AqlBinaryComparatorFactoryProvider.java | 219 ------------------ .../AqlBinaryHashFunctionFactoryProvider.java | 67 ------ .../AqlBinaryHashFunctionFamilyProvider.java | 48 ---- .../nontagged/AqlBinaryIntegerInspector.java | 45 ---- .../AqlBinaryTokenizerFactoryProvider.java | 85 ------- .../nontagged/AqlCSVPrinterFactoryProvider.java | 148 ------------- .../AqlCleanJSONPrinterFactoryProvider.java | 152 ------------- .../AqlLinearizeComparatorFactoryProvider.java | 103 --------- .../AqlLosslessJSONPrinterFactoryProvider.java | 152 ------------- ...AqlNormalizedKeyComputerFactoryProvider.java | 89 -------- .../AqlPredicateEvaluatorFactoryProvider.java | 83 ------- .../AqlSerializerDeserializerProvider.java | 202 ----------------- .../formats/nontagged/AqlTypeTraitProvider.java | 106 --------- .../nontagged/BinaryBooleanInspector.java | 57 +++++ .../BinaryComparatorFactoryProvider.java | 220 +++++++++++++++++++ .../BinaryHashFunctionFactoryProvider.java | 67 ++++++ .../BinaryHashFunctionFamilyProvider.java | 48 ++++ .../nontagged/BinaryIntegerInspector.java | 45 ++++ .../BinaryTokenizerFactoryProvider.java | 85 +++++++ .../nontagged/CSVPrinterFactoryProvider.java | 148 +++++++++++++ .../CleanJSONPrinterFactoryProvider.java | 152 +++++++++++++ .../LinearizeComparatorFactoryProvider.java | 103 +++++++++ .../LosslessJSONPrinterFactoryProvider.java | 152 +++++++++++++ .../NormalizedKeyComputerFactoryProvider.java | 89 ++++++++ .../PredicateEvaluatorFactoryProvider.java | 83 +++++++ .../SerializerDeserializerProvider.java | 202 +++++++++++++++++ .../formats/nontagged/TypeTraitProvider.java | 106 +++++++++ .../asterix/om/util/NonTaggedFormatUtil.java | 14 +- ...bstractSerializableAvgAggregateFunction.java | 8 +- ...tractSerializableCountAggregateFunction.java | 6 +- ...bstractSerializableSumAggregateFunction.java | 16 +- .../SerializableSqlSumAggregateFunction.java | 4 +- .../std/SerializableSumAggregateFunction.java | 4 +- .../std/AbstractAvgAggregateFunction.java | 8 +- .../std/AbstractCountAggregateFunction.java | 4 +- .../std/AbstractMinMaxAggregateFunction.java | 6 +- .../std/AbstractSumAggregateFunction.java | 16 +- .../aggregates/std/SqlSumAggregateFunction.java | 4 +- .../aggregates/std/SumAggregateFunction.java | 4 +- .../stream/EmptyStreamAggregateDescriptor.java | 4 +- .../NonEmptyStreamAggregateDescriptor.java | 4 +- .../accessors/CircleCenterAccessor.java | 4 +- .../accessors/CircleRadiusAccessor.java | 4 +- .../accessors/LineRectanglePolygonAccessor.java | 4 +- .../accessors/PointXCoordinateAccessor.java | 4 +- .../accessors/PointYCoordinateAccessor.java | 4 +- .../accessors/TemporalDayAccessor.java | 4 +- .../accessors/TemporalHourAccessor.java | 4 +- .../accessors/TemporalIntervalEndAccessor.java | 10 +- .../TemporalIntervalEndDateAccessor.java | 4 +- .../TemporalIntervalEndDatetimeAccessor.java | 6 +- .../TemporalIntervalEndTimeAccessor.java | 4 +- .../TemporalIntervalStartAccessor.java | 10 +- .../TemporalIntervalStartDateAccessor.java | 4 +- .../TemporalIntervalStartDatetimeAccessor.java | 6 +- .../TemporalIntervalStartTimeAccessor.java | 4 +- .../accessors/TemporalMillisecondAccessor.java | 4 +- .../accessors/TemporalMinuteAccessor.java | 4 +- .../accessors/TemporalMonthAccessor.java | 4 +- .../accessors/TemporalSecondAccessor.java | 4 +- .../accessors/TemporalYearAccessor.java | 4 +- .../common/AbstractAsterixListIterator.java | 20 +- .../common/EditDistanceCheckEvaluator.java | 4 +- .../common/EditDistanceEvaluator.java | 4 +- .../common/SimilarityJaccardCheckEvaluator.java | 4 +- .../common/SimilarityJaccardEvaluator.java | 4 +- .../SimilarityJaccardPrefixEvaluator.java | 4 +- .../AbstractComparisonEvaluator.java | 6 +- .../comparisons/ComparisonHelper.java | 4 +- .../ABooleanConstructorDescriptor.java | 10 +- .../ACircleConstructorDescriptor.java | 4 +- .../ADateConstructorDescriptor.java | 4 +- .../ADateTimeConstructorDescriptor.java | 4 +- .../ADayTimeDurationConstructorDescriptor.java | 7 +- .../ADoubleConstructorDescriptor.java | 10 +- .../ADurationConstructorDescriptor.java | 4 +- .../AFloatConstructorDescriptor.java | 8 +- .../AInt16ConstructorDescriptor.java | 4 +- .../AInt32ConstructorDescriptor.java | 4 +- .../AInt64ConstructorDescriptor.java | 4 +- .../AInt8ConstructorDescriptor.java | 4 +- .../AIntervalConstructorDescriptor.java | 4 +- ...ervalStartFromDateConstructorDescriptor.java | 4 +- ...lStartFromDateTimeConstructorDescriptor.java | 4 +- ...ervalStartFromTimeConstructorDescriptor.java | 4 +- .../ALineConstructorDescriptor.java | 4 +- .../ANullConstructorDescriptor.java | 10 +- .../APoint3DConstructorDescriptor.java | 4 +- .../APointConstructorDescriptor.java | 4 +- .../ARectangleConstructorDescriptor.java | 6 +- .../ATimeConstructorDescriptor.java | 4 +- .../AUUIDFromStringConstructorDescriptor.java | 4 +- ...AYearMonthDurationConstructorDescriptor.java | 7 +- .../functions/AbstractBinaryStringBoolEval.java | 4 +- .../functions/AbstractBinaryStringIntEval.java | 4 +- .../AbstractNumericArithmeticEval.java | 32 +-- .../functions/AbstractQuadStringStringEval.java | 4 +- .../functions/AbstractTripleStringBoolEval.java | 4 +- .../functions/AbstractTripleStringIntEval.java | 4 +- .../AbstractTripleStringStringEval.java | 4 +- .../AbstractUnaryNumericFunctionEval.java | 14 +- .../evaluators/functions/AndDescriptor.java | 8 +- .../functions/CreateCircleDescriptor.java | 4 +- .../functions/CreateLineDescriptor.java | 4 +- .../functions/CreatePointDescriptor.java | 4 +- .../functions/CreatePolygonDescriptor.java | 6 +- .../functions/CreateRectangleDescriptor.java | 6 +- .../functions/CreateUUIDDescriptor.java | 4 +- .../functions/DeepEqualityDescriptor.java | 4 +- .../EditDistanceListIsFilterableDescriptor.java | 4 +- ...EditDistanceStringIsFilterableEvaluator.java | 4 +- .../evaluators/functions/LenDescriptor.java | 4 +- .../evaluators/functions/NotDescriptor.java | 4 +- .../functions/NumericATan2Descriptor.java | 4 +- .../functions/NumericRoundDescriptor.java | 14 +- .../NumericRoundHalfToEven2Descriptor.java | 14 +- .../NumericRoundHalfToEvenDescriptor.java | 14 +- .../functions/NumericSubtractDescriptor.java | 14 +- .../functions/NumericTruncDescriptor.java | 14 +- .../evaluators/functions/OrDescriptor.java | 8 +- .../functions/PrefixLenDescriptor.java | 4 +- .../functions/PrefixLenJaccardDescriptor.java | 4 +- .../functions/SimilarityDescriptor.java | 4 +- .../SimilarityJaccardPrefixCheckDescriptor.java | 6 +- .../functions/SpatialCellDescriptor.java | 6 +- .../functions/SpatialIntersectDescriptor.java | 6 +- .../functions/StringConcatDescriptor.java | 6 +- .../functions/StringJoinDescriptor.java | 6 +- .../functions/StringLengthDescriptor.java | 4 +- .../functions/StringToCodePointDescriptor.java | 4 +- .../evaluators/functions/UUIDDescriptor.java | 4 +- .../binary/AbstractFindBinaryEvaluator.java | 4 +- .../binary/BinaryConcatDescriptor.java | 6 +- .../binary/BinaryLengthDescriptor.java | 4 +- .../functions/binary/ParseBinaryDescriptor.java | 4 +- .../records/FieldAccessNestedEvalFactory.java | 8 +- .../functions/records/RecordFieldsUtil.java | 6 +- .../AbstractIntervalLogicFuncDescriptor.java | 4 +- .../CalendarDuartionFromDateDescriptor.java | 4 +- .../CalendarDurationFromDateTimeDescriptor.java | 4 +- .../temporal/CurrentDateDescriptor.java | 4 +- .../temporal/CurrentDateTimeDescriptor.java | 4 +- .../temporal/CurrentTimeDescriptor.java | 4 +- .../temporal/DateFromDatetimeDescriptor.java | 4 +- .../DateFromUnixTimeInDaysDescriptor.java | 4 +- .../DatetimeFromDateAndTimeDescriptor.java | 4 +- .../DatetimeFromUnixTimeInMsDescriptor.java | 4 +- .../DatetimeFromUnixTimeInSecsDescriptor.java | 4 +- .../functions/temporal/DayOfWeekDescriptor.java | 4 +- .../DayTimeDurationComparatorDescriptor.java | 4 +- .../temporal/DurationEqualDescriptor.java | 4 +- .../DurationFromIntervalDescriptor.java | 7 +- .../DurationFromMillisecondsDescriptor.java | 4 +- .../temporal/DurationFromMonthsDescriptor.java | 4 +- .../temporal/GetDayTimeDurationDescriptor.java | 7 +- .../GetOverlappingIntervalDescriptor.java | 8 +- .../GetYearMonthDurationDescriptor.java | 7 +- .../temporal/IntervalBinDescriptor.java | 6 +- ...llisecondsFromDayTimeDurationDescriptor.java | 4 +- .../MonthsFromYearMonthDurationDescriptor.java | 4 +- .../temporal/OverlapBinsDescriptor.java | 6 +- .../functions/temporal/ParseDateDescriptor.java | 4 +- .../temporal/ParseDateTimeDescriptor.java | 4 +- .../functions/temporal/ParseTimeDescriptor.java | 4 +- .../temporal/TimeFromDatetimeDescriptor.java | 4 +- .../TimeFromUnixTimeInMsDescriptor.java | 4 +- .../UnixTimeFromDateInDaysDescriptor.java | 4 +- .../UnixTimeFromDatetimeInMsDescriptor.java | 4 +- .../UnixTimeFromDatetimeInSecsDescriptor.java | 4 +- .../UnixTimeFromTimeInMsDescriptor.java | 4 +- .../YearMonthDurationComparatorDescriptor.java | 4 +- .../runtime/formats/NonTaggedDataFormat.java | 68 +++--- .../std/TidRunningAggregateDescriptor.java | 4 +- .../unnestingfunctions/std/RangeDescriptor.java | 4 +- 233 files changed, 2463 insertions(+), 2457 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java index 8a65ae5..a49f0e8 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java @@ -26,14 +26,14 @@ import java.util.List; import org.apache.asterix.common.config.GlobalConfig; import org.apache.asterix.dataflow.data.common.ExpressionTypeComputer; import org.apache.asterix.dataflow.data.nontagged.AqlMissingWriterFactory; -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.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.SerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.jobgen.QueryLogicalExpressionJobGen; import org.apache.asterix.om.base.IAObject; import org.apache.asterix.om.constants.AsterixConstantValue; @@ -122,10 +122,10 @@ public class ConstantFoldingRule implements IAlgebraicRewriteRule { }; private static final JobGenContext _jobGenCtx = new JobGenContext(null, null, null, - AqlSerializerDeserializerProvider.INSTANCE, AqlBinaryHashFunctionFactoryProvider.INSTANCE, - AqlBinaryHashFunctionFamilyProvider.INSTANCE, AqlBinaryComparatorFactoryProvider.INSTANCE, - AqlTypeTraitProvider.INSTANCE, AqlBinaryBooleanInspectorImpl.FACTORY, AqlBinaryIntegerInspector.FACTORY, - AqlADMPrinterFactoryProvider.INSTANCE, AqlMissingWriterFactory.INSTANCE, null, + SerializerDeserializerProvider.INSTANCE, BinaryHashFunctionFactoryProvider.INSTANCE, + BinaryHashFunctionFamilyProvider.INSTANCE, BinaryComparatorFactoryProvider.INSTANCE, + TypeTraitProvider.INSTANCE, BinaryBooleanInspector.FACTORY, BinaryIntegerInspector.FACTORY, + ADMPrinterFactoryProvider.INSTANCE, AqlMissingWriterFactory.INSTANCE, null, new LogicalExpressionJobGenToExpressionRuntimeProviderAdapter(QueryLogicalExpressionJobGen.INSTANCE), ExpressionTypeComputer.INSTANCE, null, null, null, null, GlobalConfig.DEFAULT_FRAME_SIZE, null); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java index 066757d..78e308f 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java @@ -29,7 +29,7 @@ import org.apache.asterix.common.annotations.SkipSecondaryIndexSearchExpressionA import org.apache.asterix.common.config.DatasetConfig.IndexType; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.dataflow.data.common.ExpressionTypeComputer; -import org.apache.asterix.formats.nontagged.AqlBinaryTokenizerFactoryProvider; +import org.apache.asterix.formats.nontagged.BinaryTokenizerFactoryProvider; import org.apache.asterix.lang.common.util.FunctionUtil; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.entities.Index; @@ -1131,14 +1131,14 @@ public class InvertedIndexAccessMethod implements IAccessMethod { switch (index.getIndexType()) { case SINGLE_PARTITION_WORD_INVIX: case LENGTH_PARTITIONED_WORD_INVIX: { - return AqlBinaryTokenizerFactoryProvider.INSTANCE.getWordTokenizerFactory(searchKeyType, false); + return BinaryTokenizerFactoryProvider.INSTANCE.getWordTokenizerFactory(searchKeyType, false); } case SINGLE_PARTITION_NGRAM_INVIX: case LENGTH_PARTITIONED_NGRAM_INVIX: { // Make sure not to use pre- and postfixing for conjunctive searches. boolean prePost = (searchModifierType == SearchModifierType.CONJUNCTIVE || searchModifierType == SearchModifierType.CONJUNCTIVE_EDIT_DISTANCE) ? false : true; - return AqlBinaryTokenizerFactoryProvider.INSTANCE.getNGramTokenizerFactory(searchKeyType, + return BinaryTokenizerFactoryProvider.INSTANCE.getNGramTokenizerFactory(searchKeyType, index.getGramLength(), prePost, false); } default: { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java index 3e9c34f..7f0f0d0 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java @@ -53,9 +53,9 @@ import org.apache.asterix.external.provider.AdapterFactoryProvider; import org.apache.asterix.external.util.ExternalDataConstants; import org.apache.asterix.file.IndexOperations; import org.apache.asterix.file.JobSpecificationUtils; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; -import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.declared.MetadataProvider; @@ -589,13 +589,13 @@ public class ExternalIndexingOperations { keyType = nestedKeyType.getTypeTag(); for (int i = 0; i < numNestedSecondaryKeyFields; i++) { - ISerializerDeserializer keySerde = AqlSerializerDeserializerProvider.INSTANCE + ISerializerDeserializer keySerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(nestedKeyType); secondaryRecFields[i] = keySerde; - secondaryComparatorFactories[i] = AqlBinaryComparatorFactoryProvider.INSTANCE + secondaryComparatorFactories[i] = BinaryComparatorFactoryProvider.INSTANCE .getBinaryComparatorFactory(nestedKeyType, true); - secondaryTypeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(nestedKeyType); + secondaryTypeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(nestedKeyType); valueProviderFactories[i] = AqlPrimitiveValueProviderFactory.INSTANCE; } // Add serializers and comparators for primary index fields. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java index 7bf5195..cf6e49d 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java @@ -84,7 +84,7 @@ import org.apache.asterix.external.util.FeedUtils.FeedRuntimeType; import org.apache.asterix.file.DatasetOperations; import org.apache.asterix.file.DataverseOperations; import org.apache.asterix.file.IndexOperations; -import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.lang.aql.statement.SubscribeFeedStatement; import org.apache.asterix.lang.common.base.IRewriterFactory; import org.apache.asterix.lang.common.base.IStatementRewriter; @@ -895,7 +895,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen List<List<String>> partitioningKeys = DatasetUtils.getPartitioningKeys(ds); for (List<String> partitioningKey : partitioningKeys) { IAType keyType = aRecordType.getSubFieldType(partitioningKey); - ITypeTraits typeTrait = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); + ITypeTraits typeTrait = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); // If it is not a fixed length if (typeTrait.getFixedLength() < 0) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryIndexOperationsHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryIndexOperationsHelper.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryIndexOperationsHelper.java index fe8358f..7decdf7 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryIndexOperationsHelper.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryIndexOperationsHelper.java @@ -42,10 +42,10 @@ import org.apache.asterix.external.indexing.ExternalFile; import org.apache.asterix.external.indexing.IndexingConstants; import org.apache.asterix.external.operators.ExternalDataScanOperatorDescriptor; import org.apache.asterix.external.operators.ExternalIndexBulkModifyOperatorDescriptor; -import org.apache.asterix.formats.nontagged.AqlBinaryBooleanInspectorImpl; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; -import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; +import org.apache.asterix.formats.nontagged.BinaryBooleanInspector; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.entities.InternalDatasetDetails; @@ -211,9 +211,9 @@ public abstract class SecondaryIndexOperationsHelper { this.metaType = metaType; this.keySourceIndicators = keySourceIndicators; enforcedItemType = enforcedType; - payloadSerde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType); + payloadSerde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType); metaSerde = metaType == null ? null - : AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(metaType); + : SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(metaType); numSecondaryKeys = secondaryKeyFields.size(); Pair<IFileSplitProvider, AlgebricksPartitionConstraint> secondarySplitsAndConstraint = metadataProvider .splitProviderAndPartitionConstraintsForDataset(dataverseName, datasetName, secondaryIndexName, temp); @@ -265,8 +265,8 @@ public abstract class SecondaryIndexOperationsHelper { } IAType type = itemType.getSubFieldType(filterFieldName); - filterCmpFactories[0] = AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(type, true); - filterTypeTraits[0] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(type); + filterCmpFactories[0] = BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(type, true); + filterTypeTraits[0] = TypeTraitProvider.INSTANCE.getTypeTrait(type); secondaryFilterFields[0] = getNumSecondaryKeys() + numPrimaryKeys; primaryFilterFields[0] = numPrimaryKeys + 1; } @@ -292,15 +292,15 @@ public abstract class SecondaryIndexOperationsHelper { : metaType.getSubFieldType(partitioningKeys.get(i)); primaryRecFields[i] = serdeProvider.getSerializerDeserializer(keyType); primaryComparatorFactories[i] = - AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, true); - primaryTypeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); + BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, true); + primaryTypeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); primaryBloomFilterKeyFields[i] = i; } primaryRecFields[numPrimaryKeys] = payloadSerde; - primaryTypeTraits[numPrimaryKeys] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(itemType); + primaryTypeTraits[numPrimaryKeys] = TypeTraitProvider.INSTANCE.getTypeTrait(itemType); if (dataset.hasMetaPart()) { primaryRecFields[numPrimaryKeys + 1] = payloadSerde; - primaryTypeTraits[numPrimaryKeys + 1] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(itemType); + primaryTypeTraits[numPrimaryKeys + 1] = TypeTraitProvider.INSTANCE.getTypeTrait(itemType); } primaryRecDesc = new RecordDescriptor(primaryRecFields, primaryTypeTraits); } @@ -478,7 +478,7 @@ public abstract class SecondaryIndexOperationsHelper { selectCond = andArgsEvalFactories[0]; } StreamSelectRuntimeFactory select = new StreamSelectRuntimeFactory(selectCond, null, - AqlBinaryBooleanInspectorImpl.FACTORY, false, -1, null); + BinaryBooleanInspector.FACTORY, false, -1, null); AlgebricksMetaOperatorDescriptor asterixSelectOp = new AlgebricksMetaOperatorDescriptor(spec, 1, 1, new IPushRuntimeFactory[] { select }, new RecordDescriptor[] { secondaryRecDesc }); AlgebricksPartitionConstraintHelper.setPartitionConstraintInJobSpec(spec, asterixSelectOp, @@ -494,7 +494,7 @@ public abstract class SecondaryIndexOperationsHelper { ITypeTraits[] typeTraits = new ITypeTraits[1 + numPrimaryKeys]; // payload serde and type traits for the record slot serdes[0] = payloadSerde; - typeTraits[0] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(itemType); + typeTraits[0] = TypeTraitProvider.INSTANCE.getTypeTrait(itemType); // serdes and type traits for rid fields for (int i = 1; i < serdes.length; i++) { serdes[i] = IndexingConstants.getSerializerDeserializer(i - 1); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java index 8a9549b..53c48f1 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java @@ -33,9 +33,9 @@ import org.apache.asterix.common.transactions.IResourceFactory; import org.apache.asterix.dataflow.data.nontagged.valueproviders.AqlPrimitiveValueProviderFactory; import org.apache.asterix.external.indexing.IndexingConstants; import org.apache.asterix.external.operators.ExternalDataScanOperatorDescriptor; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; -import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Index; import org.apache.asterix.metadata.utils.ExternalDatasetsRegistry; @@ -206,11 +206,11 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp keyType = nestedKeyType.getTypeTag(); for (int i = 0; i < numNestedSecondaryKeyFields; i++) { ISerializerDeserializer keySerde = - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(nestedKeyType); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(nestedKeyType); secondaryRecFields[i] = keySerde; secondaryComparatorFactories[i] = - AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(nestedKeyType, true); - secondaryTypeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(nestedKeyType); + BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(nestedKeyType, true); + secondaryTypeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(nestedKeyType); valueProviderFactories[i] = AqlPrimitiveValueProviderFactory.INSTANCE; } @@ -231,7 +231,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp } } enforcedRecFields[numPrimaryKeys] = - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType); enforcedRecDesc = new RecordDescriptor(enforcedRecFields, enforcedTypeTraits); if (numFilterFields > 0) { rtreeFields = new int[numNestedSecondaryKeyFields + numPrimaryKeys]; @@ -241,7 +241,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp Pair<IAType, Boolean> typePair = Index.getNonNullableKeyFieldType(filterFieldName, itemType); IAType type = typePair.first; - ISerializerDeserializer serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(type); + ISerializerDeserializer serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(type); secondaryRecFields[numPrimaryKeys + numNestedSecondaryKeyFields] = serde; } secondaryRecDesc = new RecordDescriptor(secondaryRecFields); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java index e2c6a04..0901463 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java @@ -35,9 +35,9 @@ import org.apache.asterix.common.ioopcallbacks.LSMBTreeIOOperationCallbackFactor import org.apache.asterix.common.transactions.IRecoveryManager.ResourceType; import org.apache.asterix.common.transactions.IResourceFactory; import org.apache.asterix.common.transactions.ITransactionManager; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; -import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.utils.DatasetUtils; import org.apache.asterix.om.types.ARecordType; @@ -328,7 +328,7 @@ public class TestNodeController { private IBinaryComparatorFactory[] createPrimaryIndexComparatorFactories(IAType[] primaryKeyTypes) { IBinaryComparatorFactory[] primaryIndexComparatorFactories = new IBinaryComparatorFactory[primaryKeyTypes.length]; for (int j = 0; j < primaryKeyTypes.length; ++j) { - primaryIndexComparatorFactories[j] = AqlBinaryComparatorFactoryProvider.INSTANCE + primaryIndexComparatorFactories[j] = BinaryComparatorFactoryProvider.INSTANCE .getBinaryComparatorFactory(primaryKeyTypes[j], true); } return primaryIndexComparatorFactories; @@ -339,12 +339,12 @@ public class TestNodeController { int i = 0; ISerializerDeserializer<?>[] primaryIndexSerdes = new ISerializerDeserializer<?>[primaryIndexNumOfTupleFields]; for (; i < primaryKeyTypes.length; i++) { - primaryIndexSerdes[i] = AqlSerializerDeserializerProvider.INSTANCE + primaryIndexSerdes[i] = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(primaryKeyTypes[i]); } - primaryIndexSerdes[i++] = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(recordType); + primaryIndexSerdes[i++] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(recordType); if (metaType != null) { - primaryIndexSerdes[i] = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(metaType); + primaryIndexSerdes[i] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(metaType); } return primaryIndexSerdes; } @@ -354,11 +354,11 @@ public class TestNodeController { ITypeTraits[] primaryIndexTypeTraits = new ITypeTraits[primaryIndexNumOfTupleFields]; int i = 0; for (; i < primaryKeyTypes.length; i++) { - primaryIndexTypeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(primaryKeyTypes[i]); + primaryIndexTypeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(primaryKeyTypes[i]); } - primaryIndexTypeTraits[i++] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(recordType); + primaryIndexTypeTraits[i++] = TypeTraitProvider.INSTANCE.getTypeTrait(recordType); if (metaType != null) { - primaryIndexTypeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(metaType); + primaryIndexTypeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(metaType); } return primaryIndexTypeTraits; } @@ -462,8 +462,8 @@ public class TestNodeController { ITypeTraits[] primaryKeyTypeTraits = new ITypeTraits[primaryKeyTypes.length]; ISerializerDeserializer<?>[] primaryKeySerdes = new ISerializerDeserializer<?>[primaryKeyTypes.length]; for (int i = 0; i < primaryKeyTypes.length; i++) { - primaryKeyTypeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(primaryKeyTypes[i]); - primaryKeySerdes[i] = AqlSerializerDeserializerProvider.INSTANCE + primaryKeyTypeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(primaryKeyTypes[i]); + primaryKeySerdes[i] = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(primaryKeyTypes[i]); } RecordDescriptor searcgRecDesc = new RecordDescriptor(primaryKeySerdes, primaryKeyTypeTraits); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParser.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParser.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParser.java index 322e51f..7b936a9 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParser.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParser.java @@ -24,7 +24,7 @@ import org.apache.asterix.builders.IARecordBuilder; import org.apache.asterix.builders.OrderedListBuilder; import org.apache.asterix.builders.RecordBuilder; import org.apache.asterix.builders.UnorderedListBuilder; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMutableOrderedList; import org.apache.asterix.om.base.AMutableRecord; import org.apache.asterix.om.base.AMutableUnorderedList; @@ -99,7 +99,7 @@ public interface IDataParser { } default: - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(obj.getType()).serialize(obj, + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(obj.getType()).serialize(obj, dataOutput); break; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java index 42e11b1..71de1b1 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/ExternalFileIndexAccessor.java @@ -25,7 +25,7 @@ import java.io.Serializable; import java.util.Date; import org.apache.asterix.external.operators.ExternalLookupOperatorDescriptor; -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.AInt64; import org.apache.asterix.om.base.AMutableInt32; @@ -65,7 +65,7 @@ public class ExternalFileIndexAccessor implements Serializable { private ArrayTupleReference searchKey; private MultiComparator searchCmp; private AMutableInt32 currentFileNumber = new AMutableInt32(-1); - private ISerializerDeserializer intSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); private RangePredicate searchPredicate; private ILSMIndexAccessorInternal fileIndexAccessor; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FileIndexTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FileIndexTupleTranslator.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FileIndexTupleTranslator.java index fa22179..18e5a79 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FileIndexTupleTranslator.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FileIndexTupleTranslator.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.asterix.builders.RecordBuilder; 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.AMutableDateTime; import org.apache.asterix.om.base.AMutableInt32; import org.apache.asterix.om.base.AMutableInt64; @@ -46,11 +46,11 @@ public class FileIndexTupleTranslator { private AMutableInt64 aInt64 = new AMutableInt64(0); private AMutableString aString = new AMutableString(null); private AMutableDateTime aDateTime = new AMutableDateTime(0); - private ISerializerDeserializer<IAObject> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<IAObject> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); - private ISerializerDeserializer<IAObject> dateTimeSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<IAObject> dateTimeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); - private ISerializerDeserializer<IAObject> longSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<IAObject> longSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); private ArrayTupleReference tuple = new ArrayTupleReference(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FileOffsetIndexer.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FileOffsetIndexer.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FileOffsetIndexer.java index d7a20e1..a15ec6e 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FileOffsetIndexer.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FileOffsetIndexer.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.asterix.external.api.IExternalIndexer; import org.apache.asterix.external.api.IIndexingDatasource; -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.base.AMutableInt64; import org.apache.asterix.om.base.IAObject; @@ -42,10 +42,10 @@ public class FileOffsetIndexer implements IExternalIndexer { protected RecordReader<?, ? extends Writable> recordReader; @SuppressWarnings("unchecked") - private ISerializerDeserializer<IAObject> intSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<IAObject> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); @SuppressWarnings("unchecked") - private ISerializerDeserializer<IAObject> longSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<IAObject> longSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FilesIndexDescription.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FilesIndexDescription.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FilesIndexDescription.java index 3872302..3ac8da8 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FilesIndexDescription.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/FilesIndexDescription.java @@ -21,9 +21,9 @@ package org.apache.asterix.external.indexing; import java.io.IOException; import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; -import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.om.base.AMutableInt32; import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.om.types.BuiltinType; @@ -59,25 +59,25 @@ public class FilesIndexDescription { public final ISerializerDeserializer[] EXTERNAL_FILE_BUDDY_BTREE_FIELDS = new ISerializerDeserializer[1]; public final ISerializerDeserializer[] EXTERNAL_FILE_TUPLE_FIELDS = new ISerializerDeserializer[FILE_INDEX_TUPLE_SIZE]; public final IBinaryComparatorFactory[] FILES_INDEX_COMP_FACTORIES = new IBinaryComparatorFactory[] { - AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(BuiltinType.AINT32, true) }; + BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(BuiltinType.AINT32, true) }; public FilesIndexDescription() { ARecordType type = new ARecordType("ExternalFileRecordType", payloadFieldNames, payloadFieldTypes, true); EXTERNAL_FILE_RECORD_TYPE = type; - EXTERNAL_FILE_INDEX_TYPE_TRAITS[FILE_KEY_INDEX] = AqlTypeTraitProvider.INSTANCE + EXTERNAL_FILE_INDEX_TYPE_TRAITS[FILE_KEY_INDEX] = TypeTraitProvider.INSTANCE .getTypeTrait(IndexingConstants.FILE_NUMBER_FIELD_TYPE); - EXTERNAL_FILE_INDEX_TYPE_TRAITS[FILE_PAYLOAD_INDEX] = AqlTypeTraitProvider.INSTANCE + EXTERNAL_FILE_INDEX_TYPE_TRAITS[FILE_PAYLOAD_INDEX] = TypeTraitProvider.INSTANCE .getTypeTrait(EXTERNAL_FILE_RECORD_TYPE); - EXTERNAL_FILE_BUDDY_BTREE_TYPE_TRAITS[FILE_KEY_INDEX] = AqlTypeTraitProvider.INSTANCE + EXTERNAL_FILE_BUDDY_BTREE_TYPE_TRAITS[FILE_KEY_INDEX] = TypeTraitProvider.INSTANCE .getTypeTrait(IndexingConstants.FILE_NUMBER_FIELD_TYPE); - EXTERNAL_FILE_RECORD_SERDE = AqlSerializerDeserializerProvider.INSTANCE + EXTERNAL_FILE_RECORD_SERDE = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(EXTERNAL_FILE_RECORD_TYPE); - EXTERNAL_FILE_TUPLE_FIELDS[FILE_KEY_INDEX] = AqlSerializerDeserializerProvider.INSTANCE + EXTERNAL_FILE_TUPLE_FIELDS[FILE_KEY_INDEX] = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(IndexingConstants.FILE_NUMBER_FIELD_TYPE); EXTERNAL_FILE_TUPLE_FIELDS[FILE_PAYLOAD_INDEX] = EXTERNAL_FILE_RECORD_SERDE; - EXTERNAL_FILE_BUDDY_BTREE_FIELDS[FILE_KEY_INDEX] = AqlSerializerDeserializerProvider.INSTANCE + EXTERNAL_FILE_BUDDY_BTREE_FIELDS[FILE_KEY_INDEX] = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(IndexingConstants.FILE_NUMBER_FIELD_TYPE); FILE_INDEX_RECORD_DESCRIPTOR = new RecordDescriptor(EXTERNAL_FILE_TUPLE_FIELDS, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/IndexingConstants.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/IndexingConstants.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/IndexingConstants.java index 249bd12..f315950 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/IndexingConstants.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/IndexingConstants.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; -import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.om.types.BuiltinType; import org.apache.asterix.om.types.IAType; import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; @@ -49,11 +49,11 @@ public class IndexingConstants { public static final IAType ROW_NUMBER_FIELD_TYPE = BuiltinType.AINT32; //Comparator Factories - private static final IBinaryComparatorFactory fileNumberCompFactory = AqlBinaryComparatorFactoryProvider.INSTANCE + private static final IBinaryComparatorFactory fileNumberCompFactory = BinaryComparatorFactoryProvider.INSTANCE .getBinaryComparatorFactory(BuiltinType.AINT32, true); - private static final IBinaryComparatorFactory recordOffsetCompFactory = AqlBinaryComparatorFactoryProvider.INSTANCE + private static final IBinaryComparatorFactory recordOffsetCompFactory = BinaryComparatorFactoryProvider.INSTANCE .getBinaryComparatorFactory(BuiltinType.AINT64, true); - private static final IBinaryComparatorFactory rowNumberCompFactory = AqlBinaryComparatorFactoryProvider.INSTANCE + private static final IBinaryComparatorFactory rowNumberCompFactory = BinaryComparatorFactoryProvider.INSTANCE .getBinaryComparatorFactory(BuiltinType.AINT32, true); private static final IBinaryComparatorFactory[] rCFileRIDComparatorFactories = { fileNumberCompFactory, @@ -85,16 +85,16 @@ public class IndexingConstants { static { - fileNumberSerializerDeserializer = AqlSerializerDeserializerProvider.INSTANCE + fileNumberSerializerDeserializer = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(FILE_NUMBER_FIELD_TYPE); - recordOffsetSerializerDeserializer = AqlSerializerDeserializerProvider.INSTANCE + recordOffsetSerializerDeserializer = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(RECORD_OFFSET_FIELD_TYPE); - rowNumberSerializerDeserializer = AqlSerializerDeserializerProvider.INSTANCE + rowNumberSerializerDeserializer = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(ROW_NUMBER_FIELD_TYPE); - fileNumberTypeTraits = AqlTypeTraitProvider.INSTANCE.getTypeTrait(FILE_NUMBER_FIELD_TYPE); - recordOffsetTypeTraits = AqlTypeTraitProvider.INSTANCE.getTypeTrait(RECORD_OFFSET_FIELD_TYPE); - rowNumberTypeTraits = AqlTypeTraitProvider.INSTANCE.getTypeTrait(ROW_NUMBER_FIELD_TYPE); + fileNumberTypeTraits = TypeTraitProvider.INSTANCE.getTypeTrait(FILE_NUMBER_FIELD_TYPE); + recordOffsetTypeTraits = TypeTraitProvider.INSTANCE.getTypeTrait(RECORD_OFFSET_FIELD_TYPE); + rowNumberTypeTraits = TypeTraitProvider.INSTANCE.getTypeTrait(ROW_NUMBER_FIELD_TYPE); fileNumberEvalFactory = new TupleFieldEvaluatorFactory(1); recordOffsetEvalFactory = new TupleFieldEvaluatorFactory(2); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/RecordColumnarIndexer.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/RecordColumnarIndexer.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/RecordColumnarIndexer.java index c626be5..273901c 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/RecordColumnarIndexer.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/indexing/RecordColumnarIndexer.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.apache.asterix.external.api.IExternalIndexer; import org.apache.asterix.external.api.IIndexingDatasource; import org.apache.asterix.external.input.record.reader.hdfs.HDFSRecordReader; -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.base.AMutableInt64; import org.apache.asterix.om.base.IAObject; @@ -45,10 +45,10 @@ public class RecordColumnarIndexer implements IExternalIndexer { protected RecordReader<?, Writable> recordReader; @SuppressWarnings("unchecked") - private ISerializerDeserializer<IAObject> intSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<IAObject> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); @SuppressWarnings("unchecked") - private ISerializerDeserializer<IAObject> longSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<IAObject> longSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/RecordWithMetadataAndPK.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/RecordWithMetadataAndPK.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/RecordWithMetadataAndPK.java index 3ed6af8..bc5de80 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/RecordWithMetadataAndPK.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/RecordWithMetadataAndPK.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.asterix.external.api.IDataParser; import org.apache.asterix.external.api.IRawRecord; import org.apache.asterix.external.util.ExternalDataUtils; -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.ADouble; import org.apache.asterix.om.base.AInt32; @@ -55,23 +55,23 @@ public class RecordWithMetadataAndPK<T> extends RecordWithPK<T> { // Serializers @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ADouble> doubleSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ADouble> doubleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); private final AMutableDouble mutableDouble = new AMutableDouble(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); private final AMutableString mutableString = new AMutableString(null); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AInt32> int32Serde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AInt32> int32Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); private final AMutableInt32 mutableInt = new AMutableInt32(0); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); private final AMutableInt64 mutableLong = new AMutableInt64(0); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); private final int[] keyIndicator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunction.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunction.java index 3e47f36..0a08e46 100755 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunction.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunction.java @@ -26,7 +26,7 @@ import org.apache.asterix.common.library.ILibraryManager; import org.apache.asterix.external.api.IExternalFunction; import org.apache.asterix.external.api.IFunctionFactory; import org.apache.asterix.external.api.IFunctionHelper; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.functions.IExternalFunctionInfo; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.EnumDeserializer; @@ -91,7 +91,7 @@ public abstract class ExternalFunction implements IExternalFunction { } public static ISerializerDeserializer<?> getSerDe(Object typeInfo) { - return AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(typeInfo); + return SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(typeInfo); } public IExternalFunctionInfo getFinfo() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ResultCollector.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ResultCollector.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ResultCollector.java index b6795f6..43e4e09 100755 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ResultCollector.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ResultCollector.java @@ -22,7 +22,7 @@ import java.io.DataOutput; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.external.api.IResultCollector; -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.AMutableInt32; @@ -120,7 +120,7 @@ public class ResultCollector implements IResultCollector { @SuppressWarnings("unchecked") private void serializeResult(IAObject object) throws AsterixException { try { - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(finfo.getReturnType()) + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(finfo.getReturnType()) .serialize(reusableResultObjectHolder, outputProvider.getDataOutput()); } catch (HyracksDataException hde) { throw new AsterixException(hde); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/AbstractDataParser.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/AbstractDataParser.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/AbstractDataParser.java index 2517166..d6593b5 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/AbstractDataParser.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/AbstractDataParser.java @@ -21,7 +21,7 @@ package org.apache.asterix.external.parser; import java.io.DataOutput; import org.apache.asterix.external.api.IDataParser; -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.ABoolean; import org.apache.asterix.om.base.ACircle; @@ -110,34 +110,34 @@ public abstract class AbstractDataParser implements IDataParser { // Serializers @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ADouble> doubleSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<ADouble> doubleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getAStringSerializerDeserializer(); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ABinary> binarySerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<ABinary> binarySerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABINARY); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AFloat> floatSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AFloat> floatSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AFLOAT); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt8> int8Serde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AInt8> int8Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT8); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt16> int16Serde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AInt16> int16Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT16); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt32> int32Serde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AInt32> int32Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); protected final HexParser hexParser = new HexParser(); @@ -147,46 +147,46 @@ public abstract class AbstractDataParser implements IDataParser { // (xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx) when parsing the data. // Thus, we need to call UUID.fromStringToAMutableUUID() to convert it to the internal representation (byte []). @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AUUID> uuidSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AUUID> uuidSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AUUID); // To avoid race conditions, the serdes for temporal and spatial data types needs to be one per parser // ^^^^^^^^^^^^^^^^^^^^^^^^ ??? then why all these serdes are static? @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE + protected static final ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ATIME); @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<ADate> dateSerde = AqlSerializerDeserializerProvider.INSTANCE + protected static final ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATE); @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<ADateTime> datetimeSerde = AqlSerializerDeserializerProvider.INSTANCE + protected static final ISerializerDeserializer<ADateTime> datetimeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<ADuration> durationSerde = AqlSerializerDeserializerProvider.INSTANCE + protected static final ISerializerDeserializer<ADuration> durationSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADURATION); @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<ADayTimeDuration> dayTimeDurationSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADAYTIMEDURATION); + protected static final ISerializerDeserializer<ADayTimeDuration> dayTimeDurationSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADAYTIMEDURATION); @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<AYearMonthDuration> yearMonthDurationSerde = AqlSerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AYEARMONTHDURATION); + protected static final ISerializerDeserializer<AYearMonthDuration> yearMonthDurationSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AYEARMONTHDURATION); @SuppressWarnings("unchecked") - protected final static ISerializerDeserializer<APoint> pointSerde = AqlSerializerDeserializerProvider.INSTANCE + protected final static ISerializerDeserializer<APoint> pointSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.APOINT); @SuppressWarnings("unchecked") - protected final static ISerializerDeserializer<APoint3D> point3DSerde = AqlSerializerDeserializerProvider.INSTANCE + protected final static ISerializerDeserializer<APoint3D> point3DSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.APOINT3D); @SuppressWarnings("unchecked") - protected final static ISerializerDeserializer<ACircle> circleSerde = AqlSerializerDeserializerProvider.INSTANCE + protected final static ISerializerDeserializer<ACircle> circleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ACIRCLE); @SuppressWarnings("unchecked") - protected final static ISerializerDeserializer<ARectangle> rectangleSerde = AqlSerializerDeserializerProvider.INSTANCE + protected final static ISerializerDeserializer<ARectangle> rectangleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ARECTANGLE); @SuppressWarnings("unchecked") - protected final static ISerializerDeserializer<ALine> lineSerde = AqlSerializerDeserializerProvider.INSTANCE + protected final static ISerializerDeserializer<ALine> lineSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ALINE); @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<AInterval> intervalSerde = AqlSerializerDeserializerProvider.INSTANCE + protected static final ISerializerDeserializer<AInterval> intervalSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINTERVAL); protected String filename; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/RecordWithMetadataParser.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/RecordWithMetadataParser.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/RecordWithMetadataParser.java index be308d4..2be9019 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/RecordWithMetadataParser.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/RecordWithMetadataParser.java @@ -28,7 +28,7 @@ import org.apache.asterix.external.api.IRecordConverter; import org.apache.asterix.external.api.IRecordDataParser; import org.apache.asterix.external.api.IRecordWithMetadataParser; import org.apache.asterix.external.input.record.RecordWithMetadataAndPK; -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.base.AString; import org.apache.asterix.om.types.ARecordType; @@ -49,7 +49,7 @@ public class RecordWithMetadataParser<T, O> implements IRecordWithMetadataParser private final ArrayBackedValueStorage[] metaFieldsNamesBuffers; private final int numberOfMetaFields; @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + private final ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); public RecordWithMetadataParser(ARecordType metaType, IRecordDataParser<O> valueParser, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdToADMTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdToADMTest.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdToADMTest.java index a4a64c4..f952a4d 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdToADMTest.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdToADMTest.java @@ -39,8 +39,8 @@ import org.apache.asterix.external.input.record.reader.stream.SemiStructuredReco import org.apache.asterix.external.input.stream.LocalFSInputStream; import org.apache.asterix.external.library.ClassAdParser; import org.apache.asterix.external.util.FileSystemWatcher; -import org.apache.asterix.formats.nontagged.AqlADMPrinterFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.ADMPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.om.types.BuiltinType; import org.apache.asterix.om.types.IAType; @@ -100,9 +100,9 @@ public class ClassAdToADMTest extends TestCase { ARecordType recordType = new ARecordType("value", recordFieldNames, recordFieldTypes, true); int numOfTupleFields = 1; ISerializerDeserializer[] serdes = new ISerializerDeserializer[1]; - serdes[0] = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(recordType); + serdes[0] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(recordType); IPrinterFactory[] printerFactories = new IPrinterFactory[1]; - printerFactories[0] = AqlADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(recordType); + printerFactories[0] = ADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(recordType); // create output descriptor IPrinter[] printers = new IPrinter[printerFactories.length]; for (int i = 0; i < printerFactories.length; i++) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/RecordWithMetaTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/RecordWithMetaTest.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/RecordWithMetaTest.java index c0c8eb6..2f5f341 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/RecordWithMetaTest.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/RecordWithMetaTest.java @@ -34,8 +34,8 @@ import org.apache.asterix.external.parser.ADMDataParser; import org.apache.asterix.external.parser.RecordWithMetadataParser; import org.apache.asterix.external.util.ExternalDataConstants; import org.apache.asterix.external.util.FileSystemWatcher; -import org.apache.asterix.formats.nontagged.AqlADMPrinterFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.ADMPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.om.types.BuiltinType; import org.apache.asterix.om.types.IAType; @@ -99,13 +99,13 @@ public class RecordWithMetaTest { ISerializerDeserializer[] serdes = new ISerializerDeserializer[keyTypes.length + 2]; IPrinterFactory[] printerFactories = new IPrinterFactory[keyTypes.length + 2]; for (int i = 0; i < keyTypes.length; i++) { - serdes[i + 2] = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(keyTypes[i]); - printerFactories[i + 2] = AqlADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(keyTypes[i]); + serdes[i + 2] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(keyTypes[i]); + printerFactories[i + 2] = ADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(keyTypes[i]); } - serdes[0] = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(recordType); - serdes[1] = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(metaType); - printerFactories[0] = AqlADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(recordType); - printerFactories[1] = AqlADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(metaType); + serdes[0] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(recordType); + serdes[1] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(metaType); + printerFactories[0] = ADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(recordType); + printerFactories[1] = ADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(metaType); // create output descriptor IPrinter[] printers = new IPrinter[printerFactories.length]; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/util/RangeMapBuilder.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/util/RangeMapBuilder.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/util/RangeMapBuilder.java index 2ee70bc..2e03b8a 100644 --- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/util/RangeMapBuilder.java +++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/util/RangeMapBuilder.java @@ -22,8 +22,8 @@ import java.io.DataOutput; import java.util.List; import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.lang.aql.parser.AQLParserFactory; import org.apache.asterix.lang.common.base.Expression; import org.apache.asterix.lang.common.base.Expression.Kind; @@ -109,31 +109,31 @@ public abstract class RangeMapBuilder { switch (l.getLiteralType()) { case DOUBLE: DoubleLiteral dl = (DoubleLiteral) l; - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADOUBLE); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADOUBLE); aDouble.setValue(dl.getValue()); serde.serialize(aDouble, out); break; case FLOAT: FloatLiteral fl = (FloatLiteral) l; - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AFLOAT); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AFLOAT); aFloat.setValue(fl.getValue()); serde.serialize(aFloat, out); break; case INTEGER: IntegerLiteral il = (IntegerLiteral) l; - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); aInt32.setValue(il.getValue()); serde.serialize(aInt32, out); break; case LONG: LongIntegerLiteral lil = (LongIntegerLiteral) l; - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); aInt64.setValue(lil.getValue()); serde.serialize(aInt64, out); break; case STRING: StringLiteral sl = (StringLiteral) l; - serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); + serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); aString.setValue(sl.getValue()); serde.serialize(aString, out); break; @@ -150,7 +150,7 @@ public abstract class RangeMapBuilder { // TODO Add support for composite fields. int fieldIndex = 0; int fieldType = rangeMap.getTag(0, 0); - AqlBinaryComparatorFactoryProvider comparatorFactory = AqlBinaryComparatorFactoryProvider.INSTANCE; + BinaryComparatorFactoryProvider comparatorFactory = BinaryComparatorFactoryProvider.INSTANCE; IBinaryComparatorFactory bcf = comparatorFactory.getBinaryComparatorFactory(ATypeTag.VALUE_TYPE_MAPPING[fieldType], ascending); IBinaryComparator comparator = bcf.createBinaryComparator(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/LangRecordParseUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/LangRecordParseUtil.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/LangRecordParseUtil.java index 00d8683..b3cf694 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/LangRecordParseUtil.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/LangRecordParseUtil.java @@ -27,7 +27,7 @@ import java.util.Map; import org.apache.asterix.builders.OrderedListBuilder; import org.apache.asterix.builders.RecordBuilder; import org.apache.asterix.common.exceptions.ErrorCode; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.lang.common.base.Expression; import org.apache.asterix.lang.common.base.Literal; import org.apache.asterix.lang.common.expression.FieldBinding; @@ -56,15 +56,15 @@ import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class LangRecordParseUtil { private static final String NOT_ALLOWED_EXPRESSIONS_ERROR_MESSAGE = "JSON record can only have expressions [%1$s, %2$s, %3$s]"; - private static final ISerializerDeserializer<ADouble> doubleSerde = AqlSerializerDeserializerProvider.INSTANCE + private static final ISerializerDeserializer<ADouble> doubleSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADOUBLE); - private static final ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + private static final ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); - private static final ISerializerDeserializer<AInt64> intSerde = AqlSerializerDeserializerProvider.INSTANCE + private static final ISerializerDeserializer<AInt64> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); - private static final ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + private static final ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); - private static final ISerializerDeserializer<ANull> nullSerde = AqlSerializerDeserializerProvider.INSTANCE + private static final ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ANULL); private LangRecordParseUtil() {
