Repository: hive
Updated Branches:
  refs/heads/master 4cbc4a652 -> 50cdde1aa


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/50cdde1a
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/50cdde1a
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/50cdde1a

Branch: refs/heads/master
Commit: 50cdde1aa48717d6dffddac44842cdd537bd0180
Parents: 4cbc4a6
Author: Eugene Koifman <ekoif...@hortonworks.com>
Authored: Mon Jun 6 14:10:23 2016 -0700
Committer: Eugene Koifman <ekoif...@hortonworks.com>
Committed: Mon Jun 6 14:10:23 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/50cdde1a/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 c859cbd..dd7054b 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
@@ -631,7 +631,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)
@@ -3382,6 +3382,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) {

Reply via email to