From 910edd3d99130db58b72f16aeb0e583915455870 Mon Sep 17 00:00:00 2001 From: Benchao Li Date: Fri, 17 Nov 2023 12:06:51 +0800 Subject: [PATCH 1/2] Revert "Bump 6 dependencies" This reverts commit 55034513b463c938035e5d2436949bbf734b84b6. --- .../main/java/org/apache/calcite/util/Sources.java | 5 ++++- .../apache/calcite/adapter/file/CsvStreamReader.java | 12 ++---------- gradle.properties | 12 ++++++------ 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/core/src/main/java/org/apache/calcite/util/Sources.java b/core/src/main/java/org/apache/calcite/util/Sources.java index d1846505564f..59c8cb19b958 100644 --- a/core/src/main/java/org/apache/calcite/util/Sources.java +++ b/core/src/main/java/org/apache/calcite/util/Sources.java @@ -16,6 +16,8 @@ */ package org.apache.calcite.util; +import org.apache.commons.io.input.ReaderInputStream; + import com.google.common.io.CharSource; import org.checkerframework.checker.nullness.qual.Nullable; @@ -135,7 +137,8 @@ private UnsupportedOperationException unsupported() { } @Override public InputStream openStream() throws IOException { - return charSource.asByteSource(StandardCharsets.UTF_8).openStream(); + // use charSource.asByteSource() once calcite can use guava v21+ + return new ReaderInputStream(reader(), StandardCharsets.UTF_8); } @Override public String protocol() { diff --git a/file/src/main/java/org/apache/calcite/adapter/file/CsvStreamReader.java b/file/src/main/java/org/apache/calcite/adapter/file/CsvStreamReader.java index 2bbcb45fa722..1c7aed8ff08d 100644 --- a/file/src/main/java/org/apache/calcite/adapter/file/CsvStreamReader.java +++ b/file/src/main/java/org/apache/calcite/adapter/file/CsvStreamReader.java @@ -28,7 +28,6 @@ import java.io.Closeable; import java.io.IOException; import java.io.StringReader; -import java.time.Duration; import java.util.ArrayDeque; import java.util.Queue; @@ -80,15 +79,8 @@ private CsvStreamReader(Source source, char separator, char quoteChar, contentQueue = new ArrayDeque<>(); TailerListener listener = new CsvContentListener(contentQueue); tailer = - Tailer.builder() - .setFile(source.file()) - .setTailerListener(listener) - .setDelayDuration(Duration.ofMillis(DEFAULT_MONITOR_DELAY)) - .setTailFromEnd(false) - .setReOpen(true) - .setBufferSize(4096) - .get(); - + Tailer.create(source.file(), listener, DEFAULT_MONITOR_DELAY, + false, true, 4096); this.parser = new CSVParser(separator, quoteChar, escape, strictQuotes, ignoreLeadingWhiteSpace); diff --git a/gradle.properties b/gradle.properties index 9ba85046899d..2bb04a6dee1b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -89,14 +89,14 @@ cassandra-all.version=4.0.1 cassandra-java-driver-core.version=4.13.0 cassandra-unit.version=4.3.1.0 chinook-data-hsqldb.version=0.2 -commons-codec.version=1.16.0 -commons-dbcp2.version=2.11.0 -commons-io.version=2.15.0 -commons-lang3.version=3.13.0 +commons-codec.version=1.13 +commons-dbcp2.version=2.9.0 +commons-io.version=2.11.0 +commons-lang3.version=3.8 commons-math3.version=3.6.1 -commons-pool2.version=2.12.0 +commons-pool2.version=2.6.2 commons-collections4.version=4.4 -commons-text.version=1.11.0 +commons-text.version=1.10.0 dropwizard-metrics.version=4.0.5 # do not upgrade this, new versions are Category X license. From fd92de39cf26fb516814976dd3ef1f9676e3a469 Mon Sep 17 00:00:00 2001 From: Benchao Li Date: Fri, 17 Nov 2023 12:16:39 +0800 Subject: [PATCH 2/2] Revert "Revert "Bump 6 dependencies"" This reverts commit 910edd3d99130db58b72f16aeb0e583915455870. --- .../main/java/org/apache/calcite/util/Sources.java | 5 +---- .../apache/calcite/adapter/file/CsvStreamReader.java | 12 ++++++++++-- gradle.properties | 12 ++++++------ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/org/apache/calcite/util/Sources.java b/core/src/main/java/org/apache/calcite/util/Sources.java index 59c8cb19b958..d1846505564f 100644 --- a/core/src/main/java/org/apache/calcite/util/Sources.java +++ b/core/src/main/java/org/apache/calcite/util/Sources.java @@ -16,8 +16,6 @@ */ package org.apache.calcite.util; -import org.apache.commons.io.input.ReaderInputStream; - import com.google.common.io.CharSource; import org.checkerframework.checker.nullness.qual.Nullable; @@ -137,8 +135,7 @@ private UnsupportedOperationException unsupported() { } @Override public InputStream openStream() throws IOException { - // use charSource.asByteSource() once calcite can use guava v21+ - return new ReaderInputStream(reader(), StandardCharsets.UTF_8); + return charSource.asByteSource(StandardCharsets.UTF_8).openStream(); } @Override public String protocol() { diff --git a/file/src/main/java/org/apache/calcite/adapter/file/CsvStreamReader.java b/file/src/main/java/org/apache/calcite/adapter/file/CsvStreamReader.java index 1c7aed8ff08d..2bbcb45fa722 100644 --- a/file/src/main/java/org/apache/calcite/adapter/file/CsvStreamReader.java +++ b/file/src/main/java/org/apache/calcite/adapter/file/CsvStreamReader.java @@ -28,6 +28,7 @@ import java.io.Closeable; import java.io.IOException; import java.io.StringReader; +import java.time.Duration; import java.util.ArrayDeque; import java.util.Queue; @@ -79,8 +80,15 @@ private CsvStreamReader(Source source, char separator, char quoteChar, contentQueue = new ArrayDeque<>(); TailerListener listener = new CsvContentListener(contentQueue); tailer = - Tailer.create(source.file(), listener, DEFAULT_MONITOR_DELAY, - false, true, 4096); + Tailer.builder() + .setFile(source.file()) + .setTailerListener(listener) + .setDelayDuration(Duration.ofMillis(DEFAULT_MONITOR_DELAY)) + .setTailFromEnd(false) + .setReOpen(true) + .setBufferSize(4096) + .get(); + this.parser = new CSVParser(separator, quoteChar, escape, strictQuotes, ignoreLeadingWhiteSpace); diff --git a/gradle.properties b/gradle.properties index 2bb04a6dee1b..9ba85046899d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -89,14 +89,14 @@ cassandra-all.version=4.0.1 cassandra-java-driver-core.version=4.13.0 cassandra-unit.version=4.3.1.0 chinook-data-hsqldb.version=0.2 -commons-codec.version=1.13 -commons-dbcp2.version=2.9.0 -commons-io.version=2.11.0 -commons-lang3.version=3.8 +commons-codec.version=1.16.0 +commons-dbcp2.version=2.11.0 +commons-io.version=2.15.0 +commons-lang3.version=3.13.0 commons-math3.version=3.6.1 -commons-pool2.version=2.6.2 +commons-pool2.version=2.12.0 commons-collections4.version=4.4 -commons-text.version=1.10.0 +commons-text.version=1.11.0 dropwizard-metrics.version=4.0.5 # do not upgrade this, new versions are Category X license.