You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by fo...@apache.org on 2020/01/05 18:25:24 UTC
[parquet-mr] branch master updated: PARQUET-1732: Call toArray With
Empty Array (#720)
This is an automated email from the ASF dual-hosted git repository.
fokko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-mr.git
The following commit(s) were added to refs/heads/master by this push:
new cce6fdb PARQUET-1732: Call toArray With Empty Array (#720)
cce6fdb is described below
commit cce6fdb3304894e23231b10e1c758631e52df2d8
Author: belugabehr <12...@users.noreply.github.com>
AuthorDate: Sun Jan 5 13:25:13 2020 -0500
PARQUET-1732: Call toArray With Empty Array (#720)
---
.../src/main/java/org/apache/parquet/cli/csv/RecordBuilder.java | 2 +-
.../src/main/java/org/apache/parquet/cli/util/GetClassLoader.java | 2 +-
.../parquet/filter2/recordlevel/FilteringGroupConverter.java | 7 ++-----
.../internal/column/columnindex/BinaryColumnIndexBuilder.java | 4 ++--
.../src/main/java/org/apache/parquet/io/PrimitiveColumnIO.java | 2 +-
.../java/org/apache/parquet/io/RecordReaderImplementation.java | 2 +-
.../apache/parquet/format/converter/ParquetMetadataConverter.java | 2 +-
.../main/java/org/apache/parquet/tools/command/MetadataUtils.java | 2 +-
.../src/main/java/org/apache/parquet/tools/util/MetadataUtils.java | 2 +-
9 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/csv/RecordBuilder.java b/parquet-cli/src/main/java/org/apache/parquet/cli/csv/RecordBuilder.java
index 9adf22e..b26e64b 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/csv/RecordBuilder.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/csv/RecordBuilder.java
@@ -39,7 +39,7 @@ class RecordBuilder<E> {
this.recordClass = recordClass;
// initialize the index and field arrays
- fields = schema.getFields().toArray(new Schema.Field[schema.getFields().size()]);
+ fields = schema.getFields().toArray(new Schema.Field[0]);
indexes = new int[fields.length];
if (header != null) {
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/util/GetClassLoader.java b/parquet-cli/src/main/java/org/apache/parquet/cli/util/GetClassLoader.java
index 1cacbd5..9000a3a 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/util/GetClassLoader.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/util/GetClassLoader.java
@@ -28,7 +28,7 @@ public class GetClassLoader implements PrivilegedAction<ClassLoader> {
private final URL[] urls;
public GetClassLoader(List<URL> urls) {
- this.urls = urls.toArray(new URL[urls.size()]);
+ this.urls = urls.toArray(new URL[0]);
}
@Override
diff --git a/parquet-column/src/main/java/org/apache/parquet/filter2/recordlevel/FilteringGroupConverter.java b/parquet-column/src/main/java/org/apache/parquet/filter2/recordlevel/FilteringGroupConverter.java
index a76b5ee..87f7cf1 100644
--- a/parquet-column/src/main/java/org/apache/parquet/filter2/recordlevel/FilteringGroupConverter.java
+++ b/parquet-column/src/main/java/org/apache/parquet/filter2/recordlevel/FilteringGroupConverter.java
@@ -96,11 +96,8 @@ public class FilteringGroupConverter extends GroupConverter {
private ValueInspector[] getValueInspectors(ColumnPath columnPath) {
List<ValueInspector> inspectorsList = valueInspectorsByColumn.get(columnPath);
- if (inspectorsList == null) {
- return new ValueInspector[] {};
- } else {
- return inspectorsList.toArray(new ValueInspector[inspectorsList.size()]);
- }
+ return inspectorsList == null ? new ValueInspector[0]
+ : inspectorsList.toArray(new ValueInspector[0]);
}
@Override
diff --git a/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/BinaryColumnIndexBuilder.java b/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/BinaryColumnIndexBuilder.java
index 490cc3e..c5aa8a7 100644
--- a/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/BinaryColumnIndexBuilder.java
+++ b/parquet-column/src/main/java/org/apache/parquet/internal/column/columnindex/BinaryColumnIndexBuilder.java
@@ -112,8 +112,8 @@ class BinaryColumnIndexBuilder extends ColumnIndexBuilder {
@Override
ColumnIndexBase<Binary> createColumnIndex(PrimitiveType type) {
BinaryColumnIndex columnIndex = new BinaryColumnIndex(type);
- columnIndex.minValues = minValues.toArray(new Binary[minValues.size()]);
- columnIndex.maxValues = maxValues.toArray(new Binary[maxValues.size()]);
+ columnIndex.minValues = minValues.toArray(new Binary[0]);
+ columnIndex.maxValues = maxValues.toArray(new Binary[0]);
return columnIndex;
}
diff --git a/parquet-column/src/main/java/org/apache/parquet/io/PrimitiveColumnIO.java b/parquet-column/src/main/java/org/apache/parquet/io/PrimitiveColumnIO.java
index 9bb3ee4..268a078 100644
--- a/parquet-column/src/main/java/org/apache/parquet/io/PrimitiveColumnIO.java
+++ b/parquet-column/src/main/java/org/apache/parquet/io/PrimitiveColumnIO.java
@@ -52,7 +52,7 @@ public class PrimitiveColumnIO extends ColumnIO {
type,
getRepetitionLevel(),
getDefinitionLevel());
- this.path = path.toArray(new ColumnIO[path.size()]);
+ this.path = path.toArray(new ColumnIO[0]);
}
@Override
diff --git a/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java b/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java
index b4ac363..9bca6e8 100644
--- a/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java
+++ b/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java
@@ -249,7 +249,7 @@ class RecordReaderImplementation<T> extends RecordReader<T> {
public RecordReaderImplementation(MessageColumnIO root, RecordMaterializer<T> recordMaterializer, boolean validating, ColumnReadStoreImpl columnStore) {
this.recordMaterializer = recordMaterializer;
this.recordRootConverter = recordMaterializer.getRootConverter(); // TODO: validator(wrap(recordMaterializer), validating, root.getType());
- PrimitiveColumnIO[] leaves = root.getLeaves().toArray(new PrimitiveColumnIO[root.getLeaves().size()]);
+ PrimitiveColumnIO[] leaves = root.getLeaves().toArray(new PrimitiveColumnIO[0]);
columnReaders = new ColumnReader[leaves.length];
int[][] nextColumnIdxForRepLevel = new int[leaves.length][];
int[][] levelToClose = new int[leaves.length][];
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java
index 03476a1..bfb4aa3 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java
@@ -1276,7 +1276,7 @@ public class ParquetMetadataConverter {
}
private static ColumnPath getPath(ColumnMetaData metaData) {
- String[] path = metaData.path_in_schema.toArray(new String[metaData.path_in_schema.size()]);
+ String[] path = metaData.path_in_schema.toArray(new String[0]);
return ColumnPath.get(path);
}
diff --git a/parquet-tools/src/main/java/org/apache/parquet/tools/command/MetadataUtils.java b/parquet-tools/src/main/java/org/apache/parquet/tools/command/MetadataUtils.java
index 0bade37..3e68c86 100644
--- a/parquet-tools/src/main/java/org/apache/parquet/tools/command/MetadataUtils.java
+++ b/parquet-tools/src/main/java/org/apache/parquet/tools/command/MetadataUtils.java
@@ -188,7 +188,7 @@ class MetadataUtils {
if (container != null) {
cpath.add(type.getName());
- String[] paths = cpath.toArray(new String[cpath.size()]);
+ String[] paths = cpath.toArray(new String[0]);
cpath.remove(cpath.size() - 1);
ColumnDescriptor desc = container.getColumnDescription(paths);
diff --git a/parquet-tools/src/main/java/org/apache/parquet/tools/util/MetadataUtils.java b/parquet-tools/src/main/java/org/apache/parquet/tools/util/MetadataUtils.java
index 206028a..b5b37aa 100644
--- a/parquet-tools/src/main/java/org/apache/parquet/tools/util/MetadataUtils.java
+++ b/parquet-tools/src/main/java/org/apache/parquet/tools/util/MetadataUtils.java
@@ -210,7 +210,7 @@ public class MetadataUtils {
if (container != null) {
cpath.add(type.getName());
- String[] paths = cpath.toArray(new String[cpath.size()]);
+ String[] paths = cpath.toArray(new String[0]);
cpath.remove(cpath.size() - 1);
ColumnDescriptor desc = container.getColumnDescription(paths);