Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2104,7 +2104,7 @@ && getOptions().getOpenTelemetryTracer() != null) {

return queryRpc(projectId, content, options);
}
return create(JobInfo.of(jobId, configuration), options).getQueryResults();
return create(JobInfo.of(jobId, configuration), options);
Comment thread
logachev marked this conversation as resolved.
Comment thread
lqiu96 marked this conversation as resolved.
} finally {
if (querySpan != null) {
querySpan.end();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7487,22 +7487,36 @@ void testQueryWithTimeout() throws InterruptedException {
}

// Stateful query returns Job
// Test scenario 2 to ensure job is created if JobCreationMode is set, but for a small query
// it still returns results.
// Test scenario 2 to ensure job is created if Query is long running.
// Explicitly disable cache to ensure it is long-running query;
config = QueryJobConfiguration.newBuilder(largeQuery).setUseQueryCache(false).build();
long millis = System.currentTimeMillis();
result = bigQuery.queryWithTimeout(config, null, 1000L);
millis = System.currentTimeMillis() - millis;
assertTrue(result instanceof Job);
// Cancel the job as we don't need results.
((Job) result).cancel();
// Allow 2 seconds of timeout value to account for random delays
assertTrue(millis < 1_000_000 * 2);

// Stateful query returns Job
// Test scenario 3 to ensure job is created if JobCreationMode is set.
config =
QueryJobConfiguration.newBuilder(query)
.setJobCreationMode(JobCreationMode.JOB_CREATION_REQUIRED)
.build();
result = bigQuery.queryWithTimeout(config, null, null);
assertTrue(result instanceof TableResult);
assertNotNull(((TableResult) result).getJobId());
assertNull(((TableResult) result).getQueryId());
assertTrue(result instanceof Job);

// Stateful query returns Job
// Test scenario 3 to ensure job is created if Query is long running.
// Test scenario 4 to ensure job is created if Query is long running.
// Explicitly disable cache to ensure it is long-running query;
config = QueryJobConfiguration.newBuilder(largeQuery).setUseQueryCache(false).build();
long millis = System.currentTimeMillis();
config =
QueryJobConfiguration.newBuilder(largeQuery)
.setJobCreationMode(JobCreationMode.JOB_CREATION_REQUIRED)
.setUseQueryCache(false)
.build();
millis = System.currentTimeMillis();
result = bigQuery.queryWithTimeout(config, null, 1000L);
millis = System.currentTimeMillis() - millis;
assertTrue(result instanceof Job);
Expand Down
Loading