You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by bh...@apache.org on 2020/09/03 22:21:20 UTC
[beam] 01/01: Partial Revert "[BEAM-10615] Eliminate nullability
errors from :sdks:java:extensions:sql:jdbc"
This is an automated email from the ASF dual-hosted git repository.
bhulette pushed a commit to branch pr-12738
in repository https://gitbox.apache.org/repos/asf/beam.git
commit 91f680897d5b4f7cb2243fe6f91e80da33b23f6b
Author: Brian Hulette <bh...@google.com>
AuthorDate: Thu Sep 3 15:17:27 2020 -0700
Partial Revert "[BEAM-10615] Eliminate nullability errors from :sdks:java:extensions:sql:jdbc"
This reverts the portions of commit f1070f7104208db165115d6355bdbb59e968d1ac that create new InputStreams.
---
.../beam/sdk/extensions/sql/jdbc/BeamSqlLine.java | 4 +---
.../sdk/extensions/sql/jdbc/BeamSqlLineTest.java | 23 +++++++++-------------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/sdks/java/extensions/sql/jdbc/src/main/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLine.java b/sdks/java/extensions/sql/jdbc/src/main/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLine.java
index 031705a..bf4ef1d 100644
--- a/sdks/java/extensions/sql/jdbc/src/main/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLine.java
+++ b/sdks/java/extensions/sql/jdbc/src/main/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLine.java
@@ -19,7 +19,6 @@ package org.apache.beam.sdk.extensions.sql.jdbc;
import static org.apache.beam.sdk.extensions.sql.impl.JdbcDriver.CONNECT_STRING_PREFIX;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -38,8 +37,7 @@ public class BeamSqlLine {
private static final String NICKNAME = "BeamSQL";
public static void main(String[] args) throws IOException {
- final InputStream inputStream = new ByteArrayInputStream(new byte[0]);
- runSqlLine(args, inputStream, System.out, System.err);
+ runSqlLine(args, null, System.out, System.err);
}
private static String[] checkConnectionArgs(String[] args) {
diff --git a/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java b/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java
index 0667f01..34bae8d 100644
--- a/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java
+++ b/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java
@@ -22,10 +22,8 @@ import static org.apache.beam.sdk.extensions.sql.jdbc.BeamSqlLineTestingUtils.to
import static org.hamcrest.CoreMatchers.everyItem;
import static org.junit.Assert.assertThat;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
import org.hamcrest.collection.IsIn;
@@ -90,8 +88,8 @@ public class BeamSqlLineTest {
public void testSqlLine_select() throws Exception {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
String[] args = buildArgs("SELECT 3, 'hello', DATE '2018-05-28';");
- InputStream inputStream = new ByteArrayInputStream(new byte[0]);
- BeamSqlLine.runSqlLine(args, inputStream, byteArrayOutputStream, null);
+
+ BeamSqlLine.runSqlLine(args, null, byteArrayOutputStream, null);
List<List<String>> lines = toLines(byteArrayOutputStream);
assertThat(
@@ -108,8 +106,8 @@ public class BeamSqlLineTest {
+ "col_c VARCHAR, col_x TINYINT, col_y INT, col_z BIGINT) TYPE 'test';",
"INSERT INTO table_test VALUES ('a', 'b', 'c', 1, 2, 3);",
"SELECT * FROM table_test;");
- InputStream inputStream = new ByteArrayInputStream(new byte[0]);
- BeamSqlLine.runSqlLine(args, inputStream, byteArrayOutputStream, null);
+
+ BeamSqlLine.runSqlLine(args, null, byteArrayOutputStream, null);
List<List<String>> lines = toLines(byteArrayOutputStream);
assertThat(
@@ -127,8 +125,8 @@ public class BeamSqlLineTest {
"CREATE EXTERNAL TABLE table_test (col_a VARCHAR, col_b VARCHAR) TYPE 'test';",
"INSERT INTO table_test SELECT '3', 'hello';",
"SELECT * FROM table_test;");
- InputStream inputStream = new ByteArrayInputStream(new byte[0]);
- BeamSqlLine.runSqlLine(args, inputStream, byteArrayOutputStream, null);
+
+ BeamSqlLine.runSqlLine(args, null, byteArrayOutputStream, null);
List<List<String>> lines = toLines(byteArrayOutputStream);
assertThat(
@@ -146,8 +144,7 @@ public class BeamSqlLineTest {
"INSERT INTO table_test SELECT '4', 'foo';",
"SELECT col_a, count(*) FROM table_test GROUP BY col_a;");
- InputStream inputStream = new ByteArrayInputStream(new byte[0]);
- BeamSqlLine.runSqlLine(args, inputStream, byteArrayOutputStream, null);
+ BeamSqlLine.runSqlLine(args, null, byteArrayOutputStream, null);
List<List<String>> lines = toLines(byteArrayOutputStream);
assertThat(
@@ -166,8 +163,7 @@ public class BeamSqlLineTest {
"SELECT TUMBLE_START(col_b, INTERVAL '1' SECOND), count(*) FROM table_test "
+ "GROUP BY TUMBLE(col_b, INTERVAL '1' SECOND);");
- InputStream inputStream = new ByteArrayInputStream(new byte[0]);
- BeamSqlLine.runSqlLine(args, inputStream, byteArrayOutputStream, null);
+ BeamSqlLine.runSqlLine(args, null, byteArrayOutputStream, null);
List<List<String>> lines = toLines(byteArrayOutputStream);
assertThat(
@@ -189,8 +185,7 @@ public class BeamSqlLineTest {
"SELECT HOP_END(col_b, INTERVAL '1' SECOND, INTERVAL '2' SECOND), count(*) FROM "
+ "table_test GROUP BY HOP(col_b, INTERVAL '1' SECOND, INTERVAL '2' SECOND);");
- InputStream inputStream = new ByteArrayInputStream(new byte[0]);
- BeamSqlLine.runSqlLine(args, inputStream, byteArrayOutputStream, null);
+ BeamSqlLine.runSqlLine(args, null, byteArrayOutputStream, null);
List<List<String>> lines = toLines(byteArrayOutputStream);
assertThat(