[1/2] git commit: AMBARI-4420. ORA-01795: maximum number of expressions in a list is 1000 for Oracle DB. (swagle)

2014-10-07 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/trunk f702bb529 - 0a0186b15


AMBARI-4420. ORA-01795: maximum number of expressions in a list is 1000 for 
Oracle DB. (swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/31d8208b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/31d8208b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/31d8208b

Branch: refs/heads/trunk
Commit: 31d8208b8ba2bf87bb089532a8fe093ef606385f
Parents: f702bb5
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Tue Oct 7 11:13:36 2014 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Tue Oct 7 11:14:00 2014 -0700

--
 .../apache/ambari/server/orm/DBAccessor.java|  14 +++
 .../ambari/server/orm/DBAccessorImpl.java   |  67 
 .../apache/ambari/server/orm/dao/DaoUtils.java  |  12 +-
 .../server/orm/dao/HostRoleCommandDAO.java  |  30 -
 .../actionmanager/TestActionDBAccessorImpl.java | 109 ---
 .../ambari/server/agent/AgentResourceTest.java  |  53 +
 .../server/configuration/ConfigurationTest.java |   3 +-
 .../internal/AlertResourceProviderTest.java |  19 +++-
 .../ambari/server/orm/DBAccessorImplTest.java   |   6 +
 9 files changed, 224 insertions(+), 89 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/31d8208b/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 9eca8c0..4baf6da 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
@@ -320,6 +320,20 @@ public interface DBAccessor {
   public void setNullable(String tableName, DBAccessor.DBColumnInfo 
columnInfo, boolean nullable)
   throws SQLException;
 
+  public static enum DbType {
+ORACLE,
+MYSQL,
+POSTGRES,
+DERBY,
+UNKNOWN
+  }
+
+  /**
+   * Get type of database platform
+   * @return @DbType
+   */
+  public DbType getDbType();
+
   /**
* Capture column type
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/31d8208b/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 f9407f7..eb09c7a 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
@@ -17,22 +17,7 @@
  */
 package org.apache.ambari.server.orm;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-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.List;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
+import com.google.inject.Inject;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.orm.helpers.ScriptRunner;
 import org.apache.ambari.server.orm.helpers.dbms.DbmsHelper;
@@ -55,8 +40,20 @@ import org.eclipse.persistence.sessions.DatabaseLogin;
 import org.eclipse.persistence.sessions.DatabaseSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import com.google.inject.Inject;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+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.List;
+import java.util.regex.Pattern;
 
 public class DBAccessorImpl implements DBAccessor {
   private static final Logger LOG = 
LoggerFactory.getLogger(DBAccessorImpl.class);
@@ -67,6 +64,7 @@ public class DBAccessorImpl implements DBAccessor {
   private DatabaseMetaData databaseMetaData;
   private static final String dbURLPatternString = jdbc:(.*?):.*;
   private Pattern dbURLPattern = Pattern.compile(dbURLPatternString, 
Pattern.CASE_INSENSITIVE);
+  private DbType dbType;
 
   @Inject
   public DBAccessorImpl(Configuration configuration) {
@@ -101,14 +99,19 @@ public class DBAccessorImpl implements

git commit: AMBARI-4420. ORA-01795: maximum number of expressions in a list is 1000 for Oracle DB. (swagle)

2014-10-06 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 165356e26 - f108b52e5


AMBARI-4420. ORA-01795: maximum number of expressions in a list is 1000 for 
Oracle DB. (swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f108b52e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f108b52e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f108b52e

Branch: refs/heads/branch-1.7.0
Commit: f108b52e566c02efe5827827adf9201e49946247
Parents: 165356e
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Mon Oct 6 16:16:20 2014 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Mon Oct 6 16:16:20 2014 -0700

--
 .../apache/ambari/server/orm/DBAccessor.java|  14 +++
 .../ambari/server/orm/DBAccessorImpl.java   |  67 
 .../apache/ambari/server/orm/dao/DaoUtils.java  |  12 +-
 .../server/orm/dao/HostRoleCommandDAO.java  |  30 -
 .../actionmanager/TestActionDBAccessorImpl.java | 109 ---
 .../ambari/server/agent/AgentResourceTest.java  |  53 +
 .../ambari/server/orm/DBAccessorImplTest.java   |   6 +
 7 files changed, 205 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f108b52e/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 9eca8c0..4baf6da 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
@@ -320,6 +320,20 @@ public interface DBAccessor {
   public void setNullable(String tableName, DBAccessor.DBColumnInfo 
columnInfo, boolean nullable)
   throws SQLException;
 
+  public static enum DbType {
+ORACLE,
+MYSQL,
+POSTGRES,
+DERBY,
+UNKNOWN
+  }
+
+  /**
+   * Get type of database platform
+   * @return @DbType
+   */
+  public DbType getDbType();
+
   /**
* Capture column type
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/f108b52e/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 f9407f7..eb09c7a 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
@@ -17,22 +17,7 @@
  */
 package org.apache.ambari.server.orm;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-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.List;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
+import com.google.inject.Inject;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.orm.helpers.ScriptRunner;
 import org.apache.ambari.server.orm.helpers.dbms.DbmsHelper;
@@ -55,8 +40,20 @@ import org.eclipse.persistence.sessions.DatabaseLogin;
 import org.eclipse.persistence.sessions.DatabaseSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import com.google.inject.Inject;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+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.List;
+import java.util.regex.Pattern;
 
 public class DBAccessorImpl implements DBAccessor {
   private static final Logger LOG = 
LoggerFactory.getLogger(DBAccessorImpl.class);
@@ -67,6 +64,7 @@ public class DBAccessorImpl implements DBAccessor {
   private DatabaseMetaData databaseMetaData;
   private static final String dbURLPatternString = jdbc:(.*?):.*;
   private Pattern dbURLPattern = Pattern.compile(dbURLPatternString, 
Pattern.CASE_INSENSITIVE);
+  private DbType dbType;
 
   @Inject
   public DBAccessorImpl(Configuration configuration) {
@@ -101,14 +99,19 @@ public class DBAccessorImpl implements DBAccessor {
 
   protected DbmsHelper loadHelper(DatabasePlatform databasePlatform) {
 if

git commit: AMBARI-4420. ORA-01795: maximum number of expressions in a list is 1000 for Oracle DB. (swagle)

2014-10-06 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/trunk 5b6065876 - 6b8ecd54c


AMBARI-4420. ORA-01795: maximum number of expressions in a list is 1000 for 
Oracle DB. (swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6b8ecd54
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6b8ecd54
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6b8ecd54

Branch: refs/heads/trunk
Commit: 6b8ecd54c5a25e65fb43df8cca15dc69bd32ee5e
Parents: 5b60658
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Mon Oct 6 16:32:14 2014 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Mon Oct 6 16:32:14 2014 -0700

--
 .../apache/ambari/server/orm/DBAccessor.java|  14 +++
 .../ambari/server/orm/DBAccessorImpl.java   |  67 
 .../apache/ambari/server/orm/dao/DaoUtils.java  |  12 +-
 .../server/orm/dao/HostRoleCommandDAO.java  |  30 -
 .../actionmanager/TestActionDBAccessorImpl.java | 109 ---
 .../ambari/server/agent/AgentResourceTest.java  |  53 +
 .../ambari/server/orm/DBAccessorImplTest.java   |   6 +
 7 files changed, 205 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6b8ecd54/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 9eca8c0..4baf6da 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
@@ -320,6 +320,20 @@ public interface DBAccessor {
   public void setNullable(String tableName, DBAccessor.DBColumnInfo 
columnInfo, boolean nullable)
   throws SQLException;
 
+  public static enum DbType {
+ORACLE,
+MYSQL,
+POSTGRES,
+DERBY,
+UNKNOWN
+  }
+
+  /**
+   * Get type of database platform
+   * @return @DbType
+   */
+  public DbType getDbType();
+
   /**
* Capture column type
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/6b8ecd54/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 f9407f7..eb09c7a 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
@@ -17,22 +17,7 @@
  */
 package org.apache.ambari.server.orm;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-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.List;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
+import com.google.inject.Inject;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.orm.helpers.ScriptRunner;
 import org.apache.ambari.server.orm.helpers.dbms.DbmsHelper;
@@ -55,8 +40,20 @@ import org.eclipse.persistence.sessions.DatabaseLogin;
 import org.eclipse.persistence.sessions.DatabaseSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import com.google.inject.Inject;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+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.List;
+import java.util.regex.Pattern;
 
 public class DBAccessorImpl implements DBAccessor {
   private static final Logger LOG = 
LoggerFactory.getLogger(DBAccessorImpl.class);
@@ -67,6 +64,7 @@ public class DBAccessorImpl implements DBAccessor {
   private DatabaseMetaData databaseMetaData;
   private static final String dbURLPatternString = jdbc:(.*?):.*;
   private Pattern dbURLPattern = Pattern.compile(dbURLPatternString, 
Pattern.CASE_INSENSITIVE);
+  private DbType dbType;
 
   @Inject
   public DBAccessorImpl(Configuration configuration) {
@@ -101,14 +99,19 @@ public class DBAccessorImpl implements DBAccessor {
 
   protected DbmsHelper loadHelper(DatabasePlatform databasePlatform) {
 if (databasePlatform instanceof