diff --git metastore/scripts/upgrade/derby/008-HIVE-2246.derby.sql metastore/scripts/upgrade/derby/008-HIVE-2246.derby.sql index 7902b9d..6fa3ccb 100644 --- metastore/scripts/upgrade/derby/008-HIVE-2246.derby.sql +++ metastore/scripts/upgrade/derby/008-HIVE-2246.derby.sql @@ -50,12 +50,12 @@ ALTER TABLE SDS * for tables. For speed, just let CD_ID = SD_ID for tables */ INSERT INTO CDS (CD_ID) -SELECT t.SD_ID FROM TBLS t WHERE t.SD_ID IS NOT NULL ORDER BY t.SD_ID; +SELECT t.SD_ID FROM TBLS t WHERE t.SD_ID IS NOT NULL; UPDATE SDS SET CD_ID = SD_ID WHERE SD_ID in -(SELECT t.SD_ID FROM TBLS t WHERE t.SD_ID IS NOT NULL ORDER BY t.SD_ID); +(SELECT t.SD_ID FROM TBLS t WHERE t.SD_ID IS NOT NULL); INSERT INTO COLUMNS_V2 (CD_ID, COMMENT, COLUMN_NAME, TYPE_NAME, INTEGER_IDX) @@ -85,7 +85,7 @@ INSERT INTO "SESSION"."TMP_TBL" SELECT FROM PARTITIONS p JOIN TBLS t ON t.TBL_ID = p.TBL_ID JOIN SDS sds on t.SD_ID = sds.SD_ID - WHERE p.SD_ID IS NOT NULL; + WHERE p.SD_ID IS NOT NULL AND sds.CD_ID IS NOT NULL; UPDATE SDS sd SET sd.CD_ID = @@ -96,12 +96,12 @@ UPDATE SDS sd * Migrate IDXS */ INSERT INTO CDS (CD_ID) -SELECT i.SD_ID FROM IDXS i WHERE i.SD_ID IS NOT NULL ORDER BY i.SD_ID; +SELECT i.SD_ID FROM IDXS i WHERE i.SD_ID IS NOT NULL; UPDATE SDS SET CD_ID = SD_ID WHERE SD_ID in -(SELECT i.SD_ID FROM IDXS i WHERE i.SD_ID IS NOT NULL ORDER BY i.SD_ID); +(SELECT i.SD_ID FROM IDXS i WHERE i.SD_ID IS NOT NULL); INSERT INTO COLUMNS_V2 (CD_ID, COMMENT, COLUMN_NAME, TYPE_NAME, INTEGER_IDX)