Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

chore: project structure maintenance #583

Merged
merged 1 commit into from
Nov 6, 2023
Merged

chore: project structure maintenance #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions distribution/conf/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion distribution/docker/compose.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
9 changes: 2 additions & 7 deletions ...data/s3/DefaultS3MetadataServiceTest.java → ...service/DefaultS3MetadataServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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();
Expand Down
21 changes: 0 additions & 21 deletions metadata/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
174 changes: 0 additions & 174 deletions metadata/src/test/java/com/automq/rocketmq/metadata/s3/DatabaseTestBase.java
View file
Open in desktop

This file was deleted.