You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2016/02/18 21:55:43 UTC
ambari git commit: AMBARI-15098: Ambari Schema Version should ignore
patch number from version number (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk b57749da6 -> 081820216
AMBARI-15098: Ambari Schema Version should ignore patch number from version number (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/08182021
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/08182021
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/08182021
Branch: refs/heads/trunk
Commit: 0818202169217994fab9dcc254b7728a2bfc238f
Parents: b57749d
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Thu Feb 18 12:55:38 2016 -0800
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Thu Feb 18 12:55:38 2016 -0800
----------------------------------------------------------------------
ambari-server/pom.xml | 13 +++++++++++++
.../apache/ambari/server/controller/AmbariServer.java | 3 ++-
.../server/controller/utilities/DatabaseChecker.java | 2 +-
.../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +-
.../src/main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +-
.../src/main/resources/Ambari-DDL-Postgres-CREATE.sql | 2 +-
.../resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 2 +-
.../main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 2 +-
.../src/main/resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +-
.../apache/ambari/server/utils/TestVersionUtils.java | 2 ++
10 files changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/08182021/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 0fa0101..2d0559c 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -75,6 +75,19 @@
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
+ <execution>
+ <id>regex-schema-version</id>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>ambariSchemaVersion</name>
+ <value>${project.version}</value>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+ <replacement>$1.$2.$3</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/ambari/blob/08182021/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index b416129..ad4a59b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -105,6 +105,7 @@ import org.apache.ambari.server.topology.TopologyManager;
import org.apache.ambari.server.topology.TopologyRequestFactoryImpl;
import org.apache.ambari.server.utils.RetryHelper;
import org.apache.ambari.server.utils.StageUtils;
+import org.apache.ambari.server.utils.VersionUtils;
import org.apache.ambari.server.view.ViewRegistry;
import org.apache.velocity.app.Velocity;
import org.eclipse.jetty.http.HttpVersion;
@@ -787,7 +788,7 @@ public class AmbariServer {
MetainfoEntity schemaVersion = new MetainfoEntity();
schemaVersion.setMetainfoName(Configuration.SERVER_VERSION_KEY);
- schemaVersion.setMetainfoValue(ambariMetaInfo.getServerVersion());
+ schemaVersion.setMetainfoValue(VersionUtils.getVersionSubstring(ambariMetaInfo.getServerVersion()));
metainfoDAO.create(schemaVersion);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/08182021/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
index 190a6a7..3a3ef9a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
@@ -286,7 +286,7 @@ public class DatabaseChecker {
throw new AmbariException("Unable to read server version file.");
}
- if (schemaVersionEntity==null || VersionUtils.compareVersions(schemaVersion, serverVersion, 4) != 0) {
+ if (schemaVersionEntity==null || VersionUtils.compareVersions(schemaVersion, serverVersion, 3) != 0) {
String error = "Current database store version is not compatible with " +
"current server version"
+ ", serverVersion=" + serverVersion
http://git-wip-us.apache.org/repos/asf/ambari/blob/08182021/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
index 73b172a..4940e9d 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -1276,7 +1276,7 @@ insert into adminprivilege (privilege_id, permission_id, resource_id, principal_
select 1, 1, 1, 1;
insert into metainfo(`metainfo_key`, `metainfo_value`)
- select 'version','${ambariVersion}';
+ select 'version','${ambariSchemaVersion}';
-- Quartz tables
http://git-wip-us.apache.org/repos/asf/ambari/blob/08182021/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index 1df396d..e43a7fc 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -991,7 +991,7 @@ INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('topology_ho
INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('setting_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('hostcomponentstate_id_seq', 0);
-INSERT INTO metainfo("metainfo_key", "metainfo_value") values ('version', '${ambariVersion}');
+INSERT INTO metainfo("metainfo_key", "metainfo_value") values ('version', '${ambariSchemaVersion}');
insert into adminresourcetype (resource_type_id, resource_type_name)
select 1, 'AMBARI' from dual
http://git-wip-us.apache.org/repos/asf/ambari/blob/08182021/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
index d948b3b..848d9e0 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
@@ -1313,7 +1313,7 @@ INSERT INTO adminprivilege (privilege_id, permission_id, resource_id, principal_
SELECT 1, 1, 1, 1;
INSERT INTO metainfo (metainfo_key, metainfo_value)
- SELECT 'version', '${ambariVersion}';
+ SELECT 'version', '${ambariSchemaVersion}';
COMMIT;
-- Quartz tables
http://git-wip-us.apache.org/repos/asf/ambari/blob/08182021/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
index 5fe742c..a379575 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
@@ -1412,7 +1412,7 @@ INSERT INTO ambari.adminprivilege (privilege_id, permission_id, resource_id, pri
SELECT 1, 1, 1, 1;
INSERT INTO ambari.metainfo (metainfo_key, metainfo_value)
- SELECT 'version', '${ambariVersion}';
+ SELECT 'version', '${ambariSchemaVersion}';
COMMIT;
-- Quartz tables
http://git-wip-us.apache.org/repos/asf/ambari/blob/08182021/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
index fe1e505..b57d377 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
@@ -1263,7 +1263,7 @@ insert into adminprivilege (privilege_id, permission_id, resource_id, principal_
select 1, 1, 1, 1;
insert into metainfo(metainfo_key, metainfo_value)
- select 'version','${ambariVersion}';
+ select 'version','${ambariSchemaVersion}';
-- Quartz tables
http://git-wip-us.apache.org/repos/asf/ambari/blob/08182021/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
index 41dac77..b2fd5e2 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -1373,7 +1373,7 @@ BEGIN TRANSACTION
select 1, 1, 1, 1;
insert into metainfo(metainfo_key, metainfo_value)
- select 'version','${ambariVersion}';
+ select 'version','${ambariSchemaVersion}';
COMMIT TRANSACTION
-- Quartz tables
http://git-wip-us.apache.org/repos/asf/ambari/blob/08182021/ambari-server/src/test/java/org/apache/ambari/server/utils/TestVersionUtils.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/utils/TestVersionUtils.java b/ambari-server/src/test/java/org/apache/ambari/server/utils/TestVersionUtils.java
index 371660b..5141dc0 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/utils/TestVersionUtils.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/utils/TestVersionUtils.java
@@ -84,6 +84,8 @@ public class TestVersionUtils {
Assert.assertEquals(0, VersionUtils.compareVersions("1.2.3", "1.2.3.4", 3));
Assert.assertEquals(0, VersionUtils.compareVersions("1.2.3.6.7", "1.2.3.4", 3));
Assert.assertEquals(1, VersionUtils.compareVersions("1.2.3.6.7", "1.2.3.4", 4));
+ Assert.assertEquals(0, VersionUtils.compareVersions("1.2.3", "1.2.3.0", 4));
+ Assert.assertEquals(-1, VersionUtils.compareVersions("1.2.3", "1.2.3.1", 4));
Assert.assertEquals(1, VersionUtils.compareVersions("1.2.3.6.7\n", "1.2.3.4\n", 4)); //test version trimming
Assert.assertEquals(1, VersionUtils.compareVersions("1.2.3.1", "1.2.3", true));