Author: brock
Date: Fri Sep 27 15:08:02 2013
New Revision: 1526941
URL: http://svn.apache.org/r1526941
Log:
HIVE-5379 - NoClassDefFoundError is thrown when using lead/lag with kryo
serialization (Reviewed By Ashutosh, Contributed by Navis)
Added:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/LeadLagInfo.java
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/WindowingExprNodeEvaluatorFactory.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDeserializer.java
Added: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/LeadLagInfo.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/LeadLagInfo.java?rev=1526941&view=auto
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/LeadLagInfo.java
(added)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/LeadLagInfo.java Fri
Sep 27 15:08:02 2013
@@ -0,0 +1,71 @@
+/**
+ * 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.ql.parse;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
+import org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc;
+
+/**
+ * Lead Lag functionality
+ */
+public class LeadLagInfo {
+
+ /**
+ * list of LL invocations in a Query.
+ */
+ List<ExprNodeGenericFuncDesc> leadLagExprs;
+
+ /**
+ * map from the Select Expr Node to the LL Function invocations in it.
+ */
+ Map<ExprNodeDesc, List<ExprNodeGenericFuncDesc>> mapTopExprToLLFunExprs;
+
+ private void addLeadLagExpr(ExprNodeGenericFuncDesc llFunc) {
+ leadLagExprs = leadLagExprs == null ? new
ArrayList<ExprNodeGenericFuncDesc>() : leadLagExprs;
+ leadLagExprs.add(llFunc);
+ }
+
+ public List<ExprNodeGenericFuncDesc> getLeadLagExprs() {
+ return leadLagExprs;
+ }
+
+ public void addLLFuncExprForTopExpr(ExprNodeDesc topExpr,
ExprNodeGenericFuncDesc llFuncExpr) {
+ addLeadLagExpr(llFuncExpr);
+ mapTopExprToLLFunExprs = mapTopExprToLLFunExprs == null ?
+ new HashMap<ExprNodeDesc, List<ExprNodeGenericFuncDesc>>() :
mapTopExprToLLFunExprs;
+ List<ExprNodeGenericFuncDesc> funcList =
mapTopExprToLLFunExprs.get(topExpr);
+ if (funcList == null) {
+ funcList = new ArrayList<ExprNodeGenericFuncDesc>();
+ mapTopExprToLLFunExprs.put(topExpr, funcList);
+ }
+ funcList.add(llFuncExpr);
+ }
+
+ public List<ExprNodeGenericFuncDesc> getLLFuncExprsInTopExpr(ExprNodeDesc
topExpr) {
+ if (mapTopExprToLLFunExprs == null) {
+ return null;
+ }
+ return mapTopExprToLLFunExprs.get(topExpr);
+ }
+}
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java?rev=1526941&r1=1526940&r2=1526941&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java
Fri Sep 27 15:08:02 2013
@@ -1097,49 +1097,6 @@ public class PTFTranslator {
return componentInvocations;
}
-
- /*
- * Lead Lag functionality
- */
- public static class LeadLagInfo {
- /*
- * list of LL invocations in a Query.
- */
- List<ExprNodeGenericFuncDesc> leadLagExprs;
- /*
- * map from the Select Expr Node to the LL Function invocations in it.
- */
- Map<ExprNodeDesc, List<ExprNodeGenericFuncDesc>> mapTopExprToLLFunExprs;
-
- private void addLeadLagExpr(ExprNodeGenericFuncDesc llFunc) {
- leadLagExprs = leadLagExprs == null ? new
ArrayList<ExprNodeGenericFuncDesc>() : leadLagExprs;
- leadLagExprs.add(llFunc);
- }
-
- public List<ExprNodeGenericFuncDesc> getLeadLagExprs() {
- return leadLagExprs;
- }
-
- public void addLLFuncExprForTopExpr(ExprNodeDesc topExpr,
ExprNodeGenericFuncDesc llFuncExpr) {
- addLeadLagExpr(llFuncExpr);
- mapTopExprToLLFunExprs = mapTopExprToLLFunExprs == null ?
- new HashMap<ExprNodeDesc, List<ExprNodeGenericFuncDesc>>() :
mapTopExprToLLFunExprs;
- List<ExprNodeGenericFuncDesc> funcList =
mapTopExprToLLFunExprs.get(topExpr);
- if (funcList == null) {
- funcList = new ArrayList<ExprNodeGenericFuncDesc>();
- mapTopExprToLLFunExprs.put(topExpr, funcList);
- }
- funcList.add(llFuncExpr);
- }
-
- public List<ExprNodeGenericFuncDesc> getLLFuncExprsInTopExpr(ExprNodeDesc
topExpr) {
- if (mapTopExprToLLFunExprs == null) {
- return null;
- }
- return mapTopExprToLLFunExprs.get(topExpr);
- }
- }
-
public static void validateNoLeadLagInValueBoundarySpec(ASTNode node)
throws SemanticException {
String errMsg = "Lead/Lag not allowed in ValueBoundary Spec";
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/WindowingExprNodeEvaluatorFactory.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/WindowingExprNodeEvaluatorFactory.java?rev=1526941&r1=1526940&r2=1526941&view=diff
==============================================================================
---
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/WindowingExprNodeEvaluatorFactory.java
(original)
+++
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/WindowingExprNodeEvaluatorFactory.java
Fri Sep 27 15:08:02 2013
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.hadoop.hive.ql.exec.ExprNodeEvaluator;
import org.apache.hadoop.hive.ql.exec.ExprNodeEvaluatorFactory;
import org.apache.hadoop.hive.ql.metadata.HiveException;
-import org.apache.hadoop.hive.ql.parse.PTFTranslator.LeadLagInfo;
import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc;
import org.apache.hadoop.hive.ql.udf.generic.GenericUDF;
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDesc.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDesc.java?rev=1526941&r1=1526940&r2=1526941&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDesc.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDesc.java Fri Sep
27 15:08:02 2013
@@ -26,9 +26,9 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.exec.ExprNodeEvaluator;
import org.apache.hadoop.hive.ql.exec.PTFUtils;
+import org.apache.hadoop.hive.ql.parse.LeadLagInfo;
import org.apache.hadoop.hive.ql.parse.PTFInvocationSpec.Order;
import org.apache.hadoop.hive.ql.parse.PTFInvocationSpec.PTFQueryInputType;
-import org.apache.hadoop.hive.ql.parse.PTFTranslator.LeadLagInfo;
import org.apache.hadoop.hive.ql.parse.RowResolver;
import org.apache.hadoop.hive.ql.parse.TypeCheckCtx;
import org.apache.hadoop.hive.ql.parse.WindowingSpec.Direction;
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDeserializer.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDeserializer.java?rev=1526941&r1=1526940&r2=1526941&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDeserializer.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDeserializer.java
Fri Sep 27 15:08:02 2013
@@ -29,7 +29,7 @@ import org.apache.hadoop.hive.conf.HiveC
import org.apache.hadoop.hive.ql.exec.ExprNodeEvaluator;
import org.apache.hadoop.hive.ql.exec.PTFPartition;
import org.apache.hadoop.hive.ql.metadata.HiveException;
-import org.apache.hadoop.hive.ql.parse.PTFTranslator.LeadLagInfo;
+import org.apache.hadoop.hive.ql.parse.LeadLagInfo;
import org.apache.hadoop.hive.ql.parse.WindowingExprNodeEvaluatorFactory;
import org.apache.hadoop.hive.ql.plan.PTFDesc.BoundaryDef;
import org.apache.hadoop.hive.ql.plan.PTFDesc.PTFExpressionDef;
