Permalink
Browse files

HIVE-1526. Hive should depend on release version of Thrift (Carl Stei…

…nbach via Ning Zhang)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1044070 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent fa31870 commit e3636cac73bad080081f684cdebb9d50d8628531 Ning Zhang committed Dec 9, 2010
Showing with 40,815 additions and 26,104 deletions.
  1. +0 −59 .classpath._hbase
  2. +1 −1 .gitignore
  3. +5 −0 CHANGES.txt
  4. +24 −9 build-common.xml
  5. +50 −15 build.xml
  6. +13 −10 eclipse-templates/.classpath
  7. +25 −24 eclipse-templates/.classpath._hbase
  8. +6 −1 ivy/libraries.properties
  9. +2 −2 lib/README
  10. +0 −19 lib/libfb303.LICENSE
  11. BIN lib/libfb303.jar
  12. +0 −19 lib/libthrift.LICENSE
  13. BIN lib/libthrift.jar
  14. BIN lib/thrift-0.5.0.jar
  15. BIN lib/thrift-fb303-0.5.0.jar
  16. +16 −0 lib/thrift-fb303.LICENSE
  17. +324 −0 lib/thrift.LICENSE
  18. +8 −7 metastore/build.xml
  19. +1 −1 metastore/if/hive_metastore.thrift
  20. +18 −0 metastore/ivy.xml
  21. +0 −211 metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java
  22. +0 −277 metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java
  23. +1,798 −1,798 metastore/src/{ → gen/thrift}/gen-cpp/ThriftHiveMetastore.cpp
  24. +1,209 −937 metastore/src/{ → gen/thrift}/gen-cpp/ThriftHiveMetastore.h
  25. +4 −4 metastore/src/{ → gen/thrift}/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp
  26. 0 metastore/src/{ → gen/thrift}/gen-cpp/hive_metastore_constants.cpp
  27. 0 metastore/src/{ → gen/thrift}/gen-cpp/hive_metastore_constants.h
  28. +271 −271 metastore/src/{ → gen/thrift}/gen-cpp/hive_metastore_types.cpp
  29. +218 −177 metastore/src/{ → gen/thrift}/gen-cpp/hive_metastore_types.h
  30. +126 −31 ...src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/AlreadyExistsException.java
  31. +126 −31 ...{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/ConfigValSecurityException.java
  32. +7 −1 metastore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/Constants.java
  33. +201 −48 metastore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
  34. +173 −40 metastore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java
  35. +378 −114 metastore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java
  36. +126 −31 ... → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/IndexAlreadyExistsException.java
  37. +126 −31 ...src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidObjectException.java
  38. +126 −31 .../{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/InvalidOperationException.java
  39. +306 −0 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/MetaException.java
  40. +126 −31 .../src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/NoSuchObjectException.java
  41. +392 −0 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java
  42. +294 −84 metastore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
  43. +157 −41 metastore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
  44. +178 −44 metastore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
  45. +373 −104 ...tore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
  46. +426 −123 metastore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
  47. +14,533 −3,419 ...re/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
  48. +199 −52 metastore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java
  49. +126 −31 ...ore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownDBException.java
  50. +126 −31 .../src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/UnknownTableException.java
  51. +150 −36 metastore/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/metastore/api/Version.java
  52. 0 metastore/src/{gen-php → gen/thrift/gen-php/hive_metastore}/ThriftHiveMetastore.php
  53. 0 metastore/src/{gen-php → gen/thrift/gen-php/hive_metastore}/hive_metastore_constants.php
  54. 0 metastore/src/{gen-php → gen/thrift/gen-php/hive_metastore}/hive_metastore_types.php
  55. 0 metastore/src/gen/thrift/gen-py/__init__.py
  56. +8 −2 metastore/src/{ → gen/thrift}/gen-py/hive_metastore/ThriftHiveMetastore-remote
  57. +235 −3 metastore/src/{ → gen/thrift}/gen-py/hive_metastore/ThriftHiveMetastore.py
  58. 0 metastore/src/{ → gen/thrift}/gen-py/hive_metastore/__init__.py
  59. +0 −16 metastore/src/{ → gen/thrift}/gen-py/hive_metastore/constants.py
  60. +62 −2 metastore/src/{ → gen/thrift}/gen-py/hive_metastore/ttypes.py
  61. +40 −0 metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb
  62. +470 −0 metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
  63. +2,676 −0 metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
  64. +1 −1 metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
  65. +6 −1 metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
  66. +26 −18 odbc/Makefile
  67. +0 −12 odbc/build.xml
  68. +1 −0 odbc/src/cpp/HiveRowSet.cpp
  69. +1 −0 odbc/src/cpp/hiveclienthelper.cpp
  70. +9 −9 ql/build.xml
  71. +34 −3 ql/if/queryplan.thrift
  72. +3 −1 ql/ivy.xml
  73. +0 −28 ql/src/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java
  74. +0 −28 ql/src/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java
  75. +0 −76 ql/src/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
  76. +0 −52 ql/src/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java
  77. +0 −31 ql/src/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.java
  78. +16 −0 ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp
  79. +23 −0 ql/src/gen/thrift/gen-cpp/queryplan_constants.h
  80. +1,075 −0 ql/src/gen/thrift/gen-cpp/queryplan_types.cpp
  81. +467 −0 ql/src/gen/thrift/gen-cpp/queryplan_types.h
  82. +214 −76 ql/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java
  83. +44 −0 ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java
  84. +219 −80 ql/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Graph.java
  85. +44 −0 ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java
  86. +307 −112 ql/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java
  87. +92 −0 ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
  88. +325 −95 ql/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java
  89. +188 −55 ql/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java
  90. +335 −120 ql/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.java
  91. +68 −0 ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java
  92. +361 −131 ql/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Task.java
  93. +47 −0 ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.java
  94. 0 ql/src/{gen-php → gen/thrift/gen-php/queryplan}/queryplan_types.php
  95. 0 ql/src/gen/thrift/gen-py/__init__.py
  96. 0 ql/src/{ → gen/thrift}/gen-py/queryplan/__init__.py
  97. 0 ql/src/{ → gen/thrift}/gen-py/queryplan/constants.py
  98. +123 −2 ql/src/{ → gen/thrift}/gen-py/queryplan/ttypes.py
  99. +1 −2 service/src/gen-py/hive_service/constants.py → ql/src/gen/thrift/gen-rb/queryplan_constants.rb
  100. +256 −0 ql/src/gen/thrift/gen-rb/queryplan_types.rb
  101. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java
  102. +3 −2 ql/src/java/org/apache/hadoop/hive/ql/exec/CollectOperator.java
  103. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/ConditionalTask.java
  104. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/CopyTask.java
  105. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
  106. +2,754 −0 ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java.orig
  107. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java
  108. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java
  109. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/ExtractOperator.java
  110. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java
  111. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
  112. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/FilterOperator.java
  113. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/ForwardOperator.java
  114. +2 −2 ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionTask.java
  115. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/GroupByOperator.java
  116. +1,061 −0 ql/src/java/org/apache/hadoop/hive/ql/exec/GroupByOperator.java.orig
  117. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/HashTableDummyOperator.java
  118. +1 −4 ql/src/java/org/apache/hadoop/hive/ql/exec/HashTableSinkOperator.java
  119. +449 −0 ql/src/java/org/apache/hadoop/hive/ql/exec/HashTableSinkOperator.java.orig
  120. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
  121. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/LateralViewForwardOperator.java
  122. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/LateralViewJoinOperator.java
  123. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/LimitOperator.java
  124. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
  125. +3 −2 ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java
  126. +0 −3 ql/src/java/org/apache/hadoop/hive/ql/exec/MapRedTask.java
  127. +2 −2 ql/src/java/org/apache/hadoop/hive/ql/exec/MapredLocalTask.java
  128. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java
  129. +2 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
  130. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java
  131. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java
  132. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/ScriptOperator.java
  133. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/SelectOperator.java
  134. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/StatsTask.java
  135. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/TableScanOperator.java
  136. +4 −6 ql/src/java/org/apache/hadoop/hive/ql/exec/Task.java
  137. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/UDTFOperator.java
  138. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/UnionOperator.java
  139. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/index/compact/CompactIndexHandler.java
  140. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/index/compact/IndexMetadataChangeTask.java
  141. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
  142. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
  143. +10 −10 serde/build.xml
  144. +19 −1 serde/ivy.xml
  145. +0 −1 serde/src/gen-java/org/apache/hadoop/hive/serde/dynamic_type/.gitignore
  146. +0 −214 serde/src/gen-java/org/apache/hadoop/hive/serde/test/InnerStruct.java
  147. +0 −1 serde/src/gen-java/org/apache/hadoop/hive/serde2/dynamic_type/.gitignore
  148. +0 −18 serde/src/gen-java/org/apache/hadoop/hive/serde2/thrift/test/Constants.java
  149. +0 −1 serde/src/gen-py/serde/.gitignore
  150. 0 serde/src/{ → gen/protobuf}/gen-java/org/apache/hadoop/hive/serde2/proto/test/Complexpb.java
  151. 0 serde/src/{ → gen/thrift}/gen-cpp/serde_constants.cpp
  152. 0 serde/src/{ → gen/thrift}/gen-cpp/serde_constants.h
  153. 0 serde/src/{ → gen/thrift}/gen-cpp/serde_types.cpp
  154. +1 −0 serde/src/{ → gen/thrift}/gen-cpp/serde_types.h
  155. +7 −1 serde/src/{gen-java → gen/thrift/gen-javabean}/org/apache/hadoop/hive/serde/Constants.java
  156. +304 −0 serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.java
  157. +171 −54 serde/src/{gen-java → gen/thrift/gen-javabean}/org/apache/hadoop/hive/serde/test/ThriftTestObj.java
  158. +246 −87 ...e/src/{gen-java → gen/thrift/gen-javabean}/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
  159. +180 −64 ...src/{gen-java → gen/thrift/gen-javabean}/org/apache/hadoop/hive/serde2/thrift/test/IntString.java
  160. 0 serde/src/{gen-php → gen/thrift/gen-php/serde}/serde_constants.php
  161. 0 serde/src/{gen-php → gen/thrift/gen-php/serde}/serde_types.php
  162. 0 serde/src/gen/thrift/gen-py/__init__.py
  163. 0 serde/src/{ → gen/thrift}/gen-py/org_apache_hadoop_hive_serde/__init__.py
  164. +0 −34 serde/src/{ → gen/thrift}/gen-py/org_apache_hadoop_hive_serde/constants.py
  165. +1 −1 serde/src/{ → gen/thrift}/gen-py/org_apache_hadoop_hive_serde/ttypes.py
  166. +92 −0 serde/src/gen/thrift/gen-rb/serde_constants.rb
  167. +7 −0 serde/src/gen/thrift/gen-rb/serde_types.rb
  168. +32 −4 serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java
  169. +7 −2 serde/src/java/org/apache/hadoop/hive/serde2/thrift/TCTLSeparatedProtocol.java
  170. +6 −6 serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorUtils.java
  171. +6 −6 serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestThriftObjectInspectors.java
  172. +5 −5 service/build.xml
  173. +1 −1 service/if/hive_service.thrift
  174. +0 −163 service/include/thrift/TLogging.h
  175. +0 −53 service/include/thrift/TProcessor.h
  176. +0 −96 service/include/thrift/TReflectionLocal.h
  177. +0 −191 service/include/thrift/Thrift.h
  178. +0 −60 service/include/thrift/concurrency/Exception.h
  179. +0 −77 service/include/thrift/concurrency/FunctionRunner.h
  180. +0 −84 service/include/thrift/concurrency/Monitor.h
  181. +0 −114 service/include/thrift/concurrency/Mutex.h
  182. +0 −130 service/include/thrift/concurrency/PosixThreadFactory.h
  183. +0 −125 service/include/thrift/concurrency/Thread.h
  184. +0 −169 service/include/thrift/concurrency/ThreadManager.h
  185. +0 −122 service/include/thrift/concurrency/TimerManager.h
  186. +0 −100 service/include/thrift/concurrency/Util.h
  187. +0 −354 service/include/thrift/config.h
  188. +0 −103 service/include/thrift/fb303/FacebookBase.h
  189. +0 −2,887 service/include/thrift/fb303/FacebookService.cpp
  190. +0 −1,359 service/include/thrift/fb303/FacebookService.h
  191. +0 −215 service/include/thrift/fb303/ServiceTracker.h
  192. +0 −16 service/include/thrift/fb303/fb303_constants.cpp
  193. +0 −23 service/include/thrift/fb303/fb303_constants.h
  194. +0 −10 service/include/thrift/fb303/fb303_types.cpp
  195. +0 −28 service/include/thrift/fb303/fb303_types.h
  196. +0 −112 service/include/thrift/fb303/if/fb303.thrift
  197. +0 −71 service/include/thrift/if/reflection_limited.thrift
  198. +0 −77 service/include/thrift/processor/PeekProcessor.h
  199. +0 −264 service/include/thrift/processor/StatsProcessor.h
  200. +0 −42 service/include/thrift/protocol/TBase64Utils.h
  201. +0 −254 service/include/thrift/protocol/TBinaryProtocol.h
  202. +0 −279 service/include/thrift/protocol/TCompactProtocol.h
  203. +0 −225 service/include/thrift/protocol/TDebugProtocol.h
  204. +0 −253 service/include/thrift/protocol/TDenseProtocol.h
  205. +0 −340 service/include/thrift/protocol/TJSONProtocol.h
  206. +0 −304 service/include/thrift/protocol/TOneWayProtocol.h
  207. +0 −438 service/include/thrift/protocol/TProtocol.h
  208. +0 −104 service/include/thrift/protocol/TProtocolException.h
  209. +0 −187 service/include/thrift/protocol/TProtocolTap.h
  210. +0 −285 service/include/thrift/reflection_limited_types.h
  211. +0 −435 service/include/thrift/server/TNonblockingServer.h
  212. +0 −213 service/include/thrift/server/TServer.h
  213. +0 −70 service/include/thrift/server/TSimpleServer.h
  214. +0 −79 service/include/thrift/server/TThreadPoolServer.h
  215. +0 −74 service/include/thrift/server/TThreadedServer.h
  216. +0 −667 service/include/thrift/transport/TBufferTransports.h
  217. +0 −73 service/include/thrift/transport/TFDTransport.h
  218. +0 −442 service/include/thrift/transport/TFileTransport.h
  219. +0 −111 service/include/thrift/transport/THttpClient.h
  220. +0 −76 service/include/thrift/transport/TServerSocket.h
  221. +0 −92 service/include/thrift/transport/TServerTransport.h
  222. +0 −96 service/include/thrift/transport/TShortReadTransport.h
  223. +0 −41 service/include/thrift/transport/TSimpleFileTransport.h
  224. +0 −242 service/include/thrift/transport/TSocket.h
  225. +0 −191 service/include/thrift/transport/TSocketPool.h
  226. +0 −224 service/include/thrift/transport/TTransport.h
  227. +0 −117 service/include/thrift/transport/TTransportException.h
  228. +0 −287 service/include/thrift/transport/TTransportUtils.h
  229. +0 −219 service/include/thrift/transport/TZlibTransport.h
  230. +0 −18 service/src/gen-javabean/org/apache/hadoop/hive/service/Constants.java
  231. +0 −549 service/src/gen-javabean/org/apache/hadoop/hive/service/HiveClusterStatus.java
  232. +0 −28 service/src/gen-javabean/org/apache/hadoop/hive/service/JobTrackerState.java
  233. +0 −107 service/src/gen-py/hive/ThriftHive-remote
  234. +0 −860 service/src/gen-py/hive/ThriftHive.py
  235. +0 −71 service/src/gen-py/hive/ttypes.py
  236. +0 −1 service/src/gen-py/hive_service/__init__.py
  237. +0 −241 service/src/gen-rb/ThriftHive.rb
  238. +0 −24 service/src/gen-rb/hive_service_types.rb
  239. +520 −263 service/src/{ → gen/thrift}/gen-cpp/ThriftHive.cpp
  240. +294 −133 service/src/{ → gen/thrift}/gen-cpp/ThriftHive.h
  241. +9 −4 service/src/{ → gen/thrift}/gen-cpp/ThriftHive_server.skeleton.cpp
  242. 0 service/src/{ → gen/thrift}/gen-cpp/hive_service_constants.cpp
  243. 0 service/src/{ → gen/thrift}/gen-cpp/hive_service_constants.h
  244. +49 −27 service/src/{ → gen/thrift}/gen-cpp/hive_service_types.cpp
  245. +42 −26 service/src/{ → gen/thrift}/gen-cpp/hive_service_types.h
  246. +736 −0 service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/HiveClusterStatus.java
  247. +184 −50 service/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/service/HiveServerException.java
  248. +44 −0 service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/JobTrackerState.java
  249. +2,335 −512 service/src/{ → gen/thrift}/gen-javabean/org/apache/hadoop/hive/service/ThriftHive.java
  250. 0 service/src/{gen-php → gen/thrift/gen-php/hive_service}/ThriftHive.php
  251. 0 service/src/{gen-php → gen/thrift/gen-php/hive_service}/hive_service_types.php
  252. 0 service/src/gen/thrift/gen-py/__init__.py
  253. +8 −2 service/src/{ → gen/thrift}/gen-py/hive_service/ThriftHive-remote
  254. +49 −3 service/src/{ → gen/thrift}/gen-py/hive_service/ThriftHive.py
  255. 0 service/src/{gen-py/hive → gen/thrift/gen-py/hive_service}/__init__.py
  256. 0 service/src/{gen-py/hive → gen/thrift/gen-py/hive_service}/constants.py
  257. +18 −2 service/src/{ → gen/thrift}/gen-py/hive_service/ttypes.py
  258. +0 −1 service/src/{ → gen/thrift}/gen-rb/hive_service_constants.rb
  259. +67 −0 service/src/gen/thrift/gen-rb/hive_service_types.rb
  260. +504 −0 service/src/gen/thrift/gen-rb/thrift_hive.rb
  261. +4 −3 service/src/java/org/apache/hadoop/hive/service/HiveServer.java
View
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-0.20.0/hadoop-0.20.0-core.jar"/>
- <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-0.20.0/hadoop-0.20.0-test.jar"/>
- <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-0.20.0/lib/servlet-api-2.5-6.1.14.jar"/>
- <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-0.20.0/lib/jetty-6.1.14.jar"/>
- <classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-0.20.0/lib/jetty-util-6.1.14.jar"/>
- <classpathentry exported="true" kind="lib" path="cli/lib/jline-0.9.94.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/json.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/asm-3.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-logging-api-1.0.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/derby.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jdo2-api-2.3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/datanucleus-core-1.1.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/datanucleus-enhancer-1.1.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/datanucleus-rdbms-1.1.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/libfb303.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/libthrift.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.15.jar"/>
- <classpathentry exported="true" kind="lib" path="ql/lib/antlr-3.0.1.jar"/>
- <classpathentry exported="true" kind="lib" path="ql/lib/antlr-runtime-3.0.1.jar"/>
- <classpathentry exported="true" kind="lib" path="testlibs/junit-3.8.1.jar"/>
- <classpathentry exported="true" kind="lib" path="stats/lib/hbase-0.20.3.jar"/>
- <classpathentry exported="true" kind="lib" path="stats/lib/hbase-0.20.3-test.jar"/>
- <classpathentry exported="true" kind="lib" path="stats/lib/zookeeper-3.2.2.jar"/>
- <classpathentry kind="src" path="build/ql/gen-java"/>
- <classpathentry kind="src" path="build/contrib/test/src"/>
- <classpathentry kind="src" path="build/ql/test/src"/>
- <classpathentry kind="src" path="cli/src/java"/>
- <classpathentry kind="src" path="common/src/java"/>
- <classpathentry kind="src" path="contrib/src/java"/>
- <classpathentry kind="src" path="contrib/src/test"/>
- <classpathentry kind="src" path="metastore/src/gen-javabean"/>
- <classpathentry kind="src" path="metastore/src/java"/>
- <classpathentry kind="src" path="metastore/src/model"/>
- <classpathentry kind="src" path="metastore/src/test"/>
- <classpathentry kind="src" path="ql/src/gen-javabean"/>
- <classpathentry kind="src" path="ql/src/java"/>
- <classpathentry kind="src" path="ql/src/test"/>
- <classpathentry kind="src" path="serde/src/gen-java"/>
- <classpathentry kind="src" path="serde/src/java"/>
- <classpathentry kind="src" path="serde/src/test"/>
- <classpathentry kind="src" path="service/src/gen-javabean"/>
- <classpathentry kind="src" path="service/src/java"/>
- <classpathentry kind="src" path="service/src/test"/>
- <classpathentry kind="src" path="jdbc/src/java"/>
- <classpathentry kind="src" path="jdbc/src/test"/>
- <classpathentry kind="src" path="shims/src/0.20/java"/>
- <classpathentry kind="src" path="shims/src/common/java"/>
- <classpathentry kind="src" path="hbase-handler/src/java"/>
- <classpathentry kind="src" path="hwi/src/java"/>
- <classpathentry kind="src" path="hwi/src/test"/>
- <classpathentry kind="output" path="build/eclipse-classes"/>
-</classpath>
View
@@ -1,6 +1,6 @@
build
build-eclipse
-.classpath
+.classpath*
.externalToolBuilders
.project
.settings
View
@@ -618,6 +618,11 @@ Trunk - Unreleased
HIVE-1658. Fix describe [extended] column formatting
(Thiruvel Thirumoolan via Ning Zhang)
+ TASKS
+
+ HIVE-1526. Hive should depend on a release version of Thrift
+ (Carl Steinbach via Ning Zhang)
+
Release 0.6.0 - 2010-10-19
INCOMPATIBLE CHANGES
View
@@ -25,6 +25,8 @@
<property file="${user.home}/build.properties" />
<property file="${basedir}/build.properties" />
+ <property environment="env"/>
+
<property name="hive.conf.dir" value="${hive.root}/conf"/>
<property name="dist.dir" location="${hive.root}"/>
@@ -34,6 +36,8 @@
<property name="build.classes" location="${build.dir}/classes"/>
<property name="build.encoding" value="ISO-8859-1"/>
+ <property name="thrift.args" value="-I ${thrift.home} --gen java:beans --gen cpp --gen php --gen py --gen rb"/>
+
<property name="hadoop.conf.dir" location="${hadoop.root}/conf"/>
<!-- configuration needed for tests -->
@@ -101,7 +105,7 @@
</condition>
<!--this is the naming policy for artifacts we want pulled down-->
- <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
+ <property name="ivy.artifact.retrieve.pattern" value="[conf]/[artifact]-[revision].[ext]"/>
<target name="ivy-init-dirs">
<mkdir dir="${build.ivy.dir}" />
@@ -159,18 +163,18 @@
log="${ivyresolvelog}"/>
</target>
- <target name="ivy-resolve-checkstyle" depends="ivy-init">
- <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="checkstyle"
- log="${ivyresolvelog}"/>
- </target>
-
- <target name="ivy-retrieve" depends="ivy-resolve" unless="offline"
+ <target name="ivy-retrieve" depends="ivy-resolve"
description="Retrieve Ivy-managed artifacts">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
log="${ivyresolvelog}"/>
</target>
+ <target name="ivy-resolve-checkstyle" depends="ivy-init">
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="checkstyle"
+ log="${ivyresolvelog}"/>
+ </target>
+
<target name="ivy-retrieve-checkstyle" depends="ivy-resolve-checkstyle"
description="Retrieve Ivy-managed artifacts for the checkstyle configurations">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
@@ -226,8 +230,8 @@
<fileset dir="${build.dir.hive}" includes="*/*.jar"/>
<fileset dir="${hive.root}/lib" includes="*.jar"/>
<fileset dir="${hive.root}/ql/lib" includes="*.jar"/>
- <fileset dir="${build.dir.hive}/ivy/lib/metastore/default" includes="*.jar" excludes="*hadoop*.jar"
- erroronmissingdir="false" />
+ <fileset dir="${build.ivy.lib.dir}/default" includes="*.jar" excludes="*hadoop*.jar"
+ erroronmissingdir="false"/>
</path>
<path id="classpath">
@@ -461,4 +465,15 @@
<delete dir="${build.dir}"/>
</target>
+ <target name="check-thrift-home">
+ <condition property="thrift.home.defined">
+ <or>
+ <not>
+ <isset property="thrift.home"/>
+ </not>
+ <equals arg1="${thrift.home}" arg2="$${thrift.home}" trim="true"/>
+ </or>
+ </condition>
+ </target>
+
</project>
View
@@ -25,6 +25,8 @@
<property file="${user.home}/build.properties" />
<property file="${basedir}/build.properties" />
+ <property environment="env"/>
+
<property name="target.dir" location="${build.dir.hive}/dist"/>
<property name="target.lib.dir" location="${target.dir}/lib"/>
<property name="target.conf.dir" location="${target.dir}/conf"/>
@@ -91,6 +93,28 @@
</sequential>
</macrodef>
+ <macrodef name="iterate-test">
+ <attribute name="target"/>
+ <sequential>
+ <subant target="@{target}">
+ <property name="thrift.home" value="${thrift.home}"/>
+ <property name="build.dir.hive" location="${build.dir.hive}"/>
+ <filelist dir="." files="ql/build.xml,contrib/build.xml,hbase-handler/build.xml,hwi/build.xml,jdbc/build.xml,metastore/build.xml,odbc/build.xml,serde/build.xml,service/build.xml"/>
+ </subant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="iterate-thriftif">
+ <attribute name="target"/>
+ <sequential>
+ <subant target="@{target}">
+ <property name="thrift.home" value="${thrift.home}"/>
+ <property name="build.dir.hive" location="${build.dir.hive}"/>
+ <filelist dir="." files="ql/build.xml,service/build.xml,metastore/build.xml,serde/build.xml"/>
+ </subant>
+ </sequential>
+ </macrodef>
+
<macrodef name="iterate-all">
<attribute name="target"/>
<sequential>
@@ -121,7 +145,7 @@
<fileset dir="${hive.root}" includes="hive-*.jar"/>
<fileset dir="${hive.root}/lib" includes="*.jar"/>
<fileset dir="${hive.root}/ql/lib" includes="*.jar"/>
- <fileset dir="${build.dir.hive}/ivy/lib/metastore/default" includes="*.jar"
+ <fileset dir="${build.dir.hive}/ivy/lib/default" includes="*.jar"
excludes="*hadoop*.jar" erroronmissingdir="false"/>
</path>
@@ -165,16 +189,24 @@
<iterate target="compile"/>
</target>
+ <target name="thriftif">
+ <iterate-thriftif target="thriftif"/>
+ </target>
+
<target name="jar"
description="Build JAR artifacts">
<iterate target="jar"/>
</target>
+ <target name="jar-test" depends="jar"
+ description="Build Java test artifacts">
+ <iterate-test target="compile-test"/>
+ </target>
+
<target name="test"
depends="clean-test,jar"
description="Run tests">
<iterate target="test"/>
- <iterate-cpp target="test"/>
</target>
<!-- create an html report from junit output files -->
@@ -212,7 +244,7 @@
<target name="clean-offline" if="offline">
<!-- preserve the downloaded ivy .jar -->
<delete quiet="true" includeemptydirs="true">
- <fileset dir="${build.dir.hive}" excludes="ivy/**/*"/>
+ <fileset dir="${build.dir.hive}" excludes="ivy/**/ivy*.jar"/>
</delete>
</target>
@@ -280,16 +312,16 @@
<fileset dir="${hive.root}/service/lib/php" excludes="${vcs.excludes}"/>
</copy>
<copy todir="${target.lib.dir}/php/packages/serde">
- <fileset dir="${hive.root}/serde/src/gen-php" excludes="${vcs.excludes}"/>
+ <fileset dir="${hive.root}/serde/src/gen/thrift/gen-php" excludes="${vcs.excludes}"/>
</copy>
<copy todir="${target.lib.dir}/php/packages/hive_metastore">
- <fileset dir="${hive.root}/metastore/src/gen-php" excludes="${vcs.excludes}"/>
+ <fileset dir="${hive.root}/metastore/src/gen/thrift/gen-php" excludes="${vcs.excludes}"/>
</copy>
<copy todir="${target.lib.dir}/php/packages/hive_service">
- <fileset dir="${hive.root}/service/src/gen-php" excludes="${vcs.excludes}"/>
+ <fileset dir="${hive.root}/service/src/gen/thrift/gen-php" excludes="${vcs.excludes}"/>
</copy>
<copy todir="${target.lib.dir}/php/packages/queryplan">
- <fileset dir="${hive.root}/ql/src/gen-php" excludes="${vcs.excludes}"/>
+ <fileset dir="${hive.root}/ql/src/gen/thrift/gen-php" excludes="${vcs.excludes}"/>
</copy>
@@ -298,16 +330,16 @@
<fileset dir="${hive.root}/service/lib/py" excludes="${vcs.excludes}"/>
</copy>
<copy todir="${target.lib.dir}/py/hive_serde">
- <fileset dir="${hive.root}/serde/src/gen-py/org_apache_hadoop_hive_serde" excludes="${vcs.excludes}"/>
+ <fileset dir="${hive.root}/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde" excludes="${vcs.excludes}"/>
</copy>
<copy todir="${target.lib.dir}/py/hive_metastore">
- <fileset dir="${hive.root}/metastore/src/gen-py/hive_metastore" excludes="${vcs.excludes}"/>
+ <fileset dir="${hive.root}/metastore/src/gen/thrift/gen-py/hive_metastore" excludes="${vcs.excludes}"/>
</copy>
<copy todir="${target.lib.dir}/py/hive_service">
- <fileset dir="${hive.root}/service/src/gen-py/hive_service" excludes="${vcs.excludes}"/>
+ <fileset dir="${hive.root}/service/src/gen/thrift/gen-py/hive_service" excludes="${vcs.excludes}"/>
</copy>
<copy todir="${target.lib.dir}/py/queryplan">
- <fileset dir="${hive.root}/ql/src/gen-py/queryplan" excludes="${vcs.excludes}"/>
+ <fileset dir="${hive.root}/ql/src/gen/thrift/gen-py/queryplan" excludes="${vcs.excludes}"/>
</copy>
<!-- copy jar files -->
@@ -320,7 +352,7 @@
<fileset file="${build.dir.hive}/hwi/hive-hwi-${version}.war"/>
<fileset file="${build.dir.hive}/contrib/hive-contrib-${version}.jar"/>
<fileset file="${build.dir.hive}/contrib/hive-hbase_handler-${version}.jar"/>
- <fileset dir="${build.dir.hive}/ivy/lib/metastore/default">
+ <fileset dir="${build.dir.hive}/ivy/lib/default">
<include name="*.jar"/>
<exclude name="*.tar.gz"/>
</fileset>
@@ -449,18 +481,21 @@
<packageset dir="common/src/java"/>
<packageset dir="service/src/java"/>
<packageset dir="service/src/test"/>
- <packageset dir="service/src/gen-javabean"/>
+ <packageset dir="service/src/gen/thrift/gen-javabean"/>
<packageset dir="serde/src/java"/>
<packageset dir="serde/src/test"/>
- <packageset dir="serde/src/gen-java"/>
+ <packageset dir="serde/src/gen/thrift/gen-javabean"/>
+ <packageset dir="serde/src/gen/protobuf/gen-java"/>
<packageset dir="jdbc/src/java"/>
<packageset dir="jdbc/src/test"/>
<packageset dir="metastore/src/java"/>
<packageset dir="metastore/src/test"/>
- <packageset dir="metastore/src/gen-javabean"/>
+ <packageset dir="metastore/src/gen/thrift/gen-javabean"/>
<packageset dir="metastore/src/model"/>
<packageset dir="cli/src/java"/>
<packageset dir="ql/src/java"/>
+ <packageset dir="ql/src/test"/>
+ <packageset dir="ql/src/gen/thrift/gen-javabean"/>
<packageset dir="${build.dir.hive}/ql/gen-java"/>
<packageset dir="shims/src/common/java"/>
@@ -16,10 +16,10 @@
<classpathentry exported="true" kind="lib" path="lib/commons-logging-@commons-logging.version@.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-logging-api-@commons-logging-api.version@.jar"/>
<classpathentry exported="true" kind="lib" path="lib/derby.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hbase-0.20.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hbase-0.20.3-test.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/libfb303.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/libthrift.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hbase-@hbase.version@.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hbase-@hbase-test.version@-test.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="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"/>
@@ -33,25 +33,28 @@
<classpathentry kind="lib" path="build/dist/lib/commons-dbcp-@commons-dbcp.version@.jar"/>
<classpathentry kind="lib" path="build/dist/lib/datanucleus-connectionpool-@datanucleus-connectionpool.version@.jar"/>
<classpathentry kind="lib" path="build/dist/lib/commons-pool-@commons-pool.version@.jar"/>
- <classpathentry kind="src" path="build/metastore/gen-java"/>
- <classpathentry kind="src" path="build/ql/gen-java"/>
+ <classpathentry kind="lib" path="build/dist/lib/slf4j-api-@slf4j-api.version@.jar"/>
+ <classpathentry kind="lib" path="build/dist/lib/slf4j-log4j12-@slf4j-log4j12.version@.jar"/>
<classpathentry kind="src" path="build/contrib/test/src"/>
+ <classpathentry kind="src" path="build/metastore/gen/antlr/gen-java"/>
<classpathentry kind="src" path="build/ql/test/src"/>
+ <classpathentry kind="src" path="build/ql/gen/antlr/gen-java"/>
<classpathentry kind="src" path="cli/src/java"/>
<classpathentry kind="src" path="common/src/java"/>
<classpathentry kind="src" path="contrib/src/java"/>
<classpathentry kind="src" path="contrib/src/test"/>
- <classpathentry kind="src" path="metastore/src/gen-javabean"/>
+ <classpathentry kind="src" path="metastore/src/gen/thrift/gen-javabean"/>
<classpathentry kind="src" path="metastore/src/java"/>
<classpathentry kind="src" path="metastore/src/model"/>
<classpathentry kind="src" path="metastore/src/test"/>
- <classpathentry kind="src" path="ql/src/gen-javabean"/>
+ <classpathentry kind="src" path="ql/src/gen/thrift/gen-javabean"/>
<classpathentry kind="src" path="ql/src/java"/>
<classpathentry kind="src" path="ql/src/test"/>
- <classpathentry kind="src" path="serde/src/gen-java"/>
+ <classpathentry kind="src" path="serde/src/gen/thrift/gen-javabean"/>
+ <classpathentry kind="src" path="serde/src/gen/protobuf/gen-java"/>
<classpathentry kind="src" path="serde/src/java"/>
<classpathentry kind="src" path="serde/src/test"/>
- <classpathentry kind="src" path="service/src/gen-javabean"/>
+ <classpathentry kind="src" path="service/src/gen/thrift/gen-javabean"/>
<classpathentry kind="src" path="service/src/java"/>
<classpathentry kind="src" path="service/src/test"/>
<classpathentry kind="src" path="jdbc/src/java"/>
Oops, something went wrong.

0 comments on commit e3636ca

Please sign in to comment.