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

Refactor connection management in bqjdbc tests #186

Merged
merged 6 commits into from
Jan 4, 2024
Merged

Refactor connection management in bqjdbc tests #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28012fa
Refactor BQScrollableResultSetFunctionTest connection management.
goomrw Dec 20, 2023
582b761
Refactor BQForwardOnlyResultSetFunctionTest connection management.
goomrw Dec 20, 2023
3479fdc
Refactor BQResultSetFunctionTest connection management.
goomrw Dec 20, 2023
62f1f38
Refactor QueryResultTest connection management.
goomrw Dec 20, 2023
68f17f5
Refactor QueryResultTest connection management.
goomrw Dec 20, 2023
e61041d
Remove extra instance variable fixtures.
goomrw Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
173 changes: 69 additions & 104 deletions src/test/java/net/starschema/clouddb/jdbc/BQForwardOnlyResultSetFunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
Expand Down Expand Up @@ -62,35 +61,43 @@
*/
public class BQForwardOnlyResultSetFunctionTest extends CommonTestsForResultSets {

private static java.sql.Connection con = null;
private java.sql.Connection connection;
private java.sql.Connection standardSqlConnection;
private java.sql.ResultSet resultForTest = null;

Logger logger = LoggerFactory.getLogger(BQForwardOnlyResultSetFunctionTest.class);
private Integer maxRows = null;
private String defaultProjectId = null;
private BQConnection defaultConn = null;

private Connection connect(final String extraUrl) throws SQLException, IOException {
return ConnectionFromResources.connect("installedaccount1.properties", extraUrl);
}

@Before
public void setup() throws SQLException, IOException {
Properties props =
BQSupportFuncts.readFromPropFile(
getClass().getResource("/installedaccount.properties").getFile());
String url = BQSupportFuncts.constructUrlFromPropertiesFile(props, true, null);
url += "&useLegacySql=false";
this.defaultProjectId = props.getProperty("projectid");
this.defaultConn = new BQConnection(url, new Properties());
public void setConnection() throws SQLException, IOException {
goomrw marked this conversation as resolved.
Show resolved Hide resolved
connection = connect("&useLegacySql=true");
}

@Before
public void setStandardSqlConnection() throws SQLException, IOException {
standardSqlConnection = connect("&useLegacySql=false");
}

@After
public void teardown() throws SQLException {
if (defaultConn != null) {
defaultConn.close();
defaultConn = null;
}
public void closeConnection() throws SQLException {
connection.close();
}

private BQConnection conn() throws SQLException, IOException {
return this.defaultConn;
@After
public void closeStandardSqlConnection() throws SQLException {
standardSqlConnection.close();
}

private BQConnection bqConnection() {
return (BQConnection) connection;
}

private BQConnection bqStandardSqlConnection() {
return (BQConnection) standardSqlConnection;
}

@Test
Expand Down Expand Up @@ -143,7 +150,10 @@ public void databaseMetaDataGetTables() {
this.QueryLoad();
ResultSet result = null;
try {
result = con.getMetaData().getColumns(null, "starschema_net__clouddb", "OUTLET_LOOKUP", null);
result =
connection
.getMetaData()
.getColumns(null, "starschema_net__clouddb", "OUTLET_LOOKUP", null);
} catch (SQLException e) {
e.printStackTrace();
Assert.fail();
Expand Down Expand Up @@ -176,79 +186,43 @@ public void databaseMetaDataGetTables() {
public void isClosedValidtest() {
this.QueryLoad();
try {
Assert.assertEquals(true, BQForwardOnlyResultSetFunctionTest.con.isValid(0));
Assert.assertEquals(true, connection.isValid(0));
} catch (SQLException e) {
Assert.fail("Got an exception" + e.toString());
e.printStackTrace();
}
try {
Assert.assertEquals(true, BQForwardOnlyResultSetFunctionTest.con.isValid(10));
Assert.assertEquals(true, connection.isValid(10));
} catch (SQLException e) {
Assert.fail("Got an exception" + e.toString());
e.printStackTrace();
}
try {
BQForwardOnlyResultSetFunctionTest.con.isValid(-10);
connection.isValid(-10);
} catch (SQLException e) {
Assert.assertTrue(true);
// e.printStackTrace();
}

try {
BQForwardOnlyResultSetFunctionTest.con.close();
connection.close();
} catch (SQLException e) {
e.printStackTrace();
}
try {
Assert.assertTrue(BQForwardOnlyResultSetFunctionTest.con.isClosed());
Assert.assertTrue(connection.isClosed());
} catch (SQLException e1) {
e1.printStackTrace();
}

try {
BQForwardOnlyResultSetFunctionTest.con.isValid(0);
connection.isValid(0);
} catch (SQLException e) {
Assert.assertTrue(true);
e.printStackTrace();
}
}

/**
* Makes a new Bigquery Connection to URL in file and gives back the Connection to static con
* member.
*/
@Before
public void NewConnection() {
NewConnection("&useLegacySql=true");
}

void NewConnection(String extraUrl) {
this.logger.info("Testing the JDBC driver");
try {
Class.forName("net.starschema.clouddb.jdbc.BQDriver");
Properties props =
BQSupportFuncts.readFromPropFile(
getClass().getResource("/installedaccount1.properties").getFile());
String jdcbUrl = BQSupportFuncts.constructUrlFromPropertiesFile(props);
if (extraUrl != null) {
jdcbUrl += extraUrl;
}
if (BQForwardOnlyResultSetFunctionTest.con != null) {
BQForwardOnlyResultSetFunctionTest.con.close();
}
BQForwardOnlyResultSetFunctionTest.con =
DriverManager.getConnection(
jdcbUrl,
BQSupportFuncts.readFromPropFile(
getClass().getResource("/installedaccount1.properties").getFile()));
} catch (Exception e) {
e.printStackTrace();
this.logger.error("Error in connection" + e.toString());
Assert.fail("General Exception:" + e.toString());
}
this.logger.info(((BQConnection) BQForwardOnlyResultSetFunctionTest.con).getURLPART());
}

// Comprehensive Tests:

public void QueryLoad() {
Expand All @@ -260,8 +234,7 @@ public void QueryLoad() {
try {
// Statement stmt = BQResultSetFunctionTest.con.createStatement();
Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
stmt.setQueryTimeout(500);
if (this.maxRows != null) {
stmt.setMaxRows(this.maxRows);
Expand Down Expand Up @@ -460,11 +433,10 @@ public void testResultSetTypesInGetString() throws SQLException {
+ "STRUCT(1 as a, ['an', 'array'] as b),"
+ "TIMESTAMP('2012-01-01 00:00:03.0000') as t";

this.NewConnection("&useLegacySql=false");
java.sql.ResultSet result = null;
try {
Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
standardSqlConnection.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
stmt.setQueryTimeout(500);
result = stmt.executeQuery(sql);
Expand Down Expand Up @@ -522,9 +494,8 @@ public void testResultSetDateTimeType() throws SQLException, ParseException {
final DateFormat utcDateFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
utcDateFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));

this.NewConnection("&useLegacySql=false");
Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
standardSqlConnection.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
stmt.setQueryTimeout(500);
ResultSet result = stmt.executeQuery(sql);
Expand Down Expand Up @@ -556,9 +527,8 @@ public void testResultSetDateTimeType() throws SQLException, ParseException {
public void testResultSetTimestampType() throws SQLException, ParseException {
final String sql = "SELECT TIMESTAMP('2012-01-01 01:02:03.04567')";

this.NewConnection("&useLegacySql=false");
Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
standardSqlConnection.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
stmt.setQueryTimeout(500);
ResultSet result = stmt.executeQuery(sql);
Expand Down Expand Up @@ -589,12 +559,10 @@ public void testResultSetTypesInGetObject() throws SQLException, ParseException
+ "CAST('2011-04-03' AS DATE), "
+ "CAST('nan' AS FLOAT)";

this.NewConnection("&useLegacySql=true");
java.sql.ResultSet result = null;
try {
Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
stmt.setQueryTimeout(500);
result = stmt.executeQuery(sql);
} catch (SQLException e) {
Expand All @@ -617,11 +585,10 @@ public void testResultSetTypesInGetObject() throws SQLException, ParseException
public void testResultSetArraysInGetObject() throws SQLException, ParseException {
final String sql = "SELECT [1, 2, 3], [TIMESTAMP(\"2010-09-07 15:30:00 America/Los_Angeles\")]";

this.NewConnection("&useLegacySql=false");
java.sql.ResultSet result = null;
try {
Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
standardSqlConnection.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
stmt.setQueryTimeout(500);
result = stmt.executeQuery(sql);
Expand Down Expand Up @@ -651,12 +618,11 @@ public void testResultSetArraysInGetObject() throws SQLException, ParseException
@Test
public void testResultSetTimeType() throws SQLException, ParseException {
final String sql = "select current_time(), CAST('00:00:02.12345' AS TIME)";
this.NewConnection("&useLegacySql=false");

java.sql.ResultSet result = null;
try {
Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
standardSqlConnection.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
stmt.setQueryTimeout(500);
result = stmt.executeQuery(sql);
Expand Down Expand Up @@ -709,11 +675,10 @@ public void testResultSetProcedures() throws SQLException, ParseException {
final String sql =
"CREATE PROCEDURE looker_test.procedure_test(target_id INT64)\n" + "BEGIN\n" + "END;";

this.NewConnection("&useLegacySql=false");
java.sql.ResultSet result = null;
try {
Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
standardSqlConnection.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
stmt.setQueryTimeout(500);
result = stmt.executeQuery(sql);
Expand All @@ -723,23 +688,22 @@ public void testResultSetProcedures() throws SQLException, ParseException {
} finally {
String cleanupSql = "DROP PROCEDURE looker_test.procedure_test;\n";
Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
standardSqlConnection.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
stmt.setQueryTimeout(500);
stmt.executeQuery(cleanupSql);
}

System.out.println(result.toString());
// System.out.println(result.toString());
}

@Test
public void testResultSetProceduresAsync() throws SQLException {
final String sql =
"CREATE PROCEDURE looker_test.long_procedure(target_id INT64)\n" + "BEGIN\n" + "END;";
this.NewConnection("&useLegacySql=false");

try {
BQConnection bq = conn();
BQConnection bq = bqStandardSqlConnection();
BQStatement stmt =
new BQStatement(
bq.getProjectId(), bq, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY) {
Expand All @@ -751,13 +715,13 @@ protected long getSyncTimeoutMillis() {

stmt.setQueryTimeout(500);
stmt.executeQuery(sql);
} catch (SQLException | IOException e) {
} catch (SQLException e) {
this.logger.error("SQLexception" + e.toString());
Assert.fail("SQLException" + e.toString());
} finally {
String cleanupSql = "DROP PROCEDURE looker_test.long_procedure;\n";
Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
standardSqlConnection.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
stmt.setQueryTimeout(500);
stmt.executeQuery(cleanupSql);
Expand All @@ -766,20 +730,20 @@ protected long getSyncTimeoutMillis() {

@Test
public void testBQForwardOnlyResultSetDoesntThrowNPE() throws Exception {
BQConnection bq = conn();
BQConnection bq = bqConnection();
BQStatement stmt = (BQStatement) bq.createStatement();
QueryResponse qr = stmt.runSyncQuery("SELECT 1", false);
Job ref =
bq.getBigquery()
.jobs()
.get(defaultProjectId, qr.getJobReference().getJobId())
.get(bq.getProjectId(), qr.getJobReference().getJobId())
.setLocation(qr.getJobReference().getLocation())
.execute();
// Under certain race conditions we could close the connection after the job is complete but
// before the results have been fetched. This was throwing a NPE.
bq.close();
try {
new BQForwardOnlyResultSet(bq.getBigquery(), defaultProjectId, ref, null, stmt);
new BQForwardOnlyResultSet(bq.getBigquery(), bq.getProjectId(), ref, null, stmt);
Assert.fail("Initalizing BQForwardOnlyResultSet should throw something other than a NPE.");
} catch (SQLException e) {
Assert.assertEquals(e.getMessage(), "Failed to fetch results. Connection is closed.");
Expand All @@ -799,9 +763,8 @@ public void testHandlesAllNullResponseFields() throws Exception {

@Test
public void testHandlesNullTimeDateObjects() throws Exception {
this.NewConnection("&useLegacySql=false");
Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
standardSqlConnection.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);

final String date = "2011-11-11";
Expand Down Expand Up @@ -888,20 +851,22 @@ private void mockResponse(String jsonResponse) throws Exception {
}

@Test
public void testStatelessQuery() throws SQLException {
NewConnection("&useLegacySql=false&jobcreationmode=JOB_CREATION_OPTIONAL");
StatelessQuery.assumeStatelessQueriesEnabled(
BQForwardOnlyResultSetFunctionTest.con.getCatalog());
final Statement stmt =
BQForwardOnlyResultSetFunctionTest.con.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
final ResultSet result = stmt.executeQuery(StatelessQuery.exampleQuery());
final String[][] rows = BQSupportMethods.GetQueryResult(result);
Assertions.assertThat(rows).isEqualTo(StatelessQuery.exampleValues());

final BQForwardOnlyResultSet bqResultSet = (BQForwardOnlyResultSet) result;
Assertions.assertThat(bqResultSet.getJobId()).isNull();
Assertions.assertThat(bqResultSet.getQueryId()).contains("!");
public void testStatelessQuery() throws SQLException, IOException {
try (Connection statelessConnection =
connect("&useLegacySql=false&jobcreationmode=JOB_CREATION_OPTIONAL")) {
goomrw marked this conversation as resolved.
Show resolved Hide resolved
StatelessQuery.assumeStatelessQueriesEnabled(statelessConnection.getCatalog());
try (Statement stmt =
statelessConnection.createStatement(
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) {
final ResultSet result = stmt.executeQuery(StatelessQuery.exampleQuery());
final String[][] rows = BQSupportMethods.GetQueryResult(result);
Assertions.assertThat(rows).isEqualTo(StatelessQuery.exampleValues());

final BQForwardOnlyResultSet bqResultSet = (BQForwardOnlyResultSet) result;
Assertions.assertThat(bqResultSet.getJobId()).isNull();
Assertions.assertThat(bqResultSet.getQueryId()).contains("!");
}
}
}

@Override
Expand Down
Loading
Loading