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/AInt32PrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt32PrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt32PrinterFactory.java index 40bf33d..fc6943d 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt32PrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/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/json/clean/AInt64PrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt64PrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt64PrinterFactory.java index 5fe8e3a..8aa5de1 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt64PrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/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/json/clean/AInt8PrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt8PrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt8PrinterFactory.java index a6c3c97..3552b96 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt8PrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/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/json/clean/AObjectPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AObjectPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AObjectPrinterFactory.java index 624613a..5cae68c 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AObjectPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AObjectPrinterFactory.java @@ -120,12 +120,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/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 c933c05..188773b 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 @@ -47,8 +47,8 @@ public class AOptionalFieldPrinterFactory implements IPrinterFactory { public void init() throws HyracksDataException { nullPrinter = (CleanJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.AMISSING)) .createPrinter(); - fieldPrinter = (CleanJSONPrinterFactoryProvider.INSTANCE - .getPrinterFactory(unionType.getActualType())).createPrinter(); + fieldPrinter = (CleanJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getActualType())) + .createPrinter(); } @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/json/clean/AOrderedlistPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOrderedlistPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOrderedlistPrinterFactory.java index a6e3347..36e13fb 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOrderedlistPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/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/json/clean/ARecordPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARecordPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARecordPrinterFactory.java index 430bf66..a188952 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARecordPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/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/json/lossless/ADoublePrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADoublePrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADoublePrinterFactory.java index 5d74980..61444cd 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADoublePrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/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/lossless/AFloatPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AFloatPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AFloatPrinterFactory.java index 6ed3f98..13c23a5 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AFloatPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/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/lossless/AObjectPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AObjectPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AObjectPrinterFactory.java index 947229c..3c1c449 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AObjectPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AObjectPrinterFactory.java @@ -120,12 +120,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/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 a0ac3cd..62d0591 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 @@ -47,8 +47,9 @@ public class AOptionalFieldPrinterFactory implements IPrinterFactory { public void init() throws HyracksDataException { nullPrinter = (LosslessJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.AMISSING)) .createPrinter(); - fieldPrinter = (LosslessJSONPrinterFactoryProvider.INSTANCE - .getPrinterFactory(unionType.getActualType())).createPrinter(); + fieldPrinter = + (LosslessJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getActualType())) + .createPrinter(); } @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/json/lossless/AOrderedlistPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOrderedlistPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOrderedlistPrinterFactory.java index 7c210b6..c5993e8 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOrderedlistPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOrderedlistPrinterFactory.java @@ -44,8 +44,8 @@ public class AOrderedlistPrinterFactory implements IPrinterFactory { @Override public IPrinter createPrinter() { 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/json/lossless/ARecordPrinterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARecordPrinterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARecordPrinterFactory.java index 4bab638..8a3ec39 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARecordPrinterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/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/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 fafa397..af36c78 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 @@ -197,8 +197,8 @@ public class ARecordSerializerDeserializer implements ISerializerDeserializer<AR @SuppressWarnings({ "unchecked", "rawtypes" }) public static void serializeSchemalessRecord(ARecord record, DataOutput dataOutput, boolean writeTypeTag) throws HyracksDataException { - ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ASTRING); + ISerializerDeserializer<AString> stringSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); RecordBuilder confRecordBuilder = new RecordBuilder(); confRecordBuilder.reset(RecordUtil.FULLY_OPEN_RECORD_TYPE); ArrayBackedValueStorage fieldNameBytes = new ArrayBackedValueStorage(); @@ -219,8 +219,8 @@ 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 = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ASTRING); + ISerializerDeserializer<AString> stringSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); RecordBuilder confRecordBuilder = new RecordBuilder(); confRecordBuilder.reset(RecordUtil.FULLY_OPEN_RECORD_TYPE); ArrayBackedValueStorage fieldNameBytes = new ArrayBackedValueStorage(); @@ -317,11 +317,11 @@ public class ARecordSerializerDeserializer implements ISerializerDeserializer<AR int fieldUtflength = UTF8StringUtil.getUTFLength(fieldName, nstart + 1); int fieldUtfMetaLen = UTF8StringUtil.getNumBytesToStoreLength(fieldUtflength); - IBinaryHashFunction utf8HashFunction = BinaryHashFunctionFactoryProvider.UTF8STRING_POINTABLE_INSTANCE - .createBinaryHashFunction(); + IBinaryHashFunction utf8HashFunction = + BinaryHashFunctionFactoryProvider.UTF8STRING_POINTABLE_INSTANCE.createBinaryHashFunction(); - IBinaryComparator utf8BinaryComparator = BinaryComparatorFactoryProvider.UTF8STRING_POINTABLE_INSTANCE - .createBinaryComparator(); + 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/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/PrimitiveValueProviderFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/PrimitiveValueProviderFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/PrimitiveValueProviderFactory.java index 1a7810e..abc235d 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/PrimitiveValueProviderFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/valueproviders/PrimitiveValueProviderFactory.java @@ -39,12 +39,12 @@ public class PrimitiveValueProviderFactory implements IPrimitiveValueProviderFac @Override public IPrimitiveValueProvider createPrimitiveValueProvider() { return new IPrimitiveValueProvider() { - final IPrimitiveValueProvider intProvider = IntegerPrimitiveValueProviderFactory.INSTANCE - .createPrimitiveValueProvider(); - final IPrimitiveValueProvider floatProvider = FloatPrimitiveValueProviderFactory.INSTANCE - .createPrimitiveValueProvider(); - final IPrimitiveValueProvider doubleProvider = DoublePrimitiveValueProviderFactory.INSTANCE - .createPrimitiveValueProvider(); + final IPrimitiveValueProvider intProvider = + IntegerPrimitiveValueProviderFactory.INSTANCE.createPrimitiveValueProvider(); + final IPrimitiveValueProvider floatProvider = + FloatPrimitiveValueProviderFactory.INSTANCE.createPrimitiveValueProvider(); + final IPrimitiveValueProvider doubleProvider = + DoublePrimitiveValueProviderFactory.INSTANCE.createPrimitiveValueProvider(); @Override public double getValue(byte[] bytes, int offset) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/BinaryTokenizerFactoryProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/BinaryTokenizerFactoryProvider.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/BinaryTokenizerFactoryProvider.java index b5fd171..5ef7702 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/BinaryTokenizerFactoryProvider.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/BinaryTokenizerFactoryProvider.java @@ -36,7 +36,7 @@ public class BinaryTokenizerFactoryProvider implements IBinaryTokenizerFactoryPr private static final IBinaryTokenizerFactory aqlStringTokenizer = new DelimitedUTF8StringBinaryTokenizerFactory(true, true, - new UTF8WordTokenFactory(ATypeTag.SERIALIZED_STRING_TYPE_TAG, ATypeTag.SERIALIZED_INT32_TYPE_TAG)); + new UTF8WordTokenFactory(ATypeTag.SERIALIZED_STRING_TYPE_TAG, ATypeTag.SERIALIZED_INT32_TYPE_TAG)); private static final IBinaryTokenizerFactory aqlStringNoTypeTagTokenizer = new DelimitedUTF8StringBinaryTokenizerFactory(true, false, @@ -46,11 +46,11 @@ public class BinaryTokenizerFactoryProvider implements IBinaryTokenizerFactoryPr new DelimitedUTF8StringBinaryTokenizerFactory(true, true, new HashedUTF8WordTokenFactory( ATypeTag.SERIALIZED_INT32_TYPE_TAG, ATypeTag.SERIALIZED_INT32_TYPE_TAG)); - private static final IBinaryTokenizerFactory orderedListTokenizer = new AOrderedListBinaryTokenizerFactory( - new AListElementTokenFactory()); + private static final IBinaryTokenizerFactory orderedListTokenizer = + new AOrderedListBinaryTokenizerFactory(new AListElementTokenFactory()); - private static final IBinaryTokenizerFactory unorderedListTokenizer = new AUnorderedListBinaryTokenizerFactory( - new AListElementTokenFactory()); + private static final IBinaryTokenizerFactory unorderedListTokenizer = + new AUnorderedListBinaryTokenizerFactory(new AListElementTokenFactory()); @Override public IBinaryTokenizerFactory getWordTokenizerFactory(ATypeTag typeTag, boolean hashedTokens, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/LinearizeComparatorFactoryProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/LinearizeComparatorFactoryProvider.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/LinearizeComparatorFactoryProvider.java index 3e54e99..91fb96a 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/LinearizeComparatorFactoryProvider.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/LinearizeComparatorFactoryProvider.java @@ -52,8 +52,8 @@ public class LinearizeComparatorFactoryProvider implements ILinearizeComparatorF || typeTag == ATypeTag.BIGINT) { return addOffset(new ZCurveIntComparatorFactory(dimension), ascending); } else { - throw new AlgebricksException("Cannot propose linearizer for key with type " + typeTag + " and dimension " - + dimension + "."); + throw new AlgebricksException( + "Cannot propose linearizer for key with type " + typeTag + " and dimension " + dimension + "."); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ABinary.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ABinary.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ABinary.java index 4bcd4c9..ff32903 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ABinary.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ABinary.java @@ -105,7 +105,7 @@ public class ABinary implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ABoolean.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ABoolean.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ABoolean.java index a0c572c..5589205 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ABoolean.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ABoolean.java @@ -74,7 +74,7 @@ public final class ABoolean implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { return new ObjectMapper().createObjectNode().put("ABoolean", bVal); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java index 9c2369d..93f8663 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java @@ -75,7 +75,7 @@ public class ACircle implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADate.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADate.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADate.java index 3d7639e..2a80f28 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADate.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADate.java @@ -89,7 +89,7 @@ public class ADate implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADateTime.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADateTime.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADateTime.java index cf6fff0..efcb828 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADateTime.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADateTime.java @@ -130,7 +130,7 @@ public class ADateTime implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java index 95e677b..6017d4b 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java @@ -41,7 +41,7 @@ public class ADayTimeDuration implements IAObject { * @see org.apache.hyracks.api.dataflow.value.JSONSerializable#toJSON() */ @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADouble.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADouble.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADouble.java index 4c307f4..0a6c7d4 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADouble.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADouble.java @@ -71,7 +71,7 @@ public class ADouble implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java index 618f130..5e22711 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java @@ -110,7 +110,7 @@ public class ADuration implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AFloat.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AFloat.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AFloat.java index 4ad1b50..a44034a 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AFloat.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AFloat.java @@ -71,7 +71,7 @@ public class AFloat implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AGeneratedUUID.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AGeneratedUUID.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AGeneratedUUID.java index da1b35b..f0071b6 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AGeneratedUUID.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AGeneratedUUID.java @@ -26,12 +26,13 @@ import java.util.concurrent.atomic.AtomicInteger; public class AGeneratedUUID extends AUUID { private static class Holder { - static final byte [] hostUnique = new byte[4]; + static final byte[] hostUnique = new byte[4]; static { new SecureRandom().nextBytes(hostUnique); - } + } } + static final Random random = new Random(); static final AtomicInteger nextInstance = new AtomicInteger(random.nextInt()); @@ -45,10 +46,10 @@ public class AGeneratedUUID extends AUUID { System.arraycopy(Holder.hostUnique, 0, uuidBytes, 0, 4); // overwrite the next four bytes with the thread unique value - uuidBytes[5] = (byte)(unique >> 24); - uuidBytes[6] = (byte)(unique >> 16); - uuidBytes[7] = (byte)(unique >> 8); - uuidBytes[8] = (byte)unique; + uuidBytes[5] = (byte) (unique >> 24); + uuidBytes[6] = (byte) (unique >> 16); + uuidBytes[7] = (byte) (unique >> 8); + uuidBytes[8] = (byte) unique; } public void nextUUID() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt16.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt16.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt16.java index 65c53ac..727ba45 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt16.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt16.java @@ -61,7 +61,7 @@ public class AInt16 implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt32.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt32.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt32.java index ae96578..2da4708 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt32.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt32.java @@ -72,7 +72,7 @@ public class AInt32 implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt64.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt64.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt64.java index ef69856..5e20f67 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt64.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt64.java @@ -60,7 +60,7 @@ public class AInt64 implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt8.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt8.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt8.java index 9d0f4b2..53ecd54 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt8.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInt8.java @@ -60,7 +60,7 @@ public class AInt8 implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java index 2d54786..150575f 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java @@ -64,15 +64,15 @@ public class AInterval implements IAObject { return false; } else { AInterval t = (AInterval) o; - return (t.intervalStart == this.intervalStart || t.intervalEnd == this.intervalEnd - && t.typetag == this.typetag); + return (t.intervalStart == this.intervalStart + || t.intervalEnd == this.intervalEnd && t.typetag == this.typetag); } } @Override public int hashCode() { - return (int) (((int) (this.intervalStart ^ (this.intervalStart >>> 32))) * 31 + (int) (this.intervalEnd ^ (this.intervalEnd >>> 32))) - * 31 + (int) this.typetag; + return (int) (((int) (this.intervalStart ^ (this.intervalStart >>> 32))) * 31 + + (int) (this.intervalEnd ^ (this.intervalEnd >>> 32))) * 31 + (int) this.typetag; } /* (non-Javadoc) @@ -99,9 +99,8 @@ public class AInterval implements IAObject { if (typetag == ATypeTag.DATE.serialize()) { sbder.append("date: { "); - GregorianCalendarSystem.getInstance().getExtendStringRepUntilField( - intervalStart * ADate.CHRONON_OF_DAY, 0, sbder, GregorianCalendarSystem.Fields.YEAR, - GregorianCalendarSystem.Fields.DAY, false); + GregorianCalendarSystem.getInstance().getExtendStringRepUntilField(intervalStart * ADate.CHRONON_OF_DAY, + 0, sbder, GregorianCalendarSystem.Fields.YEAR, GregorianCalendarSystem.Fields.DAY, false); sbder.append(" }, date: {"); GregorianCalendarSystem.getInstance().getExtendStringRepUntilField(intervalEnd * ADate.CHRONON_OF_DAY, @@ -145,7 +144,7 @@ public class AInterval implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { // TODO(madhusudancs): Remove this method when a printer based JSON serializer is implemented. return null; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java index 67ae2d5..66ec23e 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java @@ -68,7 +68,7 @@ public class ALine implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AMissing.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AMissing.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AMissing.java index a404032..e38dc76 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AMissing.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AMissing.java @@ -52,7 +52,7 @@ public class AMissing implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUUID.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUUID.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUUID.java index c9e581c..2fb69ab 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUUID.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUUID.java @@ -27,9 +27,9 @@ public class AMutableUUID extends AUUID { if (tokenImage.length() != UUID_CHARS) { throw new HyracksDataException("This is not a correct UUID value: " + tokenImage); } - byte [] hexBytes = new byte[UUID_CHARS]; + byte[] hexBytes = new byte[UUID_CHARS]; for (int i = 0; i < tokenImage.length(); i++) { - hexBytes[i] = (byte)tokenImage.charAt(i); + hexBytes[i] = (byte) tokenImage.charAt(i); } parseUUIDHexBytes(hexBytes, 0); } @@ -68,9 +68,9 @@ public class AMutableUUID extends AUUID { } // Calculate a long value from a hex string. - private static void decodeBytesFromHex(byte[] hexArray, int hexArrayOffset, byte[] outputArray, int outputOffset, int length) - throws HyracksDataException { - for (int i = hexArrayOffset; i < hexArrayOffset + length; ) { + private static void decodeBytesFromHex(byte[] hexArray, int hexArrayOffset, byte[] outputArray, int outputOffset, + int length) throws HyracksDataException { + for (int i = hexArrayOffset; i < hexArrayOffset + length;) { int hi = transformHexCharToInt(hexArray[i++]); outputArray[outputOffset++] = (byte) (hi << 4 | transformHexCharToInt(hexArray[i++])); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ANull.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ANull.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ANull.java index 6be4832..ee7b822 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ANull.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ANull.java @@ -52,7 +52,7 @@ public class ANull implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); json.put("ANull", "null"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java index 3c1a165..785c62d 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java @@ -120,7 +120,7 @@ public class AOrderedList implements IACollection { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java index 66e96f0..d2d45f9 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java @@ -68,7 +68,7 @@ public class APoint implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); ObjectNode point = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java index 9a4a06e..81f8a6b 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java @@ -74,7 +74,7 @@ public class APoint3D implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java index eb4f1b4..3cb0f5c 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java @@ -88,7 +88,7 @@ public class APolygon implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java index aed969c..d964079 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java @@ -99,7 +99,7 @@ public class ARecord implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java index d6da9e5..8a527c9 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java @@ -68,7 +68,7 @@ public class ARectangle implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java index aefe5f7..e6b8f7c8 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java @@ -72,7 +72,7 @@ public class AString implements IAObject, Serializable { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ATime.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ATime.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ATime.java index a14d386..5375f7e 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ATime.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ATime.java @@ -105,7 +105,7 @@ public class ATime implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUUID.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUUID.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUUID.java index 0ed9d3f..433ff8b 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUUID.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUUID.java @@ -56,7 +56,7 @@ public class AUUID implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); json.put("AUUID", toString()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java index 894421c..137171d 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java @@ -103,7 +103,7 @@ public class AUnorderedList implements IACollection { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java index 8321848..fd35adf 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java @@ -55,7 +55,7 @@ public class AYearMonthDuration implements IAObject { } @Override - public ObjectNode toJSON() { + public ObjectNode toJSON() { ObjectMapper om = new ObjectMapper(); ObjectNode json = om.createObjectNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADateTimeParserFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADateTimeParserFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADateTimeParserFactory.java index b5cac1b..9cee586 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADateTimeParserFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADateTimeParserFactory.java @@ -59,8 +59,8 @@ public class ADateTimeParserFactory implements IValueParserFactory { chrononTimeInMs = ADateParserFactory.parseDatePart(buffer, start, timeOffset); - chrononTimeInMs += ATimeParserFactory.parseTimePart(buffer, start + timeOffset + 1, length - timeOffset - - 1); + chrononTimeInMs += + ATimeParserFactory.parseTimePart(buffer, start + timeOffset + 1, length - timeOffset - 1); try { out.writeLong(chrononTimeInMs); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADurationParserFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADurationParserFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADurationParserFactory.java index cca37e4..6e7721f 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADurationParserFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ADurationParserFactory.java @@ -35,7 +35,8 @@ public class ADurationParserFactory implements IValueParserFactory { private static final long serialVersionUID = 1L; - private static final String durationErrorMessage = "Wrong Input Format for a duration/year-month-duration/day-time-duration Value"; + private static final String durationErrorMessage = + "Wrong Input Format for a duration/year-month-duration/day-time-duration Value"; private static final String onlyYearMonthErrorMessage = "Only year-month fields are allowed"; private static final String onlyDayTimeErrorMessage = "Only day-time fields are allowed"; @@ -214,11 +215,11 @@ public class ADurationParserFactory implements IValueParserFactory { if (charAccessor.getCharAt(offset + i) >= '0' && charAccessor.getCharAt(offset + i) <= '9') { if (i < 4) { - millisecond = millisecond * DECIMAL_UNIT - + (charAccessor.getCharAt(offset + i) - '0'); + millisecond = + millisecond * DECIMAL_UNIT + (charAccessor.getCharAt(offset + i) - '0'); } else { - throw new HyracksDataException(durationErrorMessage - + ": wrong MILLISECOND field."); + throw new HyracksDataException( + durationErrorMessage + ": wrong MILLISECOND field."); } } else { break; @@ -253,10 +254,9 @@ public class ADurationParserFactory implements IValueParserFactory { } int totalMonths = sign * (year * 12 + month); - long totalMilliseconds = sign - * (day * GregorianCalendarSystem.CHRONON_OF_DAY + hour * GregorianCalendarSystem.CHRONON_OF_HOUR - + minute * GregorianCalendarSystem.CHRONON_OF_MINUTE + second - * GregorianCalendarSystem.CHRONON_OF_SECOND + millisecond); + long totalMilliseconds = sign * (day * GregorianCalendarSystem.CHRONON_OF_DAY + + hour * GregorianCalendarSystem.CHRONON_OF_HOUR + minute * GregorianCalendarSystem.CHRONON_OF_MINUTE + + second * GregorianCalendarSystem.CHRONON_OF_SECOND + millisecond); if (sign > 0) { if (totalMonths < 0) { @@ -264,9 +264,8 @@ public class ADurationParserFactory implements IValueParserFactory { + ": total number of months is beyond its max value (-2147483647 to 2147483647)."); } if (totalMilliseconds < 0) { - throw new HyracksDataException( - durationErrorMessage - + ": total number of milliseconds is beyond its max value (-9223372036854775808 to 9223372036854775807)."); + throw new HyracksDataException(durationErrorMessage + + ": total number of milliseconds is beyond its max value (-9223372036854775808 to 9223372036854775807)."); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ATimeParserFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ATimeParserFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ATimeParserFactory.java index 2b97005..e14720a 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ATimeParserFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/ATimeParserFactory.java @@ -146,7 +146,8 @@ public class ATimeParserFactory implements IValueParserFactory { } // error is thrown if more than three digits are seen for the millisecond part - if (length > offset && timeString.charAt(start + offset) >= '0' && timeString.charAt(start + offset) <= '9') { + if (length > offset && timeString.charAt(start + offset) >= '0' + && timeString.charAt(start + offset) <= '9') { throw new HyracksDataException(timeErrorMessage + ": too many fields for millisecond."); } } @@ -188,16 +189,17 @@ public class ATimeParserFactory implements IValueParserFactory { int temp_offset = (timeString.charAt(start + 3) == ':') ? 1 : 0; for (int i = 0; i < 2; i++) { - if ((timeString.charAt(start + temp_offset + 3 + i) >= '0' && timeString.charAt(start + temp_offset + 3 - + i) <= '9')) { - timezoneMinute = (short) (timezoneMinute * 10 + timeString.charAt(start + temp_offset + 3 + i) - '0'); + if ((timeString.charAt(start + temp_offset + 3 + i) >= '0' + && timeString.charAt(start + temp_offset + 3 + i) <= '9')) { + timezoneMinute = + (short) (timezoneMinute * 10 + timeString.charAt(start + temp_offset + 3 + i) - '0'); } else { throw new HyracksDataException(timeErrorMessage + ": Non-numeric value in timezone minute field"); } } - timezone = (int) (timezoneHour * GregorianCalendarSystem.CHRONON_OF_HOUR + timezoneMinute - * GregorianCalendarSystem.CHRONON_OF_MINUTE); + timezone = (int) (timezoneHour * GregorianCalendarSystem.CHRONON_OF_HOUR + + timezoneMinute * GregorianCalendarSystem.CHRONON_OF_MINUTE); if (timeString.charAt(start) == '+') { timezone *= -1; @@ -343,15 +345,16 @@ public class ATimeParserFactory implements IValueParserFactory { int temp_offset = (timeString[start + 3] == ':') ? 1 : 0; for (int i = 0; i < 2; i++) { - if ((timeString[start + temp_offset + 3 + i] >= '0' && timeString[start + temp_offset + 3 + i] <= '9')) { + if ((timeString[start + temp_offset + 3 + i] >= '0' + && timeString[start + temp_offset + 3 + i] <= '9')) { timezoneMinute = (short) (timezoneMinute * 10 + timeString[start + temp_offset + 3 + i] - '0'); } else { throw new HyracksDataException(timeErrorMessage + ": Non-numeric value in timezone minute field"); } } - timezone = (int) (timezoneHour * GregorianCalendarSystem.CHRONON_OF_HOUR + timezoneMinute - * GregorianCalendarSystem.CHRONON_OF_MINUTE); + timezone = (int) (timezoneHour * GregorianCalendarSystem.CHRONON_OF_HOUR + + timezoneMinute * GregorianCalendarSystem.CHRONON_OF_MINUTE); if (timeString[start] == '+') { timezone *= -1; @@ -497,15 +500,16 @@ public class ATimeParserFactory implements IValueParserFactory { int temp_offset = (timeString[start + 3] == ':') ? 1 : 0; for (int i = 0; i < 2; i++) { - if ((timeString[start + temp_offset + 3 + i] >= '0' && timeString[start + temp_offset + 3 + i] <= '9')) { + if ((timeString[start + temp_offset + 3 + i] >= '0' + && timeString[start + temp_offset + 3 + i] <= '9')) { timezoneMinute = (short) (timezoneMinute * 10 + timeString[start + temp_offset + 3 + i] - '0'); } else { throw new HyracksDataException(timeErrorMessage + ": Non-numeric value in timezone minute field"); } } - timezone = (int) (timezoneHour * GregorianCalendarSystem.CHRONON_OF_HOUR + timezoneMinute - * GregorianCalendarSystem.CHRONON_OF_MINUTE); + timezone = (int) (timezoneHour * GregorianCalendarSystem.CHRONON_OF_HOUR + + timezoneMinute * GregorianCalendarSystem.CHRONON_OF_MINUTE); if (timeString[start] == '+') { timezone *= -1; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DateTimeFormatUtils.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DateTimeFormatUtils.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DateTimeFormatUtils.java index 1051458..300d696 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DateTimeFormatUtils.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DateTimeFormatUtils.java @@ -308,8 +308,8 @@ public class DateTimeFormatUtils { break; case DAY_CHAR: processState = DateTimeProcessState.DAY; - pointerMove = parseFormatField(format, formatStart, formatLength, formatPointer, DAY_CHAR, - MAX_DAY_CHARS); + pointerMove = + parseFormatField(format, formatStart, formatLength, formatPointer, DAY_CHAR, MAX_DAY_CHARS); formatPointer += pointerMove; formatCharCopies += pointerMove; break; @@ -762,8 +762,8 @@ public class DateTimeFormatUtils { break; case DAY_CHAR: processState = DateTimeProcessState.DAY; - pointerMove = parseFormatField(format, formatStart, formatLength, formatPointer, DAY_CHAR, - MAX_DAY_CHARS); + pointerMove = + parseFormatField(format, formatStart, formatLength, formatPointer, DAY_CHAR, MAX_DAY_CHARS); formatPointer += pointerMove; formatCharCopies += pointerMove; break; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/GregorianCalendarSystem.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/GregorianCalendarSystem.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/GregorianCalendarSystem.java index 7f79478..dd711a8 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/GregorianCalendarSystem.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/GregorianCalendarSystem.java @@ -212,8 +212,8 @@ public class GregorianCalendarSystem implements ICalendarSystem { */ public long getChronon(int year, int month, int day, int hour, int min, int sec, int millis, int timezone) { // Added milliseconds for all fields but month and day - long chrononTime = chrononizeBeginningOfYear(year) + hour * CHRONON_OF_HOUR + min * CHRONON_OF_MINUTE + sec - * CHRONON_OF_SECOND + millis + timezone; + long chrononTime = chrononizeBeginningOfYear(year) + hour * CHRONON_OF_HOUR + min * CHRONON_OF_MINUTE + + sec * CHRONON_OF_SECOND + millis + timezone; // Added milliseconds for days of the month. chrononTime += (day - 1 + DAYS_SINCE_MONTH_BEGIN_ORDI[month - 1]) * CHRONON_OF_DAY; @@ -238,8 +238,8 @@ public class GregorianCalendarSystem implements ICalendarSystem { */ public int getChronon(int hour, int min, int sec, int millis, int timezone) { // Added milliseconds for all fields but month and day - long chrononTime = hour * CHRONON_OF_HOUR + min * CHRONON_OF_MINUTE + sec * CHRONON_OF_SECOND + millis - + timezone; + long chrononTime = + hour * CHRONON_OF_HOUR + min * CHRONON_OF_MINUTE + sec * CHRONON_OF_SECOND + millis + timezone; return (int) chrononTime; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/InvalidExpressionException.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/InvalidExpressionException.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/InvalidExpressionException.java index c84b9e2..699629b 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/InvalidExpressionException.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/InvalidExpressionException.java @@ -32,15 +32,13 @@ public class InvalidExpressionException extends CompilationException { public InvalidExpressionException(FunctionIdentifier fid, int index, ILogicalExpression actualExpr, LogicalExpressionTag... exprKinds) { - super(ErrorCode.COMPILATION_INVALID_EXPRESSION, fid.getName(), indexToPosition(index), - actualExpr.toString(), + super(ErrorCode.COMPILATION_INVALID_EXPRESSION, fid.getName(), indexToPosition(index), actualExpr.toString(), toExpectedTypeString(exprKinds)); } public InvalidExpressionException(String functionName, int index, ILogicalExpression actualExpr, LogicalExpressionTag... exprKinds) { - super(ErrorCode.COMPILATION_INVALID_EXPRESSION, functionName, indexToPosition(index), - actualExpr.toString(), + super(ErrorCode.COMPILATION_INVALID_EXPRESSION, functionName, indexToPosition(index), actualExpr.toString(), toExpectedTypeString(exprKinds)); } }
