This is an automated email from the ASF dual-hosted git repository.
fokko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new dc7e6ef101 Spark: Optimize Preconditions.checkArgument in procedures
(#6096)
dc7e6ef101 is described below
commit dc7e6ef1013c41de7c4ce81a6d8e0b5dab2c5b2f
Author: Ajantha Bhat <[email protected]>
AuthorDate: Thu Nov 3 12:45:30 2022 +0530
Spark: Optimize Preconditions.checkArgument in procedures (#6096)
---
.../org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java | 3 ++-
.../apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java | 3 ++-
.../org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java | 3 ++-
.../apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java | 3 ++-
.../org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java | 3 ++-
.../apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java | 3 ++-
.../org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java | 3 ++-
.../apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java | 3 ++-
8 files changed, 16 insertions(+), 8 deletions(-)
diff --git
a/spark/v3.0/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
b/spark/v3.0/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
index 5f2508aaa3..214b1ea52b 100644
---
a/spark/v3.0/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
+++
b/spark/v3.0/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
@@ -98,7 +98,8 @@ public class ExpireSnapshotsProcedure extends BaseProcedure {
Preconditions.checkArgument(
maxConcurrentDeletes == null || maxConcurrentDeletes > 0,
- "max_concurrent_deletes should have value > 0, value: " +
maxConcurrentDeletes);
+ "max_concurrent_deletes should have value > 0, value: %s",
+ maxConcurrentDeletes);
return modifyIcebergTable(
tableIdent,
diff --git
a/spark/v3.0/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
b/spark/v3.0/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
index 010c61e066..b41ada1754 100644
---
a/spark/v3.0/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
+++
b/spark/v3.0/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
@@ -96,7 +96,8 @@ public class RemoveOrphanFilesProcedure extends BaseProcedure
{
Preconditions.checkArgument(
maxConcurrentDeletes == null || maxConcurrentDeletes > 0,
- "max_concurrent_deletes should have value > 0, value: " +
maxConcurrentDeletes);
+ "max_concurrent_deletes should have value > 0, value: %s",
+ maxConcurrentDeletes);
return withIcebergTable(
tableIdent,
diff --git
a/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
b/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
index 5f2508aaa3..214b1ea52b 100644
---
a/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
+++
b/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
@@ -98,7 +98,8 @@ public class ExpireSnapshotsProcedure extends BaseProcedure {
Preconditions.checkArgument(
maxConcurrentDeletes == null || maxConcurrentDeletes > 0,
- "max_concurrent_deletes should have value > 0, value: " +
maxConcurrentDeletes);
+ "max_concurrent_deletes should have value > 0, value: %s",
+ maxConcurrentDeletes);
return modifyIcebergTable(
tableIdent,
diff --git
a/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
b/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
index 010c61e066..b41ada1754 100644
---
a/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
+++
b/spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
@@ -96,7 +96,8 @@ public class RemoveOrphanFilesProcedure extends BaseProcedure
{
Preconditions.checkArgument(
maxConcurrentDeletes == null || maxConcurrentDeletes > 0,
- "max_concurrent_deletes should have value > 0, value: " +
maxConcurrentDeletes);
+ "max_concurrent_deletes should have value > 0, value: %s",
+ maxConcurrentDeletes);
return withIcebergTable(
tableIdent,
diff --git
a/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
b/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
index dfca343db5..aff4b44f94 100644
---
a/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
+++
b/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
@@ -97,7 +97,8 @@ public class ExpireSnapshotsProcedure extends BaseProcedure {
Preconditions.checkArgument(
maxConcurrentDeletes == null || maxConcurrentDeletes > 0,
- "max_concurrent_deletes should have value > 0, value: " +
maxConcurrentDeletes);
+ "max_concurrent_deletes should have value > 0, value: %s",
+ maxConcurrentDeletes);
return modifyIcebergTable(
tableIdent,
diff --git
a/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
b/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
index 60e27d252c..f49f37c02e 100644
---
a/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
+++
b/spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
@@ -102,7 +102,8 @@ public class RemoveOrphanFilesProcedure extends
BaseProcedure {
Preconditions.checkArgument(
maxConcurrentDeletes == null || maxConcurrentDeletes > 0,
- "max_concurrent_deletes should have value > 0, value: " +
maxConcurrentDeletes);
+ "max_concurrent_deletes should have value > 0, value: %s",
+ maxConcurrentDeletes);
Map<String, String> equalSchemes = Maps.newHashMap();
if (!args.isNullAt(6)) {
diff --git
a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
index dfca343db5..aff4b44f94 100644
---
a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
+++
b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/procedures/ExpireSnapshotsProcedure.java
@@ -97,7 +97,8 @@ public class ExpireSnapshotsProcedure extends BaseProcedure {
Preconditions.checkArgument(
maxConcurrentDeletes == null || maxConcurrentDeletes > 0,
- "max_concurrent_deletes should have value > 0, value: " +
maxConcurrentDeletes);
+ "max_concurrent_deletes should have value > 0, value: %s",
+ maxConcurrentDeletes);
return modifyIcebergTable(
tableIdent,
diff --git
a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
index 60e27d252c..f49f37c02e 100644
---
a/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
+++
b/spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
@@ -102,7 +102,8 @@ public class RemoveOrphanFilesProcedure extends
BaseProcedure {
Preconditions.checkArgument(
maxConcurrentDeletes == null || maxConcurrentDeletes > 0,
- "max_concurrent_deletes should have value > 0, value: " +
maxConcurrentDeletes);
+ "max_concurrent_deletes should have value > 0, value: %s",
+ maxConcurrentDeletes);
Map<String, String> equalSchemes = Maps.newHashMap();
if (!args.isNullAt(6)) {
