dramaticlly commented on code in PR #13913:
URL: https://github.com/apache/iceberg/pull/13913#discussion_r2363858431
##########
spark/v4.0/spark/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java:
##########
@@ -105,58 +124,39 @@ public ProcedureParameter[] parameters() {
@Override
@SuppressWarnings("checkstyle:CyclomaticComplexity")
public Iterator<Scan> call(InternalRow args) {
- Identifier tableIdent = toIdentifier(args.getString(0),
PARAMETERS[0].name());
- Long olderThanMillis = args.isNullAt(1) ? null :
DateTimeUtil.microsToMillis(args.getLong(1));
- String location = args.isNullAt(2) ? null : args.getString(2);
- boolean dryRun = args.isNullAt(3) ? false : args.getBoolean(3);
- Integer maxConcurrentDeletes = args.isNullAt(4) ? null : args.getInt(4);
- String fileListView = args.isNullAt(5) ? null : args.getString(5);
+ ProcedureInput input = new ProcedureInput(spark(), tableCatalog(),
PARAMETERS, args);
+ Identifier tableIdent = input.ident(TABLE_PARAM);
+ Long olderThanMillis = input.asTimestampLong(OLDER_THAN_PARAM, null);
+ String location = input.asString(LOCATION_PARAM, null);
+ boolean dryRun = input.asBoolean(DRY_RUN_PARAM, false);
+ Integer maxConcurrentDeletes = input.asInt(MAX_CONCURRENT_DELETES_PARAM,
null);
+ String fileListView = input.asString(FILE_LIST_VIEW_PARAM, null);
Preconditions.checkArgument(
maxConcurrentDeletes == null || maxConcurrentDeletes > 0,
"max_concurrent_deletes should have value > 0, value: %s",
maxConcurrentDeletes);
- Map<String, String> equalSchemes = Maps.newHashMap();
- if (!args.isNullAt(6)) {
- args.getMap(6)
- .foreach(
- DataTypes.StringType,
- DataTypes.StringType,
- (k, v) -> {
- equalSchemes.put(k.toString(), v.toString());
- return BoxedUnit.UNIT;
- });
- }
-
- Map<String, String> equalAuthorities = Maps.newHashMap();
- if (!args.isNullAt(7)) {
- args.getMap(7)
- .foreach(
- DataTypes.StringType,
- DataTypes.StringType,
- (k, v) -> {
- equalAuthorities.put(k.toString(), v.toString());
- return BoxedUnit.UNIT;
- });
- }
+ Map<String, String> equalSchemes = input.asStringMap(EQUAL_SCHEMES_PARAM,
ImmutableMap.of());
+ Map<String, String> equalAuthorities =
+ input.asStringMap(EQUAL_AUTHORITIES_PARAM, ImmutableMap.of());
- PrefixMismatchMode prefixMismatchMode =
- args.isNullAt(8) ? null :
PrefixMismatchMode.fromString(args.getString(8));
+ PrefixMismatchMode prefixMismatchMode =
input.asPrefixMismatchMode(PREFIX_MISMATCH_MODE_PARAM);
- boolean prefixListing = args.isNullAt(9) ? false : args.getBoolean(9);
+ boolean prefixListing = input.asBoolean(PREFIX_LISTING_PARAM, false);
+ Long finalOlderThanMillis = olderThanMillis;
Review Comment:
I also suggested this earlier in
https://github.com/apache/iceberg/pull/13913#discussion_r2317242962
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
