You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2012/11/08 10:44:29 UTC
svn commit: r1406984 [1/29] - in /hive/trunk:
contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/
contrib/src/java/org/apache/hadoop/hive/contrib/serde2/
contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/
contrib/src/test/...
Author: hashutosh
Date: Thu Nov 8 09:44:19 2012
New Revision: 1406984
URL: http://svn.apache.org/viewvc?rev=1406984&view=rev
Log:
HIVE-2715: Upgrade Thrift dependency to 0.9.0 (Ashutosh Chauhan)
Added:
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java
hive/trunk/metastore/src/gen/thrift/gen-php/metastore/
hive/trunk/metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php
hive/trunk/metastore/src/gen/thrift/gen-php/metastore/Types.php
hive/trunk/metastore/src/gen/thrift/gen-py/__init__.py
hive/trunk/ql/src/gen/thrift/gen-php/Types.php
hive/trunk/ql/src/gen/thrift/gen-py/__init__.py
hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java
hive/trunk/serde/src/gen/thrift/gen-php/org/
hive/trunk/serde/src/gen/thrift/gen-php/org/apache/
hive/trunk/serde/src/gen/thrift/gen-php/org/apache/hadoop/
hive/trunk/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/
hive/trunk/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/
hive/trunk/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Types.php
hive/trunk/serde/src/gen/thrift/gen-py/__init__.py
hive/trunk/service/src/gen/thrift/gen-php/ThriftHive.php
hive/trunk/service/src/gen/thrift/gen-php/Types.php
hive/trunk/service/src/gen/thrift/gen-py/__init__.py
Removed:
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Constants.java
hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/Constants.java
Modified:
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/RegexSerDe.java
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordReader.java
hive/trunk/contrib/src/test/org/apache/hadoop/hive/contrib/serde2/TestRegexSerDe.java
hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java
hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java
hive/trunk/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java
hive/trunk/ivy/libraries.properties
hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveQueryResultSet.java
hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveResultSetMetaData.java
hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp
hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.cpp
hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_constants.h
hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BinaryColumnStatsData.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BooleanColumnStatsData.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsData.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/IndexAlreadyExistsException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidInputException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidPartitionException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownPartitionException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java
hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/constants.py
hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb
hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
hive/trunk/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaTool.java
hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp
hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_constants.h
hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp
hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.h
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Graph.java
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.java
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Task.java
hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.java
hive/trunk/ql/src/gen/thrift/gen-py/queryplan/constants.py
hive/trunk/ql/src/gen/thrift/gen-py/queryplan/ttypes.py
hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_constants.rb
hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_types.rb
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinUtil.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ListSinkOperator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/HiveIgnoreKeyTextOutputFormat.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/MapJoinProcessor.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeConstantDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFArrayContains.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcatWS.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIf.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPrintf.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSize.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSortArray.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFWhen.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFJSONTuple.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFParseUrlTuple.java
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/TestExpressionEvaluator.java
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestRCFile.java
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHiveMetaStoreChecker.java
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEvaluateNPE.java
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTestTranslate.java
hive/trunk/ql/src/test/results/clientpositive/convert_enum_to_string.q.out
hive/trunk/serde/build.xml
hive/trunk/serde/src/gen/thrift/gen-cpp/serde_constants.cpp
hive/trunk/serde/src/gen/thrift/gen-cpp/serde_constants.h
hive/trunk/serde/src/gen/thrift/gen-cpp/serde_types.cpp
hive/trunk/serde/src/gen/thrift/gen-cpp/serde_types.h
hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.java
hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java
hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java
hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java
hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MiniStruct.java
hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MyEnum.java
hive/trunk/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py
hive/trunk/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/ttypes.py
hive/trunk/serde/src/gen/thrift/gen-rb/serde_constants.rb
hive/trunk/serde/src/gen/thrift/gen-rb/serde_types.rb
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeList.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyListObjectInspector.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardListObjectInspector.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardMapObjectInspector.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TCTLSeparatedProtocol.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/ThriftDeserializer.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/ListTypeInfo.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/MapTypeInfo.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/StructTypeInfo.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/UnionTypeInfo.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestStatsSerde.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestTCTLSeparatedProtocol.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/TestBinarySortableSerDe.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/dynamic_type/TestDynamicSerDe.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazySimpleSerDe.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/TestLazyBinarySerDe.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestCrossMapEqualComparer.java
hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestSimpleMapEqualComparer.java
hive/trunk/service/src/gen/thrift/gen-cpp/ThriftHive.cpp
hive/trunk/service/src/gen/thrift/gen-cpp/ThriftHive.h
hive/trunk/service/src/gen/thrift/gen-cpp/ThriftHive_server.skeleton.cpp
hive/trunk/service/src/gen/thrift/gen-cpp/hive_service_constants.cpp
hive/trunk/service/src/gen/thrift/gen-cpp/hive_service_constants.h
hive/trunk/service/src/gen/thrift/gen-cpp/hive_service_types.cpp
hive/trunk/service/src/gen/thrift/gen-cpp/hive_service_types.h
hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/HiveClusterStatus.java
hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/HiveServerException.java
hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/JobTrackerState.java
hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/ThriftHive.java
hive/trunk/service/src/gen/thrift/gen-py/hive_service/ThriftHive-remote
hive/trunk/service/src/gen/thrift/gen-py/hive_service/ThriftHive.py
hive/trunk/service/src/gen/thrift/gen-py/hive_service/constants.py
hive/trunk/service/src/gen/thrift/gen-py/hive_service/ttypes.py
hive/trunk/service/src/gen/thrift/gen-rb/hive_service_constants.rb
hive/trunk/service/src/gen/thrift/gen-rb/hive_service_types.rb
hive/trunk/service/src/gen/thrift/gen-rb/thrift_hive.rb
hive/trunk/service/src/test/org/apache/hadoop/hive/service/TestHiveServer.java
Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/GenericUDFDBOutput.java Thu Nov 8 09:44:19 2012
@@ -30,7 +30,7 @@ import org.apache.hadoop.hive.ql.metadat
import org.apache.hadoop.hive.ql.udf.UDFType;
import org.apache.hadoop.hive.ql.udf.generic.GenericUDF;
import org.apache.hadoop.hive.ql.udf.generic.GenericUDFUtils;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
@@ -94,7 +94,7 @@ public class GenericUDFDBOutput extends
if (!(poi.getPrimitiveCategory() == PrimitiveObjectInspector.PrimitiveCategory.STRING)) {
throw new UDFArgumentTypeException(i,
"The argument of function should be \""
- + Constants.STRING_TYPE_NAME + "\", but \""
+ + serdeConstants.STRING_TYPE_NAME + "\", but \""
+ arguments[i].getTypeName() + "\" is found");
}
}
Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/RegexSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/RegexSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/RegexSerDe.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/RegexSerDe.java Thu Nov 8 09:44:19 2012
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDe;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.SerDeStats;
@@ -92,8 +92,8 @@ public class RegexSerDe implements SerDe
// Read the configuration parameters
inputRegex = tbl.getProperty("input.regex");
outputFormatString = tbl.getProperty("output.format.string");
- String columnNameProperty = tbl.getProperty(Constants.LIST_COLUMNS);
- String columnTypeProperty = tbl.getProperty(Constants.LIST_COLUMN_TYPES);
+ String columnNameProperty = tbl.getProperty(serdeConstants.LIST_COLUMNS);
+ String columnTypeProperty = tbl.getProperty(serdeConstants.LIST_COLUMN_TYPES);
boolean inputRegexIgnoreCase = "true".equalsIgnoreCase(tbl
.getProperty("input.regex.case.insensitive"));
Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/TypedBytesSerDe.java Thu Nov 8 09:44:19 2012
@@ -31,7 +31,7 @@ import org.apache.hadoop.hive.contrib.ut
import org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesWritableOutput;
import org.apache.hadoop.hive.ql.io.NonSyncDataInputBuffer;
import org.apache.hadoop.hive.ql.io.NonSyncDataOutputBuffer;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDe;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.SerDeStats;
@@ -105,8 +105,8 @@ public class TypedBytesSerDe implements
tbIn = new TypedBytesWritableInput(inBarrStr);
// Read the configuration parameters
- String columnNameProperty = tbl.getProperty(Constants.LIST_COLUMNS);
- String columnTypeProperty = tbl.getProperty(Constants.LIST_COLUMN_TYPES);
+ String columnNameProperty = tbl.getProperty(serdeConstants.LIST_COLUMNS);
+ String columnTypeProperty = tbl.getProperty(serdeConstants.LIST_COLUMN_TYPES);
columnNames = Arrays.asList(columnNameProperty.split(","));
columnTypes = null;
Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordReader.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordReader.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordReader.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/TypedBytesRecordReader.java Thu Nov 8 09:44:19 2012
@@ -31,7 +31,7 @@ import java.util.Properties;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.ql.exec.RecordReader;
import org.apache.hadoop.hive.ql.io.NonSyncDataOutputBuffer;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.io.ByteWritable;
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
@@ -71,21 +71,21 @@ public class TypedBytesRecordReader impl
private static Map<Type, String> typedBytesToTypeName = new HashMap<Type, String>();
static {
- typedBytesToTypeName.put(getType(1), Constants.TINYINT_TYPE_NAME);
- typedBytesToTypeName.put(getType(2), Constants.BOOLEAN_TYPE_NAME);
- typedBytesToTypeName.put(getType(3), Constants.INT_TYPE_NAME);
- typedBytesToTypeName.put(getType(4), Constants.BIGINT_TYPE_NAME);
- typedBytesToTypeName.put(getType(5), Constants.FLOAT_TYPE_NAME);
- typedBytesToTypeName.put(getType(6), Constants.DOUBLE_TYPE_NAME);
- typedBytesToTypeName.put(getType(7), Constants.STRING_TYPE_NAME);
- typedBytesToTypeName.put(getType(11), Constants.SMALLINT_TYPE_NAME);
+ typedBytesToTypeName.put(getType(1), serdeConstants.TINYINT_TYPE_NAME);
+ typedBytesToTypeName.put(getType(2), serdeConstants.BOOLEAN_TYPE_NAME);
+ typedBytesToTypeName.put(getType(3), serdeConstants.INT_TYPE_NAME);
+ typedBytesToTypeName.put(getType(4), serdeConstants.BIGINT_TYPE_NAME);
+ typedBytesToTypeName.put(getType(5), serdeConstants.FLOAT_TYPE_NAME);
+ typedBytesToTypeName.put(getType(6), serdeConstants.DOUBLE_TYPE_NAME);
+ typedBytesToTypeName.put(getType(7), serdeConstants.STRING_TYPE_NAME);
+ typedBytesToTypeName.put(getType(11), serdeConstants.SMALLINT_TYPE_NAME);
}
public void initialize(InputStream in, Configuration conf, Properties tbl) throws IOException {
din = new DataInputStream(in);
tbIn = new TypedBytesWritableInput(din);
tbOut = new TypedBytesWritableOutput(barrStr);
- String columnTypeProperty = tbl.getProperty(Constants.LIST_COLUMN_TYPES);
+ String columnTypeProperty = tbl.getProperty(serdeConstants.LIST_COLUMN_TYPES);
columnTypes = Arrays.asList(columnTypeProperty.split(","));
for (String columnType : columnTypes) {
PrimitiveTypeEntry dstTypeEntry = PrimitiveObjectInspectorUtils
@@ -205,21 +205,21 @@ public class TypedBytesRecordReader impl
Writable w = (Writable) converters.get(pos).convert(inpw);
- if (typ.equalsIgnoreCase(Constants.BOOLEAN_TYPE_NAME)) {
+ if (typ.equalsIgnoreCase(serdeConstants.BOOLEAN_TYPE_NAME)) {
tbOut.writeBoolean((BooleanWritable) w);
- } else if (typ.equalsIgnoreCase(Constants.TINYINT_TYPE_NAME)) {
+ } else if (typ.equalsIgnoreCase(serdeConstants.TINYINT_TYPE_NAME)) {
tbOut.writeByte((ByteWritable) w);
- } else if (typ.equalsIgnoreCase(Constants.SMALLINT_TYPE_NAME)) {
+ } else if (typ.equalsIgnoreCase(serdeConstants.SMALLINT_TYPE_NAME)) {
tbOut.writeShort((ShortWritable) w);
- } else if (typ.equalsIgnoreCase(Constants.INT_TYPE_NAME)) {
+ } else if (typ.equalsIgnoreCase(serdeConstants.INT_TYPE_NAME)) {
tbOut.writeInt((IntWritable) w);
- } else if (typ.equalsIgnoreCase(Constants.BIGINT_TYPE_NAME)) {
+ } else if (typ.equalsIgnoreCase(serdeConstants.BIGINT_TYPE_NAME)) {
tbOut.writeLong((LongWritable) w);
- } else if (typ.equalsIgnoreCase(Constants.FLOAT_TYPE_NAME)) {
+ } else if (typ.equalsIgnoreCase(serdeConstants.FLOAT_TYPE_NAME)) {
tbOut.writeFloat((FloatWritable) w);
- } else if (typ.equalsIgnoreCase(Constants.DOUBLE_TYPE_NAME)) {
+ } else if (typ.equalsIgnoreCase(serdeConstants.DOUBLE_TYPE_NAME)) {
tbOut.writeDouble((DoubleWritable) w);
- } else if (typ.equalsIgnoreCase(Constants.STRING_TYPE_NAME)) {
+ } else if (typ.equalsIgnoreCase(serdeConstants.STRING_TYPE_NAME)) {
tbOut.writeText((Text) w);
} else {
assert false;
Modified: hive/trunk/contrib/src/test/org/apache/hadoop/hive/contrib/serde2/TestRegexSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/test/org/apache/hadoop/hive/contrib/serde2/TestRegexSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/contrib/src/test/org/apache/hadoop/hive/contrib/serde2/TestRegexSerDe.java (original)
+++ hive/trunk/contrib/src/test/org/apache/hadoop/hive/contrib/serde2/TestRegexSerDe.java Thu Nov 8 09:44:19 2012
@@ -22,7 +22,7 @@ import java.util.Properties;
import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDe;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils;
@@ -38,8 +38,8 @@ public class TestRegexSerDe extends Test
private SerDe createSerDe(String fieldNames, String fieldTypes,
String inputRegex, String outputFormatString) throws Throwable {
Properties schema = new Properties();
- schema.setProperty(Constants.LIST_COLUMNS, fieldNames);
- schema.setProperty(Constants.LIST_COLUMN_TYPES, fieldTypes);
+ schema.setProperty(serdeConstants.LIST_COLUMNS, fieldNames);
+ schema.setProperty(serdeConstants.LIST_COLUMN_TYPES, fieldTypes);
schema.setProperty("input.regex", inputRegex);
schema.setProperty("output.format.string", outputFormatString);
Modified: hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java (original)
+++ hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java Thu Nov 8 09:44:19 2012
@@ -30,7 +30,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.ByteStream;
import org.apache.hadoop.hive.serde2.SerDe;
import org.apache.hadoop.hive.serde2.SerDeException;
@@ -271,7 +271,7 @@ public class HBaseSerDe implements SerDe
// use the table default storage specification
if (colType.getCategory() == Category.PRIMITIVE) {
- if (!colType.getTypeName().equals(Constants.STRING_TYPE_NAME)) {
+ if (!colType.getTypeName().equals(serdeConstants.STRING_TYPE_NAME)) {
colMap.binaryStorage.add(tableBinaryStorage);
} else {
colMap.binaryStorage.add(false);
@@ -281,14 +281,14 @@ public class HBaseSerDe implements SerDe
TypeInfo valueTypeInfo = ((MapTypeInfo) colType).getMapValueTypeInfo();
if (keyTypeInfo.getCategory() == Category.PRIMITIVE &&
- !keyTypeInfo.getTypeName().equals(Constants.STRING_TYPE_NAME)) {
+ !keyTypeInfo.getTypeName().equals(serdeConstants.STRING_TYPE_NAME)) {
colMap.binaryStorage.add(tableBinaryStorage);
} else {
colMap.binaryStorage.add(false);
}
if (valueTypeInfo.getCategory() == Category.PRIMITIVE &&
- !valueTypeInfo.getTypeName().equals(Constants.STRING_TYPE_NAME)) {
+ !valueTypeInfo.getTypeName().equals(serdeConstants.STRING_TYPE_NAME)) {
colMap.binaryStorage.add(tableBinaryStorage);
} else {
colMap.binaryStorage.add(false);
@@ -311,7 +311,7 @@ public class HBaseSerDe implements SerDe
}
if (colType.getCategory() == Category.PRIMITIVE &&
- !colType.getTypeName().equals(Constants.STRING_TYPE_NAME)) {
+ !colType.getTypeName().equals(serdeConstants.STRING_TYPE_NAME)) {
if ("-".equals(storageOption)) {
colMap.binaryStorage.add(tableBinaryStorage);
@@ -349,7 +349,7 @@ public class HBaseSerDe implements SerDe
TypeInfo valueTypeInfo = ((MapTypeInfo) colType).getMapValueTypeInfo();
if (keyTypeInfo.getCategory() == Category.PRIMITIVE &&
- !keyTypeInfo.getTypeName().equals(Constants.STRING_TYPE_NAME)) {
+ !keyTypeInfo.getTypeName().equals(serdeConstants.STRING_TYPE_NAME)) {
if (keyStorage.equals("-")) {
colMap.binaryStorage.add(tableBinaryStorage);
@@ -363,7 +363,7 @@ public class HBaseSerDe implements SerDe
}
if (valueTypeInfo.getCategory() == Category.PRIMITIVE &&
- !valueTypeInfo.getTypeName().equals(Constants.STRING_TYPE_NAME)) {
+ !valueTypeInfo.getTypeName().equals(serdeConstants.STRING_TYPE_NAME)) {
if (valStorage.equals("-")) {
colMap.binaryStorage.add(tableBinaryStorage);
} else if ("binary".startsWith(valStorage)) {
@@ -416,7 +416,7 @@ public class HBaseSerDe implements SerDe
// Read configuration parameters
hbaseColumnsMapping = tbl.getProperty(HBaseSerDe.HBASE_COLUMNS_MAPPING);
- String columnTypeProperty = tbl.getProperty(Constants.LIST_COLUMN_TYPES);
+ String columnTypeProperty = tbl.getProperty(serdeConstants.LIST_COLUMN_TYPES);
putTimestamp = Long.valueOf(tbl.getProperty(HBaseSerDe.HBASE_PUT_TIMESTAMP,"-1"));
// Parse and initialize the HBase columns mapping
@@ -435,17 +435,17 @@ public class HBaseSerDe implements SerDe
if (colMap.hbaseRowKey) {
// the row key column becomes a STRING
- sb.append(Constants.STRING_TYPE_NAME);
+ sb.append(serdeConstants.STRING_TYPE_NAME);
} else if (colMap.qualifierName == null) {
// a column family become a MAP
- sb.append(Constants.MAP_TYPE_NAME + "<" + Constants.STRING_TYPE_NAME + ","
- + Constants.STRING_TYPE_NAME + ">");
+ sb.append(serdeConstants.MAP_TYPE_NAME + "<" + serdeConstants.STRING_TYPE_NAME + ","
+ + serdeConstants.STRING_TYPE_NAME + ">");
} else {
// an individual column becomes a STRING
- sb.append(Constants.STRING_TYPE_NAME);
+ sb.append(serdeConstants.STRING_TYPE_NAME);
}
}
- tbl.setProperty(Constants.LIST_COLUMN_TYPES, sb.toString());
+ tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES, sb.toString());
}
serdeParams = LazySimpleSerDe.initSerdeParams(job, tbl, serdeName);
Modified: hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java (original)
+++ hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java Thu Nov 8 09:44:19 2012
@@ -38,7 +38,7 @@ import org.apache.hadoop.hbase.util.Byte
import org.apache.hadoop.hive.hbase.HBaseSerDe.ColumnMapping;
import org.apache.hadoop.hive.metastore.HiveMetaHook;
import org.apache.hadoop.hive.metastore.MetaStoreUtils;
-import org.apache.hadoop.hive.metastore.api.Constants;
+import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants;
import org.apache.hadoop.hive.metastore.api.MetaException;
import org.apache.hadoop.hive.metastore.api.Table;
import org.apache.hadoop.hive.ql.index.IndexPredicateAnalyzer;
@@ -284,7 +284,7 @@ public class HBaseStorageHandler extends
tableProperties.getProperty(HBaseSerDe.HBASE_TABLE_NAME);
if (tableName == null) {
tableName =
- tableProperties.getProperty(Constants.META_TABLE_NAME);
+ tableProperties.getProperty(hive_metastoreConstants.META_TABLE_NAME);
if (tableName.startsWith(DEFAULT_PREFIX)) {
tableName = tableName.substring(DEFAULT_PREFIX.length());
}
@@ -299,13 +299,13 @@ public class HBaseStorageHandler extends
ExprNodeDesc predicate)
{
String columnNameProperty = jobConf.get(
- org.apache.hadoop.hive.serde.Constants.LIST_COLUMNS);
+ org.apache.hadoop.hive.serde.serdeConstants.LIST_COLUMNS);
List<String> columnNames =
Arrays.asList(columnNameProperty.split(","));
HBaseSerDe hbaseSerde = (HBaseSerDe) deserializer;
int keyColPos = hbaseSerde.getKeyColumnOffset();
- String keyColType = jobConf.get(org.apache.hadoop.hive.serde.Constants.LIST_COLUMN_TYPES).
+ String keyColType = jobConf.get(org.apache.hadoop.hive.serde.serdeConstants.LIST_COLUMN_TYPES).
split(",")[keyColPos];
IndexPredicateAnalyzer analyzer =
HiveHBaseTableInputFormat.newIndexPredicateAnalyzer(columnNames.get(keyColPos), keyColType,
Modified: hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java (original)
+++ hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java Thu Nov 8 09:44:19 2012
@@ -44,7 +44,7 @@ import org.apache.hadoop.hive.ql.index.I
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
import org.apache.hadoop.hive.ql.plan.TableScanDesc;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.ByteStream;
import org.apache.hadoop.hive.serde2.ColumnProjectionUtils;
import org.apache.hadoop.hive.serde2.SerDeException;
@@ -257,8 +257,8 @@ public class HiveHBaseTableInputFormat e
ExprNodeDesc filterExpr =
Utilities.deserializeExpression(filterExprSerialized, jobConf);
- String colName = jobConf.get(Constants.LIST_COLUMNS).split(",")[iKey];
- String colType = jobConf.get(Constants.LIST_COLUMN_TYPES).split(",")[iKey];
+ String colName = jobConf.get(serdeConstants.LIST_COLUMNS).split(",")[iKey];
+ String colType = jobConf.get(serdeConstants.LIST_COLUMN_TYPES).split(",")[iKey];
IndexPredicateAnalyzer analyzer = newIndexPredicateAnalyzer(colName,colType, isKeyBinary);
List<IndexSearchCondition> searchConditions =
Modified: hive/trunk/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java (original)
+++ hive/trunk/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java Thu Nov 8 09:44:19 2012
@@ -30,7 +30,7 @@ import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.io.ByteWritable;
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
@@ -234,7 +234,7 @@ public class TestHBaseSerDe extends Test
Properties tbl = new Properties();
// Set the configuration parameters
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
tbl.setProperty("columns", "key,abyte,ashort,aint,along,afloat,adouble,astring,abool");
tbl.setProperty("columns.types",
"string,tinyint:smallint:int:bigint:float:double:string:boolean");
@@ -249,7 +249,7 @@ public class TestHBaseSerDe extends Test
Properties tbl = new Properties();
// Set the configuration parameters
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
tbl.setProperty("columns", "key,abyte,ashort,aint,along,afloat,adouble,astring,abool");
tbl.setProperty("columns.types",
"string,tinyint:smallint:int:bigint:float:double:string:boolean");
@@ -264,7 +264,7 @@ public class TestHBaseSerDe extends Test
Properties tbl = new Properties();
// Set the configuration parameters
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
tbl.setProperty("columns", "key,abyte,ashort,aint,along,afloat,adouble,astring,abool");
tbl.setProperty("columns.types",
"string,tinyint:smallint:int:bigint:float:double:string:boolean");
@@ -281,7 +281,7 @@ public class TestHBaseSerDe extends Test
Properties tbl = new Properties();
// Set the configuration parameters
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
tbl.setProperty("columns", "key,abyte,ashort,aint,along,afloat,adouble,astring,abool");
tbl.setProperty("columns.types",
"string,tinyint:smallint:int:bigint:float:double:string:boolean");
@@ -375,7 +375,7 @@ public class TestHBaseSerDe extends Test
Properties tbl = new Properties();
// Set the configuration parameters
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
tbl.setProperty("columns", "key,abyte,ashort,aint,along,afloat,adouble,astring,abool");
tbl.setProperty("columns.types",
"string,tinyint:smallint:int:bigint:float:double:string:boolean");
@@ -390,7 +390,7 @@ public class TestHBaseSerDe extends Test
Properties tbl = new Properties();
// Set the configuration parameters
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
tbl.setProperty("columns", "key,abyte,ashort,aint,along,afloat,adouble,astring,abool");
tbl.setProperty("columns.types",
"string,tinyint:smallint:int:bigint:float:double:string:boolean");
@@ -405,7 +405,7 @@ public class TestHBaseSerDe extends Test
Properties tbl = new Properties();
// Set the configuration parameters
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
tbl.setProperty("columns", "key,abyte,ashort,aint,along,afloat,adouble,astring,abool");
tbl.setProperty("columns.types",
"string,tinyint:smallint:int:bigint:float:double:string:boolean");
@@ -542,10 +542,10 @@ public class TestHBaseSerDe extends Test
private Properties createPropertiesForHiveMapHBaseColumnFamily() {
Properties tbl = new Properties();
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
- tbl.setProperty(Constants.LIST_COLUMNS,
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.LIST_COLUMNS,
"key,valint,valbyte,valshort,vallong,valfloat,valdouble,valbool");
- tbl.setProperty(Constants.LIST_COLUMN_TYPES,
+ tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES,
"string:map<int,int>:map<tinyint,tinyint>:map<smallint,smallint>:map<bigint,bigint>:"
+ "map<float,float>:map<double,double>:map<boolean,boolean>");
tbl.setProperty(HBaseSerDe.HBASE_COLUMNS_MAPPING,
@@ -556,10 +556,10 @@ public class TestHBaseSerDe extends Test
private Properties createPropertiesForHiveMapHBaseColumnFamilyII() {
Properties tbl = new Properties();
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
- tbl.setProperty(Constants.LIST_COLUMNS,
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.LIST_COLUMNS,
"key,valint,valbyte,valshort,vallong,valfloat,valdouble,valbool");
- tbl.setProperty(Constants.LIST_COLUMN_TYPES,
+ tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES,
"string:map<int,int>:map<tinyint,tinyint>:map<smallint,smallint>:map<bigint,bigint>:"
+ "map<float,float>:map<double,double>:map<boolean,boolean>");
tbl.setProperty(HBaseSerDe.HBASE_COLUMNS_MAPPING,
@@ -627,10 +627,10 @@ public class TestHBaseSerDe extends Test
private Properties createPropertiesForHiveMapHBaseColumnFamilyII_I() {
Properties tbl = new Properties();
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
- tbl.setProperty(Constants.LIST_COLUMNS,
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.LIST_COLUMNS,
"key,valbyte,valshort,valint,vallong,valfloat,valdouble,valstring,valbool");
- tbl.setProperty(Constants.LIST_COLUMN_TYPES,
+ tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES,
"string:map<tinyint,tinyint>:map<smallint,smallint>:map<int,int>:map<bigint,bigint>:"
+ "map<float,float>:map<double,double>:map<string,string>:map<boolean,boolean>");
tbl.setProperty(HBaseSerDe.HBASE_COLUMNS_MAPPING,
@@ -641,10 +641,10 @@ public class TestHBaseSerDe extends Test
private Properties createPropertiesForHiveMapHBaseColumnFamilyII_II() {
Properties tbl = new Properties();
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
- tbl.setProperty(Constants.LIST_COLUMNS,
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.LIST_COLUMNS,
"key,valbyte,valshort,valint,vallong,valfloat,valdouble,valstring,valbool");
- tbl.setProperty(Constants.LIST_COLUMN_TYPES,
+ tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES,
"string:map<tinyint,tinyint>:map<smallint,smallint>:map<int,int>:map<bigint,bigint>:"
+ "map<float,float>:map<double,double>:map<string,string>:map<boolean,boolean>");
tbl.setProperty(HBaseSerDe.HBASE_COLUMNS_MAPPING,
Modified: hive/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/trunk/ivy/libraries.properties?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/ivy/libraries.properties (original)
+++ hive/trunk/ivy/libraries.properties Thu Nov 8 09:44:19 2012
@@ -54,8 +54,8 @@ sqlline.version=1_0_2
sqlline.branch=1.0.2
json.version=20090211
junit.version=4.10
-libfb303.version=0.7.0
-libthrift.version=0.7.0
+libfb303.version=0.9.0
+libthrift.version=0.9.0
log4j.version=1.2.16
maven-ant-tasks.version=2.1.0
mockito-all.version=1.8.2
Modified: hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveQueryResultSet.java
URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveQueryResultSet.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveQueryResultSet.java (original)
+++ hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveQueryResultSet.java Thu Nov 8 09:44:19 2012
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.metastore.api.Schema;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDe;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
@@ -102,11 +102,11 @@ public class HiveQueryResultSet extends
Properties props = new Properties();
if (names.length() > 0) {
LOG.debug("Column names: " + names);
- props.setProperty(Constants.LIST_COLUMNS, names);
+ props.setProperty(serdeConstants.LIST_COLUMNS, names);
}
if (types.length() > 0) {
LOG.debug("Column types: " + types);
- props.setProperty(Constants.LIST_COLUMN_TYPES, types);
+ props.setProperty(serdeConstants.LIST_COLUMN_TYPES, types);
}
serde.initialize(new Configuration(), props);
Modified: hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveResultSetMetaData.java
URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveResultSetMetaData.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveResultSetMetaData.java (original)
+++ hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveResultSetMetaData.java Thu Nov 8 09:44:19 2012
@@ -22,7 +22,7 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.List;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
/**
* HiveResultSetMetaData.
@@ -95,29 +95,29 @@ public class HiveResultSetMetaData imple
// TODO: this would be better handled in an enum
String type = columnTypes.get(column - 1);
if ("string".equalsIgnoreCase(type)) {
- return Constants.STRING_TYPE_NAME;
+ return serdeConstants.STRING_TYPE_NAME;
} else if ("float".equalsIgnoreCase(type)) {
- return Constants.FLOAT_TYPE_NAME;
+ return serdeConstants.FLOAT_TYPE_NAME;
} else if ("double".equalsIgnoreCase(type)) {
- return Constants.DOUBLE_TYPE_NAME;
+ return serdeConstants.DOUBLE_TYPE_NAME;
} else if ("boolean".equalsIgnoreCase(type)) {
- return Constants.BOOLEAN_TYPE_NAME;
+ return serdeConstants.BOOLEAN_TYPE_NAME;
} else if ("tinyint".equalsIgnoreCase(type)) {
- return Constants.TINYINT_TYPE_NAME;
+ return serdeConstants.TINYINT_TYPE_NAME;
} else if ("smallint".equalsIgnoreCase(type)) {
- return Constants.SMALLINT_TYPE_NAME;
+ return serdeConstants.SMALLINT_TYPE_NAME;
} else if ("int".equalsIgnoreCase(type)) {
- return Constants.INT_TYPE_NAME;
+ return serdeConstants.INT_TYPE_NAME;
} else if ("bigint".equalsIgnoreCase(type)) {
- return Constants.BIGINT_TYPE_NAME;
+ return serdeConstants.BIGINT_TYPE_NAME;
} else if ("timestamp".equalsIgnoreCase(type)) {
- return Constants.TIMESTAMP_TYPE_NAME;
+ return serdeConstants.TIMESTAMP_TYPE_NAME;
} else if (type.startsWith("map<")) {
- return Constants.STRING_TYPE_NAME;
+ return serdeConstants.STRING_TYPE_NAME;
} else if (type.startsWith("array<")) {
- return Constants.STRING_TYPE_NAME;
+ return serdeConstants.STRING_TYPE_NAME;
} else if (type.startsWith("struct<")) {
- return Constants.STRING_TYPE_NAME;
+ return serdeConstants.STRING_TYPE_NAME;
}
throw new SQLException("Unrecognized column type: " + type);