fix: separate database accessor to metadata-jdbc module (#540)

Signed-off-by: Li Zhanhui <[email protected]>
AutoMQ · Nov 1, 2023 · 0192e88 · 0192e88
1 parent aadbbb4
commit 0192e88
Show file tree

Hide file tree

Showing 119 changed files with 746 additions and 481 deletions.
diff --git a/broker/src/main/java/com/automq/rocketmq/broker/BrokerController.java b/broker/src/main/java/com/automq/rocketmq/broker/BrokerController.java
@@ -20,9 +20,9 @@
 import com.automq.rocketmq.common.api.DataStore;
 import com.automq.rocketmq.common.config.BrokerConfig;
 import com.automq.rocketmq.common.util.Lifecycle;
-import com.automq.rocketmq.controller.ControllerServiceImpl;
-import com.automq.rocketmq.controller.MetadataStoreBuilder;
-import com.automq.rocketmq.controller.metadata.MetadataStore;
+import com.automq.rocketmq.controller.server.ControllerServiceImpl;
+import com.automq.rocketmq.controller.server.MetadataStoreBuilder;
+import com.automq.rocketmq.controller.MetadataStore;
 import com.automq.rocketmq.metadata.DefaultProxyMetadataService;
 import com.automq.rocketmq.metadata.DefaultStoreMetadataService;
 import com.automq.rocketmq.metadata.api.ProxyMetadataService;

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/ConsumeMessage.java b/cli/src/main/java/com/automq/rocketmq/cli/ConsumeMessage.java
@@ -24,7 +24,7 @@
 import com.automq.rocketmq.cli.tools.CliUtils;
 import com.automq.rocketmq.common.PrefixThreadFactory;
 import com.automq.rocketmq.controller.exception.ControllerException;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import com.codahale.metrics.ConsoleReporter;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/CreateGroup.java b/cli/src/main/java/com/automq/rocketmq/cli/CreateGroup.java
@@ -21,8 +21,8 @@
 import apache.rocketmq.controller.v1.CreateGroupRequest;
 import apache.rocketmq.controller.v1.GroupType;
 import apache.rocketmq.controller.v1.SubscriptionMode;
-import com.automq.rocketmq.controller.metadata.ControllerClient;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.ControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import java.util.concurrent.Callable;
 import picocli.CommandLine;
 

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/CreateTopic.java b/cli/src/main/java/com/automq/rocketmq/cli/CreateTopic.java
@@ -21,7 +21,7 @@
 import apache.rocketmq.controller.v1.CreateTopicRequest;
 import apache.rocketmq.controller.v1.MessageType;
 import com.automq.rocketmq.common.util.DurationUtil;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import java.util.concurrent.Callable;
 import picocli.CommandLine;
 

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/DeleteGroup.java b/cli/src/main/java/com/automq/rocketmq/cli/DeleteGroup.java
@@ -17,8 +17,8 @@
 
 package com.automq.rocketmq.cli;
 
-import com.automq.rocketmq.controller.metadata.ControllerClient;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.ControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import java.util.concurrent.Callable;
 import picocli.CommandLine;
 

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/DeleteTopic.java b/cli/src/main/java/com/automq/rocketmq/cli/DeleteTopic.java
@@ -17,8 +17,8 @@
 
 package com.automq.rocketmq.cli;
 
-import com.automq.rocketmq.controller.metadata.ControllerClient;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.ControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import java.util.concurrent.Callable;
 import picocli.CommandLine;
 

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/DescribeCluster.java b/cli/src/main/java/com/automq/rocketmq/cli/DescribeCluster.java
@@ -19,8 +19,8 @@
 
 import apache.rocketmq.controller.v1.Cluster;
 import apache.rocketmq.controller.v1.DescribeClusterRequest;
-import com.automq.rocketmq.controller.metadata.ControllerClient;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.ControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import java.util.concurrent.Callable;
 import picocli.CommandLine;
 

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/DescribeGroup.java b/cli/src/main/java/com/automq/rocketmq/cli/DescribeGroup.java
@@ -18,8 +18,8 @@
 package com.automq.rocketmq.cli;
 
 import apache.rocketmq.controller.v1.ConsumerGroup;
-import com.automq.rocketmq.controller.metadata.ControllerClient;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.ControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import de.vandermeer.asciitable.AT_Row;
 import de.vandermeer.asciitable.AsciiTable;
 import de.vandermeer.asciitable.CWC_LongestLine;

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/DescribeTopic.java b/cli/src/main/java/com/automq/rocketmq/cli/DescribeTopic.java
@@ -18,8 +18,8 @@
 package com.automq.rocketmq.cli;
 
 import apache.rocketmq.controller.v1.Topic;
-import com.automq.rocketmq.controller.metadata.ControllerClient;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.ControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import java.util.concurrent.Callable;
 import picocli.CommandLine;
 

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/ListGroup.java b/cli/src/main/java/com/automq/rocketmq/cli/ListGroup.java
@@ -20,8 +20,8 @@
 import apache.rocketmq.controller.v1.ConsumerGroup;
 import apache.rocketmq.controller.v1.ListGroupReply;
 import apache.rocketmq.controller.v1.ListGroupRequest;
-import com.automq.rocketmq.controller.metadata.ControllerClient;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.ControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import de.vandermeer.asciitable.AT_Row;
 import de.vandermeer.asciitable.AsciiTable;
 import de.vandermeer.asciitable.CWC_LongestLine;

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/ListTopic.java b/cli/src/main/java/com/automq/rocketmq/cli/ListTopic.java
@@ -21,8 +21,8 @@
 import apache.rocketmq.controller.v1.ListTopicsRequest;
 import apache.rocketmq.controller.v1.MessageType;
 import apache.rocketmq.controller.v1.Topic;
-import com.automq.rocketmq.controller.metadata.ControllerClient;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.ControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import de.vandermeer.asciitable.AT_Row;
 import de.vandermeer.asciitable.AsciiTable;
 import de.vandermeer.asciitable.CWC_LongestLine;

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/ProduceMessage.java b/cli/src/main/java/com/automq/rocketmq/cli/ProduceMessage.java
@@ -24,7 +24,7 @@
 import com.automq.rocketmq.cli.tools.CliUtils;
 import com.automq.rocketmq.common.PrefixThreadFactory;
 import com.automq.rocketmq.controller.exception.ControllerException;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import com.codahale.metrics.ConsoleReporter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/TerminateNode.java b/cli/src/main/java/com/automq/rocketmq/cli/TerminateNode.java
@@ -19,8 +19,8 @@
 
 import apache.rocketmq.controller.v1.TerminateNodeReply;
 import apache.rocketmq.controller.v1.TerminateNodeRequest;
-import com.automq.rocketmq.controller.metadata.ControllerClient;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.ControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import io.grpc.stub.StreamObserver;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/UpdateGroup.java b/cli/src/main/java/com/automq/rocketmq/cli/UpdateGroup.java
@@ -19,8 +19,8 @@
 
 import apache.rocketmq.controller.v1.GroupType;
 import apache.rocketmq.controller.v1.UpdateGroupRequest;
-import com.automq.rocketmq.controller.metadata.ControllerClient;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.ControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import com.google.common.base.Strings;
 import java.util.concurrent.Callable;
 import picocli.CommandLine;

diff --git a/cli/src/main/java/com/automq/rocketmq/cli/UpdateTopic.java b/cli/src/main/java/com/automq/rocketmq/cli/UpdateTopic.java
@@ -19,8 +19,8 @@
 
 import apache.rocketmq.controller.v1.Topic;
 import apache.rocketmq.controller.v1.UpdateTopicRequest;
-import com.automq.rocketmq.controller.metadata.ControllerClient;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.controller.ControllerClient;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
 import com.google.common.base.Strings;
 import java.util.concurrent.Callable;
 import picocli.CommandLine;

diff --git a/controller/pom.xml b/controller/pom.xml
@@ -29,40 +29,16 @@
     <artifactId>rocketmq-controller</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>rocketmq-proto</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>rocketmq-common</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>5.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>3.5.13</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <version>8.1.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.automq.rocketmq</groupId>
+            <artifactId>metadata-jdbc</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/...controller/metadata/ControllerClient.java → ...rocketmq/controller/ControllerClient.java b/...controller/metadata/ControllerClient.java → ...rocketmq/controller/ControllerClient.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.automq.rocketmq.controller.metadata;
+package com.automq.rocketmq.controller;
 
 import apache.rocketmq.controller.v1.CloseStreamReply;
 import apache.rocketmq.controller.v1.CloseStreamRequest;
@@ -47,7 +47,7 @@
 import apache.rocketmq.controller.v1.UpdateGroupRequest;
 import apache.rocketmq.controller.v1.UpdateTopicRequest;
 import com.automq.rocketmq.controller.exception.ControllerException;
-import com.automq.rocketmq.controller.metadata.database.dao.Node;
+import com.automq.rocketmq.metadata.dao.Node;
 
 import io.grpc.stub.StreamObserver;
 import java.io.Closeable;

diff --git a/...mq/controller/metadata/MetadataStore.java → ...mq/rocketmq/controller/MetadataStore.java b/...mq/controller/metadata/MetadataStore.java → ...mq/rocketmq/controller/MetadataStore.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.automq.rocketmq.controller.metadata;
+package com.automq.rocketmq.controller;
 
 import apache.rocketmq.controller.v1.AssignmentStatus;
 import apache.rocketmq.controller.v1.Cluster;
@@ -34,11 +34,13 @@
 import com.automq.rocketmq.common.api.DataStore;
 import com.automq.rocketmq.common.config.ControllerConfig;
 import com.automq.rocketmq.controller.exception.ControllerException;
-import com.automq.rocketmq.controller.metadata.database.dao.Group;
-import com.automq.rocketmq.controller.metadata.database.dao.Lease;
-import com.automq.rocketmq.controller.metadata.database.dao.Node;
-import com.automq.rocketmq.controller.metadata.database.dao.QueueAssignment;
-import com.automq.rocketmq.controller.metadata.database.dao.Stream;
+import com.automq.rocketmq.controller.server.store.BrokerNode;
+import com.automq.rocketmq.controller.server.store.Role;
+import com.automq.rocketmq.metadata.dao.Group;
+import com.automq.rocketmq.metadata.dao.Lease;
+import com.automq.rocketmq.metadata.dao.Node;
+import com.automq.rocketmq.metadata.dao.QueueAssignment;
+import com.automq.rocketmq.metadata.dao.Stream;
 import java.io.Closeable;
 import java.util.Collection;
 import java.util.List;
@@ -207,7 +209,7 @@ CompletableFuture<Pair<List<S3StreamObject>, List<S3WALObject>>> listObjects(lon
 
     boolean maintainLeadershipWithSharedLock(SqlSession session);
 
-    void applyTopicChange(List<com.automq.rocketmq.controller.metadata.database.dao.Topic> topics);
+    void applyTopicChange(List<com.automq.rocketmq.metadata.dao.Topic> topics);
 
     void applyAssignmentChange(List<QueueAssignment> assignments);
 

diff --git a/...roller/metadata/GrpcControllerClient.java → ...ntroller/client/GrpcControllerClient.java b/...roller/metadata/GrpcControllerClient.java → ...ntroller/client/GrpcControllerClient.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.automq.rocketmq.controller.metadata;
+package com.automq.rocketmq.controller.client;
 
 import apache.rocketmq.controller.v1.CloseStreamReply;
 import apache.rocketmq.controller.v1.CloseStreamRequest;
@@ -72,8 +72,9 @@
 import apache.rocketmq.controller.v1.UpdateTopicReply;
 import apache.rocketmq.controller.v1.UpdateTopicRequest;
 import com.automq.rocketmq.common.config.GrpcClientConfig;
+import com.automq.rocketmq.controller.ControllerClient;
 import com.automq.rocketmq.controller.exception.ControllerException;
-import com.automq.rocketmq.controller.metadata.database.dao.Node;
+import com.automq.rocketmq.metadata.dao.Node;
 import com.google.common.base.Strings;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;

diff --git a/...tmq/controller/ControllerServiceImpl.java → ...troller/server/ControllerServiceImpl.java b/...tmq/controller/ControllerServiceImpl.java → ...troller/server/ControllerServiceImpl.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.automq.rocketmq.controller;
+package com.automq.rocketmq.controller.server;
 
 import apache.rocketmq.controller.v1.CloseStreamReply;
 import apache.rocketmq.controller.v1.CloseStreamRequest;
@@ -78,9 +78,9 @@
 import apache.rocketmq.controller.v1.UpdateTopicReply;
 import apache.rocketmq.controller.v1.UpdateTopicRequest;
 import com.automq.rocketmq.common.PrefixThreadFactory;
+import com.automq.rocketmq.controller.MetadataStore;
 import com.automq.rocketmq.controller.exception.ControllerException;
-import com.automq.rocketmq.controller.metadata.MetadataStore;
-import com.automq.rocketmq.controller.tasks.TerminationStageTask;
+import com.automq.rocketmq.controller.server.tasks.TerminationStageTask;
 import com.google.protobuf.TextFormat;
 import io.grpc.Context;
 import io.grpc.stub.StreamObserver;

diff --git a/...etmq/controller/MetadataStoreBuilder.java → ...ntroller/server/MetadataStoreBuilder.java b/...etmq/controller/MetadataStoreBuilder.java → ...ntroller/server/MetadataStoreBuilder.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package com.automq.rocketmq.controller;
+package com.automq.rocketmq.controller.server;
 
 import com.automq.rocketmq.common.config.ControllerConfig;
-import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
-import com.automq.rocketmq.controller.metadata.MetadataStore;
-import com.automq.rocketmq.controller.metadata.database.DefaultMetadataStore;
+import com.automq.rocketmq.controller.MetadataStore;
+import com.automq.rocketmq.controller.client.GrpcControllerClient;
+import com.automq.rocketmq.controller.server.store.DefaultMetadataStore;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;

diff --git a/...ketmq/controller/metadata/BrokerNode.java → ...q/controller/server/store/BrokerNode.java b/...ketmq/controller/metadata/BrokerNode.java → ...q/controller/server/store/BrokerNode.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.automq.rocketmq.controller.metadata;
+package com.automq.rocketmq.controller.server.store;
 
 import com.automq.rocketmq.common.config.ControllerConfig;
-import com.automq.rocketmq.controller.metadata.database.dao.Node;
+import com.automq.rocketmq.metadata.dao.Node;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;