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 9A86B200D2D for ; Fri, 13 Oct 2017 02:15:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 98FB9160BEB; Fri, 13 Oct 2017 00:15:49 +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 95AD4160BE9 for ; Fri, 13 Oct 2017 02:15:48 +0200 (CEST) Received: (qmail 72984 invoked by uid 500); 13 Oct 2017 00:15:43 -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 71888 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 5C5F2DFDAC; 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:09 -0000 Message-Id: <34aa7b6a28ef4d56accf1c36d4661d61@git.apache.org> In-Reply-To: <9e162a6238574b3cb2495bb9dabe7988@git.apache.org> References: <9e162a6238574b3cb2495bb9dabe7988@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] [abbrv] hive git commit: HIVE-15212 : merge branch into master - some test/out fixes 3 (Sergey Shelukhin) archived-at: Fri, 13 Oct 2017 00:15:49 -0000 HIVE-15212 : merge branch into master - some test/out fixes 3 (Sergey Shelukhin) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6f0be79b Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6f0be79b Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6f0be79b Branch: refs/heads/master Commit: 6f0be79ba93bac5469ceb003c224ed356507476c Parents: 1fb04f3 Author: sergey Authored: Thu Sep 21 17:43:27 2017 +1000 Committer: sergey Committed: Thu Sep 21 17:43:27 2017 +1000 ---------------------------------------------------------------------- ql/src/test/queries/clientpositive/mm_all.q | 31 +++---- ql/src/test/results/clientpositive/mm_all.q.out | 94 ++++++-------------- 2 files changed, 42 insertions(+), 83 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/6f0be79b/ql/src/test/queries/clientpositive/mm_all.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/mm_all.q b/ql/src/test/queries/clientpositive/mm_all.q index e23260f..b93e13e 100644 --- a/ql/src/test/queries/clientpositive/mm_all.q +++ b/ql/src/test/queries/clientpositive/mm_all.q @@ -209,11 +209,9 @@ drop table multi0_2_mm; create table multi0_1_mm (key int, key2 int) tblproperties("transactional"="true", "transactional_properties"="insert_only"); create table multi0_2_mm (key int, key2 int) tblproperties("transactional"="true", "transactional_properties"="insert_only"); ---from intermediate ---insert overwrite table multi0_1_mm select key, p ---insert overwrite table multi0_2_mm select p, key; -insert into table multi0_1_mm select key, p from intermediate; -insert into table multi0_2_mm select p, key from intermediate; +from intermediate +insert overwrite table multi0_1_mm select key, p +insert overwrite table multi0_2_mm select p, key; select * from multi0_1_mm order by key, key2; select * from multi0_2_mm order by key, key2; @@ -222,11 +220,10 @@ set hive.merge.mapredfiles=true; set hive.merge.sparkfiles=true; set hive.merge.tezfiles=true; ---from intermediate ---insert into table multi0_1_mm select p, key ---insert overwrite table multi0_2_mm select key, p; -insert into table multi0_1_mm select p, key from intermediate; -insert into table multi0_2_mm select key, p from intermediate; +from intermediate +insert into table multi0_1_mm select p, key +insert overwrite table multi0_2_mm select key, p; + select * from multi0_1_mm order by key, key2; select * from multi0_2_mm order by key, key2; @@ -243,23 +240,27 @@ create table multi1_mm (key int, key2 int) partitioned by (p int) tblproperties( from intermediate insert into table multi1_mm partition(p=1) select p, key insert into table multi1_mm partition(p=2) select key, p; + select * from multi1_mm order by key, key2, p; ---from intermediate ---insert into table multi1_mm partition(p=2) select p, key ---insert overwrite table multi1_mm partition(p=1) select key, p; -insert into table multi1_mm partition(p=2) select p, key from intermediate; -insert into table multi1_mm partition(p=1) select key, p from intermediate; + +from intermediate +insert into table multi1_mm partition(p=2) select p, key +insert overwrite table multi1_mm partition(p=1) select key, p; + select * from multi1_mm order by key, key2, p; from intermediate insert into table multi1_mm partition(p) select p, key, p insert into table multi1_mm partition(p=1) select key, p; + select key, key2, p from multi1_mm order by key, key2, p; from intermediate insert into table multi1_mm partition(p) select p, key, 1 insert into table multi1_mm partition(p=1) select key, p; + select key, key2, p from multi1_mm order by key, key2, p; + drop table multi1_mm; http://git-wip-us.apache.org/repos/asf/hive/blob/6f0be79b/ql/src/test/results/clientpositive/mm_all.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/mm_all.q.out b/ql/src/test/results/clientpositive/mm_all.q.out index ea60414..4162ce9 100644 --- a/ql/src/test/results/clientpositive/mm_all.q.out +++ b/ql/src/test/results/clientpositive/mm_all.q.out @@ -1342,36 +1342,28 @@ POSTHOOK: query: create table multi0_2_mm (key int, key2 int) tblproperties("tr POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@multi0_2_mm -PREHOOK: query: insert into table multi0_1_mm select key, p from intermediate +PREHOOK: query: from intermediate +insert overwrite table multi0_1_mm select key, p +insert overwrite table multi0_2_mm select p, key PREHOOK: type: QUERY PREHOOK: Input: default@intermediate PREHOOK: Input: default@intermediate@p=455 PREHOOK: Input: default@intermediate@p=456 PREHOOK: Input: default@intermediate@p=457 PREHOOK: Output: default@multi0_1_mm -POSTHOOK: query: insert into table multi0_1_mm select key, p from intermediate +PREHOOK: Output: default@multi0_2_mm +POSTHOOK: query: from intermediate +insert overwrite table multi0_1_mm select key, p +insert overwrite table multi0_2_mm select p, key POSTHOOK: type: QUERY POSTHOOK: Input: default@intermediate POSTHOOK: Input: default@intermediate@p=455 POSTHOOK: Input: default@intermediate@p=456 POSTHOOK: Input: default@intermediate@p=457 POSTHOOK: Output: default@multi0_1_mm +POSTHOOK: Output: default@multi0_2_mm POSTHOOK: Lineage: multi0_1_mm.key SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: multi0_1_mm.key2 SIMPLE [(intermediate)intermediate.FieldSchema(name:p, type:int, comment:null), ] -PREHOOK: query: insert into table multi0_2_mm select p, key from intermediate -PREHOOK: type: QUERY -PREHOOK: Input: default@intermediate -PREHOOK: Input: default@intermediate@p=455 -PREHOOK: Input: default@intermediate@p=456 -PREHOOK: Input: default@intermediate@p=457 -PREHOOK: Output: default@multi0_2_mm -POSTHOOK: query: insert into table multi0_2_mm select p, key from intermediate -POSTHOOK: type: QUERY -POSTHOOK: Input: default@intermediate -POSTHOOK: Input: default@intermediate@p=455 -POSTHOOK: Input: default@intermediate@p=456 -POSTHOOK: Input: default@intermediate@p=457 -POSTHOOK: Output: default@multi0_2_mm POSTHOOK: Lineage: multi0_2_mm.key SIMPLE [(intermediate)intermediate.FieldSchema(name:p, type:int, comment:null), ] POSTHOOK: Lineage: multi0_2_mm.key2 SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: select * from multi0_1_mm order by key, key2 @@ -1396,42 +1388,28 @@ POSTHOOK: query: select * from multi0_2_mm order by key, key2 POSTHOOK: type: QUERY POSTHOOK: Input: default@multi0_2_mm #### A masked pattern was here #### -455 97 -455 98 -456 0 -456 10 -457 100 -457 103 -PREHOOK: query: insert into table multi0_1_mm select p, key from intermediate +PREHOOK: query: from intermediate +insert into table multi0_1_mm select p, key +insert overwrite table multi0_2_mm select key, p PREHOOK: type: QUERY PREHOOK: Input: default@intermediate PREHOOK: Input: default@intermediate@p=455 PREHOOK: Input: default@intermediate@p=456 PREHOOK: Input: default@intermediate@p=457 PREHOOK: Output: default@multi0_1_mm -POSTHOOK: query: insert into table multi0_1_mm select p, key from intermediate +PREHOOK: Output: default@multi0_2_mm +POSTHOOK: query: from intermediate +insert into table multi0_1_mm select p, key +insert overwrite table multi0_2_mm select key, p POSTHOOK: type: QUERY POSTHOOK: Input: default@intermediate POSTHOOK: Input: default@intermediate@p=455 POSTHOOK: Input: default@intermediate@p=456 POSTHOOK: Input: default@intermediate@p=457 POSTHOOK: Output: default@multi0_1_mm +POSTHOOK: Output: default@multi0_2_mm POSTHOOK: Lineage: multi0_1_mm.key SIMPLE [(intermediate)intermediate.FieldSchema(name:p, type:int, comment:null), ] POSTHOOK: Lineage: multi0_1_mm.key2 SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -PREHOOK: query: insert into table multi0_2_mm select key, p from intermediate -PREHOOK: type: QUERY -PREHOOK: Input: default@intermediate -PREHOOK: Input: default@intermediate@p=455 -PREHOOK: Input: default@intermediate@p=456 -PREHOOK: Input: default@intermediate@p=457 -PREHOOK: Output: default@multi0_2_mm -POSTHOOK: query: insert into table multi0_2_mm select key, p from intermediate -POSTHOOK: type: QUERY -POSTHOOK: Input: default@intermediate -POSTHOOK: Input: default@intermediate@p=455 -POSTHOOK: Input: default@intermediate@p=456 -POSTHOOK: Input: default@intermediate@p=457 -POSTHOOK: Output: default@multi0_2_mm POSTHOOK: Lineage: multi0_2_mm.key SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: multi0_2_mm.key2 SIMPLE [(intermediate)intermediate.FieldSchema(name:p, type:int, comment:null), ] PREHOOK: query: select * from multi0_1_mm order by key, key2 @@ -1462,18 +1440,6 @@ POSTHOOK: query: select * from multi0_2_mm order by key, key2 POSTHOOK: type: QUERY POSTHOOK: Input: default@multi0_2_mm #### A masked pattern was here #### -0 456 -10 456 -97 455 -98 455 -100 457 -103 457 -455 97 -455 98 -456 0 -456 10 -457 100 -457 103 PREHOOK: query: drop table multi0_1_mm PREHOOK: type: DROPTABLE PREHOOK: Input: default@multi0_1_mm @@ -1550,38 +1516,30 @@ POSTHOOK: Input: default@multi1_mm@p=2 456 10 1 457 100 1 457 103 1 -PREHOOK: query: insert into table multi1_mm partition(p=2) select p, key from intermediate -PREHOOK: type: QUERY -PREHOOK: Input: default@intermediate -PREHOOK: Input: default@intermediate@p=455 -PREHOOK: Input: default@intermediate@p=456 -PREHOOK: Input: default@intermediate@p=457 -PREHOOK: Output: default@multi1_mm@p=2 -POSTHOOK: query: insert into table multi1_mm partition(p=2) select p, key from intermediate -POSTHOOK: type: QUERY -POSTHOOK: Input: default@intermediate -POSTHOOK: Input: default@intermediate@p=455 -POSTHOOK: Input: default@intermediate@p=456 -POSTHOOK: Input: default@intermediate@p=457 -POSTHOOK: Output: default@multi1_mm@p=2 -POSTHOOK: Lineage: multi1_mm PARTITION(p=2).key SIMPLE [(intermediate)intermediate.FieldSchema(name:p, type:int, comment:null), ] -POSTHOOK: Lineage: multi1_mm PARTITION(p=2).key2 SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] -PREHOOK: query: insert into table multi1_mm partition(p=1) select key, p from intermediate +PREHOOK: query: from intermediate +insert into table multi1_mm partition(p=2) select p, key +insert overwrite table multi1_mm partition(p=1) select key, p PREHOOK: type: QUERY PREHOOK: Input: default@intermediate PREHOOK: Input: default@intermediate@p=455 PREHOOK: Input: default@intermediate@p=456 PREHOOK: Input: default@intermediate@p=457 PREHOOK: Output: default@multi1_mm@p=1 -POSTHOOK: query: insert into table multi1_mm partition(p=1) select key, p from intermediate +PREHOOK: Output: default@multi1_mm@p=2 +POSTHOOK: query: from intermediate +insert into table multi1_mm partition(p=2) select p, key +insert overwrite table multi1_mm partition(p=1) select key, p POSTHOOK: type: QUERY POSTHOOK: Input: default@intermediate POSTHOOK: Input: default@intermediate@p=455 POSTHOOK: Input: default@intermediate@p=456 POSTHOOK: Input: default@intermediate@p=457 POSTHOOK: Output: default@multi1_mm@p=1 +POSTHOOK: Output: default@multi1_mm@p=2 POSTHOOK: Lineage: multi1_mm PARTITION(p=1).key SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: multi1_mm PARTITION(p=1).key2 SIMPLE [(intermediate)intermediate.FieldSchema(name:p, type:int, comment:null), ] +POSTHOOK: Lineage: multi1_mm PARTITION(p=2).key SIMPLE [(intermediate)intermediate.FieldSchema(name:p, type:int, comment:null), ] +POSTHOOK: Lineage: multi1_mm PARTITION(p=2).key2 SIMPLE [(intermediate)intermediate.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: select * from multi1_mm order by key, key2, p PREHOOK: type: QUERY PREHOOK: Input: default@multi1_mm