From a75d99909d12e26adaf02d53b2258a4e1fff5c67 Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Tue, 2 Sep 2025 17:01:09 +0530 Subject: [PATCH 1/6] SK-2274 warning log when user provide limits --- common/pom.xml | 2 +- .../main/java/com/skyflow/logs/InfoLogs.java | 4 +++- .../main/java/com/skyflow/logs/WarningLogs.java | 2 ++ v2/pom.xml | 2 +- v3/pom.xml | 2 +- .../vault/controller/VaultController.java | 17 ++++++++++++++++- 6 files changed, 24 insertions(+), 5 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 72fff275..df90bb58 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -11,7 +11,7 @@ common - 1.0.0 + 1.0.1 ${project.groupId}:${project.artifactId} diff --git a/common/src/main/java/com/skyflow/logs/InfoLogs.java b/common/src/main/java/com/skyflow/logs/InfoLogs.java index 03f80ac7..e2c5f075 100644 --- a/common/src/main/java/com/skyflow/logs/InfoLogs.java +++ b/common/src/main/java/com/skyflow/logs/InfoLogs.java @@ -92,7 +92,9 @@ public enum InfoLogs { VALIDATE_GET_DETECT_RUN_REQUEST("Validating get detect run request."), REIDENTIFY_TEXT_SUCCESS("Text data re-identified."), - PROCESSING_BATCHES("Processing batch") + PROCESSING_BATCHES("Processing batch"), + SET_CONCURRENCY_LIMIT("Setting concurrency limit to %s1"), + SET_BATCH_SIZE("Setting batch size to %s1"), ; diff --git a/common/src/main/java/com/skyflow/logs/WarningLogs.java b/common/src/main/java/com/skyflow/logs/WarningLogs.java index 8905ad12..5f80a728 100644 --- a/common/src/main/java/com/skyflow/logs/WarningLogs.java +++ b/common/src/main/java/com/skyflow/logs/WarningLogs.java @@ -3,6 +3,8 @@ public enum WarningLogs { INVALID_BATCH_SIZE_PROVIDED("Invalid value for batch size provided, switching to default value."), INVALID_CONCURRENCY_LIMIT_PROVIDED("Invalid value for concurrency limit provided, switching to default value."), + BATCH_SIZE_EXCEEDS_MAX_LIMIT("Provided batch size exceeds the maximum limit, switching to max limit."), + CONCURRENCY_EXCEEDS_MAX_LIMIT("Provided concurrency limit exceeds the maximum limit, switching to max limit.") ; private final String log; diff --git a/v2/pom.xml b/v2/pom.xml index e239bc85..17e4ebe6 100644 --- a/v2/pom.xml +++ b/v2/pom.xml @@ -24,7 +24,7 @@ com.skyflow common - 1.0.0 + 1.0.1 diff --git a/v3/pom.xml b/v3/pom.xml index 6a6bf839..2f8a6b2e 100644 --- a/v3/pom.xml +++ b/v3/pom.xml @@ -43,7 +43,7 @@ com.skyflow common - 1.0.0 + 1.0.1 diff --git a/v3/src/main/java/com/skyflow/vault/controller/VaultController.java b/v3/src/main/java/com/skyflow/vault/controller/VaultController.java index fc8cc278..98fd316e 100644 --- a/v3/src/main/java/com/skyflow/vault/controller/VaultController.java +++ b/v3/src/main/java/com/skyflow/vault/controller/VaultController.java @@ -306,8 +306,12 @@ private void configureInsertConcurrencyAndBatchSize(int totalRequests) { if (userProvidedBatchSize != null) { try { int batchSize = Integer.parseInt(userProvidedBatchSize); + if (batchSize > Constants.MAX_DETOKENIZE_BATCH_SIZE) { + LogUtil.printWarningLog(WarningLogs.BATCH_SIZE_EXCEEDS_MAX_LIMIT.getLog()); + } int maxBatchSize = Math.min(batchSize, Constants.MAX_INSERT_BATCH_SIZE); if (maxBatchSize > 0) { +// LogUtil.printInfoLog(InfoLogs.SET_BATCH_SIZE.getLog() + maxBatchSize); this.insertBatchSize = maxBatchSize; } else { LogUtil.printWarningLog(WarningLogs.INVALID_BATCH_SIZE_PROVIDED.getLog()); @@ -326,8 +330,11 @@ private void configureInsertConcurrencyAndBatchSize(int totalRequests) { try { int concurrencyLimit = Integer.parseInt(userProvidedConcurrencyLimit); int maxConcurrencyLimit = Math.min(concurrencyLimit, Constants.MAX_INSERT_CONCURRENCY_LIMIT); - + if (concurrencyLimit > Constants.MAX_DETOKENIZE_CONCURRENCY_LIMIT) { + LogUtil.printWarningLog(WarningLogs.CONCURRENCY_EXCEEDS_MAX_LIMIT.getLog()); + } if (maxConcurrencyLimit > 0) { +// LogUtil.printInfoLog(InfoLogs.SET_CONCURRENCY_LIMIT.getLog() + maxConcurrencyLimit); this.insertConcurrencyLimit = Math.min(maxConcurrencyLimit, maxConcurrencyNeeded); } else { LogUtil.printWarningLog(WarningLogs.INVALID_CONCURRENCY_LIMIT_PROVIDED.getLog()); @@ -357,8 +364,12 @@ private void configureDetokenizeConcurrencyAndBatchSize(int totalRequests) { if (userProvidedBatchSize != null) { try { int batchSize = Integer.parseInt(userProvidedBatchSize); + if (batchSize > Constants.MAX_DETOKENIZE_BATCH_SIZE) { + LogUtil.printWarningLog(WarningLogs.BATCH_SIZE_EXCEEDS_MAX_LIMIT.getLog()); + } int maxBatchSize = Math.min(batchSize, Constants.MAX_DETOKENIZE_BATCH_SIZE); if (maxBatchSize > 0) { +// LogUtil.printInfoLog(InfoLogs.SET_BATCH_SIZE.getLog() + maxBatchSize); this.detokenizeBatchSize = maxBatchSize; } else { LogUtil.printWarningLog(WarningLogs.INVALID_BATCH_SIZE_PROVIDED.getLog()); @@ -376,9 +387,13 @@ private void configureDetokenizeConcurrencyAndBatchSize(int totalRequests) { if (userProvidedConcurrencyLimit != null) { try { int concurrencyLimit = Integer.parseInt(userProvidedConcurrencyLimit); + if (concurrencyLimit > Constants.MAX_DETOKENIZE_CONCURRENCY_LIMIT) { + LogUtil.printWarningLog(WarningLogs.CONCURRENCY_EXCEEDS_MAX_LIMIT.getLog()); + } int maxConcurrencyLimit = Math.min(concurrencyLimit, Constants.MAX_DETOKENIZE_CONCURRENCY_LIMIT); if (maxConcurrencyLimit > 0) { +// LogUtil.printInfoLog(InfoLogs.SET_CONCURRENCY_LIMIT.getLog() + maxConcurrencyLimit); this.detokenizeConcurrencyLimit = Math.min(maxConcurrencyLimit, maxConcurrencyNeeded); } else { LogUtil.printWarningLog(WarningLogs.INVALID_CONCURRENCY_LIMIT_PROVIDED.getLog()); From 25445cd17fa4566fe289b4d37c4676db86604d0f Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Tue, 2 Sep 2025 11:31:39 +0000 Subject: [PATCH 2/6] [AUTOMATED] Private Release 3.0.0-beta.2-dev-a75d999 --- v3/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/pom.xml b/v3/pom.xml index 2f8a6b2e..6a436b1f 100644 --- a/v3/pom.xml +++ b/v3/pom.xml @@ -11,7 +11,7 @@ skyflow-java - 3.0.0-beta.2 + 3.0.0-beta.2-dev.a75d999 jar ${project.groupId}:${project.artifactId} Skyflow V3 SDK for the Java programming language From 5788f9b06d7f00f1c2c962bac5acc6df36a91c16 Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Tue, 2 Sep 2025 17:44:06 +0530 Subject: [PATCH 3/6] SK-2274 warning log when user provide limits --- common/src/main/java/com/skyflow/logs/InfoLogs.java | 2 -- .../com/skyflow/vault/controller/VaultController.java | 10 ++++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/com/skyflow/logs/InfoLogs.java b/common/src/main/java/com/skyflow/logs/InfoLogs.java index e2c5f075..9727e811 100644 --- a/common/src/main/java/com/skyflow/logs/InfoLogs.java +++ b/common/src/main/java/com/skyflow/logs/InfoLogs.java @@ -93,8 +93,6 @@ public enum InfoLogs { REIDENTIFY_TEXT_SUCCESS("Text data re-identified."), PROCESSING_BATCHES("Processing batch"), - SET_CONCURRENCY_LIMIT("Setting concurrency limit to %s1"), - SET_BATCH_SIZE("Setting batch size to %s1"), ; diff --git a/v3/src/main/java/com/skyflow/vault/controller/VaultController.java b/v3/src/main/java/com/skyflow/vault/controller/VaultController.java index 98fd316e..0ac80f4a 100644 --- a/v3/src/main/java/com/skyflow/vault/controller/VaultController.java +++ b/v3/src/main/java/com/skyflow/vault/controller/VaultController.java @@ -49,6 +49,7 @@ public com.skyflow.vault.data.InsertResponse bulkInsert(InsertRequest insertRequ LogUtil.printInfoLog(InfoLogs.VALIDATE_INSERT_REQUEST.getLog()); Validations.validateInsertRequest(insertRequest); configureInsertConcurrencyAndBatchSize(insertRequest.getValues().size()); + setBearerToken(); com.skyflow.generated.rest.resources.recordservice.requests.InsertRequest request = super.getBulkInsertRequestBody(insertRequest, super.getVaultConfig()); @@ -70,6 +71,7 @@ public CompletableFuture bulkInsertAsync( LogUtil.printInfoLog(InfoLogs.VALIDATE_INSERT_REQUEST.getLog()); Validations.validateInsertRequest(insertRequest); configureInsertConcurrencyAndBatchSize(insertRequest.getValues().size()); + setBearerToken(); com.skyflow.generated.rest.resources.recordservice.requests.InsertRequest request = super.getBulkInsertRequestBody(insertRequest, super.getVaultConfig()); List errorRecords = Collections.synchronizedList(new ArrayList<>()); @@ -306,12 +308,11 @@ private void configureInsertConcurrencyAndBatchSize(int totalRequests) { if (userProvidedBatchSize != null) { try { int batchSize = Integer.parseInt(userProvidedBatchSize); - if (batchSize > Constants.MAX_DETOKENIZE_BATCH_SIZE) { + if (batchSize > Constants.MAX_INSERT_BATCH_SIZE) { LogUtil.printWarningLog(WarningLogs.BATCH_SIZE_EXCEEDS_MAX_LIMIT.getLog()); } int maxBatchSize = Math.min(batchSize, Constants.MAX_INSERT_BATCH_SIZE); if (maxBatchSize > 0) { -// LogUtil.printInfoLog(InfoLogs.SET_BATCH_SIZE.getLog() + maxBatchSize); this.insertBatchSize = maxBatchSize; } else { LogUtil.printWarningLog(WarningLogs.INVALID_BATCH_SIZE_PROVIDED.getLog()); @@ -330,11 +331,10 @@ private void configureInsertConcurrencyAndBatchSize(int totalRequests) { try { int concurrencyLimit = Integer.parseInt(userProvidedConcurrencyLimit); int maxConcurrencyLimit = Math.min(concurrencyLimit, Constants.MAX_INSERT_CONCURRENCY_LIMIT); - if (concurrencyLimit > Constants.MAX_DETOKENIZE_CONCURRENCY_LIMIT) { + if (concurrencyLimit > Constants.MAX_INSERT_CONCURRENCY_LIMIT) { LogUtil.printWarningLog(WarningLogs.CONCURRENCY_EXCEEDS_MAX_LIMIT.getLog()); } if (maxConcurrencyLimit > 0) { -// LogUtil.printInfoLog(InfoLogs.SET_CONCURRENCY_LIMIT.getLog() + maxConcurrencyLimit); this.insertConcurrencyLimit = Math.min(maxConcurrencyLimit, maxConcurrencyNeeded); } else { LogUtil.printWarningLog(WarningLogs.INVALID_CONCURRENCY_LIMIT_PROVIDED.getLog()); @@ -369,7 +369,6 @@ private void configureDetokenizeConcurrencyAndBatchSize(int totalRequests) { } int maxBatchSize = Math.min(batchSize, Constants.MAX_DETOKENIZE_BATCH_SIZE); if (maxBatchSize > 0) { -// LogUtil.printInfoLog(InfoLogs.SET_BATCH_SIZE.getLog() + maxBatchSize); this.detokenizeBatchSize = maxBatchSize; } else { LogUtil.printWarningLog(WarningLogs.INVALID_BATCH_SIZE_PROVIDED.getLog()); @@ -393,7 +392,6 @@ private void configureDetokenizeConcurrencyAndBatchSize(int totalRequests) { int maxConcurrencyLimit = Math.min(concurrencyLimit, Constants.MAX_DETOKENIZE_CONCURRENCY_LIMIT); if (maxConcurrencyLimit > 0) { -// LogUtil.printInfoLog(InfoLogs.SET_CONCURRENCY_LIMIT.getLog() + maxConcurrencyLimit); this.detokenizeConcurrencyLimit = Math.min(maxConcurrencyLimit, maxConcurrencyNeeded); } else { LogUtil.printWarningLog(WarningLogs.INVALID_CONCURRENCY_LIMIT_PROVIDED.getLog()); From ec810fc53238bf816fb52f0b5421d25442b825e1 Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Tue, 2 Sep 2025 12:14:27 +0000 Subject: [PATCH 4/6] [AUTOMATED] Private Release 3.0.0-beta.2-dev-5788f9b --- v3/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/pom.xml b/v3/pom.xml index 6a436b1f..50a0bb9b 100644 --- a/v3/pom.xml +++ b/v3/pom.xml @@ -11,7 +11,7 @@ skyflow-java - 3.0.0-beta.2-dev.a75d999 + 3.0.0-beta.2-dev.5788f9b jar ${project.groupId}:${project.artifactId} Skyflow V3 SDK for the Java programming language From dca75d0421f4e0dbdb70f7076655a9cad716ae9a Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Tue, 2 Sep 2025 17:52:09 +0530 Subject: [PATCH 5/6] SK-2274 upadate release version --- v3/src/main/java/com/skyflow/utils/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/src/main/java/com/skyflow/utils/Constants.java b/v3/src/main/java/com/skyflow/utils/Constants.java index 80e07298..e3c56ad3 100644 --- a/v3/src/main/java/com/skyflow/utils/Constants.java +++ b/v3/src/main/java/com/skyflow/utils/Constants.java @@ -2,7 +2,7 @@ public final class Constants extends BaseConstants { public static final String SDK_NAME = "Skyflow Java SDK "; - public static final String SDK_VERSION = "3.0.0-beta.2"; + public static final String SDK_VERSION = "3.0.0-beta.3"; public static final String VAULT_DOMAIN = ".skyvault."; public static final String SDK_PREFIX = SDK_NAME + SDK_VERSION; public static final Integer INSERT_BATCH_SIZE = 50; From 8e0fbba304112bb53c712e106fc7378df84c35e1 Mon Sep 17 00:00:00 2001 From: skyflow-bharti Date: Tue, 2 Sep 2025 12:22:30 +0000 Subject: [PATCH 6/6] [AUTOMATED] Private Release 3.0.0-beta.2-dev-dca75d0 --- v3/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/pom.xml b/v3/pom.xml index 50a0bb9b..82532786 100644 --- a/v3/pom.xml +++ b/v3/pom.xml @@ -11,7 +11,7 @@ skyflow-java - 3.0.0-beta.2-dev.5788f9b + 3.0.0-beta.2-dev.dca75d0 jar ${project.groupId}:${project.artifactId} Skyflow V3 SDK for the Java programming language