Skip to content

SK-2258 fix the error response handling #206

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

Merged
skyflow-bharti merged 1 commit into from
Aug 29, 2025
Merged

SK-2258 fix the error response handling #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion v3/src/main/java/com/skyflow/utils/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public static com.skyflow.vault.data.InsertResponse formatResponse(InsertRespons
tokensMap.put(key, tokenList);
}
}
Success success = new Success(indexNumber, record.get(index).getSkyflowId().get(), tokensMap, null);
Success success = new Success(indexNumber, record.get(index).getSkyflowId().get(), tokensMap, record.get(index).getData().isPresent() ? record.get(index).getData().get() : null);
successRecords.add(success);
}
indexNumber++;
Expand Down
24 changes: 14 additions & 10 deletions v3/src/main/java/com/skyflow/vault/controller/VaultController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import io.github.cdimascio.dotenv.Dotenv;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand Down Expand Up @@ -77,13 +78,13 @@ public CompletableFuture<com.skyflow.vault.data.InsertResponse> bulkInsertAsync(
setBearerToken();
configureInsertConcurrencyAndBatchSize(insertRequest.getValues().size());
com.skyflow.generated.rest.resources.recordservice.requests.InsertRequest request = super.getBulkInsertRequestBody(insertRequest, super.getVaultConfig());

List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> futures = this.insertBatchFutures(request);
List<ErrorRecord> errorRecords = Collections.synchronizedList(new ArrayList<>());
List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> futures = this.insertBatchFutures(request, errorRecords);

return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
.thenApply(v -> {
List<Success> successRecords = new ArrayList<>();
List<ErrorRecord> errorRecords = new ArrayList<>();
// List<ErrorRecord> errorRecords = new ArrayList<>();

for (CompletableFuture<com.skyflow.vault.data.InsertResponse> future : futures) {
com.skyflow.vault.data.InsertResponse futureResponse = future.join();
Expand Down Expand Up @@ -111,10 +112,10 @@ private com.skyflow.vault.data.InsertResponse processSync(
ArrayList<HashMap<String, Object>> originalPayload
) throws ExecutionException, InterruptedException {
LogUtil.printInfoLog(InfoLogs.PROCESSING_BATCHES.getLog());
List<ErrorRecord> errorRecords = new ArrayList<>();
// List<ErrorRecord> errorRecords = new ArrayList<>();
List<Success> successRecords = new ArrayList<>();

List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> futures = this.insertBatchFutures(insertRequest);
List<ErrorRecord> errorRecords = Collections.synchronizedList(new ArrayList<>());
List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> futures = this.insertBatchFutures(insertRequest, errorRecords);

CompletableFuture<Void> allFutures = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
allFutures.join();
Expand All @@ -137,8 +138,8 @@ private com.skyflow.vault.data.InsertResponse processSync(


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

ExecutorService executor = Executors.newFixedThreadPool(insertConcurrencyLimit);
Expand All @@ -152,7 +153,10 @@ private List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> insertBat
CompletableFuture<com.skyflow.vault.data.InsertResponse> future = CompletableFuture
.supplyAsync(() -> insertBatch(batch, insertRequest.getTableName().get()), executor)
.thenApply(response -> formatResponse(response, batchNumber, insertBatchSize))
.exceptionally(ex -> new com.skyflow.vault.data.InsertResponse(null, handleBatchException(ex, batch, batchNumber, batches)));
.exceptionally(ex -> {
errorRecords.addAll(handleBatchException(ex, batch, batchNumber, batches));
return null;
});
futures.add(future);
}
} finally {
Expand Down Expand Up @@ -181,7 +185,7 @@ private void configureInsertConcurrencyAndBatchSize(int totalRequests) {
int batchSize = Integer.parseInt(userProvidedBatchSize);
int maxBatchSize = Math.min(batchSize, Constants.MAX_INSERT_BATCH_SIZE);
if (maxBatchSize > 0) {
this.insertBatchSize = batchSize;
this.insertBatchSize = maxBatchSize;
} else {
LogUtil.printWarningLog(WarningLogs.INVALID_BATCH_SIZE_PROVIDED.getLog());
this.insertBatchSize = Constants.INSERT_BATCH_SIZE;
Expand Down
Loading