jerryshao commented on code in PR #14540:
URL: https://github.com/apache/gravitino/pull/14540#discussion_r4480341535
##########
core/src/main/java/org/apache/gravitino/catalog/SchemaOperationDispatcher.java:
##########
@@ -310,35 +311,15 @@ public Schema createSchema(
*/
@Override
public Schema loadSchema(NameIdentifier ident) throws NoSuchSchemaException {
- // Load the schema and check if this schema is already imported.
- EntityCombinedSchema schema =
- TreeLockUtils.doWithTreeLock(ident, LockType.READ, () ->
internalLoadSchema(ident));
-
- if (!schema.imported()) {
- try {
- TreeLockUtils.doWithTreeLock(
- NameIdentifier.of(ident.namespace().levels()),
- LockType.WRITE,
- () -> {
- importSchema(ident);
- return null;
- });
- } catch (EntityAlreadyExistsException e) {
- // HA race: another Gravitino node concurrently imported this schema.
Reload from the
- // entity store to verify the entity stored by the winning node is
consistent.
- LOG.info(
- "Schema {} was concurrently imported by another node; reloading
from store.", ident);
- EntityCombinedSchema reloaded =
- TreeLockUtils.doWithTreeLock(ident, LockType.READ, () ->
internalLoadSchema(ident));
- if (!reloaded.imported()) {
- throw new UnsupportedOperationException(
- "Schema managed by multiple catalogs. This may cause unexpected
issues such as privilege conflicts. "
- + "To resolve: Remove all catalogs managing this schema,
then recreate one catalog to ensure single-catalog management.");
- }
- }
- }
+ return loadAndImportSchema(ident, AuditInfo.EMPTY);
+ }
- return schema;
+ /** {@inheritDoc} */
+ @Override
+ public Schema importSchema(NameIdentifier ident, AuditInfo auditInfo)
+ throws NoSuchSchemaException {
+ Preconditions.checkNotNull(auditInfo, "auditInfo must not be null");
Review Comment:
You should not use `checkNotNull`.
--
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]
