Skip to content

Commit

Permalink
Merge branch 'main' into feature/cli-command-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Brijeshthummar02 authored Mar 3, 2025
2 parents 42ca8c9 + 0e31573 commit f013623
Show file tree
Hide file tree
Showing 17 changed files with 2,490 additions and 1,612 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,35 @@
import java.util.Map;
import org.apache.gravitino.MetadataObject;
import org.apache.gravitino.exceptions.NoSuchTagException;
import org.apache.gravitino.listener.api.event.AlterTagEvent;
import org.apache.gravitino.listener.api.event.AlterTagFailureEvent;
import org.apache.gravitino.listener.api.event.AlterTagPreEvent;
import org.apache.gravitino.listener.api.event.AssociateTagsForMetadataObjectEvent;
import org.apache.gravitino.listener.api.event.AssociateTagsForMetadataObjectFailureEvent;
import org.apache.gravitino.listener.api.event.AssociateTagsForMetadataObjectPreEvent;
import org.apache.gravitino.listener.api.event.CreateTagEvent;
import org.apache.gravitino.listener.api.event.CreateTagFailureEvent;
import org.apache.gravitino.listener.api.event.CreateTagPreEvent;
import org.apache.gravitino.listener.api.event.DeleteTagEvent;
import org.apache.gravitino.listener.api.event.DeleteTagFailureEvent;
import org.apache.gravitino.listener.api.event.DeleteTagPreEvent;
import org.apache.gravitino.listener.api.event.GetTagEvent;
import org.apache.gravitino.listener.api.event.GetTagFailureEvent;
import org.apache.gravitino.listener.api.event.GetTagForMetadataObjectEvent;
import org.apache.gravitino.listener.api.event.GetTagForMetadataObjectFailureEvent;
import org.apache.gravitino.listener.api.event.GetTagForMetadataObjectPreEvent;
import org.apache.gravitino.listener.api.event.GetTagPreEvent;
import org.apache.gravitino.listener.api.event.ListMetadataObjectsForTagEvent;
import org.apache.gravitino.listener.api.event.ListMetadataObjectsForTagFailureEvent;
import org.apache.gravitino.listener.api.event.ListMetadataObjectsForTagPreEvent;
import org.apache.gravitino.listener.api.event.ListTagsEvent;
import org.apache.gravitino.listener.api.event.ListTagsFailureEvent;
import org.apache.gravitino.listener.api.event.ListTagsForMetadataObjectEvent;
import org.apache.gravitino.listener.api.event.ListTagsForMetadataObjectFailureEvent;
import org.apache.gravitino.listener.api.event.ListTagsForMetadataObjectPreEvent;
import org.apache.gravitino.listener.api.event.ListTagsInfoEvent;
import org.apache.gravitino.listener.api.event.ListTagsInfoFailureEvent;
import org.apache.gravitino.listener.api.event.ListTagsInfoForMetadataObjectEvent;
import org.apache.gravitino.listener.api.event.ListTagsInfoForMetadataObjectFailureEvent;
import org.apache.gravitino.listener.api.event.ListTagsInfoForMetadataObjectPreEvent;
import org.apache.gravitino.listener.api.event.ListTagsInfoPreEvent;
Expand Down Expand Up @@ -68,8 +79,9 @@ public TagEventDispatcher(EventBus eventBus, TagDispatcher dispatcher) {
public String[] listTags(String metalake) {
eventBus.dispatchEvent(new ListTagsPreEvent(PrincipalUtils.getCurrentUserName(), metalake));
try {
// TODO: listTagsEvent
return dispatcher.listTags(metalake);
String[] tagNames = dispatcher.listTags(metalake);
eventBus.dispatchEvent(new ListTagsEvent(PrincipalUtils.getCurrentUserName(), metalake));
return tagNames;
} catch (Exception e) {
eventBus.dispatchEvent(
new ListTagsFailureEvent(PrincipalUtils.getCurrentUserName(), metalake, e));
Expand All @@ -81,8 +93,9 @@ public String[] listTags(String metalake) {
public Tag[] listTagsInfo(String metalake) {
eventBus.dispatchEvent(new ListTagsInfoPreEvent(PrincipalUtils.getCurrentUserName(), metalake));
try {
// TODO: listTagsInfoEvent
return dispatcher.listTagsInfo(metalake);
Tag[] tags = dispatcher.listTagsInfo(metalake);
eventBus.dispatchEvent(new ListTagsInfoEvent(PrincipalUtils.getCurrentUserName(), metalake));
return tags;
} catch (Exception e) {
eventBus.dispatchEvent(
new ListTagsInfoFailureEvent(PrincipalUtils.getCurrentUserName(), metalake, e));
Expand All @@ -94,8 +107,11 @@ public Tag[] listTagsInfo(String metalake) {
public Tag getTag(String metalake, String name) throws NoSuchTagException {
eventBus.dispatchEvent(new GetTagPreEvent(PrincipalUtils.getCurrentUserName(), metalake, name));
try {
// TODO: getTagEvent
return dispatcher.getTag(metalake, name);
Tag tag = dispatcher.getTag(metalake, name);
TagInfo tagInfo = new TagInfo(tag.name(), tag.comment(), tag.properties());
eventBus.dispatchEvent(
new GetTagEvent(PrincipalUtils.getCurrentUserName(), metalake, name, tagInfo));
return tag;
} catch (Exception e) {
eventBus.dispatchEvent(
new GetTagFailureEvent(PrincipalUtils.getCurrentUserName(), metalake, name, e));
Expand All @@ -107,13 +123,16 @@ public Tag getTag(String metalake, String name) throws NoSuchTagException {
public Tag createTag(
String metalake, String name, String comment, Map<String, String> properties) {
TagInfo tagInfo = new TagInfo(name, comment, properties);
// TODO: createTagPreEvent

eventBus.dispatchEvent(
new CreateTagPreEvent(PrincipalUtils.getCurrentUserName(), metalake, tagInfo));
try {
// TODO: createTagEvent
return dispatcher.createTag(metalake, name, comment, properties);
Tag tag = dispatcher.createTag(metalake, name, comment, properties);
eventBus.dispatchEvent(
new CreateTagEvent(
PrincipalUtils.getCurrentUserName(),
metalake,
new TagInfo(tag.name(), tag.comment(), tag.properties())));
return tag;
} catch (Exception e) {
eventBus.dispatchEvent(
new CreateTagFailureEvent(PrincipalUtils.getCurrentUserName(), metalake, tagInfo, e));
Expand All @@ -128,8 +147,14 @@ public Tag alterTag(String metalake, String name, TagChange... changes) {

eventBus.dispatchEvent(preEvent);
try {
// TODO: alterTagEvent
return dispatcher.alterTag(metalake, name, changes);
Tag tag = dispatcher.alterTag(metalake, name, changes);
eventBus.dispatchEvent(
new AlterTagEvent(
PrincipalUtils.getCurrentUserName(),
metalake,
changes,
new TagInfo(tag.name(), tag.comment(), tag.properties())));
return tag;
} catch (Exception e) {
eventBus.dispatchEvent(
new AlterTagFailureEvent(
Expand All @@ -145,8 +170,10 @@ public boolean deleteTag(String metalake, String name) {

eventBus.dispatchEvent(preEvent);
try {
// TODO: deleteTagEvent
return dispatcher.deleteTag(metalake, name);
boolean isExists = dispatcher.deleteTag(metalake, name);
eventBus.dispatchEvent(
new DeleteTagEvent(PrincipalUtils.getCurrentUserName(), metalake, name, isExists));
return isExists;
} catch (Exception e) {
eventBus.dispatchEvent(
new DeleteTagFailureEvent(PrincipalUtils.getCurrentUserName(), metalake, name, e));
Expand All @@ -159,8 +186,10 @@ public MetadataObject[] listMetadataObjectsForTag(String metalake, String name)
eventBus.dispatchEvent(
new ListMetadataObjectsForTagPreEvent(PrincipalUtils.getCurrentUserName(), metalake, name));
try {
// TODO: listMetadataObjectsForTagEvent
return dispatcher.listMetadataObjectsForTag(metalake, name);
MetadataObject[] metadataObjects = dispatcher.listMetadataObjectsForTag(metalake, name);
eventBus.dispatchEvent(
new ListMetadataObjectsForTagEvent(PrincipalUtils.getCurrentUserName(), metalake, name));
return metadataObjects;
} catch (Exception e) {
eventBus.dispatchEvent(
new ListMetadataObjectsForTagFailureEvent(
Expand All @@ -176,8 +205,11 @@ public String[] listTagsForMetadataObject(String metalake, MetadataObject metada
PrincipalUtils.getCurrentUserName(), metalake, metadataObject));

try {
// TODO: listTagsForMetadataObjectEvent
return dispatcher.listTagsForMetadataObject(metalake, metadataObject);
String[] tags = dispatcher.listTagsForMetadataObject(metalake, metadataObject);
eventBus.dispatchEvent(
new ListTagsForMetadataObjectEvent(
PrincipalUtils.getCurrentUserName(), metalake, metadataObject));
return tags;
} catch (Exception e) {
eventBus.dispatchEvent(
new ListTagsForMetadataObjectFailureEvent(
Expand All @@ -192,8 +224,11 @@ public Tag[] listTagsInfoForMetadataObject(String metalake, MetadataObject metad
new ListTagsInfoForMetadataObjectPreEvent(
PrincipalUtils.getCurrentUserName(), metalake, metadataObject));
try {
// TODO: listTagsInfoForMetadataObjectEvent
return dispatcher.listTagsInfoForMetadataObject(metalake, metadataObject);
Tag[] tags = dispatcher.listTagsInfoForMetadataObject(metalake, metadataObject);
eventBus.dispatchEvent(
new ListTagsInfoForMetadataObjectEvent(
PrincipalUtils.getCurrentUserName(), metalake, metadataObject));
return tags;
} catch (Exception e) {
eventBus.dispatchEvent(
new ListTagsInfoForMetadataObjectFailureEvent(
Expand All @@ -214,9 +249,18 @@ public String[] associateTagsForMetadataObject(
tagsToRemove));

try {
// TODO: associateTagsForMetadataObjectEvent
return dispatcher.associateTagsForMetadataObject(
metalake, metadataObject, tagsToAdd, tagsToRemove);
String[] associatedTags =
dispatcher.associateTagsForMetadataObject(
metalake, metadataObject, tagsToAdd, tagsToRemove);
eventBus.dispatchEvent(
new AssociateTagsForMetadataObjectEvent(
PrincipalUtils.getCurrentUserName(),
metalake,
metadataObject,
tagsToAdd,
tagsToRemove,
associatedTags));
return associatedTags;
} catch (Exception e) {
eventBus.dispatchEvent(
new AssociateTagsForMetadataObjectFailureEvent(
Expand All @@ -236,8 +280,12 @@ public Tag getTagForMetadataObject(String metalake, MetadataObject metadataObjec
new GetTagForMetadataObjectPreEvent(
PrincipalUtils.getCurrentUserName(), metalake, metadataObject, name));
try {
// TODO: getTagForMetadataObjectEvent
return dispatcher.getTagForMetadataObject(metalake, metadataObject, name);
Tag tag = dispatcher.getTagForMetadataObject(metalake, metadataObject, name);
TagInfo tagInfo = new TagInfo(tag.name(), tag.comment(), tag.properties());
eventBus.dispatchEvent(
new GetTagForMetadataObjectEvent(
PrincipalUtils.getCurrentUserName(), metalake, metadataObject, tagInfo));
return tag;
} catch (Exception e) {
eventBus.dispatchEvent(
new GetTagForMetadataObjectFailureEvent(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.gravitino.listener.api.event;

import javax.annotation.Nullable;
import org.apache.gravitino.annotation.DeveloperApi;
import org.apache.gravitino.listener.api.info.TagInfo;
import org.apache.gravitino.tag.TagChange;
import org.apache.gravitino.utils.NameIdentifierUtil;

/** Represents an event triggered upon the successful alteration of a tag. */
@DeveloperApi
public final class AlterTagEvent extends TagEvent {
private final TagInfo updatedTagInfo;
private final TagChange[] tagChanges;

/**
* Constructs an instance of {@code AlterTagEvent}, encapsulating the key details about the
* successful alteration of a tag.
*
* @param user The username of the individual responsible for initiating the tag alteration.
* @param metalake The metalake from which the tag is being altered.
* @param tagChanges An array of {@link TagChange} objects representing the specific changes
* applied to the tag during the alteration process.
* @param updatedTagInfo The post-alteration state of the tag.
*/
public AlterTagEvent(
String user, String metalake, TagChange[] tagChanges, TagInfo updatedTagInfo) {
super(user, NameIdentifierUtil.ofTag(metalake, updatedTagInfo.name()));
this.tagChanges = tagChanges != null ? tagChanges.clone() : null;
this.updatedTagInfo = updatedTagInfo;
}

/**
* Retrieves the final state of the tag as it was returned to the user after successful
* alteration.
*
* @return A {@link TagInfo} instance encapsulating the comprehensive details of the newly altered
* tag.
*/
public TagInfo updatedTagInfo() {
return updatedTagInfo;
}

/**
* Retrieves the specific changes that were made to the tag during the alteration process.
*
* @return An array of {@link TagChange} objects detailing each modification applied to the tag.
*/
@Nullable
public TagChange[] changes() {
return tagChanges;
}

/**
* Returns the type of operation.
*
* @return the operation type.
*/
@Override
public OperationType operationType() {
return OperationType.ALTER_TAG;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.gravitino.listener.api.event;

import org.apache.gravitino.MetadataObject;
import org.apache.gravitino.annotation.DeveloperApi;
import org.apache.gravitino.utils.MetadataObjectUtil;

/**
* Represents an event that is triggered upon successfully associating tags with a metadata object.
*/
@DeveloperApi
public final class AssociateTagsForMetadataObjectEvent extends TagEvent {
private final String[] tagsToAdd;
private final String[] tagsToRemove;
private final String[] associatedTags;

/**
* Constructs an instance of {@code AssociateTagsForMetadataObjectEvent}.
*
* @param user The username of the individual who initiated the tag association.
* @param metalake The metalake from which the tags were associated.
* @param metadataObject The metadata object with which the tags were associated.
* @param tagsToAdd The tags that were added.
* @param tagsToRemove The tags that were removed.
* @param associatedTags The resulting list of associated tags after the operation.
*/
public AssociateTagsForMetadataObjectEvent(
String user,
String metalake,
MetadataObject metadataObject,
String[] tagsToAdd,
String[] tagsToRemove,
String[] associatedTags) {
super(user, MetadataObjectUtil.toEntityIdent(metalake, metadataObject));
this.tagsToAdd = tagsToAdd != null ? tagsToAdd.clone() : new String[0];
this.tagsToRemove = tagsToRemove != null ? tagsToRemove.clone() : new String[0];
this.associatedTags = associatedTags != null ? associatedTags.clone() : new String[0];
}

/**
* Provides the tags that were added in this operation.
*
* @return An array of tag names that were added.
*/
public String[] tagsToAdd() {
return tagsToAdd;
}

/**
* Provides the tags that were removed in this operation.
*
* @return An array of tag names that were removed.
*/
public String[] tagsToRemove() {
return tagsToRemove;
}

/**
* Provides the resulting list of associated tags after the operation.
*
* @return An array of tag names representing the associated tags.
*/
public String[] associatedTags() {
return associatedTags;
}

/**
* Returns the type of operation.
*
* @return The operation type.
*/
@Override
public OperationType operationType() {
return OperationType.ASSOCIATE_TAGS_FOR_METADATA_OBJECT;
}
}
Loading

0 comments on commit f013623

Please sign in to comment.