You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2016/05/09 19:42:50 UTC

[5/5] hive git commit: HIVE-13597 : revert HIVE-12892 (Sergey Shelukhin, reviewed by Ashutosh Chauhan)

HIVE-13597 : revert HIVE-12892 (Sergey Shelukhin, reviewed by Ashutosh Chauhan)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/10c07d6e
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/10c07d6e
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/10c07d6e

Branch: refs/heads/master
Commit: 10c07d6ec265f747c1a27597c6ad3683054e760d
Parents: c204dd7
Author: Sergey Shelukhin <se...@apache.org>
Authored: Mon May 9 12:39:04 2016 -0700
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Mon May 9 12:39:04 2016 -0700

----------------------------------------------------------------------
 metastore/if/hive_metastore.thrift              |   13 +-
 .../upgrade/derby/033-HIVE-12892.derby.sql      |    3 -
 .../upgrade/derby/hive-schema-2.1.0.derby.sql   |    7 -
 .../derby/upgrade-2.0.0-to-2.1.0.derby.sql      |    1 -
 .../upgrade/mssql/018-HIVE-12892.mssql.sql      |    9 -
 .../upgrade/mssql/hive-schema-2.1.0.mssql.sql   |   13 -
 .../mssql/upgrade-2.0.0-to-2.1.0.mssql.sql      |    1 -
 .../upgrade/mysql/033-HIVE-12892.mysql.sql      |   10 -
 .../upgrade/mysql/hive-schema-2.1.0.mysql.sql   |   11 -
 .../mysql/upgrade-2.0.0-to-2.1.0.mysql.sql      |    1 -
 .../upgrade/oracle/033-HIVE-12892.oracle.sql    |    7 -
 .../upgrade/oracle/hive-schema-2.1.0.oracle.sql |   11 +-
 .../oracle/upgrade-2.0.0-to-2.1.0.oracle.sql    |    1 -
 .../postgres/032-HIVE-12892.postgres.sql        |   10 -
 .../postgres/hive-schema-2.1.0.postgres.sql     |   14 -
 .../upgrade-2.0.0-to-2.1.0.postgres.sql         |    1 -
 .../gen/thrift/gen-cpp/ThriftHiveMetastore.cpp  | 2403 ++++++++----------
 .../gen/thrift/gen-cpp/ThriftHiveMetastore.h    |  126 -
 .../ThriftHiveMetastore_server.skeleton.cpp     |    5 -
 .../gen/thrift/gen-cpp/hive_metastore_types.cpp |  736 ++----
 .../gen/thrift/gen-cpp/hive_metastore_types.h   |   84 -
 .../metastore/api/GetChangeVersionRequest.java  |  389 ---
 .../metastore/api/GetChangeVersionResult.java   |  387 ---
 .../hive/metastore/api/ThriftHiveMetastore.java | 1622 +++---------
 .../gen-php/metastore/ThriftHiveMetastore.php   |  216 --
 .../src/gen/thrift/gen-php/metastore/Types.php  |  150 --
 .../hive_metastore/ThriftHiveMetastore-remote   |    7 -
 .../hive_metastore/ThriftHiveMetastore.py       |  189 --
 .../gen/thrift/gen-py/hive_metastore/ttypes.py  |  134 -
 .../gen/thrift/gen-rb/hive_metastore_types.rb   |   34 -
 .../gen/thrift/gen-rb/thrift_hive_metastore.rb  |   54 -
 .../hadoop/hive/metastore/HiveMetaStore.java    |    8 -
 .../hive/metastore/HiveMetaStoreClient.java     |    7 -
 .../hadoop/hive/metastore/IMetaStoreClient.java |    3 -
 .../hadoop/hive/metastore/ObjectStore.java      |  102 +-
 .../apache/hadoop/hive/metastore/RawStore.java  |    3 -
 .../hive/metastore/hbase/HBaseReadWrite.java    |   19 +-
 .../hadoop/hive/metastore/hbase/HBaseStore.java |   28 +-
 .../hive/metastore/model/MChangeVersion.java    |   48 -
 metastore/src/model/package.jdo                 |   13 +-
 .../DummyRawStoreControlledCommit.java          |    5 -
 .../DummyRawStoreForJdoConnection.java          |    5 -
 .../apache/hadoop/hive/ql/metadata/Hive.java    |    8 -
 43 files changed, 1706 insertions(+), 5192 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/if/hive_metastore.thrift
