diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/translator/JoinTypeCheckCtx.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/translator/JoinTypeCheckCtx.java index b9bac9f..fdee66b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/translator/JoinTypeCheckCtx.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/translator/JoinTypeCheckCtx.java @@ -54,7 +54,7 @@ public JoinTypeCheckCtx(RowResolver leftRR, RowResolver rightRR, JoinType hiveJoinType) throws SemanticException { super(RowResolver.getCombinedRR(leftRR, rightRR), false, false, false, false, false, false, - false, false, false); + false, false); this.inputRRLst = ImmutableList.of(leftRR, rightRR); this.outerJoin = (hiveJoinType == JoinType.LEFTOUTER) || (hiveJoinType == JoinType.RIGHTOUTER) || (hiveJoinType == JoinType.FULLOUTER); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckCtx.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckCtx.java index 11bd103..3b6178f 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckCtx.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckCtx.java @@ -62,9 +62,6 @@ private final boolean allowWindowing; - // "." : FIELD Expression - private final boolean allowFieldExpr; - // "[]" : LSQUARE/INDEX Expression private final boolean allowIndexExpr; @@ -77,12 +74,12 @@ * The input row resolver of the previous operator. */ public TypeCheckCtx(RowResolver inputRR) { - this(inputRR, false, true, true, true, true, true, true, true, true); + this(inputRR, false, true, true, true, true, true, true, true); } public TypeCheckCtx(RowResolver inputRR, boolean allowStatefulFunctions, boolean allowDistinctFunctions, boolean allowGBExprElimination, boolean allowAllColRef, - boolean allowFunctionStar, boolean allowWindowing, boolean allowFieldExpr, + boolean allowFunctionStar, boolean allowWindowing, boolean allowIndexExpr, boolean allowSubQueryExpr) { setInputRR(inputRR); error = null; @@ -92,7 +89,6 @@ public TypeCheckCtx(RowResolver inputRR, boolean allowStatefulFunctions, this.allowAllColRef = allowAllColRef; this.allowFunctionStar = allowFunctionStar; this.allowWindowing = allowWindowing; - this.allowFieldExpr = allowFieldExpr; this.allowIndexExpr = allowIndexExpr; this.allowSubQueryExpr = allowSubQueryExpr; } @@ -145,7 +141,7 @@ public boolean getAllowStatefulFunctions() { /** * @param error * the error to set - * + * */ public void setError(String error, ASTNode errorSrcNode) { this.error = error; @@ -187,10 +183,6 @@ public boolean getallowWindowing() { return allowWindowing; } - public boolean getallowFieldExpr() { - return allowFieldExpr; - } - public boolean getallowIndexExpr() { return allowIndexExpr; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java index 1e60f7b..84dbbbc 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java @@ -741,8 +741,6 @@ protected ExprNodeDesc getXpathOrFuncExprNodeDesc(ASTNode expr, ExprNodeDesc desc; if (funcText.equals(".")) { // "." : FIELD Expression - if (!ctx.getallowFieldExpr()) - throw new SemanticException(ErrorMsg.INVALID_FUNCTION.getMsg(expr)); assert (children.size() == 2); // Only allow constant field name for now