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 D2F59200CB4 for ; Tue, 27 Jun 2017 20:19:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C8F30160BF6; Tue, 27 Jun 2017 18:19:45 +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 1ADE0160BD8 for ; Tue, 27 Jun 2017 20:19:44 +0200 (CEST) Received: (qmail 58955 invoked by uid 500); 27 Jun 2017 18:19:44 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 58945 invoked by uid 99); 27 Jun 2017 18:19:44 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jun 2017 18:19:44 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id E47F11AA2BA for ; Tue, 27 Jun 2017 18:19:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, 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] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id NOhTULPr4bz6 for ; Tue, 27 Jun 2017 18:19:42 +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 A728C5F2FD for ; Tue, 27 Jun 2017 18:19:41 +0000 (UTC) Received: (qmail 58908 invoked by uid 99); 27 Jun 2017 18:19:40 -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, 27 Jun 2017 18:19:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A42F2DFBDA; Tue, 27 Jun 2017 18:19:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hzeller@apache.org To: commits@trafodion.incubator.apache.org Date: Tue, 27 Jun 2017 18:19:40 -0000 Message-Id: <0d9706915e36408b92a1f724e2b97592@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] incubator-trafodion git commit: [TRAFODION-2637] Part 2: Rework archived-at: Tue, 27 Jun 2017 18:19:46 -0000 Repository: incubator-trafodion Updated Branches: refs/heads/master 9e31984ea -> 665ea9330 [TRAFODION-2637] Part 2: Rework This is cleanup and rework for an earlier PR that somehow got messed up. The first commit of PR 1141 got merged into Master without indicating so in the PR. I am submitting a new commit with the rework from the review comments here. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/13cb0468 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/13cb0468 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/13cb0468 Branch: refs/heads/master Commit: 13cb04682cba886c6e7504bff6c5468836f8384a Parents: c7dfd5a Author: Hans Zeller Authored: Mon Jun 26 23:57:29 2017 +0000 Committer: Hans Zeller Committed: Mon Jun 26 23:57:29 2017 +0000 ---------------------------------------------------------------------- .../src/main/java/org/trafodion/libmgmt/SyncLibUDF.java | 7 ++++--- core/sql/udrserv/udrserv.cpp | 6 ------ 2 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/13cb0468/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/SyncLibUDF.java ---------------------------------------------------------------------- diff --git a/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/SyncLibUDF.java b/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/SyncLibUDF.java index 3f8daf0..523f964 100644 --- a/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/SyncLibUDF.java +++ b/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/SyncLibUDF.java @@ -43,10 +43,11 @@ public class SyncLibUDF extends UDR { public void describeParamsAndColumns(UDRInvocationInfo info) throws UDRException { - // this TMUDF takes no table-valued inputs, two string + // This TMUDF takes no table-valued inputs, two string // parameters, and generates a table with a single integer - // value. It assumes that it was created with the following - // DDL, without specifying parameters or return values: + // column (one row per parallel instance). It assumes that it + // was created with the following DDL, without specifying + // parameters or return values: // // create table_mapping function SyncLibUDF() // external name 'org.trafodion.libmgmt.SyncLibUDF' http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/13cb0468/core/sql/udrserv/udrserv.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/udrserv.cpp b/core/sql/udrserv/udrserv.cpp index 0a3629a..29654b1 100644 --- a/core/sql/udrserv/udrserv.cpp +++ b/core/sql/udrserv/udrserv.cpp @@ -176,12 +176,6 @@ static Int32 processCommandsFromFile(const char *filename, UdrGlobals &glob); static Int32 processSingleCommandFromFile(FILE *f, UdrGlobals &glob); // LCOV_EXCL_STOP -// Changed the default to 512 to limit java heap size used by SQL processes. -// Keep this define in sync with executor/JavaObjectInterface.cpp -#define DEFAULT_JVM_MAX_HEAP_SIZE 512 -#define DEFAULT_COMPRESSED_CLASSSPACE_SIZE 128 -#define DEFAULT_MAX_METASPACE_SIZE 128 - static NAString initErrText(""); /************************************************************************* Helper function to propagate all Java-related environment settings