chore: project structure maintenance (#583)

Signed-off-by: Li Zhanhui <[email protected]>
AutoMQ · Nov 6, 2023 · e5ed6a9 · e5ed6a9
1 parent 04323ac
commit e5ed6a9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 203 deletions.
diff --git a/distribution/conf/log4j2.xml b/distribution/conf/log4j2.xml
@@ -51,6 +51,9 @@
         <Logger name="com.automq.stream" level="info" additivity="false">
             <AppenderRef ref="streamAppender"/>
         </Logger>
+        <Logger name="com.automq.rocketmq.metadata.mapper" level="trace" additivity="false">
+            <AppenderRef ref="controllerAppender" />
+        </Logger>
         <Root level="info">
             <AppenderRef ref="rollingFile"/>
         </Root>

diff --git a/distribution/docker/compose.sh b/distribution/docker/compose.sh
@@ -18,7 +18,7 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 REPO_DIR=$(dirname "$(dirname "$SCRIPT_DIR")")
 cd "$SCRIPT_DIR" || exit 1
-cp "$REPO_DIR/controller/src/main/resources/ddl.sql" .
+cp "$REPO_DIR/metadata-jdbc/src/main/resources/ddl.sql" .
 
 OS_NAME=$(uname)
 if [ "$OS_NAME" == "Linux" ]

diff --git a/...data/s3/DefaultS3MetadataServiceTest.java → ...service/DefaultS3MetadataServiceTest.java b/...data/s3/DefaultS3MetadataServiceTest.java → ...service/DefaultS3MetadataServiceTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.automq.rocketmq.metadata.s3;
+package com.automq.rocketmq.metadata.service;
 
 import apache.rocketmq.controller.v1.S3ObjectState;
 import apache.rocketmq.controller.v1.S3StreamObject;
@@ -25,8 +25,7 @@
 import apache.rocketmq.controller.v1.SubStream;
 import com.automq.rocketmq.common.config.ControllerConfig;
 import com.automq.rocketmq.common.system.StreamConstants;
-import com.automq.rocketmq.controller.ControllerClient;
-import com.automq.rocketmq.metadata.service.S3MetadataService;
+import com.automq.rocketmq.metadata.DatabaseTestBase;
 import com.automq.rocketmq.metadata.dao.Range;
 import com.automq.rocketmq.metadata.dao.S3Object;
 import com.automq.rocketmq.metadata.dao.S3WalObject;
@@ -36,7 +35,6 @@
 import com.automq.rocketmq.metadata.mapper.S3StreamObjectMapper;
 import com.automq.rocketmq.metadata.mapper.S3WalObjectMapper;
 import com.automq.rocketmq.metadata.mapper.StreamMapper;
-import com.automq.rocketmq.metadata.service.DefaultS3MetadataService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.LongStream;
@@ -56,14 +54,11 @@
 
 public class DefaultS3MetadataServiceTest extends DatabaseTestBase {
 
-    ControllerClient client;
-
     ControllerConfig config;
 
     ExecutorService executorService;
 
     public DefaultS3MetadataServiceTest() {
-        this.client = Mockito.mock(ControllerClient.class);
         this.config = Mockito.mock(ControllerConfig.class);
         Mockito.when(config.nodeId()).thenReturn(1);
         this.executorService = Executors.newSingleThreadExecutor();

diff --git a/metadata/pom.xml b/metadata/pom.xml
@@ -39,26 +39,5 @@
             <artifactId>metadata-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <version>1.19.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>mysql</artifactId>
-            <version>1.19.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>1.19.0</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/metadata/src/test/java/com/automq/rocketmq/metadata/s3/DatabaseTestBase.java b/metadata/src/test/java/com/automq/rocketmq/metadata/s3/DatabaseTestBase.java