Skip to content

Commit

Permalink
[apache#6067] improvement(core): Support model pre event to Gravitino…
Browse files Browse the repository at this point in the history
… server

Remove Model Event.
  • Loading branch information
Abyss-lord committed Feb 16, 2025
1 parent 91493af commit 8d73819
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 782 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,13 @@
import org.apache.gravitino.exceptions.NoSuchModelException;
import org.apache.gravitino.exceptions.NoSuchModelVersionException;
import org.apache.gravitino.exceptions.NoSuchSchemaException;
import org.apache.gravitino.listener.api.event.DeleteModelEvent;
import org.apache.gravitino.listener.api.event.DeleteModelPreEvent;
import org.apache.gravitino.listener.api.event.DeleteModelVersionEvent;
import org.apache.gravitino.listener.api.event.DeleteModelVersionPreEvent;
import org.apache.gravitino.listener.api.event.GetModelEvent;
import org.apache.gravitino.listener.api.event.GetModelPreEvent;
import org.apache.gravitino.listener.api.event.GetModelVersionEvent;
import org.apache.gravitino.listener.api.event.GetModelVersionPreEvent;
import org.apache.gravitino.listener.api.event.LinkModelVersionEvent;
import org.apache.gravitino.listener.api.event.LinkModelVersionPreEvent;
import org.apache.gravitino.listener.api.event.ListModelEvent;
import org.apache.gravitino.listener.api.event.ListModelPreEvent;
import org.apache.gravitino.listener.api.event.ListModelVersionsEvent;
import org.apache.gravitino.listener.api.event.ListModelVersionsPreEvent;
import org.apache.gravitino.listener.api.event.RegisterModelEvent;
import org.apache.gravitino.listener.api.event.RegisterModelPreEvent;
import org.apache.gravitino.listener.api.info.ModelInfo;
import org.apache.gravitino.listener.api.info.ModelVersionInfo;
Expand Down Expand Up @@ -96,9 +88,7 @@ public Model registerModel(NameIdentifier ident, String comment, Map<String, Str
new RegisterModelPreEvent(PrincipalUtils.getCurrentUserName(), ident, registerRequest));
try {
Model model = dispatcher.registerModel(ident, comment, properties);
ModelInfo modelInfo = new ModelInfo(model);
eventBus.dispatchEvent(
new RegisterModelEvent(PrincipalUtils.getCurrentUserName(), ident, modelInfo));
// TODO: ModelEvent
return model;
} catch (Exception e) {
// TODO: failureEvent
Expand Down Expand Up @@ -150,9 +140,7 @@ public Model getModel(NameIdentifier ident) throws NoSuchModelException {
eventBus.dispatchEvent(new GetModelPreEvent(PrincipalUtils.getCurrentUserName(), ident));
try {
Model model = dispatcher.getModel(ident);
ModelInfo modelInfo = new ModelInfo(model);
eventBus.dispatchEvent(
new GetModelEvent(PrincipalUtils.getCurrentUserName(), ident, modelInfo));
// TODO: ModelEvent
return model;
} catch (Exception e) {
// TODO: failureEvent
Expand All @@ -172,8 +160,7 @@ public boolean deleteModel(NameIdentifier ident) {
eventBus.dispatchEvent(new DeleteModelPreEvent(PrincipalUtils.getCurrentUserName(), ident));
try {
boolean isExists = dispatcher.deleteModel(ident);
eventBus.dispatchEvent(
new DeleteModelEvent(PrincipalUtils.getCurrentUserName(), ident, isExists));
// TODO: ModelEvent
return isExists;
} catch (Exception e) {
// TODO: failureEvent
Expand All @@ -193,7 +180,7 @@ public NameIdentifier[] listModels(Namespace namespace) throws NoSuchSchemaExcep
eventBus.dispatchEvent(new ListModelPreEvent(PrincipalUtils.getCurrentUserName(), namespace));
try {
NameIdentifier[] models = dispatcher.listModels(namespace);
eventBus.dispatchEvent(new ListModelEvent(PrincipalUtils.getCurrentUserName(), namespace));
// TODO: ModelEvent
return models;
} catch (Exception e) {
// TODO: failureEvent
Expand Down Expand Up @@ -233,8 +220,7 @@ public void linkModelVersion(
new LinkModelVersionPreEvent(PrincipalUtils.getCurrentUserName(), ident, linkRequest));
try {
dispatcher.linkModelVersion(ident, uri, aliases, comment, properties);
eventBus.dispatchEvent(
new LinkModelVersionEvent(PrincipalUtils.getCurrentUserName(), ident, linkRequest));
// TODO: ModelEvent
} catch (Exception e) {
// TODO: failureEvent
throw e;
Expand All @@ -255,9 +241,7 @@ public ModelVersion getModelVersion(NameIdentifier ident, int version)
eventBus.dispatchEvent(new GetModelVersionPreEvent(PrincipalUtils.getCurrentUserName(), ident));
try {
ModelVersion modelVersion = dispatcher.getModelVersion(ident, version);
ModelInfo modelInfo = getModelInfo(ident, version);
eventBus.dispatchEvent(
new GetModelVersionEvent(PrincipalUtils.getCurrentUserName(), ident, modelInfo));
// TODO: ModelEvent
return modelVersion;
} catch (Exception e) {
// TODO: failureEvent
Expand All @@ -279,9 +263,7 @@ public ModelVersion getModelVersion(NameIdentifier ident, String alias)
eventBus.dispatchEvent(new GetModelVersionPreEvent(PrincipalUtils.getCurrentUserName(), ident));
try {
ModelVersion modelVersion = dispatcher.getModelVersion(ident, alias);
ModelInfo modelInfo = getModelInfo(ident, alias);
eventBus.dispatchEvent(
new GetModelVersionEvent(PrincipalUtils.getCurrentUserName(), ident, modelInfo));
// TODO: ModelEvent
return modelVersion;
} catch (Exception e) {
// TODO: failureEvent
Expand All @@ -303,8 +285,7 @@ public boolean deleteModelVersion(NameIdentifier ident, int version) {
new DeleteModelVersionPreEvent(PrincipalUtils.getCurrentUserName(), ident));
try {
boolean isExists = dispatcher.deleteModelVersion(ident, version);
eventBus.dispatchEvent(
new DeleteModelVersionEvent(PrincipalUtils.getCurrentUserName(), ident, isExists));
// TODO: ModelEvent
return isExists;
} catch (Exception e) {
// TODO: failureEvent
Expand All @@ -326,8 +307,7 @@ public boolean deleteModelVersion(NameIdentifier ident, String alias) {
new DeleteModelVersionPreEvent(PrincipalUtils.getCurrentUserName(), ident));
try {
boolean isExists = dispatcher.deleteModelVersion(ident, alias);
eventBus.dispatchEvent(
new DeleteModelVersionEvent(PrincipalUtils.getCurrentUserName(), ident, isExists));
// TODO: ModelEvent
return isExists;
} catch (Exception e) {
// TODO: failureEvent
Expand All @@ -350,8 +330,7 @@ public int[] listModelVersions(NameIdentifier ident) throws NoSuchModelException
new ListModelVersionsPreEvent(PrincipalUtils.getCurrentUserName(), ident, modelInfo));
try {
int[] versions = dispatcher.listModelVersions(ident);
eventBus.dispatchEvent(
new ListModelVersionsEvent(PrincipalUtils.getCurrentUserName(), ident, modelInfo));
// TODO: ModelEvent
return versions;
} catch (Exception e) {
// TODO: failureEvent
Expand Down Expand Up @@ -395,20 +374,4 @@ public boolean modelVersionExists(NameIdentifier ident, int version) {
public boolean modelVersionExists(NameIdentifier ident, String alias) {
return dispatcher.modelVersionExists(ident, alias);
}

private ModelInfo getModelInfo(NameIdentifier modelIdent, int version) {
Model model = dispatcher.getModel(modelIdent);
ModelVersion modelVersion = dispatcher.getModelVersion(modelIdent, version);
ModelVersionInfo modelVersionInfo = new ModelVersionInfo(modelVersion);

return new ModelInfo(model, new ModelVersionInfo[] {modelVersionInfo});
}

private ModelInfo getModelInfo(NameIdentifier modelIdent, String alias) {
Model model = dispatcher.getModel(modelIdent);
ModelVersion modelVersion = dispatcher.getModelVersion(modelIdent, alias);
ModelVersionInfo modelVersionInfo = new ModelVersionInfo(modelVersion);

return new ModelInfo(model, new ModelVersionInfo[] {modelVersionInfo});
}
}

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 8d73819

Please sign in to comment.