You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/10/06 20:20:38 UTC

svn commit: r1629725 - in /hive/branches/branch-0.14: common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ql/pom.xml

Author: gunther
Date: Mon Oct  6 18:20:38 2014
New Revision: 1629725

URL: http://svn.apache.org/r1629725
Log:
HIVE-8336: Update pom, now that Optiq is renamed to Calcite (Julian Hyde, reviewed by Gunther Hagleitner)

Modified:
    hive/branches/branch-0.14/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hive/branches/branch-0.14/ql/pom.xml

Modified: hive/branches/branch-0.14/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1629725&r1=1629724&r2=1629725&view=diff
==============================================================================
--- hive/branches/branch-0.14/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/branch-0.14/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Mon Oct  6 18:20:38 2014
@@ -641,7 +641,7 @@ public class HiveConf extends Configurat
         "How many rows in the joining tables (except the streaming table) should be cached in memory."),
 
     // CBO related
-    HIVE_CBO_ENABLED("hive.cbo.enable", false, "Flag to control enabling Cost Based Optimizations using Optiq framework."),
+    HIVE_CBO_ENABLED("hive.cbo.enable", false, "Flag to control enabling Cost Based Optimizations using Calcite framework."),
 
     // hive.mapjoin.bucket.cache.size has been replaced by hive.smbjoin.cache.row,
     // need to remove by hive .13. Also, do not change default (see SMB operator)

Modified: hive/branches/branch-0.14/ql/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/pom.xml?rev=1629725&r1=1629724&r2=1629725&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/pom.xml (original)
+++ hive/branches/branch-0.14/ql/pom.xml Mon Oct  6 18:20:38 2014
@@ -28,7 +28,7 @@
   <name>Hive Query Language</name>
 
   <properties>
-    <optiq.version>0.9.1-incubating-SNAPSHOT</optiq.version>
+    <calcite.version>0.9.1-incubating-SNAPSHOT</calcite.version>
     <hive.path.to.root>..</hive.path.to.root>
   </properties>
 
@@ -183,9 +183,9 @@
       <version>${datanucleus-core.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.optiq</groupId>
-      <artifactId>optiq-core</artifactId>
-      <version>${optiq.version}</version>
+      <groupId>org.apache.calcite</groupId>
+      <artifactId>calcite-core</artifactId>
+      <version>${calcite.version}</version>
       <exclusions>
         <!-- hsqldb interferes with the use of derby as the default db
           in hive's use of datanucleus. 
@@ -201,9 +201,9 @@
       </exclusions>
     </dependency>   
     <dependency>
-      <groupId>org.apache.optiq</groupId>
-      <artifactId>optiq-avatica</artifactId>
-      <version>${optiq.version}</version>
+      <groupId>org.apache.calcite</groupId>
+      <artifactId>calcite-avatica</artifactId>
+      <version>${calcite.version}</version>
       <exclusions>
         <!-- hsqldb interferes with the use of derby as the default db
           in hive's use of datanucleus.