Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 62D91200D42 for ; Fri, 13 Oct 2017 02:15:48 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 61A3B160BEB; Fri, 13 Oct 2017 00:15:48 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A260D160BE9 for ; Fri, 13 Oct 2017 02:15:47 +0200 (CEST) Received: (qmail 72448 invoked by uid 500); 13 Oct 2017 00:15:42 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 71669 invoked by uid 99); 13 Oct 2017 00:15:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Oct 2017 00:15:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47A18DFD7B; Fri, 13 Oct 2017 00:15:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sershe@apache.org To: commits@hive.apache.org Date: Fri, 13 Oct 2017 00:16:03 -0000 Message-Id: In-Reply-To: <9e162a6238574b3cb2495bb9dabe7988@git.apache.org> References: <9e162a6238574b3cb2495bb9dabe7988@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/50] [abbrv] hive git commit: HIVE-14671 : merge master into hive-14535 (Wei Zheng) archived-at: Fri, 13 Oct 2017 00:15:48 -0000 HIVE-14671 : merge master into hive-14535 (Wei Zheng) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/bb1c0f25 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/bb1c0f25 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/bb1c0f25 Branch: refs/heads/master Commit: bb1c0f25fc17d8c5ced8855a05b6651358c5fd96 Parents: 00e7510 5df1540 Author: Wei Zheng Authored: Fri Sep 8 15:35:21 2017 -0700 Committer: Wei Zheng Committed: Fri Sep 8 15:35:21 2017 -0700 ---------------------------------------------------------------------- druid-handler/pom.xml | 48 +- .../hive/druid/DruidStorageHandlerUtils.java | 7 + .../hadoop/hive/druid/io/DruidOutputFormat.java | 9 +- .../druid/io/DruidQueryBasedInputFormat.java | 8 +- .../hadoop/hive/druid/io/DruidRecordWriter.java | 3 +- .../serde/DruidGroupByQueryRecordReader.java | 5 +- .../serde/DruidSelectQueryRecordReader.java | 5 +- .../hadoop/hive/druid/serde/DruidSerDe.java | 15 +- .../serde/DruidTimeseriesQueryRecordReader.java | 5 +- .../druid/serde/DruidTopNQueryRecordReader.java | 5 +- .../TestHiveDruidQueryBasedInputFormat.java | 6 +- .../hive/ql/io/TestDruidRecordWriter.java | 19 +- .../test/resources/testconfiguration.properties | 1 + .../hadoop/hive/metastore/HiveAlterHandler.java | 24 +- .../hive/metastore/MetaStoreDirectSql.java | 7 +- .../hadoop/hive/metastore/ObjectStore.java | 11 +- .../metastore/PartitionExpressionProxy.java | 10 +- .../hive/metastore/cache/CachedStore.java | 12 +- .../hive/metastore/parser/ExpressionTree.java | 6 +- .../MockPartitionExpressionForMetastore.java | 5 +- .../hadoop/hive/metastore/TestObjectStore.java | 11 +- .../hadoop/hive/metastore/TestOldSchema.java | 6 +- .../hadoop/hive/ql/exec/repl/ReplDumpTask.java | 6 +- .../hive/ql/optimizer/ConvertJoinMapJoin.java | 4 +- .../ppr/PartitionExpressionForMetastore.java | 14 +- .../hadoop/hive/ql/parse/ParseContext.java | 10 + .../hadoop/hive/ql/parse/SemanticAnalyzer.java | 32 +- .../apache/hadoop/hive/ql/TestTxnCommands.java | 11 +- .../hadoop/hive/ql/TestTxnCommandsBase.java | 162 ----- .../apache/hadoop/hive/ql/TestTxnNoBuckets.java | 2 +- .../hadoop/hive/ql/TxnCommandsBaseForTests.java | 162 +++++ .../test/queries/clientpositive/mapjoin_hint.q | 69 ++ ql/src/test/queries/clientpositive/masking_11.q | 6 + .../clientpositive/llap/mapjoin_hint.q.out | 643 +++++++++++++++++++ .../results/clientpositive/masking_11.q.out | 20 + .../hadoop/hive/metastore/ColumnType.java | 242 +++++++ 36 files changed, 1313 insertions(+), 298 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/bb1c0f25/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/bb1c0f25/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/bb1c0f25/metastore/src/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/bb1c0f25/metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java ---------------------------------------------------------------------- diff --cc metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java index 7573fb2,5448d0d..75eba79 --- a/metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java +++ b/metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java @@@ -290,11 -272,11 +287,11 @@@ public class TestObjectStore public void testPartitionOps() throws MetaException, InvalidObjectException, NoSuchObjectException, InvalidInputException { Database db1 = new Database(DB1, "description", "locationurl", null); objectStore.createDatabase(db1); - StorageDescriptor sd = new StorageDescriptor(null, "location", null, null, false, 0, new SerDeInfo("SerDeName", "serializationLib", null), null, null, null); + StorageDescriptor sd = createFakeSd("location"); HashMap tableParams = new HashMap(); tableParams.put("EXTERNAL", "false"); - FieldSchema partitionKey1 = new FieldSchema("Country", serdeConstants.STRING_TYPE_NAME, ""); - FieldSchema partitionKey2 = new FieldSchema("State", serdeConstants.STRING_TYPE_NAME, ""); + FieldSchema partitionKey1 = new FieldSchema("Country", ColumnType.STRING_TYPE_NAME, ""); + FieldSchema partitionKey2 = new FieldSchema("State", ColumnType.STRING_TYPE_NAME, ""); Table tbl1 = new Table(TABLE1, DB1, "owner", 1, 2, 3, sd, Arrays.asList(partitionKey1, partitionKey2), tableParams, null, null, "MANAGED_TABLE"); objectStore.createTable(tbl1); HashMap partitionParams = new HashMap(); http://git-wip-us.apache.org/repos/asf/hive/blob/bb1c0f25/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/bb1c0f25/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/bb1c0f25/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java ----------------------------------------------------------------------