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 9D209200C8B for ; Mon, 8 May 2017 06:19:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9BBFF160BC6; Mon, 8 May 2017 04:19:08 +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 B8E63160BB1 for ; Mon, 8 May 2017 06:19:07 +0200 (CEST) Received: (qmail 57500 invoked by uid 500); 8 May 2017 04:19:06 -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 57491 invoked by uid 99); 8 May 2017 04:19:06 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 May 2017 04:19:06 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 72AAC1812EA for ; Mon, 8 May 2017 04:19:06 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.712 X-Spam-Level: X-Spam-Status: No, score=-3.712 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_NUMSUBJECT=0.5, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 2PwrDVjnVJtp for ; Mon, 8 May 2017 04:19:05 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 0EFF65F568 for ; Mon, 8 May 2017 04:19:03 +0000 (UTC) Received: (qmail 57468 invoked by uid 99); 8 May 2017 04:19:03 -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; Mon, 08 May 2017 04:19:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 32769DFBAB; Mon, 8 May 2017 04:19:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: huor@apache.org To: commits@hawq.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-hawq git commit: HAWQ-1412. Fix inconsistent json file for catalog of hawq 2.0 Date: Mon, 8 May 2017 04:19:03 +0000 (UTC) archived-at: Mon, 08 May 2017 04:19:08 -0000 Repository: incubator-hawq Updated Branches: refs/heads/master 50bf9a3e9 -> d0befa185 HAWQ-1412. Fix inconsistent json file for catalog of hawq 2.0 Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/d0befa18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/d0befa18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/d0befa18 Branch: refs/heads/master Commit: d0befa1853fab51ca14bbcc76c917287dde1d818 Parents: 50bf9a3 Author: Ruilong Huo Authored: Mon May 8 12:18:45 2017 +0800 Committer: Ruilong Huo Committed: Mon May 8 12:18:45 2017 +0800 ---------------------------------------------------------------------- tools/bin/gppylib/data/2.0.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/d0befa18/tools/bin/gppylib/data/2.0.json ---------------------------------------------------------------------- diff --git a/tools/bin/gppylib/data/2.0.json b/tools/bin/gppylib/data/2.0.json index 019c378..3b05181 100644 --- a/tools/bin/gppylib/data/2.0.json +++ b/tools/bin/gppylib/data/2.0.json @@ -1,5 +1,5 @@ { - "__comment" : "Generated by tidycat.pl version 34 on Sat Jan 2 21:08:04 2016 CATALOG_VERSION_NO=201507221", + "__comment" : "Generated by tidycat.pl version 34 on Mon Mar 27 14:44:22 2017 CATALOG_VERSION_NO=201507221", "__info" : { "CATALOG_VERSION_NO" : "201507221" }, @@ -8252,9 +8252,9 @@ "creationtime" : "timestamptz", "memorylimit" : "text", "nvseglowerlimit" : "int4", - "nvseglowerlimitperseg" : "int4", + "nvseglowerlimitperseg" : "float4", "nvsegupperlimit" : "int4", - "nvsegupperlimitperseg" : "int4", + "nvsegupperlimitperseg" : "float4", "oid" : "Oid", "parentoid" : "Oid", "resovercommit" : "float4", @@ -8327,15 +8327,15 @@ }, { "colname" : "nvsegupperlimitperseg", - "ctype" : "int4", + "ctype" : "float4", "postcomment" : "-- vsegment size upper limit per segment", - "sqltype" : "integer" + "sqltype" : "real" }, { "colname" : "nvseglowerlimitperseg", - "ctype" : "int4", + "ctype" : "float4", "postcomment" : "-- vsegment size lower limit per segment", - "sqltype" : "integer" + "sqltype" : "real" }, { "colname" : "creationtime", @@ -8388,7 +8388,7 @@ } ], "relid_comment_tag" : "/* relation id: 6026 - pg_resqueue */\n", - "tabdef_text" : "\n CREATE TABLE pg_resqueue\n with (camelcase=ResQueue, shared=true, relid=6026, reltype_oid=9830, toast_oid=9820, toast_index=9821, toast_reltype=9822)\n (\n name name, -- name of resource queue\n parentoid oid, -- oid of resource queue\n activestats integer, -- active statement count limit\n memorylimit text, -- memory limit in cluster\n corelimit text, -- core limit in cluster\n resovercommit real, -- resource upper limit in cluster\n allocpolicy text, -- query resource allocation policy\n vsegresourcequota text, -- vsegment resource quota\n nvsegupperlimit integer, -- vsegment size upper limit\n nvseglowerlimit integer, -- vsegment size lower limit\n nvsegupperlimitperseg integer, -- vsegment size upper limit per segment\n nvseglowerlimitperseg integer, -- vsegment size lower limit per segment\n creationtime timestamp with time zone, -- when the queue is created\n updatetime timestamp with time zone, -- when the queue is u pdated ( create or alter )\n status text, -- the status of resource queue\n )", + "tabdef_text" : "\n CREATE TABLE pg_resqueue\n with (camelcase=ResQueue, shared=true, relid=6026, reltype_oid=9830, toast_oid=9820, toast_index=9821, toast_reltype=9822)\n (\n rsqname name, -- name of resource queue\n parentoid oid, -- oid of resource queue\n activestats integer, -- active statement count limit\n memorylimit text, -- memory limit in cluster\n corelimit text, -- core limit in cluster\n resovercommit real, -- resource upper limit in cluster\n allocpolicy text, -- query resource allocation policy\n vsegresourcequota text, -- vsegment resource quota\n nvsegupperlimit integer, -- vsegment size upper limit\n nvseglowerlimit integer, -- vsegment size lower limit\n nvsegupperlimitperseg real, -- vsegment size upper limit per segment\n nvseglowerlimitperseg real, -- vsegment size lower limit per segment\n creationtime timestamp with time zone, -- when the queue is created\n updatetime timestamp with time zone, -- when the queue is upda ted ( create or alter )\n status text, -- the status of resource queue\n )", "tzhack" : "\"creationtime\" et al", "with" : { "bootstrap" : 0,