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 2026/10/29 12:56:08 UTC
(parquet-java) branch master updated: GH-3900: Replace Guava with JDK APIs in parquet-cli (#3906)
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-java.git
The following commit(s) were added to refs/heads/master by this push:
new ea06dbd4e GH-3900: Replace Guava with JDK APIs in parquet-cli (#3906)
ea06dbd4e is described below
commit ea06dbd4e28f06ba31cb8e79ada5d672db614301
Author: Fokko Driesprong <fo...@apache.org>
AuthorDate: Thu Oct 29 13:56:02 2026 +0100
GH-3900: Replace Guava with JDK APIs in parquet-cli (#3906)
Now that the minimum JDK is 17, replace Guava collection factories,
ImmutableList/ImmutableSet/ImmutableMap, Joiner, Splitter, Objects,
MoreObjects and simple Iterables/Predicate/Function usages in
parquet-cli with JDK equivalents, and switch Guava Preconditions to
org.apache.parquet.Preconditions (all call sites use %s-only messages
with matching argument counts) and Objects.requireNonNull.
Guava usages without a clean JDK equivalent are kept: Closeables,
CharMatcher, Ascii, HashCode, CharStreams, Resources, Iterators.transform
and VisibleForTesting.
Co-authored-by: Isaac <no...@databricks.com>
---
.../java/org/apache/parquet/cli/BaseCommand.java | 2 +-
.../src/main/java/org/apache/parquet/cli/Help.java | 4 +-
.../src/main/java/org/apache/parquet/cli/Main.java | 3 +-
.../src/main/java/org/apache/parquet/cli/Util.java | 13 ++----
.../parquet/cli/commands/CSVSchemaCommand.java | 7 ++--
.../apache/parquet/cli/commands/CatCommand.java | 6 +--
.../cli/commands/CheckParquet251Command.java | 15 +++----
.../parquet/cli/commands/ColumnMaskingCommand.java | 6 +--
.../parquet/cli/commands/ColumnSizeCommand.java | 6 +--
.../parquet/cli/commands/ConvertCSVCommand.java | 11 +++--
.../parquet/cli/commands/ConvertCommand.java | 6 +--
.../cli/commands/ParquetMetadataCommand.java | 23 +++++-----
.../parquet/cli/commands/PruneColumnsCommand.java | 6 +--
.../parquet/cli/commands/RewriteCommand.java | 6 +--
.../apache/parquet/cli/commands/ScanCommand.java | 6 +--
.../apache/parquet/cli/commands/SchemaCommand.java | 6 +--
.../cli/commands/ShowBloomFilterCommand.java | 6 +--
.../cli/commands/ShowColumnIndexCommand.java | 6 +--
.../cli/commands/ShowDictionaryCommand.java | 10 ++---
.../commands/ShowGeospatialStatisticsCommand.java | 6 +--
.../parquet/cli/commands/ShowPagesCommand.java | 15 +++----
.../cli/commands/ShowSizeStatisticsCommand.java | 6 +--
.../apache/parquet/cli/commands/ToAvroCommand.java | 6 +--
.../cli/commands/TransCompressionCommand.java | 6 +--
.../java/org/apache/parquet/cli/csv/AvroCSV.java | 7 ++--
.../org/apache/parquet/cli/csv/AvroCSVReader.java | 9 ++--
.../java/org/apache/parquet/cli/json/AvroJson.java | 49 ++++++++++------------
.../org/apache/parquet/cli/util/Expressions.java | 30 ++++++-------
.../java/org/apache/parquet/cli/util/Schemas.java | 36 ++++++++--------
29 files changed, 148 insertions(+), 170 deletions(-)
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/BaseCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/BaseCommand.java
index b78d193d3..a9121b09c 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/BaseCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/BaseCommand.java
@@ -21,7 +21,6 @@ package org.apache.parquet.cli;
import com.beust.jcommander.internal.Lists;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import com.google.common.io.CharStreams;
import com.google.common.io.Resources;
import java.io.File;
@@ -51,6 +50,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.parquet.HadoopReadOptions;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.avro.AvroParquetReader;
import org.apache.parquet.avro.AvroReadSupport;
import org.apache.parquet.cli.json.AvroJsonReader;
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/Help.java b/parquet-cli/src/main/java/org/apache/parquet/cli/Help.java
index 5a510b246..a42afe68c 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/Help.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/Help.java
@@ -24,7 +24,7 @@ import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterDescription;
import com.beust.jcommander.Parameters;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
@Parameters(commandDescription = "Retrieves details on the functions of other commands")
public class Help implements Command {
@Parameter(description = "<commands>")
- List<String> helpCommands = Lists.newArrayList();
+ List<String> helpCommands = new ArrayList<>();
private final JCommander jc;
private final Logger console;
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/Main.java b/parquet-cli/src/main/java/org/apache/parquet/cli/Main.java
index 0f4932f3d..b8cebd38a 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/Main.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/Main.java
@@ -24,7 +24,6 @@ import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
import com.beust.jcommander.Parameters;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableSet;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.List;
@@ -89,7 +88,7 @@ public class Main extends Configured implements Tool {
@VisibleForTesting
static final String DEFAULT_PROGRAM_NAME = "parquet";
- private static Set<String> HELP_ARGS = ImmutableSet.of("-h", "-help", "--help", "help");
+ private static Set<String> HELP_ARGS = Set.of("-h", "-help", "--help", "help");
private final Logger console;
private final Help help;
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/Util.java b/parquet-cli/src/main/java/org/apache/parquet/cli/Util.java
index 16cb6128c..0abcc595d 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/Util.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/Util.java
@@ -29,12 +29,9 @@ import static org.apache.parquet.column.Encoding.RLE_DICTIONARY;
import static org.apache.parquet.format.Encoding.DELTA_LENGTH_BYTE_ARRAY;
import com.google.common.base.Ascii;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
import com.google.common.hash.HashCode;
import java.util.Set;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.column.ColumnDescriptor;
import org.apache.parquet.column.Encoding;
import org.apache.parquet.column.EncodingStats;
@@ -240,16 +237,14 @@ public class Util {
return sb.toString();
}
- private static final Splitter DOT = Splitter.on('.');
-
public static ColumnDescriptor descriptor(String column, MessageType schema) {
- String[] path = Iterables.toArray(DOT.split(column), String.class);
+ String[] path = column.split("\\.", -1);
Preconditions.checkArgument(schema.containsPath(path), "Schema doesn't have column: %s", column);
return schema.getColumnDescription(path);
}
public static String columnName(ColumnDescriptor desc) {
- return Joiner.on('.').join(desc.getPath());
+ return String.join(".", desc.getPath());
}
public static PrimitiveType primitive(MessageType schema, String[] path) {
@@ -264,7 +259,7 @@ public class Util {
}
public static PrimitiveType primitive(String column, MessageType schema) {
- String[] path = Iterables.toArray(DOT.split(column), String.class);
+ String[] path = column.split("\\.", -1);
Preconditions.checkArgument(schema.containsPath(path), "Schema doesn't have column: %s", column);
return primitive(schema, path);
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CSVSchemaCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CSVSchemaCommand.java
index b343645c4..7766c3890 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CSVSchemaCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CSVSchemaCommand.java
@@ -22,12 +22,11 @@ package org.apache.parquet.cli.commands;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.beust.jcommander.internal.Lists;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableSet;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.List;
import java.util.Set;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.csv.AvroCSV;
import org.apache.parquet.cli.csv.CSVProperties;
@@ -101,9 +100,9 @@ public class CSVSchemaCommand extends BaseCommand {
.charset(charsetName)
.build();
- Set<String> required = ImmutableSet.of();
+ Set<String> required = Set.of();
if (requiredFields != null) {
- required = ImmutableSet.copyOf(requiredFields);
+ required = Set.copyOf(requiredFields);
}
// assume fields are nullable by default, users can easily change this
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CatCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CatCommand.java
index bba732a8b..e388cb12b 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CatCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CatCommand.java
@@ -22,14 +22,14 @@ import static org.apache.parquet.cli.util.Expressions.select;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
import java.io.Closeable;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import org.apache.avro.Schema;
import org.apache.avro.SchemaParseException;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.util.Expressions;
import org.apache.parquet.example.data.Group;
@@ -150,7 +150,7 @@ public class CatCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Show the first 10 records in file \"data.avro\":",
"data.avro",
"# Show the first 50 records in file \"data.parquet\":",
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CheckParquet251Command.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CheckParquet251Command.java
index d01776f9e..cacf23db5 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CheckParquet251Command.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/CheckParquet251Command.java
@@ -24,13 +24,10 @@ import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.BINARY;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.beust.jcommander.internal.Lists;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
-import javax.annotation.Nullable;
import org.apache.hadoop.fs.Path;
import org.apache.parquet.CorruptStatistics;
import org.apache.parquet.Version;
@@ -97,13 +94,11 @@ public class CheckParquet251Command extends BaseCommand {
// get just the binary columns
List<ColumnDescriptor> columns = Lists.newArrayList();
- Iterables.addAll(
- columns, Iterables.filter(meta.getSchema().getColumns(), new Predicate<ColumnDescriptor>() {
- @Override
- public boolean apply(@Nullable ColumnDescriptor input) {
- return input != null && input.getType() == BINARY;
- }
- }));
+ for (ColumnDescriptor input : meta.getSchema().getColumns()) {
+ if (input != null && input.getType() == BINARY) {
+ columns.add(input);
+ }
+ }
// now check to see if the data is actually corrupt
try (ParquetFileReader reader =
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnMaskingCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnMaskingCommand.java
index 808241fe5..ae0aeea26 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnMaskingCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnMaskingCommand.java
@@ -23,12 +23,12 @@ import static org.apache.parquet.format.converter.ParquetMetadataConverter.NO_FI
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import org.apache.hadoop.fs.Path;
import org.apache.parquet.HadoopReadOptions;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.hadoop.ParquetFileReader;
import org.apache.parquet.hadoop.ParquetFileWriter;
@@ -109,7 +109,7 @@ public class ColumnMaskingCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Replace columns with masked values and write to a new Parquet file",
"-m nullify -i input.parquet -o output.parquet -c col1_name");
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnSizeCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnSizeCommand.java
index 6694fb8ee..444195902 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnSizeCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ColumnSizeCommand.java
@@ -21,10 +21,9 @@ package org.apache.parquet.cli.commands;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -32,6 +31,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.format.converter.ParquetMetadataConverter;
import org.apache.parquet.hadoop.ParquetFileReader;
@@ -143,7 +143,7 @@ public class ColumnSizeCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Print every column size in byte and ratio for a Parquet file",
"sample.parquet",
"sample.parquet -c col_1",
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ConvertCSVCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ConvertCSVCommand.java
index d7249eba6..1c1962b97 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ConvertCSVCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ConvertCSVCommand.java
@@ -25,17 +25,16 @@ import static org.apache.parquet.column.ParquetProperties.WriterVersion.PARQUET_
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
+import java.util.Arrays;
import java.util.List;
import java.util.Set;
import org.apache.avro.Schema;
import org.apache.avro.SchemaNormalization;
import org.apache.avro.generic.GenericData;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.avro.AvroParquetWriter;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.csv.AvroCSV;
@@ -141,9 +140,9 @@ public class ConvertCSVCommand extends BaseCommand {
if (avroSchemaFile != null) {
csvSchema = Schemas.fromAvsc(open(avroSchemaFile));
} else {
- Set<String> required = ImmutableSet.of();
+ Set<String> required = Set.of();
if (requiredFields != null) {
- required = ImmutableSet.copyOf(requiredFields);
+ required = Set.copyOf(requiredFields);
}
String filename = new File(targets.get(0)).getName();
@@ -199,7 +198,7 @@ public class ConvertCSVCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Create a Parquet file from a CSV file",
"sample.csv -o sample.parquet --schema schema.avsc",
"# Create a Parquet file in HDFS from local CSV",
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ConvertCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ConvertCommand.java
index c92527c5d..27bcdbfe7 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ConvertCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ConvertCommand.java
@@ -26,16 +26,16 @@ import static org.apache.parquet.column.ParquetProperties.WriterVersion.PARQUET_
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
import java.io.Closeable;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import org.apache.avro.Schema;
import org.apache.avro.generic.GenericData;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.avro.AvroParquetWriter;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.util.Codecs;
@@ -153,7 +153,7 @@ public class ConvertCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Create a Parquet file from an Avro file",
"sample.avro -o sample.parquet",
"# Create a Parquet file in S3 from a local Avro file",
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ParquetMetadataCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ParquetMetadataCommand.java
index 64421f6de..fb5eecdc3 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ParquetMetadataCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ParquetMetadataCommand.java
@@ -28,16 +28,14 @@ import static org.apache.parquet.cli.Util.shortCodec;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
-import javax.annotation.Nullable;
import org.apache.commons.text.TextStringBuilder;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.column.ColumnDescriptor;
import org.apache.parquet.column.Encoding;
@@ -102,7 +100,7 @@ public class ParquetMetadataCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList();
+ return new ArrayList<>();
}
private int maxSize(Iterable<String> strings) {
@@ -131,12 +129,11 @@ public class ParquetMetadataCommand extends BaseCommand {
filePath != null ? "path: " + filePath : "",
new TextStringBuilder(80).appendPadding(80, '-')));
- int size = maxSize(Iterables.transform(rowGroup.getColumns(), new Function<ColumnChunkMetaData, String>() {
- @Override
- public String apply(@Nullable ColumnChunkMetaData input) {
- return input == null ? "" : input.getPath().toDotString();
- }
- }));
+ List<String> columnNames = new ArrayList<>();
+ for (ColumnChunkMetaData input : rowGroup.getColumns()) {
+ columnNames.add(input == null ? "" : input.getPath().toDotString());
+ }
+ int size = maxSize(columnNames);
console.info(String.format(
"%-" + size + "s %-9s %-9s %-9s %-10s %-7s %s",
@@ -155,7 +152,7 @@ public class ParquetMetadataCommand extends BaseCommand {
private void printColumnChunk(Logger console, int width, ColumnChunkMetaData column, MessageType schema) {
String[] path = column.getPath().toArray();
PrimitiveType type = primitive(schema, path);
- Preconditions.checkNotNull(type);
+ Objects.requireNonNull(type);
ColumnDescriptor desc = schema.getColumnDescription(path);
long size = column.getTotalSize();
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/PruneColumnsCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/PruneColumnsCommand.java
index 0d933ecff..2e6808c75 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/PruneColumnsCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/PruneColumnsCommand.java
@@ -20,11 +20,11 @@ package org.apache.parquet.cli.commands;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import org.apache.hadoop.fs.Path;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.hadoop.util.ColumnPruner;
import org.slf4j.Logger;
@@ -74,7 +74,7 @@ public class PruneColumnsCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Removes specified columns and write to a new Parquet file",
"-i input.parquet -o output.parquet -c col1_name");
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/RewriteCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/RewriteCommand.java
index b2365d53f..e1fde4956 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/RewriteCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/RewriteCommand.java
@@ -20,15 +20,15 @@ package org.apache.parquet.cli.commands;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.util.Codecs;
import org.apache.parquet.hadoop.metadata.CompressionCodecName;
@@ -143,7 +143,7 @@ public class RewriteCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Rewrite one or more Parquet files to a new Parquet file",
"-i input.parquet -o output.parquet --mask-mode nullify --mask-columns col1_name");
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ScanCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ScanCommand.java
index 3e348e747..13995e507 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ScanCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ScanCommand.java
@@ -20,15 +20,15 @@ package org.apache.parquet.cli.commands;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
import java.io.Closeable;
import java.io.IOException;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.avro.Schema;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.util.Expressions;
import org.slf4j.Logger;
@@ -93,7 +93,7 @@ public class ScanCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Scan all the records from file \"data.avro\":",
"data.avro",
"# Scan all the records from file \"data.parquet\":",
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/SchemaCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/SchemaCommand.java
index dab563258..9a5656e77 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/SchemaCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/SchemaCommand.java
@@ -21,14 +21,14 @@ package org.apache.parquet.cli.commands;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import java.util.List;
import org.apache.avro.file.SeekableInput;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.util.Formats;
import org.apache.parquet.format.converter.ParquetMetadataConverter;
@@ -88,7 +88,7 @@ public class SchemaCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Print the Avro schema for a Parquet file",
"sample.parquet",
"# Print the Avro schema for an Avro file",
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowBloomFilterCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowBloomFilterCommand.java
index 8fccd05d8..14fa71f4a 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowBloomFilterCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowBloomFilterCommand.java
@@ -21,12 +21,12 @@ package org.apache.parquet.cli.commands;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import org.apache.commons.text.TextStringBuilder;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.Util;
import org.apache.parquet.column.values.bloomfilter.BloomFilter;
@@ -120,7 +120,7 @@ public class ShowBloomFilterCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Show bloom filter for column 'col' from a Parquet file", "-c col -v 1,2,3 -i sample.parquet");
}
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowColumnIndexCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowColumnIndexCommand.java
index d87c48f98..5f3a1ef15 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowColumnIndexCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowColumnIndexCommand.java
@@ -20,15 +20,15 @@ package org.apache.parquet.cli.commands;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.hadoop.ParquetFileReader;
import org.apache.parquet.hadoop.metadata.BlockMetaData;
@@ -74,7 +74,7 @@ public class ShowColumnIndexCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Show only column indexes for column 'col' from a Parquet file", "-c col -i sample.parquet");
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowDictionaryCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowDictionaryCommand.java
index aa7b98e6a..d21095c24 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowDictionaryCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowDictionaryCommand.java
@@ -21,10 +21,11 @@ package org.apache.parquet.cli.commands;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.Util;
import org.apache.parquet.column.ColumnDescriptor;
@@ -66,7 +67,7 @@ public class ShowDictionaryCommand extends BaseCommand {
MessageType schema = reader.getFileMetaData().getSchema();
ColumnDescriptor descriptor = Util.descriptor(column, schema);
PrimitiveType type = Util.primitive(column, schema);
- Preconditions.checkNotNull(type);
+ Objects.requireNonNull(type);
DictionaryPageReadStore dictionaryReader;
int rowGroup = 0;
@@ -129,7 +130,6 @@ public class ShowDictionaryCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
- "# Show the dictionary for column 'col' from a Parquet file", "-c col sample.parquet");
+ return Arrays.asList("# Show the dictionary for column 'col' from a Parquet file", "-c col sample.parquet");
}
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowGeospatialStatisticsCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowGeospatialStatisticsCommand.java
index e310d3f4a..e9b6e70d5 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowGeospatialStatisticsCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowGeospatialStatisticsCommand.java
@@ -20,11 +20,11 @@ package org.apache.parquet.cli.commands;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import org.apache.commons.text.TextStringBuilder;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
import org.apache.parquet.hadoop.ParquetFileReader;
@@ -105,6 +105,6 @@ public class ShowGeospatialStatisticsCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList("# Show geospatial statistics for a Parquet file", "sample.parquet");
+ return Arrays.asList("# Show geospatial statistics for a Parquet file", "sample.parquet");
}
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowPagesCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowPagesCommand.java
index ef7a65bb2..5d8bf4d94 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowPagesCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowPagesCommand.java
@@ -29,14 +29,15 @@ import static org.apache.parquet.cli.Util.shortCodec;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.text.TextStringBuilder;
import org.apache.hadoop.fs.Path;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.rawpages.RawPagesReader;
import org.apache.parquet.column.ColumnDescriptor;
@@ -98,7 +99,7 @@ public class ShowPagesCommand extends BaseCommand {
String source = targets.get(0);
try (ParquetFileReader reader = createParquetFileReader(source)) {
MessageType schema = reader.getFileMetaData().getSchema();
- Map<ColumnDescriptor, PrimitiveType> columns = Maps.newLinkedHashMap();
+ Map<ColumnDescriptor, PrimitiveType> columns = new LinkedHashMap<>();
if (this.columns == null || this.columns.isEmpty()) {
for (ColumnDescriptor descriptor : schema.getColumns()) {
columns.put(descriptor, primitive(schema, descriptor.getPath()));
@@ -112,7 +113,7 @@ public class ShowPagesCommand extends BaseCommand {
CompressionCodecName codec =
reader.getRowGroups().get(0).getColumns().get(0).getCodec();
// accumulate formatted lines to print by column
- Map<String, List<String>> formatted = Maps.newLinkedHashMap();
+ Map<String, List<String>> formatted = new LinkedHashMap<>();
PageFormatter formatter = new PageFormatter(reader);
PageReadStore pageStore;
int rowGroupNum = 0;
@@ -120,7 +121,7 @@ public class ShowPagesCommand extends BaseCommand {
for (ColumnDescriptor descriptor : columns.keySet()) {
List<String> lines = formatted.get(columnName(descriptor));
if (lines == null) {
- lines = Lists.newArrayList();
+ lines = new ArrayList<>();
formatted.put(columnName(descriptor), lines);
}
@@ -157,7 +158,7 @@ public class ShowPagesCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList("# Show pages for column 'col' from a Parquet file", "-c col sample.parquet");
+ return Arrays.asList("# Show pages for column 'col' from a Parquet file", "-c col sample.parquet");
}
private class PageFormatter implements DataPage.Visitor<String> {
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowSizeStatisticsCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowSizeStatisticsCommand.java
index 1f50509a0..e4f76c636 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowSizeStatisticsCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowSizeStatisticsCommand.java
@@ -23,15 +23,15 @@ import static org.apache.parquet.cli.Util.humanReadable;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.annotation.Nullable;
import org.apache.commons.text.TextStringBuilder;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.column.statistics.SizeStatistics;
import org.apache.parquet.hadoop.ParquetFileReader;
@@ -142,7 +142,7 @@ public class ShowSizeStatisticsCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Show size statistics for a Parquet file",
"sample.parquet",
"# Show size statistics for selected columns",
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ToAvroCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ToAvroCommand.java
index bac70db75..e195f05d4 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ToAvroCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ToAvroCommand.java
@@ -24,18 +24,18 @@ import static org.apache.parquet.cli.util.Expressions.filterSchema;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
import java.io.Closeable;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.Arrays;
import java.util.List;
import org.apache.avro.Schema;
import org.apache.avro.file.CodecFactory;
import org.apache.avro.file.DataFileWriter;
import org.apache.avro.generic.GenericDatumWriter;
import org.apache.avro.io.DatumWriter;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.util.Codecs;
import org.apache.parquet.cli.util.Schemas;
@@ -122,7 +122,7 @@ public class ToAvroCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Create an Avro file from a Parquet file",
"sample.parquet sample.avro",
"# Create an Avro file in HDFS from a local JSON file",
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/TransCompressionCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/TransCompressionCommand.java
index 1f0605b7e..61cbe1c60 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/TransCompressionCommand.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/TransCompressionCommand.java
@@ -23,12 +23,12 @@ import static org.apache.parquet.format.converter.ParquetMetadataConverter.NO_FI
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import org.apache.hadoop.fs.Path;
import org.apache.parquet.HadoopReadOptions;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.BaseCommand;
import org.apache.parquet.cli.util.Codecs;
import org.apache.parquet.hadoop.ParquetFileReader;
@@ -97,7 +97,7 @@ public class TransCompressionCommand extends BaseCommand {
@Override
public List<String> getExamples() {
- return Lists.newArrayList(
+ return Arrays.asList(
"# Translate the compression from one to another", " input.parquet -o output.parquet -c ZSTD");
}
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/csv/AvroCSV.java b/parquet-cli/src/main/java/org/apache/parquet/cli/csv/AvroCSV.java
index 42fe1f158..a54dc6d44 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/csv/AvroCSV.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/csv/AvroCSV.java
@@ -24,12 +24,11 @@ import static java.lang.Math.min;
import au.com.bytecode.opencsv.CSVParser;
import au.com.bytecode.opencsv.CSVReader;
import com.google.common.base.CharMatcher;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
+import java.util.Arrays;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Pattern;
@@ -42,7 +41,7 @@ public class AvroCSV {
private static final Pattern DOUBLE = Pattern.compile("\\d*\\.\\d*[dD]?");
private static final Pattern FLOAT = Pattern.compile("\\d*\\.\\d*[fF]?");
private static final int DEFAULT_INFER_LINES = 25;
- private static final Set<String> NO_REQUIRED_FIELDS = ImmutableSet.of();
+ private static final Set<String> NO_REQUIRED_FIELDS = Set.of();
// As per the Avro specs mentioned here -http://avro.apache.org/docs/1.7.5/spec.html
// It should start with [A-Za-z_] and subsequently contain only [A-Za-z0-9_]
private static final Pattern AVRO_COMPATIBLE = Pattern.compile("^[A-Za-z_][A-Za-z\\d_]*$");
@@ -218,7 +217,7 @@ public class AvroCSV {
private static Schema schema(Schema.Type type, boolean makeNullable) {
Schema schema = Schema.create(type == null ? Schema.Type.STRING : type);
if (makeNullable || type == null) {
- schema = Schema.createUnion(Lists.newArrayList(Schema.create(Schema.Type.NULL), schema));
+ schema = Schema.createUnion(Arrays.asList(Schema.create(Schema.Type.NULL), schema));
}
return schema;
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/csv/AvroCSVReader.java b/parquet-cli/src/main/java/org/apache/parquet/cli/csv/AvroCSVReader.java
index 365518338..01efedec5 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/csv/AvroCSVReader.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/csv/AvroCSVReader.java
@@ -20,15 +20,16 @@
package org.apache.parquet.cli.csv;
import au.com.bytecode.opencsv.CSVReader;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import org.apache.avro.Schema;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.util.RuntimeIOException;
public class AvroCSVReader<E> implements Iterator<E>, Iterable<E>, Closeable {
@@ -51,10 +52,10 @@ public class AvroCSVReader<E> implements Iterator<E>, Iterable<E>, Closeable {
List<String> header = null;
if (props.useHeader) {
this.hasNext = advance();
- header = Lists.newArrayList(next);
+ header = new ArrayList<>(Arrays.asList(next));
} else if (props.header != null) {
try {
- header = Lists.newArrayList(AvroCSV.newParser(props).parseLine(props.header));
+ header = new ArrayList<>(Arrays.asList(AvroCSV.newParser(props).parseLine(props.header)));
} catch (IOException e) {
throw new RuntimeIOException("Failed to parse header from properties: " + props.header, e);
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/json/AvroJson.java b/parquet-cli/src/main/java/org/apache/parquet/cli/json/AvroJson.java
index bded9f757..cc560b88a 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/json/AvroJson.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/json/AvroJson.java
@@ -34,19 +34,15 @@ import com.fasterxml.jackson.databind.node.NumericNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode;
import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -54,6 +50,7 @@ import java.util.Set;
import org.apache.avro.AvroRuntimeException;
import org.apache.avro.Schema;
import org.apache.avro.generic.GenericData;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.cli.util.RecordException;
import org.apache.parquet.cli.util.RuntimeIOException;
import org.apache.parquet.cli.util.Schemas;
@@ -117,7 +114,7 @@ public class AvroJson {
case MAP:
RecordException.check(datum.isObject(), "Cannot convert non-object to map: %s", datum);
- Map<String, Object> map = Maps.newLinkedHashMap();
+ Map<String, Object> map = new LinkedHashMap<>();
Iterator<Map.Entry<String, JsonNode>> iter = datum.fields();
while (iter.hasNext()) {
Map.Entry<String, JsonNode> entry = iter.next();
@@ -127,7 +124,7 @@ public class AvroJson {
case ARRAY:
RecordException.check(datum.isArray(), "Cannot convert to array: %s", datum);
- List<Object> list = Lists.newArrayListWithExpectedSize(datum.size());
+ List<Object> list = new ArrayList<>(datum.size());
for (JsonNode element : datum) {
list.add(convertToAvro(model, element, schema.getElementType()));
}
@@ -217,8 +214,8 @@ public class AvroJson {
}
private static Schema resolveUnion(JsonNode datum, Collection<Schema> schemas) {
- Set<Schema.Type> primitives = Sets.newHashSet();
- List<Schema> others = Lists.newArrayList();
+ Set<Schema.Type> primitives = new HashSet<>();
+ List<Schema> others = new ArrayList<>();
for (Schema schema : schemas) {
if (PRIMITIVES.containsKey(schema.getType())) {
primitives.add(schema.getType());
@@ -260,14 +257,13 @@ public class AvroJson {
// this does not contain string, bytes, or fixed because the datum type
// doesn't necessarily determine the schema.
- private static ImmutableMap<Schema.Type, Schema> PRIMITIVES = ImmutableMap.<Schema.Type, Schema>builder()
- .put(Schema.Type.NULL, Schema.create(Schema.Type.NULL))
- .put(Schema.Type.BOOLEAN, Schema.create(Schema.Type.BOOLEAN))
- .put(Schema.Type.INT, Schema.create(Schema.Type.INT))
- .put(Schema.Type.LONG, Schema.create(Schema.Type.LONG))
- .put(Schema.Type.FLOAT, Schema.create(Schema.Type.FLOAT))
- .put(Schema.Type.DOUBLE, Schema.create(Schema.Type.DOUBLE))
- .build();
+ private static Map<Schema.Type, Schema> PRIMITIVES = Map.of(
+ Schema.Type.NULL, Schema.create(Schema.Type.NULL),
+ Schema.Type.BOOLEAN, Schema.create(Schema.Type.BOOLEAN),
+ Schema.Type.INT, Schema.create(Schema.Type.INT),
+ Schema.Type.LONG, Schema.create(Schema.Type.LONG),
+ Schema.Type.FLOAT, Schema.create(Schema.Type.FLOAT),
+ Schema.Type.DOUBLE, Schema.create(Schema.Type.DOUBLE));
private static Schema closestPrimitive(Set<Schema.Type> possible, Schema.Type... types) {
for (Schema.Type type : types) {
@@ -392,7 +388,6 @@ public class AvroJson {
private static class JsonSchemaVisitor extends JsonTreeVisitor<Schema> {
- private static final Joiner DOT = Joiner.on('.');
private final String name;
private boolean objectsToRecords = true;
@@ -408,7 +403,7 @@ public class AvroJson {
@Override
public Schema object(ObjectNode object, Map<String, Schema> fields) {
if (objectsToRecords || recordLevels.size() < 1) {
- List<Schema.Field> recordFields = Lists.newArrayListWithExpectedSize(fields.size());
+ List<Schema.Field> recordFields = new ArrayList<>(fields.size());
for (Map.Entry<String, Schema> entry : fields.entrySet()) {
recordFields.add(new Schema.Field(
@@ -422,7 +417,7 @@ public class AvroJson {
if (recordLevels.size() < 1) {
recordSchema = Schema.createRecord(name, null, null, false);
} else {
- recordSchema = Schema.createRecord(DOT.join(recordLevels), null, null, false);
+ recordSchema = Schema.createRecord(String.join(".", recordLevels), null, null, false);
}
recordSchema.setFields(recordFields);
@@ -434,7 +429,7 @@ public class AvroJson {
case 0:
return Schema.createMap(Schema.create(Schema.Type.NULL));
case 1:
- return Schema.createMap(Iterables.getOnlyElement(fields.values()));
+ return Schema.createMap(fields.values().iterator().next());
default:
return Schema.createMap(Schemas.mergeOrUnion(fields.values()));
}
@@ -448,7 +443,7 @@ public class AvroJson {
case 0:
return Schema.createArray(Schema.create(Schema.Type.NULL));
case 1:
- return Schema.createArray(Iterables.getOnlyElement(elementSchemas));
+ return Schema.createArray(elementSchemas.get(0));
default:
return Schema.createArray(Schemas.mergeOrUnion(elementSchemas));
}
@@ -501,7 +496,7 @@ public class AvroJson {
Preconditions.checkArgument(node instanceof ObjectNode, "Expected instance of ObjectNode: %s", node);
// use LinkedHashMap to preserve field order
- Map<String, T> fields = Maps.newLinkedHashMap();
+ Map<String, T> fields = new LinkedHashMap<>();
Iterator<Map.Entry<String, JsonNode>> iter = node.fields();
while (iter.hasNext()) {
@@ -517,7 +512,7 @@ public class AvroJson {
case ARRAY:
Preconditions.checkArgument(node instanceof ArrayNode, "Expected instance of ArrayNode: %s", node);
- List<T> elements = Lists.newArrayListWithExpectedSize(node.size());
+ List<T> elements = new ArrayList<>(node.size());
for (JsonNode element : node) {
elements.add(visit(element, visitor));
@@ -560,7 +555,7 @@ public class AvroJson {
}
private abstract static class JsonTreeVisitor<T> {
- protected LinkedList<String> recordLevels = Lists.newLinkedList();
+ protected LinkedList<String> recordLevels = new LinkedList<>();
public T object(ObjectNode object, Map<String, T> fields) {
return null;
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/util/Expressions.java b/parquet-cli/src/main/java/org/apache/parquet/cli/util/Expressions.java
index 240f10f21..2388db649 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/util/Expressions.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/util/Expressions.java
@@ -19,9 +19,8 @@
package org.apache.parquet.cli.util;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -30,12 +29,13 @@ import org.apache.avro.Schema;
import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.util.Utf8;
+import org.apache.parquet.Preconditions;
public class Expressions {
private static final Pattern NUMERIC_RE = Pattern.compile("^\\d+$");
public static Object select(Schema schema, Object datum, String path) {
- return select(schema, datum, Lists.newArrayList(parse(path)));
+ return select(schema, datum, new ArrayList<>(Arrays.asList(parse(path))));
}
@SuppressWarnings("unchecked")
@@ -100,14 +100,14 @@ public class Expressions {
* @return a filtered schema
*/
public static Schema filterSchema(Schema schema, String... fieldPaths) {
- return filterSchema(schema, Lists.newArrayList(fieldPaths));
+ return filterSchema(schema, new ArrayList<>(Arrays.asList(fieldPaths)));
}
public static Schema filterSchema(Schema schema, List<String> fieldPaths) {
if (fieldPaths == null) {
return schema;
}
- List<PathExpr> paths = merge(Lists.newArrayList(fieldPaths));
+ List<PathExpr> paths = merge(new ArrayList<>(fieldPaths));
return filter(schema, paths);
}
@@ -182,7 +182,7 @@ public class Expressions {
}
private static List<PathExpr> merge(List<String> fields) {
- List<PathExpr> paths = Lists.newArrayList();
+ List<PathExpr> paths = new ArrayList<>();
for (String field : fields) {
merge(paths, parse(field));
}
@@ -212,7 +212,7 @@ public class Expressions {
switch (schema.getType()) {
case RECORD:
- List<Schema.Field> fields = Lists.newArrayList();
+ List<Schema.Field> fields = new ArrayList<>();
for (PathExpr expr : exprs) {
Schema.Field field = schema.getField(expr.value);
Preconditions.checkArgument(
@@ -237,7 +237,7 @@ public class Expressions {
}
}
- List<Schema> schemas = Lists.newArrayList();
+ List<Schema> schemas = new ArrayList<>();
for (PathExpr expr : exprs) {
schemas.add(filter(schema, expr));
}
@@ -332,7 +332,7 @@ public class Expressions {
}
static PathExpr deref(String value, PathExpr child) {
- return new PathExpr(Type.DEREF, value, Lists.newArrayList(child));
+ return new PathExpr(Type.DEREF, value, new ArrayList<>(Arrays.asList(child)));
}
static PathExpr field(String value) {
@@ -340,7 +340,7 @@ public class Expressions {
}
static PathExpr field(String value, PathExpr child) {
- return new PathExpr(Type.FIELD, value, Lists.newArrayList(child));
+ return new PathExpr(Type.FIELD, value, new ArrayList<>(Arrays.asList(child)));
}
private final Type type;
@@ -350,7 +350,7 @@ public class Expressions {
PathExpr(Type type, String value) {
this.type = type;
this.value = value;
- this.children = Lists.newArrayList();
+ this.children = new ArrayList<>();
}
PathExpr(Type type, String value, List<PathExpr> children) {
@@ -381,11 +381,7 @@ public class Expressions {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
- .add("type", type)
- .add("value", value)
- .add("children", children)
- .toString();
+ return "PathExpr{type=" + type + ", value=" + value + ", children=" + children + "}";
}
}
}
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/util/Schemas.java b/parquet-cli/src/main/java/org/apache/parquet/cli/util/Schemas.java
index bf5baeff9..9478d783b 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/util/Schemas.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/util/Schemas.java
@@ -20,18 +20,17 @@
package org.apache.parquet.cli.util;
import com.fasterxml.jackson.databind.node.NullNode;
-import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.common.io.Closeables;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import org.apache.avro.Schema;
import org.apache.avro.file.DataFileStream;
@@ -40,6 +39,7 @@ import org.apache.avro.generic.GenericRecord;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.parquet.Preconditions;
import org.apache.parquet.avro.AvroSchemaConverter;
import org.apache.parquet.cli.json.AvroJson;
import org.apache.parquet.hadoop.ParquetFileReader;
@@ -238,7 +238,7 @@ public class Schemas {
} else {
boolean notMerged = true;
// combine a union with a non-union by checking if each type will merge
- List<Schema> types = Lists.newArrayList();
+ List<Schema> types = new ArrayList<>();
Iterator<Schema> schemas = left.getTypes().iterator();
// try to merge each type and stop when one succeeds
while (schemas.hasNext()) {
@@ -268,7 +268,7 @@ public class Schemas {
return union(right, left);
}
- return Schema.createUnion(ImmutableList.of(left, right));
+ return Schema.createUnion(List.of(left, right));
}
/**
@@ -285,7 +285,7 @@ public class Schemas {
* @see {@link #mergeOrUnion} to return a union when a merge is not possible.
*/
private static Schema mergeOnly(Schema left, Schema right) {
- if (Objects.equal(left, right)) {
+ if (Objects.equals(left, right)) {
return left;
}
@@ -325,7 +325,7 @@ public class Schemas {
&& right.getName() == null
&& fieldSimilarity(left, right) < SIMILARITY_THRESH) {
return null;
- } else if (!Objects.equal(left.getName(), right.getName())) {
+ } else if (!Objects.equals(left.getName(), right.getName())) {
return null;
}
@@ -345,17 +345,17 @@ public class Schemas {
return Schema.createArray(mergeOrUnion(left.getElementType(), right.getElementType()));
case ENUM:
- if (!Objects.equal(left.getName(), right.getName())) {
+ if (!Objects.equals(left.getName(), right.getName())) {
return null;
}
- Set<String> symbols = Sets.newLinkedHashSet();
+ Set<String> symbols = new LinkedHashSet<>();
symbols.addAll(left.getEnumSymbols());
symbols.addAll(right.getEnumSymbols());
return Schema.createEnum(
left.getName(),
coalesce(left.getDoc(), right.getDoc()),
coalesce(left.getNamespace(), right.getNamespace()),
- ImmutableList.copyOf(symbols));
+ List.copyOf(symbols));
default:
// all primitives are handled before the switch by the equality check.
@@ -383,14 +383,14 @@ public class Schemas {
}
if (schema.getType() != Schema.Type.UNION) {
- return Schema.createUnion(ImmutableList.of(NULL, schema));
+ return Schema.createUnion(List.of(NULL, schema));
}
if (schema.getTypes().get(0).getType() == Schema.Type.NULL) {
return schema;
}
- List<Schema> types = Lists.newArrayList();
+ List<Schema> types = new ArrayList<>();
types.add(NULL);
for (Schema type : schema.getTypes()) {
if (type.getType() != Schema.Type.NULL) {
@@ -402,7 +402,7 @@ public class Schemas {
}
private static List<Schema.Field> mergeFields(Schema left, Schema right) {
- List<Schema.Field> fields = Lists.newArrayList();
+ List<Schema.Field> fields = new ArrayList<>();
for (Schema.Field leftField : left.getFields()) {
Schema.Field rightField = right.getField(leftField.name());
if (rightField != null) {
@@ -455,14 +455,16 @@ public class Schemas {
// check whether the unnamed records appear to be the same record
Set<String> leftNames = names(left.getFields());
Set<String> rightNames = names(right.getFields());
- int common = Sets.intersection(leftNames, rightNames).size();
+ Set<String> commonNames = new HashSet<>(leftNames);
+ commonNames.retainAll(rightNames);
+ int common = commonNames.size();
float leftRatio = ((float) common) / ((float) leftNames.size());
float rightRatio = ((float) common) / ((float) rightNames.size());
return hmean(leftRatio, rightRatio);
}
private static Set<String> names(Collection<Schema.Field> fields) {
- Set<String> names = Sets.newHashSet();
+ Set<String> names = new HashSet<>();
for (Schema.Field field : fields) {
names.add(field.name());
}