http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 b2a7ca6..8a0cf84 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 @@ -275,8 +275,7 @@ public class FeedMetadataUtil { } } - public static ARecordType getOutputType(IFeed feed, String fqOutputType) - throws AlgebricksException { + public static ARecordType getOutputType(IFeed feed, String fqOutputType) throws AlgebricksException { ARecordType outputType = null; if (fqOutputType == null) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalScalarFunctionInfo.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalScalarFunctionInfo.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalScalarFunctionInfo.java index 8625756..93165dc 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalScalarFunctionInfo.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalScalarFunctionInfo.java @@ -29,10 +29,9 @@ public class ExternalScalarFunctionInfo extends ExternalFunctionInfo { private static final long serialVersionUID = 1L; - public ExternalScalarFunctionInfo(String namespace, String name, int arity, IAType - returnType, - String body, String language, List<IAType> argumentTypes, IResultTypeComputer rtc) { - super(namespace, name, arity , FunctionKind.SCALAR, argumentTypes, returnType, rtc, body, language); + public ExternalScalarFunctionInfo(String namespace, String name, int arity, IAType returnType, String body, + String language, List<IAType> argumentTypes, IResultTypeComputer rtc) { + super(namespace, name, arity, FunctionKind.SCALAR, argumentTypes, returnType, rtc, body, language); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java index c34cc3c..6d81145 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java @@ -350,9 +350,8 @@ public class DatasetUtil { int[] highKeyFields = null; ITransactionSubsystemProvider txnSubsystemProvider = TransactionSubsystemProvider.INSTANCE; ISearchOperationCallbackFactory searchCallbackFactory = new PrimaryIndexInstantSearchOperationCallbackFactory( - dataset.getDatasetId(), - dataset.getPrimaryBloomFilterFields(), txnSubsystemProvider, - IRecoveryManager.ResourceType.LSM_BTREE); + dataset.getDatasetId(), dataset.getPrimaryBloomFilterFields(), txnSubsystemProvider, + IRecoveryManager.ResourceType.LSM_BTREE); IndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory( metadataProvider.getStorageComponentProvider().getStorageManager(), primaryFileSplitProvider); BTreeSearchOperatorDescriptor primarySearchOp = new BTreeSearchOperatorDescriptor(spec, @@ -557,8 +556,7 @@ public class DatasetUtil { if (i > 0 && i < datasetArg.length() - 1) { first = datasetArg.substring(0, i); second = datasetArg.substring(i + 1); - } - else { + } else { first = metadata.getDefaultDataverse() == null ? null : metadata.getDefaultDataverse().getDataverseName(); second = datasetArg; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalIndexingOperations.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalIndexingOperations.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalIndexingOperations.java index ef3346b..a3c3842 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalIndexingOperations.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalIndexingOperations.java @@ -203,8 +203,8 @@ public class ExternalIndexingOperations { mergePolicyFactory, mergePolicyProperties); IIndexBuilderFactory indexBuilderFactory = new IndexBuilderFactory(storageComponentProvider.getStorageManager(), secondaryFileSplitProvider, resourceFactory, true); - IIndexDataflowHelperFactory dataflowHelperFactory = - new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), secondaryFileSplitProvider); + IIndexDataflowHelperFactory dataflowHelperFactory = new IndexDataflowHelperFactory( + storageComponentProvider.getStorageManager(), secondaryFileSplitProvider); ExternalFilesIndexCreateOperatorDescriptor externalFilesOp = new ExternalFilesIndexCreateOperatorDescriptor( spec, indexBuilderFactory, dataflowHelperFactory, externalFilesSnapshot); AlgebricksPartitionConstraintHelper.setPartitionConstraintInJobSpec(spec, externalFilesOp, @@ -221,8 +221,8 @@ public class ExternalIndexingOperations { Pair<IFileSplitProvider, AlgebricksPartitionConstraint> secondarySplitsAndConstraint = metadataProvider .getSplitProviderAndConstraints(dataset, IndexingConstants.getFilesIndexName(dataset.getDatasetName())); IFileSplitProvider secondaryFileSplitProvider = secondarySplitsAndConstraint.first; - IIndexDataflowHelperFactory dataflowHelperFactory = - new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), secondaryFileSplitProvider); + IIndexDataflowHelperFactory dataflowHelperFactory = new IndexDataflowHelperFactory( + storageComponentProvider.getStorageManager(), secondaryFileSplitProvider); ExternalFilesIndexModificationOperatorDescriptor externalFilesOp = new ExternalFilesIndexModificationOperatorDescriptor(spec, dataflowHelperFactory, externalFilesSnapshot); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedTreeIndexOperationsHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedTreeIndexOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedTreeIndexOperationsHelper.java index 0a772fa..48982c0 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedTreeIndexOperationsHelper.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedTreeIndexOperationsHelper.java @@ -263,8 +263,8 @@ public abstract class SecondaryCorrelatedTreeIndexOperationsHelper extends Secon LSMSecondaryIndexBulkLoadOperatorDescriptor treeIndexBulkLoadOp = new LSMSecondaryIndexBulkLoadOperatorDescriptor(spec, taggedSecondaryRecDesc, primaryIndexHelperFactory, - secondaryIndexHelperFactory, fieldPermutation, NUM_TAG_FIELDS, numSecondaryKeys, - numPrimaryKeys, hasBuddyBtree); + secondaryIndexHelperFactory, fieldPermutation, NUM_TAG_FIELDS, numSecondaryKeys, numPrimaryKeys, + hasBuddyBtree); AlgebricksPartitionConstraintHelper.setPartitionConstraintInJobSpec(spec, treeIndexBulkLoadOp, secondaryPartitionConstraint); return treeIndexBulkLoadOp; @@ -274,9 +274,8 @@ public abstract class SecondaryCorrelatedTreeIndexOperationsHelper extends Secon MetadataProvider metadataProvider, RecordDescriptor outRecDesc) throws AlgebricksException { ITransactionSubsystemProvider txnSubsystemProvider = TransactionSubsystemProvider.INSTANCE; ISearchOperationCallbackFactory searchCallbackFactory = new PrimaryIndexInstantSearchOperationCallbackFactory( - dataset.getDatasetId(), - dataset.getPrimaryBloomFilterFields(), txnSubsystemProvider, - IRecoveryManager.ResourceType.LSM_BTREE); + dataset.getDatasetId(), dataset.getPrimaryBloomFilterFields(), txnSubsystemProvider, + IRecoveryManager.ResourceType.LSM_BTREE); IndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory( metadataProvider.getStorageComponentProvider().getStorageManager(), primaryFileSplitProvider); LSMBTreeDiskComponentScanOperatorDescriptor primaryScanOp = new LSMBTreeDiskComponentScanOperatorDescriptor( http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java index 7701f65..065eb72 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java @@ -147,19 +147,19 @@ public abstract class SecondaryIndexOperationsHelper { SecondaryIndexOperationsHelper indexOperationsHelper; switch (index.getIndexType()) { case BTREE: - indexOperationsHelper = new SecondaryBTreeOperationsHelper(dataset, index, physOptConf, - metadataProvider); + indexOperationsHelper = + new SecondaryBTreeOperationsHelper(dataset, index, physOptConf, metadataProvider); break; case RTREE: - indexOperationsHelper = new SecondaryRTreeOperationsHelper(dataset, index, physOptConf, - metadataProvider); + indexOperationsHelper = + new SecondaryRTreeOperationsHelper(dataset, index, physOptConf, metadataProvider); break; case SINGLE_PARTITION_WORD_INVIX: case SINGLE_PARTITION_NGRAM_INVIX: case LENGTH_PARTITIONED_WORD_INVIX: case LENGTH_PARTITIONED_NGRAM_INVIX: - indexOperationsHelper = new SecondaryInvertedIndexOperationsHelper(dataset, index, physOptConf, - metadataProvider); + indexOperationsHelper = + new SecondaryInvertedIndexOperationsHelper(dataset, index, physOptConf, metadataProvider); break; default: throw new CompilationException(ErrorCode.COMPILATION_UNKNOWN_INDEX_TYPE, index.getIndexType()); @@ -265,7 +265,6 @@ public abstract class SecondaryIndexOperationsHelper { protected abstract void setSecondaryRecDescAndComparators() throws AlgebricksException; - protected AlgebricksMetaOperatorDescriptor createAssignOp(JobSpecification spec, int numSecondaryKeyFields, RecordDescriptor secondaryRecDesc) throws AlgebricksException { int[] outColumns = new int[numSecondaryKeyFields + numFilterFields]; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java index 1c9eb74..d31ca3b 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java @@ -212,8 +212,7 @@ public class SecondaryInvertedIndexOperationsHelper extends SecondaryTreeIndexOp IOperatorDescriptor keyProviderOp = DatasetUtil.createDummyKeyProviderOp(spec, dataset, metadataProvider); // Create primary index scan op. - IOperatorDescriptor primaryScanOp = - DatasetUtil.createPrimaryIndexScanOp(spec, metadataProvider, dataset); + IOperatorDescriptor primaryScanOp = DatasetUtil.createPrimaryIndexScanOp(spec, metadataProvider, dataset); IOperatorDescriptor sourceOp = primaryScanOp; boolean isOverridingKeyFieldTypes = index.isOverridingKeyFieldTypes(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/builders/RecordBuilder.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/builders/RecordBuilder.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/builders/RecordBuilder.java index 797901e..975b4f4 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/builders/RecordBuilder.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/builders/RecordBuilder.java @@ -80,10 +80,10 @@ public class RecordBuilder implements IARecordBuilder { this.openFieldNameLengths = new int[DEFAULT_NUM_OPEN_FIELDS]; this.numberOfOpenFields = 0; - this.utf8HashFunction = new PointableBinaryHashFunctionFactory(UTF8StringPointable.FACTORY) - .createBinaryHashFunction(); - this.utf8Comparator = new PointableBinaryComparatorFactory(UTF8StringPointable.FACTORY) - .createBinaryComparator(); + this.utf8HashFunction = + new PointableBinaryHashFunctionFactory(UTF8StringPointable.FACTORY).createBinaryHashFunction(); + this.utf8Comparator = + new PointableBinaryComparatorFactory(UTF8StringPointable.FACTORY).createBinaryComparator(); this.openPartOffsetArray = null; this.openPartOffsetArraySize = 0; @@ -195,11 +195,11 @@ public class RecordBuilder implements IARecordBuilder { } if (numberOfOpenFields == openPartOffsets.length) { openPartOffsets = Arrays.copyOf(openPartOffsets, openPartOffsets.length + DEFAULT_NUM_OPEN_FIELDS); - openFieldNameLengths = Arrays.copyOf(openFieldNameLengths, - openFieldNameLengths.length + DEFAULT_NUM_OPEN_FIELDS); + openFieldNameLengths = + Arrays.copyOf(openFieldNameLengths, openFieldNameLengths.length + DEFAULT_NUM_OPEN_FIELDS); } - int fieldNameHashCode = utf8HashFunction.hash(name.getByteArray(), name.getStartOffset() + 1, - name.getLength() - 1); + int fieldNameHashCode = + utf8HashFunction.hash(name.getByteArray(), name.getStartOffset() + 1, name.getLength() - 1); if (recType != null) { int cFieldPos; cFieldPos = recTypeInfo.getFieldIndex(name.getByteArray(), name.getStartOffset() + 1, name.getLength() - 1); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/PartialAggregationTypeComputer.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/PartialAggregationTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/PartialAggregationTypeComputer.java index 1a73af3..4a0384d 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/PartialAggregationTypeComputer.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/PartialAggregationTypeComputer.java @@ -38,8 +38,8 @@ public class PartialAggregationTypeComputer implements IPartialAggregationTypeCo if (partialFid.equals(BuiltinFunctions.SERIAL_GLOBAL_AVG)) { partialFid = BuiltinFunctions.SERIAL_LOCAL_AVG; } - AggregateFunctionCallExpression partialAgg = BuiltinFunctions.makeAggregateFunctionExpression(partialFid, - agg.getArguments()); + AggregateFunctionCallExpression partialAgg = + BuiltinFunctions.makeAggregateFunctionExpression(partialFid, agg.getArguments()); return getTypeForFunction(partialAgg, env, metadataProvider); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ACirclePartialBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ACirclePartialBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ACirclePartialBinaryComparatorFactory.java index a5709ba..961b4dd 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ACirclePartialBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ACirclePartialBinaryComparatorFactory.java @@ -49,24 +49,24 @@ public class ACirclePartialBinaryComparatorFactory implements IBinaryComparatorF int c = Double .compare( ADoubleSerializerDeserializer.getDouble( - b1, - s1 - + ACircleSerializerDeserializer - .getCenterPointCoordinateOffset(Coordinate.X) - 1), - ADoubleSerializerDeserializer.getDouble( - b2, - s2 - + ACircleSerializerDeserializer - .getCenterPointCoordinateOffset(Coordinate.X) - 1)); + b1, s1 + ACircleSerializerDeserializer + .getCenterPointCoordinateOffset(Coordinate.X) - 1), + ADoubleSerializerDeserializer.getDouble(b2, s2 + + ACircleSerializerDeserializer.getCenterPointCoordinateOffset(Coordinate.X) + - 1)); if (c == 0) { // center.y - c = Double.compare( - ADoubleSerializerDeserializer.getDouble(b1, - s1 + ACircleSerializerDeserializer.getCenterPointCoordinateOffset(Coordinate.Y) - - 1), - ADoubleSerializerDeserializer.getDouble(b2, - s2 + ACircleSerializerDeserializer.getCenterPointCoordinateOffset(Coordinate.Y) - - 1)); + c = Double + .compare( + ADoubleSerializerDeserializer.getDouble(b1, + s1 + ACircleSerializerDeserializer + .getCenterPointCoordinateOffset(Coordinate.Y) - 1), + ADoubleSerializerDeserializer + .getDouble( + b2, s2 + + ACircleSerializerDeserializer + .getCenterPointCoordinateOffset(Coordinate.Y) + - 1)); if (c == 0) { // radius return Double.compare( http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ADurationPartialBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ADurationPartialBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ADurationPartialBinaryComparatorFactory.java index da8696b..ed9c051 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ADurationPartialBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ADurationPartialBinaryComparatorFactory.java @@ -28,7 +28,8 @@ public class ADurationPartialBinaryComparatorFactory implements IBinaryComparato private static final long serialVersionUID = 1L; - public static final ADurationPartialBinaryComparatorFactory INSTANCE = new ADurationPartialBinaryComparatorFactory(); + public static final ADurationPartialBinaryComparatorFactory INSTANCE = + new ADurationPartialBinaryComparatorFactory(); private ADurationPartialBinaryComparatorFactory() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AIntervalAscPartialBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AIntervalAscPartialBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AIntervalAscPartialBinaryComparatorFactory.java index bb96d5d..fb2b112 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AIntervalAscPartialBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AIntervalAscPartialBinaryComparatorFactory.java @@ -26,7 +26,8 @@ public class AIntervalAscPartialBinaryComparatorFactory implements IBinaryCompar private static final long serialVersionUID = 1L; - public static final AIntervalAscPartialBinaryComparatorFactory INSTANCE = new AIntervalAscPartialBinaryComparatorFactory(); + public static final AIntervalAscPartialBinaryComparatorFactory INSTANCE = + new AIntervalAscPartialBinaryComparatorFactory(); private AIntervalAscPartialBinaryComparatorFactory() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AIntervalDescPartialBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AIntervalDescPartialBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AIntervalDescPartialBinaryComparatorFactory.java index 5ee553c..32994ab 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AIntervalDescPartialBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AIntervalDescPartialBinaryComparatorFactory.java @@ -26,7 +26,8 @@ public class AIntervalDescPartialBinaryComparatorFactory implements IBinaryCompa private static final long serialVersionUID = 1L; - public static final AIntervalDescPartialBinaryComparatorFactory INSTANCE = new AIntervalDescPartialBinaryComparatorFactory(); + public static final AIntervalDescPartialBinaryComparatorFactory INSTANCE = + new AIntervalDescPartialBinaryComparatorFactory(); private AIntervalDescPartialBinaryComparatorFactory() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ALinePartialBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ALinePartialBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ALinePartialBinaryComparatorFactory.java index 9eae119..405e063 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ALinePartialBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ALinePartialBinaryComparatorFactory.java @@ -45,39 +45,50 @@ public class ALinePartialBinaryComparatorFactory implements IBinaryComparatorFac @Override public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) { try { - int c = Double.compare( - ADoubleSerializerDeserializer.getDouble(b1, - s1 + ALineSerializerDeserializer.getStartPointCoordinateOffset(Coordinate.X) - 1), - ADoubleSerializerDeserializer.getDouble(b2, - s2 + ALineSerializerDeserializer.getStartPointCoordinateOffset(Coordinate.X) - 1)); - if (c == 0) { - c = Double.compare( - ADoubleSerializerDeserializer.getDouble(b1, - s1 + ALineSerializerDeserializer.getStartPointCoordinateOffset(Coordinate.Y) - - 1), - ADoubleSerializerDeserializer.getDouble(b2, - s2 + ALineSerializerDeserializer.getStartPointCoordinateOffset(Coordinate.Y) - - 1)); - if (c == 0) { - c = Double.compare( - ADoubleSerializerDeserializer.getDouble(b1, - s1 + ALineSerializerDeserializer.getEndPointCoordinateOffset(Coordinate.X) - - 1), + int c = Double + .compare( + ADoubleSerializerDeserializer.getDouble( + b1, s1 + ALineSerializerDeserializer + .getStartPointCoordinateOffset(Coordinate.X) - 1), ADoubleSerializerDeserializer.getDouble(b2, - s2 + ALineSerializerDeserializer.getEndPointCoordinateOffset(Coordinate.X) + s2 + ALineSerializerDeserializer.getStartPointCoordinateOffset(Coordinate.X) - 1)); + if (c == 0) { + c = Double + .compare( + ADoubleSerializerDeserializer.getDouble(b1, + s1 + ALineSerializerDeserializer + .getStartPointCoordinateOffset(Coordinate.Y) - 1), + ADoubleSerializerDeserializer + .getDouble( + b2, s2 + + ALineSerializerDeserializer + .getStartPointCoordinateOffset(Coordinate.Y) + - 1)); + if (c == 0) { + c = Double + .compare( + ADoubleSerializerDeserializer.getDouble(b1, + s1 + ALineSerializerDeserializer + .getEndPointCoordinateOffset(Coordinate.X) - 1), + ADoubleSerializerDeserializer + .getDouble( + b2, s2 + + ALineSerializerDeserializer + .getEndPointCoordinateOffset(Coordinate.X) + - 1)); if (c == 0) { - return Double.compare( - ADoubleSerializerDeserializer.getDouble( - b1, - s1 - + ALineSerializerDeserializer - .getEndPointCoordinateOffset(Coordinate.Y) - 1), - ADoubleSerializerDeserializer.getDouble( - b2, - s2 - + ALineSerializerDeserializer - .getEndPointCoordinateOffset(Coordinate.Y) - 1)); + return Double + .compare( + ADoubleSerializerDeserializer + .getDouble(b1, + s1 + ALineSerializerDeserializer + .getEndPointCoordinateOffset(Coordinate.Y) - 1), + ADoubleSerializerDeserializer + .getDouble(b2, + s2 + ALineSerializerDeserializer + .getEndPointCoordinateOffset(Coordinate.Y) + - 1)); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AObjectAscBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AObjectAscBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AObjectAscBinaryComparatorFactory.java index e74d5ec..61b47c2 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AObjectAscBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AObjectAscBinaryComparatorFactory.java @@ -57,51 +57,51 @@ public class AObjectAscBinaryComparatorFactory implements IBinaryComparatorFacto // BOOLEAN final IBinaryComparator ascBoolComp = BooleanBinaryComparatorFactory.INSTANCE.createBinaryComparator(); // TINYINT - final IBinaryComparator ascByteComp = new PointableBinaryComparatorFactory(BytePointable.FACTORY) - .createBinaryComparator(); + final IBinaryComparator ascByteComp = + new PointableBinaryComparatorFactory(BytePointable.FACTORY).createBinaryComparator(); // SMALLINT - final IBinaryComparator ascShortComp = new PointableBinaryComparatorFactory(ShortPointable.FACTORY) - .createBinaryComparator(); + final IBinaryComparator ascShortComp = + new PointableBinaryComparatorFactory(ShortPointable.FACTORY).createBinaryComparator(); // INTEGER - final IBinaryComparator ascIntComp = new PointableBinaryComparatorFactory(IntegerPointable.FACTORY) - .createBinaryComparator(); + final IBinaryComparator ascIntComp = + new PointableBinaryComparatorFactory(IntegerPointable.FACTORY).createBinaryComparator(); // BIGINT final IBinaryComparator ascLongComp = LongBinaryComparatorFactory.INSTANCE.createBinaryComparator(); // STRING - final IBinaryComparator ascStrComp = new PointableBinaryComparatorFactory(UTF8StringPointable.FACTORY) - .createBinaryComparator(); + final IBinaryComparator ascStrComp = + new PointableBinaryComparatorFactory(UTF8StringPointable.FACTORY).createBinaryComparator(); // BINARY - final IBinaryComparator ascByteArrayComp = new PointableBinaryComparatorFactory(ByteArrayPointable.FACTORY) - .createBinaryComparator(); + final IBinaryComparator ascByteArrayComp = + new PointableBinaryComparatorFactory(ByteArrayPointable.FACTORY).createBinaryComparator(); // FLOAT - final IBinaryComparator ascFloatComp = new PointableBinaryComparatorFactory(FloatPointable.FACTORY) - .createBinaryComparator(); + final IBinaryComparator ascFloatComp = + new PointableBinaryComparatorFactory(FloatPointable.FACTORY).createBinaryComparator(); // DOUBLE - final IBinaryComparator ascDoubleComp = new PointableBinaryComparatorFactory(DoublePointable.FACTORY) - .createBinaryComparator(); + final IBinaryComparator ascDoubleComp = + new PointableBinaryComparatorFactory(DoublePointable.FACTORY).createBinaryComparator(); // RECTANGLE - final IBinaryComparator ascRectangleComp = ARectanglePartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); + final IBinaryComparator ascRectangleComp = + ARectanglePartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); // CIRCLE - final IBinaryComparator ascCircleComp = ACirclePartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); + final IBinaryComparator ascCircleComp = + ACirclePartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); // DURATION - final IBinaryComparator ascDurationComp = ADurationPartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); + final IBinaryComparator ascDurationComp = + ADurationPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); // INTERVAL - final IBinaryComparator ascIntervalComp = AIntervalAscPartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); + final IBinaryComparator ascIntervalComp = + AIntervalAscPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); // LINE final IBinaryComparator ascLineComp = ALinePartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); // POINT - final IBinaryComparator ascPointComp = APointPartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); + final IBinaryComparator ascPointComp = + APointPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); // POINT3D - final IBinaryComparator ascPoint3DComp = APoint3DPartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); + final IBinaryComparator ascPoint3DComp = + APoint3DPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); // POLYGON - final IBinaryComparator ascPolygonComp = APolygonPartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); + final IBinaryComparator ascPolygonComp = + APolygonPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); // UUID final IBinaryComparator ascUUIDComp = AUUIDPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); // RAW http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AObjectDescBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AObjectDescBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AObjectDescBinaryComparatorFactory.java index 5db1bcd..3260527 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AObjectDescBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AObjectDescBinaryComparatorFactory.java @@ -41,8 +41,8 @@ public class AObjectDescBinaryComparatorFactory implements IBinaryComparatorFact // INTERVAL // Interval asc and desc comparator factories are not the inverse of each other. // Thus, we need to specify the interval desc comparator factory for descending comparisons. - final IBinaryComparator descIntervalComp = AIntervalDescPartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); + final IBinaryComparator descIntervalComp = + AIntervalDescPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); @Override public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APoint3DPartialBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APoint3DPartialBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APoint3DPartialBinaryComparatorFactory.java index de07035..dfba1d1 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APoint3DPartialBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APoint3DPartialBinaryComparatorFactory.java @@ -45,21 +45,29 @@ public class APoint3DPartialBinaryComparatorFactory implements IBinaryComparator @Override public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) { try { - int c = Double.compare( - ADoubleSerializerDeserializer.getDouble(b1, - s1 + APoint3DSerializerDeserializer.getCoordinateOffset(Coordinate.X) - 1), - ADoubleSerializerDeserializer.getDouble(b2, - s2 + APoint3DSerializerDeserializer.getCoordinateOffset(Coordinate.X) - 1)); + int c = Double + .compare( + ADoubleSerializerDeserializer + .getDouble(b1, + s1 + APoint3DSerializerDeserializer + .getCoordinateOffset(Coordinate.X) - 1), + ADoubleSerializerDeserializer.getDouble(b2, + s2 + APoint3DSerializerDeserializer.getCoordinateOffset(Coordinate.X) - 1)); if (c == 0) { - c = Double.compare( - ADoubleSerializerDeserializer.getDouble(b1, - s1 + APoint3DSerializerDeserializer.getCoordinateOffset(Coordinate.Y) - 1), - ADoubleSerializerDeserializer.getDouble(b2, - s2 + APoint3DSerializerDeserializer.getCoordinateOffset(Coordinate.Y) - 1)); + c = Double + .compare( + ADoubleSerializerDeserializer.getDouble( + b1, s1 + APoint3DSerializerDeserializer + .getCoordinateOffset(Coordinate.Y) - 1), + ADoubleSerializerDeserializer.getDouble(b2, + s2 + APoint3DSerializerDeserializer.getCoordinateOffset(Coordinate.Y) + - 1)); if (c == 0) { return Double.compare( - ADoubleSerializerDeserializer.getDouble(b1, - s1 + APoint3DSerializerDeserializer.getCoordinateOffset(Coordinate.Z) - 1), + ADoubleSerializerDeserializer + .getDouble(b1, + s1 + APoint3DSerializerDeserializer + .getCoordinateOffset(Coordinate.Z) - 1), ADoubleSerializerDeserializer.getDouble(b2, s2 + APoint3DSerializerDeserializer.getCoordinateOffset(Coordinate.Z) - 1)); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APointPartialBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APointPartialBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APointPartialBinaryComparatorFactory.java index a6df87c..b0eeb2b 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APointPartialBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APointPartialBinaryComparatorFactory.java @@ -48,11 +48,13 @@ public class APointPartialBinaryComparatorFactory implements IBinaryComparatorFa ADoubleSerializerDeserializer.getDouble(b2, s2 + APointSerializerDeserializer.getCoordinateOffset(Coordinate.X) - 1)); if (c == 0) { - return Double.compare( - ADoubleSerializerDeserializer.getDouble(b1, - s1 + APointSerializerDeserializer.getCoordinateOffset(Coordinate.Y) - 1), - ADoubleSerializerDeserializer.getDouble(b2, - s2 + APointSerializerDeserializer.getCoordinateOffset(Coordinate.Y) - 1)); + return Double + .compare( + ADoubleSerializerDeserializer.getDouble( + b1, s1 + APointSerializerDeserializer.getCoordinateOffset(Coordinate.Y) + - 1), + ADoubleSerializerDeserializer.getDouble(b2, s2 + + APointSerializerDeserializer.getCoordinateOffset(Coordinate.Y) - 1)); } return c; } catch (HyracksDataException hex) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APolygonPartialBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APolygonPartialBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APolygonPartialBinaryComparatorFactory.java index 407fa23..577f6a3 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APolygonPartialBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/APolygonPartialBinaryComparatorFactory.java @@ -48,27 +48,31 @@ public class APolygonPartialBinaryComparatorFactory implements IBinaryComparator try { short pointCount1 = AInt16SerializerDeserializer.getShort(b1, s1 + APolygonSerializerDeserializer.getNumberOfPointsOffset() - 1); - int c = Short.compare( - pointCount1, - AInt16SerializerDeserializer.getShort(b2, - s2 + APolygonSerializerDeserializer.getNumberOfPointsOffset() - 1)); + int c = Short.compare(pointCount1, AInt16SerializerDeserializer.getShort(b2, + s2 + APolygonSerializerDeserializer.getNumberOfPointsOffset() - 1)); if (c == 0) { int ci = 0; for (int i = 0; i < pointCount1; i++) { - ci = Double.compare( - DoublePointable.getDouble(b1, s1 + APolygonSerializerDeserializer.getCoordinateOffset(i, Coordinate.X) - - 1), - DoublePointable.getDouble(b2, s1 + APolygonSerializerDeserializer.getCoordinateOffset(i, Coordinate.X) - - 1)); + ci = Double + .compare( + DoublePointable.getDouble(b1, + s1 + APolygonSerializerDeserializer.getCoordinateOffset(i, + Coordinate.X) - 1), + DoublePointable.getDouble(b2, s1 + APolygonSerializerDeserializer + .getCoordinateOffset(i, Coordinate.X) - 1)); if (ci == 0) { - ci = Double.compare( - DoublePointable.getDouble(b1, s1 - + APolygonSerializerDeserializer.getCoordinateOffset(i, - Coordinate.Y) - 1), - DoublePointable.getDouble(b2, s1 - + APolygonSerializerDeserializer.getCoordinateOffset(i, - Coordinate.Y) - 1)); + ci = Double + .compare( + DoublePointable.getDouble(b1, + s1 + APolygonSerializerDeserializer.getCoordinateOffset(i, + Coordinate.Y) - 1), + DoublePointable + .getDouble( + b2, s1 + + APolygonSerializerDeserializer + .getCoordinateOffset(i, Coordinate.Y) + - 1)); if (ci == 0) { continue; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ARectanglePartialBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ARectanglePartialBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ARectanglePartialBinaryComparatorFactory.java index 4bd7c78..12f358f 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ARectanglePartialBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ARectanglePartialBinaryComparatorFactory.java @@ -25,7 +25,8 @@ import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory; public class ARectanglePartialBinaryComparatorFactory implements IBinaryComparatorFactory { private static final long serialVersionUID = 1L; - public final static ARectanglePartialBinaryComparatorFactory INSTANCE = new ARectanglePartialBinaryComparatorFactory(); + public final static ARectanglePartialBinaryComparatorFactory INSTANCE = + new ARectanglePartialBinaryComparatorFactory(); private ARectanglePartialBinaryComparatorFactory() { } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AUUIDPartialBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AUUIDPartialBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AUUIDPartialBinaryComparatorFactory.java index 67233e0..0810341 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AUUIDPartialBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/AUUIDPartialBinaryComparatorFactory.java @@ -35,11 +35,9 @@ public class AUUIDPartialBinaryComparatorFactory implements IBinaryComparatorFac @Override public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) { - int msbCompare = Long.compare(LongPointable.getLong(b1, s1), - LongPointable.getLong(b2, s2)); + int msbCompare = Long.compare(LongPointable.getLong(b1, s1), LongPointable.getLong(b2, s2)); if (msbCompare == 0) { - return Long.compare(LongPointable.getLong(b1, s1 + 8), - LongPointable.getLong(b2, s2 + 8)); + return Long.compare(LongPointable.getLong(b1, s1 + 8), LongPointable.getLong(b2, s2 + 8)); } else { return msbCompare; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ListItemBinaryComparatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ListItemBinaryComparatorFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ListItemBinaryComparatorFactory.java index 09db0ba..cff39a7 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ListItemBinaryComparatorFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/comparators/ListItemBinaryComparatorFactory.java @@ -50,35 +50,35 @@ public class ListItemBinaryComparatorFactory implements IBinaryComparatorFactory final boolean ignoreCase) { return new IBinaryComparator() { final IBinaryComparator ascBoolComp = BooleanBinaryComparatorFactory.INSTANCE.createBinaryComparator(); - final IBinaryComparator ascIntComp = new PointableBinaryComparatorFactory(IntegerPointable.FACTORY) - .createBinaryComparator(); + final IBinaryComparator ascIntComp = + new PointableBinaryComparatorFactory(IntegerPointable.FACTORY).createBinaryComparator(); final IBinaryComparator ascLongComp = LongBinaryComparatorFactory.INSTANCE.createBinaryComparator(); - final IBinaryComparator ascStrComp = new PointableBinaryComparatorFactory(UTF8StringPointable.FACTORY) - .createBinaryComparator(); - final IBinaryComparator ascLowerCaseStrComp = new PointableBinaryComparatorFactory( - UTF8StringLowercasePointable.FACTORY).createBinaryComparator(); - final IBinaryComparator ascFloatComp = new PointableBinaryComparatorFactory(FloatPointable.FACTORY) - .createBinaryComparator(); - final IBinaryComparator ascDoubleComp = new PointableBinaryComparatorFactory(DoublePointable.FACTORY) - .createBinaryComparator(); - final IBinaryComparator ascRectangleComp = ARectanglePartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); - final IBinaryComparator ascCircleComp = ACirclePartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); - final IBinaryComparator ascDurationComp = ADurationPartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); - final IBinaryComparator ascIntervalComp = AIntervalAscPartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); + final IBinaryComparator ascStrComp = + new PointableBinaryComparatorFactory(UTF8StringPointable.FACTORY).createBinaryComparator(); + final IBinaryComparator ascLowerCaseStrComp = + new PointableBinaryComparatorFactory(UTF8StringLowercasePointable.FACTORY).createBinaryComparator(); + final IBinaryComparator ascFloatComp = + new PointableBinaryComparatorFactory(FloatPointable.FACTORY).createBinaryComparator(); + final IBinaryComparator ascDoubleComp = + new PointableBinaryComparatorFactory(DoublePointable.FACTORY).createBinaryComparator(); + final IBinaryComparator ascRectangleComp = + ARectanglePartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); + final IBinaryComparator ascCircleComp = + ACirclePartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); + final IBinaryComparator ascDurationComp = + ADurationPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); + final IBinaryComparator ascIntervalComp = + AIntervalAscPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); final IBinaryComparator ascLineComp = ALinePartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); - final IBinaryComparator ascPointComp = APointPartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); - final IBinaryComparator ascPoint3DComp = APoint3DPartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); - final IBinaryComparator ascPolygonComp = APolygonPartialBinaryComparatorFactory.INSTANCE - .createBinaryComparator(); + final IBinaryComparator ascPointComp = + APointPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); + final IBinaryComparator ascPoint3DComp = + APoint3DPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); + final IBinaryComparator ascPolygonComp = + APolygonPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); final IBinaryComparator ascUUIDComp = AUUIDPartialBinaryComparatorFactory.INSTANCE.createBinaryComparator(); - final IBinaryComparator ascByteArrayComp = new PointableBinaryComparatorFactory(ByteArrayPointable.FACTORY) - .createBinaryComparator(); + final IBinaryComparator ascByteArrayComp = + new PointableBinaryComparatorFactory(ByteArrayPointable.FACTORY).createBinaryComparator(); final IBinaryComparator rawComp = RawBinaryComparatorFactory.INSTANCE.createBinaryComparator(); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/hash/AObjectBinaryHashFunctionFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/hash/AObjectBinaryHashFunctionFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/hash/AObjectBinaryHashFunctionFactory.java index e02ac3d..a8fa8a4 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/hash/AObjectBinaryHashFunctionFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/hash/AObjectBinaryHashFunctionFactory.java @@ -35,8 +35,8 @@ public class AObjectBinaryHashFunctionFactory implements IBinaryHashFunctionFact @Override public IBinaryHashFunction createBinaryHashFunction() { return new IBinaryHashFunction() { - private IBinaryHashFunction genericBinaryHash = MurmurHash3BinaryHashFunctionFamily.INSTANCE - .createBinaryHashFunction(0); + private IBinaryHashFunction genericBinaryHash = + MurmurHash3BinaryHashFunctionFamily.INSTANCE.createBinaryHashFunction(0); @Override public int hash(byte[] bytes, int offset, int length) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/hash/ListItemBinaryHashFunctionFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/hash/ListItemBinaryHashFunctionFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/hash/ListItemBinaryHashFunctionFactory.java index d7cf9ae..a3a826e 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/hash/ListItemBinaryHashFunctionFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/hash/ListItemBinaryHashFunctionFactory.java @@ -53,10 +53,11 @@ public class ListItemBinaryHashFunctionFactory implements IBinaryHashFunctionFac public IBinaryHashFunction createBinaryHashFunction(final ATypeTag itemTypeTag, final boolean ignoreCase) { return new IBinaryHashFunction() { - private IBinaryHashFunction lowerCaseStringHash = new PointableBinaryHashFunctionFactory( - UTF8StringLowercasePointable.FACTORY).createBinaryHashFunction(); - private IBinaryHashFunction genericBinaryHash = MurmurHash3BinaryHashFunctionFamily.INSTANCE - .createBinaryHashFunction(0); + private IBinaryHashFunction lowerCaseStringHash = + new PointableBinaryHashFunctionFactory(UTF8StringLowercasePointable.FACTORY) + .createBinaryHashFunction(); + private IBinaryHashFunction genericBinaryHash = + MurmurHash3BinaryHashFunctionFamily.INSTANCE.createBinaryHashFunction(0); private GrowableArray taggedBytes = new GrowableArray(); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinterFactory.java index 49455d5..051d00b 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinterFactory.java @@ -29,8 +29,7 @@ public class ADoublePrinterFactory implements IPrinterFactory { private static final long serialVersionUID = 1L; public static final ADoublePrinterFactory INSTANCE = new ADoublePrinterFactory(); - public static final IPrinter PRINTER = (byte[] b, int s, int l, PrintStream ps) -> PrintTools.printDouble(b, s, - ps); + public static final IPrinter PRINTER = (byte[] b, int s, int l, PrintStream ps) -> PrintTools.printDouble(b, s, ps); @Override public IPrinter createPrinter() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinterFactory.java index 9e81b19..21880dd 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinterFactory.java @@ -123,12 +123,12 @@ public class AObjectPrinterFactory implements IPrinterFactory { @Override public IPrinter createPrinter() { - final ARecordVisitablePointable rPointable = new ARecordVisitablePointable( - DefaultOpenFieldType.NESTED_OPEN_RECORD_TYPE); - final AListVisitablePointable olPointable = new AListVisitablePointable( - DefaultOpenFieldType.NESTED_OPEN_AORDERED_LIST_TYPE); - final AListVisitablePointable ulPointable = new AListVisitablePointable( - DefaultOpenFieldType.NESTED_OPEN_AUNORDERED_LIST_TYPE); + final ARecordVisitablePointable rPointable = + new ARecordVisitablePointable(DefaultOpenFieldType.NESTED_OPEN_RECORD_TYPE); + final AListVisitablePointable olPointable = + new AListVisitablePointable(DefaultOpenFieldType.NESTED_OPEN_AORDERED_LIST_TYPE); + final AListVisitablePointable ulPointable = + new AListVisitablePointable(DefaultOpenFieldType.NESTED_OPEN_AUNORDERED_LIST_TYPE); final Pair<PrintStream, ATypeTag> streamTag = new Pair<>(null, null); final IPrintVisitor visitor = new APrintVisitor(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 8797bdc..f44b834 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 @@ -46,8 +46,7 @@ public class AOptionalFieldPrinterFactory implements IPrinterFactory { @Override public void init() throws HyracksDataException { - nullPrinter = (ADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.ANULL)) - .createPrinter(); + nullPrinter = (ADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.ANULL)).createPrinter(); fieldPrinter = (ADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getActualType())) .createPrinter(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java index 0eef522..322ce7c 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java @@ -44,8 +44,8 @@ public class AOrderedlistPrinterFactory implements IPrinterFactory { @Override public IPrinter createPrinter() { final PointableAllocator allocator = new PointableAllocator(); - final IAType inputType = orderedlistType == null - ? DefaultOpenFieldType.getDefaultOpenFieldType(ATypeTag.ARRAY) : orderedlistType; + final IAType inputType = orderedlistType == null ? DefaultOpenFieldType.getDefaultOpenFieldType(ATypeTag.ARRAY) + : orderedlistType; final IVisitablePointable listAccessor = allocator.allocateListValue(inputType); final APrintVisitor printVisitor = new APrintVisitor(); final Pair<PrintStream, ATypeTag> arg = new Pair<>(null, null); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java index 0ea2d96..718a49c 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java @@ -44,8 +44,8 @@ public class ARecordPrinterFactory implements IPrinterFactory { @Override public IPrinter createPrinter() { final PointableAllocator allocator = new PointableAllocator(); - final IAType inputType = recType == null ? DefaultOpenFieldType.getDefaultOpenFieldType(ATypeTag.OBJECT) - : recType; + final IAType inputType = + recType == null ? DefaultOpenFieldType.getDefaultOpenFieldType(ATypeTag.OBJECT) : recType; final IVisitablePointable recAccessor = allocator.allocateRecordValue(inputType); final APrintVisitor printVisitor = new APrintVisitor(); final Pair<PrintStream, ATypeTag> arg = new Pair<>(null, null); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 d8a412f..105bef0 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 @@ -49,8 +49,9 @@ public class AUnionPrinterFactory implements IPrinterFactory { unionList = unionType.getUnionList(); printers = new IPrinter[unionType.getUnionList().size()]; for (int i = 0; i < printers.length; i++) { - printers[i] = (ADMPrinterFactoryProvider.INSTANCE - .getPrinterFactory(unionType.getUnionList().get(i))).createPrinter(); + printers[i] = + (ADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getUnionList().get(i))) + .createPrinter(); printers[i].init(); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADoublePrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADoublePrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADoublePrinterFactory.java index 29f11c4..79d20cb 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADoublePrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADoublePrinterFactory.java @@ -29,8 +29,7 @@ public class ADoublePrinterFactory implements IPrinterFactory { private static final long serialVersionUID = 1L; public static final ADoublePrinterFactory INSTANCE = new ADoublePrinterFactory(); - public static final IPrinter PRINTER = (byte[] b, int s, int l, PrintStream ps) -> PrintTools.printDouble(b, s, - ps); + public static final IPrinter PRINTER = (byte[] b, int s, int l, PrintStream ps) -> PrintTools.printDouble(b, s, ps); @Override public IPrinter createPrinter() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt16PrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt16PrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt16PrinterFactory.java index 8c6ec22..5de8aea 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt16PrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt16PrinterFactory.java @@ -29,8 +29,8 @@ public class AInt16PrinterFactory implements IPrinterFactory { private static final long serialVersionUID = 1L; public static final AInt16PrinterFactory INSTANCE = new AInt16PrinterFactory(); - public static final IPrinter PRINTER = (byte[] b, int s, int l, PrintStream ps) -> ps - .print(AInt16SerializerDeserializer.getShort(b, s + 1)); + public static final IPrinter PRINTER = + (byte[] b, int s, int l, PrintStream ps) -> ps.print(AInt16SerializerDeserializer.getShort(b, s + 1)); @Override public IPrinter createPrinter() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt32PrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt32PrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt32PrinterFactory.java index ef3f9d9..c260b55 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt32PrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt32PrinterFactory.java @@ -29,8 +29,8 @@ public class AInt32PrinterFactory implements IPrinterFactory { private static final long serialVersionUID = 1L; public static final AInt32PrinterFactory INSTANCE = new AInt32PrinterFactory(); - public static final IPrinter PRINTER = (byte[] b, int s, int l, PrintStream ps) -> ps - .print(AInt32SerializerDeserializer.getInt(b, s + 1)); + public static final IPrinter PRINTER = + (byte[] b, int s, int l, PrintStream ps) -> ps.print(AInt32SerializerDeserializer.getInt(b, s + 1)); @Override public IPrinter createPrinter() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt64PrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt64PrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt64PrinterFactory.java index 403d0f4..4a8dd8a 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt64PrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt64PrinterFactory.java @@ -29,8 +29,8 @@ public class AInt64PrinterFactory implements IPrinterFactory { private static final long serialVersionUID = 1L; public static final AInt64PrinterFactory INSTANCE = new AInt64PrinterFactory(); - public static final IPrinter PRINTER = (byte[] b, int s, int l, PrintStream ps) -> ps - .print(AInt64SerializerDeserializer.getLong(b, s + 1)); + public static final IPrinter PRINTER = + (byte[] b, int s, int l, PrintStream ps) -> ps.print(AInt64SerializerDeserializer.getLong(b, s + 1)); @Override public IPrinter createPrinter() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt8PrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt8PrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt8PrinterFactory.java index c9d4165..8de0264 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt8PrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt8PrinterFactory.java @@ -29,8 +29,8 @@ public class AInt8PrinterFactory implements IPrinterFactory { private static final long serialVersionUID = 1L; public static final AInt8PrinterFactory INSTANCE = new AInt8PrinterFactory(); - public static final IPrinter PRINTER = (byte[] b, int s, int l, PrintStream ps) -> ps - .print(AInt8SerializerDeserializer.getByte(b, s + 1)); + public static final IPrinter PRINTER = + (byte[] b, int s, int l, PrintStream ps) -> ps.print(AInt8SerializerDeserializer.getByte(b, s + 1)); @Override public IPrinter createPrinter() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AObjectPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AObjectPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AObjectPrinterFactory.java index 2fddc83..f1e2300 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AObjectPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AObjectPrinterFactory.java @@ -119,8 +119,8 @@ public class AObjectPrinterFactory implements IPrinterFactory { @Override public IPrinter createPrinter() { - final ARecordVisitablePointable rPointable = new ARecordVisitablePointable( - DefaultOpenFieldType.NESTED_OPEN_RECORD_TYPE); + final ARecordVisitablePointable rPointable = + new ARecordVisitablePointable(DefaultOpenFieldType.NESTED_OPEN_RECORD_TYPE); final Pair<PrintStream, ATypeTag> streamTag = new Pair<>(null, null); final IPrintVisitor visitor = new APrintVisitor(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 ca01935..ef212f4 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 @@ -46,8 +46,8 @@ public class AOptionalFieldPrinterFactory implements IPrinterFactory { @Override public void init() throws HyracksDataException { - nullPrinter = (CSVPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.AMISSING)) - .createPrinter(); + nullPrinter = + (CSVPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.AMISSING)).createPrinter(); fieldPrinter = (CSVPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getActualType())) .createPrinter(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARecordPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARecordPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARecordPrinterFactory.java index bf55410..909fd60 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARecordPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARecordPrinterFactory.java @@ -44,8 +44,8 @@ public class ARecordPrinterFactory implements IPrinterFactory { @Override public IPrinter createPrinter() { final PointableAllocator allocator = new PointableAllocator(); - final IAType inputType = recType == null ? DefaultOpenFieldType.getDefaultOpenFieldType(ATypeTag.OBJECT) - : recType; + final IAType inputType = + recType == null ? DefaultOpenFieldType.getDefaultOpenFieldType(ATypeTag.OBJECT) : recType; final IVisitablePointable recAccessor = allocator.allocateRecordValue(inputType); final APrintVisitor printVisitor = new APrintVisitor(); final Pair<PrintStream, ATypeTag> arg = new Pair<>(null, null); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 62cbf1a..28e0321 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 @@ -51,8 +51,9 @@ public class AUnionPrinterFactory implements IPrinterFactory { unionList = unionType.getUnionList(); printers = new IPrinter[unionType.getUnionList().size()]; for (int i = 0; i < printers.length; i++) { - printers[i] = (CSVPrinterFactoryProvider.INSTANCE - .getPrinterFactory(unionType.getUnionList().get(i))).createPrinter(); + printers[i] = + (CSVPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getUnionList().get(i))) + .createPrinter(); printers[i].init(); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADoublePrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADoublePrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADoublePrinterFactory.java index 2081162..2b4d3f7 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADoublePrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADoublePrinterFactory.java @@ -29,8 +29,8 @@ public class ADoublePrinterFactory implements IPrinterFactory { private static final long serialVersionUID = 1L; public static final ADoublePrinterFactory INSTANCE = new ADoublePrinterFactory(); - public static final IPrinter PRINTER = (byte[] b, int s, int l, PrintStream ps) -> PrintTools.printDoubleForJson(b, - s, ps); + public static final IPrinter PRINTER = + (byte[] b, int s, int l, PrintStream ps) -> PrintTools.printDoubleForJson(b, s, ps); @Override public IPrinter createPrinter() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AFloatPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AFloatPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AFloatPrinterFactory.java index 46ff2f7..31b1f97 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AFloatPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AFloatPrinterFactory.java @@ -29,8 +29,8 @@ public class AFloatPrinterFactory implements IPrinterFactory { private static final long serialVersionUID = 1L; public static final AFloatPrinterFactory INSTANCE = new AFloatPrinterFactory(); - public static final IPrinter PRINTER = (byte[] b, int s, int l, PrintStream ps) -> PrintTools.printFloatForJson(b, - s, ps); + public static final IPrinter PRINTER = + (byte[] b, int s, int l, PrintStream ps) -> PrintTools.printFloatForJson(b, s, ps); @Override public IPrinter createPrinter() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt16PrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt16PrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt16PrinterFactory.java index 4454aa6..6a6ae38 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt16PrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt16PrinterFactory.java @@ -29,8 +29,8 @@ public class AInt16PrinterFactory implements IPrinterFactory { private static final long serialVersionUID = 1L; public static final AInt16PrinterFactory INSTANCE = new AInt16PrinterFactory(); - public static final IPrinter PRINTER = (byte[] b, int s, int l, PrintStream ps) -> ps - .print(AInt16SerializerDeserializer.getShort(b, s + 1)); + public static final IPrinter PRINTER = + (byte[] b, int s, int l, PrintStream ps) -> ps.print(AInt16SerializerDeserializer.getShort(b, s + 1)); @Override public IPrinter createPrinter() {
