You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2014/12/17 03:07:46 UTC
svn commit: r1646135 - in
/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator:
ASTBuilder.java RexNodeConverter.java
Author: navis
Date: Wed Dec 17 02:07:46 2014
New Revision: 1646135
URL: http://svn.apache.org/r1646135
Log:
HIVE-9129 : Migrate to newer Calcite snapshot, where ByteString is now in org.apache.calcite.avatica.util (Julian Hyde via Navis, reviwed by Ashutosh Chauhan)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/ASTBuilder.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/RexNodeConverter.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/ASTBuilder.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/ASTBuilder.java?rev=1646135&r1=1646134&r2=1646135&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/ASTBuilder.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/ASTBuilder.java Wed Dec 17 02:07:46 2014
@@ -21,7 +21,6 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
-import org.apache.calcite.avatica.ByteString;
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.calcite.rel.core.TableScan;
import org.apache.calcite.rex.RexLiteral;
@@ -145,8 +144,7 @@ class ASTBuilder {
switch (sqlType) {
case BINARY:
- ByteString bs = (ByteString) literal.getValue();
- val = bs.byteAt(0);
+ val = literal.byteValue();
type = HiveParser.BigintLiteral;
break;
case TINYINT:
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/RexNodeConverter.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/RexNodeConverter.java?rev=1646135&r1=1646134&r2=1646135&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/RexNodeConverter.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/RexNodeConverter.java Wed Dec 17 02:07:46 2014
@@ -29,7 +29,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.apache.calcite.avatica.ByteString;
import org.apache.calcite.plan.RelOptCluster;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.type.RelDataType;