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 100C9200C02 for ; Fri, 20 Jan 2017 20:06:15 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 0EA68160B48; Fri, 20 Jan 2017 19:06:15 +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 3390B160B34 for ; Fri, 20 Jan 2017 20:06:14 +0100 (CET) Received: (qmail 20322 invoked by uid 500); 20 Jan 2017 19:06:13 -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 20311 invoked by uid 99); 20 Jan 2017 19:06:13 -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, 20 Jan 2017 19:06:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47397DFA43; Fri, 20 Jan 2017 19:06:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pxiong@apache.org To: commits@hive.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-15297: Hive should not split semicolon within quoted string literals (Pengcheng Xiong, reviewed by Ashutosh Chauhan) (addendum V) Date: Fri, 20 Jan 2017 19:06:13 +0000 (UTC) archived-at: Fri, 20 Jan 2017 19:06:15 -0000 Repository: hive Updated Branches: refs/heads/master 6fe150828 -> f968cf78a HIVE-15297: Hive should not split semicolon within quoted string literals (Pengcheng Xiong, reviewed by Ashutosh Chauhan) (addendum V) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f968cf78 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f968cf78 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f968cf78 Branch: refs/heads/master Commit: f968cf78a231810451ee3bebaa51c8205893aaad Parents: 6fe1508 Author: Pengcheng Xiong Authored: Fri Jan 20 11:05:58 2017 -0800 Committer: Pengcheng Xiong Committed: Fri Jan 20 11:05:58 2017 -0800 ---------------------------------------------------------------------- ql/src/test/queries/clientpositive/specialChar.q | 2 +- .../clientnegative/cluster_tasklog_retrieval.q.out | 8 ++------ .../results/clientnegative/minimr_broken_pipe.q.out | 3 +-- .../test/results/clientpositive/specialChar.q.out | 16 ++++++++-------- 4 files changed, 12 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/f968cf78/ql/src/test/queries/clientpositive/specialChar.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/specialChar.q b/ql/src/test/queries/clientpositive/specialChar.q index 7cee119..ed1cf24 100644 --- a/ql/src/test/queries/clientpositive/specialChar.q +++ b/ql/src/test/queries/clientpositive/specialChar.q @@ -27,4 +27,4 @@ INSERT INTO ts VALUES ("Mozilla\\\"/5.0 ;;;;;;(iPhone; CPU iPhone OS 5_0 like Ma INSERT INTO ts VALUES ("Mozilla\'\\/5.0 ;;;\";;\";(iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"); -select * from ts; +select * from ts order by s; http://git-wip-us.apache.org/repos/asf/hive/blob/f968cf78/ql/src/test/results/clientnegative/cluster_tasklog_retrieval.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientnegative/cluster_tasklog_retrieval.q.out b/ql/src/test/results/clientnegative/cluster_tasklog_retrieval.q.out index bbf42cd..b5ccfed 100644 --- a/ql/src/test/results/clientnegative/cluster_tasklog_retrieval.q.out +++ b/ql/src/test/results/clientnegative/cluster_tasklog_retrieval.q.out @@ -1,11 +1,7 @@ -PREHOOK: query: -- TaskLog retrieval upon Null Pointer Exception in Cluster - -CREATE TEMPORARY FUNCTION evaluate_npe AS 'org.apache.hadoop.hive.ql.udf.generic.GenericUDFEvaluateNPE' +PREHOOK: query: CREATE TEMPORARY FUNCTION evaluate_npe AS 'org.apache.hadoop.hive.ql.udf.generic.GenericUDFEvaluateNPE' PREHOOK: type: CREATEFUNCTION PREHOOK: Output: evaluate_npe -POSTHOOK: query: -- TaskLog retrieval upon Null Pointer Exception in Cluster - -CREATE TEMPORARY FUNCTION evaluate_npe AS 'org.apache.hadoop.hive.ql.udf.generic.GenericUDFEvaluateNPE' +POSTHOOK: query: CREATE TEMPORARY FUNCTION evaluate_npe AS 'org.apache.hadoop.hive.ql.udf.generic.GenericUDFEvaluateNPE' POSTHOOK: type: CREATEFUNCTION POSTHOOK: Output: evaluate_npe PREHOOK: query: FROM src http://git-wip-us.apache.org/repos/asf/hive/blob/f968cf78/ql/src/test/results/clientnegative/minimr_broken_pipe.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientnegative/minimr_broken_pipe.q.out b/ql/src/test/results/clientnegative/minimr_broken_pipe.q.out index ae31487..553e94a 100644 --- a/ql/src/test/results/clientnegative/minimr_broken_pipe.q.out +++ b/ql/src/test/results/clientnegative/minimr_broken_pipe.q.out @@ -1,5 +1,4 @@ -PREHOOK: query: -- Tests exception in ScriptOperator.close() by passing to the operator a small amount of data -SELECT TRANSFORM(*) USING 'true' AS a, b FROM (SELECT TRANSFORM(*) USING 'echo' AS a, b FROM src LIMIT 1) tmp +PREHOOK: query: SELECT TRANSFORM(*) USING 'true' AS a, b FROM (SELECT TRANSFORM(*) USING 'echo' AS a, b FROM src LIMIT 1) tmp PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### http://git-wip-us.apache.org/repos/asf/hive/blob/f968cf78/ql/src/test/results/clientpositive/specialChar.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/specialChar.q.out b/ql/src/test/results/clientpositive/specialChar.q.out index 2646ad6..b194ad5 100644 --- a/ql/src/test/results/clientpositive/specialChar.q.out +++ b/ql/src/test/results/clientpositive/specialChar.q.out @@ -76,21 +76,21 @@ POSTHOOK: query: INSERT INTO ts VALUES ("Mozilla\'\\/5.0 ;;;\";;\";(iPhone; CPU POSTHOOK: type: QUERY POSTHOOK: Output: default@ts POSTHOOK: Lineage: ts.s EXPRESSION [(values__tmp__table__10)values__tmp__table__10.FieldSchema(name:tmp_values_col1, type:string, comment:), ] -PREHOOK: query: select * from ts +PREHOOK: query: select * from ts order by s PREHOOK: type: QUERY PREHOOK: Input: default@ts #### A masked pattern was here #### -POSTHOOK: query: select * from ts +POSTHOOK: query: select * from ts order by s POSTHOOK: type: QUERY POSTHOOK: Input: default@ts #### A masked pattern was here #### -Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 -Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 -Mozilla/5.0 (iPhone; \; \;CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 -Mozilla/5.0 (iPhone/; ///;CPU ;;;iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 -' " +' Mozilla"'/5.0 "(iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 Mozilla'"/5.0 '(iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 -Mozilla\"/5.0 ;;;;;;(iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 Mozilla'\/5.0 ;;;";;";(iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 +Mozilla/5.0 (iPhone/; ///;CPU ;;;iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 +Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 +Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 +Mozilla/5.0 (iPhone; \; \;CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3 +Mozilla\"/5.0 ;;;;;;(iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3