This is an automated email from the ASF dual-hosted git repository. jcamacho pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push: new 0b09d01 HIVE-23453: IntelliJ compile errors in StaticPermanentFunctionChecker and TestVectorGroupByOperator (Stamatis Zampetakis, reviewed by Gopal V) 0b09d01 is described below commit 0b09d0104dde7734965e5825f2a5d06987f906ae Author: Stamatis Zampetakis <zabe...@gmail.com> AuthorDate: Wed May 27 21:16:21 2020 -0700 HIVE-23453: IntelliJ compile errors in StaticPermanentFunctionChecker and TestVectorGroupByOperator (Stamatis Zampetakis, reviewed by Gopal V) Close apache/hive#1037 --- .../impl/StaticPermanentFunctionChecker.java | 15 ++---- .../ql/exec/vector/TestVectorGroupByOperator.java | 55 +++++++++++----------- 2 files changed, 32 insertions(+), 38 deletions(-) diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/StaticPermanentFunctionChecker.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/StaticPermanentFunctionChecker.java index 1d2565f..b62ee29 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/StaticPermanentFunctionChecker.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/StaticPermanentFunctionChecker.java @@ -13,22 +13,17 @@ */ package org.apache.hadoop.hive.llap.daemon.impl; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.URL; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.Set; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.ql.exec.FunctionRegistry; import org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge.UdfWhitelistChecker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.jdi.InvocationException; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.IdentityHashMap; public class StaticPermanentFunctionChecker implements UdfWhitelistChecker { private static final Logger LOG = LoggerFactory.getLogger(StaticPermanentFunctionChecker.class); diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorGroupByOperator.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorGroupByOperator.java index 12df385..3835987 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorGroupByOperator.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorGroupByOperator.java @@ -36,6 +36,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.calcite.util.Pair; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.llap.LlapDaemonInfo; @@ -87,8 +88,6 @@ import org.apache.hadoop.io.Text; import org.junit.Assert; import org.junit.Test; -import com.sun.tools.javac.util.Pair; - /** * Unit test for the vectorized GROUP BY operator. */ @@ -241,8 +240,8 @@ public class TestVectorGroupByOperator { Pair<GroupByDesc,VectorGroupByDesc> pair = buildGroupByDescType(ctx, aggregate, GenericUDAFEvaluator.Mode.PARTIAL1, column, dataTypeInfo); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; vectorDesc.setProcessingMode(ProcessingMode.HASH); ArrayList<ExprNodeDesc> keyExprs = new ArrayList<ExprNodeDesc>(keys.length); @@ -273,8 +272,8 @@ public class TestVectorGroupByOperator { "Value", TypeInfoFactory.longTypeInfo, new String[] {"Key"}, new TypeInfo[] {TypeInfoFactory.longTypeInfo}); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; // Set the memory treshold so that we get 100Kb before we need to flush. MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean(); @@ -364,8 +363,8 @@ public class TestVectorGroupByOperator { "Value", TypeInfoFactory.longTypeInfo, new String[] {"Key"}, new TypeInfo[] {TypeInfoFactory.longTypeInfo}); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; LlapProxy.setDaemon(true); @@ -459,8 +458,8 @@ public class TestVectorGroupByOperator { "v", TypeInfoFactory.longTypeInfo, new String[] { "k1", "k2" }, new TypeInfo[] {TypeInfoFactory.longTypeInfo, TypeInfoFactory.longTypeInfo}); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; desc.setGroupingSetsPresent(true); ArrayList<Long> groupingSets = new ArrayList<>(); @@ -620,8 +619,8 @@ public class TestVectorGroupByOperator { "Value", TypeInfoFactory.longTypeInfo, new String[] {"Key"}, new TypeInfo[] {TypeInfoFactory.longTypeInfo}); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; // Set the memory treshold so that we get 100Kb before we need to flush. MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean(); @@ -2724,8 +2723,8 @@ public class TestVectorGroupByOperator { VectorizationContext ctx = new VectorizationContext("name", mapColumnNames); Pair<GroupByDesc,VectorGroupByDesc> pair = buildGroupByDescCountStar (ctx); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; vectorDesc.setProcessingMode(ProcessingMode.HASH); CompilationOpContext cCtx = new CompilationOpContext(); @@ -2761,8 +2760,8 @@ public class TestVectorGroupByOperator { VectorizationContext ctx = new VectorizationContext("name", mapColumnNames); Pair<GroupByDesc,VectorGroupByDesc> pair = buildGroupByDescType(ctx, "count", GenericUDAFEvaluator.Mode.FINAL, "A", TypeInfoFactory.longTypeInfo); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; vectorDesc.setProcessingMode(ProcessingMode.GLOBAL); // Use GLOBAL when no key for Reduce. CompilationOpContext cCtx = new CompilationOpContext(); @@ -2799,8 +2798,8 @@ public class TestVectorGroupByOperator { Pair<GroupByDesc,VectorGroupByDesc> pair = buildGroupByDescType(ctx, aggregateName, GenericUDAFEvaluator.Mode.PARTIAL1, "A", TypeInfoFactory.stringTypeInfo); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; CompilationOpContext cCtx = new CompilationOpContext(); @@ -2837,8 +2836,8 @@ public class TestVectorGroupByOperator { Pair<GroupByDesc,VectorGroupByDesc> pair = buildGroupByDescType(ctx, aggregateName, GenericUDAFEvaluator.Mode.PARTIAL1, "A", TypeInfoFactory.getDecimalTypeInfo(30, 4)); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; CompilationOpContext cCtx = new CompilationOpContext(); @@ -2876,8 +2875,8 @@ public class TestVectorGroupByOperator { Pair<GroupByDesc,VectorGroupByDesc> pair = buildGroupByDescType (ctx, aggregateName, GenericUDAFEvaluator.Mode.PARTIAL1, "A", TypeInfoFactory.doubleTypeInfo); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; CompilationOpContext cCtx = new CompilationOpContext(); @@ -2913,8 +2912,8 @@ public class TestVectorGroupByOperator { VectorizationContext ctx = new VectorizationContext("name", mapColumnNames); Pair<GroupByDesc,VectorGroupByDesc> pair = buildGroupByDescType(ctx, aggregateName, GenericUDAFEvaluator.Mode.PARTIAL1, "A", TypeInfoFactory.longTypeInfo); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; CompilationOpContext cCtx = new CompilationOpContext(); @@ -2956,8 +2955,8 @@ public class TestVectorGroupByOperator { TypeInfoFactory.longTypeInfo, new String[] {"Key"}, new TypeInfo[] {TypeInfoFactory.longTypeInfo}); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; CompilationOpContext cCtx = new CompilationOpContext(); @@ -3030,8 +3029,8 @@ public class TestVectorGroupByOperator { dataTypeInfo, new String[] {"Key"}, new TypeInfo[] {TypeInfoFactory.stringTypeInfo}); - GroupByDesc desc = pair.fst; - VectorGroupByDesc vectorDesc = pair.snd; + GroupByDesc desc = pair.left; + VectorGroupByDesc vectorDesc = pair.right; CompilationOpContext cCtx = new CompilationOpContext();