http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInMsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInMsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInMsDescriptor.java index d4db02e..87e83d7 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInMsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInMsDescriptor.java @@ -78,8 +78,8 @@ public class DatetimeFromUnixTimeInMsDescriptor extends AbstractScalarFunctionDy // possible output types @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADateTime> datetimeSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADATETIME); + private ISerializerDeserializer<ADateTime> datetimeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADATETIME); private AMutableDateTime aDatetime = new AMutableDateTime(0);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInSecsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInSecsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInSecsDescriptor.java index 2bbbd5c..abf4016 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInSecsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DatetimeFromUnixTimeInSecsDescriptor.java @@ -77,8 +77,8 @@ public class DatetimeFromUnixTimeInSecsDescriptor extends AbstractScalarFunction // possible output types @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADateTime> datetimeSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADATETIME); + private ISerializerDeserializer<ADateTime> datetimeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADATETIME); private AMutableDateTime aDatetime = new AMutableDateTime(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayOfWeekDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayOfWeekDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayOfWeekDescriptor.java index 4e93872..6a3e128 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayOfWeekDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayOfWeekDescriptor.java @@ -75,8 +75,8 @@ public class DayOfWeekDescriptor extends AbstractScalarFunctionDynamicDescriptor // possible returning types @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT64); + private ISerializerDeserializer<AInt64> int64Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); private AMutableInt64 aInt64 = new AMutableInt64(0); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayTimeDurationComparatorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayTimeDurationComparatorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayTimeDurationComparatorDescriptor.java index dd5c2c5..cb26c58 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayTimeDurationComparatorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DayTimeDurationComparatorDescriptor.java @@ -68,8 +68,8 @@ public class DayTimeDurationComparatorDescriptor extends AbstractScalarFunctionD private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ABoolean> boolSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ABOOLEAN); + private ISerializerDeserializer<ABoolean> boolSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ABOOLEAN); @Override public void evaluate(IFrameTupleReference tuple, IPointable result) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationEqualDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationEqualDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationEqualDescriptor.java index 0f6730a..9b29ca8 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationEqualDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationEqualDescriptor.java @@ -69,8 +69,8 @@ public class DurationEqualDescriptor extends AbstractScalarFunctionDynamicDescri private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ABoolean> boolSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ABOOLEAN); + private ISerializerDeserializer<ABoolean> boolSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ABOOLEAN); @Override public void evaluate(IFrameTupleReference tuple, IPointable result) throws HyracksDataException { @@ -96,10 +96,10 @@ public class DurationEqualDescriptor extends AbstractScalarFunctionDynamicDescri offset0 + 1) == ADurationSerializerDeserializer.getDayTime(bytes1, offset1 + 1)) && (ADurationSerializerDeserializer.getYearMonth(bytes0, offset0 + 1) == ADurationSerializerDeserializer.getYearMonth(bytes1, - offset1 + 1))) { - boolSerde.serialize(ABoolean.TRUE, out); + offset1 + 1))) { + boolSerde.serialize(ABoolean.TRUE, out); } else { - boolSerde.serialize(ABoolean.FALSE, out); + boolSerde.serialize(ABoolean.FALSE, out); } result.set(resultStorage); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromIntervalDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromIntervalDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromIntervalDescriptor.java index f17f330..d8be601 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromIntervalDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromIntervalDescriptor.java @@ -71,8 +71,8 @@ public class DurationFromIntervalDescriptor extends AbstractScalarFunctionDynami @SuppressWarnings("unchecked") private ISerializerDeserializer<ADayTimeDuration> dayTimeDurationSerde = - SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer( - BuiltinType.ADAYTIMEDURATION); + SerializerDeserializerProvider.INSTANCE + .getSerializerDeserializer(BuiltinType.ADAYTIMEDURATION); private AMutableDayTimeDuration aDayTimeDuration = new AMutableDayTimeDuration(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMillisecondsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMillisecondsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMillisecondsDescriptor.java index 38eaa1b..f1987ca 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMillisecondsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMillisecondsDescriptor.java @@ -73,8 +73,8 @@ public class DurationFromMillisecondsDescriptor extends AbstractScalarFunctionDy private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADuration> durationSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADURATION); + private ISerializerDeserializer<ADuration> durationSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADURATION); AMutableDuration aDuration = new AMutableDuration(0, 0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMonthsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMonthsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMonthsDescriptor.java index 6277525..b066c0d 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMonthsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/DurationFromMonthsDescriptor.java @@ -68,8 +68,8 @@ public class DurationFromMonthsDescriptor extends AbstractScalarFunctionDynamicD private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADuration> durationSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADURATION); + private ISerializerDeserializer<ADuration> durationSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADURATION); AMutableDuration aDuration = new AMutableDuration(0, 0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetDayTimeDurationDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetDayTimeDurationDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetDayTimeDurationDescriptor.java index 3707f38..9410e6d 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetDayTimeDurationDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetDayTimeDurationDescriptor.java @@ -70,8 +70,8 @@ public class GetDayTimeDurationDescriptor extends AbstractScalarFunctionDynamicD @SuppressWarnings("unchecked") private ISerializerDeserializer<ADayTimeDuration> dayTimeDurationSerde = - SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer( - BuiltinType.ADAYTIMEDURATION); + SerializerDeserializerProvider.INSTANCE + .getSerializerDeserializer(BuiltinType.ADAYTIMEDURATION); AMutableDayTimeDuration aDayTimeDuration = new AMutableDayTimeDuration(0); @@ -88,8 +88,7 @@ public class GetDayTimeDurationDescriptor extends AbstractScalarFunctionDynamicD ATypeTag.SERIALIZED_DURATION_TYPE_TAG); } - aDayTimeDuration - .setMilliseconds(ADurationSerializerDeserializer.getDayTime(bytes, offset + 1)); + aDayTimeDuration.setMilliseconds(ADurationSerializerDeserializer.getDayTime(bytes, offset + 1)); dayTimeDurationSerde.serialize(aDayTimeDuration, out); result.set(resultStorage); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java index d7145ca..4bd3ede 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java @@ -65,22 +65,22 @@ public class GetOverlappingIntervalDescriptor extends AbstractScalarFunctionDyna protected final IntervalLogic il = new IntervalLogic(); private ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); private DataOutput out = resultStorage.getDataOutput(); - private TaggedValuePointable argPtr0 = (TaggedValuePointable) TaggedValuePointable.FACTORY - .createPointable(); - private TaggedValuePointable argPtr1 = (TaggedValuePointable) TaggedValuePointable.FACTORY - .createPointable(); - private AIntervalPointable interval0 = (AIntervalPointable) AIntervalPointable.FACTORY - .createPointable(); - private AIntervalPointable interval1 = (AIntervalPointable) AIntervalPointable.FACTORY - .createPointable(); + private TaggedValuePointable argPtr0 = + (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); + private TaggedValuePointable argPtr1 = + (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); + private AIntervalPointable interval0 = + (AIntervalPointable) AIntervalPointable.FACTORY.createPointable(); + private AIntervalPointable interval1 = + (AIntervalPointable) AIntervalPointable.FACTORY.createPointable(); private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); private final AMutableInterval aInterval = new AMutableInterval(0, 0, (byte) -1); @SuppressWarnings("unchecked") - private final ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ANULL); + private final ISerializerDeserializer<ANull> nullSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); @SuppressWarnings("unchecked") private final ISerializerDeserializer<AInterval> intervalSerde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINTERVAL); @@ -93,7 +93,6 @@ public class GetOverlappingIntervalDescriptor extends AbstractScalarFunctionDyna byte type0 = argPtr0.getTag(); byte type1 = argPtr1.getTag(); - if (type0 == ATypeTag.SERIALIZED_INTERVAL_TYPE_TAG && type0 == type1) { argPtr0.getValue(interval0); argPtr1.getValue(interval1); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetYearMonthDurationDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetYearMonthDurationDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetYearMonthDurationDescriptor.java index 1b033cd..fd58d6c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetYearMonthDurationDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetYearMonthDurationDescriptor.java @@ -69,8 +69,8 @@ public class GetYearMonthDurationDescriptor extends AbstractScalarFunctionDynami @SuppressWarnings("unchecked") private ISerializerDeserializer<AYearMonthDuration> yearMonthDurationSerde = - SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer( - BuiltinType.AYEARMONTHDURATION); + SerializerDeserializerProvider.INSTANCE + .getSerializerDeserializer(BuiltinType.AYEARMONTHDURATION); AMutableYearMonthDuration aYearMonthDuration = new AMutableYearMonthDuration(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalBinDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalBinDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalBinDescriptor.java index 3426c28..5694c27 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalBinDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalBinDescriptor.java @@ -198,12 +198,12 @@ public class IntervalBinDescriptor extends AbstractScalarFunctionDynamicDescript binEndChronon = DurationArithmeticOperations.addDuration(chrononToStart, yearMonth * ((int) binIndex + 1), dayTime * (binIndex + 1), false); - binStartChronon = binStartChronon / GregorianCalendarSystem.CHRONON_OF_DAY - + ((binStartChronon < 0 + binStartChronon = + binStartChronon / GregorianCalendarSystem.CHRONON_OF_DAY + ((binStartChronon < 0 && binStartChronon % GregorianCalendarSystem.CHRONON_OF_DAY != 0) ? -1 : 0); - binEndChronon = binEndChronon / GregorianCalendarSystem.CHRONON_OF_DAY - + ((binEndChronon < 0 + binEndChronon = + binEndChronon / GregorianCalendarSystem.CHRONON_OF_DAY + ((binEndChronon < 0 && binEndChronon % GregorianCalendarSystem.CHRONON_OF_DAY != 0) ? -1 : 0); break; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MillisecondsFromDayTimeDurationDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MillisecondsFromDayTimeDurationDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MillisecondsFromDayTimeDurationDescriptor.java index bab73e5..c3bf58d 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MillisecondsFromDayTimeDurationDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MillisecondsFromDayTimeDurationDescriptor.java @@ -68,8 +68,8 @@ public class MillisecondsFromDayTimeDurationDescriptor extends AbstractScalarFun private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT64); + private ISerializerDeserializer<AInt64> int64Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); AMutableInt64 aInt64 = new AMutableInt64(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MonthsFromYearMonthDurationDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MonthsFromYearMonthDurationDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MonthsFromYearMonthDurationDescriptor.java index 5eed081..3d595c3 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MonthsFromYearMonthDurationDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/MonthsFromYearMonthDurationDescriptor.java @@ -68,8 +68,8 @@ public class MonthsFromYearMonthDurationDescriptor extends AbstractScalarFunctio private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT64); + private ISerializerDeserializer<AInt64> int64Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); AMutableInt64 aInt64 = new AMutableInt64(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/OverlapBinsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/OverlapBinsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/OverlapBinsDescriptor.java index 8e1064f..6980c65 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/OverlapBinsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/OverlapBinsDescriptor.java @@ -220,8 +220,8 @@ public class OverlapBinsDescriptor extends AbstractScalarFunctionDynamicDescript + ((binStartChronon < 0 && binStartChronon % GregorianCalendarSystem.CHRONON_OF_DAY != 0) ? -1 : 0); - binEndChronon = binEndChronon / GregorianCalendarSystem.CHRONON_OF_DAY - + ((binEndChronon < 0 + binEndChronon = + binEndChronon / GregorianCalendarSystem.CHRONON_OF_DAY + ((binEndChronon < 0 && binEndChronon % GregorianCalendarSystem.CHRONON_OF_DAY != 0) ? -1 : 0); aInterval.setValue(binStartChronon, binEndChronon, intervalTypeTag); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateDescriptor.java index a615b09..e463eed 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateDescriptor.java @@ -80,8 +80,8 @@ public class ParseDateDescriptor extends AbstractScalarFunctionDynamicDescriptor private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADATE); + private ISerializerDeserializer<ADate> dateSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADATE); private AMutableDate aDate = new AMutableDate(0); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateTimeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateTimeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateTimeDescriptor.java index c63a4e5..a391529 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateTimeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseDateTimeDescriptor.java @@ -75,8 +75,8 @@ public class ParseDateTimeDescriptor extends AbstractScalarFunctionDynamicDescri private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ADateTime> datetimeSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADATETIME); + private ISerializerDeserializer<ADateTime> datetimeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADATETIME); private AMutableDateTime aDateTime = new AMutableDateTime(0); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseTimeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseTimeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseTimeDescriptor.java index 8fa1d56..948c779 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseTimeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/ParseTimeDescriptor.java @@ -76,8 +76,8 @@ public class ParseTimeDescriptor extends AbstractScalarFunctionDynamicDescriptor private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ATIME); + private ISerializerDeserializer<ATime> timeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ATIME); private AMutableTime aTime = new AMutableTime(0); private final UTF8StringPointable utf8Ptr = new UTF8StringPointable(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromDatetimeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromDatetimeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromDatetimeDescriptor.java index 6ebed0f..273cba4 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromDatetimeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromDatetimeDescriptor.java @@ -76,8 +76,8 @@ public class TimeFromDatetimeDescriptor extends AbstractScalarFunctionDynamicDes // possible returning types @SuppressWarnings("unchecked") - private ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ATIME); + private ISerializerDeserializer<ATime> timeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ATIME); private AMutableTime aTime = new AMutableTime(0); @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromUnixTimeInMsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromUnixTimeInMsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromUnixTimeInMsDescriptor.java index ce4a5c4..a253a89 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromUnixTimeInMsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/TimeFromUnixTimeInMsDescriptor.java @@ -70,8 +70,8 @@ public class TimeFromUnixTimeInMsDescriptor extends AbstractScalarFunctionDynami // possible output types @SuppressWarnings("unchecked") - private ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ATIME); + private ISerializerDeserializer<ATime> timeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ATIME); private AMutableTime aTime = new AMutableTime(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDateInDaysDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDateInDaysDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDateInDaysDescriptor.java index 53f521b..3dc449d 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDateInDaysDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDateInDaysDescriptor.java @@ -71,8 +71,8 @@ public class UnixTimeFromDateInDaysDescriptor extends AbstractScalarFunctionDyna // possible returning types private AMutableInt64 aInt64 = new AMutableInt64(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT64); + private ISerializerDeserializer<AInt64> int64Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); @Override public void evaluate(IFrameTupleReference tuple, IPointable result) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInMsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInMsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInMsDescriptor.java index f5628d4..2dc57c5 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInMsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInMsDescriptor.java @@ -69,8 +69,8 @@ public class UnixTimeFromDatetimeInMsDescriptor extends AbstractScalarFunctionDy // possible returning types private AMutableInt64 aInt64 = new AMutableInt64(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT64); + private ISerializerDeserializer<AInt64> int64Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); @Override public void evaluate(IFrameTupleReference tuple, IPointable result) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInSecsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInSecsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInSecsDescriptor.java index ade2093..34fedb6 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInSecsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromDatetimeInSecsDescriptor.java @@ -75,8 +75,8 @@ public class UnixTimeFromDatetimeInSecsDescriptor extends AbstractScalarFunction // possible returning types private AMutableInt64 aInt64 = new AMutableInt64(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT64); + private ISerializerDeserializer<AInt64> int64Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); @Override public void evaluate(IFrameTupleReference tuple, IPointable result) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromTimeInMsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromTimeInMsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromTimeInMsDescriptor.java index 382feb0..0909764 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromTimeInMsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/UnixTimeFromTimeInMsDescriptor.java @@ -71,8 +71,8 @@ public class UnixTimeFromTimeInMsDescriptor extends AbstractScalarFunctionDynami // possible returning types private AMutableInt64 aInt64 = new AMutableInt64(0); @SuppressWarnings("unchecked") - private ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT64); + private ISerializerDeserializer<AInt64> int64Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); @Override public void evaluate(IFrameTupleReference tuple, IPointable result) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/YearMonthDurationComparatorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/YearMonthDurationComparatorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/YearMonthDurationComparatorDescriptor.java index 42809d8..5748956 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/YearMonthDurationComparatorDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/YearMonthDurationComparatorDescriptor.java @@ -68,8 +68,8 @@ public class YearMonthDurationComparatorDescriptor extends AbstractScalarFunctio private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); @SuppressWarnings("unchecked") - private ISerializerDeserializer<ABoolean> boolSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ABOOLEAN); + private ISerializerDeserializer<ABoolean> boolSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ABOOLEAN); @Override public void evaluate(IFrameTupleReference tuple, IPointable result) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/utils/RegExpMatcher.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/utils/RegExpMatcher.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/utils/RegExpMatcher.java index 9206262..8d238df 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/utils/RegExpMatcher.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/utils/RegExpMatcher.java @@ -113,8 +113,8 @@ public class RegExpMatcher { StringEvaluatorUtils.copyResetUTF8Pointable(patternPtr, lastPatternStorage, lastPatternPtr); // ! object creation ! String inputPatternString = lastPatternPtr.toString(); - String patternString = patternGenerator == null ? inputPatternString : patternGenerator - .toRegExpPatternString(inputPatternString); + String patternString = patternGenerator == null ? inputPatternString + : patternGenerator.toRegExpPatternString(inputPatternString); if (newFlag) { pattern = Pattern.compile(patternString, StringEvaluatorUtils.toFlag(flagPtr.toString())); @@ -167,8 +167,8 @@ public class RegExpMatcher { */ public String replace(UTF8StringPointable replaceStrPtr) { // Sets up a new replacement string if necessary. - final boolean newReplace = replaceStrPtr != null - && (replaceStr == null || lastReplaceStrPtr.compareTo(replaceStrPtr) != 0); + final boolean newReplace = + replaceStrPtr != null && (replaceStr == null || lastReplaceStrPtr.compareTo(replaceStrPtr) != 0); if (newReplace) { StringEvaluatorUtils.copyResetUTF8Pointable(replaceStrPtr, lastReplaceStorage, lastReplaceStrPtr); replaceStr = replaceStrPtr.toString(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/DeepEqualityVisitorHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/DeepEqualityVisitorHelper.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/DeepEqualityVisitorHelper.java index 000425e..cc842e6 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/DeepEqualityVisitorHelper.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/DeepEqualityVisitorHelper.java @@ -32,8 +32,10 @@ public class DeepEqualityVisitorHelper { public static final int TABLE_SIZE = 100; public static final int TABLE_FRAME_SIZE = 32768; - private final ListItemBinaryHashFunctionFactory listItemBinaryHashFunctionFactory = ListItemBinaryHashFunctionFactory.INSTANCE; - private final ListItemBinaryComparatorFactory listItemBinaryComparatorFactory = ListItemBinaryComparatorFactory.INSTANCE; + private final ListItemBinaryHashFunctionFactory listItemBinaryHashFunctionFactory = + ListItemBinaryHashFunctionFactory.INSTANCE; + private final ListItemBinaryComparatorFactory listItemBinaryComparatorFactory = + ListItemBinaryComparatorFactory.INSTANCE; private final IBinaryHashFunction putHashFunc = listItemBinaryHashFunctionFactory.createBinaryHashFunction(); private final IBinaryHashFunction getHashFunc = listItemBinaryHashFunctionFactory.createBinaryHashFunction(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/ListDeepEqualityChecker.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/ListDeepEqualityChecker.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/ListDeepEqualityChecker.java index bcb41f5..6341b79 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/ListDeepEqualityChecker.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/ListDeepEqualityChecker.java @@ -40,7 +40,8 @@ class ListDeepEqualityChecker { private BinaryEntry valEntry = new BinaryEntry(); private final DeepEqualityVisitorHelper deepEqualityVisitorHelper = new DeepEqualityVisitorHelper(); - private final Pair<IVisitablePointable, Boolean> itemVisitorArg = new Pair<IVisitablePointable, Boolean>(null, false); + private final Pair<IVisitablePointable, Boolean> itemVisitorArg = + new Pair<IVisitablePointable, Boolean>(null, false); public ListDeepEqualityChecker() { hashMap = deepEqualityVisitorHelper.initializeHashMap(valEntry); @@ -50,22 +51,22 @@ class ListDeepEqualityChecker { DeepEqualityVisitor visitor) throws HyracksDataException { this.visitor = visitor; - AListVisitablePointable listLeft = (AListVisitablePointable)listPointableLeft; + AListVisitablePointable listLeft = (AListVisitablePointable) listPointableLeft; List<IVisitablePointable> itemsLeft = listLeft.getItems(); List<IVisitablePointable> itemTagTypesLeft = listLeft.getItemTags(); - - AListVisitablePointable listRight = (AListVisitablePointable)listPointableRight; + AListVisitablePointable listRight = (AListVisitablePointable) listPointableRight; List<IVisitablePointable> itemsRight = listRight.getItems(); List<IVisitablePointable> itemTagTypesRight = listRight.getItemTags(); - if (itemsLeft.size() != itemsRight.size()) return false; + if (itemsLeft.size() != itemsRight.size()) + return false; boolean isOrderedRight = listLeft.ordered(); if (isOrderedRight != listRight.ordered()) return false; - if( isOrderedRight) { + if (isOrderedRight) { return processOrderedList(itemsLeft, itemTagTypesLeft, itemsRight, itemTagTypesRight); } else { return processUnorderedList(itemsLeft, itemTagTypesLeft, itemsRight, itemTagTypesRight); @@ -75,9 +76,10 @@ class ListDeepEqualityChecker { private boolean processOrderedList(List<IVisitablePointable> itemsLeft, List<IVisitablePointable> itemTagTypesLeft, List<IVisitablePointable> itemsRight, List<IVisitablePointable> itemTagTypesRight) throws HyracksDataException { - for(int i=0; i<itemsLeft.size(); i++) { + for (int i = 0; i < itemsLeft.size(); i++) { ATypeTag fieldTypeLeft = PointableHelper.getTypeTag(itemTagTypesLeft.get(i)); - if(fieldTypeLeft.isDerivedType() && fieldTypeLeft != PointableHelper.getTypeTag(itemTagTypesRight.get(i))) { + if (fieldTypeLeft.isDerivedType() + && fieldTypeLeft != PointableHelper.getTypeTag(itemTagTypesRight.get(i))) { return false; } itemVisitorArg.first = itemsRight.get(i); @@ -89,13 +91,13 @@ class ListDeepEqualityChecker { return true; } - private boolean processUnorderedList(List<IVisitablePointable> itemsLeft, List<IVisitablePointable> itemTagTypesLeft, - List<IVisitablePointable> itemsRight, List<IVisitablePointable> itemTagTypesRight) - throws HyracksDataException { + private boolean processUnorderedList(List<IVisitablePointable> itemsLeft, + List<IVisitablePointable> itemTagTypesLeft, List<IVisitablePointable> itemsRight, + List<IVisitablePointable> itemTagTypesRight) throws HyracksDataException { hashMap.clear(); // Build phase: Add items into hash map, starting with first list. - for(int i=0; i<itemsLeft.size(); i++) { + for (int i = 0; i < itemsLeft.size(); i++) { IVisitablePointable item = itemsLeft.get(i); byte[] buf = item.getByteArray(); int off = item.getStartOffset(); @@ -108,12 +110,11 @@ class ListDeepEqualityChecker { return probeHashMap(itemsLeft, itemTagTypesLeft, itemsRight, itemTagTypesRight); } - private boolean probeHashMap(List<IVisitablePointable> itemsLeft, List<IVisitablePointable> itemTagTypesLeft, List<IVisitablePointable> itemsRight, List<IVisitablePointable> itemTagTypesRight) throws HyracksDataException { // Probe phase: Probe items from second list - for(int indexRight=0; indexRight<itemsRight.size(); indexRight++) { + for (int indexRight = 0; indexRight < itemsRight.size(); indexRight++) { IVisitablePointable itemRight = itemsRight.get(indexRight); byte[] buf = itemRight.getByteArray(); int off = itemRight.getStartOffset(); @@ -128,7 +129,8 @@ class ListDeepEqualityChecker { int indexLeft = IntegerPointable.getInteger(entry.getBuf(), entry.getOffset()); ATypeTag fieldTypeLeft = PointableHelper.getTypeTag(itemTagTypesLeft.get(indexLeft)); - if(fieldTypeLeft.isDerivedType() && fieldTypeLeft != PointableHelper.getTypeTag(itemTagTypesRight.get(indexRight))) { + if (fieldTypeLeft.isDerivedType() + && fieldTypeLeft != PointableHelper.getTypeTag(itemTagTypesRight.get(indexRight))) { return false; } @@ -140,4 +142,3 @@ class ListDeepEqualityChecker { return true; } } - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/RecordDeepEqualityChecker.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/RecordDeepEqualityChecker.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/RecordDeepEqualityChecker.java index 699f2f8..1c033e9 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/RecordDeepEqualityChecker.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/visitors/RecordDeepEqualityChecker.java @@ -32,8 +32,8 @@ import org.apache.hyracks.data.std.primitive.IntegerPointable; import org.apache.hyracks.data.std.util.BinaryEntry; class RecordDeepEqualityChecker { - private final Pair<IVisitablePointable, Boolean> nestedVisitorArg = new Pair<IVisitablePointable, Boolean>(null, - false); + private final Pair<IVisitablePointable, Boolean> nestedVisitorArg = + new Pair<IVisitablePointable, Boolean>(null, false); private final DeepEqualityVisitorHelper deepEqualityVisitorHelper = new DeepEqualityVisitorHelper(); private DeepEqualityVisitor visitor; private BinaryEntry keyEntry = new BinaryEntry(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/IncompatibleTypeException.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/IncompatibleTypeException.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/IncompatibleTypeException.java index 3e5b311..5feb87f 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/IncompatibleTypeException.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/IncompatibleTypeException.java @@ -35,8 +35,7 @@ public class IncompatibleTypeException extends RuntimeDataException { // Incompatible input parameters, e.g., "1.0" > 1.0 public IncompatibleTypeException(String functionName, byte typeTagLeft, byte typeTagRight) { - super(ErrorCode.TYPE_INCOMPATIBLE, functionName, - EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(typeTagLeft), + super(ErrorCode.TYPE_INCOMPATIBLE, functionName, EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(typeTagLeft), EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(typeTagRight)); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/TypeMismatchException.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/TypeMismatchException.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/TypeMismatchException.java index c061197..f6cf1c7 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/TypeMismatchException.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/TypeMismatchException.java @@ -41,5 +41,4 @@ public class TypeMismatchException extends RuntimeDataException { EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(actualTypeTag)); } - } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedTypeException.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedTypeException.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedTypeException.java index af86bd8..29b3819 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedTypeException.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedTypeException.java @@ -34,7 +34,6 @@ public class UnsupportedTypeException extends RuntimeDataException { // Unsupported input type. public UnsupportedTypeException(String funcName, byte actualTypeTag) { - super(ErrorCode.TYPE_UNSUPPORTED, funcName, - EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(actualTypeTag)); + super(ErrorCode.TYPE_UNSUPPORTED, funcName, EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(actualTypeTag)); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java index 0de61ff..7913d48 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java @@ -60,9 +60,8 @@ public class JobEventListenerFactory implements IJobEventListenerFactory { @Override public void updateListenerJobParameters(JobParameterByteStore jobParameterByteStore) { - String AsterixTransactionIdString = - new String(jobParameterByteStore.getParameterValue(TRANSACTION_ID_PARAMETER_NAME, 0, - TRANSACTION_ID_PARAMETER_NAME.length)); + String AsterixTransactionIdString = new String(jobParameterByteStore + .getParameterValue(TRANSACTION_ID_PARAMETER_NAME, 0, TRANSACTION_ID_PARAMETER_NAME.length)); if (AsterixTransactionIdString.length() > 0) { this.txnId = new TxnId(Integer.parseInt(AsterixTransactionIdString)); } @@ -75,8 +74,9 @@ public class JobEventListenerFactory implements IJobEventListenerFactory { @Override public void jobletFinish(JobStatus jobStatus) { try { - ITransactionManager txnManager = ((INcApplicationContext) jobletContext.getServiceContext() - .getApplicationContext()).getTransactionSubsystem().getTransactionManager(); + ITransactionManager txnManager = + ((INcApplicationContext) jobletContext.getServiceContext().getApplicationContext()) + .getTransactionSubsystem().getTransactionManager(); ITransactionContext txnContext = txnManager.getTransactionContext(txnId); txnContext.setWriteTxn(transactionalWrite); if (jobStatus != JobStatus.FAILURE) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java index 656ea09..9b9206c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java @@ -94,8 +94,7 @@ public class MultiTransactionJobletEventListenerFactory implements IJobEventList new TransactionOptions(ITransactionManager.AtomicityLevel.ENTITY_LEVEL); for (TxnId subTxnId : txnIdMap.values()) { ((INcApplicationContext) jobletContext.getServiceContext().getApplicationContext()) - .getTransactionSubsystem().getTransactionManager() - .beginTransaction(subTxnId, options); + .getTransactionSubsystem().getTransactionManager().beginTransaction(subTxnId, options); } } catch (ACIDException e) { throw new Error(e); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java index ff009dc..9a42420 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java @@ -70,9 +70,8 @@ public class NodeJobTracker implements INodeJobTracker { @Override public synchronized Set<JobId> getPendingJobs(String nodeId) { - return nodeJobs.containsKey(nodeId) ? - Collections.unmodifiableSet(nodeJobs.get(nodeId)) : - Collections.emptySet(); + return nodeJobs.containsKey(nodeId) ? Collections.unmodifiableSet(nodeJobs.get(nodeId)) + : Collections.emptySet(); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/runningaggregates/std/TidRunningAggregateDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/runningaggregates/std/TidRunningAggregateDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/runningaggregates/std/TidRunningAggregateDescriptor.java index 207ce85..0a959d6 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/runningaggregates/std/TidRunningAggregateDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/runningaggregates/std/TidRunningAggregateDescriptor.java @@ -60,8 +60,8 @@ public class TidRunningAggregateDescriptor extends AbstractRunningAggregateFunct return new IRunningAggregateEvaluator() { private final ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); - private final ISerializerDeserializer<AInt64> serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT64); + private final ISerializerDeserializer<AInt64> serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); private final AMutableInt64 m = new AMutableInt64(0); private int cnt; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/unnestingfunctions/std/RangeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/unnestingfunctions/std/RangeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/unnestingfunctions/std/RangeDescriptor.java index d102d7c..5ad8d3f 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/unnestingfunctions/std/RangeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/unnestingfunctions/std/RangeDescriptor.java @@ -67,8 +67,8 @@ public class RangeDescriptor extends AbstractUnnestingFunctionDynamicDescriptor return new IUnnestingEvaluator() { private ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); @SuppressWarnings("rawtypes") - private ISerializerDeserializer serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT64); + private ISerializerDeserializer serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); private IPointable inputVal = new VoidPointable(); private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); private IScalarEvaluator eval1 = args[1].createScalarEvaluator(ctx); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java index 6994862..c5eeb65 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java @@ -277,8 +277,8 @@ public class ClusterStateManager implements IClusterStateManager { clusterActiveLocations.add(p.getActiveNodeId()); } } - clusterPartitionConstraint = new AlgebricksAbsolutePartitionConstraint( - clusterActiveLocations.toArray(new String[] {})); + clusterPartitionConstraint = + new AlgebricksAbsolutePartitionConstraint(clusterActiveLocations.toArray(new String[] {})); } @Override @@ -443,8 +443,8 @@ public class ClusterStateManager implements IClusterStateManager { } private void updateNodeConfig(String nodeId, Map<IOption, Object> configuration) { - ConfigManager configManager = ((ConfigManagerApplicationConfig) appCtx.getServiceContext().getAppConfig()) - .getConfigManager(); + ConfigManager configManager = + ((ConfigManagerApplicationConfig) appCtx.getServiceContext().getAppConfig()).getConfigManager(); configuration.forEach((key, value) -> { if (key.section() == Section.NC) { configManager.set(nodeId, key, value); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/LicensingIT.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/LicensingIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/LicensingIT.java index a0e9385..6d4af8c 100644 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/LicensingIT.java +++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/LicensingIT.java @@ -76,8 +76,8 @@ public class LicensingIT { @Test public void ensureNoMissingLicenses() throws IOException { for (String licenseArtifactName : getLicenseArtifactNames()) { - final File licenseFile = new File( - FileUtil.joinPath(installerDir, pathToLicensingFiles(), licenseArtifactName)); + final File licenseFile = + new File(FileUtil.joinPath(installerDir, pathToLicensingFiles(), licenseArtifactName)); List<String> badLines = new ArrayList<>(); for (String line : FileUtils.readLines(licenseFile, StandardCharsets.UTF_8)) { if (line.matches("^\\s*MISSING:.*")) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java index 1d3c1c5..d7eea9a 100644 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java +++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java @@ -55,8 +55,8 @@ public class NCServiceExecutionIT { // Important paths and files for this test. // The "target" subdirectory of asterix-server. All outputs go here. - public static final String TARGET_DIR = StringUtils.join(new String[] { "../asterix-server/target" }, - File.separator); + public static final String TARGET_DIR = + StringUtils.join(new String[] { "../asterix-server/target" }, File.separator); // Directory where the NCs create and store all data, as configured by // src/test/resources/NCServiceExecutionIT/cc.conf. @@ -65,12 +65,12 @@ public class NCServiceExecutionIT { // The log directory, where all CC, NCService, and NC logs are written. CC and // NCService logs are configured on the HyracksVirtualCluster below. NC logs // are configured in src/test/resources/NCServiceExecutionIT/ncservice*.conf. - public static final String LOG_DIR = StringUtils.join(new String[] { TARGET_DIR, "failsafe-reports" }, - File.separator); + public static final String LOG_DIR = + StringUtils.join(new String[] { TARGET_DIR, "failsafe-reports" }, File.separator); // Directory where *.conf files are located. - public static final String CONF_DIR = StringUtils - .join(new String[] { TARGET_DIR, "test-classes", "NCServiceExecutionIT" }, File.separator); + public static final String CONF_DIR = + StringUtils.join(new String[] { TARGET_DIR, "test-classes", "NCServiceExecutionIT" }, File.separator); // The app.home specified for HyracksVirtualCluster. The NCService expects // to find the NC startup script in ${app.home}/bin. @@ -84,13 +84,13 @@ public class NCServiceExecutionIT { // Path to the actual AQL test files, which we borrow from asterix-app. This is // passed to TestExecutor. - protected static final String TESTS_DIR = StringUtils - .join(new String[] { ASTERIX_APP_DIR, "src", "test", "resources", "runtimets" }, File.separator); + protected static final String TESTS_DIR = + StringUtils.join(new String[] { ASTERIX_APP_DIR, "src", "test", "resources", "runtimets" }, File.separator); // Path that actual results are written to. We create and clean this directory // here, and also pass it to TestExecutor which writes the test output there. - public static final String ACTUAL_RESULTS_DIR = StringUtils.join(new String[] { TARGET_DIR, "ittest" }, - File.separator); + public static final String ACTUAL_RESULTS_DIR = + StringUtils.join(new String[] { TARGET_DIR, "ittest" }, File.separator); private static final Logger LOGGER = LogManager.getLogger(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NcLifecycleIT.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NcLifecycleIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NcLifecycleIT.java index f69f849..9e3a029 100644 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NcLifecycleIT.java +++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NcLifecycleIT.java @@ -69,7 +69,8 @@ public class NcLifecycleIT { this.tcCtx = tcCtx; } - @Rule public TestRule retainLogs = new RetainLogsRule(NCServiceExecutionIT.ASTERIX_APP_DIR, reportPath, this); + @Rule + public TestRule retainLogs = new RetainLogsRule(NCServiceExecutionIT.ASTERIX_APP_DIR, reportPath, this); @Before public void before() throws Exception { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/RecoveryIT.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/RecoveryIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/RecoveryIT.java index 7aea282..163e279 100644 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/RecoveryIT.java +++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/RecoveryIT.java @@ -67,8 +67,8 @@ public class RecoveryIT { File outdir = new File(PATH_ACTUAL); outdir.mkdirs(); - File externalTestsJar = new File( - StringUtils.join(new String[] { "..", "asterix-external-data", "target" }, File.separator)) + File externalTestsJar = + new File(StringUtils.join(new String[] { "..", "asterix-external-data", "target" }, File.separator)) .listFiles((dir, name) -> name.matches("asterix-external-data-.*-tests.jar"))[0]; asterixInstallerPath = new File(System.getProperty("user.dir")); @@ -106,8 +106,8 @@ public class RecoveryIT { public static void tearDown() throws Exception { File outdir = new File(PATH_ACTUAL); FileUtils.deleteDirectory(outdir); - File dataCopyDir = new File( - ncServiceHomePath + File.separator + ".." + File.separator + ".." + File.separator + "data"); + File dataCopyDir = + new File(ncServiceHomePath + File.separator + ".." + File.separator + ".." + File.separator + "data"); FileUtils.deleteDirectory(dataCopyDir); TestExecutor.executeScript(pb, scriptHomePath + File.separator + "setup_teardown" + File.separator + "stop_and_delete.sh"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/ReplicationIT.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/ReplicationIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/ReplicationIT.java index 289dbf2..ad1078d 100644 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/ReplicationIT.java +++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/ReplicationIT.java @@ -81,7 +81,8 @@ public class ReplicationIT { this.tcCtx = tcCtx; } - @Rule public TestRule retainLogs = new RetainLogsRule(NCServiceExecutionIT.ASTERIX_APP_DIR, reportPath, this); + @Rule + public TestRule retainLogs = new RetainLogsRule(NCServiceExecutionIT.ASTERIX_APP_DIR, reportPath, this); @Before public void before() throws Exception { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java index b6cb030..190cead 100644 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java +++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java @@ -108,8 +108,8 @@ public class SampleLocalClusterIT { @Test public void test0_startCluster() throws Exception { - Process process = new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/stop-sample-cluster.sh"), "-f") - .inheritIO().start(); + Process process = + new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/stop-sample-cluster.sh"), "-f").inheritIO().start(); Assert.assertEquals(0, process.waitFor()); process = new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/start-sample-cluster.sh")).inheritIO().start(); Assert.assertEquals(0, process.waitFor()); @@ -127,8 +127,8 @@ public class SampleLocalClusterIT { @Test public void test2_stopCluster() throws Exception { - Process process = new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/stop-sample-cluster.sh")).inheritIO() - .start(); + Process process = + new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/stop-sample-cluster.sh")).inheritIO().start(); Assert.assertEquals(0, process.waitFor()); try { new URL("http://127.0.0.1:19002";).openConnection().connect(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/template/TemplateHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/template/TemplateHelper.java b/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/template/TemplateHelper.java index d2f52dc..bd5400d 100644 --- a/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/template/TemplateHelper.java +++ b/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/template/TemplateHelper.java @@ -59,8 +59,8 @@ public class TemplateHelper { } public File resolveTemplateFile(File inputFile) throws IOException { - File outputFile = File.createTempFile("template.", "." + - inputFile.getName().substring(0, inputFile.getName().lastIndexOf(".template"))); + File outputFile = File.createTempFile("template.", + "." + inputFile.getName().substring(0, inputFile.getName().lastIndexOf(".template"))); outputFile.deleteOnExit(); processFile(inputFile, outputFile); return outputFile; @@ -71,7 +71,7 @@ public class TemplateHelper { outputFile.getParentFile().mkdirs(); } try (BufferedReader reader = new BufferedReader(new FileReader(inputFile)); - BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile))) { + BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile))) { String line; while ((line = reader.readLine()) != null) { Matcher m = replacementPattern.matcher(line); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java b/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java index ebd945e..406a762 100644 --- a/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java +++ b/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java @@ -42,7 +42,7 @@ public class TestSuiteParser { JAXBContext ctx = JAXBContext.newInstance(org.apache.asterix.testframework.xml.TestSuite.class); Unmarshaller um = ctx.createUnmarshaller(); - return (org.apache.asterix.testframework.xml.TestSuite) um.unmarshal(new SAXSource(saxParser.getXMLReader(), - new InputSource(testSuiteCatalog.toURI().toString()))); + return (org.apache.asterix.testframework.xml.TestSuite) um.unmarshal( + new SAXSource(saxParser.getXMLReader(), new InputSource(testSuiteCatalog.toURI().toString()))); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/CustOrdDataGen.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/CustOrdDataGen.java b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/CustOrdDataGen.java index b605f73..5127d7b 100644 --- a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/CustOrdDataGen.java +++ b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/CustOrdDataGen.java @@ -44,8 +44,8 @@ public class CustOrdDataGen { "Lake St.", "Hill St.", "Park St.", "View St." }; private static final int MIN_STREET_NUM = 1; private static final int MAX_STREET_NUM = 10000; - private static final String[] CITIES = { "Seattle", "San Jose", "Mountain View", "Los Angeles", "Sunnyvale", - "Portland" }; + private static final String[] CITIES = + { "Seattle", "San Jose", "Mountain View", "Los Angeles", "Sunnyvale", "Portland" }; private static final int MIN_INTERESTS = 0; private static final int MAX_INTERESTS = 5; @@ -67,13 +67,13 @@ public class CustOrdDataGen { private String[] ORDER_PRIORITIES = { "LOW", "MEDIUM", "HIGH", "PREMIUM" }; private String[] ORDER_STATUSES = { "ORDER_PLACED", "PAYMENT_RECEIVED", "ORDER_SHIPPED", "ORDER_DELIVERED" }; - private String[] firstNames = { "Joe", "John", "Jill", "Gill", "Bill", "William", "Kathy", "Cathey", "Jane", - "Albert" }; - private String[] lastNames = { "Doe", "Smith", "Li", "Singh", "Williams", "Davis", "Brown", "Wilson", "Moore", - "Thomas" }; + private String[] firstNames = + { "Joe", "John", "Jill", "Gill", "Bill", "William", "Kathy", "Cathey", "Jane", "Albert" }; + private String[] lastNames = + { "Doe", "Smith", "Li", "Singh", "Williams", "Davis", "Brown", "Wilson", "Moore", "Thomas" }; - private static final String[] UNDECLARED_FIELD_NAMES = { "param1", "param2", "param3", "param4", "param5", - "param6", "param7", "param8", "param9", "param10" }; + private static final String[] UNDECLARED_FIELD_NAMES = + { "param1", "param2", "param3", "param4", "param5", "param6", "param7", "param8", "param9", "param10" }; private int currentCID = 0; private int currentOID = 0; @@ -414,8 +414,8 @@ public class CustOrdDataGen { customersFile.write(customerList.get(ix).getJSON() + "\n"); // generate orders - int numOrders = Math.abs(rndValue.nextInt()) % (MAX_ORDERS_PER_CUST - MIN_ORDERS_PER_CUST) - + MIN_ORDERS_PER_CUST; + int numOrders = + Math.abs(rndValue.nextInt()) % (MAX_ORDERS_PER_CUST - MIN_ORDERS_PER_CUST) + MIN_ORDERS_PER_CUST; for (int i = 0; i < numOrders; i++) { ordersBatch[i].generateFieldValues(customerList.get(ix)); ordersList.add(ordersBatch[i]);
