Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FLINK-17361] [jdbc] Added custom query on JDBC tables #11986

Merged
merged 2 commits into from
May 19, 2020
Merged

[FLINK-17361] [jdbc] Added custom query on JDBC tables #11986

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bed30e
[FLINK-17361] Add custom query on JDBC tables
fpompermaier May 4, 2020
8c15ff1
[FLINK-17361] Refactor JdbcTableSourceITCase to use TableResult inste…
aljoscha May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
85 changes: 48 additions & 37 deletions ...ector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTableSourceITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import org.apache.flink.connector.jdbc.JdbcTestBase;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableResult;
import org.apache.flink.table.api.java.StreamTableEnvironment;
import org.apache.flink.table.runtime.utils.StreamITCase;
import org.apache.flink.test.util.AbstractTestBase;
import org.apache.flink.types.Row;

Expand All @@ -34,8 +34,15 @@
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Spliterator;
import java.util.Spliterators;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;

import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.Assert.assertThat;


/**
Expand Down Expand Up @@ -107,20 +114,19 @@ public void testJdbcSource() throws Exception {
")"
);

StreamITCase.clear();
tEnv.toAppendStream(tEnv.sqlQuery("SELECT * FROM " + INPUT_TABLE), Row.class)
.addSink(new StreamITCase.StringSink<>());
env.execute();
TableResult tableResult = tEnv.executeSql("SELECT * FROM " + INPUT_TABLE);

List<String> results = manifestResults(tableResult);

List<String> expected =
Arrays.asList(
"1,2020-01-01T15:35:00.123456,2020-01-01T15:35:00.123456789,15:35,1.175E-37,1.79769E308,100.1234",
"2,2020-01-01T15:36:01.123456,2020-01-01T15:36:01.123456789,15:36:01,-1.175E-37,-1.79769E308,101.1234");
StreamITCase.compareWithList(expected);
assertThat(
results,
containsInAnyOrder(
"1,2020-01-01T15:35:00.123456,2020-01-01T15:35:00.123456789,15:35,1.175E-37,1.79769E308,100.1234",
"2,2020-01-01T15:36:01.123456,2020-01-01T15:36:01.123456789,15:36:01,-1.175E-37,-1.79769E308,101.1234"));
}

@Test
public void testProjectableJdbcSource() throws Exception {
public void testProjectableJdbcSource() {
StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
EnvironmentSettings envSettings = EnvironmentSettings.newInstance()
.useBlinkPlanner()
Expand All @@ -143,20 +149,19 @@ public void testProjectableJdbcSource() throws Exception {
")"
);

StreamITCase.clear();
tEnv.toAppendStream(tEnv.sqlQuery("SELECT timestamp6_col, decimal_col FROM " + INPUT_TABLE), Row.class)
.addSink(new StreamITCase.StringSink<>());
env.execute();
TableResult tableResult = tEnv.executeSql("SELECT timestamp6_col, decimal_col FROM " + INPUT_TABLE);

List<String> results = manifestResults(tableResult);

List<String> expected =
Arrays.asList(
"2020-01-01T15:35:00.123456,100.1234",
"2020-01-01T15:36:01.123456,101.1234");
StreamITCase.compareWithList(expected);
assertThat(
results,
containsInAnyOrder(
"2020-01-01T15:35:00.123456,100.1234",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aljoscha for the future: please use instances instead of strings

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted, that's a very good point.

"2020-01-01T15:36:01.123456,101.1234"));
}

@Test
public void testScanQueryJDBCSource() throws Exception {
public void testScanQueryJDBCSource() {
StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
EnvironmentSettings envSettings = EnvironmentSettings.newInstance()
.useBlinkPlanner()
Expand All @@ -165,23 +170,29 @@ public void testScanQueryJDBCSource() throws Exception {
StreamTableEnvironment tEnv = StreamTableEnvironment.create(env, envSettings);

final String testQuery = "SELECT id FROM " + INPUT_TABLE;
tEnv.sqlUpdate(
"CREATE TABLE test(" +
"id BIGINT" +
") WITH (" +
" 'connector.type'='jdbc'," +
" 'connector.url'='" + DB_URL + "'," +
" 'connector.table'='whatever'," +
" 'connector.read.query'='" + testQuery + "'" +
")"
tEnv.executeSql(
"CREATE TABLE test(" +
"id BIGINT" +
") WITH (" +
" 'connector.type'='jdbc'," +
" 'connector.url'='" + DB_URL + "'," +
" 'connector.table'='whatever'," +
" 'connector.read.query'='" + testQuery + "'" +
")"
);

StreamITCase.clear();
tEnv.toAppendStream(tEnv.sqlQuery("SELECT id FROM test"), Row.class)
.addSink(new StreamITCase.StringSink<>());
env.execute();
TableResult tableResult = tEnv.executeSql("SELECT id FROM test");

List<String> results = manifestResults(tableResult);

assertThat(results, containsInAnyOrder("1", "2"));
}

List<String> expected = Arrays.asList("1", "2");
StreamITCase.compareWithList(expected);
private static List<String> manifestResults(TableResult result) {
Iterator<Row> resultIterator = result.collect();
return StreamSupport
.stream(Spliterators.spliteratorUnknownSize(resultIterator, Spliterator.ORDERED), false)
.map(Row::toString)
.collect(Collectors.toList());
}
}