HIVE-14671 : merge master into hive-14535 (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f159b5a1 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f159b5a1 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f159b5a1 Branch: refs/heads/hive-14535 Commit: f159b5a198aa04e34c78ebc8159d2525146d8c9b Parents: a02a61b b8aad36 Author: sergey <[email protected]> Authored: Thu Sep 28 20:35:00 2017 -0700 Committer: sergey <[email protected]> Committed: Thu Sep 28 20:35:00 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/conf/HiveConf.java | 3 + data/conf/perf-reg/spark/hive-site.xml | 268 ++ .../hadoop/hive/druid/DruidStorageHandler.java | 59 +- .../hive/druid/DruidStorageHandlerUtils.java | 488 ++- .../druid/io/DruidQueryBasedInputFormat.java | 66 +- .../serde/DruidGroupByQueryRecordReader.java | 225 +- .../druid/serde/DruidQueryRecordReader.java | 215 +- .../serde/DruidSelectQueryRecordReader.java | 26 +- .../hadoop/hive/druid/serde/DruidSerDe.java | 18 +- .../hive/druid/serde/DruidSerDeUtils.java | 27 +- .../serde/DruidTimeseriesQueryRecordReader.java | 22 +- .../druid/serde/DruidTopNQueryRecordReader.java | 38 +- .../hadoop/hive/druid/TestDruidSerDe.java | 918 ----- .../hive/druid/TestDruidStorageHandler.java | 153 +- .../hadoop/hive/druid/serde/TestDruidSerDe.java | 991 ++++++ .../apache/hive/hcatalog/common/HCatUtil.java | 24 +- .../hcatalog/mapreduce/HCatBaseInputFormat.java | 8 +- .../hive/hcatalog/streaming/HiveEndPoint.java | 26 +- .../hcatalog/streaming/TransactionBatch.java | 12 +- .../hive/hcatalog/streaming/TestStreaming.java | 13 +- .../hive/hcatalog/api/TestHCatClient.java | 7 + .../hadoop/hive/ql/parse/TestCopyUtils.java | 8 +- .../hadoop/hive/ql/parse/TestExportImport.java | 2 + .../hive/ql/parse/TestReplicationScenarios.java | 39 + ...TestReplicationScenariosAcrossInstances.java | 2 + .../hadoop/hive/cli/TestSparkPerfCliDriver.java | 62 + .../hadoop/hive/cli/TestPerfCliDriver.java | 62 - .../hadoop/hive/cli/TestTezPerfCliDriver.java | 62 + .../test/resources/testconfiguration.properties | 2 + .../hadoop/hive/cli/control/CliConfigs.java | 32 +- .../hadoop/hive/llap/LlapRowRecordReader.java | 7 +- .../hadoop/hive/metastore/HiveMetaStore.java | 41 + .../hadoop/hive/metastore/MetaStoreUtils.java | 26 + .../physical/SparkCrossProductCheck.java | 2 +- .../hadoop/hive/ql/parse/SemanticAnalyzer.java | 3 +- .../apache/hadoop/hive/ql/plan/SparkWork.java | 4 +- .../queries/clientpositive/input_lazyserde2.q | 53 + .../clientpositive/input_lazyserde2.q.out | 844 +++++ .../clientpositive/perf/spark/query1.q.out | 340 ++ .../clientpositive/perf/spark/query10.q.out | 533 +++ .../clientpositive/perf/spark/query11.q.out | 683 ++++ .../clientpositive/perf/spark/query12.q.out | 249 ++ .../clientpositive/perf/spark/query13.q.out | 339 ++ .../clientpositive/perf/spark/query14.q.out | 3237 ++++++++++++++++++ .../clientpositive/perf/spark/query15.q.out | 223 ++ .../clientpositive/perf/spark/query16.q.out | 363 ++ .../clientpositive/perf/spark/query17.q.out | 409 +++ .../clientpositive/perf/spark/query18.q.out | 360 ++ .../clientpositive/perf/spark/query19.q.out | 306 ++ .../clientpositive/perf/spark/query2.q.out | 429 +++ .../clientpositive/perf/spark/query20.q.out | 241 ++ .../clientpositive/perf/spark/query21.q.out | 245 ++ .../clientpositive/perf/spark/query22.q.out | 218 ++ .../clientpositive/perf/spark/query23.q.out | 1110 ++++++ .../clientpositive/perf/spark/query24.q.out | 610 ++++ .../clientpositive/perf/spark/query25.q.out | 415 +++ .../clientpositive/perf/spark/query26.q.out | 253 ++ .../clientpositive/perf/spark/query27.q.out | 265 ++ .../clientpositive/perf/spark/query28.q.out | 517 +++ .../clientpositive/perf/spark/query29.q.out | 415 +++ .../clientpositive/perf/spark/query3.q.out | 183 + .../clientpositive/perf/spark/query30.q.out | 424 +++ .../clientpositive/perf/spark/query31.q.out | 815 +++++ .../clientpositive/perf/spark/query32.q.out | 284 ++ .../clientpositive/perf/spark/query33.q.out | 683 ++++ .../clientpositive/perf/spark/query34.q.out | 273 ++ .../clientpositive/perf/spark/query35.q.out | 524 +++ .../clientpositive/perf/spark/query36.q.out | 282 ++ .../clientpositive/perf/spark/query37.q.out | 192 ++ .../clientpositive/perf/spark/query38.q.out | 458 +++ .../clientpositive/perf/spark/query39.q.out | 473 +++ .../clientpositive/perf/spark/query4.q.out | 986 ++++++ .../clientpositive/perf/spark/query40.q.out | 274 ++ .../clientpositive/perf/spark/query42.q.out | 191 ++ .../clientpositive/perf/spark/query43.q.out | 184 + .../clientpositive/perf/spark/query44.q.out | 486 +++ .../clientpositive/perf/spark/query45.q.out | 374 ++ .../clientpositive/perf/spark/query46.q.out | 355 ++ .../clientpositive/perf/spark/query47.q.out | 771 +++++ .../clientpositive/perf/spark/query48.q.out | 329 ++ .../clientpositive/perf/spark/query49.q.out | 876 +++++ .../clientpositive/perf/spark/query5.q.out | 740 ++++ .../clientpositive/perf/spark/query50.q.out | 333 ++ .../clientpositive/perf/spark/query51.q.out | 383 +++ .../clientpositive/perf/spark/query52.q.out | 188 + .../clientpositive/perf/spark/query53.q.out | 267 ++ .../clientpositive/perf/spark/query54.q.out | 742 ++++ .../clientpositive/perf/spark/query55.q.out | 168 + .../clientpositive/perf/spark/query56.q.out | 669 ++++ .../clientpositive/perf/spark/query57.q.out | 765 +++++ .../clientpositive/perf/spark/query58.q.out | 944 +++++ .../clientpositive/perf/spark/query59.q.out | 445 +++ .../clientpositive/perf/spark/query6.q.out | 459 +++ .../clientpositive/perf/spark/query60.q.out | 691 ++++ .../clientpositive/perf/spark/query61.q.out | 586 ++++ .../clientpositive/perf/spark/query63.q.out | 269 ++ .../clientpositive/perf/spark/query65.q.out | 333 ++ .../clientpositive/perf/spark/query66.q.out | 873 +++++ .../clientpositive/perf/spark/query67.q.out | 315 ++ .../clientpositive/perf/spark/query68.q.out | 363 ++ .../clientpositive/perf/spark/query69.q.out | 516 +++ .../clientpositive/perf/spark/query7.q.out | 253 ++ .../clientpositive/perf/spark/query70.q.out | 429 +++ .../clientpositive/perf/spark/query71.q.out | 343 ++ .../clientpositive/perf/spark/query72.q.out | 489 +++ .../clientpositive/perf/spark/query73.q.out | 261 ++ .../clientpositive/perf/spark/query74.q.out | 639 ++++ .../clientpositive/perf/spark/query75.q.out | 898 +++++ .../clientpositive/perf/spark/query76.q.out | 383 +++ .../clientpositive/perf/spark/query77.q.out | 912 +++++ .../clientpositive/perf/spark/query78.q.out | 523 +++ .../clientpositive/perf/spark/query79.q.out | 258 ++ .../clientpositive/perf/spark/query8.q.out | 549 +++ .../clientpositive/perf/spark/query80.q.out | 903 +++++ .../clientpositive/perf/spark/query81.q.out | 429 +++ .../clientpositive/perf/spark/query82.q.out | 192 ++ .../clientpositive/perf/spark/query83.q.out | 742 ++++ .../clientpositive/perf/spark/query84.q.out | 253 ++ .../clientpositive/perf/spark/query85.q.out | 493 +++ .../clientpositive/perf/spark/query86.q.out | 240 ++ .../clientpositive/perf/spark/query87.q.out | 500 +++ .../clientpositive/perf/spark/query88.q.out | 1294 +++++++ .../clientpositive/perf/spark/query89.q.out | 281 ++ .../clientpositive/perf/spark/query9.q.out | 824 +++++ .../clientpositive/perf/spark/query90.q.out | 351 ++ .../clientpositive/perf/spark/query91.q.out | 347 ++ .../clientpositive/perf/spark/query92.q.out | 303 ++ .../clientpositive/perf/spark/query93.q.out | 181 + .../clientpositive/perf/spark/query94.q.out | 359 ++ .../clientpositive/perf/spark/query95.q.out | 468 +++ .../clientpositive/perf/spark/query96.q.out | 193 ++ .../clientpositive/perf/spark/query97.q.out | 250 ++ .../clientpositive/perf/spark/query98.q.out | 243 ++ .../clientpositive/perf/spark/query99.q.out | 270 ++ .../hive/serde2/lazybinary/LazyBinarySerDe.java | 14 +- .../serde2/lazybinary/LazyBinarySerDe2.java | 623 ++++ .../serde2/lazybinary/TestLazyBinaryFast.java | 7 +- .../serde2/lazybinary/TestLazyBinarySerDe.java | 2 +- .../serde2/lazybinary/TestLazyBinarySerDe2.java | 56 + 139 files changed, 50191 insertions(+), 1648 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/f159b5a1/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/f159b5a1/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/f159b5a1/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/f159b5a1/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/f159b5a1/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ----------------------------------------------------------------------
