You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by nz...@apache.org on 2010/10/15 18:43:58 UTC
svn commit: r1023011 - in /hadoop/hive/branches/branch-0.6: CHANGES.txt
metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
Author: nzhang
Date: Fri Oct 15 16:43:57 2010
New Revision: 1023011
URL: http://svn.apache.org/viewvc?rev=1023011&view=rev
Log:
HIVE-1681. ObjectStore.commitTransaction() does not properly handle transactions that have already been rolled back (Carl Steinbach via Ning Zhang)
Modified:
hadoop/hive/branches/branch-0.6/CHANGES.txt
hadoop/hive/branches/branch-0.6/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
Modified: hadoop/hive/branches/branch-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/CHANGES.txt?rev=1023011&r1=1023010&r2=1023011&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.6/CHANGES.txt Fri Oct 15 16:43:57 2010
@@ -625,6 +625,10 @@ Release 0.6.0 - Unreleased
HIVE-1524. parallel execution failed if mapred.job.name is set
(Yuanjun Li via Ning Zhang)
+ HIVE-1681. ObjectStore.commitTransaction() does not properly handle transactions
+ that have already been rolled back
+ (Carl Steinbach via Ning Zhang)
+
Release 0.5.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/branches/branch-0.6/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java?rev=1023011&r1=1023010&r2=1023011&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java (original)
+++ hadoop/hive/branches/branch-0.6/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java Fri Oct 15 16:43:57 2010
@@ -243,7 +243,14 @@ public class ObjectStore implements RawS
*/
@SuppressWarnings("nls")
public boolean commitTransaction() {
- assert (openTrasactionCalls >= 1);
+ if (TXN_STATUS.ROLLBACK == transactionStatus) {
+ return false;
+ }
+ if (openTrasactionCalls <= 0) {
+ throw new RuntimeException("commitTransaction was called but openTransactionCalls = "
+ + openTrasactionCalls + ". This probably indicates that there are unbalanced " +
+ "calls to openTransaction/commitTransaction");
+ }
if (!currentTransaction.isActive()) {
throw new RuntimeException(
"Commit is called, but transaction is not active. Either there are"