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 60D84200B6D for ; Tue, 23 Aug 2016 23:45:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5F38E160AAD; Tue, 23 Aug 2016 21:45:34 +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 A6D93160A81 for ; Tue, 23 Aug 2016 23:45:33 +0200 (CEST) Received: (qmail 83673 invoked by uid 500); 23 Aug 2016 21:45:32 -0000 Mailing-List: contact commits-help@hawq.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hawq.incubator.apache.org Delivered-To: mailing list commits@hawq.incubator.apache.org Received: (qmail 83664 invoked by uid 99); 23 Aug 2016 21:45:32 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Aug 2016 21:45:32 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 5BC8DC0591 for ; Tue, 23 Aug 2016 21:45:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id OnHUyapVDBs2 for ; Tue, 23 Aug 2016 21:45:30 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id DD2975FABF for ; Tue, 23 Aug 2016 21:45:29 +0000 (UTC) Received: (qmail 83626 invoked by uid 99); 23 Aug 2016 21:45:29 -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; Tue, 23 Aug 2016 21:45:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5647FE0230; Tue, 23 Aug 2016 21:45:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: odiachenko@apache.org To: commits@hawq.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-hawq git commit: HAWQ-997. Added type modifiers for varchar and bpchar. Date: Tue, 23 Aug 2016 21:45:29 +0000 (UTC) archived-at: Tue, 23 Aug 2016 21:45:34 -0000 Repository: incubator-hawq Updated Branches: refs/heads/HAWQ-997 fe904a8bc -> 08e795332 HAWQ-997. Added type modifiers for varchar and bpchar. Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/08e79533 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/08e79533 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/08e79533 Branch: refs/heads/HAWQ-997 Commit: 08e795332a223392515fadbb7c5f1d3ad8bfe3e2 Parents: fe904a8 Author: Oleksandr Diachenko Authored: Tue Aug 23 14:45:25 2016 -0700 Committer: Oleksandr Diachenko Committed: Tue Aug 23 14:45:25 2016 -0700 ---------------------------------------------------------------------- src/backend/access/external/pxfheaders.c | 28 ++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/08e79533/src/backend/access/external/pxfheaders.c ---------------------------------------------------------------------- diff --git a/src/backend/access/external/pxfheaders.c b/src/backend/access/external/pxfheaders.c index 3cf3cdb..f1be919 100644 --- a/src/backend/access/external/pxfheaders.c +++ b/src/backend/access/external/pxfheaders.c @@ -162,12 +162,12 @@ static void add_tuple_desc_httpheader(CHURL_HEADERS headers, Relation rel) appendStringInfo(&formatter, "X-GP-ATTR-TYPENAME%u", i); churl_headers_append(headers, formatter.data, TypeOidGetTypename(tuple->attrs[i]->atttypid)); - /* Add attribute type modifiers if any*/ - switch (tuple->attrs[i]->atttypid) + /* Add attribute type modifiers if any*/ + if (tuple->attrs[i]->atttypmod > -1) { - case NUMERICOID: + switch (tuple->attrs[i]->atttypid) { - if (tuple->attrs[i]->atttypmod > -1) + case NUMERICOID: { /* precision */ resetStringInfo(&formatter); @@ -178,16 +178,22 @@ static void add_tuple_desc_httpheader(CHURL_HEADERS headers, Relation rel) /* scale */ resetStringInfo(&formatter); appendStringInfo(&formatter, "X-GP-ATTR%u-TYPEMOD%u", i, 1); - pg_ltoa((tuple->attrs[i]->atttypmod) & 0xffff, long_number); + pg_ltoa((tuple->attrs[i]->atttypmod - VARHDRSZ) & 0xffff, long_number); churl_headers_append(headers, formatter.data, long_number); - - break; + break; + } + case VARCHAROID: + case BPCHAROID: + resetStringInfo(&formatter); + appendStringInfo(&formatter, "X-GP-ATTR%u-TYPEMOD%u", i, 0); + pg_ltoa((tuple->attrs[i]->atttypmod - VARHDRSZ), long_number); + churl_headers_append(headers, formatter.data, long_number); + break; + default: + break; } - default: - break; } - - } + } pfree(formatter.data); }