http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/AbstractDataParser.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/AbstractDataParser.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/AbstractDataParser.java index 1cbe364..8351931 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/AbstractDataParser.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/AbstractDataParser.java @@ -110,35 +110,35 @@ public abstract class AbstractDataParser implements IDataParser { // Serializers @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ADouble> doubleSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADOUBLE); + protected ISerializerDeserializer<ADouble> doubleSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADOUBLE); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE - .getAStringSerializerDeserializer(); + protected ISerializerDeserializer<AString> stringSerde = + SerializerDeserializerProvider.INSTANCE.getAStringSerializerDeserializer(); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ABinary> binarySerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ABINARY); + protected ISerializerDeserializer<ABinary> binarySerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ABINARY); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AFloat> floatSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AFLOAT); + protected ISerializerDeserializer<AFloat> floatSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AFLOAT); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt8> int8Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT8); + protected ISerializerDeserializer<AInt8> int8Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT8); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt16> int16Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT16); + protected ISerializerDeserializer<AInt16> int16Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT16); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt32> int32Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT32); + protected ISerializerDeserializer<AInt32> int32Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT32); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AInt64> int64Serde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINT64); + protected ISerializerDeserializer<AInt64> int64Serde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINT64); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ABoolean> booleanSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ABOOLEAN); + protected ISerializerDeserializer<ABoolean> booleanSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ABOOLEAN); @SuppressWarnings("unchecked") - protected ISerializerDeserializer<ANull> nullSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ANULL); + protected ISerializerDeserializer<ANull> nullSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ANULL); protected final HexParser hexParser = new HexParser(); protected final Base64Parser base64Parser = new Base64Parser(); @@ -147,23 +147,23 @@ public abstract class AbstractDataParser implements IDataParser { // (xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx) when parsing the data. // Thus, we need to call UUID.fromStringToAMutableUUID() to convert it to the internal representation (byte []). @SuppressWarnings("unchecked") - protected ISerializerDeserializer<AUUID> uuidSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AUUID); + protected ISerializerDeserializer<AUUID> uuidSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AUUID); // To avoid race conditions, the serdes for temporal and spatial data types needs to be one per parser // ^^^^^^^^^^^^^^^^^^^^^^^^ ??? then why all these serdes are static? @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<ATime> timeSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ATIME); + protected static final ISerializerDeserializer<ATime> timeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ATIME); @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<ADate> dateSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADATE); + protected static final ISerializerDeserializer<ADate> dateSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADATE); @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<ADateTime> datetimeSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADATETIME); + protected static final ISerializerDeserializer<ADateTime> datetimeSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADATETIME); @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<ADuration> durationSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ADURATION); + protected static final ISerializerDeserializer<ADuration> durationSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADURATION); @SuppressWarnings("unchecked") protected static final ISerializerDeserializer<ADayTimeDuration> dayTimeDurationSerde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ADAYTIMEDURATION); @@ -171,23 +171,23 @@ public abstract class AbstractDataParser implements IDataParser { protected static final ISerializerDeserializer<AYearMonthDuration> yearMonthDurationSerde = SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AYEARMONTHDURATION); @SuppressWarnings("unchecked") - protected final static ISerializerDeserializer<APoint> pointSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.APOINT); + protected final static ISerializerDeserializer<APoint> pointSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.APOINT); @SuppressWarnings("unchecked") - protected final static ISerializerDeserializer<APoint3D> point3DSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.APOINT3D); + protected final static ISerializerDeserializer<APoint3D> point3DSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.APOINT3D); @SuppressWarnings("unchecked") - protected final static ISerializerDeserializer<ACircle> circleSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ACIRCLE); + protected final static ISerializerDeserializer<ACircle> circleSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ACIRCLE); @SuppressWarnings("unchecked") - protected final static ISerializerDeserializer<ARectangle> rectangleSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ARECTANGLE); + protected final static ISerializerDeserializer<ARectangle> rectangleSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ARECTANGLE); @SuppressWarnings("unchecked") - protected final static ISerializerDeserializer<ALine> lineSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ALINE); + protected final static ISerializerDeserializer<ALine> lineSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ALINE); @SuppressWarnings("unchecked") - protected static final ISerializerDeserializer<AInterval> intervalSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.AINTERVAL); + protected static final ISerializerDeserializer<AInterval> intervalSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.AINTERVAL); protected String filename; @@ -224,8 +224,8 @@ public abstract class AbstractDataParser implements IDataParser { } } long chrononTimeInMs = ADateParserFactory.parseDatePart(datetime, 0, timeOffset); - chrononTimeInMs += ATimeParserFactory.parseTimePart(datetime, timeOffset + 1, - datetime.length() - timeOffset - 1); + chrononTimeInMs += + ATimeParserFactory.parseTimePart(datetime, timeOffset + 1, datetime.length() - timeOffset - 1); aDateTime.setValue(chrononTimeInMs); datetimeSerde.serialize(aDateTime, out); }
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/DelimitedDataParser.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/DelimitedDataParser.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/DelimitedDataParser.java index 0df1412..a7dbc30 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/DelimitedDataParser.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/DelimitedDataParser.java @@ -140,8 +140,8 @@ public class DelimitedDataParser extends AbstractDataParser implements IStreamDa // NULL. Note that string type can also process empty field as an // empty string if (!NonTaggedFormatUtil.isOptional(recordType.getFieldTypes()[i])) { - throw new RuntimeDataException(ErrorCode.PARSER_DELIMITED_NONOPTIONAL_NULL, - cursor.recordCount, cursor.fieldCount); + throw new RuntimeDataException(ErrorCode.PARSER_DELIMITED_NONOPTIONAL_NULL, cursor.recordCount, + cursor.fieldCount); } fieldValueBufferOutput.writeByte(ATypeTag.SERIALIZED_NULL_TYPE_TAG); } else { @@ -152,8 +152,8 @@ public class DelimitedDataParser extends AbstractDataParser implements IStreamDa cursor.fEnd -= cursor.doubleQuoteCount; cursor.isDoubleQuoteIncludedInThisField = false; } - valueParsers[i] - .parse(cursor.buffer, cursor.fStart, cursor.fEnd - cursor.fStart, fieldValueBufferOutput); + valueParsers[i].parse(cursor.buffer, cursor.fStart, cursor.fEnd - cursor.fStart, + fieldValueBufferOutput); areAllNullFields = false; } if (fldIds[i] < 0) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/RecordWithMetadataParser.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/RecordWithMetadataParser.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/RecordWithMetadataParser.java index ed33401..c92ee12 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/RecordWithMetadataParser.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/RecordWithMetadataParser.java @@ -49,8 +49,8 @@ public class RecordWithMetadataParser<T, O> implements IRecordWithMetadataParser private final ArrayBackedValueStorage[] metaFieldsNamesBuffers; private final int numberOfMetaFields; @SuppressWarnings("unchecked") - private final ISerializerDeserializer<AString> stringSerde = SerializerDeserializerProvider.INSTANCE - .getSerializerDeserializer(BuiltinType.ASTRING); + private final ISerializerDeserializer<AString> stringSerde = + SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(BuiltinType.ASTRING); public RecordWithMetadataParser(ARecordType metaType, IRecordDataParser<O> valueParser, IRecordConverter<T, RecordWithMetadataAndPK<O>> converter) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/TweetParser.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/TweetParser.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/TweetParser.java index be49863..e1c961a 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/TweetParser.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/TweetParser.java @@ -48,12 +48,12 @@ import java.io.IOException; import java.util.Iterator; public class TweetParser extends AbstractDataParser implements IRecordDataParser<String> { - private final IObjectPool<IARecordBuilder, ATypeTag> recordBuilderPool = new ListObjectPool<>( - new RecordBuilderFactory()); - private final IObjectPool<IAsterixListBuilder, ATypeTag> listBuilderPool = new ListObjectPool<>( - new ListBuilderFactory()); - private final IObjectPool<IMutableValueStorage, ATypeTag> abvsBuilderPool = new ListObjectPool<>( - new AbvsBuilderFactory()); + private final IObjectPool<IARecordBuilder, ATypeTag> recordBuilderPool = + new ListObjectPool<>(new RecordBuilderFactory()); + private final IObjectPool<IAsterixListBuilder, ATypeTag> listBuilderPool = + new ListObjectPool<>(new ListBuilderFactory()); + private final IObjectPool<IMutableValueStorage, ATypeTag> abvsBuilderPool = + new ListObjectPool<>(new AbvsBuilderFactory()); private ARecordType recordType; private UTF8StringWriter utf8Writer = new UTF8StringWriter(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/DelimitedDataParserFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/DelimitedDataParserFactory.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/DelimitedDataParserFactory.java index bba8ccc..f406729 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/DelimitedDataParserFactory.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/DelimitedDataParserFactory.java @@ -39,8 +39,8 @@ import org.apache.hyracks.dataflow.common.data.parsers.IValueParserFactory; public class DelimitedDataParserFactory extends AbstractRecordStreamParserFactory<char[]> { private static final long serialVersionUID = 1L; - private static final List<String> parserFormats = Collections - .unmodifiableList(Arrays.asList("csv", "delimited-text")); + private static final List<String> parserFormats = + Collections.unmodifiableList(Arrays.asList("csv", "delimited-text")); @Override public IRecordDataParser<char[]> createRecordParser(IHyracksTaskContext ctx) throws HyracksDataException { @@ -73,8 +73,8 @@ public class DelimitedDataParserFactory extends AbstractRecordStreamParserFactor if (delimiterValue == null) { delimiterValue = ExternalDataConstants.DEFAULT_DELIMITER; } else if (delimiterValue.length() != 1) { - throw new RuntimeDataException( - ErrorCode.PARSER_FACTORY_DELIMITED_DATA_PARSER_FACTORY_NOT_VALID_DELIMITER, delimiterValue); + throw new RuntimeDataException(ErrorCode.PARSER_FACTORY_DELIMITED_DATA_PARSER_FACTORY_NOT_VALID_DELIMITER, + delimiterValue); } return delimiterValue.charAt(0); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/HiveDataParserFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/HiveDataParserFactory.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/HiveDataParserFactory.java index c944554..489749c 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/HiveDataParserFactory.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/HiveDataParserFactory.java @@ -38,8 +38,8 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; public class HiveDataParserFactory implements IRecordDataParserFactory<Writable> { private static final long serialVersionUID = 1L; - private static final List<String> parserFormats = Collections - .unmodifiableList(Arrays.asList("hive", "hive-parser")); + private static final List<String> parserFormats = + Collections.unmodifiableList(Arrays.asList("hive", "hive-parser")); private Map<String, String> configuration; private ARecordType recordType; private String hiveSerdeClassName; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/AdapterFactoryProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/AdapterFactoryProvider.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/AdapterFactoryProvider.java index d6ac5d1..5740143 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/AdapterFactoryProvider.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/AdapterFactoryProvider.java @@ -68,8 +68,8 @@ public class AdapterFactoryProvider { Map<String, String> configuration, ARecordType recordType, int[] ridFields, boolean retainInput, boolean retainMissing, IMissingWriterFactory missingWriterFactory) throws HyracksDataException, AlgebricksException { - LookupAdapterFactory<?> adapterFactory = new LookupAdapterFactory<>(recordType, ridFields, retainInput, - retainMissing, missingWriterFactory); + LookupAdapterFactory<?> adapterFactory = + new LookupAdapterFactory<>(recordType, ridFields, retainInput, retainMissing, missingWriterFactory); adapterFactory.configure(serviceCtx, configuration); return adapterFactory; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/DatasourceFactoryProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/DatasourceFactoryProvider.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/DatasourceFactoryProvider.java index 859c9fd..c9dafbc 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/DatasourceFactoryProvider.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/DatasourceFactoryProvider.java @@ -68,8 +68,8 @@ public class DatasourceFactoryProvider { IInputStreamFactory streamSourceFactory; if (ExternalDataUtils.isExternal(streamSource)) { String dataverse = ExternalDataUtils.getDataverse(configuration); - streamSourceFactory = ExternalDataUtils.createExternalInputStreamFactory(libraryManager, dataverse, - streamSource); + streamSourceFactory = + ExternalDataUtils.createExternalInputStreamFactory(libraryManager, dataverse, streamSource); } else { switch (streamSource) { case ExternalDataConstants.STREAM_LOCAL_FILESYSTEM: @@ -87,8 +87,7 @@ public class DatasourceFactoryProvider { streamSourceFactory = (IInputStreamFactory) Class.forName(streamSource).newInstance(); } catch (Exception e) { throw new RuntimeDataException( - ErrorCode.PROVIDER_DATASOURCE_FACTORY_UNKNOWN_INPUT_STREAM_FACTORY, e, - streamSource); + ErrorCode.PROVIDER_DATASOURCE_FACTORY_UNKNOWN_INPUT_STREAM_FACTORY, e, streamSource); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/StreamRecordReaderProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/StreamRecordReaderProvider.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/StreamRecordReaderProvider.java index 701d0f2..4165fa8 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/StreamRecordReaderProvider.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/StreamRecordReaderProvider.java @@ -39,8 +39,8 @@ import org.apache.commons.lang3.tuple.Pair; public class StreamRecordReaderProvider { - private static final String RESOURCE = "META-INF/services/org.apache.asterix.external.input.record." - + "reader.stream.StreamRecordReader"; + private static final String RESOURCE = + "META-INF/services/org.apache.asterix.external.input.record." + "reader.stream.StreamRecordReader"; private static Map<String, List<Pair<String[], Class>>> recordReaders = null; protected static StreamRecordReader getInstance(Class clazz) throws AsterixException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java index 2cb842b..23c168e 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/LocalFileSystemUtils.java @@ -35,12 +35,11 @@ import org.apache.asterix.common.exceptions.RuntimeDataException; public class LocalFileSystemUtils { - public static void traverse(final List<File> files, File root, final String expression, - final LinkedList<Path> dirs) throws IOException { + public static void traverse(final List<File> files, File root, final String expression, final LinkedList<Path> dirs) + throws IOException { final Path path = root.toPath(); if (!Files.exists(path)) { - throw new RuntimeDataException(ErrorCode.UTIL_LOCAL_FILE_SYSTEM_UTILS_PATH_NOT_FOUND, - path.toString()); + throw new RuntimeDataException(ErrorCode.UTIL_LOCAL_FILE_SYSTEM_UTILS_PATH_NOT_FOUND, path.toString()); } if (!Files.isDirectory(path)) { validateAndAdd(path, expression, files); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/TwitterUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/TwitterUtil.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/TwitterUtil.java index 8cc3466..f64daf3 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/TwitterUtil.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/TwitterUtil.java @@ -87,7 +87,8 @@ public class TwitterUtil { public static double[][] getBoundingBoxes(String locationValue) throws AsterixException { double[][] locations = null; - String coordRegex = "^((((\\-?\\d+\\.\\d+),\\s*){3}(\\-?\\d+\\.\\d+)|\\w+);\\s*)*(((\\-?\\d+\\.\\d+),\\s*){3}(\\-?\\d+\\.\\d+)|\\w+)$"; + String coordRegex = + "^((((\\-?\\d+\\.\\d+),\\s*){3}(\\-?\\d+\\.\\d+)|\\w+);\\s*)*(((\\-?\\d+\\.\\d+),\\s*){3}(\\-?\\d+\\.\\d+)|\\w+)$"; Pattern p = Pattern.compile(coordRegex); Matcher m = p.matcher(locationValue); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/ClassAd.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/ClassAd.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/ClassAd.java index 7ac637f..bc24227 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/ClassAd.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/ClassAd.java @@ -105,8 +105,8 @@ public class ClassAd extends ExprTree { specialAttrNames.add(ATTR_PARENT); } - public static final FunctionCall curr_time_expr = FunctionCall.createFunctionCall("time", - new ExprList(new ClassAdObjectPool()), new ClassAdObjectPool()); + public static final FunctionCall curr_time_expr = + FunctionCall.createFunctionCall("time", new ExprList(new ClassAdObjectPool()), new ClassAdObjectPool()); private ClassAd alternateScope; private final Map<CaseInsensitiveString, ExprTree> attrList; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/Operation.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/Operation.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/Operation.java index 73ededd..562bd49 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/Operation.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/Operation.java @@ -529,8 +529,8 @@ public class Operation extends ExprTree { } // do evaluation - sig = privateDoOperation(opKind.getIntegerValue(), val1, val2, val3, valid1, valid2, valid3, result, - state, objectPool); + sig = privateDoOperation(opKind.getIntegerValue(), val1, val2, val3, valid1, valid2, valid3, result, state, + objectPool); // delete trees which were not significant if (valid1 && 0 != (sig & SigValues.SIG_CHLD1.ordinal())) { @@ -553,8 +553,7 @@ public class Operation extends ExprTree { // corresponding value is UNDEFINED or ERROR, propagate only that tree if (isStrictOperator(opKind.getIntegerValue())) { // strict unary operators: unary -, unary +, !, ~, () - if (opKind.getIntegerValue() == OpKind_UNARY_MINUS_OP - || opKind.getIntegerValue() == OpKind_UNARY_PLUS_OP + if (opKind.getIntegerValue() == OpKind_UNARY_MINUS_OP || opKind.getIntegerValue() == OpKind_UNARY_PLUS_OP || opKind.getIntegerValue() == OpKind_LOGICAL_NOT_OP || opKind.getIntegerValue() == OpKind_BITWISE_NOT_OP || opKind.getIntegerValue() == OpKind_PARENTHESES_OP) { @@ -588,15 +587,13 @@ public class Operation extends ExprTree { } } else { // non-strict operators - if (opKind.getIntegerValue() == OpKind_IS_OP - || opKind.getIntegerValue() == OpKind_ISNT_OP) { + if (opKind.getIntegerValue() == OpKind_IS_OP || opKind.getIntegerValue() == OpKind_ISNT_OP) { // the operation is *always* significant for IS and ISNT tree.setInnerTree(createOperation(opKind.getIntegerValue(), t1, t2, objectPool)); return (true); } // other non-strict binary operators - if (opKind.getIntegerValue() == OpKind_LOGICAL_AND_OP - || opKind.getIntegerValue() == OpKind_LOGICAL_OR_OP) { + if (opKind.getIntegerValue() == OpKind_LOGICAL_AND_OP || opKind.getIntegerValue() == OpKind_LOGICAL_OR_OP) { if ((SigValues.values()[sig].ordinal() & SigValues.SIG_CHLD1.ordinal()) != 0 && (SigValues.values()[sig].ordinal() & SigValues.SIG_CHLD2.ordinal()) != 0) { tree.setInnerTree(createOperation(opKind.getIntegerValue(), t1, t2, objectPool)); @@ -765,16 +762,15 @@ public class Operation extends ExprTree { } // cannot collapse values due to dissimilar ops - if ((op1.getIntegerValue() != OpKind_NO_OP || op2.getIntegerValue() != OpKind_NO_OP) - && !op.equals(op1) && !op.equals(op1)) { + if ((op1.getIntegerValue() != OpKind_NO_OP || op2.getIntegerValue() != OpKind_NO_OP) && !op.equals(op1) + && !op.equals(op1)) { // at least one of them returned a value and a tree, and parent does // not share the same operation with either child ExprTreeHolder newOp1 = objectPool.mutableExprPool.get(); ExprTreeHolder newOp2 = objectPool.mutableExprPool.get(); if (op1.getIntegerValue() != OpKind_NO_OP) { - newOp1.setInnerTree( - Operation.createOperation(op1.getIntegerValue(), val1, tree1, objectPool)); + newOp1.setInnerTree(Operation.createOperation(op1.getIntegerValue(), val1, tree1, objectPool)); } else if (tree1.getInnerTree() != null) { newOp1.setInnerTree(tree1.getInnerTree()); } else { @@ -782,8 +778,7 @@ public class Operation extends ExprTree { } if (op2.getIntegerValue() != OpKind_NO_OP) { - newOp2.setInnerTree( - Operation.createOperation(op2.getIntegerValue(), val2, tree2, objectPool)); + newOp2.setInnerTree(Operation.createOperation(op2.getIntegerValue(), val2, tree2, objectPool)); } else if (tree2.getInnerTree() != null) { newOp2.setInnerTree(tree2); } else { @@ -820,8 +815,7 @@ public class Operation extends ExprTree { // leftson makes a tree,value contribution if (tree2.getInnerTree() == null) { // rightson makes a value contribution - privateDoOperation(op.getIntegerValue(), val1, val2, dummy, true, true, false, val, - objectPool); + privateDoOperation(op.getIntegerValue(), val1, val2, dummy, true, true, false, val, objectPool); tree.setInnerTree(tree1); return true; } else { @@ -840,8 +834,7 @@ public class Operation extends ExprTree { // rightson makes a tree,value contribution if (tree1.getInnerTree() == null) { // leftson makes a value contribution - privateDoOperation(op.getIntegerValue(), val1, val2, dummy, true, true, false, val, - objectPool); + privateDoOperation(op.getIntegerValue(), val1, val2, dummy, true, true, false, val, objectPool); tree.setInnerTree(tree2); return true; } else { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdParserTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdParserTest.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdParserTest.java index f661d06..a4ac726 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdParserTest.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdParserTest.java @@ -58,7 +58,7 @@ public class ClassAdParserTest extends TestCase { ClassAdObjectPool objectPool = new ClassAdObjectPool(); ClassAd pAd = new ClassAd(objectPool); String szInput; - String[] files = new String[] {"/classad/testdata.txt"}; + String[] files = new String[] { "/classad/testdata.txt" }; BufferedReader infile = null; for (String path : files) { infile = Files.newBufferedReader( http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdToADMTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdToADMTest.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdToADMTest.java index 3bbcf89..47f784a 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdToADMTest.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdToADMTest.java @@ -90,8 +90,8 @@ public class ClassAdToADMTest extends TestCase { public void testSchemaful() { try { File file = new File("target/classad-wtih-temporals.adm"); - File expected = new File( - getClass().getResource("/classad/results/classad-with-temporals.adm").toURI().getPath()); + File expected = + new File(getClass().getResource("/classad/results/classad-with-temporals.adm").toURI().getPath()); FileUtils.deleteQuietly(file); PrintStream printStream = new PrintStream(Files.newOutputStream(Paths.get(file.toURI()))); String[] recordFieldNames = { "GlobalJobId", "Owner", "ClusterId", "ProcId", "RemoteWallClockTime", http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdUnitTester.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdUnitTester.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdUnitTester.java index eaade6c..85b866e 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdUnitTester.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/classad/test/ClassAdUnitTester.java @@ -332,7 +332,8 @@ public class ClassAdUnitTester { System.out.println("Testing the ClassAd class..."); - String input_basic = "[ A = 3; B = 4.0; C = \"babyzilla\"; D = true; E = {1}; F = [ AA = 3; ]; G =\"deleteme\";]"; + String input_basic = + "[ A = 3; B = 4.0; C = \"babyzilla\"; D = true; E = {1}; F = [ AA = 3; ]; G =\"deleteme\";]"; ClassAd basic = new ClassAd(objectPool); AMutableInt64 i = new AMutableInt64(0); MutableBoolean b = new MutableBoolean(); @@ -380,7 +381,8 @@ public class ClassAdUnitTester { basic = null; /* ----- Test GetExternalReferences ----- */ - String inputRef = "[ Rank=Member(\"LCG-2_1_0\",other.Environment) ? other.Time/seconds : other.Time/minutes; minutes=60; ]"; + String inputRef = + "[ Rank=Member(\"LCG-2_1_0\",other.Environment) ? other.Time/seconds : other.Time/minutes; minutes=60; ]"; TreeSet<String> refs = new TreeSet<String>(); ExprTree rank; @@ -431,7 +433,8 @@ public class ClassAdUnitTester { // This ClassAd may cause problems. Perhaps a memory leak. // This test is only useful when run under valgrind. - String memoryProblemClassad = "[ Updates = [status = \"request_completed\"; timestamp = absTime(\"2004-12-16T18:10:59-0600]\")] ]"; + String memoryProblemClassad = + "[ Updates = [status = \"request_completed\"; timestamp = absTime(\"2004-12-16T18:10:59-0600]\")] ]"; c = parser.parseClassAd(memoryProblemClassad); /* ----- Test Parsing multiple ClassAds ----- */ @@ -441,11 +444,9 @@ public class ClassAdUnitTester { AMutableInt32 offset = new AMutableInt32(0); parser.parseClassAd(twoClassads, classad1, offset); - test("Have good offset #1", offset.getIntegerValue() == 10, "Test Parsing multiple ClassAds 1", - results); + test("Have good offset #1", offset.getIntegerValue() == 10, "Test Parsing multiple ClassAds 1", results); parser.parseClassAd(twoClassads, classad2, offset); - test("Have good offset #2", offset.getIntegerValue() == 20, "Test Parsing multiple ClassAds 2", - results); + test("Have good offset #2", offset.getIntegerValue() == 20, "Test Parsing multiple ClassAds 2", results); /* ----- Test chained ClassAds ----- */ // classad1 and classad2 from above test are used. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/input/record/reader/TestAsterixMembersReader.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/input/record/reader/TestAsterixMembersReader.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/input/record/reader/TestAsterixMembersReader.java index 665d50b..8e6f346 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/input/record/reader/TestAsterixMembersReader.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/input/record/reader/TestAsterixMembersReader.java @@ -38,8 +38,8 @@ public class TestAsterixMembersReader implements IRecordReader<RecordWithPK<char private int counter = 0; private final int numOfRecords = 10; private final StringBuilder builder = new StringBuilder(); - private static final String[] names = { "Abdullah", "Michael", "Till", "Yingyi", "Ildar", "Taewoo", "Young-Seok", - "Murtadha", "Ian", "Steven" }; + private static final String[] names = + { "Abdullah", "Michael", "Till", "Yingyi", "Ildar", "Taewoo", "Young-Seok", "Murtadha", "Ian", "Steven" }; public TestAsterixMembersReader() { rawRecord = new CharArrayRecord(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/CapitalFinderFunction.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/CapitalFinderFunction.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/CapitalFinderFunction.java index ecd9b13..cc32f45 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/CapitalFinderFunction.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/CapitalFinderFunction.java @@ -52,7 +52,8 @@ public class CapitalFinderFunction implements IExternalScalarFunction { @Override public void initialize(IFunctionHelper functionHelper) throws Exception { - InputStream in = CapitalFinderFunction.class.getClassLoader().getResourceAsStream("data/countriesCapitals.properties"); + InputStream in = + CapitalFinderFunction.class.getClassLoader().getResourceAsStream("data/countriesCapitals.properties"); capitalList = new Properties(); capitalList.load(in); capital = (JString) functionHelper.getObject(JTypeTag.STRING); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/ClassAdParser.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/ClassAdParser.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/ClassAdParser.java index 04848a5..2f9faed 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/ClassAdParser.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/ClassAdParser.java @@ -89,14 +89,12 @@ public class ClassAdParser extends AbstractDataParser implements IRecordDataPars private final ClassAdObjectPool objectPool; // asterix objects private ARecordType recordType; - private IObjectPool<IARecordBuilder, ATypeTag> recordBuilderPool = new ListObjectPool<IARecordBuilder, ATypeTag>( - new RecordBuilderFactory()); + private IObjectPool<IARecordBuilder, ATypeTag> recordBuilderPool = + new ListObjectPool<IARecordBuilder, ATypeTag>(new RecordBuilderFactory()); private IObjectPool<IAsterixListBuilder, ATypeTag> listBuilderPool = - new ListObjectPool<IAsterixListBuilder, ATypeTag>( - new ListBuilderFactory()); + new ListObjectPool<IAsterixListBuilder, ATypeTag>(new ListBuilderFactory()); private IObjectPool<IMutableValueStorage, ATypeTag> abvsBuilderPool = - new ListObjectPool<IMutableValueStorage, ATypeTag>( - new AbvsBuilderFactory()); + new ListObjectPool<IMutableValueStorage, ATypeTag>(new AbvsBuilderFactory()); private final ClassAd rootAd; private String exprPrefix = "expr="; private String exprSuffix = ""; @@ -1351,7 +1349,7 @@ public class ClassAdParser extends AbstractDataParser implements IRecordDataPars if (!parseArgumentList(argList)) { tree.setInnerTree(null); return false; - }; + } ; // special case function-calls should be converted // into a literal expression if the argument is a // string literal @@ -1399,7 +1397,7 @@ public class ClassAdParser extends AbstractDataParser implements IRecordDataPars tree.setInnerTree(Operation.createOperation(Operation.OpKind_PARENTHESES_OP, treeL, objectPool)); return (tree.size() != 0); } - // constants + // constants case LEX_OPEN_BOX: { isExpr = true; ClassAd newAd = objectPool.classAdPool.get(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapter.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapter.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapter.java index d822f84..90336fe 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapter.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapter.java @@ -73,8 +73,7 @@ public class TestTypedAdapter extends FeedAdapter { } else { } if (LOGGER.isWarnEnabled()) { - LOGGER.warn( - "Could not obtain input stream for parsing from adapter " + this + "[" + partition + "]"); + LOGGER.warn("Could not obtain input stream for parsing from adapter " + this + "[" + partition + "]"); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java index 616ed6e..6fe938c 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java @@ -85,10 +85,12 @@ public class TestTypedAdapterFactory implements IAdapterFactory { (IApplicationContext) ctx.getJobletContext().getServiceContext().getApplicationContext(); ClusterPartition nodePartition = appCtx.getMetadataProperties().getNodePartitions().get(nodeId)[0]; parser = new ADMDataParser(outputType, true); - forwarder = DataflowUtils.getTupleForwarder(configuration, - FeedUtils.getFeedLogManager(ctx, - FeedUtils.splitsForAdapter(ExternalDataUtils.getDataverse(configuration), - ExternalDataUtils.getFeedName(configuration), nodeId, nodePartition))); + forwarder = + DataflowUtils + .getTupleForwarder(configuration, + FeedUtils.getFeedLogManager(ctx, FeedUtils.splitsForAdapter( + ExternalDataUtils.getDataverse(configuration), + ExternalDataUtils.getFeedName(configuration), nodeId, nodePartition))); tb = new ArrayTupleBuilder(1); return new ITupleParser() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/TestRecordWithPKParser.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/TestRecordWithPKParser.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/TestRecordWithPKParser.java index 21a1430..fb222e6 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/TestRecordWithPKParser.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/TestRecordWithPKParser.java @@ -37,8 +37,8 @@ public class TestRecordWithPKParser<T> implements IRecordWithPKDataParser<Record } @Override - public void parse(final IRawRecord<? extends RecordWithPK<T>> record, final DataOutput out) throws - HyracksDataException { + public void parse(final IRawRecord<? extends RecordWithPK<T>> record, final DataOutput out) + throws HyracksDataException { recordParser.parse(record.get().getRecord(), out); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/ADMDataParserTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/ADMDataParserTest.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/ADMDataParserTest.java index 6f36eab..f06528e 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/ADMDataParserTest.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/ADMDataParserTest.java @@ -38,22 +38,22 @@ public class ADMDataParserTest { @Test public void test() throws IOException { String[] dates = { "-9537-08-04", "9656-06-03", "-9537-04-04", "9656-06-04", "-9537-10-04", "9626-09-05" }; - AMutableDate[] parsedDates = new AMutableDate[] { new AMutableDate(-4202630), new AMutableDate(2807408), - new AMutableDate(-4202752), new AMutableDate(2807409), new AMutableDate(-4202569), - new AMutableDate(2796544), }; + AMutableDate[] parsedDates = + new AMutableDate[] { new AMutableDate(-4202630), new AMutableDate(2807408), new AMutableDate(-4202752), + new AMutableDate(2807409), new AMutableDate(-4202569), new AMutableDate(2796544), }; String[] times = { "12:04:45.689Z", "12:41:59.002Z", "12:10:45.169Z", "15:37:48.736Z", "04:16:42.321Z", "12:22:56.816Z" }; - AMutableTime[] parsedTimes = new AMutableTime[] { new AMutableTime(43485689), new AMutableTime(45719002), - new AMutableTime(43845169), new AMutableTime(56268736), new AMutableTime(15402321), - new AMutableTime(44576816), }; + AMutableTime[] parsedTimes = + new AMutableTime[] { new AMutableTime(43485689), new AMutableTime(45719002), new AMutableTime(43845169), + new AMutableTime(56268736), new AMutableTime(15402321), new AMutableTime(44576816), }; String[] dateTimes = { "-2640-10-11T17:32:15.675Z", "4104-02-01T05:59:11.902Z", "0534-12-08T08:20:31.487Z", "6778-02-16T22:40:21.653Z", "2129-12-12T13:18:35.758Z", "8647-07-01T13:10:19.691Z" }; - AMutableDateTime[] parsedDateTimes = new AMutableDateTime[] { new AMutableDateTime(-145452954464325L), - new AMutableDateTime(67345192751902L), new AMutableDateTime(-45286270768513L), - new AMutableDateTime(151729886421653L), new AMutableDateTime(5047449515758L), - new AMutableDateTime(210721439419691L) }; + AMutableDateTime[] parsedDateTimes = + new AMutableDateTime[] { new AMutableDateTime(-145452954464325L), new AMutableDateTime(67345192751902L), + new AMutableDateTime(-45286270768513L), new AMutableDateTime(151729886421653L), + new AMutableDateTime(5047449515758L), new AMutableDateTime(210721439419691L) }; Thread[] threads = new Thread[16]; AtomicInteger errorCount = new AtomicInteger(0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/ParserFactoryProviderLoadParserTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/ParserFactoryProviderLoadParserTest.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/ParserFactoryProviderLoadParserTest.java index effb7cd..26cefa8 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/ParserFactoryProviderLoadParserTest.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/ParserFactoryProviderLoadParserTest.java @@ -29,10 +29,10 @@ import org.apache.asterix.external.provider.ParserFactoryProvider; import org.junit.Assert; import org.junit.Test; - public class ParserFactoryProviderLoadParserTest { IDataParserFactory factory; + @Test public void test() throws AsterixException { boolean result = true; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/StreamRecordReaderProviderTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/StreamRecordReaderProviderTest.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/StreamRecordReaderProviderTest.java index 71a5072..3a9d7a5 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/StreamRecordReaderProviderTest.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/StreamRecordReaderProviderTest.java @@ -32,14 +32,11 @@ import java.util.Map; public class StreamRecordReaderProviderTest { @Test - public void Test() throws AsterixException{ - List<String> recordReaderFormats = Arrays.asList( - ExternalDataConstants.FORMAT_LINE_SEPARATED, - ExternalDataConstants.FORMAT_ADM, - ExternalDataConstants.FORMAT_JSON, - ExternalDataConstants.FORMAT_SEMISTRUCTURED, - ExternalDataConstants.FORMAT_DELIMITED_TEXT, - ExternalDataConstants.FORMAT_CSV); + public void Test() throws AsterixException { + List<String> recordReaderFormats = + Arrays.asList(ExternalDataConstants.FORMAT_LINE_SEPARATED, ExternalDataConstants.FORMAT_ADM, + ExternalDataConstants.FORMAT_JSON, ExternalDataConstants.FORMAT_SEMISTRUCTURED, + ExternalDataConstants.FORMAT_DELIMITED_TEXT, ExternalDataConstants.FORMAT_CSV); Map<String, String> config = new HashMap<>(); for (String format : recordReaderFormats) { config.clear(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/TweetParserTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/TweetParserTest.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/TweetParserTest.java index 5389310..9916fa5 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/TweetParserTest.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/test/TweetParserTest.java @@ -60,8 +60,8 @@ public class TweetParserTest { unionTypeList.add(ANULL); unionTypeList.add(AMISSING); IAType geoUnionType = new AUnionType(unionTypeList, "GeoType?"); - ARecordType tweetRecordType = new ARecordType("TweetType", new String[] { "id", "geo" }, - new IAType[] { AINT64, geoUnionType }, true); + ARecordType tweetRecordType = + new ARecordType("TweetType", new String[] { "id", "geo" }, new IAType[] { AINT64, geoUnionType }, true); TweetParser parser = new TweetParser(tweetRecordType); @@ -86,8 +86,8 @@ public class TweetParserTest { // contruct type IAType geoFieldType = new ARecordType("GeoType", new String[] { "coordinates" }, new IAType[] { new AOrderedListType(AFLOAT, "point") }, true); - ARecordType tweetRecordType = new ARecordType("TweetType", new String[] { "id", "geo" }, - new IAType[] { AINT64, geoFieldType }, true); + ARecordType tweetRecordType = + new ARecordType("TweetType", new String[] { "id", "geo" }, new IAType[] { AINT64, geoFieldType }, true); TweetParser parser = new TweetParser(tweetRecordType); List<String> lines = Files.readAllLines(Paths.get(getClass().getResource("/test_tweets.txt").toURI())); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyFiltersJaccard.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyFiltersJaccard.java b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyFiltersJaccard.java index 770e9dd..5f50108 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyFiltersJaccard.java +++ b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyFiltersJaccard.java @@ -92,13 +92,13 @@ public class FuzzyFiltersJaccard { * @return */ public boolean passPositionFilter(int noGramsCommon, int positionX, int positionY, int lengthX, int lengthY) { - return getIntersectUpperBound(noGramsCommon, positionX, positionY, lengthX, lengthY) >= getIntersectLowerBound( - lengthX, lengthY); + return getIntersectUpperBound(noGramsCommon, positionX, positionY, lengthX, + lengthY) >= getIntersectLowerBound(lengthX, lengthY); } public boolean passPositionFilter(int noGramsCommon, long positionX, long positionY, long lengthX, long lengthY) { - return getIntersectUpperBound(noGramsCommon, positionX, positionY, lengthX, lengthY) >= getIntersectLowerBound( - lengthX, lengthY); + return getIntersectUpperBound(noGramsCommon, positionX, positionY, lengthX, + lengthY) >= getIntersectLowerBound(lengthX, lengthY); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinAppendLength.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinAppendLength.java b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinAppendLength.java index 6778152..8be6f0c 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinAppendLength.java +++ b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinAppendLength.java @@ -45,8 +45,8 @@ public class FuzzyJoinAppendLength { String line; while ((line = input.readLine()) != null) { String[] splits = line.split(FuzzyJoinConfig.RECORD_SEPARATOR_REGEX); - Collection<String> tokens = tokenizer - .tokenize(FuzzyJoinUtil.getData(splits, dataColumns, FuzzyJoinConfig.TOKEN_SEPARATOR)); + Collection<String> tokens = + tokenizer.tokenize(FuzzyJoinUtil.getData(splits, dataColumns, FuzzyJoinConfig.TOKEN_SEPARATOR)); output.write(splits[0] + FuzzyJoinConfig.RECORD_SEPARATOR + splits[1] + FuzzyJoinConfig.RECORD_SEPARATOR + splits[2] + FuzzyJoinConfig.RECORD_SEPARATOR + splits[3] + FuzzyJoinConfig.RECORD_SEPARATOR + tokens.size() + "\n"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinMemory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinMemory.java b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinMemory.java index e42ba51..02d3037 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinMemory.java +++ b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinMemory.java @@ -80,7 +80,7 @@ public class FuzzyJoinMemory { @SuppressWarnings("squid:S1166") // Either log or rethrow this exception public static void readRecords(String fileName, List<int[]> records, List<Integer> rids) throws IOException { try (LittleEndianIntInputStream in = - new LittleEndianIntInputStream(new BufferedInputStream(new FileInputStream(fileName)))) { + new LittleEndianIntInputStream(new BufferedInputStream(new FileInputStream(fileName)))) { while (true) { int rid = 0; @@ -161,9 +161,8 @@ public class FuzzyJoinMemory { count = -1; } // suffix filter - if (count == 1 - && !similarityFilters.passSuffixFilter(tokens, indexToken, records.get(indexProbe), - indexTokenProbe)) { + if (count == 1 && !similarityFilters.passSuffixFilter(tokens, indexToken, + records.get(indexProbe), indexTokenProbe)) { count = -1; } counts.put(indexProbe, count); @@ -268,9 +267,8 @@ public class FuzzyJoinMemory { count = -1; } // suffix filter - if (count == 1 - && !similarityFilters.passSuffixFilter(tokens, indexToken, records.get(indexProbe), - indexTokenProbe)) { + if (count == 1 && !similarityFilters.passSuffixFilter(tokens, indexToken, + records.get(indexProbe), indexTokenProbe)) { count = -1; } counts.put(indexProbe, count); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinTokenize.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinTokenize.java b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinTokenize.java index 64c7e52..4c85f25 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinTokenize.java +++ b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinTokenize.java @@ -78,8 +78,9 @@ public class FuzzyJoinTokenize { String line; HashMap<String, MutableInteger> tokenCount = new HashMap<String, MutableInteger>(); while ((line = input.readLine()) != null) { - Collection<String> tokens = tokenizer.tokenize(FuzzyJoinUtil.getData( - line.split(FuzzyJoinConfig.RECORD_SEPARATOR_REGEX), dataColumns, FuzzyJoinConfig.TOKEN_SEPARATOR)); + Collection<String> tokens = + tokenizer.tokenize(FuzzyJoinUtil.getData(line.split(FuzzyJoinConfig.RECORD_SEPARATOR_REGEX), + dataColumns, FuzzyJoinConfig.TOKEN_SEPARATOR)); for (String token : tokens) { MutableInteger count = tokenCount.get(token); @@ -108,14 +109,14 @@ public class FuzzyJoinTokenize { tokenLoad.loadTokenRank(); input = new BufferedReader(new FileReader(inputFileName)); - LittleEndianIntOutputStream outputTokenized = new LittleEndianIntOutputStream( - new BufferedOutputStream(new FileOutputStream(tokenizedFileName))); + LittleEndianIntOutputStream outputTokenized = + new LittleEndianIntOutputStream(new BufferedOutputStream(new FileOutputStream(tokenizedFileName))); while ((line = input.readLine()) != null) { String splits[] = line.split(FuzzyJoinConfig.RECORD_SEPARATOR_REGEX); int rid = Integer.parseInt(splits[FuzzyJoinConfig.RECORD_KEY]); outputTokenized.writeInt(rid); - Collection<String> tokens = tokenizer - .tokenize(FuzzyJoinUtil.getData(splits, dataColumns, FuzzyJoinConfig.TOKEN_SEPARATOR)); + Collection<String> tokens = + tokenizer.tokenize(FuzzyJoinUtil.getData(splits, dataColumns, FuzzyJoinConfig.TOKEN_SEPARATOR)); Collection<Integer> tokensRanked = tokenRank.getTokenRanks(tokens); outputTokenized.writeInt(tokensRanked.size()); for (Integer token : tokensRanked) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/invertedlist/InvertedList.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/invertedlist/InvertedList.java b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/invertedlist/InvertedList.java index ee1e362..7a9356a 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/invertedlist/InvertedList.java +++ b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/invertedlist/InvertedList.java @@ -19,7 +19,6 @@ package org.apache.asterix.fuzzyjoin.invertedlist; - public interface InvertedList extends Iterable<int[]> { public void add(int[] element); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/similarity/SimilarityFiltersJaccard.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/similarity/SimilarityFiltersJaccard.java b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/similarity/SimilarityFiltersJaccard.java index f16fed9..556c0b7 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/similarity/SimilarityFiltersJaccard.java +++ b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/similarity/SimilarityFiltersJaccard.java @@ -186,8 +186,8 @@ public class SimilarityFiltersJaccard implements SimilarityFilters { * @return */ public boolean passPositionFilter(int noGramsCommon, int positionX, int lengthX, int positionY, int lengthY) { - return getIntersectUpperBound(noGramsCommon, positionX, positionY, lengthX, lengthY) >= getIntersectLowerBound( - lengthX, lengthY); + return getIntersectUpperBound(noGramsCommon, positionX, positionY, lengthX, + lengthY) >= getIntersectLowerBound(lengthX, lengthY); } public float passSimilarityFilter(final int[] tokensX, int startX, int lengthX, final int prefixLengthX, @@ -208,9 +208,9 @@ public class SimilarityFiltersJaccard implements SimilarityFilters { } } else { if (intersectionSizePrefix + lengthProbe - prefixLengthY >= intersectSizeLowerBound) { - intersectSize = intersectionSizePrefix - + SimilarityMetric.getIntersectSize(tokensX, startX + intersectionSizePrefix, lengthX - - intersectionSizePrefix, tokensY, startY + prefixLengthY, lengthY - prefixLengthY); + intersectSize = intersectionSizePrefix + SimilarityMetric.getIntersectSize(tokensX, + startX + intersectionSizePrefix, lengthX - intersectionSizePrefix, tokensY, + startY + prefixLengthY, lengthY - prefixLengthY); } } @@ -268,8 +268,8 @@ public class SimilarityFiltersJaccard implements SimilarityFilters { public boolean passSuffixFilter(int[] tokensX, int tokensStartX, int tokensLengthX, int positionX, int[] tokensY, int tokensStartY, int tokensLengthY, int positionY) { - int hammingMax = tokensLengthX + tokensLengthY - 2 - * (int) Math.ceil(simThr100 / (100 + simThr100) * (tokensLengthX + tokensLengthY)) + int hammingMax = tokensLengthX + tokensLengthY + - 2 * (int) Math.ceil(simThr100 / (100 + simThr100) * (tokensLengthX + tokensLengthY)) - (positionX + 1 + positionY + 1 - 2); int hamming = getSuffixFilter(tokensX, tokensStartX + positionX + 1, tokensLengthX - positionX - 1, tokensY, tokensStartY + positionY + 1, tokensLengthY - positionY - 1, hammingMax, 1); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/similarity/SimilarityMetricJaccard.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/similarity/SimilarityMetricJaccard.java b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/similarity/SimilarityMetricJaccard.java index 4a31b8b..63d3077 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/similarity/SimilarityMetricJaccard.java +++ b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/similarity/SimilarityMetricJaccard.java @@ -60,8 +60,8 @@ public class SimilarityMetricJaccard extends SimilarityMetric implements IGeneri // apply length filter int lengthLowerBound = (int) Math.ceil(simThresh * firstList.size()); - boolean passesLengthFilter = (lengthLowerBound <= secondList.size()) - && (secondList.size() <= 1.0f / simThresh * firstList.size()); + boolean passesLengthFilter = + (lengthLowerBound <= secondList.size()) && (secondList.size() <= 1.0f / simThresh * firstList.size()); if (!passesLengthFilter) { return -1f; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/tokenizer/TokenizerBufferedFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/tokenizer/TokenizerBufferedFactory.java b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/tokenizer/TokenizerBufferedFactory.java index 164b965..2f4e8c6 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/tokenizer/TokenizerBufferedFactory.java +++ b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/tokenizer/TokenizerBufferedFactory.java @@ -28,6 +28,7 @@ public class TokenizerBufferedFactory { } public static boolean isSeparator(char c) { - return !(Character.isLetterOrDigit(c) || Character.getType(c) == Character.OTHER_LETTER || Character.getType(c) == Character.OTHER_NUMBER); + return !(Character.isLetterOrDigit(c) || Character.getType(c) == Character.OTHER_LETTER + || Character.getType(c) == Character.OTHER_NUMBER); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/FuzzyJoinTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/FuzzyJoinTest.java b/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/FuzzyJoinTest.java index 40e4b8e..d2f5da5 100644 --- a/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/FuzzyJoinTest.java +++ b/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/FuzzyJoinTest.java @@ -55,7 +55,8 @@ public class FuzzyJoinTest { BufferedWriter out = new BufferedWriter(new FileWriter(base + dataset.getPathPart0(Directory.SSJOINOUT))); for (ResultSelfJoin result : results) { - out.write(String.format("%d %d %.3f\n", rids.get(result.indexX), rids.get(result.indexY), result.similarity)); + out.write( + String.format("%d %d %.3f\n", rids.get(result.indexX), rids.get(result.indexY), result.similarity)); } out.close(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/AbstractDataset.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/AbstractDataset.java b/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/AbstractDataset.java index 1629c74..fe77a38 100644 --- a/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/AbstractDataset.java +++ b/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/AbstractDataset.java @@ -40,7 +40,8 @@ public abstract class AbstractDataset { } public static enum Relation { - R, S, + R, + S, } public static final String FILE_PART = "part-"; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/DBLPDataset.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/DBLPDataset.java b/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/DBLPDataset.java index 429a26e..15fada4 100644 --- a/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/DBLPDataset.java +++ b/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/DBLPDataset.java @@ -19,7 +19,6 @@ package org.apache.asterix.fuzzyjoin.tests.dataset; - public class DBLPDataset extends PublicationsDataset { private static final String NAME = "dblp"; private static final int NO_RECORDS = 1268017; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/parser/FunctionParser.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/parser/FunctionParser.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/parser/FunctionParser.java index 098b447..eb9631a 100644 --- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/parser/FunctionParser.java +++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/parser/FunctionParser.java @@ -42,8 +42,8 @@ public class FunctionParser { public FunctionDecl getFunctionDecl(Function function) throws CompilationException { if (!function.getLanguage().equals(Function.LANGUAGE_AQL)) { - throw new CompilationException(ErrorCode.COMPILATION_INCOMPATIBLE_FUNCTION_LANGUAGE, - Function.LANGUAGE_AQL, function.getLanguage()); + throw new CompilationException(ErrorCode.COMPILATION_INCOMPATIBLE_FUNCTION_LANGUAGE, Function.LANGUAGE_AQL, + function.getLanguage()); } String functionBody = function.getFunctionBody(); List<String> params = function.getParams(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java index 6ab69ad..d2cb64f 100644 --- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java +++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/rewrites/AqlQueryRewriter.java @@ -123,8 +123,8 @@ class AqlQueryRewriter implements IQueryRewriter { declaredFunctions.addAll(storedFunctionDecls); } if (!declaredFunctions.isEmpty()) { - AQLInlineUdfsVisitor visitor = new AQLInlineUdfsVisitor(context, new AQLRewriterFactory(), - declaredFunctions, metadataProvider); + AQLInlineUdfsVisitor visitor = + new AQLInlineUdfsVisitor(context, new AQLRewriterFactory(), declaredFunctions, metadataProvider); while (topStatement.accept(visitor, declaredFunctions)) { // loop until no more changes } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/util/AQLVariableSubstitutionUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/util/AQLVariableSubstitutionUtil.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/util/AQLVariableSubstitutionUtil.java index 096b12f..f19afac 100644 --- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/util/AQLVariableSubstitutionUtil.java +++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/util/AQLVariableSubstitutionUtil.java @@ -32,8 +32,8 @@ public class AQLVariableSubstitutionUtil { public static ILangExpression substituteVariable(ILangExpression expression, Map<VariableExpr, Expression> varExprMap) throws CompilationException { - AQLCloneAndSubstituteVariablesVisitor visitor = new AQLCloneAndSubstituteVariablesVisitor( - new LangRewritingContext(0)); + AQLCloneAndSubstituteVariablesVisitor visitor = + new AQLCloneAndSubstituteVariablesVisitor(new LangRewritingContext(0)); VariableSubstitutionEnvironment env = new VariableSubstitutionEnvironment(varExprMap); return expression.accept(visitor, env).first; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLCloneAndSubstituteVariablesVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLCloneAndSubstituteVariablesVisitor.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLCloneAndSubstituteVariablesVisitor.java index 0e7b4ad..6008723 100644 --- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLCloneAndSubstituteVariablesVisitor.java +++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLCloneAndSubstituteVariablesVisitor.java @@ -93,8 +93,8 @@ public class AQLCloneAndSubstituteVariablesVisitor extends CloneAndSubstituteVar @Override public Pair<ILangExpression, VariableSubstitutionEnvironment> visit(DistinctClause dc, VariableSubstitutionEnvironment env) throws CompilationException { - List<Expression> exprList = VariableCloneAndSubstitutionUtil.visitAndCloneExprList(dc.getDistinctByExpr(), env, - this); + List<Expression> exprList = + VariableCloneAndSubstitutionUtil.visitAndCloneExprList(dc.getDistinctByExpr(), env, this); DistinctClause dc2 = new DistinctClause(exprList); return new Pair<ILangExpression, VariableSubstitutionEnvironment>(dc2, env); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/IQueryRewriter.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/IQueryRewriter.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/IQueryRewriter.java index f072917..05ab836 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/IQueryRewriter.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/IQueryRewriter.java @@ -41,9 +41,8 @@ public interface IQueryRewriter { * @param context, * manages ids of variables and guarantees uniqueness of variables. */ - void rewrite(List<FunctionDecl> declaredFunctions, IReturningStatement topExpr, - MetadataProvider metadataProvider, LangRewritingContext context, boolean inlineUdfs) - throws CompilationException; + void rewrite(List<FunctionDecl> declaredFunctions, IReturningStatement topExpr, MetadataProvider metadataProvider, + LangRewritingContext context, boolean inlineUdfs) throws CompilationException; /** * Find the function calls used by a given expression http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/context/Scope.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/context/Scope.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/context/Scope.java index df6d3a5..bf46c5d 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/context/Scope.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/context/Scope.java @@ -203,7 +203,7 @@ public final class Scope { return symbols.keySet(); } - public Scope getParentScope(){ + public Scope getParentScope() { return parent; } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/Query.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/Query.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/Query.java index 8dc7b87..db74938 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/Query.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/Query.java @@ -44,8 +44,7 @@ public class Query implements IReturningStatement { this(explain, topLevel, body, varCounter, null); } - public Query(boolean explain, boolean topLevel, Expression body, int varCounter, - List<VarIdentifier> externalVars) { + public Query(boolean explain, boolean topLevel, Expression body, int varCounter, List<VarIdentifier> externalVars) { this.explain = explain; this.topLevel = topLevel; this.body = body; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java index cd57396..7858e58 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppFunctionBodyRewriter.java @@ -30,8 +30,8 @@ class SqlppFunctionBodyRewriter extends SqlppQueryRewriter { @Override public void rewrite(List<FunctionDecl> declaredFunctions, IReturningStatement topStatement, - MetadataProvider metadataProvider, - LangRewritingContext context, boolean inlineUdfs) throws CompilationException { + MetadataProvider metadataProvider, LangRewritingContext context, boolean inlineUdfs) + throws CompilationException { // Sets up parameters. setup(declaredFunctions, topStatement, metadataProvider, context); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineWithExpressionVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineWithExpressionVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineWithExpressionVisitor.java index 54ef5ab..ebb7b10 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineWithExpressionVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/InlineWithExpressionVisitor.java @@ -66,8 +66,8 @@ public class InlineWithExpressionVisitor extends AbstractSqlppExpressionScopingV } // Inlines WITH expressions into the select expression. - SelectExpression newSelectExpression = (SelectExpression) substituteExpression(selectExpression, - varExprMap, context); + SelectExpression newSelectExpression = + (SelectExpression) substituteExpression(selectExpression, varExprMap, context); // Continues to visit the rewritten select expression. return super.visit(newSelectExpression, arg);
