瀏覽代碼

AMBARI-9265. Incorrect Ambari-DDL-MySQL-CREATE.sql file (dlysnichenko)

Lisnichenko Dmitro 10 年之前
父節點
當前提交
8d4af57074

+ 1 - 1
ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java

@@ -260,7 +260,7 @@ public class UpgradeCatalog200 extends AbstractUpgradeCatalog {
   private void createArtifactTable() throws SQLException {
     ArrayList<DBColumnInfo> columns = new ArrayList<DBColumnInfo>();
     columns.add(new DBColumnInfo("artifact_name", String.class, 255, null, false));
-    columns.add(new DBColumnInfo("foreign_keys", String.class, null, null, false));
+    columns.add(new DBColumnInfo("foreign_keys", String.class, 255, null, false));
     columns.add(new DBColumnInfo("artifact_data", char[].class, null, null, false));
     dbAccessor.createTable(ARTIFACT_TABLE, columns, "artifact_name", "foreign_keys");
   }

+ 2 - 2
ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql

@@ -519,8 +519,8 @@ CREATE TABLE repo_version (
 
 CREATE TABLE artifact (
   artifact_name VARCHAR(255) NOT NULL,
-  foreign_keys LONGTEXT NOT NULL,
-  artifact_data VARCHAR(4096) NOT NULL,
+  foreign_keys VARCHAR(255) NOT NULL,
+  artifact_data LONGTEXT NOT NULL,
   PRIMARY KEY(artifact_name, foreign_keys));
 
 -- altering tables by creating unique constraints----------

+ 2 - 2
ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql

@@ -509,8 +509,8 @@ CREATE TABLE repo_version (
 
 CREATE TABLE artifact (
   artifact_name VARCHAR2(255) NOT NULL,
-  foreign_keys CLOB NOT NULL,
-  artifact_data VARCHAR2(4096) NOT NULL,
+  foreign_keys VARCHAR2(255) NOT NULL,
+  artifact_data CLOB NOT NULL,
   PRIMARY KEY(artifact_name, foreign_keys));
 
 --------altering tables by creating unique constraints----------

+ 6 - 0
ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql

@@ -508,6 +508,12 @@ CREATE TABLE repo_version (
   PRIMARY KEY(repo_version_id)
 );
 
+CREATE TABLE ambari.artifact (
+  artifact_name VARCHAR(255) NOT NULL,
+  artifact_data TEXT NOT NULL,
+  foreign_keys VARCHAR(255) NOT NULL,
+  PRIMARY KEY (artifact_name, foreign_keys));
+
 --------altering tables by creating unique constraints----------
 ALTER TABLE clusterconfig ADD CONSTRAINT UQ_config_type_tag UNIQUE (cluster_id, type_name, version_tag);
 ALTER TABLE clusterconfig ADD CONSTRAINT UQ_config_type_version UNIQUE (cluster_id, type_name, version);

+ 1 - 1
ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql

@@ -452,7 +452,7 @@ GRANT ALL PRIVILEGES ON TABLE ambari.hostgroup_configuration TO :username;
 CREATE TABLE ambari.artifact (
   artifact_name VARCHAR(255) NOT NULL,
   artifact_data TEXT NOT NULL,
-  foreign_keys VARCHAR(4096) NOT NULL,
+  foreign_keys VARCHAR(255) NOT NULL,
   PRIMARY KEY (artifact_name, foreign_keys));
 GRANT ALL PRIVILEGES ON TABLE ambari.artifact TO :username;
 

+ 1 - 0
ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java

@@ -556,6 +556,7 @@ public class UpgradeCatalog200Test {
       } else if (column.getName().equals("foreign_keys")) {
         assertNull(column.getDefaultValue());
         assertEquals(String.class, column.getType());
+        assertEquals(255, (int) column.getLength());
         assertEquals(false, column.isNullable());
       } else if (column.getName().equals("artifact_data")) {
         assertNull(column.getDefaultValue());