HIVE-22727: Add hive db schema changes introduced in HIVE-21884 to th…

…e schema upgrade scripts (Zoltan Chovan, reviewed by Zoltan Haindrich and Peter Vary)

metastore/scripts/upgrade/hive/upgrade-3.1.0-to-4.0.0.hive.sql

@@ -137,6 +137,62 @@ LEFT OUTER JOIN \"WM_POOL\" ON \"WM_POOL\".\"POOL_ID\" = \"WM_MAPPING\".\"POOL_I
 "
 );
 
+CREATE EXTERNAL TABLE IF NOT EXISTS `SCHEDULED_QUERIES` (
+  `SCHEDULED_QUERY_ID` bigint,
+  `SCHEDULE_NAME` string,
+  `ENABLED` boolean,
+  `CLUSTER_NAMESPACE` string,
+  `SCHEDULE` string,
+  `USER` string,
+  `QUERY` string,
+  `NEXT_EXECUTION` bigint,
+  CONSTRAINT `SYS_PK_SCHEDULED_QUERIES` PRIMARY KEY (`SCHEDULED_QUERY_ID`) DISABLE
+)
+STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
+TBLPROPERTIES (
+"hive.sql.database.type" = "METASTORE",
+"hive.sql.query" =
+"SELECT
+  \"SCHEDULED_QUERY_ID\",
+  \"SCHEDULE_NAME\",
+  \"ENABLED\",
+  \"CLUSTER_NAMESPACE\",
+  \"SCHEDULE\",
+  \"USER\",
+  \"QUERY\",
+  \"NEXT_EXECUTION\"
+FROM
+  \"SCHEDULED_QUERIES\""
+);
+
+CREATE EXTERNAL TABLE IF NOT EXISTS `SCHEDULED_EXECUTIONS` (
+  `SCHEDULED_EXECUTION_ID` bigint,
+  `SCHEDULED_QUERY_ID` bigint,
+  `EXECUTOR_QUERY_ID` string,
+  `STATE` string,
+  `START_TIME` int,
+  `END_TIME` int,
+  `ERROR_MESSAGE` string,
+  `LAST_UPDATE_TIME` int,
+  CONSTRAINT `SYS_PK_SCHEDULED_EXECUTIONS` PRIMARY KEY (`SCHEDULED_EXECUTION_ID`) DISABLE
+)
+STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
+TBLPROPERTIES (
+"hive.sql.database.type" = "METASTORE",
+"hive.sql.query" =
+"SELECT
+  \"SCHEDULED_EXECUTION_ID\",
+  \"SCHEDULED_QUERY_ID\",
+  \"EXECUTOR_QUERY_ID\",
+  \"STATE\",
+  \"START_TIME\",
+  \"END_TIME\",
+  \"ERROR_MESSAGE\",
+  \"LAST_UPDATE_TIME\"
+FROM
+  \"SCHEDULED_EXECUTIONS\""
+);
+
 -- HIVE-22553
 CREATE EXTERNAL TABLE IF NOT EXISTS `TXNS` (
     `TXN_ID` bigint,
@@ -312,4 +368,38 @@ DROP TABLE IF EXISTS `VERSION`;
 CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '4.0.0' AS `SCHEMA_VERSION`,
   'Hive release version 4.0.0' AS `VERSION_COMMENT`;
 
+USE INFORMATION_SCHEMA;
+
+create or replace view SCHEDULED_QUERIES  as
+select
+  `SCHEDULED_QUERY_ID` ,
+  `SCHEDULE_NAME` ,
+  `ENABLED`,
+  `CLUSTER_NAMESPACE`,
+  `SCHEDULE`,
+  `USER`,
+  `QUERY`,
+  FROM_UNIXTIME(NEXT_EXECUTION) as NEXT_EXECUTION
+FROM
+  SYS.SCHEDULED_QUERIES
+;
+
+create or replace view SCHEDULED_EXECUTIONS as
+SELECT
+  SCHEDULED_EXECUTION_ID,
+  SCHEDULE_NAME,
+  EXECUTOR_QUERY_ID,
+  `STATE`,
+  FROM_UNIXTIME(START_TIME) as START_TIME,
+  FROM_UNIXTIME(END_TIME) as END_TIME,
+  END_TIME-START_TIME as ELAPSED,
+  ERROR_MESSAGE,
+  FROM_UNIXTIME(LAST_UPDATE_TIME) AS LAST_UPDATE_TIME
+FROM
+  SYS.SCHEDULED_EXECUTIONS SE
+JOIN
+  SYS.SCHEDULED_QUERIES SQ
+WHERE
+  SE.SCHEDULED_QUERY_ID=SQ.SCHEDULED_QUERY_ID;
+
 SELECT 'Finished upgrading MetaStore schema from 3.1.0 to 4.0.0';