You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/06/24 15:11:30 UTC
[shardingsphere-elasticjob-lite] branch master updated: Unify RDB
module (#833)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-lite.git
The following commit(s) were added to refs/heads/master by this push:
new 35aeae6 Unify RDB module (#833)
35aeae6 is described below
commit 35aeae663674e86720ddd1f9d8e7cd7cf8eb603f
Author: Liang Zhang <te...@163.com>
AuthorDate: Wed Jun 24 23:11:21 2020 +0800
Unify RDB module (#833)
* Rename RDBJobEventSearch
* Rename RDBStatisticRepository
* Rename RDBJobEventStorage
---
.../restful/EventTraceHistoryRESTfulAPI.java | 23 +++----
.../tracing/rdb/listener/RDBTracingListener.java | 6 +-
...bEventRdbSearch.java => RDBJobEventSearch.java} | 4 +-
...Repository.java => RDBStatisticRepository.java} | 6 +-
...ventRdbStorage.java => RDBJobEventStorage.java} | 54 +++++++--------
.../rdb/listener/RDBTracingListenerTest.java | 4 +-
...bSearchTest.java => RDBJobEventSearchTest.java} | 79 +++++++++++-----------
...ryTest.java => RDBStatisticRepositoryTest.java} | 6 +-
...torageTest.java => RDBJobEventStorageTest.java} | 6 +-
9 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/EventTraceHistoryRESTfulAPI.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/EventTraceHistoryRESTfulAPI.java
index f9b5229..c3fa0a0 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/EventTraceHistoryRESTfulAPI.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/restful/EventTraceHistoryRESTfulAPI.java
@@ -18,14 +18,15 @@
package org.apache.shardingsphere.elasticjob.lite.console.restful;
import com.google.common.base.Strings;
+import org.apache.commons.dbcp.BasicDataSource;
import org.apache.shardingsphere.elasticjob.lite.console.domain.EventTraceDataSourceConfiguration;
import org.apache.shardingsphere.elasticjob.lite.console.service.EventTraceDataSourceConfigurationService;
import org.apache.shardingsphere.elasticjob.lite.console.service.impl.EventTraceDataSourceConfigurationServiceImpl;
import org.apache.shardingsphere.elasticjob.lite.console.util.SessionEventTraceDataSourceConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.search.JobEventRdbSearch;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobExecutionEvent;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.search.RDBJobEventSearch;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.search.RDBJobEventSearch.Result;
import javax.sql.DataSource;
import javax.ws.rs.Consumes;
@@ -63,12 +64,11 @@ public final class EventTraceHistoryRESTfulAPI {
@Path("/execution")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
- public JobEventRdbSearch.Result<JobExecutionEvent> findJobExecutionEvents(@Context final UriInfo uriInfo) throws ParseException {
+ public Result<JobExecutionEvent> findJobExecutionEvents(@Context final UriInfo uriInfo) throws ParseException {
if (!eventTraceDataSourceConfigurationService.loadActivated().isPresent()) {
- return new JobEventRdbSearch.Result<>(0, new ArrayList<JobExecutionEvent>());
+ return new Result<>(0, new ArrayList<JobExecutionEvent>());
}
- JobEventRdbSearch jobEventRdbSearch = new JobEventRdbSearch(setUpEventTraceDataSource());
- return jobEventRdbSearch.findJobExecutionEvents(buildCondition(uriInfo, new String[]{"jobName", "ip", "isSuccess"}));
+ return new RDBJobEventSearch(setUpEventTraceDataSource()).findJobExecutionEvents(buildCondition(uriInfo, new String[]{"jobName", "ip", "isSuccess"}));
}
/**
@@ -82,12 +82,11 @@ public final class EventTraceHistoryRESTfulAPI {
@Path("/status")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
- public JobEventRdbSearch.Result<JobStatusTraceEvent> findJobStatusTraceEvents(@Context final UriInfo uriInfo) throws ParseException {
+ public Result<JobStatusTraceEvent> findJobStatusTraceEvents(@Context final UriInfo uriInfo) throws ParseException {
if (!eventTraceDataSourceConfigurationService.loadActivated().isPresent()) {
- return new JobEventRdbSearch.Result<>(0, new ArrayList<JobStatusTraceEvent>());
+ return new Result<>(0, new ArrayList<JobStatusTraceEvent>());
}
- JobEventRdbSearch jobEventRdbSearch = new JobEventRdbSearch(setUpEventTraceDataSource());
- return jobEventRdbSearch.findJobStatusTraceEvents(buildCondition(uriInfo, new String[]{"jobName", "source", "executionType", "state"}));
+ return new RDBJobEventSearch(setUpEventTraceDataSource()).findJobStatusTraceEvents(buildCondition(uriInfo, new String[]{"jobName", "source", "executionType", "state"}));
}
private DataSource setUpEventTraceDataSource() {
@@ -99,7 +98,7 @@ public final class EventTraceHistoryRESTfulAPI {
return result;
}
- private JobEventRdbSearch.Condition buildCondition(final UriInfo info, final String[] params) throws ParseException {
+ private RDBJobEventSearch.Condition buildCondition(final UriInfo info, final String[] params) throws ParseException {
int perPage = 10;
int page = 1;
if (!Strings.isNullOrEmpty(info.getQueryParameters().getFirst("per_page"))) {
@@ -120,7 +119,7 @@ public final class EventTraceHistoryRESTfulAPI {
if (!Strings.isNullOrEmpty(info.getQueryParameters().getFirst("endTime"))) {
endTime = simpleDateFormat.parse(info.getQueryParameters().getFirst("endTime"));
}
- return new JobEventRdbSearch.Condition(perPage, page, sort, order, startTime, endTime, fields);
+ return new RDBJobEventSearch.Condition(perPage, page, sort, order, startTime, endTime, fields);
}
private Map<String, Object> getQueryParameters(final UriInfo info, final String[] params) {
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListener.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListener.java
index e9e7ef7..4dc039a 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListener.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListener.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.elasticjob.lite.tracing.rdb.listener;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobExecutionEvent;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent;
import org.apache.shardingsphere.elasticjob.lite.tracing.listener.TracingListener;
-import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.storage.JobEventRdbStorage;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.storage.RDBJobEventStorage;
import javax.sql.DataSource;
import java.sql.SQLException;
@@ -30,10 +30,10 @@ import java.sql.SQLException;
*/
public final class RDBTracingListener implements TracingListener {
- private final JobEventRdbStorage repository;
+ private final RDBJobEventStorage repository;
public RDBTracingListener(final DataSource dataSource) throws SQLException {
- repository = new JobEventRdbStorage(dataSource);
+ repository = new RDBJobEventStorage(dataSource);
}
@Override
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/JobEventRdbSearch.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/RDBJobEventSearch.java
similarity index 99%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/JobEventRdbSearch.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/RDBJobEventSearch.java
index 3aa2e23..462a155 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/JobEventRdbSearch.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/RDBJobEventSearch.java
@@ -42,11 +42,11 @@ import java.util.List;
import java.util.Map;
/**
- * Job event RDB search.
+ * RDB job event search.
*/
@RequiredArgsConstructor
@Slf4j
-public final class JobEventRdbSearch {
+public final class RDBJobEventSearch {
private static final String TABLE_JOB_EXECUTION_LOG = "JOB_EXECUTION_LOG";
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/StatisticRdbRepository.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/RDBStatisticRepository.java
similarity index 99%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/StatisticRdbRepository.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/RDBStatisticRepository.java
index aefec96..9b6f3fe 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/StatisticRdbRepository.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/RDBStatisticRepository.java
@@ -38,10 +38,10 @@ import java.util.List;
import java.util.Optional;
/**
- * Statistic RDB repository.
+ * RDB statistic repository.
*/
@Slf4j
-public class StatisticRdbRepository {
+public class RDBStatisticRepository {
private static final String TABLE_TASK_RESULT_STATISTICS = "TASK_RESULT_STATISTICS";
@@ -53,7 +53,7 @@ public class StatisticRdbRepository {
private final DataSource dataSource;
- public StatisticRdbRepository(final DataSource dataSource) throws SQLException {
+ public RDBStatisticRepository(final DataSource dataSource) throws SQLException {
this.dataSource = dataSource;
initTables();
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/JobEventRdbStorage.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/RDBJobEventStorage.java
similarity index 90%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/JobEventRdbStorage.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/RDBJobEventStorage.java
index 1aaf2fa..dacfa8f 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/JobEventRdbStorage.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/RDBJobEventStorage.java
@@ -39,10 +39,10 @@ import java.util.List;
import java.util.UUID;
/**
- * Job event RDB storage.
+ * RDB job event storage.
*/
@Slf4j
-public final class JobEventRdbStorage {
+public final class RDBJobEventStorage {
private static final String TABLE_JOB_EXECUTION_LOG = "JOB_EXECUTION_LOG";
@@ -54,41 +54,41 @@ public final class JobEventRdbStorage {
private DatabaseType databaseType;
- public JobEventRdbStorage(final DataSource dataSource) throws SQLException {
+ public RDBJobEventStorage(final DataSource dataSource) throws SQLException {
this.dataSource = dataSource;
initTablesAndIndexes();
}
private void initTablesAndIndexes() throws SQLException {
- try (Connection conn = dataSource.getConnection()) {
- createJobExecutionTableAndIndexIfNeeded(conn);
- createJobStatusTraceTableAndIndexIfNeeded(conn);
- databaseType = DatabaseType.valueFrom(conn.getMetaData().getDatabaseProductName());
+ try (Connection connection = dataSource.getConnection()) {
+ createJobExecutionTableAndIndexIfNeeded(connection);
+ createJobStatusTraceTableAndIndexIfNeeded(connection);
+ databaseType = DatabaseType.valueFrom(connection.getMetaData().getDatabaseProductName());
}
}
- private void createJobExecutionTableAndIndexIfNeeded(final Connection conn) throws SQLException {
- DatabaseMetaData dbMetaData = conn.getMetaData();
- try (ResultSet resultSet = dbMetaData.getTables(conn.getCatalog(), null, TABLE_JOB_EXECUTION_LOG, new String[]{"TABLE"})) {
+ private void createJobExecutionTableAndIndexIfNeeded(final Connection connection) throws SQLException {
+ DatabaseMetaData dbMetaData = connection.getMetaData();
+ try (ResultSet resultSet = dbMetaData.getTables(connection.getCatalog(), null, TABLE_JOB_EXECUTION_LOG, new String[]{"TABLE"})) {
if (!resultSet.next()) {
- createJobExecutionTable(conn);
+ createJobExecutionTable(connection);
}
}
}
- private void createJobStatusTraceTableAndIndexIfNeeded(final Connection conn) throws SQLException {
- DatabaseMetaData dbMetaData = conn.getMetaData();
- try (ResultSet resultSet = dbMetaData.getTables(conn.getCatalog(), null, TABLE_JOB_STATUS_TRACE_LOG, new String[]{"TABLE"})) {
+ private void createJobStatusTraceTableAndIndexIfNeeded(final Connection connection) throws SQLException {
+ DatabaseMetaData dbMetaData = connection.getMetaData();
+ try (ResultSet resultSet = dbMetaData.getTables(connection.getCatalog(), null, TABLE_JOB_STATUS_TRACE_LOG, new String[]{"TABLE"})) {
if (!resultSet.next()) {
- createJobStatusTraceTable(conn);
+ createJobStatusTraceTable(connection);
}
}
- createTaskIdIndexIfNeeded(conn, TABLE_JOB_STATUS_TRACE_LOG, TASK_ID_STATE_INDEX);
+ createTaskIdIndexIfNeeded(connection, TABLE_JOB_STATUS_TRACE_LOG, TASK_ID_STATE_INDEX);
}
- private void createTaskIdIndexIfNeeded(final Connection conn, final String tableName, final String indexName) throws SQLException {
- DatabaseMetaData dbMetaData = conn.getMetaData();
- try (ResultSet resultSet = dbMetaData.getIndexInfo(conn.getCatalog(), null, tableName, false, false)) {
+ private void createTaskIdIndexIfNeeded(final Connection connection, final String tableName, final String indexName) throws SQLException {
+ DatabaseMetaData dbMetaData = connection.getMetaData();
+ try (ResultSet resultSet = dbMetaData.getIndexInfo(connection.getCatalog(), null, tableName, false, false)) {
boolean hasTaskIdIndex = false;
while (resultSet.next()) {
if (indexName.equals(resultSet.getString("INDEX_NAME"))) {
@@ -96,12 +96,12 @@ public final class JobEventRdbStorage {
}
}
if (!hasTaskIdIndex) {
- createTaskIdAndStateIndex(conn, tableName);
+ createTaskIdAndStateIndex(connection, tableName);
}
}
}
- private void createJobExecutionTable(final Connection conn) throws SQLException {
+ private void createJobExecutionTable(final Connection connection) throws SQLException {
String dbSchema = "CREATE TABLE `" + TABLE_JOB_EXECUTION_LOG + "` ("
+ "`id` VARCHAR(40) NOT NULL, "
+ "`job_name` VARCHAR(100) NOT NULL, "
@@ -115,12 +115,12 @@ public final class JobEventRdbStorage {
+ "`start_time` TIMESTAMP NULL, "
+ "`complete_time` TIMESTAMP NULL, "
+ "PRIMARY KEY (`id`));";
- try (PreparedStatement preparedStatement = conn.prepareStatement(dbSchema)) {
+ try (PreparedStatement preparedStatement = connection.prepareStatement(dbSchema)) {
preparedStatement.execute();
}
}
- private void createJobStatusTraceTable(final Connection conn) throws SQLException {
+ private void createJobStatusTraceTable(final Connection connection) throws SQLException {
String dbSchema = "CREATE TABLE `" + TABLE_JOB_STATUS_TRACE_LOG + "` ("
+ "`id` VARCHAR(40) NOT NULL, "
+ "`job_name` VARCHAR(100) NOT NULL, "
@@ -134,20 +134,20 @@ public final class JobEventRdbStorage {
+ "`message` VARCHAR(4000) NULL, "
+ "`creation_time` TIMESTAMP NULL, "
+ "PRIMARY KEY (`id`));";
- try (PreparedStatement preparedStatement = conn.prepareStatement(dbSchema)) {
+ try (PreparedStatement preparedStatement = connection.prepareStatement(dbSchema)) {
preparedStatement.execute();
}
}
- private void createTaskIdAndStateIndex(final Connection conn, final String tableName) throws SQLException {
+ private void createTaskIdAndStateIndex(final Connection connection, final String tableName) throws SQLException {
String sql;
- DatabaseMetaData dbMetaData = conn.getMetaData();
+ DatabaseMetaData dbMetaData = connection.getMetaData();
if ("MySQL".equalsIgnoreCase(dbMetaData.getDatabaseProductName())) {
sql = "CREATE INDEX " + TASK_ID_STATE_INDEX + " ON " + tableName + " (`task_id`(128), `state`);";
} else {
sql = "CREATE INDEX " + TASK_ID_STATE_INDEX + " ON " + tableName + " (`task_id`, `state`);";
}
- try (PreparedStatement preparedStatement = conn.prepareStatement(sql)) {
+ try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
preparedStatement.execute();
}
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListenerTest.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListenerTest.java
index d677ac0..ff3026f 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListenerTest.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListenerTest.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobExecutionEvent
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent.Source;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent.State;
-import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.storage.JobEventRdbStorage;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.storage.RDBJobEventStorage;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -48,7 +48,7 @@ public final class RDBTracingListenerTest {
private RDBTracingListenerConfiguration rdbTracingListenerConfig;
@Mock
- private JobEventRdbStorage repository;
+ private RDBJobEventStorage repository;
private JobEventBus jobEventBus;
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/JobEventRdbSearchTest.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/RDBJobEventSearchTest.java
similarity index 62%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/JobEventRdbSearchTest.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/RDBJobEventSearchTest.java
index 842472f..54c9630 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/JobEventRdbSearchTest.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/RDBJobEventSearchTest.java
@@ -22,7 +22,8 @@ import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobExecutionEvent
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent.Source;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent.State;
-import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.storage.JobEventRdbStorage;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.search.RDBJobEventSearch.Result;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.storage.RDBJobEventStorage;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -34,11 +35,11 @@ import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class JobEventRdbSearchTest {
+public final class RDBJobEventSearchTest {
- private static JobEventRdbStorage storage;
+ private static RDBJobEventStorage storage;
- private static JobEventRdbSearch repository;
+ private static RDBJobEventSearch repository;
@BeforeClass
public static void setUpClass() throws SQLException {
@@ -47,8 +48,8 @@ public final class JobEventRdbSearchTest {
dataSource.setUrl("jdbc:h2:mem:");
dataSource.setUsername("sa");
dataSource.setPassword("");
- storage = new JobEventRdbStorage(dataSource);
- repository = new JobEventRdbSearch(dataSource);
+ storage = new RDBJobEventStorage(dataSource);
+ repository = new RDBJobEventSearch(dataSource);
initStorage();
}
@@ -67,34 +68,34 @@ public final class JobEventRdbSearchTest {
@Test
public void assertFindJobExecutionEventsWithPageSizeAndNumber() {
- JobEventRdbSearch.Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, null, null, null, null, null));
+ Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, null, null, null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
- result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(50, 1, null, null, null, null, null));
+ result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(50, 1, null, null, null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(50));
- result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(100, 5, null, null, null, null, null));
+ result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(100, 5, null, null, null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(100));
- result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(100, 6, null, null, null, null, null));
+ result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(100, 6, null, null, null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(0));
}
@Test
public void assertFindJobExecutionEventsWithErrorPageSizeAndNumber() {
- JobEventRdbSearch.Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(-1, -1, null, null, null, null, null));
+ Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(-1, -1, null, null, null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
}
@Test
public void assertFindJobExecutionEventsWithSort() {
- JobEventRdbSearch.Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, "jobName", "ASC", null, null, null));
+ Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, "jobName", "ASC", null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
assertThat(result.getRows().get(0).getJobName(), is("test_job_1"));
- result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, "jobName", "DESC", null, null, null));
+ result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, "jobName", "DESC", null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
assertThat(result.getRows().get(0).getJobName(), is("test_job_99"));
@@ -102,11 +103,11 @@ public final class JobEventRdbSearchTest {
@Test
public void assertFindJobExecutionEventsWithErrorSort() {
- JobEventRdbSearch.Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, "jobName", "ERROR_SORT", null, null, null));
+ Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, "jobName", "ERROR_SORT", null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
assertThat(result.getRows().get(0).getJobName(), is("test_job_1"));
- result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, "notExistField", "ASC", null, null, null));
+ result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, "notExistField", "ASC", null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
}
@@ -115,19 +116,19 @@ public final class JobEventRdbSearchTest {
public void assertFindJobExecutionEventsWithTime() {
Date now = new Date();
Date tenMinutesBefore = new Date(now.getTime() - 10 * 60 * 1000);
- JobEventRdbSearch.Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, null, null, tenMinutesBefore, null, null));
+ Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, null, null, tenMinutesBefore, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
- result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, null, null, now, null, null));
+ result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, null, null, now, null, null));
assertThat(result.getTotal(), is(0));
assertThat(result.getRows().size(), is(0));
- result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, null, null, null, tenMinutesBefore, null));
+ result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, null, null, null, tenMinutesBefore, null));
assertThat(result.getTotal(), is(0));
assertThat(result.getRows().size(), is(0));
- result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, null, null, null, now, null));
+ result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, null, null, null, now, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
- result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, null, null, tenMinutesBefore, now, null));
+ result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, null, null, tenMinutesBefore, now, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
}
@@ -136,12 +137,12 @@ public final class JobEventRdbSearchTest {
public void assertFindJobExecutionEventsWithFields() {
Map<String, Object> fields = new HashMap<>();
fields.put("isSuccess", "1");
- JobEventRdbSearch.Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, null, null, null, null, fields));
+ Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, null, null, null, null, fields));
assertThat(result.getTotal(), is(250));
assertThat(result.getRows().size(), is(10));
fields.put("isSuccess", null);
fields.put("jobName", "test_job_1");
- result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, null, null, null, null, fields));
+ result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, null, null, null, null, fields));
assertThat(result.getTotal(), is(1));
assertThat(result.getRows().size(), is(1));
}
@@ -150,41 +151,41 @@ public final class JobEventRdbSearchTest {
public void assertFindJobExecutionEventsWithErrorFields() {
Map<String, Object> fields = new HashMap<>();
fields.put("notExistField", "some value");
- JobEventRdbSearch.Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new JobEventRdbSearch.Condition(10, 1, null, null, null, null, fields));
+ Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new RDBJobEventSearch.Condition(10, 1, null, null, null, null, fields));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
}
@Test
public void assertFindJobStatusTraceEventsWithPageSizeAndNumber() {
- JobEventRdbSearch.Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, null, null, null, null, null));
+ Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, null, null, null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
- result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(50, 1, null, null, null, null, null));
+ result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(50, 1, null, null, null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(50));
- result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(100, 5, null, null, null, null, null));
+ result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(100, 5, null, null, null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(100));
- result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(100, 6, null, null, null, null, null));
+ result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(100, 6, null, null, null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(0));
}
@Test
public void assertFindJobStatusTraceEventsWithErrorPageSizeAndNumber() {
- JobEventRdbSearch.Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(-1, -1, null, null, null, null, null));
+ Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(-1, -1, null, null, null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
}
@Test
public void assertFindJobStatusTraceEventsWithSort() {
- JobEventRdbSearch.Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, "jobName", "ASC", null, null, null));
+ Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, "jobName", "ASC", null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
assertThat(result.getRows().get(0).getJobName(), is("test_job_1"));
- result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, "jobName", "DESC", null, null, null));
+ result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, "jobName", "DESC", null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
assertThat(result.getRows().get(0).getJobName(), is("test_job_99"));
@@ -192,11 +193,11 @@ public final class JobEventRdbSearchTest {
@Test
public void assertFindJobStatusTraceEventsWithErrorSort() {
- JobEventRdbSearch.Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, "jobName", "ERROR_SORT", null, null, null));
+ Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, "jobName", "ERROR_SORT", null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
assertThat(result.getRows().get(0).getJobName(), is("test_job_1"));
- result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, "notExistField", "ASC", null, null, null));
+ result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, "notExistField", "ASC", null, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
}
@@ -205,19 +206,19 @@ public final class JobEventRdbSearchTest {
public void assertFindJobStatusTraceEventsWithTime() {
Date now = new Date();
Date tenMinutesBefore = new Date(now.getTime() - 10 * 60 * 1000);
- JobEventRdbSearch.Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, null, null, tenMinutesBefore, null, null));
+ Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, null, null, tenMinutesBefore, null, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
- result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, null, null, now, null, null));
+ result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, null, null, now, null, null));
assertThat(result.getTotal(), is(0));
assertThat(result.getRows().size(), is(0));
- result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, null, null, null, tenMinutesBefore, null));
+ result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, null, null, null, tenMinutesBefore, null));
assertThat(result.getTotal(), is(0));
assertThat(result.getRows().size(), is(0));
- result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, null, null, null, now, null));
+ result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, null, null, null, now, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
- result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, null, null, tenMinutesBefore, now, null));
+ result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, null, null, tenMinutesBefore, now, null));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
}
@@ -226,7 +227,7 @@ public final class JobEventRdbSearchTest {
public void assertFindJobStatusTraceEventsWithFields() {
Map<String, Object> fields = new HashMap<>();
fields.put("jobName", "test_job_1");
- JobEventRdbSearch.Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, null, null, null, null, fields));
+ Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, null, null, null, null, fields));
assertThat(result.getTotal(), is(1));
assertThat(result.getRows().size(), is(1));
}
@@ -235,7 +236,7 @@ public final class JobEventRdbSearchTest {
public void assertFindJobStatusTraceEventsWithErrorFields() {
Map<String, Object> fields = new HashMap<>();
fields.put("notExistField", "some value");
- JobEventRdbSearch.Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new JobEventRdbSearch.Condition(10, 1, null, null, null, null, fields));
+ Result<JobStatusTraceEvent> result = repository.findJobStatusTraceEvents(new RDBJobEventSearch.Condition(10, 1, null, null, null, null, fields));
assertThat(result.getTotal(), is(500));
assertThat(result.getRows().size(), is(10));
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/StatisticRdbRepositoryTest.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/RDBStatisticRepositoryTest.java
similarity index 98%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/StatisticRdbRepositoryTest.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/RDBStatisticRepositoryTest.java
index 83d3ccc..68b603b 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/StatisticRdbRepositoryTest.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/statistics/rdb/RDBStatisticRepositoryTest.java
@@ -35,9 +35,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-public class StatisticRdbRepositoryTest {
+public class RDBStatisticRepositoryTest {
- private StatisticRdbRepository repository;
+ private RDBStatisticRepository repository;
@Before
public void setup() throws SQLException {
@@ -46,7 +46,7 @@ public class StatisticRdbRepositoryTest {
dataSource.setUrl("jdbc:h2:mem:");
dataSource.setUsername("sa");
dataSource.setPassword("");
- repository = new StatisticRdbRepository(dataSource);
+ repository = new RDBStatisticRepository(dataSource);
}
@Test
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/JobEventRdbStorageTest.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/RDBJobEventStorageTest.java
similarity index 98%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/JobEventRdbStorageTest.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/RDBJobEventStorageTest.java
index 152128e..c90de06 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/JobEventRdbStorageTest.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/storage/RDBJobEventStorageTest.java
@@ -35,9 +35,9 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-public final class JobEventRdbStorageTest {
+public final class RDBJobEventStorageTest {
- private JobEventRdbStorage storage;
+ private RDBJobEventStorage storage;
@Before
public void setup() throws SQLException {
@@ -46,7 +46,7 @@ public final class JobEventRdbStorageTest {
dataSource.setUrl("jdbc:h2:mem:job_event_storage");
dataSource.setUsername("sa");
dataSource.setPassword("");
- storage = new JobEventRdbStorage(dataSource);
+ storage = new RDBJobEventStorage(dataSource);
}
@Test