http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java
deleted file mode 100644
index e8728a5..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropFunctionEvent.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Function;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class DropFunctionEvent extends ListenerEvent {
-
-  private final Function function;
-
-  public DropFunctionEvent(Function function, boolean status, IHMSHandler 
handler) {
-    super(status, handler);
-    this.function = function;
-  }
-
-  /**
-   * @return the function
-   */
-  public Function getFunction() {
-    return function;
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java
deleted file mode 100644
index 7c03638..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropISchemaEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.ISchema;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class DropISchemaEvent extends ListenerEvent {
-
-  private final ISchema schema;
-
-  public DropISchemaEvent(boolean status, IHMSHandler handler, ISchema schema) 
{
-    super(status, handler);
-    this.schema = schema;
-  }
-
-  public ISchema getSchema() {
-    return schema;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java
deleted file mode 100644
index dce9df3..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Partition;
-import org.apache.hadoop.hive.metastore.api.Table;
-
-import java.util.Collections;
-import java.util.Iterator;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class DropPartitionEvent extends ListenerEvent {
-
-  private final Table table;
-  private final Iterable<Partition> partitions;
-  private final boolean deleteData;
-
-  public DropPartitionEvent (Table table,
-      Partition partition, boolean status, boolean deleteData, IHMSHandler 
handler) {
-    super (status, handler);
-    this.table = table;
-    this.partitions = Collections.singletonList(partition);
-    // In HiveMetaStore, the deleteData flag indicates whether DFS data should 
be
-    // removed on a drop.
-    this.deleteData = deleteData;
-  }
-
-  /**
-   * @return the partitions
-   */
-  public Iterator<Partition> getPartitionIterator() {
-    return partitions.iterator();
-  }
-
-  /**
-   * @return the table
-   */
-  public Table getTable() {
-
-    return table;
-  }
-
-  /**
-   * @return the deleteData flag
-   */
-  public boolean getDeleteData() {
-
-    return deleteData;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java
deleted file mode 100644
index c722c33..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropSchemaVersionEvent.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.SchemaVersion;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class DropSchemaVersionEvent extends ListenerEvent {
-
-  private final SchemaVersion schemaVersion;
-
-  public DropSchemaVersionEvent(boolean status, IHMSHandler handler,
-                                SchemaVersion schemaVersion) {
-    super(status, handler);
-    this.schemaVersion = schemaVersion;
-  }
-
-  public SchemaVersion getSchemaVersion() {
-    return schemaVersion;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java
deleted file mode 100644
index 9152232..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Table;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class DropTableEvent extends ListenerEvent {
-
-  private final Table table;
-  private final boolean deleteData;
-
-  public DropTableEvent(Table table, boolean status, boolean deleteData, 
IHMSHandler handler) {
-    super(status, handler);
-    this.table = table;
-    // In HiveMetaStore, the deleteData flag indicates whether DFS data should 
be
-    // removed on a drop.
-    this.deleteData = deleteData;
-  }
-
-  /**
-   * @return the table
-   */
-  public Table getTable() {
-    return table;
-  }
-
-  /**
-   * @return the deleteData flag
-   */
-  public boolean getDeleteData() {
-    return deleteData;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java
deleted file mode 100644
index a6da7df..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/EventCleanerTask.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.metastore.HiveMetaStore;
-import org.apache.hadoop.hive.metastore.MetastoreTaskThread;
-import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.hadoop.hive.metastore.RawStore;
-
-import java.util.concurrent.TimeUnit;
-
-public class EventCleanerTask implements MetastoreTaskThread {
-  private static final Logger LOG = 
LoggerFactory.getLogger(EventCleanerTask.class);
-
-  private Configuration conf;
-
-  @Override
-  public long runFrequency(TimeUnit unit) {
-    return MetastoreConf.getTimeVar(conf, 
MetastoreConf.ConfVars.EVENT_CLEAN_FREQ, unit);
-  }
-
-  @Override
-  public void setConf(Configuration configuration) {
-    conf = configuration;
-
-  }
-
-  @Override
-  public Configuration getConf() {
-    return conf;
-  }
-
-  @Override
-  public void run() {
-
-    try {
-      RawStore ms = HiveMetaStore.HMSHandler.getMSForConf(conf);
-      long deleteCnt = ms.cleanupEvents();
-
-      if (deleteCnt > 0L){
-        LOG.info("Number of events deleted from event Table: "+deleteCnt);
-      }
-    } catch (Exception e) {
-      LOG.error("Exception while trying to delete events ", e);
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java
deleted file mode 100644
index 60ad7db..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/InsertEvent.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.ClientCapabilities;
-import org.apache.hadoop.hive.metastore.api.ClientCapability;
-import org.apache.hadoop.hive.metastore.api.GetTableRequest;
-import org.apache.hadoop.hive.metastore.api.InsertEventRequestData;
-import org.apache.hadoop.hive.metastore.api.MetaException;
-import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
-import org.apache.hadoop.hive.metastore.api.Partition;
-import org.apache.hadoop.hive.metastore.api.Table;
-import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils;
-import org.apache.thrift.TException;
-
-import com.google.common.collect.Lists;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class InsertEvent extends ListenerEvent {
-
-  private final Table tableObj;
-  private final Partition ptnObj;
-  private final boolean replace;
-  private final List<String> files;
-  private List<String> fileChecksums = new ArrayList<>();
-
-  /**
-   *
-   * @param db name of the database the table is in
-   * @param table name of the table being inserted into
-   * @param partVals list of partition values, can be null
-   * @param insertData the inserted files and their checksums
-   * @param status status of insert, true = success, false = failure
-   * @param handler handler that is firing the event
-   */
-  public InsertEvent(String catName, String db, String table, List<String> 
partVals,
-      InsertEventRequestData insertData, boolean status, IHMSHandler handler) 
throws MetaException,
-      NoSuchObjectException {
-    super(status, handler);
-
-    GetTableRequest req = new GetTableRequest(db, table);
-    req.setCatName(catName);
-    // TODO MS-SPLIT Switch this back once HiveMetaStoreClient is moved.
-    //req.setCapabilities(HiveMetaStoreClient.TEST_VERSION);
-    req.setCapabilities(new ClientCapabilities(
-        Lists.newArrayList(ClientCapability.TEST_CAPABILITY, 
ClientCapability.INSERT_ONLY_TABLES)));
-    try {
-      this.tableObj = handler.get_table_req(req).getTable();
-      if (partVals != null) {
-        this.ptnObj = 
handler.get_partition(MetaStoreUtils.prependNotNullCatToDbName(catName, db),
-            table, partVals);
-      } else {
-        this.ptnObj = null;
-      }
-    } catch (NoSuchObjectException e) {
-      // This is to mimic previous behavior where NoSuchObjectException was 
thrown through this
-      // method.
-      throw e;
-    } catch (TException e) {
-      throw MetaStoreUtils.newMetaException(e);
-    }
-
-    // If replace flag is not set by caller, then by default set it to true to 
maintain backward compatibility
-    this.replace = (insertData.isSetReplace() ? insertData.isReplace() : true);
-    this.files = insertData.getFilesAdded();
-    if (insertData.isSetFilesAddedChecksum()) {
-      fileChecksums = insertData.getFilesAddedChecksum();
-    }
-  }
-
-  /**
-   * @return Table object
-   */
-  public Table getTableObj() {
-    return tableObj;
-  }
-
-  /**
-   * @return Partition object
-   */
-  public Partition getPartitionObj() {
-    return ptnObj;
-  }
-
-  /**
-   * @return The replace flag.
-   */
-  public boolean isReplace() {
-    return replace;
-  }
-
-  /**
-   * Get list of files created as a result of this DML operation
-   *
-   * @return list of new files
-   */
-  public List<String> getFiles() {
-    return files;
-  }
-
-  /**
-   * Get a list of file checksums corresponding to the files created (if 
available)
-   *
-   * @return
-   */
-  public List<String> getFileChecksums() {
-    return fileChecksums;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java
deleted file mode 100644
index 93f1c2b..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/ListenerEvent.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.HiveMetaStore;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.EnvironmentContext;
-import javax.annotation.concurrent.NotThreadSafe;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Base class for all the events which are defined for metastore.
- *
- * This class is not thread-safe and not expected to be called in parallel.
- */
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-@NotThreadSafe
-public abstract class ListenerEvent {
-
-  /**
-   * status of the event, whether event was successful or not.
-   */
-  private final boolean status;
-  private final IHMSHandler handler;
-
-  /**
-   * Key/value parameters used by listeners to store notifications results
-   * i.e. DbNotificationListener sets a DB_NOTIFICATION_EVENT_ID.
-   *
-   * NotThreadSafe: The parameters map is not expected to be access in 
parallel by Hive, so keep it thread-unsafe
-   * to avoid locking overhead.
-   */
-  private Map<String, String> parameters;
-
-  /** For performance concerns, it is preferable to cache the unmodifiable 
parameters variable that will be returned on the
-   * {@link #getParameters()} method. It is expected that {@link 
#putParameter(String, String)} is called less times
-   * than {@link #getParameters()}, so performance may be better by using this 
cache.
-   */
-  private Map<String, String> unmodifiableParameters;
-
-  // Listener parameters aren't expected to have many values. So far only
-  // DbNotificationListener will add a parameter; let's set a low initial 
capacity for now.
-  // If we find out many parameters are added, then we can adjust or remove 
this initial capacity.
-  private static final int PARAMETERS_INITIAL_CAPACITY = 1;
-
-  // Properties passed by the client, to be used in execution hooks.
-  private EnvironmentContext environmentContext = null;
-
-  public ListenerEvent(boolean status, IHMSHandler handler) {
-    super();
-    this.status = status;
-    this.handler = handler;
-    this.parameters = new HashMap<>(PARAMETERS_INITIAL_CAPACITY);
-    updateUnmodifiableParameters();
-  }
-
-  /**
-   * @return the status of event.
-   */
-  public boolean getStatus() {
-    return status;
-  }
-
-  /**
-   * Set the environment context of the event.
-   *
-   * @param environmentContext An EnvironmentContext object that contains 
environment parameters sent from
-   *                           the HMS client.
-   */
-  public void setEnvironmentContext(EnvironmentContext environmentContext) {
-    this.environmentContext = environmentContext;
-  }
-
-  /**
-   * @return environment properties of the event
-   */
-  public EnvironmentContext getEnvironmentContext() {
-    return environmentContext;
-  }
-
-  /**
-   * You should use {@link #getIHMSHandler()} instead.
-   * @return handler.
-   */
-  @Deprecated
-  public HiveMetaStore.HMSHandler getHandler() {
-    return (HiveMetaStore.HMSHandler)handler;
-  }
-
-  /**
-   * @return the handler
-   */
-  public IHMSHandler getIHMSHandler() {
-    return handler;
-  }
-
-  /**
-   * Return all parameters of the listener event. Parameters are read-only 
(unmodifiable map). If a new parameter
-   * must be added, please use the putParameter() method.
-   *
-   *
-   * @return A map object with all parameters.
-   */
-  public final Map<String, String> getParameters() {
-    return unmodifiableParameters;
-  }
-
-  /**
-   * Put a new parameter to the listener event.
-   *
-   * Overridden parameters is not allowed, and an exception may be thrown to 
avoid a mis-configuration
-   * between listeners setting the same parameters.
-   *
-   * @param name Name of the parameter.
-   * @param value Value of the parameter.
-   * @throws IllegalStateException if a parameter already exists.
-   */
-  public void putParameter(String name, String value) {
-    putParameterIfAbsent(name, value);
-    updateUnmodifiableParameters();
-  }
-
-  /**
-   * Put a new set the parameters to the listener event.
-   *
-   * Overridden parameters is not allowed, and an exception may be thrown to 
avoid a mis-configuration
-   * between listeners setting the same parameters.
-   *
-   * @param parameters A Map object with the a set of parameters.
-   * @throws IllegalStateException if a parameter already exists.
-   */
-  public void putParameters(final Map<String, String> parameters) {
-    if (parameters != null) {
-      for (Map.Entry<String, String> entry : parameters.entrySet()) {
-        putParameterIfAbsent(entry.getKey(), entry.getValue());
-      }
-
-      updateUnmodifiableParameters();
-    }
-  }
-
-  /**
-   * Put a parameter to the listener event only if the parameter is absent.
-   *
-   * Overridden parameters is not allowed, and an exception may be thrown to 
avoid a mis-configuration
-   * between listeners setting the same parameters.
-   *
-   * @param name Name of the parameter.
-   * @param value Value of the parameter.
-   * @throws IllegalStateException if a parameter already exists.
-   */
-  private void putParameterIfAbsent(String name, String value) {
-    if (parameters.containsKey(name)) {
-      throw new IllegalStateException("Invalid attempt to overwrite a 
read-only parameter: " + name);
-    }
-
-    parameters.put(name, value);
-  }
-
-  /**
-   * Keeps a cache of unmodifiable parameters returned by the getParameters() 
method.
-   */
-  private void updateUnmodifiableParameters() {
-    unmodifiableParameters = Collections.unmodifiableMap(parameters);
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java
deleted file mode 100644
index 3128a8f..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/LoadPartitionDoneEvent.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import java.util.Map;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Table;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class LoadPartitionDoneEvent extends ListenerEvent {
-
-  private final Table table;
-
-  private final Map<String,String> partSpec;
-
-  public LoadPartitionDoneEvent(boolean status, Table table,
-      Map<String,String> partSpec, IHMSHandler handler) {
-    super(status, handler);
-    this.table = table;
-    this.partSpec = partSpec;
-  }
-
-  /**
-   * @return the tblName
-   */
-  public Table getTable() {
-    return table;
-  }
-
-  /**
-   * @return the partition Name
-   */
-  public Map<String,String> getPartitionName() {
-    return partSpec;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java
deleted file mode 100644
index 547c43e..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/OpenTxnEvent.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import com.google.common.collect.Lists;
-import java.util.List;
-
-/**
- * OpenTxnEvent
- * Event generated for open transaction event.
- */
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class OpenTxnEvent extends ListenerEvent {
-  private List<Long> txnIds;
-
-  /**
-   * @param txnIds List of unique identification for the transaction just 
opened.
-   * @param handler handler that is firing the event
-   */
-  public OpenTxnEvent(List<Long> txnIds, IHMSHandler handler) {
-    super(true, handler);
-    this.txnIds = Lists.newArrayList(txnIds);
-  }
-
-  /**
-   * @return List<Long> txnIds
-   */
-  public List<Long> getTxnIds() {
-    return txnIds;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java
deleted file mode 100644
index b5c4607..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddPartitionEvent.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Partition;
-import org.apache.hadoop.hive.metastore.api.Table;
-import org.apache.hadoop.hive.metastore.partition.spec.PartitionSpecProxy;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreAddPartitionEvent extends PreEventContext {
-
-  private final Table table;
-  private final List<Partition> partitions;
-  private PartitionSpecProxy partitionSpecProxy;
-
-  public PreAddPartitionEvent (Table table, List<Partition> partitions, 
IHMSHandler handler) {
-    super(PreEventType.ADD_PARTITION, handler);
-    this.table = table;
-    this.partitions = partitions;
-    this.partitionSpecProxy = null;
-  }
-
-  public PreAddPartitionEvent(Table table, Partition partition, IHMSHandler 
handler) {
-    this(table, Arrays.asList(partition), handler);
-  }
-
-  /**
-   * Alternative constructor, using
-   */
-  public PreAddPartitionEvent(Table table, PartitionSpecProxy 
partitionSpecProxy, IHMSHandler handler) {
-    this(table, (List<Partition>)null, handler);
-    this.partitionSpecProxy = partitionSpecProxy;
-  }
-
-  /**
-   * @return the partitions
-   */
-  public List<Partition> getPartitions() {
-    return partitions;
-  }
-
-  /**
-   * @return the table
-   */
-  public Table getTable() {
-    return table ;
-  }
-
-  /**
-   * @return Iterator over partition-list.
-   */
-  public Iterator<Partition> getPartitionIterator() {
-    return partitionSpecProxy == null ? null : 
partitionSpecProxy.getPartitionIterator();
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java
deleted file mode 100644
index fc345f5..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAddSchemaVersionEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.SchemaVersion;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreAddSchemaVersionEvent extends PreEventContext {
-
-  private final SchemaVersion schemaVersion;
-
-  public PreAddSchemaVersionEvent(IHMSHandler handler, SchemaVersion 
schemaVersion) {
-    super(PreEventType.ADD_SCHEMA_VERSION, handler);
-    this.schemaVersion = schemaVersion;
-  }
-
-  public SchemaVersion getSchemaVersion() {
-    return schemaVersion;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java
deleted file mode 100644
index e6ffe8c..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterCatalogEvent.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Catalog;
-
-public class PreAlterCatalogEvent extends PreEventContext {
-
-  private final Catalog oldCat, newCat;
-
-  public PreAlterCatalogEvent(Catalog oldCat, Catalog newCat, IHMSHandler 
handler) {
-    super(PreEventType.ALTER_CATALOG, handler);
-    this.oldCat = oldCat;
-    this.newCat = newCat;
-  }
-
-  public Catalog getOldCatalog() {
-    return oldCat;
-  }
-
-  public Catalog getNewCatalog() {
-    return newCat;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java
deleted file mode 100644
index 6ac1a4e..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterDatabaseEvent.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Database;
-
-public class PreAlterDatabaseEvent extends PreEventContext {
-
-  private final Database oldDB, newDB;
-
-  public PreAlterDatabaseEvent(Database oldDB, Database newDB, IHMSHandler 
handler) {
-    super (PreEventType.ALTER_DATABASE, handler);
-    this.oldDB = oldDB;
-    this.newDB = newDB;
-  }
-
-  /**
-   * @return the old db
-   */
-  public Database getOldDatabase () {
-    return oldDB;
-  }
-
-  /**
-   * @return the new db
-   */
-  public Database getNewDatabase() {
-    return newDB;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java
deleted file mode 100644
index 3df3780..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterISchemaEvent.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.ISchema;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreAlterISchemaEvent extends PreEventContext {
-
-  private final ISchema oldSchema, newSchema;
-
-  public PreAlterISchemaEvent(IHMSHandler handler, ISchema oldSchema, ISchema 
newSchema) {
-    super(PreEventType.ALTER_ISCHEMA, handler);
-    this.oldSchema = oldSchema;
-    this.newSchema = newSchema;
-  }
-
-  public ISchema getOldSchema() {
-    return oldSchema;
-  }
-
-  public ISchema getNewSchema() {
-    return newSchema;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java
deleted file mode 100644
index a269563..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterPartitionEvent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import java.util.List;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Partition;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreAlterPartitionEvent extends PreEventContext {
-
-  private final String dbName;
-  private final String tableName;
-  private final List<String> oldPartVals;
-  private final Partition newPart;
-
-  public PreAlterPartitionEvent(String dbName, String tableName, List<String> 
oldPartVals,
-      Partition newPart, IHMSHandler handler) {
-    super(PreEventType.ALTER_PARTITION, handler);
-    this.dbName = dbName;
-    this.tableName = tableName;
-    this.oldPartVals = oldPartVals;
-    this.newPart = newPart;
-  }
-
-  public String getDbName() {
-    return dbName;
-  }
-
-  public String getTableName() {
-    return tableName;
-  }
-
-  public List<String> getOldPartVals() {
-    return oldPartVals;
-  }
-
-  /**
-   *
-   * @return the new partition
-   */
-  public Partition getNewPartition() {
-    return newPart;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java
deleted file mode 100644
index 63ddb3b..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterSchemaVersionEvent.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.SchemaVersion;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreAlterSchemaVersionEvent extends PreEventContext {
-
-  private final SchemaVersion oldSchemaVersion, newSchemaVersion;
-
-  public PreAlterSchemaVersionEvent(IHMSHandler handler, SchemaVersion 
oldSchemaVersion,
-                                    SchemaVersion newSchemaVersion) {
-    super(PreEventType.ALTER_SCHEMA_VERSION, handler);
-    this.oldSchemaVersion = oldSchemaVersion;
-    this.newSchemaVersion = newSchemaVersion;
-  }
-
-  public SchemaVersion getOldSchemaVersion() {
-    return oldSchemaVersion;
-  }
-
-  public SchemaVersion getNewSchemaVersion() {
-    return newSchemaVersion;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java
deleted file mode 100644
index 31db0e9..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Table;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreAlterTableEvent extends PreEventContext {
-
-  private final Table newTable;
-  private final Table oldTable;
-
-  public PreAlterTableEvent (Table oldTable, Table newTable, IHMSHandler 
handler) {
-    super (PreEventType.ALTER_TABLE, handler);
-    this.oldTable = oldTable;
-    this.newTable = newTable;
-  }
-
-  /**
-   * @return the old table
-   */
-  public Table getOldTable() {
-    return oldTable;
-  }
-
-  /**
-   * @return the new table
-   */
-  public Table getNewTable() {
-    return newTable;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java
deleted file mode 100644
index 1205fc9..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreAuthorizationCallEvent.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreAuthorizationCallEvent extends PreEventContext {
-
-  public PreAuthorizationCallEvent (IHMSHandler handler) {
-    super(PreEventType.AUTHORIZATION_API_CALL, handler);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java
deleted file mode 100644
index 96aa22c..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateCatalogEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Catalog;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreCreateCatalogEvent extends PreEventContext {
-
-  private final Catalog cat;
-
-  public PreCreateCatalogEvent(IHMSHandler handler, Catalog cat) {
-    super(PreEventType.CREATE_CATALOG, handler);
-    this.cat = cat;
-  }
-
-  public Catalog getCatalog() {
-    return cat;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java
deleted file mode 100644
index 86ff1a0..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateDatabaseEvent.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Database;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreCreateDatabaseEvent extends PreEventContext {
-
-  private final Database db;
-
-  public PreCreateDatabaseEvent (Database db, IHMSHandler handler) {
-    super (PreEventType.CREATE_DATABASE, handler);
-    this.db = db;
-  }
-
-  /**
-   * @return the db
-   */
-  public Database getDatabase () {
-    return db;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java
deleted file mode 100644
index d8e9f04..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateISchemaEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.ISchema;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreCreateISchemaEvent extends PreEventContext {
-
-  private final ISchema schema;
-
-  public PreCreateISchemaEvent(IHMSHandler handler, ISchema schema) {
-    super(PreEventType.CREATE_ISCHEMA, handler);
-    this.schema = schema;
-  }
-
-  public ISchema getSchema() {
-    return schema;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java
deleted file mode 100644
index bd3aa3d..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreCreateTableEvent.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Table;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreCreateTableEvent extends PreEventContext {
-
-  private final Table table;
-
-  public PreCreateTableEvent(Table table, IHMSHandler handler) {
-    super(PreEventType.CREATE_TABLE, handler);
-    this.table = table;
-  }
-
-  /**
-   * @return the table
-   */
-  public Table getTable() {
-    return table;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java
deleted file mode 100644
index 0e01ccd..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropCatalogEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Catalog;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreDropCatalogEvent extends PreEventContext {
-
-  private final Catalog cat;
-
-  public PreDropCatalogEvent(IHMSHandler handler, Catalog cat) {
-    super(PreEventType.DROP_CATALOG, handler);
-    this.cat = cat;
-  }
-
-  public Catalog getCatalog() {
-    return cat;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java
deleted file mode 100644
index f5ebbcf..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropDatabaseEvent.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Database;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreDropDatabaseEvent extends PreEventContext {
-
-  private final Database db;
-
-  public PreDropDatabaseEvent(Database db, IHMSHandler handler) {
-    super(PreEventType.DROP_DATABASE, handler);
-    this.db = db;
-  }
-
-  /**
-   * @return the db
-   */
-  public Database getDatabase() {
-    return db;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java
deleted file mode 100644
index 5755374..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropISchemaEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.ISchema;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreDropISchemaEvent extends PreEventContext {
-
-  private final ISchema schema;
-
-  public PreDropISchemaEvent(IHMSHandler handler, ISchema schema) {
-    super(PreEventType.DROP_ISCHEMA, handler);
-    this.schema = schema;
-  }
-
-  public ISchema getSchema() {
-    return schema;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java
deleted file mode 100644
index a0daf31..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Partition;
-import org.apache.hadoop.hive.metastore.api.Table;
-
-import java.util.Collections;
-import java.util.Iterator;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreDropPartitionEvent extends PreEventContext {
-
-  private final Iterable<Partition> partitions;
-  private final Table table;
-  private final boolean deleteData;
-
-  public PreDropPartitionEvent (Table table, Partition partition, boolean 
deleteData,
-                                IHMSHandler handler) {
-    super (PreEventType.DROP_PARTITION, handler);
-    this.partitions = Collections.singletonList(partition);
-    this.table = table;
-    this.deleteData = deleteData;
-  }
-
-  /**
-   * @return the partitions
-   */
-  public Iterator<Partition> getPartitionIterator() {
-    return partitions.iterator();
-  }
-
- /**
-  * @return the table
-  */
-  public Table getTable() {
-    return table;
-  }
-
-  /**
-   * @return the deleteData flag
-   */
-  public boolean getDeleteData() {
-
-    return deleteData;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java
deleted file mode 100644
index 2958bd9..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropSchemaVersionEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.SchemaVersion;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreDropSchemaVersionEvent extends PreEventContext {
-
-  private final SchemaVersion schemaVersion;
-
-  public PreDropSchemaVersionEvent(IHMSHandler handler, SchemaVersion 
schemaVersion) {
-    super(PreEventType.DROP_SCHEMA_VERSION, handler);
-    this.schemaVersion = schemaVersion;
-  }
-
-  public SchemaVersion getSchemaVersion() {
-    return schemaVersion;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java
deleted file mode 100644
index f06fdcd..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Table;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreDropTableEvent extends PreEventContext {
-
-  private final Table table;
-  private final boolean deleteData;
-
-  public PreDropTableEvent(Table table, boolean deleteData, IHMSHandler 
handler) {
-    super(PreEventType.DROP_TABLE, handler);
-    this.table = table;
-    // In HiveMetaStore, the deleteData flag indicates whether DFS data should 
be
-    // removed on a drop.
-    this.deleteData = deleteData;
-  }
-
-  /**
-   * @return the table
-   */
-  public Table getTable() {
-    return table;
-  }
-
-  /**
-   * @return the deleteData flag
-   */
-  public boolean getDeleteData() {
-    return deleteData;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java
deleted file mode 100644
index b93675f..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreEventContext.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-
-/**
- * Base class for all the events which are defined for metastore.
- */
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public abstract class PreEventContext {
-
-  public enum PreEventType {
-    CREATE_TABLE,
-    DROP_TABLE,
-    ALTER_TABLE,
-    ADD_PARTITION,
-    DROP_PARTITION,
-    ALTER_PARTITION,
-    CREATE_DATABASE,
-    DROP_DATABASE,
-    LOAD_PARTITION_DONE,
-    AUTHORIZATION_API_CALL,
-    READ_TABLE,
-    READ_DATABASE,
-    ALTER_DATABASE,
-    CREATE_ISCHEMA,
-    ALTER_ISCHEMA,
-    DROP_ISCHEMA,
-    ADD_SCHEMA_VERSION,
-    ALTER_SCHEMA_VERSION,
-    DROP_SCHEMA_VERSION,
-    READ_ISCHEMA,
-    READ_SCHEMA_VERSION,
-    CREATE_CATALOG,
-    DROP_CATALOG,
-    READ_CATALOG,
-    ALTER_CATALOG
-  }
-
-  private final PreEventType eventType;
-  private final IHMSHandler handler;
-
-  public PreEventContext(PreEventType eventType, IHMSHandler  handler) {
-    this.eventType = eventType;
-    this.handler = handler;
-  }
-
-  /**
-   * @return the event type
-   */
-  public PreEventType getEventType() {
-    return eventType;
-  }
-
-  /**
-   * @return the handler
-   */
-  public IHMSHandler getHandler() {
-    return handler;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java
deleted file mode 100644
index a380301..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreLoadPartitionDoneEvent.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-
-import java.util.Map;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreLoadPartitionDoneEvent extends PreEventContext {
-
-  private final String catName;
-  private final String dbName;
-  private final String tableName;
-  private final Map<String,String> partSpec;
-
-  public PreLoadPartitionDoneEvent(String catName, String dbName, String 
tableName,
-      Map<String, String> partSpec, IHMSHandler handler) {
-    super(PreEventType.LOAD_PARTITION_DONE, handler);
-    this.catName = catName;
-    this.dbName = dbName;
-    this.tableName = tableName;
-    this.partSpec = partSpec;
-  }
-
-  public String getCatName() {
-    return catName;
-  }
-
-  public String getDbName() {
-    return dbName;
-  }
-
-  public String getTableName() {
-    return tableName;
-  }
-
-  /**
-   * @return the partition Name
-   */
-  public Map<String,String> getPartitionName() {
-    return partSpec;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java
deleted file mode 100644
index 3f1afdf..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadCatalogEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Catalog;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreReadCatalogEvent extends PreEventContext {
-
-  private final Catalog cat;
-
-  public PreReadCatalogEvent(IHMSHandler handler, Catalog cat) {
-    super(PreEventType.READ_CATALOG, handler);
-    this.cat = cat;
-  }
-
-  public Catalog getCatalog() {
-    return cat;
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java
deleted file mode 100644
index 88f3855..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadDatabaseEvent.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.Database;
-
-/**
- * Database read event
- */
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreReadDatabaseEvent extends PreEventContext {
-  private final Database db;
-
-  public PreReadDatabaseEvent(Database db, IHMSHandler handler) {
-    super(PreEventType.READ_DATABASE, handler);
-    this.db = db;
-  }
-
-  /**
-   * @return the db
-   */
-  public Database getDatabase() {
-    return db;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/081fa368/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java
----------------------------------------------------------------------
diff --git 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java
 
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java
deleted file mode 100644
index de8ce04..0000000
--- 
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/events/PreReadISchemaEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.hadoop.hive.metastore.events;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.hive.metastore.IHMSHandler;
-import org.apache.hadoop.hive.metastore.api.ISchema;
-
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class PreReadISchemaEvent extends PreEventContext {
-
-  private final ISchema schema;
-
-  public PreReadISchemaEvent(IHMSHandler handler, ISchema schema) {
-    super(PreEventType.READ_ISCHEMA, handler);
-    this.schema = schema;
-  }
-
-  public ISchema getSchema() {
-    return schema;
-  }
-}

Reply via email to