You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by am...@apache.org on 2011/09/05 11:08:20 UTC
svn commit: r1165216 [1/19] - in /hive/branches/branch-0.8: ./ cli/
eclipse-templates/ ivy/ jdbc/ lib/ metastore/
metastore/src/gen/thrift/gen-cpp/
metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/
metastore/src/gen/thrift/gen...
Author: amareshwari
Date: Mon Sep 5 09:08:16 2011
New Revision: 1165216
URL: http://svn.apache.org/viewvc?rev=1165216&view=rev
Log:
HIVE-2376. svn merge -r 1165206:1165207 from trunk
Modified:
hive/branches/branch-0.8/build.xml
hive/branches/branch-0.8/cli/ivy.xml
hive/branches/branch-0.8/eclipse-templates/.classpath
hive/branches/branch-0.8/ivy/libraries.properties
hive/branches/branch-0.8/jdbc/ivy.xml
hive/branches/branch-0.8/lib/README
hive/branches/branch-0.8/lib/thrift-0.5.0.jar
hive/branches/branch-0.8/lib/thrift-fb303-0.5.0.jar
hive/branches/branch-0.8/lib/thrift-fb303.LICENSE
hive/branches/branch-0.8/lib/thrift.LICENSE
hive/branches/branch-0.8/metastore/ivy.xml
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Constants.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/IndexAlreadyExistsException.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidPartitionException.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownPartitionException.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-php/hive_metastore/ThriftHiveMetastore.php
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-php/hive_metastore/hive_metastore_constants.php
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-php/hive_metastore/hive_metastore_types.php
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-py/hive_metastore/constants.py
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
hive/branches/branch-0.8/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
hive/branches/branch-0.8/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
hive/branches/branch-0.8/ql/build.xml
hive/branches/branch-0.8/ql/ivy.xml
hive/branches/branch-0.8/ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp
hive/branches/branch-0.8/ql/src/gen/thrift/gen-cpp/queryplan_constants.h
hive/branches/branch-0.8/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp
hive/branches/branch-0.8/ql/src/gen/thrift/gen-cpp/queryplan_types.h
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Graph.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Task.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.java
hive/branches/branch-0.8/ql/src/gen/thrift/gen-php/queryplan/queryplan_types.php
hive/branches/branch-0.8/ql/src/gen/thrift/gen-py/queryplan/constants.py
hive/branches/branch-0.8/ql/src/gen/thrift/gen-py/queryplan/ttypes.py
hive/branches/branch-0.8/ql/src/gen/thrift/gen-rb/queryplan_constants.rb
hive/branches/branch-0.8/ql/src/gen/thrift/gen-rb/queryplan_types.rb
hive/branches/branch-0.8/serde/ivy.xml
hive/branches/branch-0.8/serde/src/gen/thrift/gen-cpp/serde_constants.cpp
hive/branches/branch-0.8/serde/src/gen/thrift/gen-cpp/serde_constants.h
hive/branches/branch-0.8/serde/src/gen/thrift/gen-cpp/serde_types.cpp
hive/branches/branch-0.8/serde/src/gen/thrift/gen-cpp/serde_types.h
hive/branches/branch-0.8/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/Constants.java
hive/branches/branch-0.8/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.java
hive/branches/branch-0.8/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java
hive/branches/branch-0.8/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
hive/branches/branch-0.8/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java
hive/branches/branch-0.8/serde/src/gen/thrift/gen-php/serde/serde_constants.php
hive/branches/branch-0.8/serde/src/gen/thrift/gen-php/serde/serde_types.php
hive/branches/branch-0.8/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py
hive/branches/branch-0.8/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/ttypes.py
hive/branches/branch-0.8/serde/src/gen/thrift/gen-rb/serde_constants.rb
hive/branches/branch-0.8/serde/src/gen/thrift/gen-rb/serde_types.rb
hive/branches/branch-0.8/service/ivy.xml
hive/branches/branch-0.8/service/src/gen/thrift/gen-cpp/ThriftHive.cpp
hive/branches/branch-0.8/service/src/gen/thrift/gen-cpp/ThriftHive.h
hive/branches/branch-0.8/service/src/gen/thrift/gen-cpp/hive_service_constants.cpp
hive/branches/branch-0.8/service/src/gen/thrift/gen-cpp/hive_service_constants.h
hive/branches/branch-0.8/service/src/gen/thrift/gen-cpp/hive_service_types.cpp
hive/branches/branch-0.8/service/src/gen/thrift/gen-cpp/hive_service_types.h
hive/branches/branch-0.8/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/HiveClusterStatus.java
hive/branches/branch-0.8/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/HiveServerException.java
hive/branches/branch-0.8/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/JobTrackerState.java
hive/branches/branch-0.8/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/ThriftHive.java
hive/branches/branch-0.8/service/src/gen/thrift/gen-php/hive_service/ThriftHive.php
hive/branches/branch-0.8/service/src/gen/thrift/gen-php/hive_service/hive_service_types.php
hive/branches/branch-0.8/service/src/gen/thrift/gen-py/hive_service/ThriftHive-remote
hive/branches/branch-0.8/service/src/gen/thrift/gen-py/hive_service/ThriftHive.py
hive/branches/branch-0.8/service/src/gen/thrift/gen-py/hive_service/constants.py
hive/branches/branch-0.8/service/src/gen/thrift/gen-py/hive_service/ttypes.py
hive/branches/branch-0.8/service/src/gen/thrift/gen-rb/hive_service_constants.rb
hive/branches/branch-0.8/service/src/gen/thrift/gen-rb/hive_service_types.rb
hive/branches/branch-0.8/service/src/gen/thrift/gen-rb/thrift_hive.rb
hive/branches/branch-0.8/service/src/java/org/apache/hadoop/hive/service/HiveServer.java
hive/branches/branch-0.8/shims/ivy.xml
Modified: hive/branches/branch-0.8/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8/build.xml?rev=1165216&r1=1165215&r2=1165216&view=diff
==============================================================================
--- hive/branches/branch-0.8/build.xml (original)
+++ hive/branches/branch-0.8/build.xml Mon Sep 5 09:08:16 2011
@@ -389,8 +389,8 @@
</chmod>
<!-- create symlinks for libthrift.jar, libfb303.jar, etc. for backward compatibility -->
- <symlink overwrite="true" link="${target.lib.dir}/libthrift.jar" resource="thrift-${thrift.version}.jar"/>
- <symlink overwrite="true" link="${target.lib.dir}/libfb303.jar" resource="thrift-fb303-${thrift-fb303.version}.jar"/>
+ <symlink overwrite="true" link="${target.lib.dir}/libthrift.jar" resource="libthrift-${thrift.version}.jar"/>
+ <symlink overwrite="true" link="${target.lib.dir}/libfb303.jar" resource="libfb303-${thrift-fb303.version}.jar"/>
<symlink overwrite="true" link="${target.lib.dir}/hive_contrib.jar" resource="hive-contrib-${version}.jar"/>
</target>
Modified: hive/branches/branch-0.8/cli/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8/cli/ivy.xml?rev=1165216&r1=1165215&r2=1165216&view=diff
==============================================================================
--- hive/branches/branch-0.8/cli/ivy.xml (original)
+++ hive/branches/branch-0.8/cli/ivy.xml Mon Sep 5 09:08:16 2011
@@ -29,5 +29,7 @@
</dependency>
<dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
<dependency org="org.mockito" name="mockito-all" rev="${mockito-all.version}" />
+ <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
+ transitive="false"/>
</dependencies>
</ivy-module>
Modified: hive/branches/branch-0.8/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8/eclipse-templates/.classpath?rev=1165216&r1=1165215&r2=1165216&view=diff
==============================================================================
--- hive/branches/branch-0.8/eclipse-templates/.classpath (original)
+++ hive/branches/branch-0.8/eclipse-templates/.classpath Mon Sep 5 09:08:16 2011
@@ -17,8 +17,8 @@
<classpathentry exported="true" kind="lib" path="lib/derby.jar"/>
<classpathentry exported="true" kind="lib" path="build/dist/lib/hbase-@hbase.version@.jar"/>
<classpathentry exported="true" kind="lib" path="build/dist/lib/hbase-@hbase-test.version@-tests.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/thrift-fb303-@thrift-fb303.version@.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/thrift-@thrift.version@.jar"/>
+ <classpathentry exported="true" kind="lib" path="build/dist/lib/libfb303-@libfb303.version@.jar"/>
+ <classpathentry exported="true" kind="lib" path="build/dist/lib/libthrift-@libthrift.version@.jar"/>
<classpathentry exported="true" kind="lib" path="build/dist/lib/zookeeper-@zookeeper.version@.jar"/>
<classpathentry exported="true" kind="lib" path="lib/log4j-@log4j.version@.jar"/>
<classpathentry exported="true" kind="lib" path="ql/lib/antlr-@antlr.version@.jar"/>
Modified: hive/branches/branch-0.8/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8/ivy/libraries.properties?rev=1165216&r1=1165215&r2=1165216&view=diff
==============================================================================
--- hive/branches/branch-0.8/ivy/libraries.properties (original)
+++ hive/branches/branch-0.8/ivy/libraries.properties Mon Sep 5 09:08:16 2011
@@ -37,17 +37,17 @@ commons-logging-api.version=1.0.4
commons-pool.version=1.5.4
hbase.version=0.89.0-SNAPSHOT
hbase-test.version=0.89.0-SNAPSHOT
+ivy.version=2.1.0
jdo-api.version=2.3-ec
jdom.version=1.1
jline.version=0.9.94
junit.version=3.8.1
-ivy.version=2.1.0
+libfb303.version=0.7.0
+libthrift.version=0.7.0
log4j.version=1.2.15
maven-ant-tasks.version=2.1.0
mockito-all.version=1.8.2
slf4j-api.version=1.6.1
slf4j-log4j12.version=1.6.1
-thrift.version=0.5.0
-thrift-fb303.version=0.5.0
zookeeper.version=3.3.1
guava.version=r06
Modified: hive/branches/branch-0.8/jdbc/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8/jdbc/ivy.xml?rev=1165216&r1=1165215&r2=1165216&view=diff
==============================================================================
--- hive/branches/branch-0.8/jdbc/ivy.xml (original)
+++ hive/branches/branch-0.8/jdbc/ivy.xml Mon Sep 5 09:08:16 2011
@@ -23,4 +23,8 @@
http://wiki.apache.org/hadoop/Hive
</description>
</info>
+ <dependencies>
+ <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
+ transitive="false"/>
+ </dependencies>
</ivy-module>
Modified: hive/branches/branch-0.8/lib/README
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8/lib/README?rev=1165216&r1=1165215&r2=1165216&view=diff
==============================================================================
--- hive/branches/branch-0.8/lib/README (original)
+++ hive/branches/branch-0.8/lib/README Mon Sep 5 09:08:16 2011
@@ -1,8 +1,6 @@
Folowing is the list of external jars contained in this directory and the sources from where they were obtained:
---------------------------------------------------------------------------------------------------------------
-* thrift-0.5.0.jar - http://thrift.apache.org/
-* thrift-fb303-0.5.0.jar - http://thrift.apache.org/
* jpox-core-1.2.2.jar - http://www.jpox.org/docs/download.html
* derby.jar - http://db.apache.org/derby/derby_downloads.html
* asm-3.1.jar - http://forge.objectweb.org/projects/asm/
Modified: hive/branches/branch-0.8/metastore/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8/metastore/ivy.xml?rev=1165216&r1=1165215&r2=1165216&view=diff
==============================================================================
--- hive/branches/branch-0.8/metastore/ivy.xml (original)
+++ hive/branches/branch-0.8/metastore/ivy.xml Mon Sep 5 09:08:16 2011
@@ -72,5 +72,9 @@
</dependency>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"/>
+ <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
+ transitive="false"/>
+ <dependency org="org.apache.thrift" name="libfb303" rev="${libfb303.version}"
+ transitive="false"/>
</dependencies>
</ivy-module>