Permalink
Browse files

Fix conflict

  • Loading branch information...
2 parents b3b0813 + 32758fd commit 32eacdf1d7451147b99d53f8075320b1286bb2f7 @ashutoshc ashutoshc committed Jan 20, 2011
Showing with 79,613 additions and 21,770 deletions.
  1. +99 −0 CHANGES.txt
  2. +7 −0 build-common.xml
  3. +2 −2 build.properties
  4. +14 −2 build.xml
  5. +71 −5 cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
  6. +23 −5 common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
  7. +80 −2 conf/hive-default.xml
  8. +5 −0 conf/hive-log4j.properties
  9. +1 −1 eclipse-templates/.classpath
  10. +2 −1 hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java
  11. +18 −0 hbase-handler/src/test/queries/hbase_joins.q
  12. +72 −16 hbase-handler/src/test/results/hbase_joins.q.out
  13. +30 −25 hbase-handler/src/test/results/hbase_pushdown.q.out
  14. +4 −4 ivy/libraries.properties
  15. +109 −5 metastore/if/hive_metastore.thrift
  16. +1 −1 metastore/ivy.xml
  17. +7,877 −2,201 metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
  18. +2,473 −60 metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
  19. +90 −0 metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp
  20. +870 −164 metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
  21. +327 −9 metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
  22. +103 −12 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
  23. +584 −0 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java
  24. +707 −0 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java
  25. +53 −0 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java
  26. +11 −11 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java
  27. +111 −20 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
  28. +683 −0 ...store/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
  29. +47 −0 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java
  30. +344 −0 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java
  31. +663 −0 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java
  32. +480 −0 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java
  33. +20 −20 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
  34. +11 −11 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
  35. +37 −37 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
  36. +112 −21 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
  37. +24,129 −7,459 metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
  38. +7,347 −2,437 metastore/src/gen/thrift/gen-php/hive_metastore/ThriftHiveMetastore.php
  39. +1,356 −268 metastore/src/gen/thrift/gen-php/hive_metastore/hive_metastore_types.php
  40. +126 −0 metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
  41. +6,070 −2,238 metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
  42. +788 −99 metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
  43. +162 −3 metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
  44. +1,208 −28 metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
  45. +845 −71 metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
  46. +233 −25 metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
  47. +71 −0 metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java
  48. +202 −0 metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
  49. +42 −0 metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java
  50. +1,828 −5 metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
  51. +84 −0 metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java
  52. +24 −34 metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java
  53. +15 −4 metastore/src/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java
  54. +132 −0 metastore/src/model/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java
  55. +120 −0 metastore/src/model/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java
  56. +160 −0 metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java
  57. +139 −0 metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java
  58. +80 −0 metastore/src/model/org/apache/hadoop/hive/metastore/model/MRole.java
  59. +120 −0 metastore/src/model/org/apache/hadoop/hive/metastore/model/MRoleMap.java
  60. +159 −0 metastore/src/model/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java
  61. +139 −0 metastore/src/model/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java
  62. +308 −0 metastore/src/model/package.jdo
  63. +153 −0 metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
  64. +70 −0 metastore/src/test/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java
  65. +177 −134 ql/src/java/org/apache/hadoop/hive/ql/Driver.java
  66. +490 −9 ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
  67. +0 −2,754 ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java.orig
  68. +13 −2 ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java
  69. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
  70. +0 −1,061 ql/src/java/org/apache/hadoop/hive/ql/exec/GroupByOperator.java.orig
  71. +0 −449 ql/src/java/org/apache/hadoop/hive/ql/exec/HashTableSinkOperator.java.orig
  72. +71 −50 ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java
  73. +1 −3 ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java
  74. +1 −0 ql/src/java/org/apache/hadoop/hive/ql/exec/TaskRunner.java
  75. +3 −3 ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
  76. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/index/compact/HiveCompactIndexInputFormat.java
  77. +8 −0 ql/src/java/org/apache/hadoop/hive/ql/index/compact/HiveCompactIndexResult.java
  78. +11 −3 ql/src/java/org/apache/hadoop/hive/ql/io/HiveFileFormatUtils.java
  79. +33 −6 ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
  80. +3 −0 ql/src/java/org/apache/hadoop/hive/ql/lockmgr/HiveLockManager.java
  81. +52 −0 ql/src/java/org/apache/hadoop/hive/ql/lockmgr/HiveLockObj.java
  82. +36 −1 ql/src/java/org/apache/hadoop/hive/ql/lockmgr/HiveLockObject.java
  83. +303 −80 ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java
  84. +33 −0 ql/src/java/org/apache/hadoop/hive/ql/log/PidDailyRollingFileAppender.java
  85. +55 −0 ql/src/java/org/apache/hadoop/hive/ql/metadata/AuthorizationException.java
  86. +275 −75 ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
  87. +55 −0 ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveUtils.java
  88. +6 −6 ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
  89. +2 −3 ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java
  90. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java
  91. +5 −1 ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
  92. +407 −46 ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
  93. +1 −0 ql/src/java/org/apache/hadoop/hive/ql/parse/ErrorMsg.java
  94. +13 −0 ql/src/java/org/apache/hadoop/hive/ql/parse/FunctionSemanticAnalyzer.java
  95. +194 −15 ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g
  96. +5 −0 ql/src/java/org/apache/hadoop/hive/ql/parse/ParseDriver.java
  97. +42 −2 ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java
  98. +79 −22 ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
  99. +74 −50 ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzerFactory.java
  100. +104 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/AlterDatabaseDesc.java
  101. +141 −70 ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java
  102. +114 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/DDLWork.java
  103. +131 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/GrantDesc.java
  104. +115 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/GrantRevokeRoleDDL.java
  105. +185 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/HiveOperation.java
  106. +106 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/LoadMultiFilesDesc.java
  107. +3 −3 ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java
  108. +10 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/MoveWork.java
  109. +1 −1 ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
  110. +62 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/PrincipalDesc.java
  111. +74 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/PrivilegeDesc.java
  112. +70 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/PrivilegeObjectDesc.java
  113. +70 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/RevokeDesc.java
  114. +127 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java
  115. +78 −0 ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java
  116. +77 −0 ql/src/java/org/apache/hadoop/hive/ql/security/HadoopDefaultAuthenticator.java
  117. +38 −0 ql/src/java/org/apache/hadoop/hive/ql/security/HiveAuthenticationProvider.java
  118. +495 −0 ql/src/java/org/apache/hadoop/hive/ql/security/authorization/DefaultHiveAuthorizationProvider.java
  119. +132 −0 ql/src/java/org/apache/hadoop/hive/ql/security/authorization/HiveAuthorizationProvider.java
  120. +61 −0 ql/src/java/org/apache/hadoop/hive/ql/security/authorization/HiveAuthorizationProviderBase.java
  121. +102 −0 ql/src/java/org/apache/hadoop/hive/ql/security/authorization/Privilege.java
  122. +51 −0 ql/src/java/org/apache/hadoop/hive/ql/security/authorization/PrivilegeRegistry.java
  123. +57 −0 ql/src/java/org/apache/hadoop/hive/ql/security/authorization/PrivilegeScope.java
  124. +124 −0 ql/src/java/org/apache/hadoop/hive/ql/session/CreateTableAutomaticGrant.java
  125. +64 −4 ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
  126. +29 −3 ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
  127. +2 −4 ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java
  128. +2 −2 ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java
  129. +2 −0 ql/src/test/org/apache/hadoop/hive/ql/metadata/TestSemanticAnalyzerHookLoading.java
  130. +46 −0 ql/src/test/org/apache/hadoop/hive/ql/security/DummyAuthenticator.java
  131. +9 −0 ql/src/test/queries/clientnegative/authorization_fail_1.q
  132. +9 −0 ql/src/test/queries/clientnegative/authorization_fail_2.q
  133. +12 −0 ql/src/test/queries/clientnegative/authorization_fail_3.q
  134. +15 −0 ql/src/test/queries/clientnegative/authorization_fail_4.q
  135. +20 −0 ql/src/test/queries/clientnegative/authorization_fail_5.q
  136. +5 −0 ql/src/test/queries/clientnegative/authorization_fail_6.q
  137. +16 −0 ql/src/test/queries/clientnegative/authorization_fail_7.q
  138. +35 −0 ql/src/test/queries/clientnegative/authorization_part.q
  139. +3 −0 ql/src/test/queries/clientnegative/drop_function_failure.q
  140. +3 −0 ql/src/test/queries/clientnegative/drop_index_failure.q
  141. +11 −0 ql/src/test/queries/clientnegative/drop_partition_failure.q
  142. +3 −0 ql/src/test/queries/clientnegative/drop_table_failure1.q
  143. +3 −0 ql/src/test/queries/clientnegative/drop_table_failure2.q
  144. +3 −5 ql/src/test/queries/clientnegative/drop_view_failure2.q
  145. +2 −0 ql/src/test/queries/clientnegative/having1.q
  146. +89 −0 ql/src/test/queries/clientpositive/authorization_1.q
  147. +111 −0 ql/src/test/queries/clientpositive/authorization_2.q
  148. +19 −0 ql/src/test/queries/clientpositive/authorization_3.q
  149. +9 −0 ql/src/test/queries/clientpositive/authorization_4.q
  150. +18 −0 ql/src/test/queries/clientpositive/authorization_5.q
  151. +11 −0 ql/src/test/queries/clientpositive/database_properties.q
  152. +2 −0 ql/src/test/queries/clientpositive/drop_function.q
  153. +2 −0 ql/src/test/queries/clientpositive/drop_index.q
  154. +3 −1 ql/src/test/queries/clientpositive/drop_multi_partitions.q
  155. +2 −0 ql/src/test/queries/clientpositive/drop_table.q
  156. +2 −0 ql/src/test/queries/clientpositive/drop_view.q
  157. +14 −0 ql/src/test/queries/clientpositive/having.q
  158. +1 −1 ql/src/test/queries/clientpositive/input19.q
  159. +17 −0 ql/src/test/queries/clientpositive/keyword_1.q
  160. +1 −1 ql/src/test/queries/clientpositive/lateral_view.q
  161. +21 −0 ql/src/test/queries/clientpositive/load_fs.q
  162. +15 −0 ql/src/test/queries/clientpositive/load_overwrite.q
  163. +27 −0 ql/src/test/queries/clientpositive/merge_dynamic_partition2.q
  164. +38 −0 ql/src/test/queries/clientpositive/merge_dynamic_partition3.q
  165. +4 −0 ql/src/test/queries/clientpositive/partition_serde_format.q
  166. +19 −0 ql/src/test/queries/clientpositive/partition_special_char.q
  167. +2 −0 ql/src/test/queries/clientpositive/show_indexes_edge_cases.q
  168. +17 −0 ql/src/test/results/clientnegative/authorization_fail_1.q.out
  169. +10 −0 ql/src/test/results/clientnegative/authorization_fail_2.q.out
  170. +37 −0 ql/src/test/results/clientnegative/authorization_fail_3.q.out
  171. +75 −0 ql/src/test/results/clientnegative/authorization_fail_4.q.out
  172. +122 −0 ql/src/test/results/clientnegative/authorization_fail_5.q.out
  173. +10 −0 ql/src/test/results/clientnegative/authorization_fail_6.q.out
  174. +44 −0 ql/src/test/results/clientnegative/authorization_fail_7.q.out
  175. +250 −0 ql/src/test/results/clientnegative/authorization_part.q.out
  176. +1 −0 ql/src/test/results/clientnegative/drop_function_failure.q.out
  177. +1 −0 ql/src/test/results/clientnegative/drop_index_failure.q.out
  178. +34 −0 ql/src/test/results/clientnegative/drop_partition_failure.q.out
  179. +1 −0 ql/src/test/results/clientnegative/drop_table_failure1.q.out
  180. +14 −0 ql/src/test/results/clientnegative/drop_table_failure2.q.out
  181. +1 −19 ql/src/test/results/clientnegative/drop_view_failure2.q.out
  182. +1 −0 ql/src/test/results/clientnegative/having1.q.out
  183. +1 −1 ql/src/test/results/clientnegative/invalid_create_tbl2.q.out
  184. +1 −1 ql/src/test/results/clientnegative/lockneg5.q.out
  185. +8 −8 ql/src/test/results/clientpositive/alter4.q.out
  186. +412 −0 ql/src/test/results/clientpositive/authorization_1.q.out
  187. +1,184 −0 ql/src/test/results/clientpositive/authorization_2.q.out
  188. +87 −0 ql/src/test/results/clientpositive/authorization_3.q.out
  189. +55 −0 ql/src/test/results/clientpositive/authorization_4.q.out
  190. +80 −0 ql/src/test/results/clientpositive/authorization_5.q.out
  191. +34 −34 ql/src/test/results/clientpositive/bucket_groupby.q.out
  192. +5 −5 ql/src/test/results/clientpositive/create_default_prop.q.out
  193. +56 −56 ql/src/test/results/clientpositive/ctas.q.out
  194. +17 −4 ql/src/test/results/clientpositive/database_properties.q.out
  195. +4 −0 ql/src/test/results/clientpositive/drop_function.q.out
  196. +4 −0 ql/src/test/results/clientpositive/drop_index.q.out
  197. +11 −0 ql/src/test/results/clientpositive/drop_multi_partitions.q.out
  198. +4 −0 ql/src/test/results/clientpositive/drop_table.q.out
  199. +4 −0 ql/src/test/results/clientpositive/drop_view.q.out
  200. +1,282 −0 ql/src/test/results/clientpositive/having.q.out
  201. +4 −4 ql/src/test/results/clientpositive/input19.q.out
  202. +128 −0 ql/src/test/results/clientpositive/keyword_1.q.out
  203. +27 −27 ql/src/test/results/clientpositive/lateral_view.q.out
  204. +135 −0 ql/src/test/results/clientpositive/load_fs.q.out
  205. +125 −0 ql/src/test/results/clientpositive/load_overwrite.q.out
  206. +94 −91 ql/src/test/results/clientpositive/merge3.q.out
  207. +163 −0 ql/src/test/results/clientpositive/merge_dynamic_partition2.q.out
  208. +243 −0 ql/src/test/results/clientpositive/merge_dynamic_partition3.q.out
  209. +55 −0 ql/src/test/results/clientpositive/partition_serde_format.q.out
  210. +109 −0 ql/src/test/results/clientpositive/partition_special_char.q.out
  211. +14 −14 ql/src/test/results/clientpositive/query_result_fileformat.q.out
  212. +8 −8 ql/src/test/results/clientpositive/rcfile_default_format.q.out
  213. +74 −74 ql/src/test/results/clientpositive/semijoin.q.out
  214. +34 −0 ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out
  215. +5 −5 ql/src/test/results/clientpositive/smb_mapjoin9.q.out
  216. +9 −9 ql/src/test/results/clientpositive/stats10.q.out
  217. +21 −21 ql/src/test/results/clientpositive/stats12.q.out
  218. +16 −16 ql/src/test/results/clientpositive/stats13.q.out
  219. +6 −6 ql/src/test/results/clientpositive/stats2.q.out
  220. +7 −7 ql/src/test/results/clientpositive/stats5.q.out
  221. +9 −9 ql/src/test/results/clientpositive/stats6.q.out
  222. +7 −7 ql/src/test/results/clientpositive/stats7.q.out
  223. +30 −30 ql/src/test/results/clientpositive/stats8.q.out
  224. +5 −5 ql/src/test/results/clientpositive/stats9.q.out
  225. +12 −12 ql/src/test/results/clientpositive/str_to_map.q.out
  226. +14 −14 ql/src/test/results/clientpositive/updateAccessTime.q.out
  227. +125 −27 ql/src/test/results/compiler/plan/case_sensitivity.q.xml
  228. +102 −12 ql/src/test/results/compiler/plan/cast1.q.xml
  229. +107 −17 ql/src/test/results/compiler/plan/groupby1.q.xml
  230. +102 −12 ql/src/test/results/compiler/plan/groupby2.q.xml
  231. +102 −12 ql/src/test/results/compiler/plan/groupby3.q.xml
  232. +102 −12 ql/src/test/results/compiler/plan/groupby4.q.xml
  233. +102 −12 ql/src/test/results/compiler/plan/groupby5.q.xml
  234. +102 −12 ql/src/test/results/compiler/plan/groupby6.q.xml
  235. +117 −27 ql/src/test/results/compiler/plan/input1.q.xml
  236. +151 −61 ql/src/test/results/compiler/plan/input2.q.xml
  237. +102 −12 ql/src/test/results/compiler/plan/input20.q.xml
  238. +162 −72 ql/src/test/results/compiler/plan/input3.q.xml
  239. +107 −17 ql/src/test/results/compiler/plan/input4.q.xml
  240. +115 −17 ql/src/test/results/compiler/plan/input5.q.xml
  241. +117 −27 ql/src/test/results/compiler/plan/input6.q.xml
  242. +117 −27 ql/src/test/results/compiler/plan/input7.q.xml
  243. +102 −12 ql/src/test/results/compiler/plan/input8.q.xml
  244. +117 −27 ql/src/test/results/compiler/plan/input9.q.xml
  245. +110 −12 ql/src/test/results/compiler/plan/input_part1.q.xml
  246. +117 −27 ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
  247. +110 −12 ql/src/test/results/compiler/plan/input_testxpath.q.xml
  248. +110 −12 ql/src/test/results/compiler/plan/input_testxpath2.q.xml
  249. +156 −21 ql/src/test/results/compiler/plan/join1.q.xml
  250. +261 −36 ql/src/test/results/compiler/plan/join2.q.xml
  251. +205 −25 ql/src/test/results/compiler/plan/join3.q.xml
  252. +151 −16 ql/src/test/results/compiler/plan/join4.q.xml
  253. +151 −16 ql/src/test/results/compiler/plan/join5.q.xml
  254. +151 −16 ql/src/test/results/compiler/plan/join6.q.xml
  255. +200 −20 ql/src/test/results/compiler/plan/join7.q.xml
  256. +151 −16 ql/src/test/results/compiler/plan/join8.q.xml
  257. +110 −12 ql/src/test/results/compiler/plan/sample1.q.xml
  258. +125 −27 ql/src/test/results/compiler/plan/sample2.q.xml
  259. +125 −27 ql/src/test/results/compiler/plan/sample3.q.xml
  260. +125 −27 ql/src/test/results/compiler/plan/sample4.q.xml
  261. +125 −27 ql/src/test/results/compiler/plan/sample5.q.xml
  262. +125 −27 ql/src/test/results/compiler/plan/sample6.q.xml
  263. +125 −27 ql/src/test/results/compiler/plan/sample7.q.xml
  264. +111 −21 ql/src/test/results/compiler/plan/subq.q.xml
  265. +102 −12 ql/src/test/results/compiler/plan/udf1.q.xml
  266. +102 −12 ql/src/test/results/compiler/plan/udf4.q.xml
  267. +102 −12 ql/src/test/results/compiler/plan/udf6.q.xml
  268. +102 −12 ql/src/test/results/compiler/plan/udf_case.q.xml
  269. +102 −12 ql/src/test/results/compiler/plan/udf_when.q.xml
  270. +160 −25 ql/src/test/results/compiler/plan/union.q.xml
  271. +43 −9 shims/build.xml
  272. +5 −0 shims/src/0.20/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
  273. +14 −1 shims/src/0.20S/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
  274. +52 −0 shims/src/0.20S/java/org/apache/hadoop/hive/thrift/DelegationTokenIdentifier.java
  275. +94 −0 shims/src/0.20S/java/org/apache/hadoop/hive/thrift/DelegationTokenSecretManager.java
  276. +33 −0 shims/src/0.20S/java/org/apache/hadoop/hive/thrift/DelegationTokenSelector.java
  277. +397 −163 shims/src/0.20S/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge20S.java
  278. +22 −4 shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java
  279. +21 −3 shims/src/common/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java
  280. +195 −0 shims/src/test/org/apache/hadoop/hive/thrift/TestHadoop20SAuthBridge.java
