ODP-1672: hive schema upgrade from 3.1.4 to 4.0.0 (#24)

* 1672: hive schema upgrade from 3.1.4 to 4.0.0 * ODP-1672: resolving conflicts for oracle11g.sql file
acceldata-io · Jun 21, 2024 · 68fd48b · 68fd48b
1 parent 71c96ca
commit 68fd48b
Show file tree

Hide file tree

Showing 35 changed files with 13,805 additions and 21 deletions.
diff --git a/...e/hive/hive-schema-4.0.0-alpha-1.hive.sql → ...s/upgrade/hive/hive-schema-3.1.4.hive.sql b/...e/hive/hive-schema-4.0.0-alpha-1.hive.sql → ...s/upgrade/hive/hive-schema-3.1.4.hive.sql
@@ -823,8 +823,8 @@ FROM
   \"PART_COL_STATS\""
 );
 
-CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '4.0.0-alpha-1' AS `SCHEMA_VERSION`,
-  'Hive release version 4.0.0-alpha-1' AS `VERSION_COMMENT`;
+CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '3.1.4' AS `SCHEMA_VERSION`,
+  'Hive release version 3.1.4' AS `VERSION_COMMENT`;
 
 CREATE EXTERNAL TABLE IF NOT EXISTS `DB_VERSION` (
   `VER_ID` BIGINT,
@@ -1200,7 +1200,7 @@ SELECT
   CC_PARTITION,
   CASE WHEN CC_TYPE = 'i' THEN 'minor' WHEN CC_TYPE = 'a' THEN 'major' ELSE 'UNKNOWN' END,
   CASE WHEN CC_STATE = 'f' THEN 'failed' WHEN CC_STATE = 's' THEN 'succeeded'
-    WHEN CC_STATE = 'a' THEN 'did not initiate' WHEN CC_STATE = 'c' THEN 'refused' ELSE 'UNKNOWN' END,
+    WHEN CC_STATE = 'a' THEN 'did not initiate' ELSE 'UNKNOWN' END,
   CASE WHEN CC_WORKER_ID IS NULL THEN cast (null as string) ELSE split(CC_WORKER_ID,"-")[0] END,
   CASE WHEN CC_WORKER_ID IS NULL THEN cast (null as string) ELSE split(CC_WORKER_ID,"-")[size(split(CC_WORKER_ID,"-"))-1] END,
   CC_WORKER_VERSION,
@@ -1223,7 +1223,7 @@ SELECT
   CQ_TABLE,
   CQ_PARTITION,
   CASE WHEN CQ_TYPE = 'i' THEN 'minor' WHEN CQ_TYPE = 'a' THEN 'major' ELSE 'UNKNOWN' END,
-  CASE WHEN CQ_STATE = 'i' THEN 'initiated' WHEN CQ_STATE = 'w' THEN 'working' WHEN CQ_STATE = 'r' THEN 'ready for cleaning' ELSE 'UNKNOWN' END,
+  CASE WHEN CQ_STATE = 'i' THEN 'initiated' WHEN CQ_STATE = 'w' THEN 'working' WHEN CQ_STATE = 'r' THEN 'ready for cleaning' WHEN CQ_STATE = 'c' THEN 'refused' ELSE 'UNKNOWN' END,
   CASE WHEN CQ_WORKER_ID IS NULL THEN NULL ELSE split(CQ_WORKER_ID,"-")[0] END,
   CASE WHEN CQ_WORKER_ID IS NULL THEN NULL ELSE split(CQ_WORKER_ID,"-")[size(split(CQ_WORKER_ID,"-"))-1] END,
   CQ_WORKER_VERSION,
@@ -1949,4 +1949,3 @@ WHERE
 
 
 
-
diff --git a/...e/upgrade-3.1.0-to-4.0.0-alpha-1.hive.sql → ...upgrade-3.1.0-to-3.1.4.3.2.2.0-1.hive.sql b/...e/upgrade-3.1.0-to-4.0.0-alpha-1.hive.sql → ...upgrade-3.1.0-to-3.1.4.3.2.2.0-1.hive.sql
diff --git a/...e-4.0.0-alpha-1-to-4.0.0-alpha-2.hive.sql → ...e/upgrade-3.1.4-to-4.0.0-alpha-2.hive.sql b/...e-4.0.0-alpha-1-to-4.0.0-alpha-2.hive.sql → ...e/upgrade-3.1.4-to-4.0.0-alpha-2.hive.sql
diff --git a/metastore/scripts/upgrade/hive/upgrade-3.1.4.3.2.2.0-1-to-3.1.4.hive.sql b/metastore/scripts/upgrade/hive/upgrade-3.1.4.3.2.2.0-1-to-3.1.4.hive.sql
@@ -0,0 +1,10 @@
+SELECT 'Upgrading MetaStore schema from 3.1.4.3.2.2.0-1 to 3.1.4';
+
+USE SYS;
+
+DROP TABLE IF EXISTS `VERSION`;
+
+CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '3.1.4' AS `SCHEMA_VERSION`,
+  'Hive release version 3.1.4' AS `VERSION_COMMENT`;
+
+SELECT 'Finished upgrading MetaStore schema from 3.1.4.3.2.2.0-1 to 3.1.4';
diff --git a/metastore/scripts/upgrade/hive/upgrade.order.hive b/metastore/scripts/upgrade/hive/upgrade.order.hive
@@ -1,5 +1,6 @@
 3.0.0-to-3.1.0
-3.1.0-to-4.0.0-alpha-1.hive
-4.0.0-alpha-1-to-4.0.0-alpha-2.hive
+3.1.0-to-3.1.4.3.2.2.0-1
+3.1.4.3.2.2.0-1-to-3.1.4
+3.1.4-to-4.0.0-alpha-2.hive
 4.0.0-alpha-2-to-4.0.0-beta-1.hive
 4.0.0-beta-1-to-4.0.0.hive
diff --git a/...alone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.1.4.3.2.2.0-1.derby.sql b/...alone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.1.4.3.2.2.0-1.derby.sql
diff --git a/...derby/hive-schema-4.0.0-alpha-1.derby.sql → ...ain/sql/derby/hive-schema-3.1.4.derby.sql b/...derby/hive-schema-4.0.0-alpha-1.derby.sql → ...ain/sql/derby/hive-schema-3.1.4.derby.sql
@@ -868,4 +868,4 @@ ALTER TABLE "PACKAGES" ADD CONSTRAINT "PACKAGES_FK1" FOREIGN KEY ("DB_ID") REFER
 -- -----------------------------------------------------------------
 -- Record schema version. Should be the last step in the init script
 -- -----------------------------------------------------------------
-INSERT INTO "APP"."VERSION" (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '4.0.0-alpha-1', 'Hive release version 4.0.0-alpha-1');
+INSERT INTO "APP"."VERSION" (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '3.1.4', 'Hive release version 3.1.4');
diff --git a/...-4.0.0-alpha-1-to-4.0.0-alpha-2.derby.sql → .../upgrade-3.1.4-to-4.0.0-alpha-2.derby.sql b/...-4.0.0-alpha-1-to-4.0.0-alpha-2.derby.sql → .../upgrade-3.1.4-to-4.0.0-alpha-2.derby.sql
diff --git a/...-metastore/metastore-server/src/main/sql/derby/upgrade-3.1.4.3.2.2.0-1-to-3.1.4.derby.sql b/...-metastore/metastore-server/src/main/sql/derby/upgrade-3.1.4.3.2.2.0-1-to-3.1.4.derby.sql
@@ -0,0 +1,4 @@
+-- Upgrade MetaStore schema from 3.1.4.3.2.2.0-1 to 3.1.4
+
+-- This needs to be the last thing done.  Insert any changes above this line.
+UPDATE "APP".VERSION SET SCHEMA_VERSION='3.1.4', VERSION_COMMENT='Hive release version 3.1.4' where VER_ID=1;
diff --git a/.../upgrade-3.2.0-to-4.0.0-alpha-1.derby.sql → ...pgrade-3.2.0-to-3.1.4.3.2.2.0-1.derby.sql b/.../upgrade-3.2.0-to-4.0.0-alpha-1.derby.sql → ...pgrade-3.2.0-to-3.1.4.3.2.2.0-1.derby.sql
diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade.order.derby
@@ -16,7 +16,8 @@
 2.3.0-to-3.0.0
 3.0.0-to-3.1.0
 3.1.0-to-3.2.0
-3.2.0-to-4.0.0-alpha-1
-4.0.0-alpha-1-to-4.0.0-alpha-2
+3.2.0-to-3.1.4.3.2.2.0-1
+3.1.4.3.2.2.0-1-to-3.1.4
+3.1.4-to-4.0.0-alpha-2
 4.0.0-alpha-2-to-4.0.0-beta-1
 4.0.0-beta-1-to-4.0.0