flyrain commented on code in PR #4408:
URL: https://github.com/apache/polaris/pull/4408#discussion_r3238415068
##########
runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java:
##########
@@ -1242,70 +1241,87 @@ private <T extends PolarisEntity & LocationBasedEntity>
void validateNoLocationO
return Namespace.of(newLevels);
})
.toList();
- LOGGER.debug(
- "Resolving {} sibling entities to validate location",
- siblingTables.size() + siblingNamespaces.size());
- PolarisResolutionManifest resolutionManifest =
- new PolarisResolutionManifest(
- diagnostics,
- callContext.getRealmContext(),
- resolverFactory,
- principal,
- parentPath.getFirst().getName());
+ List<ResolvedPathKey> pathsToResolve =
+ new ArrayList<>(siblingTables.size() + siblingNamespaces.size());
siblingTables.forEach(
- tbl ->
- resolutionManifest.addPath(
- new ResolverPath(
- PolarisCatalogHelpers.tableIdentifierToList(tbl),
- PolarisEntityType.TABLE_LIKE)));
+ tbl -> {
+ if (!tbl.name().equals(name)) {
+ pathsToResolve.add(ResolvedPathKey.ofTableLike(tbl));
+ }
+ });
siblingNamespaces.forEach(
- ns ->
- resolutionManifest.addPath(
- new ResolverPath(Arrays.asList(ns.levels()),
PolarisEntityType.NAMESPACE)));
+ ns -> {
+ if (!ns.level(ns.length() - 1).equals(name)) {
+ pathsToResolve.add(ResolvedPathKey.ofNamespace(ns));
+ }
+ });
+
+ StorageLocation targetLocation = StorageLocation.of(location);
+ for (PolarisEntity entityToCheck :
+ resolveOptionalPaths(pathsToResolve, parentPath.getFirst().getName()))
{
+ String loc =
+
entityToCheck.getPropertiesAsMap().get(PolarisEntityConstants.ENTITY_BASE_LOCATION);
+ if (loc == null) {
+ continue;
+ }
+
+ StorageLocation siblingLocation = StorageLocation.of(loc);
+
+ if (targetLocation.isChildOf(siblingLocation) ||
siblingLocation.isChildOf(targetLocation)) {
+ throw new ForbiddenException(
+ "Unable to create table at location '%s' because it conflicts with
existing table or namespace at "
+ + "location '%s'",
+ targetLocation, siblingLocation);
+ }
+ }
+ }
+
+ @VisibleForTesting
+ List<PolarisEntity> resolveOptionalPaths(List<ResolvedPathKey> keys, String
catalogName) {
+ LOGGER.debug("Resolving {} sibling entities to validate location",
keys.size());
+
+ PolarisResolutionManifest resolutionManifest =
+ new PolarisResolutionManifest(
+ diagnostics, callContext.getRealmContext(), resolverFactory,
principal, catalogName);
+
+ keys.forEach(
+ k -> {
+ resolutionManifest.addPath(new ResolverPath(k, true)); // optional
path
+ });
+
ResolverStatus status = resolutionManifest.resolveAll();
- if (!status.getStatus().equals(ResolverStatus.StatusEnum.SUCCESS)) {
+
+ if (status.getStatus() != ResolverStatus.StatusEnum.SUCCESS) {
String message =
"Unable to resolve sibling entities to validate location - " +
status.getStatus();
if
(status.getStatus().equals(ResolverStatus.StatusEnum.ENTITY_COULD_NOT_BE_RESOLVED))
{
message += ". Could not resolve entity: " +
status.getFailedToResolvedEntityName();
}
- throw new IllegalStateException(message);
+
+ if
(status.getStatus().equals(ResolverStatus.StatusEnum.PATH_COULD_NOT_BE_FULLY_RESOLVED))
{
+ ResolverPath path = status.getFailedToResolvePath();
+ if (path != null) {
+ message += ". path: " + String.join(".", path.entityNames());
Review Comment:
Minor: two sequential `if (status.getStatus().equals(...))` on the same
enum, switch or `else if` reads cleaner.
--
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]
