supports multiple Kafka clusters and DBs

Change kafka table id to int

Issue-ID: DCAEGEN2-1631

Change-Id: Ib5109b75a387f76709dc38161bf2d7ef084950ef
Signed-off-by: Guobiao Mo <guobiaomo@chinamobile.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql b/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql
index 02f2343c..1fd9aa84 100644
--- a/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql
+++ b/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql
@@ -32,7 +32,7 @@ CREATE TABLE `db` (
   PRIMARY KEY (`id`),

   KEY `FK3njadtw43ieph7ftt4kxdhcko` (`db_type_id`),

   CONSTRAINT `FK3njadtw43ieph7ftt4kxdhcko` FOREIGN KEY (`db_type_id`) REFERENCES `db_type` (`id`)

-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;

+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 

 CREATE TABLE `portal` (

   `name` varchar(255) NOT NULL,

@@ -73,10 +73,10 @@ CREATE TABLE `design` (
   KEY `FKabb8e74230glxpaiai4aqsr34` (`topic_name_id`),

   CONSTRAINT `FKabb8e74230glxpaiai4aqsr34` FOREIGN KEY (`topic_name_id`) REFERENCES `topic_name` (`id`),

   CONSTRAINT `FKo43yi6aputq6kwqqu8eqbspm5` FOREIGN KEY (`design_type_id`) REFERENCES `design_type` (`id`)

-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;

+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 

 CREATE TABLE `kafka` (

-  `id` varchar(255) NOT NULL,

+  `id` int(11) NOT NULL AUTO_INCREMENT,

   `broker_list` varchar(255) NOT NULL,

   `consumer_count` int(11) DEFAULT 3,

   `enabled` bit(1) NOT NULL,

@@ -130,7 +130,7 @@ CREATE TABLE `map_db_topic` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 

 CREATE TABLE `map_kafka_topic` (

-  `kafka_id` varchar(255) NOT NULL,

+  `kafka_id` int(11) NOT NULL,

   `topic_id` int(11) NOT NULL,

   PRIMARY KEY (`topic_id`,`kafka_id`),

   KEY `FKtdrme4h7rxfh04u2i2wqu23g5` (`kafka_id`),

diff --git a/components/datalake-handler/feeder/src/assembly/scripts/init_db_data.sql b/components/datalake-handler/feeder/src/assembly/scripts/init_db_data.sql
index 0605e0e9..770c68bf 100644
--- a/components/datalake-handler/feeder/src/assembly/scripts/init_db_data.sql
+++ b/components/datalake-handler/feeder/src/assembly/scripts/init_db_data.sql
@@ -13,7 +13,7 @@ INSERT INTO datalake.kafka(
   ,timeout_sec

   ,zk

 ) VALUES (

-  'KAFKA_1'

+  1

   ,'main Kafka cluster' -- name - IN varchar(255)

   ,3   -- consumer_count - IN int(11)

   ,1   -- enabled - IN bit(1)