Skip to content

Commit 7750bd2

Browse files
Merge pull request #202 from skyflowapi/bharti/SK-2258-implement-insert-public-interface-for-v-3-flow-db-in-java-sdk
SK-2258 fix error response records
2 parents d8c5cdb + 474e83b commit 7750bd2

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

v3/src/main/java/com/skyflow/VaultClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected void updateExecutorInHTTP() {
118118
.addInterceptor(chain -> {
119119
Request original = chain.request();
120120
Request requestWithAuth = original.newBuilder()
121-
.header("Authorization", "Bearer " + this.vaultConfig.getCredentials().getToken())
121+
.header("Authorization", "Bearer " + this.token)
122122
.build();
123123
return chain.proceed(requestWithAuth);
124124
})

v3/src/main/java/com/skyflow/vault/controller/VaultController.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ public CompletableFuture<com.skyflow.vault.data.InsertResponse> bulkInsertAsync(
7878
configureInsertConcurrencyAndBatchSize(insertRequest.getValues().size());
7979
com.skyflow.generated.rest.resources.recordservice.requests.InsertRequest request = super.getBulkInsertRequestBody(insertRequest, super.getVaultConfig());
8080

81-
List<ErrorRecord> errorRecords = new ArrayList<>();
82-
List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> futures = this.insertBatchFutures(request, errorRecords);
81+
List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> futures = this.insertBatchFutures(request);
8382

8483
return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
8584
.thenApply(v -> {
8685
List<Success> successRecords = new ArrayList<>();
86+
List<ErrorRecord> errorRecords = new ArrayList<>();
8787

8888
for (CompletableFuture<com.skyflow.vault.data.InsertResponse> future : futures) {
8989
com.skyflow.vault.data.InsertResponse futureResponse = future.join();
@@ -114,7 +114,7 @@ private com.skyflow.vault.data.InsertResponse processSync(
114114
List<ErrorRecord> errorRecords = new ArrayList<>();
115115
List<Success> successRecords = new ArrayList<>();
116116

117-
List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> futures = this.insertBatchFutures(insertRequest, errorRecords);
117+
List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> futures = this.insertBatchFutures(insertRequest);
118118

119119
CompletableFuture<Void> allFutures = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
120120
allFutures.join();
@@ -137,7 +137,7 @@ private com.skyflow.vault.data.InsertResponse processSync(
137137

138138

139139
private List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> insertBatchFutures(
140-
com.skyflow.generated.rest.resources.recordservice.requests.InsertRequest insertRequest, List<ErrorRecord> errorRecords
140+
com.skyflow.generated.rest.resources.recordservice.requests.InsertRequest insertRequest
141141
) {
142142
List<InsertRecordData> records = insertRequest.getRecords().get();
143143

@@ -151,12 +151,8 @@ private List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> insertBat
151151
int batchNumber = batchIndex;
152152
CompletableFuture<com.skyflow.vault.data.InsertResponse> future = CompletableFuture
153153
.supplyAsync(() -> insertBatch(batch, insertRequest.getTableName().get()), executor)
154-
.exceptionally(ex -> {
155-
LogUtil.printInfoLog(ErrorLogs.PROCESSING_ERROR_RESPONSE.getLog());
156-
errorRecords.addAll(handleBatchException(ex, batch, batchNumber, batches));
157-
return null;
158-
})
159-
.thenApply(response -> formatResponse(response, batchNumber, insertBatchSize));
154+
.thenApply(response -> formatResponse(response, batchNumber, insertBatchSize))
155+
.exceptionally(ex -> new com.skyflow.vault.data.InsertResponse(null, handleBatchException(ex, batch, batchNumber, batches)));
160156
futures.add(future);
161157
}
162158
} finally {

0 commit comments

Comments
 (0)