Skip to content

Commit 7aab43a

Browse files
jinseopkim0jinseopkim0
committed
refactor(bigquery): rename retry-related helper methods to reflect conditional wrapping
1 parent 4a1bcdb commit 7aab43a

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ public com.google.api.services.bigquery.model.Dataset call() throws IOException
593593
}
594594
},
595595
getOptions().getRetrySettings(),
596-
getHttpRetryAlgorithm(),
596+
getRetryAlgorithmWithHttpRetry(),
597597
getOptions().getClock(),
598598
EMPTY_RETRY_CONFIG,
599599
getOptions().isOpenTelemetryTracingEnabled(),
@@ -659,7 +659,7 @@ private static Page<Dataset> listDatasets(
659659
}
660660
},
661661
serviceOptions.getRetrySettings(),
662-
BigQueryRetryHelper.getHttpRetryAlgorithm(serviceOptions.getResultRetryAlgorithm()),
662+
BigQueryRetryHelper.maybeWrapForHttpRetry(serviceOptions.getResultRetryAlgorithm()),
663663
serviceOptions.getClock(),
664664
EMPTY_RETRY_CONFIG,
665665
serviceOptions.isOpenTelemetryTracingEnabled(),
@@ -711,7 +711,7 @@ public Boolean call() throws IOException {
711711
}
712712
},
713713
getOptions().getRetrySettings(),
714-
getHttpRetryAlgorithm(),
714+
getRetryAlgorithmWithHttpRetry(),
715715
getOptions().getClock(),
716716
EMPTY_RETRY_CONFIG,
717717
getOptions().isOpenTelemetryTracingEnabled(),
@@ -762,7 +762,7 @@ public Boolean call() throws IOException {
762762
}
763763
},
764764
getOptions().getRetrySettings(),
765-
getHttpRetryAlgorithm(),
765+
getRetryAlgorithmWithHttpRetry(),
766766
getOptions().getClock(),
767767
EMPTY_RETRY_CONFIG,
768768
getOptions().isOpenTelemetryTracingEnabled(),
@@ -808,7 +808,7 @@ public Boolean call() throws IOException {
808808
}
809809
},
810810
getOptions().getRetrySettings(),
811-
getHttpRetryAlgorithm(),
811+
getRetryAlgorithmWithHttpRetry(),
812812
getOptions().getClock(),
813813
EMPTY_RETRY_CONFIG,
814814
getOptions().isOpenTelemetryTracingEnabled(),
@@ -854,7 +854,7 @@ public Boolean call() throws IOException {
854854
}
855855
},
856856
getOptions().getRetrySettings(),
857-
getHttpRetryAlgorithm(),
857+
getRetryAlgorithmWithHttpRetry(),
858858
getOptions().getClock(),
859859
EMPTY_RETRY_CONFIG,
860860
getOptions().isOpenTelemetryTracingEnabled(),
@@ -898,7 +898,7 @@ public Boolean call() throws IOException {
898898
}
899899
},
900900
getOptions().getRetrySettings(),
901-
getHttpRetryAlgorithm(),
901+
getRetryAlgorithmWithHttpRetry(),
902902
getOptions().getClock(),
903903
EMPTY_RETRY_CONFIG,
904904
getOptions().isOpenTelemetryTracingEnabled(),
@@ -939,7 +939,7 @@ public com.google.api.services.bigquery.model.Dataset call() throws IOException
939939
}
940940
},
941941
getOptions().getRetrySettings(),
942-
getHttpRetryAlgorithm(),
942+
getRetryAlgorithmWithHttpRetry(),
943943
getOptions().getClock(),
944944
EMPTY_RETRY_CONFIG,
945945
getOptions().isOpenTelemetryTracingEnabled(),
@@ -986,7 +986,7 @@ public com.google.api.services.bigquery.model.Table call() throws IOException {
986986
}
987987
},
988988
getOptions().getRetrySettings(),
989-
getHttpRetryAlgorithm(),
989+
getRetryAlgorithmWithHttpRetry(),
990990
getOptions().getClock(),
991991
EMPTY_RETRY_CONFIG,
992992
getOptions().isOpenTelemetryTracingEnabled(),
@@ -1032,7 +1032,7 @@ public com.google.api.services.bigquery.model.Model call() throws IOException {
10321032
}
10331033
},
10341034
getOptions().getRetrySettings(),
1035-
getHttpRetryAlgorithm(),
1035+
getRetryAlgorithmWithHttpRetry(),
10361036
getOptions().getClock(),
10371037
EMPTY_RETRY_CONFIG,
10381038
getOptions().isOpenTelemetryTracingEnabled(),
@@ -1078,7 +1078,7 @@ public com.google.api.services.bigquery.model.Routine call() throws IOException
10781078
}
10791079
},
10801080
getOptions().getRetrySettings(),
1081-
getHttpRetryAlgorithm(),
1081+
getRetryAlgorithmWithHttpRetry(),
10821082
getOptions().getClock(),
10831083
EMPTY_RETRY_CONFIG,
10841084
getOptions().isOpenTelemetryTracingEnabled(),
@@ -1132,7 +1132,7 @@ public com.google.api.services.bigquery.model.Table call() throws IOException {
11321132
}
11331133
},
11341134
getOptions().getRetrySettings(),
1135-
getHttpRetryAlgorithm(),
1135+
getRetryAlgorithmWithHttpRetry(),
11361136
getOptions().getClock(),
11371137
EMPTY_RETRY_CONFIG,
11381138
getOptions().isOpenTelemetryTracingEnabled(),
@@ -1191,7 +1191,7 @@ public com.google.api.services.bigquery.model.Model call() throws IOException {
11911191
}
11921192
},
11931193
getOptions().getRetrySettings(),
1194-
getHttpRetryAlgorithm(),
1194+
getRetryAlgorithmWithHttpRetry(),
11951195
getOptions().getClock(),
11961196
EMPTY_RETRY_CONFIG,
11971197
getOptions().isOpenTelemetryTracingEnabled(),
@@ -1250,7 +1250,7 @@ public com.google.api.services.bigquery.model.Routine call() throws IOException
12501250
}
12511251
},
12521252
getOptions().getRetrySettings(),
1253-
getHttpRetryAlgorithm(),
1253+
getRetryAlgorithmWithHttpRetry(),
12541254
getOptions().getClock(),
12551255
EMPTY_RETRY_CONFIG,
12561256
getOptions().isOpenTelemetryTracingEnabled(),
@@ -1468,7 +1468,7 @@ public Tuple<String, Iterable<com.google.api.services.bigquery.model.Table>> cal
14681468
}
14691469
},
14701470
serviceOptions.getRetrySettings(),
1471-
BigQueryRetryHelper.getHttpRetryAlgorithm(serviceOptions.getResultRetryAlgorithm()),
1471+
BigQueryRetryHelper.maybeWrapForHttpRetry(serviceOptions.getResultRetryAlgorithm()),
14721472
serviceOptions.getClock(),
14731473
EMPTY_RETRY_CONFIG,
14741474
serviceOptions.isOpenTelemetryTracingEnabled(),
@@ -1509,7 +1509,7 @@ public Tuple<String, Iterable<com.google.api.services.bigquery.model.Model>> cal
15091509
}
15101510
},
15111511
serviceOptions.getRetrySettings(),
1512-
BigQueryRetryHelper.getHttpRetryAlgorithm(serviceOptions.getResultRetryAlgorithm()),
1512+
BigQueryRetryHelper.maybeWrapForHttpRetry(serviceOptions.getResultRetryAlgorithm()),
15131513
serviceOptions.getClock(),
15141514
EMPTY_RETRY_CONFIG,
15151515
serviceOptions.isOpenTelemetryTracingEnabled(),
@@ -1550,7 +1550,7 @@ private static Page<Routine> listRoutines(
15501550
}
15511551
},
15521552
serviceOptions.getRetrySettings(),
1553-
BigQueryRetryHelper.getHttpRetryAlgorithm(serviceOptions.getResultRetryAlgorithm()),
1553+
BigQueryRetryHelper.maybeWrapForHttpRetry(serviceOptions.getResultRetryAlgorithm()),
15541554
serviceOptions.getClock(),
15551555
EMPTY_RETRY_CONFIG,
15561556
serviceOptions.isOpenTelemetryTracingEnabled(),
@@ -1632,7 +1632,7 @@ public TableDataInsertAllResponse call() throws Exception {
16321632
}
16331633
},
16341634
getOptions().getRetrySettings(),
1635-
getHttpRetryAlgorithm(),
1635+
getRetryAlgorithmWithHttpRetry(),
16361636
getOptions().getClock(),
16371637
EMPTY_RETRY_CONFIG,
16381638
getOptions().isOpenTelemetryTracingEnabled(),
@@ -1726,7 +1726,7 @@ public TableDataList call() throws IOException {
17261726
}
17271727
},
17281728
serviceOptions.getRetrySettings(),
1729-
BigQueryRetryHelper.getHttpRetryAlgorithm(serviceOptions.getResultRetryAlgorithm()),
1729+
BigQueryRetryHelper.maybeWrapForHttpRetry(serviceOptions.getResultRetryAlgorithm()),
17301730
serviceOptions.getClock(),
17311731
EMPTY_RETRY_CONFIG,
17321732
serviceOptions.isOpenTelemetryTracingEnabled(),
@@ -1803,7 +1803,7 @@ public com.google.api.services.bigquery.model.Job call() throws IOException {
18031803
}
18041804
},
18051805
getOptions().getRetrySettings(),
1806-
getHttpRetryAlgorithm(),
1806+
getRetryAlgorithmWithHttpRetry(),
18071807
getOptions().getClock(),
18081808
EMPTY_RETRY_CONFIG,
18091809
getOptions().isOpenTelemetryTracingEnabled(),
@@ -1860,7 +1860,7 @@ public Tuple<String, Iterable<com.google.api.services.bigquery.model.Job>> call(
18601860
}
18611861
},
18621862
serviceOptions.getRetrySettings(),
1863-
BigQueryRetryHelper.getHttpRetryAlgorithm(serviceOptions.getResultRetryAlgorithm()),
1863+
BigQueryRetryHelper.maybeWrapForHttpRetry(serviceOptions.getResultRetryAlgorithm()),
18641864
serviceOptions.getClock(),
18651865
EMPTY_RETRY_CONFIG,
18661866
serviceOptions.isOpenTelemetryTracingEnabled(),
@@ -1915,7 +1915,7 @@ public Boolean call() throws IOException {
19151915
}
19161916
},
19171917
getOptions().getRetrySettings(),
1918-
getHttpRetryAlgorithm(),
1918+
getRetryAlgorithmWithHttpRetry(),
19191919
getOptions().getClock(),
19201920
EMPTY_RETRY_CONFIG,
19211921
getOptions().isOpenTelemetryTracingEnabled(),
@@ -2170,7 +2170,7 @@ public GetQueryResultsResponse call() throws IOException {
21702170
}
21712171
},
21722172
serviceOptions.getRetrySettings(),
2173-
BigQueryRetryHelper.getHttpRetryAlgorithm(serviceOptions.getResultRetryAlgorithm()),
2173+
BigQueryRetryHelper.maybeWrapForHttpRetry(serviceOptions.getResultRetryAlgorithm()),
21742174
serviceOptions.getClock(),
21752175
DEFAULT_RETRY_CONFIG,
21762176
serviceOptions.isOpenTelemetryTracingEnabled(),
@@ -2241,7 +2241,7 @@ public com.google.api.services.bigquery.model.Policy call() throws IOException {
22412241
}
22422242
},
22432243
getOptions().getRetrySettings(),
2244-
getHttpRetryAlgorithm(),
2244+
getRetryAlgorithmWithHttpRetry(),
22452245
getOptions().getClock(),
22462246
EMPTY_RETRY_CONFIG,
22472247
getOptions().isOpenTelemetryTracingEnabled(),
@@ -2335,7 +2335,7 @@ public com.google.api.services.bigquery.model.TestIamPermissionsResponse call()
23352335
}
23362336
},
23372337
getOptions().getRetrySettings(),
2338-
getHttpRetryAlgorithm(),
2338+
getRetryAlgorithmWithHttpRetry(),
23392339
getOptions().getClock(),
23402340
EMPTY_RETRY_CONFIG,
23412341
getOptions().isOpenTelemetryTracingEnabled(),
@@ -2414,8 +2414,8 @@ private static boolean isRetryErrorCodeHttpNotFound(BigQueryRetryHelperException
24142414
}
24152415

24162416
@SuppressWarnings("unchecked")
2417-
private <V> ResultRetryAlgorithm<V> getHttpRetryAlgorithm() {
2418-
return BigQueryRetryHelper.getHttpRetryAlgorithm(
2417+
private <V> ResultRetryAlgorithm<V> getRetryAlgorithmWithHttpRetry() {
2418+
return BigQueryRetryHelper.maybeWrapForHttpRetry(
24192419
(ResultRetryAlgorithm<V>) getOptions().getResultRetryAlgorithm());
24202420
}
24212421
}

‎java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryRetryHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private static <V> V run(
121121
return retryingFuture.get();
122122
}
123123

124-
static <V> ResultRetryAlgorithm<V> getHttpRetryAlgorithm(ResultRetryAlgorithm<V> algorithm) {
124+
static <V> ResultRetryAlgorithm<V> maybeWrapForHttpRetry(ResultRetryAlgorithm<V> algorithm) {
125125
if (algorithm == BigQueryBaseService.DEFAULT_BIGQUERY_EXCEPTION_HANDLER) {
126126
return wrapDefaultAlgorithm(algorithm);
127127
}

0 commit comments

Comments
 (0)