jackye1995 commented on code in PR #6717: URL: https://github.com/apache/iceberg/pull/6717#discussion_r1103693013
########## spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/SparkCachedTableCatalog.java: ########## @@ -144,23 +149,49 @@ private Pair<Table, Long> load(Identifier ident) throws NoSuchTableException { if (snapshotBasedMatcher.matches()) { snapshotId = Long.parseLong(snapshotBasedMatcher.group(1)); } + + Matcher branchBasedMatcher = BRANCH.matcher(meta); + if (branchBasedMatcher.matches()) { + branch = branchBasedMatcher.group(1); + } + + Matcher tagBasedMatcher = BRANCH.matcher(meta); + if (tagBasedMatcher.matches()) { + tag = tagBasedMatcher.group(1); + } } Preconditions.checkArgument( - asOfTimestamp == null || snapshotId == null, - "Cannot specify both snapshot and timestamp for time travel: %s", - ident); + Stream.of(snapshotId, asOfTimestamp, branch, tag).filter(Objects::nonNull).count() <= 1, + "Can specify at most one of snapshot-id (%s), as-of-timestamp (%s), and snapshot-ref (%s)", + snapshotId, + asOfTimestamp, + branch); Table table = TABLE_CACHE.get(key); if (table == null) { throw new NoSuchTableException(ident); } + long snapshotIdFromTimeTravel = -1L; Review Comment: I see, this is a comment from Amogh > Nit: could we just have each if block match and resolve the snapshot ID, and then just have one return new SparkTable(table, snapshotId, !cacheEnabled) at the end. That'll reduce duplication considering we need to also handle the tag case also. I actually think the other way, because if we look at this current change based on the suggestion, it introduces more changes and variables without the stated benefit of really removing much duplication. -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org