-
Notifications
You must be signed in to change notification settings - Fork 4.5k
[BEAM-3217] add HadoopInputFormatIO integration test using DBInputFormat #4332
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
138b0e0
[BEAM-3217] add HadoopInputFormatIO integration test using DBInputFormat
lgajowy 421aabd
[BEAM-3217] Post code review changes #1
lgajowy 67cff14
[BEAM-3217] Fix jenkins job configuration
lgajowy cc49188
[BEAM-3217] Remove Jenkins job for the test
lgajowy d502078
Merge branch 'master' into HadoopInputFormatIO-test
lgajowy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
sdks/java/io/common/src/test/java/org/apache/beam/sdk/io/common/DatabaseTestHelper.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.beam.sdk.io.common; | ||
|
|
||
| import java.sql.Connection; | ||
| import java.sql.SQLException; | ||
| import java.sql.Statement; | ||
| import java.text.SimpleDateFormat; | ||
| import java.util.Date; | ||
| import javax.sql.DataSource; | ||
| import org.postgresql.ds.PGSimpleDataSource; | ||
|
|
||
| /** | ||
| * This class contains helper methods to ease database usage in tests. | ||
| */ | ||
| public class DatabaseTestHelper { | ||
|
|
||
| public static PGSimpleDataSource getPostgresDataSource(IOTestPipelineOptions options) { | ||
| PGSimpleDataSource dataSource = new PGSimpleDataSource(); | ||
| dataSource.setDatabaseName(options.getPostgresDatabaseName()); | ||
| dataSource.setServerName(options.getPostgresServerName()); | ||
| dataSource.setPortNumber(options.getPostgresPort()); | ||
| dataSource.setUser(options.getPostgresUsername()); | ||
| dataSource.setPassword(options.getPostgresPassword()); | ||
| dataSource.setSsl(options.getPostgresSsl()); | ||
| return dataSource; | ||
| } | ||
|
|
||
| public static void createTable(DataSource dataSource, String tableName) | ||
| throws SQLException { | ||
| try (Connection connection = dataSource.getConnection()) { | ||
| try (Statement statement = connection.createStatement()) { | ||
| statement.execute( | ||
| String.format("create table %s (id INT, name VARCHAR(500))", tableName)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static void deleteTable(DataSource dataSource, String tableName) | ||
| throws SQLException { | ||
| if (tableName != null) { | ||
| try (Connection connection = dataSource.getConnection(); | ||
| Statement statement = connection.createStatement()) { | ||
| statement.executeUpdate(String.format("drop table %s", tableName)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static String getTestTableName(String testIdentifier) { | ||
| SimpleDateFormat formatter = new SimpleDateFormat(); | ||
| formatter.applyPattern("yyyy_MM_dd_HH_mm_ss_S"); | ||
| return String.format("BEAMTEST_%s_%s", testIdentifier, formatter.format(new Date())); | ||
| } | ||
|
|
||
| public static String getPostgresDBUrl(IOTestPipelineOptions options) { | ||
| return String.format( | ||
| "jdbc:postgresql://%s:%s/%s", | ||
| options.getPostgresServerName(), | ||
| options.getPostgresPort(), | ||
| options.getPostgresDatabaseName() | ||
| ); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For now I simply duplicated the code from jdbc io, applying necessary changes. I think it can be improved later, see: https://issues.apache.org/jira/browse/BEAM-3440