----------------------------------------------------------------------
diff --git a/metastore/if/hive_metastore.thrift b/metastore/if/hive_metastore.thrift
index c8d78b6..7558046 100755
--- a/metastore/if/hive_metastore.thrift
+++ b/metastore/if/hive_metastore.thrift
@@ -794,17 +794,7 @@ struct FireEventRequest {
 struct FireEventResponse {
     // NOP for now, this is just a place holder for future responses
 }
-
-
-struct GetChangeVersionRequest {
-  1: required string topic
-}
-
-struct GetChangeVersionResult {
-  1: required i64 version
-}
-
-
+    
 struct MetadataPpdResult {
   1: optional binary metadata,
   2: optional binary includeBitset
@@ -1416,7 +1406,6 @@ service ThriftHiveMetastore extends fb303.FacebookService
   ClearFileMetadataResult clear_file_metadata(1:ClearFileMetadataRequest req)
   CacheFileMetadataResult cache_file_metadata(1:CacheFileMetadataRequest req)
 
-  GetChangeVersionResult get_change_version(1:GetChangeVersionRequest req)
 }
 
 // * Note about the DDL_TIME: When creating or altering a table or a partition,

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/derby/033-HIVE-12892.derby.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/derby/033-HIVE-12892.derby.sql b/metastore/scripts/upgrade/derby/033-HIVE-12892.derby.sql
deleted file mode 100644
index ab004d9..0000000
--- a/metastore/scripts/upgrade/derby/033-HIVE-12892.derby.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-CREATE TABLE "APP"."CHANGE_VERSION" ("CHANGE_VERSION_ID" BIGINT NOT NULL, "VERSION" BIGINT NOT NULL, "TOPIC" VARCHAR(255));
-ALTER TABLE "APP"."CHANGE_VERSION" ADD CONSTRAINT "CHANGE_VERSION_PK" PRIMARY KEY ("CHANGE_VERSION_ID");
-CREATE UNIQUE INDEX "APP"."UNIQUECHANGEVERSION" ON "APP"."CHANGE_VERSION" ("TOPIC");

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/derby/hive-schema-2.1.0.derby.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/derby/hive-schema-2.1.0.derby.sql b/metastore/scripts/upgrade/derby/hive-schema-2.1.0.derby.sql
index dc27afc..e5d3e89 100644
--- a/metastore/scripts/upgrade/derby/hive-schema-2.1.0.derby.sql
+++ b/metastore/scripts/upgrade/derby/hive-schema-2.1.0.derby.sql
@@ -98,8 +98,6 @@ CREATE TABLE "APP"."PART_COL_STATS"("DB_NAME" VARCHAR(128) NOT NULL,"TABLE_NAME"
 
 CREATE TABLE "APP"."VERSION" ("VER_ID" BIGINT NOT NULL, "SCHEMA_VERSION" VARCHAR(127) NOT NULL, "VERSION_COMMENT" VARCHAR(255));
 
-CREATE TABLE "APP"."CHANGE_VERSION" ("CHANGE_VERSION_ID" BIGINT NOT NULL, "VERSION" BIGINT NOT NULL, "TOPIC" VARCHAR(255));
-
 CREATE TABLE "APP"."FUNCS" ("FUNC_ID" BIGINT NOT NULL, "CLASS_NAME" VARCHAR(4000), "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "FUNC_NAME" VARCHAR(128), "FUNC_TYPE" INTEGER NOT NULL, "OWNER_NAME" VARCHAR(128), "OWNER_TYPE" VARCHAR(10));
 
 CREATE TABLE "APP"."FUNC_RU" ("FUNC_ID" BIGINT NOT NULL, "RESOURCE_TYPE" INTEGER NOT NULL, "RESOURCE_URI" VARCHAR(4000), "INTEGER_IDX" INTEGER NOT NULL);
@@ -318,11 +316,6 @@ ALTER TABLE "APP"."PART_COL_STATS" ADD CONSTRAINT "PART_COL_STATS_FK" FOREIGN KE
 
 ALTER TABLE "APP"."VERSION" ADD CONSTRAINT "VERSION_PK" PRIMARY KEY ("VER_ID");
 
-ALTER TABLE "APP"."CHANGE_VERSION" ADD CONSTRAINT "CHANGE_VERSION_PK" PRIMARY KEY ("CHANGE_VERSION_ID");
-
-CREATE UNIQUE INDEX "APP"."UNIQUECHANGEVERSION" ON "APP"."CHANGE_VERSION" ("TOPIC");
-
-
 ALTER TABLE "APP"."FUNCS" ADD CONSTRAINT "FUNCS_FK1" FOREIGN KEY ("DB_ID") REFERENCES "APP"."DBS" ("DB_ID") ON DELETE NO ACTION ON UPDATE NO ACTION;
 
 ALTER TABLE "APP"."FUNC_RU" ADD CONSTRAINT "FUNC_RU_FK1" FOREIGN KEY ("FUNC_ID") REFERENCES "APP"."FUNCS" ("FUNC_ID") ON DELETE NO ACTION ON UPDATE NO ACTION;

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/derby/upgrade-2.0.0-to-2.1.0.derby.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/derby/upgrade-2.0.0-to-2.1.0.derby.sql b/metastore/scripts/upgrade/derby/upgrade-2.0.0-to-2.1.0.derby.sql
index 94c686b..9c730af 100644
--- a/metastore/scripts/upgrade/derby/upgrade-2.0.0-to-2.1.0.derby.sql
+++ b/metastore/scripts/upgrade/derby/upgrade-2.0.0-to-2.1.0.derby.sql
@@ -1,5 +1,4 @@
 -- Upgrade MetaStore schema from 2.0.0 to 2.1.0
-RUN '033-HIVE-12892.derby.sql';
 RUN '034-HIVE-13076.derby.sql';
 RUN '035-HIVE-13395.derby.sql';
 

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/mssql/018-HIVE-12892.mssql.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/mssql/018-HIVE-12892.mssql.sql b/metastore/scripts/upgrade/mssql/018-HIVE-12892.mssql.sql
deleted file mode 100644
index a13591d..0000000
--- a/metastore/scripts/upgrade/mssql/018-HIVE-12892.mssql.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Table CHANGE_VERSION
-CREATE TABLE CHANGE_VERSION
-(
-    CHANGE_VERSION_ID bigint NOT NULL,
-    VERSION bigint NOT NULL,
-    TOPIC nvarchar(255) NOT NULL
-);
-ALTER TABLE CHANGE_VERSION ADD CONSTRAINT CHANGE_VERSION_PK PRIMARY KEY (CHANGE_VERSION_ID);
-CREATE UNIQUE INDEX UNIQUECHANGEVERSION ON CHANGE_VERSION (TOPIC);

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/mssql/hive-schema-2.1.0.mssql.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/mssql/hive-schema-2.1.0.mssql.sql b/metastore/scripts/upgrade/mssql/hive-schema-2.1.0.mssql.sql
index d9194ff..4f0fdd6 100644
--- a/metastore/scripts/upgrade/mssql/hive-schema-2.1.0.mssql.sql
+++ b/metastore/scripts/upgrade/mssql/hive-schema-2.1.0.mssql.sql
@@ -165,19 +165,6 @@ CREATE TABLE VERSION
 
 ALTER TABLE VERSION ADD CONSTRAINT VERSION_PK PRIMARY KEY (VER_ID);
 
--- Table CHANGE_VERSION
-CREATE TABLE CHANGE_VERSION
-(
-    CHANGE_VERSION_ID bigint NOT NULL,
-    VERSION bigint NOT NULL,
-    TOPIC nvarchar(255) NOT NULL
-);
-
-ALTER TABLE CHANGE_VERSION ADD CONSTRAINT CHANGE_VERSION_PK PRIMARY KEY (CHANGE_VERSION_ID);
-
-CREATE UNIQUE INDEX UNIQUECHANGEVERSION ON CHANGE_VERSION (TOPIC);
-
-
 -- Table GLOBAL_PRIVS for classes [org.apache.hadoop.hive.metastore.model.MGlobalPrivilege]
 CREATE TABLE GLOBAL_PRIVS
 (

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql b/metastore/scripts/upgrade/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql
index c796126..f42f2c3 100644
--- a/metastore/scripts/upgrade/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql
+++ b/metastore/scripts/upgrade/mssql/upgrade-2.0.0-to-2.1.0.mssql.sql
@@ -1,6 +1,5 @@
 SELECT 'Upgrading MetaStore schema from 2.0.0 to 2.1.0' AS MESSAGE;
 
-:r 018-HIVE-12892.mssql.sql;
 :r 019-HIVE-13076.mssql.sql;
 :r 020-HIVE-13395.mssql.sql;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/mysql/033-HIVE-12892.mysql.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/mysql/033-HIVE-12892.mysql.sql b/metastore/scripts/upgrade/mysql/033-HIVE-12892.mysql.sql
deleted file mode 100644
index 783afe8..0000000
--- a/metastore/scripts/upgrade/mysql/033-HIVE-12892.mysql.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- Table structure for CHANGE_VERSION
---
-CREATE TABLE IF NOT EXISTS `CHANGE_VERSION` (
-  `CHANGE_VERSION_ID` BIGINT NOT NULL,
-  `VERSION` BIGINT NOT NULL,
-  `TOPIC` VARCHAR(255) NOT NULL,
-  PRIMARY KEY (`CHANGE_VERSION_ID`),
-  UNIQUE KEY `UNIQUECHANGEVERSION` (`TOPIC`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
---

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/mysql/hive-schema-2.1.0.mysql.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/mysql/hive-schema-2.1.0.mysql.sql b/metastore/scripts/upgrade/mysql/hive-schema-2.1.0.mysql.sql
index a6b783c..5c03b65 100644
--- a/metastore/scripts/upgrade/mysql/hive-schema-2.1.0.mysql.sql
+++ b/metastore/scripts/upgrade/mysql/hive-schema-2.1.0.mysql.sql
@@ -760,17 +760,6 @@ CREATE TABLE IF NOT EXISTS `VERSION` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 --
--- Table structure for CHANGE_VERSION
---
-CREATE TABLE IF NOT EXISTS `CHANGE_VERSION` (
-  `CHANGE_VERSION_ID` BIGINT NOT NULL,
-  `VERSION` BIGINT NOT NULL,
-  `TOPIC` VARCHAR(255) NOT NULL,
-  PRIMARY KEY (`CHANGE_VERSION_ID`),
-  UNIQUE KEY `UNIQUECHANGEVERSION` (`TOPIC`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
 -- Table structure for table FUNCS
 --
 CREATE TABLE IF NOT EXISTS `FUNCS` (

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql b/metastore/scripts/upgrade/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql
index c3f83b3..ddc17d8 100644
--- a/metastore/scripts/upgrade/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql
+++ b/metastore/scripts/upgrade/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql
@@ -1,6 +1,5 @@
 SELECT 'Upgrading MetaStore schema from 2.0.0 to 2.1.0' AS ' ';
 
-SOURCE 033-HIVE-12892.mysql.sql;
 SOURCE 034-HIVE-13076.mysql.sql;
 SOURCE 035-HIVE-12295.mysql.sql;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/oracle/033-HIVE-12892.oracle.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/oracle/033-HIVE-12892.oracle.sql b/metastore/scripts/upgrade/oracle/033-HIVE-12892.oracle.sql
deleted file mode 100644
index d2bd9d5..0000000
--- a/metastore/scripts/upgrade/oracle/033-HIVE-12892.oracle.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE CHANGE_VERSION (
-  CHANGE_VERSION_ID NUMBER NOT NULL,
-  VERSION NUMBER NOT NULL,
-  TOPIC VARCHAR(255) NOT NULL
-);
-ALTER TABLE CHANGE_VERSION ADD CONSTRAINT CHANGE_VERSION_PK PRIMARY KEY (CHANGE_VERSION_ID);
-CREATE UNIQUE INDEX UNIQUE_CHANGE_VERSION ON CHANGE_VERSION (TOPIC);

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/oracle/hive-schema-2.1.0.oracle.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/oracle/hive-schema-2.1.0.oracle.sql b/metastore/scripts/upgrade/oracle/hive-schema-2.1.0.oracle.sql
index d003a16..8420661 100644
--- a/metastore/scripts/upgrade/oracle/hive-schema-2.1.0.oracle.sql
+++ b/metastore/scripts/upgrade/oracle/hive-schema-2.1.0.oracle.sql
@@ -488,19 +488,10 @@ CREATE TABLE TAB_COL_STATS (
 CREATE TABLE VERSION (
   VER_ID NUMBER NOT NULL,
   SCHEMA_VERSION VARCHAR(127) NOT NULL,
-  VERSION_COMMENT VARCHAR(255) NOT NULL
+  VERSION_COMMENT VARCHAR(255)
 );
 ALTER TABLE VERSION ADD CONSTRAINT VERSION_PK PRIMARY KEY (VER_ID);
 
-CREATE TABLE CHANGE_VERSION (
-  CHANGE_VERSION_ID NUMBER NOT NULL,
-  VERSION NUMBER NOT NULL,
-  TOPIC VARCHAR(255) NOT NULL
-);
-ALTER TABLE CHANGE_VERSION ADD CONSTRAINT CHANGE_VERSION_PK PRIMARY KEY (CHANGE_VERSION_ID);
-
-CREATE UNIQUE INDEX UNIQUE_CHANGE_VERSION ON CHANGE_VERSION (TOPIC);
-
 ALTER TABLE TAB_COL_STATS ADD CONSTRAINT TAB_COL_STATS_PKEY PRIMARY KEY (CS_ID);
 
 ALTER TABLE TAB_COL_STATS ADD CONSTRAINT TAB_COL_STATS_FK FOREIGN KEY (TBL_ID) REFERENCES TBLS (TBL_ID) INITIALLY DEFERRED ;

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql b/metastore/scripts/upgrade/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql
index a226d9a..e27047e 100644
--- a/metastore/scripts/upgrade/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql
+++ b/metastore/scripts/upgrade/oracle/upgrade-2.0.0-to-2.1.0.oracle.sql
@@ -1,6 +1,5 @@
 SELECT 'Upgrading MetaStore schema from 2.0.0 to 2.1.0' AS Status from dual;
 
-@033-HIVE-12892.oracle.sql;
 @034-HIVE-13076.oracle.sql;
 @035-HIVE-13395.oracle.sql;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/postgres/032-HIVE-12892.postgres.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/postgres/032-HIVE-12892.postgres.sql b/metastore/scripts/upgrade/postgres/032-HIVE-12892.postgres.sql
deleted file mode 100644
index 302c51a..0000000
--- a/metastore/scripts/upgrade/postgres/032-HIVE-12892.postgres.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- Table structure for CHANGE_VERSION
---
-CREATE TABLE "CHANGE_VERSION" (
-  "CHANGE_VERSION_ID" bigint,
-  "VERSION" bigint NOT NULL,
-  "TOPIC" character varying(255) NOT NULL
-);
---
-ALTER TABLE ONLY "CHANGE_VERSION" ADD CONSTRAINT "CHANGE_VERSION_pkey" PRIMARY KEY ("CHANGE_VERSION_ID");
-ALTER TABLE ONLY "CHANGE_VERSION" ADD CONSTRAINT "CHANGE_VERSION_UNIQUE" UNIQUE ("TOPIC");

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/postgres/hive-schema-2.1.0.postgres.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/postgres/hive-schema-2.1.0.postgres.sql b/metastore/scripts/upgrade/postgres/hive-schema-2.1.0.postgres.sql
index 43e984c..f9bf2a3 100644
--- a/metastore/scripts/upgrade/postgres/hive-schema-2.1.0.postgres.sql
+++ b/metastore/scripts/upgrade/postgres/hive-schema-2.1.0.postgres.sql
@@ -514,15 +514,6 @@ CREATE TABLE "VERSION" (
 );
 
 --
--- Table structure for CHANGE_VERSION
---
-CREATE TABLE "CHANGE_VERSION" (
-  "CHANGE_VERSION_ID" bigint,
-  "VERSION" bigint NOT NULL,
-  "TOPIC" character varying(255) NOT NULL
-);
-
---
 -- Name: PART_COL_STATS Type: TABLE; Schema: public; Owner: hiveuser; Tablespace:
 --
 
@@ -1453,11 +1444,6 @@ ALTER TABLE ONLY "PART_COL_STATS" ADD CONSTRAINT "PART_COL_STATS_fkey" FOREIGN K
 
 ALTER TABLE ONLY "VERSION" ADD CONSTRAINT "VERSION_pkey" PRIMARY KEY ("VER_ID");
 
-ALTER TABLE ONLY "CHANGE_VERSION" ADD CONSTRAINT "CHANGE_VERSION_pkey" PRIMARY KEY ("CHANGE_VERSION_ID");
-
-ALTER TABLE ONLY "CHANGE_VERSION" ADD CONSTRAINT "CHANGE_VERSION_UNIQUE" UNIQUE ("TOPIC");
-
-
 -- Name: FUNCS_FK1; Type: FK CONSTRAINT; Schema: public; Owner: hiveuser
 ALTER TABLE ONLY "FUNCS"
     ADD CONSTRAINT "FUNCS_FK1" FOREIGN KEY ("DB_ID") REFERENCES "DBS" ("DB_ID") DEFERRABLE;

http://git-wip-us.apache.org/repos/asf/hive/blob/10c07d6e/metastore/scripts/upgrade/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql
----------------------------------------------------------------------
diff --git a/metastore/scripts/upgrade/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql b/metastore/scripts/upgrade/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql
index 7fc603f..a7293f7 100644
--- a/metastore/scripts/upgrade/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql
+++ b/metastore/scripts/upgrade/postgres/upgrade-2.0.0-to-2.1.0.postgres.sql
@@ -1,6 +1,5 @@
 SELECT 'Upgrading MetaStore schema from 2.0.0 to 2.1.0';
 
-\i 032-HIVE-12892.postgres.sql;
 \i 033-HIVE-13076.postgres.sql;
 \i 034-HIVE-13395.postgres.sql;