You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2014/04/04 17:10:47 UTC
[1/2] git commit: AMBARI-5344. Error with finding FK constraint.
(mpapyrkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk f96d22e0c -> 74d037bdc
AMBARI-5344. Error with finding FK constraint. (mpapyrkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/74d037bd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/74d037bd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/74d037bd
Branch: refs/heads/trunk
Commit: 74d037bdc96712db6d9bfe217c79094615a24a83
Parents: ff43fe2
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Thu Apr 3 21:09:38 2014 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Fri Apr 4 18:10:44 2014 +0300
----------------------------------------------------------------------
.../apache/ambari/server/orm/DBAccessor.java | 14 ++-
.../ambari/server/orm/DBAccessorImpl.java | 104 ++++++++++++-------
2 files changed, 78 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/74d037bd/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
index 462f891..a40d932 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
@@ -246,13 +246,25 @@ public interface DBAccessor {
* @param refTableName
* @param columnName
* @param refColumnName
- * @return
+ * @return true if described relation exists
* @throws SQLException
*/
public boolean tableHasForeignKey(String tableName, String refTableName,
String columnName, String refColumnName) throws SQLException;
/**
+ * Verify if table already has a FK constraint.
+ * @param tableName
+ * @param referenceTableName
+ * @param keyColumns
+ * @param referenceColumns
+ * @return true if described relation exists
+ * @throws SQLException
+ */
+ boolean tableHasForeignKey(String tableName, String referenceTableName, String[] keyColumns,
+ String[] referenceColumns) throws SQLException;
+
+ /**
* Get a new DB session
* @return
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/74d037bd/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 069a4f2..6bff89f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -28,7 +28,6 @@ import org.eclipse.persistence.logging.SessionLogEntry;
import org.eclipse.persistence.platform.database.*;
import org.eclipse.persistence.sessions.DatabaseLogin;
import org.eclipse.persistence.sessions.DatabaseSession;
-import org.eclipse.persistence.sessions.Login;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,9 +38,9 @@ import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.DriverManager;
import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -122,6 +121,10 @@ public class DBAccessorImpl implements DBAccessor {
}
private String convertObjectName(String objectName) throws SQLException {
+ //tolerate null names for proper usage in filters
+ if (objectName == null) {
+ return null;
+ }
DatabaseMetaData metaData = getDatabaseMetaData();
if (metaData.storesLowerCaseIdentifiers()) {
return objectName.toLowerCase();
@@ -210,7 +213,12 @@ public class DBAccessorImpl implements DBAccessor {
@Override
public boolean tableHasForeignKey(String tableName, String refTableName,
String columnName, String refColumnName) throws SQLException {
- boolean result = false;
+ return tableHasForeignKey(tableName, refTableName, new String[]{columnName}, new String[]{refColumnName});
+ }
+
+ @Override
+ public boolean tableHasForeignKey(String tableName, String referenceTableName, String[] keyColumns,
+ String[] referenceColumns) throws SQLException {
DatabaseMetaData metaData = getDatabaseMetaData();
String schemaFilter = null;
if (getDbType().equals(Configuration.ORACLE_DB_NAME)) {
@@ -218,23 +226,56 @@ public class DBAccessorImpl implements DBAccessor {
schemaFilter = configuration.getDatabaseUser();
}
- ResultSet rs = metaData.getCrossReference(null, schemaFilter, convertObjectName(tableName),
- null, schemaFilter, convertObjectName(refTableName));
+ //NB: reference table contains pk columns while key table contains fk columns
+
+ ResultSet rs = metaData.getCrossReference(null, convertObjectName(schemaFilter), convertObjectName(referenceTableName),
+ null, convertObjectName(schemaFilter), convertObjectName(tableName));
+
+ List<String> pkColumns = new ArrayList<String>(referenceColumns.length);
+ for (String referenceColumn : referenceColumns) {
+ pkColumns.add(convertObjectName(referenceColumn));
+ }
+ List<String> fkColumns = new ArrayList<String>(keyColumns.length);
+ for (String keyColumn : keyColumns) {
+ fkColumns.add(convertObjectName(keyColumn));
+ }
if (rs != null) {
try {
while (rs.next()) {
- String refColumn = rs.getString("FKCOLUMN_NAME");
- if (refColumn != null && refColumn.equalsIgnoreCase(refColumnName)) {
- result = true;
+
+ String pkColumn = rs.getString("PKCOLUMN_NAME");
+ String fkColumn = rs.getString("FKCOLUMN_NAME");
+
+ int pkIndex = pkColumns.indexOf(pkColumn);
+ int fkIndex = fkColumns.indexOf(fkColumn);
+ if (pkIndex != -1 && fkIndex != -1) {
+ if (pkIndex != fkIndex) {
+ LOG.warn("Columns for FK constraint should be provided in exact order");
+ } else {
+ pkColumns.remove(pkIndex);
+ fkColumns.remove(fkIndex);
+ }
+
+
+ } else {
+ LOG.debug("pkCol={}, fkCol={} not found in provided column names, skipping", pkColumn, fkColumn); //TODO debug
}
+
+
}
+ if (pkColumns.isEmpty() && fkColumns.isEmpty()) {
+ return true;
+ }
+
} finally {
rs.close();
}
}
- return result;
+
+ return false;
+
}
@Override
@@ -250,48 +291,33 @@ public class DBAccessorImpl implements DBAccessor {
String keyColumn, String referenceTableName,
String referenceColumn, boolean ignoreFailure) throws SQLException {
- if (!tableHasForeignKey(tableName, referenceTableName, keyColumn, referenceColumn)) {
+ addFKConstraint(tableName, constraintName, new String[]{keyColumn}, referenceTableName,
+ new String[]{referenceColumn}, ignoreFailure);
+ }
+ @Override
+ public void addFKConstraint(String tableName, String constraintName,
+ String[] keyColumns, String referenceTableName,
+ String[] referenceColumns, boolean ignoreFailure) throws SQLException {
+ if (!tableHasForeignKey(tableName, referenceTableName, keyColumns, referenceColumns)) {
String query = dbmsHelper.getAddForeignKeyStatement(tableName, constraintName,
- Collections.singletonList(keyColumn),
- referenceTableName,
- Collections.singletonList(referenceColumn)
+ Arrays.asList(keyColumns),
+ referenceTableName,
+ Arrays.asList(referenceColumns)
);
try {
executeQuery(query);
} catch (SQLException e) {
LOG.warn("Add FK constraint failed" +
- ", constraintName = " + constraintName +
- ", tableName = " + tableName + ", errorCode = " + e.getErrorCode() +
- ", message = " + e.getMessage());
- LOG.debug("Exception on add FK constraint.", e);
+ ", constraintName = " + constraintName +
+ ", tableName = " + tableName, e);
if (!ignoreFailure) {
throw e;
}
}
- }
- }
-
- @Override
- public void addFKConstraint(String tableName, String constraintName,
- String[] keyColumns, String referenceTableName,
- String[] referenceColumns, boolean ignoreFailure) throws SQLException {
- String query = dbmsHelper.getAddForeignKeyStatement(tableName, constraintName,
- Arrays.asList(keyColumns),
- referenceTableName,
- Arrays.asList(referenceColumns)
- );
-
- try {
- executeQuery(query);
- } catch (SQLException e) {
- LOG.warn("Add FK constraint failed" +
- ", constraintName = " + constraintName +
- ", tableName = " + tableName, e);
- if (!ignoreFailure) {
- throw e;
- }
+ } else {
+ LOG.info("Foreign Key constraint {} already exists, skipping", constraintName);
}
}
[2/2] git commit: AMBARI-5319. Investigate how we can log all
exceptions rather than getting log that asks to call getNextException.
(mpapyrkovskyy)
Posted by mp...@apache.org.
AMBARI-5319. Investigate how we can log all exceptions rather than getting log that asks to call getNextException. (mpapyrkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ff43fe25
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ff43fe25
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ff43fe25
Branch: refs/heads/trunk
Commit: ff43fe25a0a27f502a02076200303b0a14bb0f17
Parents: f96d22e
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Thu Apr 3 17:35:25 2014 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Fri Apr 4 18:10:44 2014 +0300
----------------------------------------------------------------------
.../orm/AmbariJpaLocalTxnInterceptor.java | 54 ++++++++++++++++----
1 file changed, 45 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ff43fe25/ambari-server/src/main/java/org/apache/ambari/server/orm/AmbariJpaLocalTxnInterceptor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/AmbariJpaLocalTxnInterceptor.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/AmbariJpaLocalTxnInterceptor.java
index 98ca484..6d7901c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/AmbariJpaLocalTxnInterceptor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/AmbariJpaLocalTxnInterceptor.java
@@ -24,22 +24,23 @@ import com.google.inject.persist.UnitOfWork;
import com.google.inject.persist.jpa.AmbariJpaPersistService;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
+import org.eclipse.persistence.exceptions.EclipseLinkException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
+import javax.persistence.PersistenceException;
import java.lang.reflect.Method;
+import java.sql.SQLException;
public class AmbariJpaLocalTxnInterceptor implements MethodInterceptor {
+ private static final Logger LOG = LoggerFactory.getLogger(AmbariJpaLocalTxnInterceptor.class);
@Inject
private final AmbariJpaPersistService emProvider = null;
-
@Inject
private final UnitOfWork unitOfWork = null;
-
- @Transactional
- private static class Internal {}
-
// Tracks if the unit of work was begun implicitly by this transaction.
private final ThreadLocal<Boolean> didWeStartWork = new ThreadLocal<Boolean>();
@@ -67,11 +68,13 @@ public class AmbariJpaLocalTxnInterceptor implements MethodInterceptor {
result = methodInvocation.proceed();
} catch (Exception e) {
- //commit transaction only if rollback didnt occur
+ //commit transaction only if rollback didn't occur
if (rollbackIfNecessary(transactional, e, txn)) {
txn.commit();
}
+ detailedLogForPersistenceError(e);
+
//propagate whatever exception is thrown anyway
throw e;
} finally {
@@ -86,9 +89,12 @@ public class AmbariJpaLocalTxnInterceptor implements MethodInterceptor {
// interferes with the advised method's throwing semantics)
try {
txn.commit();
+ } catch (Exception e) {
+ detailedLogForPersistenceError(e);
+ throw e;
} finally {
//close the em if necessary
- if (null != didWeStartWork.get() ) {
+ if (null != didWeStartWork.get()) {
didWeStartWork.remove();
unitOfWork.end();
}
@@ -98,6 +104,32 @@ public class AmbariJpaLocalTxnInterceptor implements MethodInterceptor {
return result;
}
+ private void detailedLogForPersistenceError(Exception e) {
+ if (e instanceof PersistenceException) {
+ PersistenceException rbe = (PersistenceException) e;
+ Throwable cause = rbe.getCause();
+
+ if (cause != null && cause instanceof EclipseLinkException) {
+ EclipseLinkException de = (EclipseLinkException) cause;
+ LOG.error("[DETAILED ERROR] Rollback reason: ", cause);
+ Throwable internal = de.getInternalException();
+
+ int exIndent = 1;
+ if (internal != null && internal instanceof SQLException) {
+ SQLException exception = (SQLException) internal;
+
+ while (exception != null) {
+ LOG.error("[DETAILED ERROR] Internal exception ("
+ + exIndent
+ + ") : ", exception); // Log the exception
+ exception = exception.getNextException();
+ exIndent++;
+ }
+ }
+ }
+ }
+ }
+
// TODO Cache this method's results.
private Transactional readTransactionMetadata(MethodInvocation methodInvocation) {
Transactional transactional;
@@ -121,8 +153,8 @@ public class AmbariJpaLocalTxnInterceptor implements MethodInterceptor {
* Returns True if rollback DID NOT HAPPEN (i.e. if commit should continue).
*
* @param transactional The metadata annotaiton of the method
- * @param e The exception to test for rollback
- * @param txn A JPA Transaction to issue rollbacks on
+ * @param e The exception to test for rollback
+ * @param txn A JPA Transaction to issue rollbacks on
*/
private boolean rollbackIfNecessary(Transactional transactional, Exception e,
EntityTransaction txn) {
@@ -157,4 +189,8 @@ public class AmbariJpaLocalTxnInterceptor implements MethodInterceptor {
return commit;
}
+
+ @Transactional
+ private static class Internal {
+ }
}