http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java index 7d0d91c..b01a53e 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java @@ -43,7 +43,7 @@ import org.apache.asterix.common.transactions.ITransactionContext; import org.apache.asterix.common.transactions.ITransactionSubsystem; import org.apache.asterix.common.transactions.JobId; import org.apache.asterix.external.indexing.ExternalFile; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.api.ExtensionMetadataDataset; import org.apache.asterix.metadata.api.ExtensionMetadataDatasetId; import org.apache.asterix.metadata.api.IExtensionMetadataEntity; @@ -1079,7 +1079,7 @@ public class MetadataNode implements IMetadataNode { while (rangeCursor.hasNext()) { rangeCursor.next(); sb.append(TupleUtils.printTuple(rangeCursor.getTuple(), - new ISerializerDeserializer[] { AqlSerializerDeserializerProvider.INSTANCE + new ISerializerDeserializer[] { SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING) })); } } finally { @@ -1102,9 +1102,9 @@ public class MetadataNode implements IMetadataNode { rangeCursor.next(); sb.append(TupleUtils.printTuple(rangeCursor.getTuple(), new ISerializerDeserializer[] { - AqlSerializerDeserializerProvider.INSTANCE + SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING), - AqlSerializerDeserializerProvider.INSTANCE + SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING) })); } } finally { @@ -1126,9 +1126,9 @@ public class MetadataNode implements IMetadataNode { while (rangeCursor.hasNext()) { rangeCursor.next(); sb.append(TupleUtils.printTuple(rangeCursor.getTuple(), new ISerializerDeserializer[] { - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING), - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING), - AqlSerializerDeserializerProvider.INSTANCE + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING), + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING), + SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING) })); } } finally { @@ -1229,7 +1229,7 @@ public class MetadataNode implements IMetadataNode { // Hyracks version. public static ITupleReference createTuple(String... fields) { @SuppressWarnings("unchecked") - ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); AMutableString aString = new AMutableString(""); ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fields.length); @@ -1622,9 +1622,9 @@ public class MetadataNode implements IMetadataNode { @SuppressWarnings("unchecked") public ITupleReference createExternalFileSearchTuple(String dataverseName, String datasetName, int fileNumber) throws HyracksDataException { - ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); - ISerializerDeserializer<AInt32> intSerde = AqlSerializerDeserializerProvider.INSTANCE + ISerializerDeserializer<AInt32> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); AMutableString aString = new AMutableString("");
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataIndex.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataIndex.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataIndex.java index db6145a..80a670e 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataIndex.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataIndex.java @@ -26,10 +26,10 @@ import java.util.List; import org.apache.asterix.common.metadata.MetadataIndexImmutableProperties; import org.apache.asterix.common.transactions.DatasetId; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlBinaryHashFunctionFactoryProvider; -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.BinaryHashFunctionFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.metadata.api.IMetadataIndex; import org.apache.asterix.metadata.utils.MetadataConstants; import org.apache.asterix.om.types.ARecordType; @@ -108,31 +108,31 @@ public class MetadataIndex implements IMetadataIndex { @SuppressWarnings("rawtypes") ISerializerDeserializer[] serdes = new ISerializerDeserializer[numFields]; for (int i = 0; i < keyTypes.length; i++) { - serdes[i] = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(keyTypes[i]); + serdes[i] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(keyTypes[i]); } // For primary indexes, add payload field serde. if (fieldPermutation.length > keyTypes.length) { - serdes[numFields - 1] = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(payloadType); + serdes[numFields - 1] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(payloadType); } recDesc = new RecordDescriptor(serdes); // Create type traits. typeTraits = new ITypeTraits[fieldPermutation.length]; for (int i = 0; i < keyTypes.length; i++) { - typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyTypes[i]); + typeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyTypes[i]); } // For primary indexes, add payload field. if (fieldPermutation.length > keyTypes.length) { - typeTraits[fieldPermutation.length - 1] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(payloadType); + typeTraits[fieldPermutation.length - 1] = TypeTraitProvider.INSTANCE.getTypeTrait(payloadType); } // Create binary comparator factories. bcfs = new IBinaryComparatorFactory[keyTypes.length]; for (int i = 0; i < keyTypes.length; i++) { - bcfs[i] = AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyTypes[i], true); + bcfs[i] = BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyTypes[i], true); } // Create binary hash function factories. bhffs = new IBinaryHashFunctionFactory[keyTypes.length]; for (int i = 0; i < keyTypes.length; i++) { - bhffs[i] = AqlBinaryHashFunctionFactoryProvider.INSTANCE.getBinaryHashFunctionFactory(keyTypes[i]); + bhffs[i] = BinaryHashFunctionFactoryProvider.INSTANCE.getBinaryHashFunctionFactory(keyTypes[i]); } if (isPrimaryIndex) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FeedDataSource.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FeedDataSource.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FeedDataSource.java index f57fc6d..703f8c8 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FeedDataSource.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FeedDataSource.java @@ -26,7 +26,7 @@ import org.apache.asterix.external.feed.api.IFeed; import org.apache.asterix.external.feed.management.FeedConnectionId; import org.apache.asterix.external.operators.FeedCollectOperatorDescriptor; import org.apache.asterix.external.util.FeedUtils.FeedRuntimeType; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.entities.Feed; import org.apache.asterix.metadata.entities.FeedPolicyEntity; import org.apache.asterix.metadata.feeds.BuiltinFeedPolicies; @@ -178,11 +178,11 @@ public class FeedDataSource extends DataSource implements IMutationDataSource { ArrayList<ISerializerDeserializer> serdes = new ArrayList<>(); serdes.add(payloadSerde); if (metaItemType != null) { - serdes.add(AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(metaItemType)); + serdes.add(SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(metaItemType)); } if (pkTypes != null) { for (IAType type : pkTypes) { - serdes.add(AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(type)); + serdes.add(SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(type)); } } RecordDescriptor feedDesc = new RecordDescriptor( http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java index 3ec10f0..5322472 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java @@ -61,9 +61,9 @@ import org.apache.asterix.external.provider.AdapterFactoryProvider; import org.apache.asterix.external.util.ExternalDataConstants; import org.apache.asterix.external.util.FeedConstants; import org.apache.asterix.formats.base.IDataFormat; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlLinearizeComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.LinearizeComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.TypeTraitProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; @@ -998,7 +998,7 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> public static ILinearizeComparatorFactory proposeLinearizer(ATypeTag keyType, int numKeyFields) throws AlgebricksException { - return AqlLinearizeComparatorFactoryProvider.INSTANCE.getLinearizeComparatorFactory(keyType, true, + return LinearizeComparatorFactoryProvider.INSTANCE.getLinearizeComparatorFactory(keyType, true, numKeyFields / 2); } @@ -1285,9 +1285,9 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> sidxKeyFieldNames.get(i), (hasMeta && secondaryIndexIndicators.get(i).intValue() == 1) ? metaType : recType); IAType keyType = keyPairType.first; - comparatorFactories[i] = AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, + comparatorFactories[i] = BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, true); - typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); + typeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); } for (int j = 0; j < pidxKeyFieldCount; ++j, ++i) { @@ -1308,9 +1308,9 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> } catch (AsterixException e) { throw new AlgebricksException(e); } - comparatorFactories[i] = AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, + comparatorFactories[i] = BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, true); - typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); + typeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); } return new Pair<>(comparatorFactories, typeTraits); @@ -1561,16 +1561,16 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> Pair<IAType, Boolean> keyPairType = Index.getNonNullableOpenFieldType(secondaryKeyTypes.get(i), secondaryKeyNames.get(i), recType); IAType keyType = keyPairType.first; - comparatorFactories[i] = AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, + comparatorFactories[i] = BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, true); - typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); + typeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); } List<List<String>> partitioningKeys = DatasetUtils.getPartitioningKeys(dataset); for (List<String> partitioningKey : partitioningKeys) { IAType keyType = recType.getSubFieldType(partitioningKey); - comparatorFactories[i] = AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, + comparatorFactories[i] = BinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, true); - typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); + typeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); ++i; } @@ -1715,15 +1715,15 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> IPrimitiveValueProviderFactory[] valueProviderFactories = new IPrimitiveValueProviderFactory[numSecondaryKeys]; for (i = 0; i < numSecondaryKeys; i++) { - comparatorFactories[i] = AqlBinaryComparatorFactoryProvider.INSTANCE + comparatorFactories[i] = BinaryComparatorFactoryProvider.INSTANCE .getBinaryComparatorFactory(nestedKeyType, true); - typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(nestedKeyType); + typeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(nestedKeyType); valueProviderFactories[i] = AqlPrimitiveValueProviderFactory.INSTANCE; } List<List<String>> partitioningKeys = DatasetUtils.getPartitioningKeys(dataset); for (List<String> partitioningKey : partitioningKeys) { IAType keyType = recType.getSubFieldType(partitioningKey); - typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); + typeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); ++i; } ARecordType metaItemType = DatasetUtils.getMetaType(this, dataset); @@ -1930,7 +1930,7 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> i = 0; for (List<String> partitioningKey : partitioningKeys) { IAType keyType = recType.getSubFieldType(partitioningKey); - invListsTypeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); + invListsTypeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); ++i; } @@ -2157,7 +2157,7 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> i = 0; for (List<String> partitioningKey : partitioningKeys) { IAType keyType = recType.getSubFieldType(partitioningKey); - invListsTypeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); + invListsTypeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); ++i; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java index fcecc57..cdc982f 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java @@ -28,7 +28,7 @@ import org.apache.asterix.builders.OrderedListBuilder; import org.apache.asterix.builders.RecordBuilder; import org.apache.asterix.common.config.DatasetConfig.DatasetType; import org.apache.asterix.common.config.DatasetConfig.ExternalDatasetTransactionState; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.IDatasetDetails; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; import org.apache.asterix.metadata.utils.DatasetUtils; @@ -83,11 +83,11 @@ public class ExternalDatasetDetails implements IDatasetDetails { externalRecordBuilder.reset(MetadataRecordTypes.EXTERNAL_DETAILS_RECORDTYPE); AMutableString aString = new AMutableString(""); - ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); - ISerializerDeserializer<ADateTime> dateTimeSerde = AqlSerializerDeserializerProvider.INSTANCE + ISerializerDeserializer<ADateTime> dateTimeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); - ISerializerDeserializer<AInt32> intSerde = AqlSerializerDeserializerProvider.INSTANCE + ISerializerDeserializer<AInt32> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); // write field 0 http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java index bbb62d3..4b64f47 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java @@ -27,7 +27,7 @@ import org.apache.asterix.builders.IARecordBuilder; import org.apache.asterix.builders.OrderedListBuilder; import org.apache.asterix.builders.RecordBuilder; import org.apache.asterix.common.config.DatasetConfig.DatasetType; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.IDatasetDetails; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; import org.apache.asterix.om.base.ABoolean; @@ -155,13 +155,13 @@ public class InternalDatasetDetails implements IDatasetDetails { AMutableInt8 aInt8 = new AMutableInt8((byte) 0); @SuppressWarnings("unchecked") ISerializerDeserializer<ABoolean> booleanSerde = - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ABOOLEAN); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ABOOLEAN); @SuppressWarnings("unchecked") ISerializerDeserializer<AString> stringSerde = - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); @SuppressWarnings("unchecked") ISerializerDeserializer<AInt8> int8Serde = - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT8); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT8); // write field 0 fieldValue.reset(); @@ -281,7 +281,7 @@ public class InternalDatasetDetails implements IDatasetDetails { AMutableString aString = new AMutableString(""); @SuppressWarnings("unchecked") ISerializerDeserializer<AString> stringSerde = - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); // write field 0 fieldValue.reset(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/AbstractTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/AbstractTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/AbstractTupleTranslator.java index 5ec25e6..2d2f895 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/AbstractTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/AbstractTupleTranslator.java @@ -21,7 +21,7 @@ package org.apache.asterix.metadata.entitytupletranslators; import org.apache.asterix.builders.IARecordBuilder; import org.apache.asterix.builders.RecordBuilder; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.api.IMetadataEntityTupleTranslator; import org.apache.asterix.om.base.ABoolean; import org.apache.asterix.om.base.AInt32; @@ -41,13 +41,13 @@ public abstract class AbstractTupleTranslator<T> implements IMetadataEntityTuple private static final long serialVersionUID = 1L; protected AMutableString aString = new AMutableString(""); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ABoolean> booleanSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ABOOLEAN); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt32> int32Serde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AInt32> int32Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); protected final transient IARecordBuilder recordBuilder; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java index 9d37ddb..4598e1e 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java @@ -24,7 +24,7 @@ import java.io.DataInput; import java.io.DataInputStream; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; @@ -48,7 +48,7 @@ public class CompactionPolicyTupleTranslator extends AbstractTupleTranslator<Com public static final int COMPACTION_POLICY_PAYLOAD_TUPLE_FIELD_INDEX = 2; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ARecord> recordSerDes = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ARecord> recordSerDes = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(MetadataRecordTypes.COMPACTION_POLICY_RECORDTYPE); protected CompactionPolicyTupleTranslator(boolean getTuple) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java index e97f449..dbe4a67 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java @@ -38,7 +38,7 @@ import org.apache.asterix.builders.RecordBuilder; import org.apache.asterix.builders.UnorderedListBuilder; import org.apache.asterix.common.config.DatasetConfig.DatasetType; import org.apache.asterix.common.config.DatasetConfig.ExternalDatasetTransactionState; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.IDatasetDetails; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; @@ -83,7 +83,7 @@ public class DatasetTupleTranslator extends AbstractTupleTranslator<Dataset> { public static final int DATASET_PAYLOAD_TUPLE_FIELD_INDEX = 2; @SuppressWarnings("unchecked") - protected final ISerializerDeserializer<ARecord> recordSerDes = AqlSerializerDeserializerProvider.INSTANCE + protected final ISerializerDeserializer<ARecord> recordSerDes = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(MetadataRecordTypes.DATASET_RECORDTYPE); protected final transient AMutableInt32 aInt32; protected final transient ISerializerDeserializer<AInt32> aInt32Serde; @@ -93,7 +93,7 @@ public class DatasetTupleTranslator extends AbstractTupleTranslator<Dataset> { protected DatasetTupleTranslator(boolean getTuple) { super(getTuple, MetadataPrimaryIndexes.DATASET_DATASET.getFieldCount()); aInt32 = new AMutableInt32(-1); - aInt32Serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); + aInt32Serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); } @Override @@ -444,7 +444,7 @@ public class DatasetTupleTranslator extends AbstractTupleTranslator<Dataset> { ArrayBackedValueStorage fieldValue = new ArrayBackedValueStorage(); propertyRecordBuilder.reset(MetadataRecordTypes.DATASET_HINTS_RECORDTYPE); AMutableString aString = new AMutableString(""); - ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); // write field 0 http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java index 70c5813..44de381 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java @@ -27,7 +27,7 @@ import java.util.Calendar; import org.apache.asterix.external.api.IDataSourceAdapter; import org.apache.asterix.external.dataset.adapter.AdapterIdentifier; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; @@ -49,7 +49,7 @@ public class DatasourceAdapterTupleTranslator extends AbstractTupleTranslator<Da public static final int ADAPTER_PAYLOAD_TUPLE_FIELD_INDEX = 2; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ARecord> recordSerDes = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ARecord> recordSerDes = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(MetadataRecordTypes.DATASOURCE_ADAPTER_RECORDTYPE); protected DatasourceAdapterTupleTranslator(boolean getTuple) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java index 2e8143e..fc7ef60 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java @@ -31,7 +31,7 @@ import org.apache.asterix.builders.IARecordBuilder; import org.apache.asterix.builders.OrderedListBuilder; import org.apache.asterix.builders.RecordBuilder; import org.apache.asterix.common.transactions.JobId; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.MetadataNode; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; @@ -77,7 +77,7 @@ public class DatatypeTupleTranslator extends AbstractTupleTranslator<Datatype> { }; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ARecord> recordSerDes = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ARecord> recordSerDes = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(MetadataRecordTypes.DATATYPE_RECORDTYPE); private final MetadataNode metadataNode; private final JobId jobId; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java index 086bb10..ac4fde2 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java @@ -25,7 +25,7 @@ import java.io.DataInputStream; import java.io.IOException; import java.util.Calendar; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; @@ -52,14 +52,14 @@ public class DataverseTupleTranslator extends AbstractTupleTranslator<Dataverse> protected ISerializerDeserializer<AInt32> aInt32Serde; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ARecord> recordSerDes = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ARecord> recordSerDes = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(MetadataRecordTypes.DATAVERSE_RECORDTYPE); @SuppressWarnings("unchecked") protected DataverseTupleTranslator(boolean getTuple) { super(getTuple, MetadataPrimaryIndexes.DATAVERSE_DATASET.getFieldCount()); aInt32 = new AMutableInt32(-1); - aInt32Serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); + aInt32Serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java index f4100d4..66b6af3 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java @@ -26,7 +26,7 @@ import java.util.Date; import org.apache.asterix.common.config.DatasetConfig.ExternalFilePendingOp; import org.apache.asterix.external.indexing.ExternalFile; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; @@ -58,16 +58,16 @@ public class ExternalFileTupleTranslator extends AbstractTupleTranslator<Externa protected transient AMutableInt64 aInt64 = new AMutableInt64(0); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt32> intSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AInt32> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ADateTime> dateTimeSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<ADateTime> dateTimeSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ADATETIME); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt64> longSerde = AqlSerializerDeserializerProvider.INSTANCE + protected ISerializerDeserializer<AInt64> longSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ARecord> recordSerDes = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ARecord> recordSerDes = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(MetadataRecordTypes.EXTERNAL_FILE_RECORDTYPE); protected ExternalFileTupleTranslator(boolean getTuple) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java index 5b9c1c9..c82a073 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java @@ -30,7 +30,7 @@ import java.util.Map; import org.apache.asterix.builders.IARecordBuilder; 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.metadata.MetadataException; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; @@ -62,14 +62,14 @@ public class FeedPolicyTupleTranslator extends AbstractTupleTranslator<FeedPolic public static final int FEED_POLICY_PAYLOAD_TUPLE_FIELD_INDEX = 2; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ARecord> recordSerDes = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ARecord> recordSerDes = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(MetadataRecordTypes.FEED_POLICY_RECORDTYPE); protected ISerializerDeserializer<AInt32> aInt32Serde; @SuppressWarnings("unchecked") protected FeedPolicyTupleTranslator(boolean getTuple) { super(getTuple, MetadataPrimaryIndexes.FEED_POLICY_DATASET.getFieldCount()); - aInt32Serde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); + aInt32Serde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); } @Override @@ -174,7 +174,7 @@ public class FeedPolicyTupleTranslator extends AbstractTupleTranslator<FeedPolic propertyRecordBuilder.reset(MetadataRecordTypes.POLICY_PARAMS_RECORDTYPE); AMutableString aString = new AMutableString(""); ISerializerDeserializer<AString> stringSerde = - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); // write field 0 fieldValue.reset(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java index 09b44b4..dc0b9c9 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java @@ -34,7 +34,7 @@ import org.apache.asterix.builders.RecordBuilder; import org.apache.asterix.common.functions.FunctionSignature; import org.apache.asterix.external.feed.api.IFeed; import org.apache.asterix.external.feed.api.IFeed.FeedType; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; @@ -68,7 +68,7 @@ public class FeedTupleTranslator extends AbstractTupleTranslator<Feed> { @SuppressWarnings("unchecked") private ISerializerDeserializer<ARecord> recordSerDes = - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(MetadataRecordTypes.FEED_RECORDTYPE); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(MetadataRecordTypes.FEED_RECORDTYPE); protected FeedTupleTranslator(boolean getTuple) { super(getTuple, MetadataPrimaryIndexes.FEED_DATASET.getFieldCount()); @@ -221,7 +221,7 @@ public class FeedTupleTranslator extends AbstractTupleTranslator<Feed> { AMutableString aString = new AMutableString(""); ISerializerDeserializer<AString> stringSerde = - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); // write field 0 fieldValue.reset(); @@ -280,7 +280,7 @@ public class FeedTupleTranslator extends AbstractTupleTranslator<Feed> { propertyRecordBuilder.reset(MetadataRecordTypes.FEED_ADAPTER_CONFIGURATION_RECORDTYPE); AMutableString aString = new AMutableString(""); ISerializerDeserializer<AString> stringSerde = - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); // write field 0 fieldValue.reset(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java index f9e98e2..1487f02 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.asterix.builders.OrderedListBuilder; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; @@ -57,7 +57,7 @@ public class FunctionTupleTranslator extends AbstractTupleTranslator<Function> { public static final int FUNCTION_PAYLOAD_TUPLE_FIELD_INDEX = 3; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ARecord> recordSerDes = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ARecord> recordSerDes = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(MetadataRecordTypes.FUNCTION_RECORDTYPE); protected FunctionTupleTranslator(boolean getTuple) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java index c98252f..70d18b4 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java @@ -31,7 +31,7 @@ import org.apache.asterix.builders.OrderedListBuilder; import org.apache.asterix.common.config.DatasetConfig.IndexType; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.transactions.JobId; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.MetadataNode; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; @@ -86,13 +86,13 @@ public class IndexTupleTranslator extends AbstractTupleTranslator<Index> { private transient List<IAType> searchKeyType; private transient AMutableInt8 aInt8 = new AMutableInt8((byte) 0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt32> intSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt32> intSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT32); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt8> int8Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt8> int8Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT8); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ARecord> recordSerde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ARecord> recordSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(MetadataRecordTypes.INDEX_RECORDTYPE); private final MetadataNode metadataNode; private final JobId jobId; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java index d259212..dfb8ced 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java @@ -25,7 +25,7 @@ import java.io.DataInputStream; import java.io.IOException; import java.util.Calendar; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; @@ -49,7 +49,7 @@ public class LibraryTupleTranslator extends AbstractTupleTranslator<Library> { public static final int LIBRARY_PAYLOAD_TUPLE_FIELD_INDEX = 2; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ARecord> recordSerDes = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ARecord> recordSerDes = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(MetadataRecordTypes.LIBRARY_RECORDTYPE); protected LibraryTupleTranslator(boolean getTuple) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeGroupTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeGroupTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeGroupTupleTranslator.java index 397021d..6e865d05 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeGroupTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeGroupTupleTranslator.java @@ -28,7 +28,7 @@ import java.util.Calendar; import java.util.List; import org.apache.asterix.builders.UnorderedListBuilder; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; @@ -58,7 +58,7 @@ public class NodeGroupTupleTranslator extends AbstractTupleTranslator<NodeGroup> private transient ArrayBackedValueStorage itemValue = new ArrayBackedValueStorage(); private List<String> nodeNames; @SuppressWarnings("unchecked") - private ISerializerDeserializer<ARecord> recordSerDes = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<ARecord> recordSerDes = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(MetadataRecordTypes.NODEGROUP_RECORDTYPE); protected NodeGroupTupleTranslator(boolean getTuple) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java index a54be65..7856ed8 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java @@ -21,7 +21,7 @@ package org.apache.asterix.metadata.entitytupletranslators; import java.io.IOException; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes; import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes; @@ -46,7 +46,7 @@ public class NodeTupleTranslator extends AbstractTupleTranslator<Node> { private transient AMutableInt64 aInt64 = new AMutableInt64(-1); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = AqlSerializerDeserializerProvider.INSTANCE + private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.AINT64); // @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java index a6d5c48..6c7a41a 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java @@ -46,7 +46,7 @@ import org.apache.asterix.external.provider.AdapterFactoryProvider; import org.apache.asterix.external.util.ExternalDataConstants; import org.apache.asterix.external.util.ExternalDataUtils; import org.apache.asterix.external.util.FeedUtils.FeedRuntimeType; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; @@ -448,9 +448,9 @@ public class FeedMetadataUtil { } ISerializerDeserializer[] serdes = new ISerializerDeserializer[numOfOutputs]; int i = 0; - serdes[i++] = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(adapterOutputType); + serdes[i++] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(adapterOutputType); if (metaType != null) { - serdes[i++] = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(metaType); + serdes[i++] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(metaType); } if (ExternalDataUtils.isChangeFeed(configuration)) { getSerdesForPKs(serdes, configuration, metaType, adapterOutputType, i); @@ -471,10 +471,10 @@ public class FeedMetadataUtil { for (int j = 0; j < pkIndexes.length; j++) { int aInt = pkIndexes[j]; if (pkIndicators[j] == 0) { - serdes[index++] = AqlSerializerDeserializerProvider.INSTANCE + serdes[index++] = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(adapterOutputType.getFieldTypes()[aInt]); } else if (pkIndicators[j] == 1) { - serdes[index++] = AqlSerializerDeserializerProvider.INSTANCE + serdes[index++] = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(metaType.getFieldTypes()[aInt]); } else { throw new AlgebricksException("a key source indicator can only be 0 or 1"); @@ -482,7 +482,7 @@ public class FeedMetadataUtil { } } else { for (int aInt : pkIndexes) { - serdes[index++] = AqlSerializerDeserializerProvider.INSTANCE + serdes[index++] = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(adapterOutputType.getFieldTypes()[aInt]); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtils.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtils.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtils.java index 66c9bc9..18baab1 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtils.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtils.java @@ -29,8 +29,8 @@ import org.apache.asterix.common.config.DatasetConfig.DatasetType; import org.apache.asterix.common.context.CorrelatedPrefixMergePolicyFactory; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.external.indexing.IndexingConstants; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; -import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; +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.MetadataTransactionContext; @@ -120,7 +120,7 @@ public class DatasetUtils { if (metaItemType != null) { typeTraits = new ITypeTraits[numKeys + 2]; List<Integer> indicator = ((InternalDatasetDetails) dataset.getDatasetDetails()).getKeySourceIndicator(); - typeTraits[numKeys + 1] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(metaItemType); + typeTraits[numKeys + 1] = TypeTraitProvider.INSTANCE.getTypeTrait(metaItemType); for (int i = 0; i < numKeys; i++) { IAType keyType; if (indicator.get(i) == 0) { @@ -128,17 +128,17 @@ public class DatasetUtils { } else { keyType = metaItemType.getSubFieldType(partitioningKeys.get(i)); } - typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); + typeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); } } else { typeTraits = new ITypeTraits[numKeys + 1]; for (int i = 0; i < numKeys; i++) { IAType keyType; keyType = itemType.getSubFieldType(partitioningKeys.get(i)); - typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); + typeTraits[i] = TypeTraitProvider.INSTANCE.getTypeTrait(keyType); } } - typeTraits[numKeys] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(itemType); + typeTraits[numKeys] = TypeTraitProvider.INSTANCE.getTypeTrait(itemType); return typeTraits; } @@ -180,7 +180,7 @@ public class DatasetUtils { } ITypeTraits[] typeTraits = new ITypeTraits[1]; IAType type = itemType.getSubFieldType(filterField); - typeTraits[0] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(type); + typeTraits[0] = TypeTraitProvider.INSTANCE.getTypeTrait(type); return typeTraits; } @@ -257,7 +257,7 @@ public class DatasetUtils { propertyRecordBuilder.reset(recordType); AMutableString aString = new AMutableString(""); ISerializerDeserializer<AString> stringSerde = - AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); // write field 0 fieldValue.reset(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOptionalFieldPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOptionalFieldPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOptionalFieldPrinterFactory.java index 7825812..8797bdc 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOptionalFieldPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOptionalFieldPrinterFactory.java @@ -20,7 +20,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; -import org.apache.asterix.formats.nontagged.AqlADMPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.ADMPrinterFactoryProvider; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.AUnionType; import org.apache.asterix.om.types.BuiltinType; @@ -46,9 +46,9 @@ public class AOptionalFieldPrinterFactory implements IPrinterFactory { @Override public void init() throws HyracksDataException { - nullPrinter = (AqlADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.ANULL)) + nullPrinter = (ADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.ANULL)) .createPrinter(); - fieldPrinter = (AqlADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getActualType())) + fieldPrinter = (ADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getActualType())) .createPrinter(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java index 17f82d1..d8a412f 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java @@ -21,7 +21,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; import java.util.List; -import org.apache.asterix.formats.nontagged.AqlADMPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.ADMPrinterFactoryProvider; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.AUnionType; import org.apache.asterix.om.types.IAType; @@ -49,7 +49,7 @@ public class AUnionPrinterFactory implements IPrinterFactory { unionList = unionType.getUnionList(); printers = new IPrinter[unionType.getUnionList().size()]; for (int i = 0; i < printers.length; i++) { - printers[i] = (AqlADMPrinterFactoryProvider.INSTANCE + printers[i] = (ADMPrinterFactoryProvider.INSTANCE .getPrinterFactory(unionType.getUnionList().get(i))).createPrinter(); printers[i].init(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AOptionalFieldPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AOptionalFieldPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AOptionalFieldPrinterFactory.java index a40edc8..ca01935 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AOptionalFieldPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AOptionalFieldPrinterFactory.java @@ -20,7 +20,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv; import java.io.PrintStream; -import org.apache.asterix.formats.nontagged.AqlCSVPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.CSVPrinterFactoryProvider; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.AUnionType; import org.apache.asterix.om.types.BuiltinType; @@ -46,9 +46,9 @@ public class AOptionalFieldPrinterFactory implements IPrinterFactory { @Override public void init() throws HyracksDataException { - nullPrinter = (AqlCSVPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.AMISSING)) + nullPrinter = (CSVPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.AMISSING)) .createPrinter(); - fieldPrinter = (AqlCSVPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getActualType())) + fieldPrinter = (CSVPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getActualType())) .createPrinter(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUnionPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUnionPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUnionPrinterFactory.java index aa225be..62cbf1a 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUnionPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUnionPrinterFactory.java @@ -21,7 +21,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv; import java.io.PrintStream; import java.util.List; -import org.apache.asterix.formats.nontagged.AqlCSVPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.CSVPrinterFactoryProvider; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.AUnionType; import org.apache.asterix.om.types.IAType; @@ -51,7 +51,7 @@ public class AUnionPrinterFactory implements IPrinterFactory { unionList = unionType.getUnionList(); printers = new IPrinter[unionType.getUnionList().size()]; for (int i = 0; i < printers.length; i++) { - printers[i] = (AqlCSVPrinterFactoryProvider.INSTANCE + printers[i] = (CSVPrinterFactoryProvider.INSTANCE .getPrinterFactory(unionType.getUnionList().get(i))).createPrinter(); printers[i].init(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOptionalFieldPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOptionalFieldPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOptionalFieldPrinterFactory.java index 4edacbd..c933c05 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOptionalFieldPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOptionalFieldPrinterFactory.java @@ -20,7 +20,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean; import java.io.PrintStream; -import org.apache.asterix.formats.nontagged.AqlCleanJSONPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.CleanJSONPrinterFactoryProvider; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.AUnionType; import org.apache.asterix.om.types.BuiltinType; @@ -45,9 +45,9 @@ public class AOptionalFieldPrinterFactory implements IPrinterFactory { @Override public void init() throws HyracksDataException { - nullPrinter = (AqlCleanJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.AMISSING)) + nullPrinter = (CleanJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.AMISSING)) .createPrinter(); - fieldPrinter = (AqlCleanJSONPrinterFactoryProvider.INSTANCE + fieldPrinter = (CleanJSONPrinterFactoryProvider.INSTANCE .getPrinterFactory(unionType.getActualType())).createPrinter(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnionPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnionPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnionPrinterFactory.java index 9a2e630..fd158ab 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnionPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnionPrinterFactory.java @@ -21,7 +21,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean; import java.io.PrintStream; import java.util.List; -import org.apache.asterix.formats.nontagged.AqlCleanJSONPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.CleanJSONPrinterFactoryProvider; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.AUnionType; import org.apache.asterix.om.types.IAType; @@ -49,7 +49,7 @@ public class AUnionPrinterFactory implements IPrinterFactory { unionList = unionType.getUnionList(); printers = new IPrinter[unionType.getUnionList().size()]; for (int i = 0; i < printers.length; i++) { - printers[i] = (AqlCleanJSONPrinterFactoryProvider.INSTANCE + printers[i] = (CleanJSONPrinterFactoryProvider.INSTANCE .getPrinterFactory(unionType.getUnionList().get(i))).createPrinter(); printers[i].init(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOptionalFieldPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOptionalFieldPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOptionalFieldPrinterFactory.java index 7fb22d6..a0ac3cd 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOptionalFieldPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOptionalFieldPrinterFactory.java @@ -20,7 +20,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless; import java.io.PrintStream; -import org.apache.asterix.formats.nontagged.AqlLosslessJSONPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.LosslessJSONPrinterFactoryProvider; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.AUnionType; import org.apache.asterix.om.types.BuiltinType; @@ -45,9 +45,9 @@ public class AOptionalFieldPrinterFactory implements IPrinterFactory { @Override public void init() throws HyracksDataException { - nullPrinter = (AqlLosslessJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.AMISSING)) + nullPrinter = (LosslessJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.AMISSING)) .createPrinter(); - fieldPrinter = (AqlLosslessJSONPrinterFactoryProvider.INSTANCE + fieldPrinter = (LosslessJSONPrinterFactoryProvider.INSTANCE .getPrinterFactory(unionType.getActualType())).createPrinter(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnionPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnionPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnionPrinterFactory.java index 15bdfed..53df2a0 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnionPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnionPrinterFactory.java @@ -21,7 +21,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless; import java.io.PrintStream; import java.util.List; -import org.apache.asterix.formats.nontagged.AqlLosslessJSONPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.LosslessJSONPrinterFactoryProvider; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.AUnionType; import org.apache.asterix.om.types.IAType; @@ -50,7 +50,7 @@ public class AUnionPrinterFactory implements IPrinterFactory { unionList = unionType.getUnionList(); printers = new IPrinter[unionType.getUnionList().size()]; for (int i = 0; i < printers.length; i++) { - printers[i] = (AqlLosslessJSONPrinterFactoryProvider.INSTANCE + printers[i] = (LosslessJSONPrinterFactoryProvider.INSTANCE .getPrinterFactory(unionType.getUnionList().get(i))).createPrinter(); printers[i].init(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java index 364b2d6..6be61d6 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.asterix.builders.OrderedListBuilder; 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.AOrderedList; import org.apache.asterix.om.base.IAObject; import org.apache.asterix.om.types.AOrderedListType; @@ -58,10 +58,10 @@ public class AOrderedListSerializerDeserializer implements ISerializerDeserializ public AOrderedListSerializerDeserializer(AOrderedListType orderedlistType) { this.orderedlistType = orderedlistType; this.itemType = orderedlistType.getItemType(); - serializer = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType); + serializer = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType); deserializer = itemType.getTypeTag() == ATypeTag.ANY - ? AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType) - : AqlSerializerDeserializerProvider.INSTANCE.getNonTaggedSerializerDeserializer(itemType); + ? SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType) + : SerializerDeserializerProvider.INSTANCE.getNonTaggedSerializerDeserializer(itemType); } @Override @@ -74,7 +74,7 @@ public class AOrderedListSerializerDeserializer implements ISerializerDeserializ ISerializerDeserializer currentDeserializer = deserializer; if (itemType.getTypeTag() == ATypeTag.ANY && typeTag != ATypeTag.ANY) { currentItemType = TypeTagUtil.getBuiltinTypeByTag(typeTag); - currentDeserializer = AqlSerializerDeserializerProvider.INSTANCE + currentDeserializer = SerializerDeserializerProvider.INSTANCE .getNonTaggedSerializerDeserializer(currentItemType); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/ARecordSerializerDeserializer.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/ARecordSerializerDeserializer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/ARecordSerializerDeserializer.java index fb5d0c7..1d3a420 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/ARecordSerializerDeserializer.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/ARecordSerializerDeserializer.java @@ -26,9 +26,9 @@ import java.util.List; import org.apache.asterix.builders.IARecordBuilder; import org.apache.asterix.builders.RecordBuilder; import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlBinaryHashFunctionFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; +import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; +import org.apache.asterix.formats.nontagged.BinaryHashFunctionFactoryProvider; +import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AMissing; import org.apache.asterix.om.base.ANull; import org.apache.asterix.om.base.ARecord; @@ -79,8 +79,8 @@ public class ARecordSerializerDeserializer implements ISerializerDeserializer<AR } else { t2 = t; } - serializers[i] = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(t2); - deserializers[i] = AqlSerializerDeserializerProvider.INSTANCE.getNonTaggedSerializerDeserializer(t2); + serializers[i] = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(t2); + deserializers[i] = SerializerDeserializerProvider.INSTANCE.getNonTaggedSerializerDeserializer(t2); } } else { this.recordType = null; @@ -193,7 +193,7 @@ public class ARecordSerializerDeserializer implements ISerializerDeserializer<AR @SuppressWarnings({ "unchecked", "rawtypes" }) public static void serializeSchemalessRecord(ARecord record, DataOutput dataOutput, boolean writeTypeTag) throws HyracksDataException { - ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); RecordBuilder confRecordBuilder = new RecordBuilder(); confRecordBuilder.reset(ARecordType.FULLY_OPEN_RECORD_TYPE); @@ -204,7 +204,7 @@ public class ARecordSerializerDeserializer implements ISerializerDeserializer<AR fieldValueBytes.reset(); fieldNameBytes.reset(); stringSerde.serialize(new AString(fieldName), fieldNameBytes.getDataOutput()); - ISerializerDeserializer valueSerde = AqlSerializerDeserializerProvider.INSTANCE + ISerializerDeserializer valueSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(record.getType().getFieldTypes()[i]); valueSerde.serialize(record.getValueByPos(i), fieldValueBytes.getDataOutput()); confRecordBuilder.addField(fieldNameBytes, fieldValueBytes); @@ -215,7 +215,7 @@ public class ARecordSerializerDeserializer implements ISerializerDeserializer<AR @SuppressWarnings("unchecked") public static void serializeSimpleSchemalessRecord(List<Pair<String, String>> record, DataOutput dataOutput, boolean writeTypeTag) throws HyracksDataException { - ISerializerDeserializer<AString> stringSerde = AqlSerializerDeserializerProvider.INSTANCE + ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE .getSerializerDeserializer(BuiltinType.ASTRING); RecordBuilder confRecordBuilder = new RecordBuilder(); confRecordBuilder.reset(ARecordType.FULLY_OPEN_RECORD_TYPE); @@ -326,10 +326,10 @@ public class ARecordSerializerDeserializer implements ISerializerDeserializer<AR int fieldUtflength = UTF8StringUtil.getUTFLength(fieldName, nstart + 1); int fieldUtfMetaLen = UTF8StringUtil.getNumBytesToStoreLength(fieldUtflength); - IBinaryHashFunction utf8HashFunction = AqlBinaryHashFunctionFactoryProvider.UTF8STRING_POINTABLE_INSTANCE + IBinaryHashFunction utf8HashFunction = BinaryHashFunctionFactoryProvider.UTF8STRING_POINTABLE_INSTANCE .createBinaryHashFunction(); - IBinaryComparator utf8BinaryComparator = AqlBinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE + IBinaryComparator utf8BinaryComparator = BinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE .createBinaryComparator(); int fieldNameHashCode = utf8HashFunction.hash(fieldName, nstart + 1, fieldUtflength + fieldUtfMetaLen); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8a742fd1/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java index 46dc73d..fad023f 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import org.apache.asterix.builders.UnorderedListBuilder; 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.AUnorderedList; import org.apache.asterix.om.base.IACursor; import org.apache.asterix.om.base.IAObject; @@ -59,10 +59,10 @@ public class AUnorderedListSerializerDeserializer implements ISerializerDeserial public AUnorderedListSerializerDeserializer(AUnorderedListType unorderedlistType) { this.unorderedlistType = unorderedlistType; this.itemType = unorderedlistType.getItemType(); - serializer = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType); + serializer = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType); deserializer = itemType.getTypeTag() == ATypeTag.ANY - ? AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType) - : AqlSerializerDeserializerProvider.INSTANCE.getNonTaggedSerializerDeserializer(itemType); + ? SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType) + : SerializerDeserializerProvider.INSTANCE.getNonTaggedSerializerDeserializer(itemType); } @Override @@ -76,7 +76,7 @@ public class AUnorderedListSerializerDeserializer implements ISerializerDeserial ISerializerDeserializer currentDeserializer = deserializer; if (itemType.getTypeTag() == ATypeTag.ANY && typeTag != ATypeTag.ANY) { currentItemType = TypeTagUtil.getBuiltinTypeByTag(typeTag); - currentDeserializer = AqlSerializerDeserializerProvider.INSTANCE + currentDeserializer = SerializerDeserializerProvider.INSTANCE .getNonTaggedSerializerDeserializer(currentItemType); }