View
@@ -6,6 +6,8 @@ Trunk - Unreleased
NEW FEATURES
+ HIVE-1790. Support HAVING clause in Hive (Vaibhav Aggarwal via cws)
+
HIVE-1304. Add function row_sequence in contrib (John Sichi via namit)
HIVE-1405. Add ability to run an initialization script by 'hive -i <fileName>' (John Sichi via namit)
@@ -127,8 +129,34 @@ Trunk - Unreleased
HIVE-842 Authentication Infrastructure for Hive
(Ashutosh Chauhan via He Yongqiang)
+ HIVE-1853 Downrgrade JDO (Paul Yang via namit)
+
+ HIVE-1835 Better auto-complete for Hive
+ (Paul Butler via Ning Zhang)
+
+ HIVE-1856 Implement DROP TABLE/VIEW IF EXISTS
+ (Marcel Kornacker via jvs)
+
+ HIVE-1858 Implement DROP {PARTITION, INDEX, TEMPORARY FUNCTION} IF EXISTS
+ (Marcel Kornacker via jvs)
+
+ HIVE-78 Authorization model for Hive
+ (Yongqiang He via namit)
+
+ HIVE-1696 Add delegation token support to metastore
+ (Devaraj Das via namit)
+
+ HIVE-1862 Revive partition filtering in the Hive MetaStore
+ (Mac Yang via pauly)
+
IMPROVEMENTS
+ HIVE-1692. FetchOperator.getInputFormatFromCache hides causal exception (Philip Zeyliger via cws)
+
+ HIVE-1899 Add a factory method for creating a synchronized wrapper for IMetaStoreClient (John Sichi via cws)
+
+ HIVE-1852 Reduce unnecessary DFSClient.rename() calls (Ning Zhang via jssarma)
+
HIVE-1712. Migrating metadata from derby to mysql thrown NullPointerException (Jake Farrell via pauly)
HIVE-1394. Do not update transient_lastDdlTime if the partition is modified by a housekeeping
@@ -306,10 +334,29 @@ Trunk - Unreleased
HIVE-1415: add CLI command for executing a SQL script
(Edward Capriolo via jvs)
+ HIVE-1855 Include Process ID in the log4j log file name
+ (Ning Zhang via namit)
+
+ HIVE-1878 Set the version of Hive trunk to '0.7.0-SNAPSHOT' to avoid
+ confusing it with a release
+ (Carl Steinbach via jvs)
+
+ HIVE-1907 Store jobid in ExecDriver
+ (namit via He Yongqiang)
+
+ HIVE-1865 redo zookeeper hive lock manager
+ (namit via He Yongqiang)
+
OPTIMIZATIONS
BUG FIXES
+ HIVE-1915. Authorization on database level is broken.
+ (He Yongqiang via cws)
+
+ HIVE-1203. HiveInputFormat.getInputFormatFromCache "swallows" cause exception when trowing IOExcpetion
+ (Vladimir Klimontovich via cws)
+
HIVE-1524. Parallel Execution fails if mapred.job.name is set
(Ning Zhang via jssarma)
@@ -617,6 +664,55 @@ Trunk - Unreleased
HIVE-1845 Some attributes in eclipse template file are deprecated
(Liyin Tang via namit)
+ HIVE-1854 Temporarily disable metastore tests for listPartitionsByFilter()
+ (Paul Yang via namit)
+
+ HIVE-1857 mixed case tablename on lefthand side of LATERAL VIEW results in
+ query failing with confusing error message (John Sichi via pauly)
+
+ HIVE-1456 No need to check for LOG as null in sort-merge join
+ (Alexey Diomin via namit)
+
+ HIVE-1806 Merge per dynamic partition based on size of each dynamic partition
+ (Ning Zhang via namit)
+
+ HIVE-1864 Fix test load_overwrite..q
+ (Carl Steinbach via namit)
+
+ HIVE-1870 Add TestRemoveHiveMetaStore deleted accidently
+ (Carl Steinbach via namit)
+
+ HIVE-1873 Fix 'tar' build target broken in HIVE-1526
+ (Carl Steinbach via namit)
+
+ HIVE-1874 fix HBase filter pushdown broken by HIVE-1638
+ (John Sichi via namit)
+
+ HIVE-1871 Bug in merging dynamic partitions introduced by HIVE-1806
+ (He Yongqiag via namit)
+
+ HIVE-1881 Add an option to use FsShell to delete dir in warehouse
+ (He Yongqiang via namit)
+
+ HIVE-1840 Support ALTER DATABASE to change database properties
+ (Ning Zhang via namit)
+
+ HIVE-1889 add an option (hive.index.compact.file.ignore.hdfs)
+ to ignore HDFS location stored in index files
+ (Yongqiang He via namit)
+
+ HIVE-1903 Can't join HBase tables if one's name is the beginning of
+ the other (John Sichi via namit)
+
+ HIVE-1912 Double escaping special chars when removing old partitions
+ in rmr (Ning Zhang via namit)
+
+ HIVE-1913 use partition level serde properties
+ (Yongiang He via namit)
+
+ HIVE-1917 CTAS (create-table-as-select) throws exception when showing
+ results (Ning Zhang via namit)
+
TESTS
HIVE-1464. improve test query performance
@@ -636,6 +732,9 @@ Trunk - Unreleased
HIVE-1658. Fix describe [extended] column formatting
(Thiruvel Thirumoolan via Ning Zhang)
+ HIVE-1829. Fix intermittent failures in TestRemoteMetaStore
+ (Carl Steinbach via jvs)
+
TASKS
HIVE-1526. Hive should depend on a release version of Thrift
View
@@ -453,6 +453,13 @@
</junit>
<fail if="tests.failed">Tests failed!</fail>
</target>
+ <target name="test-shims">
+ <subant target="test">
+ <property name="hadoop.version" value="${hadoop.security.version}"/>
+ <property name="hadoop.security.version" value="${hadoop.security.version}"/>
+ <fileset dir="${hive.root}/shims" includes="build.xml"/>
+ </subant>
+ </target>
<target name="clean-test">
<delete dir="${test.build.dir}"/>
View
@@ -1,7 +1,7 @@
Name=Hive
name=hive
-version=0.7.0
-year=2010
+version=0.7.0-SNAPSHOT
+year=2011
javac.debug=on
javac.version=1.6
View
@@ -126,6 +126,17 @@
</sequential>
</macrodef>
+ <macrodef name="iterate-test-dirs">
+ <attribute name="target"/>
+ <sequential>
+ <subant target="@{target}">
+ <property name="build.dir.hive" location="${build.dir.hive}"/>
+ <property name="is-offline" value="${is-offline}"/>
+ <filelist dir="." files="common/build.xml,serde/build.xml,metastore/build.xml,ql/build.xml,cli/build.xml,contrib/build.xml,service/build.xml,jdbc/build.xml,hwi/build.xml${hbase.iterate}"/>
+ </subant>
+ </sequential>
+ </macrodef>
+
<macrodef name="iterate">
<attribute name="target"/>
<sequential>
@@ -207,7 +218,8 @@
<target name="test"
depends="clean-test,jar"
description="Run tests">
- <iterate target="test"/>
+ <antcall target="test-shims"/>
+ <iterate-test-dirs target="test"/>
</target>
<!-- create an html report from junit output files -->
@@ -497,7 +509,7 @@
<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="${build.dir.hive}/ql/gen/antlr/gen-java"/>
<packageset dir="shims/src/common/java"/>
<packageset dir="howl/src/java"/>
@@ -32,7 +32,10 @@
import java.util.Map;
import java.util.Set;
+import jline.Completor;
import jline.ArgumentCompletor;
+import jline.ArgumentCompletor.ArgumentDelimiter;
+import jline.ArgumentCompletor.AbstractArgumentDelimiter;
import jline.ConsoleReader;
import jline.History;
import jline.SimpleCompletor;
@@ -43,6 +46,8 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.Driver;
+import org.apache.hadoop.hive.ql.parse.ParseDriver;
+import org.apache.hadoop.hive.ql.exec.FunctionRegistry;
import org.apache.hadoop.hive.ql.exec.Utilities;
import org.apache.hadoop.hive.ql.exec.Utilities.StreamPrinter;
import org.apache.hadoop.hive.ql.processors.CommandProcessor;
@@ -295,6 +300,71 @@ public void processInitFiles(CliSessionState ss) throws IOException {
ss.setIsSilent(saveSilent);
}
+ public static Completor getCommandCompletor () {
+ // SimpleCompletor matches against a pre-defined wordlist
+ // We start with an empty wordlist and build it up
+ SimpleCompletor sc = new SimpleCompletor(new String[0]);
+
+ // We add Hive function names
+ // For functions that aren't infix operators, we add an open
+ // parenthesis at the end.
+ for (String s : FunctionRegistry.getFunctionNames()) {
+ if (s.matches("[a-z_]+")) {
+ sc.addCandidateString(s + "(");
+ } else {
+ sc.addCandidateString(s);
+ }
+ }
+
+ // We add Hive keywords, including lower-cased versions
+ for (String s : ParseDriver.getKeywords()) {
+ sc.addCandidateString(s);
+ sc.addCandidateString(s.toLowerCase());
+ }
+
+ // Because we use parentheses in addition to whitespace
+ // as a keyword delimiter, we need to define a new ArgumentDelimiter
+ // that recognizes parenthesis as a delimiter.
+ ArgumentDelimiter delim = new AbstractArgumentDelimiter () {
+ public boolean isDelimiterChar (String buffer, int pos) {
+ char c = buffer.charAt(pos);
+ return (Character.isWhitespace(c) || c == '(' || c == ')' ||
+ c == '[' || c == ']');
+ }
+ };
+
+ // The ArgumentCompletor allows us to match multiple tokens
+ // in the same line.
+ final ArgumentCompletor ac = new ArgumentCompletor(sc, delim);
+ // By default ArgumentCompletor is in "strict" mode meaning
+ // a token is only auto-completed if all prior tokens
+ // match. We don't want that since there are valid tokens
+ // that are not in our wordlist (eg. table and column names)
+ ac.setStrict(false);
+
+ // ArgumentCompletor always adds a space after a matched token.
+ // This is undesirable for function names because a space after
+ // the opening parenthesis is unnecessary (and uncommon) in Hive.
+ // We stack a custom Completor on top of our ArgumentCompletor
+ // to reverse this.
+ Completor completor = new Completor () {
+ public int complete (String buffer, int offset, List completions) {
+ List<String> comp = (List<String>) completions;
+ int ret = ac.complete(buffer, offset, completions);
+ // ConsoleReader will do the substitution if and only if there
+ // is exactly one valid completion, so we ignore other cases.
+ if (completions.size() == 1) {
+ if (comp.get(0).endsWith("( ")) {
+ comp.set(0, comp.get(0).trim());
+ }
+ }
+ return ret;
+ }
+ };
+
+ return completor;
+ }
+
public static void main(String[] args) throws Exception {
OptionsProcessor oproc = new OptionsProcessor();
@@ -361,11 +431,7 @@ public static void main(String[] args) throws Exception {
ConsoleReader reader = new ConsoleReader();
reader.setBellEnabled(false);
// reader.setDebug(new PrintWriter(new FileWriter("writer.debug", true)));
-
- List<SimpleCompletor> completors = new LinkedList<SimpleCompletor>();
- completors.add(new SimpleCompletor(new String[] {"set", "from", "create", "load", "describe",
- "quit", "exit"}));
- reader.addCompletor(new ArgumentCompletor(completors));
+ reader.addCompletor(getCommandCompletor());
String line;
final String HISTORYFILE = ".hivehistory";
@@ -54,7 +54,7 @@
HiveConf.ConfVars.METASTOREDIRECTORY,
HiveConf.ConfVars.METASTOREWAREHOUSE,
HiveConf.ConfVars.METASTOREURIS,
- HiveConf.ConfVars.METATORETHRIFTRETRIES,
+ HiveConf.ConfVars.METASTORETHRIFTRETRIES,
HiveConf.ConfVars.METASTOREPWD,
HiveConf.ConfVars.METASTORECONNECTURLHOOK,
HiveConf.ConfVars.METASTORECONNECTURLKEY,
@@ -106,6 +106,9 @@
// run in local mode only if number of tasks (for map and reduce each) is
// less than this
LOCALMODEMAXTASKS("hive.exec.mode.local.auto.tasks.max", 4),
+ // if true, DROP TABLE/VIEW does not fail if table/view doesn't exist and IF EXISTS is
+ // not specified
+ DROPIGNORESNONEXISTENT("hive.exec.drop.ignorenonexistent", true),
// hadoop stuff
HADOOPBIN("hadoop.bin.path", System.getenv("HADOOP_HOME") + "/bin/hadoop"),
@@ -125,7 +128,11 @@
METASTOREWAREHOUSE("hive.metastore.warehouse.dir", ""),
METASTOREURIS("hive.metastore.uris", ""),
// Number of times to retry a connection to a Thrift metastore server
- METATORETHRIFTRETRIES("hive.metastore.connect.retries", 1),
+ METASTORETHRIFTRETRIES("hive.metastore.connect.retries", 5),
+ // Number of seconds the client should wait between connection attempts
+ METASTORE_CLIENT_CONNECT_RETRY_DELAY("hive.metastore.client.connect.retry.delay", 1),
+ // Socket timeout for the client connection (in seconds)
+ METASTORE_CLIENT_SOCKET_TIMEOUT("hive.metastore.client.socket.timeout", 20),
METASTOREPWD("javax.jdo.option.ConnectionPassword", ""),
// Class name of JDO connection url hook
METASTORECONNECTURLHOOK("hive.metastore.ds.connection.url.hook", ""),
@@ -161,6 +168,8 @@
// CLI
CLIIGNOREERRORS("hive.cli.errors.ignore", false),
+ HIVE_METASTORE_FS_HANDLER_CLS("hive.metastore.fs.handler.class", "org.apache.hadoop.hive.metastore.HiveMetaStoreFsImpl"),
+
// Things we log in the jobconf
// session identifier
@@ -253,8 +262,8 @@
HIVECONVERTJOIN("hive.auto.convert.join", false),
HIVESKEWJOINKEY("hive.skewjoin.key", 1000000),
HIVESKEWJOINMAPJOINNUMMAPTASK("hive.skewjoin.mapjoin.map.tasks", 10000),
- HIVESKEWJOINMAPJOINMINSPLIT("hive.skewjoin.mapjoin.min.split", 33554432), //32M
- MAPREDMINSPLITSIZE("mapred.min.split.size", 1),
+ HIVESKEWJOINMAPJOINMINSPLIT("hive.skewjoin.mapjoin.min.split", 33554432L), //32M
+ MAPREDMINSPLITSIZE("mapred.min.split.size", 1L),
HIVEMERGEMAPONLY("hive.mergejob.maponly", true),
HIVESENDHEARTBEAT("hive.heartbeat.interval", 1000),
@@ -308,6 +317,7 @@
HIVE_ZOOKEEPER_CLIENT_PORT("hive.zookeeper.client.port", ""),
HIVE_ZOOKEEPER_SESSION_TIMEOUT("hive.zookeeper.session.timeout", 600*1000),
HIVE_ZOOKEEPER_NAMESPACE("hive.zookeeper.namespace", "hive_zookeeper_namespace"),
+ HIVE_ZOOKEEPER_CLEAN_EXTRA_NODES("hive.zookeeper.clean.extra.nodes", false),
// For HBase storage handler
HIVE_HBASE_WAL_ENABLED("hive.hbase.wal.enabled", true),
@@ -325,11 +335,19 @@
SEMANTIC_ANALYZER_HOOK("hive.semantic.analyzer.hook",null),
+ HIVE_AUTHORIZATION_ENABLED("hive.security.authorization.enabled", false),
+ HIVE_AUTHORIZATION_MANAGER("hive.security.authorization.manager", null),
+ HIVE_AUTHENTICATOR_MANAGER("hive.security.authenticator.manager", null),
+
+ HIVE_AUTHORIZATION_TABLE_USER_GRANTS("hive.security.authorization.createtable.user.grants", null),
+ HIVE_AUTHORIZATION_TABLE_GROUP_GRANTS("hive.security.authorization.createtable.group.grants", null),
+ HIVE_AUTHORIZATION_TABLE_ROLE_GRANTS("hive.security.authorization.createtable.role.grants", null),
// Print column names in output
HIVE_CLI_PRINT_HEADER("hive.cli.print.header", false),
- HIVE_ERROR_ON_EMPTY_PARTITION("hive.error.on.empty.partition", false);
+ HIVE_ERROR_ON_EMPTY_PARTITION("hive.error.on.empty.partition", false),
+ HIVE_INDEX_IGNORE_HDFS_LOC("hive.index.compact.file.ignore.hdfs", false),
;
Oops, something went wrong.

0 comments on commit 32eacdf

Please sign in to comment.