Skip to content

Commit 9e11e3e

Browse files
committed
fix
1 parent 1d181a8 commit 9e11e3e

File tree

1 file changed

+35
-31
lines changed

1 file changed

+35
-31
lines changed

core/src/main/java/org/apache/gravitino/metalake/MetalakeManager.java

+35-31
Original file line numberDiff line numberDiff line change
@@ -290,21 +290,23 @@ public BaseMetalake alterMetalake(NameIdentifier ident, MetalakeChange... change
290290
"Metalake %s is not in use, please enable it first", ident);
291291
}
292292
METALAKE_CACHE.invalidate(ident);
293-
return store.update(
294-
ident,
295-
BaseMetalake.class,
296-
EntityType.METALAKE,
297-
metalake -> {
298-
BaseMetalake.Builder builder = newMetalakeBuilder(metalake);
299-
Map<String, String> newProps =
300-
metalake.properties() == null
301-
? Maps.newHashMap()
302-
: Maps.newHashMap(metalake.properties());
303-
builder = updateEntity(builder, newProps, changes);
304-
305-
return builder.build();
306-
});
307-
293+
BaseMetalake baseMetalake =
294+
store.update(
295+
ident,
296+
BaseMetalake.class,
297+
EntityType.METALAKE,
298+
metalake -> {
299+
BaseMetalake.Builder builder = newMetalakeBuilder(metalake);
300+
Map<String, String> newProps =
301+
metalake.properties() == null
302+
? Maps.newHashMap()
303+
: Maps.newHashMap(metalake.properties());
304+
builder = updateEntity(builder, newProps, changes);
305+
306+
return builder.build();
307+
});
308+
METALAKE_CACHE.put(ident, newMetalakeWithResolvedProperties(baseMetalake));
309+
return baseMetalake;
308310
} catch (NoSuchEntityException ne) {
309311
LOG.warn("Metalake {} does not exist", ident, ne);
310312
throw new NoSuchMetalakeException(METALAKE_DOES_NOT_EXIST_MSG, ident);
@@ -370,22 +372,24 @@ public void enableMetalake(NameIdentifier ident) throws NoSuchMetalakeException
370372
boolean inUse = metalakeInUse(store, ident);
371373
if (!inUse) {
372374
METALAKE_CACHE.invalidate(ident);
373-
store.update(
374-
ident,
375-
BaseMetalake.class,
376-
EntityType.METALAKE,
377-
metalake -> {
378-
BaseMetalake.Builder builder = newMetalakeBuilder(metalake);
379-
380-
Map<String, String> newProps =
381-
metalake.properties() == null
382-
? Maps.newHashMap()
383-
: Maps.newHashMap(metalake.properties());
384-
newProps.put(PROPERTY_IN_USE, "true");
385-
builder.withProperties(newProps);
386-
387-
return builder.build();
388-
});
375+
BaseMetalake baseMetalake =
376+
store.update(
377+
ident,
378+
BaseMetalake.class,
379+
EntityType.METALAKE,
380+
metalake -> {
381+
BaseMetalake.Builder builder = newMetalakeBuilder(metalake);
382+
383+
Map<String, String> newProps =
384+
metalake.properties() == null
385+
? Maps.newHashMap()
386+
: Maps.newHashMap(metalake.properties());
387+
newProps.put(PROPERTY_IN_USE, "true");
388+
builder.withProperties(newProps);
389+
390+
return builder.build();
391+
});
392+
METALAKE_CACHE.put(ident, newMetalakeWithResolvedProperties(baseMetalake));
389393
}
390394

391395
return null;

0 commit comments

Comments
 (0)