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 95C99200B11 for ; Mon, 13 Jun 2016 21:17:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9483F160A3C; Mon, 13 Jun 2016 19:17: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 E4E12160A5B for ; Mon, 13 Jun 2016 21:17:44 +0200 (CEST) Received: (qmail 55367 invoked by uid 500); 13 Jun 2016 19:17: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 55319 invoked by uid 99); 13 Jun 2016 19:17:44 -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, 13 Jun 2016 19:17:44 +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 BA4721800B5 for ; Mon, 13 Jun 2016 19:17:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-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 mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id tOJQh1Zl7b28 for ; Mon, 13 Jun 2016 19:17:43 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 980335F476 for ; Mon, 13 Jun 2016 19:17:42 +0000 (UTC) Received: (qmail 55195 invoked by uid 99); 13 Jun 2016 19:17:41 -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, 13 Jun 2016 19:17:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 85D9BE01E2; Mon, 13 Jun 2016 19:17:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbirdsall@apache.org To: commits@trafodion.incubator.apache.org Date: Mon, 13 Jun 2016 19:17:41 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/5] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf archived-at: Mon, 13 Jun 2016 19:17:45 -0000 Repository: incubator-trafodion Updated Branches: refs/heads/master b4ab0185e -> d0c0e86c4 Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8007949c Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8007949c Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8007949c Branch: refs/heads/master Commit: 8007949c8043aad25d3613f13153c488d61f6926 Parents: 9715668 0fed958 Author: Sean Broeder Authored: Mon May 16 16:36:57 2016 +0000 Committer: Sean Broeder Committed: Mon May 16 16:36:57 2016 +0000 ---------------------------------------------------------------------- core/sql/bin/SqlciErrors.txt | 1 + core/sql/executor/ExHbaseIUD.cpp | 3 +- core/sql/executor/HBaseClient_JNI.cpp | 223 +-------------------------- core/sql/executor/HBaseClient_JNI.h | 70 +-------- core/sql/exp/ExpLOB.cpp | 10 ++ core/sql/generator/GenPreCode.cpp | 14 +- core/sql/regress/executor/EXPECTED130 | 77 +++++---- core/sql/regress/executor/TEST130 | 6 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 3 +- 9 files changed, 80 insertions(+), 327 deletions(-) ----------------------------------------------------------------------