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 07ECE200AE1 for ; Mon, 6 Jun 2016 23:13:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0694E160A55; Mon, 6 Jun 2016 21:13:33 +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 4F0D5160A1E for ; Mon, 6 Jun 2016 23:13:32 +0200 (CEST) Received: (qmail 89025 invoked by uid 500); 6 Jun 2016 21:13:31 -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 89014 invoked by uid 99); 6 Jun 2016 21:13:31 -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, 06 Jun 2016 21:13:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5D3A3DFE5F; Mon, 6 Jun 2016 21:13:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ekoifman@apache.org To: commits@hive.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-13912 DbTxnManager.commitTxn(): ORA-00918: column ambiguously defined (Eugene Koifman, reviewed by Alan Gates) Date: Mon, 6 Jun 2016 21:13:31 +0000 (UTC) archived-at: Mon, 06 Jun 2016 21:13:33 -0000 Repository: hive Updated Branches: refs/heads/branch-1 ad244efe4 -> 1d2725a8c HIVE-13912 DbTxnManager.commitTxn(): ORA-00918: column ambiguously defined (Eugene Koifman, reviewed by Alan Gates) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1d2725a8 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1d2725a8 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1d2725a8 Branch: refs/heads/branch-1 Commit: 1d2725a8cbca4dff21e6a28081472e77d0a3db4e Parents: ad244ef Author: Eugene Koifman Authored: Mon Jun 6 14:13:25 2016 -0700 Committer: Eugene Koifman Committed: Mon Jun 6 14:13:25 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/1d2725a8/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java ---------------------------------------------------------------------- diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java index 954aaf6..129abef 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java @@ -650,7 +650,7 @@ abstract class TxnHandler implements TxnStore, TxnStore.MutexAPI { */ rs = stmt.executeQuery (sqlGenerator.addLimitClause(1, "committed.ws_txnid, committed.ws_commit_id, committed.ws_database," + - "committed.ws_table, committed.ws_partition, cur.ws_commit_id " + + "committed.ws_table, committed.ws_partition, cur.ws_commit_id cur_ws_commit_id " + "from WRITE_SET committed INNER JOIN WRITE_SET cur " + "ON committed.ws_database=cur.ws_database and committed.ws_table=cur.ws_table " + //For partitioned table we always track writes at partition level (never at table) @@ -3417,6 +3417,9 @@ abstract class TxnHandler implements TxnStore, TxnStore.MutexAPI { * to the first 5 rows. The mechanism to do that differs in different DB. * Make {@code noSelectsqlQuery} to be "a,b from T" and this method will return the * appropriately modified row limiting query. + * + * Note that if {@code noSelectsqlQuery} contains a join, you must make sure that + * all columns are unique for Oracle. */ private String addLimitClause(int numRows, String noSelectsqlQuery) throws MetaException { switch (dbProduct) {