Domain V1 deprecation cleanup (#2639)

* Remove domain V1 schema * Fix cadence-system domain migration issue
uber · Oct 5, 2019 · 6d70d9a · 6d70d9a
1 parent ef14cb2
commit 6d70d9a
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 38 deletions.
diff --git a/common/domain/handler_test.go b/common/domain/handler_test.go
@@ -330,6 +330,7 @@ func (s *domainHandlerCommonSuite) TestListDomain() {
 			domains[resp.Domains[0].DomainInfo.GetName()] = resp.Domains[0]
 		}
 	}
+	delete(domains, common.SystemLocalDomainName)
 	s.Equal(map[string]*shared.DescribeDomainResponse{
 		domainName1: &shared.DescribeDomainResponse{
 			DomainInfo: &shared.DomainInfo{

diff --git a/schema/cassandra/cadence/schema.cql b/schema/cassandra/cadence/schema.cql
@@ -402,20 +402,6 @@ CREATE TABLE domains (
     'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
   };
 
-CREATE TABLE domains_by_name (
-  name               text,
-  domain             frozen<domain>,
-  config             frozen<domain_config>,
-  replication_config frozen<domain_replication_config>, -- indicating active cluster and standby cluster used for replication
-  is_global_domain   boolean, -- indicating whether a domain is a global domain
-  config_version     bigint, -- indicating the version of domain config, excluding the failover / change of active cluster name
-  failover_version   bigint, -- indicating the version of active domain only, used for domain failover
-  db_version         bigint, -- indicate the version of the record, used for update
-  PRIMARY KEY (name)
-)  WITH COMPACTION = {
-     'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-   };
-
 CREATE TABLE domains_by_name_v2 (
   domains_partition             int,
   name                          text,
@@ -432,11 +418,18 @@ CREATE TABLE domains_by_name_v2 (
      'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
    };
 
-INSERT INTO domains_by_name (
+INSERT INTO domains_by_name_v2 (
+   domains_partition,
    name,
    domain,
-   config
+   config,
+   is_global_domain,
+   config_version,
+   failover_version,
+   failover_notification_version,
+   notification_version
 ) VALUES (
+   0,
    'cadence-system',
    {
        id: 32049b68-7872-4094-8e63-d0dd59896a83,
@@ -447,7 +440,12 @@ INSERT INTO domains_by_name (
    {
        retention:3,
        emit_metric:False
-   }
+   },
+   False,
+   0,
+   -24,
+   -1,
+   -1
 ) IF NOT EXISTS;
 
 INSERT INTO domains (

diff --git a/schema/cassandra/cadence/versioned/v0.12/system_domain_bootstrap.cql b/schema/cassandra/cadence/versioned/v0.12/system_domain_bootstrap.cql
@@ -1,21 +1,3 @@
-INSERT INTO domains_by_name (
-    name,
-    domain,
-    config
-) VALUES (
-    'cadence-system',
-    {
-        id: 32049b68-7872-4094-8e63-d0dd59896a83,
-        name: 'cadence-system',
-        description: 'cadence system workflow domain',
-        owner_email: 'cadence-dev-group@uber.com'
-    },
-    {
-        retention:3,
-        emit_metric:False
-    }
-) IF NOT EXISTS;
-
 INSERT INTO domains (
     id,
     domain

diff --git a/schema/cassandra/cadence/versioned/v0.23/manifest.json b/schema/cassandra/cadence/versioned/v0.23/manifest.json
@@ -4,6 +4,7 @@
   "Description": "Add queue table and version history",
   "SchemaUpdateCqlFiles": [
     "version_histories.cql",
-    "queue.cql"
+    "queue.cql",
+    "system_domain.cql"
   ]
 }
diff --git a/schema/cassandra/cadence/versioned/v0.23/system_domain.cql b/schema/cassandra/cadence/versioned/v0.23/system_domain.cql
@@ -0,0 +1,29 @@
+INSERT INTO domains_by_name_v2 (
+    domains_partition,
+    name,
+    domain,
+    config,
+    is_global_domain,
+    config_version,
+    failover_version,
+    failover_notification_version,
+    notification_version
+) VALUES (
+    0,
+    'cadence-system',
+    {
+        id: 32049b68-7872-4094-8e63-d0dd59896a83,
+        name: 'cadence-system',
+        description: 'cadence system workflow domain',
+        owner_email: 'cadence-dev-group@uber.com'
+    },
+    {
+        retention:3,
+        emit_metric:False
+    },
+    False,
+    0,
+    -24,
+    -1,
+    -1
+) IF NOT EXISTS;
diff --git a/service/worker/service.go b/service/worker/service.go
@@ -27,6 +27,9 @@ import (
 	"sync/atomic"
 	"time"
 
+	cshared "go.uber.org/cadence/.gen/go/shared"
+	cclient "go.uber.org/cadence/client"
+
 	"github.com/uber/cadence/.gen/go/shared"
 	"github.com/uber/cadence/common"
 	carchiver "github.com/uber/cadence/common/archiver"
@@ -46,8 +49,6 @@ import (
 	"github.com/uber/cadence/service/worker/parentclosepolicy"
 	"github.com/uber/cadence/service/worker/replicator"
 	"github.com/uber/cadence/service/worker/scanner"
-	cshared "go.uber.org/cadence/.gen/go/shared"
-	cclient "go.uber.org/cadence/client"
 )
 
 type (