You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by vi...@apache.org on 2023/05/04 23:49:48 UTC
[hive] branch branch-3 updated: HIVE-27288 : Backport of HIVE-23262 to branch-3 (Aman Raj reviewed by Vihang Karajgaonkar)
This is an automated email from the ASF dual-hosted git repository.
vihangk1 pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-3 by this push:
new 7950336706c HIVE-27288 : Backport of HIVE-23262 to branch-3 (Aman Raj reviewed by Vihang Karajgaonkar)
7950336706c is described below
commit 7950336706cecabda46a7f9881ee90c3dd315304
Author: Aman Raj <10...@users.noreply.github.com>
AuthorDate: Fri May 5 05:19:40 2023 +0530
HIVE-27288 : Backport of HIVE-23262 to branch-3 (Aman Raj reviewed by Vihang Karajgaonkar)
(#4261)
---
hcatalog/conf/jndi.properties | 36 ---
hcatalog/server-extensions/pom.xml | 18 --
.../hcatalog/listener/TestMsgBusConnection.java | 120 ---------
.../listener/TestNotificationListener.java | 270 ---------------------
pom.xml | 17 --
5 files changed, 461 deletions(-)
diff --git a/hcatalog/conf/jndi.properties b/hcatalog/conf/jndi.properties
deleted file mode 100644
index f718111242d..00000000000
--- a/hcatalog/conf/jndi.properties
+++ /dev/null
@@ -1,36 +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.
-
-# If ActiveMQ is used then uncomment following properties, else substitute it accordingly.
-#java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to provide location of MQ broker.
-#java.naming.provider.url = tcp://localhost:61616
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-# queue.MyQueue = example.MyQueue
-
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-# topic.MyTopic = example.MyTopic
-
diff --git a/hcatalog/server-extensions/pom.xml b/hcatalog/server-extensions/pom.xml
index 1fcc5698d8a..afabb3e6bd8 100644
--- a/hcatalog/server-extensions/pom.xml
+++ b/hcatalog/server-extensions/pom.xml
@@ -93,24 +93,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>${activemq.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>kahadb</artifactId>
- <version>${activemq.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.pig</groupId>
<artifactId>pig</artifactId>
diff --git a/hcatalog/server-extensions/src/test/java/org/apache/hive/hcatalog/listener/TestMsgBusConnection.java b/hcatalog/server-extensions/src/test/java/org/apache/hive/hcatalog/listener/TestMsgBusConnection.java
deleted file mode 100644
index 729a5e7f620..00000000000
--- a/hcatalog/server-extensions/src/test/java/org/apache/hive/hcatalog/listener/TestMsgBusConnection.java
+++ /dev/null
@@ -1,120 +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.hive.hcatalog.listener;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.hadoop.hive.cli.CliSessionState;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
-import org.apache.hadoop.hive.ql.DriverFactory;
-import org.apache.hadoop.hive.ql.IDriver;
-import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse;
-import org.apache.hadoop.hive.ql.session.SessionState;
-import org.apache.hive.hcatalog.common.HCatConstants;
-import org.apache.hive.hcatalog.messaging.HCatEventMessage;
-import org.apache.hive.hcatalog.messaging.jms.MessagingUtils;
-import org.junit.Before;
-import org.junit.Test;
-
-public class TestMsgBusConnection {
-
- private IDriver driver;
- private BrokerService broker;
- private MessageConsumer consumer;
- private static final int TIMEOUT = 2000;
-
- @Before
- public void before() throws Exception {
-
- broker = new BrokerService();
- // configure the broker
- broker.addConnector("tcp://localhost:61616?broker.persistent=false");
-
- broker.start();
-
- System.setProperty("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- System.setProperty("java.naming.provider.url", "tcp://localhost:61616");
- connectClient();
- HiveConf hiveConf = new HiveConf(this.getClass());
- hiveConf.set(ConfVars.METASTORE_EVENT_LISTENERS.varname, NotificationListener.class.getName());
- hiveConf.set(HiveConf.ConfVars.PREEXECHOOKS.varname, "");
- hiveConf.set(HiveConf.ConfVars.POSTEXECHOOKS.varname, "");
- hiveConf.set(HiveConf.ConfVars.METASTOREURIS.varname, "");
- hiveConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");
- hiveConf.setVar(HiveConf.ConfVars.HIVE_AUTHORIZATION_MANAGER,
- "org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory");
- hiveConf.set(HCatConstants.HCAT_MSGBUS_TOPIC_PREFIX, "planetlab.hcat");
- SessionState.start(new CliSessionState(hiveConf));
- driver = DriverFactory.newDriver(hiveConf);
- }
-
- private void connectClient() throws JMSException {
- ConnectionFactory connFac = new ActiveMQConnectionFactory("tcp://localhost:61616");
- Connection conn = connFac.createConnection();
- conn.start();
- Session session = conn.createSession(true, Session.SESSION_TRANSACTED);
- Destination hcatTopic = session.createTopic("planetlab.hcat");
- consumer = session.createConsumer(hcatTopic);
- }
-
- @Test
- public void testConnection() throws Exception {
- driver.run("create database testconndb");
- Message msg = consumer.receive(TIMEOUT);
- assertTrue("Expected TextMessage", msg instanceof TextMessage);
- assertEquals(HCatConstants.HCAT_CREATE_DATABASE_EVENT, msg.getStringProperty(HCatConstants.HCAT_EVENT));
- assertEquals("topic://planetlab.hcat", msg.getJMSDestination().toString());
- HCatEventMessage messageObject = MessagingUtils.getMessage(msg);
- assertEquals("testconndb", messageObject.getDB());
- broker.stop();
- runQuery("drop database testconndb cascade");
- broker.start(true);
- connectClient();
- runQuery("create database testconndb");
- msg = consumer.receive(TIMEOUT);
- assertEquals(HCatConstants.HCAT_CREATE_DATABASE_EVENT, msg.getStringProperty(HCatConstants.HCAT_EVENT));
- assertEquals("topic://planetlab.hcat", msg.getJMSDestination().toString());
- assertEquals("testconndb", messageObject.getDB());
- driver.run("drop database testconndb cascade");
- msg = consumer.receive(TIMEOUT);
- assertEquals(HCatConstants.HCAT_DROP_DATABASE_EVENT, msg.getStringProperty(HCatConstants.HCAT_EVENT));
- assertEquals("topic://planetlab.hcat", msg.getJMSDestination().toString());
- assertEquals("testconndb", messageObject.getDB());
- }
-
- private void runQuery(String query) throws Exception {
- CommandProcessorResponse cpr = driver.run(query);
- assertFalse(cpr.getMessage(), cpr.failed());
- }
-}
diff --git a/hcatalog/server-extensions/src/test/java/org/apache/hive/hcatalog/listener/TestNotificationListener.java b/hcatalog/server-extensions/src/test/java/org/apache/hive/hcatalog/listener/TestNotificationListener.java
deleted file mode 100644
index 117a2d9916e..00000000000
--- a/hcatalog/server-extensions/src/test/java/org/apache/hive/hcatalog/listener/TestNotificationListener.java
+++ /dev/null
@@ -1,270 +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.hive.hcatalog.listener;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.TextMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.hadoop.hive.cli.CliSessionState;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
-import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
-import org.apache.hadoop.hive.metastore.TableType;
-import org.apache.hadoop.hive.metastore.api.PartitionEventType;
-import org.apache.hadoop.hive.ql.DriverFactory;
-import org.apache.hadoop.hive.ql.session.SessionState;
-import org.apache.hive.hcatalog.common.HCatConstants;
-import org.apache.hive.hcatalog.mapreduce.HCatBaseTest;
-import org.apache.hive.hcatalog.messaging.AddPartitionMessage;
-import org.apache.hive.hcatalog.messaging.AlterPartitionMessage;
-import org.apache.hive.hcatalog.messaging.AlterTableMessage;
-import org.apache.hive.hcatalog.messaging.CreateDatabaseMessage;
-import org.apache.hive.hcatalog.messaging.CreateTableMessage;
-import org.apache.hive.hcatalog.messaging.DropDatabaseMessage;
-import org.apache.hive.hcatalog.messaging.DropPartitionMessage;
-import org.apache.hive.hcatalog.messaging.DropTableMessage;
-import org.apache.hive.hcatalog.messaging.HCatEventMessage;
-import org.apache.hive.hcatalog.messaging.MessageDeserializer;
-import org.apache.hive.hcatalog.messaging.MessageFactory;
-import org.apache.hive.hcatalog.messaging.jms.MessagingUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class TestNotificationListener extends HCatBaseTest implements MessageListener {
-
- private List<String> actualMessages = new Vector<String>();
- private static final int MSG_RECEIVED_TIMEOUT = 30;
- private static final List<String> expectedMessages = Arrays.asList(
- HCatConstants.HCAT_CREATE_DATABASE_EVENT,
- HCatConstants.HCAT_CREATE_TABLE_EVENT,
- HCatConstants.HCAT_ADD_PARTITION_EVENT,
- HCatConstants.HCAT_ALTER_PARTITION_EVENT,
- HCatConstants.HCAT_DROP_PARTITION_EVENT,
- HCatConstants.HCAT_ALTER_TABLE_EVENT,
- HCatConstants.HCAT_DROP_TABLE_EVENT,
- HCatConstants.HCAT_DROP_DATABASE_EVENT);
- private static final CountDownLatch messageReceivedSignal =
- new CountDownLatch(expectedMessages.size());
-
- @Before
- public void setUp() throws Exception {
- System.setProperty("java.naming.factory.initial",
- "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- System.setProperty("java.naming.provider.url",
- "vm://localhost?broker.persistent=false");
- ConnectionFactory connFac = new ActiveMQConnectionFactory(
- "vm://localhost?broker.persistent=false");
- Connection conn = connFac.createConnection();
- conn.start();
- // We want message to be sent when session commits, thus we run in
- // transacted mode.
- Session session = conn.createSession(true, Session.SESSION_TRANSACTED);
- Destination hcatTopic = session
- .createTopic(HCatConstants.HCAT_DEFAULT_TOPIC_PREFIX);
- MessageConsumer consumer1 = session.createConsumer(hcatTopic);
- consumer1.setMessageListener(this);
- Destination tblTopic = session
- .createTopic(HCatConstants.HCAT_DEFAULT_TOPIC_PREFIX + ".mydb.mytbl");
- MessageConsumer consumer2 = session.createConsumer(tblTopic);
- consumer2.setMessageListener(this);
- Destination dbTopic = session
- .createTopic(HCatConstants.HCAT_DEFAULT_TOPIC_PREFIX + ".mydb");
- MessageConsumer consumer3 = session.createConsumer(dbTopic);
- consumer3.setMessageListener(this);
-
- setUpHiveConf();
- hiveConf.set(ConfVars.METASTORE_EVENT_LISTENERS.varname,
- NotificationListener.class.getName());
- hiveConf
- .setVar(HiveConf.ConfVars.HIVE_AUTHORIZATION_MANAGER,
- "org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory");
- SessionState.start(new CliSessionState(hiveConf));
- driver = DriverFactory.newDriver(hiveConf);
- client = new HiveMetaStoreClient(hiveConf);
- }
-
- @After
- public void tearDown() throws Exception {
- Assert.assertEquals(expectedMessages, actualMessages);
- }
-
- @Test
- public void testAMQListener() throws Exception {
- driver.run("create database mydb");
- driver.run("use mydb");
- driver.run("create table mytbl (a string) partitioned by (b string)");
- driver.run("alter table mytbl add partition(b='2011')");
- Map<String, String> kvs = new HashMap<String, String>(1);
- kvs.put("b", "2011");
- client.markPartitionForEvent("mydb", "mytbl", kvs,
- PartitionEventType.LOAD_DONE);
- driver.run("alter table mytbl partition (b='2011') set fileformat orc");
- driver.run("alter table mytbl drop partition(b='2011')");
- driver.run("alter table mytbl add columns (c int comment 'this is an int', d decimal(3,2))");
- driver.run("drop table mytbl");
- driver.run("drop database mydb");
-
- // Wait until either all messages are processed or a maximum time limit is reached.
- messageReceivedSignal.await(MSG_RECEIVED_TIMEOUT, TimeUnit.SECONDS);
- }
-
- @Override
- public void onMessage(Message msg) {
- String event;
- try {
- event = msg.getStringProperty(HCatConstants.HCAT_EVENT);
- String format = msg.getStringProperty(HCatConstants.HCAT_MESSAGE_FORMAT);
- String version = msg.getStringProperty(HCatConstants.HCAT_MESSAGE_VERSION);
- String messageBody = ((TextMessage)msg).getText();
- actualMessages.add(event);
- MessageDeserializer deserializer = MessageFactory.getDeserializer(format, version);
-
- if (event.equals(HCatConstants.HCAT_CREATE_DATABASE_EVENT)) {
-
- Assert.assertEquals("topic://" + HCatConstants.HCAT_DEFAULT_TOPIC_PREFIX, msg
- .getJMSDestination().toString());
- CreateDatabaseMessage message = deserializer.getCreateDatabaseMessage(messageBody);
- Assert.assertEquals("mydb", message.getDB());
- HCatEventMessage message2 = MessagingUtils.getMessage(msg);
- Assert.assertTrue("Unexpected message-type.", message2 instanceof CreateDatabaseMessage);
- Assert.assertEquals("mydb", message2.getDB());
- } else if (event.equals(HCatConstants.HCAT_CREATE_TABLE_EVENT)) {
-
- Assert.assertEquals("topic://hcat.mydb", msg.getJMSDestination().toString());
- CreateTableMessage message = deserializer.getCreateTableMessage(messageBody);
- Assert.assertEquals("mytbl", message.getTable());
- Assert.assertEquals("mydb", message.getDB());
- Assert.assertEquals(TableType.MANAGED_TABLE.toString(), message.getTableType());
- HCatEventMessage message2 = MessagingUtils.getMessage(msg);
- Assert.assertTrue("Unexpected message-type.", message2 instanceof CreateTableMessage);
- Assert.assertEquals("mydb", message2.getDB());
- Assert.assertEquals("mytbl", ((CreateTableMessage) message2).getTable());
- } else if (event.equals(HCatConstants.HCAT_ADD_PARTITION_EVENT)) {
-
- Assert.assertEquals("topic://hcat.mydb.mytbl", msg.getJMSDestination()
- .toString());
- AddPartitionMessage message = deserializer.getAddPartitionMessage(messageBody);
- Assert.assertEquals("mytbl", message.getTable());
- Assert.assertEquals("mydb", message.getDB());
- Assert.assertEquals(1, message.getPartitions().size());
- Assert.assertEquals("2011", message.getPartitions().get(0).get("b"));
- Assert.assertEquals(TableType.MANAGED_TABLE.toString(), message.getTableType());
- HCatEventMessage message2 = MessagingUtils.getMessage(msg);
- Assert.assertTrue("Unexpected message-type.", message2 instanceof AddPartitionMessage);
- Assert.assertEquals("mydb", message2.getDB());
- Assert.assertEquals("mytbl", ((AddPartitionMessage) message2).getTable());
- Assert.assertEquals(1, ((AddPartitionMessage) message2).getPartitions().size());
- Assert.assertEquals("2011", ((AddPartitionMessage) message2).getPartitions().get(0).get("b"));
- } else if (event.equals(HCatConstants.HCAT_ALTER_PARTITION_EVENT)) {
- Assert.assertEquals("topic://hcat.mydb.mytbl", msg.getJMSDestination().toString());
- // for alter partition events
- AlterPartitionMessage message = deserializer.getAlterPartitionMessage(messageBody);
- Assert.assertEquals("mytbl", message.getTable());
- Assert.assertEquals("mydb", message.getDB());
- Assert.assertEquals(1, message.getKeyValues().size());
- Assert.assertTrue(message.getKeyValues().values().contains("2011"));
- Assert.assertEquals(TableType.MANAGED_TABLE.toString(), message.getTableType());
- HCatEventMessage message2 = MessagingUtils.getMessage(msg);
- Assert.assertTrue("Unexpected message-type.", message2 instanceof AlterPartitionMessage);
- Assert.assertEquals("mydb", message2.getDB());
- Assert.assertEquals("mytbl", ((AlterPartitionMessage) message2).getTable());
- Assert.assertEquals(1, ((AlterPartitionMessage) message2).getKeyValues().size());
- Assert.assertTrue(((AlterPartitionMessage) message2).getKeyValues().values().contains("2011"));
- } else if (event.equals(HCatConstants.HCAT_DROP_PARTITION_EVENT)) {
-
- Assert.assertEquals("topic://hcat.mydb.mytbl", msg.getJMSDestination()
- .toString());
- DropPartitionMessage message = deserializer.getDropPartitionMessage(messageBody);
- Assert.assertEquals("mytbl", message.getTable());
- Assert.assertEquals("mydb", message.getDB());
- Assert.assertEquals(1, message.getPartitions().size());
- Assert.assertEquals("2011", message.getPartitions().get(0).get("b"));
- Assert.assertEquals(TableType.MANAGED_TABLE.toString(), message.getTableType());
- HCatEventMessage message2 = MessagingUtils.getMessage(msg);
- Assert.assertTrue("Unexpected message-type.", message2 instanceof DropPartitionMessage);
- Assert.assertEquals("mydb", message2.getDB());
- Assert.assertEquals("mytbl", ((DropPartitionMessage) message2).getTable());
- Assert.assertEquals(1, ((DropPartitionMessage) message2).getPartitions().size());
- Assert.assertEquals("2011", ((DropPartitionMessage) message2).getPartitions().get(0).get(
- "b"));
- } else if (event.equals(HCatConstants.HCAT_DROP_TABLE_EVENT)) {
-
- Assert.assertEquals("topic://hcat.mydb", msg.getJMSDestination().toString());
- DropTableMessage message = deserializer.getDropTableMessage(messageBody);
- Assert.assertEquals("mytbl", message.getTable());
- Assert.assertEquals("mydb", message.getDB());
- Assert.assertEquals(TableType.MANAGED_TABLE.toString(), message.getTableType());
- HCatEventMessage message2 = MessagingUtils.getMessage(msg);
- Assert.assertTrue("Unexpected message-type.", message2 instanceof DropTableMessage);
- Assert.assertEquals("mydb", message2.getDB());
- Assert.assertEquals("mytbl", ((DropTableMessage) message2).getTable());
- } else if (event.equals(HCatConstants.HCAT_DROP_DATABASE_EVENT)) {
-
- Assert.assertEquals("topic://" + HCatConstants.HCAT_DEFAULT_TOPIC_PREFIX, msg
- .getJMSDestination().toString());
- DropDatabaseMessage message = deserializer.getDropDatabaseMessage(messageBody);
- Assert.assertEquals("mydb", message.getDB());
- HCatEventMessage message2 = MessagingUtils.getMessage(msg);
- Assert.assertTrue("Unexpected message-type.", message2 instanceof DropDatabaseMessage);
- Assert.assertEquals("mydb", message2.getDB());
- } else if (event.equals(HCatConstants.HCAT_ALTER_TABLE_EVENT)) {
- Assert.assertEquals("topic://hcat.mydb", msg.getJMSDestination().toString());
- AlterTableMessage message = deserializer.getAlterTableMessage(messageBody);
- Assert.assertEquals("mytbl", message.getTable());
- Assert.assertEquals("mydb", message.getDB());
- Assert.assertEquals(TableType.MANAGED_TABLE.toString(), message.getTableType());
- HCatEventMessage message2 = MessagingUtils.getMessage(msg);
- Assert.assertTrue("Unexpected message-type.", message2 instanceof AlterTableMessage);
- Assert.assertEquals("mydb", message2.getDB());
- Assert.assertEquals("mytbl", ((AlterTableMessage) message2).getTable());
- } else if (event.equals(HCatConstants.HCAT_PARTITION_DONE_EVENT)) {
- // TODO: Fill in when PARTITION_DONE_EVENT is supported.
- Assert.assertTrue("Unexpected: HCAT_PARTITION_DONE_EVENT not supported (yet).", false);
- } else {
- Assert.assertTrue("Unexpected event-type: " + event, false);
- }
-
- } catch (JMSException e) {
- e.printStackTrace(System.err);
- assert false;
- }
- finally {
- messageReceivedSignal.countDown();
- }
- }
-}
diff --git a/pom.xml b/pom.xml
index 4a75d4c6448..399205c76f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,6 @@
<!-- Library Dependency Versions -->
<accumulo.version>1.7.3</accumulo.version>
- <activemq.version>5.5.0</activemq.version>
<ant.version>1.9.1</ant.version>
<antlr.version>3.5.2</antlr.version>
<apache-directory-server.version>1.5.7</apache-directory-server.version>
@@ -425,22 +424,6 @@
<artifactId>accumulo-trace</artifactId>
<version>${accumulo.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>${activemq.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>kahadb</artifactId>
- <version>${activemq.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>