Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4c0332e

Browse files
mziccardmziccard
committed
Move Clock out of ServiceOptions, use it in RetryHelper (googleapis#954)
* Move Clock out of ServiceOptions, use it in RetryHelper * Always pass options.clock() to RetryHelper.runWithRetries
1 parent d5cf726 commit 4c0332e

File tree

17 files changed

+206
-193
lines changed

17 files changed

+206
-193
lines changed

‎gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public Dataset create(DatasetInfo dataset, DatasetOption... options) {
164164
public com.google.api.services.bigquery.model.Dataset call() {
165165
return bigQueryRpc.create(datasetPb, optionsMap);
166166
}
167-
}, options().retryParams(), EXCEPTION_HANDLER));
167+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock()));
168168
} catch (RetryHelper.RetryHelperException e) {
169169
throw BigQueryException.translateAndThrow(e);
170170
}
@@ -182,7 +182,7 @@ public Table create(TableInfo table, TableOption... options) {
182182
public com.google.api.services.bigquery.model.Table call() {
183183
return bigQueryRpc.create(tablePb, optionsMap);
184184
}
185-
}, options().retryParams(), EXCEPTION_HANDLER));
185+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock()));
186186
} catch (RetryHelper.RetryHelperException e) {
187187
throw BigQueryException.translateAndThrow(e);
188188
}
@@ -200,7 +200,7 @@ public Job create(JobInfo job, JobOption... options) {
200200
public com.google.api.services.bigquery.model.Job call() {
201201
return bigQueryRpc.create(jobPb, optionsMap);
202202
}
203-
}, options().retryParams(), EXCEPTION_HANDLER));
203+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock()));
204204
} catch (RetryHelper.RetryHelperException e) {
205205
throw BigQueryException.translateAndThrow(e);
206206
}
@@ -221,7 +221,7 @@ public Dataset getDataset(final DatasetId datasetId, DatasetOption... options) {
221221
public com.google.api.services.bigquery.model.Dataset call() {
222222
return bigQueryRpc.getDataset(datasetId.dataset(), optionsMap);
223223
}
224-
}, options().retryParams(), EXCEPTION_HANDLER);
224+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock());
225225
return answer == null ? null : Dataset.fromPb(this, answer);
226226
} catch (RetryHelper.RetryHelperException e) {
227227
throw BigQueryException.translateAndThrow(e);
@@ -244,7 +244,7 @@ private static Page<Dataset> listDatasets(final BigQueryOptions serviceOptions,
244244
Iterable<com.google.api.services.bigquery.model.Dataset>> call() {
245245
return serviceOptions.rpc().listDatasets(optionsMap);
246246
}
247-
}, serviceOptions.retryParams(), EXCEPTION_HANDLER);
247+
}, serviceOptions.retryParams(), EXCEPTION_HANDLER, serviceOptions.clock());
248248
String cursor = result.x();
249249
return new PageImpl<>(new DatasetPageFetcher(serviceOptions, cursor, optionsMap), cursor,
250250
Iterables.transform(result.y(),
@@ -273,7 +273,7 @@ public boolean delete(final DatasetId datasetId, DatasetDeleteOption... options)
273273
public Boolean call() {
274274
return bigQueryRpc.deleteDataset(datasetId.dataset(), optionsMap);
275275
}
276-
}, options().retryParams(), EXCEPTION_HANDLER);
276+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock());
277277
} catch (RetryHelper.RetryHelperException e) {
278278
throw BigQueryException.translateAndThrow(e);
279279
}
@@ -292,7 +292,7 @@ public boolean delete(final TableId tableId) {
292292
public Boolean call() {
293293
return bigQueryRpc.deleteTable(tableId.dataset(), tableId.table());
294294
}
295-
}, options().retryParams(), EXCEPTION_HANDLER);
295+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock());
296296
} catch (RetryHelper.RetryHelperException e) {
297297
throw BigQueryException.translateAndThrow(e);
298298
}
@@ -310,7 +310,7 @@ public Dataset update(DatasetInfo dataset, DatasetOption... options) {
310310
public com.google.api.services.bigquery.model.Dataset call() {
311311
return bigQueryRpc.patch(datasetPb, optionsMap);
312312
}
313-
}, options().retryParams(), EXCEPTION_HANDLER));
313+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock()));
314314
} catch (RetryHelper.RetryHelperException e) {
315315
throw BigQueryException.translateAndThrow(e);
316316
}
@@ -328,7 +328,7 @@ public Table update(TableInfo table, TableOption... options) {
328328
public com.google.api.services.bigquery.model.Table call() {
329329
return bigQueryRpc.patch(tablePb, optionsMap);
330330
}
331-
}, options().retryParams(), EXCEPTION_HANDLER));
331+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock()));
332332
} catch (RetryHelper.RetryHelperException e) {
333333
throw BigQueryException.translateAndThrow(e);
334334
}
@@ -349,7 +349,7 @@ public Table getTable(final TableId tableId, TableOption... options) {
349349
public com.google.api.services.bigquery.model.Table call() {
350350
return bigQueryRpc.getTable(tableId.dataset(), tableId.table(), optionsMap);
351351
}
352-
}, options().retryParams(), EXCEPTION_HANDLER);
352+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock());
353353
return answer == null ? null : Table.fromPb(this, answer);
354354
} catch (RetryHelper.RetryHelperException e) {
355355
throw BigQueryException.translateAndThrow(e);
@@ -377,7 +377,7 @@ private static Page<Table> listTables(final String datasetId, final BigQueryOpti
377377
call() {
378378
return serviceOptions.rpc().listTables(datasetId, optionsMap);
379379
}
380-
}, serviceOptions.retryParams(), EXCEPTION_HANDLER);
380+
}, serviceOptions.retryParams(), EXCEPTION_HANDLER, serviceOptions.clock());
381381
String cursor = result.x();
382382
Iterable<Table> tables = Iterables.transform(result.y(),
383383
new Function<com.google.api.services.bigquery.model.Table, Table>() {
@@ -432,7 +432,7 @@ public BigQueryRpc.Tuple<String, Iterable<TableRow>> call() {
432432
return serviceOptions.rpc()
433433
.listTableData(tableId.dataset(), tableId.table(), optionsMap);
434434
}
435-
}, serviceOptions.retryParams(), EXCEPTION_HANDLER);
435+
}, serviceOptions.retryParams(), EXCEPTION_HANDLER, serviceOptions.clock());
436436
String cursor = result.x();
437437
return new PageImpl<>(new TableDataPageFetcher(tableId, serviceOptions, cursor, optionsMap),
438438
cursor, transformTableData(result.y()));
@@ -467,7 +467,7 @@ public Job getJob(final JobId jobId, JobOption... options) {
467467
public com.google.api.services.bigquery.model.Job call() {
468468
return bigQueryRpc.getJob(jobId.job(), optionsMap);
469469
}
470-
}, options().retryParams(), EXCEPTION_HANDLER);
470+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock());
471471
return answer == null ? null : Job.fromPb(this, answer);
472472
} catch (RetryHelper.RetryHelperException e) {
473473
throw BigQueryException.translateAndThrow(e);
@@ -489,7 +489,7 @@ private static Page<Job> listJobs(final BigQueryOptions serviceOptions,
489489
call() {
490490
return serviceOptions.rpc().listJobs(optionsMap);
491491
}
492-
}, serviceOptions.retryParams(), EXCEPTION_HANDLER);
492+
}, serviceOptions.retryParams(), EXCEPTION_HANDLER, serviceOptions.clock());
493493
String cursor = result.x();
494494
Iterable<Job> jobs = Iterables.transform(result.y(),
495495
new Function<com.google.api.services.bigquery.model.Job, Job>() {
@@ -514,7 +514,7 @@ public boolean cancel(final JobId jobId) {
514514
public Boolean call() {
515515
return bigQueryRpc.cancel(jobId.job());
516516
}
517-
}, options().retryParams(), EXCEPTION_HANDLER);
517+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock());
518518
} catch (RetryHelper.RetryHelperException e) {
519519
throw BigQueryException.translateAndThrow(e);
520520
}
@@ -529,7 +529,7 @@ public QueryResponse query(final QueryRequest request) {
529529
public com.google.api.services.bigquery.model.QueryResponse call() {
530530
return bigQueryRpc.query(request.setProjectId(options().projectId()).toPb());
531531
}
532-
}, options().retryParams(), EXCEPTION_HANDLER);
532+
}, options().retryParams(), EXCEPTION_HANDLER, options().clock());
533533
QueryResponse.Builder builder = QueryResponse.builder();
534534
JobId completeJobId = JobId.fromPb(results.getJobReference());
535535
builder.jobId(completeJobId);
@@ -574,7 +574,7 @@ private static QueryResponse getQueryResults(final JobId jobId,
574574
public GetQueryResultsResponse call() {
575575
return serviceOptions.rpc().getQueryResults(jobId.job(), optionsMap);
576576
}
577-
}, serviceOptions.retryParams(), EXCEPTION_HANDLER);
577+
}, serviceOptions.retryParams(), EXCEPTION_HANDLER, serviceOptions.clock());
578578
QueryResponse.Builder builder = QueryResponse.builder();
579579
JobId completeJobId = JobId.fromPb(results.getJobReference());
580580
builder.jobId(completeJobId);

‎gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected void flushBuffer(final int length, final boolean last) {
4747
public void run() {
4848
options().rpc().write(uploadId(), buffer(), 0, position(), length, last);
4949
}
50-
}), options().retryParams(), BigQueryImpl.EXCEPTION_HANDLER);
50+
}), options().retryParams(), BigQueryImpl.EXCEPTION_HANDLER, options().clock());
5151
} catch (RetryHelper.RetryHelperException e) {
5252
throw BigQueryException.translateAndThrow(e);
5353
}

0 commit comments

Comments
 (0)