diff --git pom.xml pom.xml
index 6e6d60f..2e41196 100644
--- pom.xml
+++ pom.xml
@@ -371,11 +371,6 @@
${httpcomponents.core.version}
- org.apache.mina
- mina-core
- ${mina.version}
-
-
org.apache.velocity
velocity
${velocity.version}
diff --git ql/pom.xml ql/pom.xml
index 2ccf6e4..e0ecc02 100644
--- ql/pom.xml
+++ ql/pom.xml
@@ -205,12 +205,6 @@
test
- org.apache.mina
- mina-core
- ${mina.version}
- test
-
-
org.mockito
mockito-all
${mockito-all.version}
diff --git ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java
index 63080ba..57b4177 100644
--- ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java
+++ ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java
@@ -25,12 +25,13 @@
import java.io.ByteArrayInputStream;
import java.io.UnsupportedEncodingException;
import java.util.List;
+import java.util.Set;
+import com.google.common.collect.Sets;
import org.apache.hadoop.hive.ql.io.sarg.SearchArgument.TruthValue;
import org.apache.hadoop.hive.ql.io.sarg.SearchArgumentImpl.ExpressionBuilder;
import org.apache.hadoop.hive.ql.io.sarg.SearchArgumentImpl.ExpressionTree;
import org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc;
-import org.apache.mina.util.IdentityHashSet;
import org.junit.Test;
/**
@@ -207,11 +208,11 @@ public void testCNF() throws Exception {
assertNoSharedNodes(ExpressionBuilder.convertToCNF(or(and(leaf(0), leaf(1), leaf(2)),
and(leaf(3), leaf(4), leaf(5)),
and(leaf(6), leaf(7)),
- leaf(8))), new IdentityHashSet());
+ leaf(8))), Sets.newIdentityHashSet());
}
private static void assertNoSharedNodes(ExpressionTree tree,
- IdentityHashSet seen
+ Set seen
) throws Exception {
if (seen.contains(tree) &&
tree.getOperator() != ExpressionTree.Operator.LEAF) {
@@ -776,7 +777,7 @@ public void testExpression1() throws Exception {
" (not leaf-4) leaf-5 leaf-6 leaf-8))",
sarg.getExpression().toString());
assertNoSharedNodes(sarg.getExpression(),
- new IdentityHashSet());
+ Sets.newIdentityHashSet());
}
@Test
@@ -1012,7 +1013,7 @@ public void testExpression2() throws Exception {
assertEquals("(or leaf-0 (not leaf-1) (not leaf-2) leaf-3)",
sarg.getExpression().toString());
assertNoSharedNodes(sarg.getExpression(),
- new IdentityHashSet());
+ Sets.newIdentityHashSet());
assertEquals(TruthValue.NO,
sarg.evaluate(values(TruthValue.NO, TruthValue.YES, TruthValue.YES,
TruthValue.NO)));
@@ -1426,7 +1427,7 @@ public void testExpression3() throws Exception {
assertEquals("(and leaf-0 leaf-1 leaf-2)",
sarg.getExpression().toString());
assertNoSharedNodes(sarg.getExpression(),
- new IdentityHashSet());
+ Sets.newIdentityHashSet());
}
@Test
@@ -1636,7 +1637,7 @@ id in (34,50) */
assertEquals("(and (not leaf-0) leaf-1 leaf-2)",
sarg.getExpression().toString());
assertNoSharedNodes(sarg.getExpression(),
- new IdentityHashSet());
+ Sets.newIdentityHashSet());
assertEquals(TruthValue.YES,
sarg.evaluate(values(TruthValue.NO, TruthValue.YES, TruthValue.YES)));
assertEquals(TruthValue.NULL,
@@ -1878,7 +1879,7 @@ public void testExpression5() throws Exception {
assertEquals("leaf-0",
sarg.getExpression().toString());
assertNoSharedNodes(sarg.getExpression(),
- new IdentityHashSet());
+ Sets.newIdentityHashSet());
}
@Test
@@ -2740,7 +2741,7 @@ public void testExpression10() throws Exception {
assertEquals("(and (not leaf-0) (not leaf-0))",
sarg.getExpression().toString());
assertNoSharedNodes(sarg.getExpression(),
- new IdentityHashSet());
+ Sets.newIdentityHashSet());
assertEquals(TruthValue.NO, sarg.evaluate(values(TruthValue.YES)));
assertEquals(TruthValue.YES, sarg.evaluate(values(TruthValue.NO)));
assertEquals(TruthValue.NULL, sarg.evaluate(values(TruthValue.NULL)));