This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new 8d45e6f5d Refactor structure of tracing module (#2356)
8d45e6f5d is described below
commit 8d45e6f5d8c1842d89f7f02ba9b79fc9347d98a1
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Oct 31 21:27:00 2023 +0800
Refactor structure of tracing module (#2356)
* Rename RDBTracingStorageConfiguration
* Refactor structure of tracing module
* Refactor structure of tracing module
* Refactor structure of tracing module
---
.../RDBTracingStorageConfiguration.java} | 28 ++--
.../tracing/rdb/listener/RDBTracingListener.java | 6 +-
.../converter/RDBTracingStorageConverter.java} | 14 +-
.../datasource/DataSourceRegistry.java | 21 ++-
.../datasource/JDBCParameterDecorator.java | 2 +-
.../RDBJobEventRepository.java} | 185 +++++++++------------
.../rdb/storage/{ => sql}/RDBStorageSQLMapper.java | 2 +-
.../storage/{ => sql}/SQLPropertiesFactory.java | 4 +-
.../type/TracingStorageDatabaseType.java | 2 +-
.../type/impl/DB2TracingStorageDatabaseType.java | 4 +-
.../impl/DefaultTracingStorageDatabaseType.java | 4 +-
.../type/impl/H2TracingStorageDatabaseType.java | 4 +-
.../type/impl/MySQLTracingStorageDatabaseType.java | 4 +-
.../impl/OracleTracingStorageDatabaseType.java | 4 +-
.../impl/PostgreSQLTracingStorageDatabaseType.java | 4 +-
.../impl/SQLServerTracingStorageDatabaseType.java | 4 +-
.../rdb/yaml/YamlDataSourceConfiguration.java | 6 +-
.../yaml/YamlDataSourceConfigurationConverter.java | 8 +-
....kernel.tracing.storage.TracingStorageConverter | 2 +-
...ng.rdb.storage.type.TracingStorageDatabaseType} | 12 +-
.../RDBTracingStorageConfigurationTest.java} | 32 ++--
.../rdb/listener/RDBTracingListenerTest.java | 8 +-
.../converter/RDBTracingStorageConverterTest.java} | 12 +-
.../datasource/DataSourceRegistryTest.java | 7 +-
.../RDBJobEventRepositoryTest.java} | 61 ++-----
...BTracingStorageConfigurationConverterTest.java} | 6 +-
.../rdb/src/test/resources/logback-test.xml | 2 +-
.../elasticjob/example/JavaMain.java | 2 +-
.../kernel/executor/facade/JobFacade.java | 4 +-
.../kernel/internal/schedule/JobScheduler.java | 2 +-
.../{api => config}/TracingConfiguration.java | 4 +-
.../TracingStorageConfiguration.java | 2 +-
.../tracing/{ => event}/JobTracingEventBus.java | 5 +-
.../tracing/storage/TracingStorageConverter.java | 4 +-
.../tracing/yaml/YamlTracingConfiguration.java | 2 +-
.../yaml/YamlTracingConfigurationConverter.java | 4 +-
.../yaml/YamlTracingStorageConfiguration.java | 2 +-
.../kernel/executor/facade/JobFacadeTest.java | 2 +-
.../{ => event}/JobTracingEventBusTest.java | 6 +-
.../config/TracingStorageConfigurationFixture.java | 2 +-
.../config/TracingStorageFixtureConverter.java | 4 +-
.../yaml/YamlJobEventCallerConfiguration.java | 2 +-
.../YamlJobEventCallerConfigurationConverter.java | 4 +-
.../YamlTracingConfigurationConverterTest.java | 2 +-
kernel/src/test/resources/logback-test.xml | 2 +-
.../boot/job/ElasticJobBootstrapConfiguration.java | 2 +-
.../tracing/ElasticJobTracingConfiguration.java | 2 +-
.../spring/boot/job/ElasticJobSpringBootTest.java | 2 +-
.../boot/tracing/TracingConfigurationTest.java | 2 +-
.../parser/TracingBeanDefinitionParser.java | 2 +-
50 files changed, 232 insertions(+), 281 deletions(-)
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfiguration.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfiguration.java
similarity index 86%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfiguration.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfiguration.java
index ec335f101..7d80065e9 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfiguration.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.datasource;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.config;
import com.google.common.base.CaseFormat;
import com.google.common.base.Joiner;
@@ -24,7 +24,9 @@ import com.google.common.collect.Sets;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.datasource.DataSourceRegistry;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.datasource.JDBCParameterDecorator;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import javax.sql.DataSource;
@@ -38,11 +40,11 @@ import java.util.Map.Entry;
import java.util.Optional;
/**
- * Data source configuration.
+ * RDB tracing storage configuration.
*/
@RequiredArgsConstructor
@Getter
-public final class DataSourceConfiguration implements
TracingStorageConfiguration<DataSource> {
+public final class RDBTracingStorageConfiguration implements
TracingStorageConfiguration<DataSource> {
private static final String GETTER_PREFIX = "get";
@@ -67,8 +69,8 @@ public final class DataSourceConfiguration implements
TracingStorageConfiguratio
* @param dataSource data source
* @return data source configuration
*/
- public static DataSourceConfiguration getDataSourceConfiguration(final
DataSource dataSource) {
- DataSourceConfiguration result = new
DataSourceConfiguration(dataSource.getClass().getName());
+ public static RDBTracingStorageConfiguration
getDataSourceConfiguration(final DataSource dataSource) {
+ RDBTracingStorageConfiguration result = new
RDBTracingStorageConfiguration(dataSource.getClass().getName());
result.props.putAll(findAllGetterProperties(dataSource));
return result;
}
@@ -97,11 +99,6 @@ public final class DataSourceConfiguration implements
TracingStorageConfiguratio
return result;
}
- @Override
- public DataSource getStorage() {
- return DataSourceRegistry.getInstance().getDataSource(this);
- }
-
/**
* Create data source.
*
@@ -135,12 +132,17 @@ public final class DataSourceConfiguration implements
TracingStorageConfiguratio
return Optional.empty();
}
+ @Override
+ public DataSource getStorage() {
+ return DataSourceRegistry.getInstance().getDataSource(this);
+ }
+
@Override
public boolean equals(final Object obj) {
- return this == obj || null != obj && getClass() == obj.getClass() &&
equalsByProperties((DataSourceConfiguration) obj);
+ return this == obj || null != obj && getClass() == obj.getClass() &&
equalsByProperties((RDBTracingStorageConfiguration) obj);
}
- private boolean equalsByProperties(final DataSourceConfiguration
dataSourceConfig) {
+ private boolean equalsByProperties(final RDBTracingStorageConfiguration
dataSourceConfig) {
return
dataSourceClassName.equals(dataSourceConfig.dataSourceClassName) &&
props.equals(dataSourceConfig.props);
}
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java
index 2e1e3a31b..448905610 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.elasticjob.tracing.rdb.listener;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListener;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.RDBJobEventStorage;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.repository.RDBJobEventRepository;
import javax.sql.DataSource;
import java.sql.SQLException;
@@ -30,10 +30,10 @@ import java.sql.SQLException;
*/
public final class RDBTracingListener implements TracingListener {
- private final RDBJobEventStorage repository;
+ private final RDBJobEventRepository repository;
public RDBTracingListener(final DataSource dataSource) throws SQLException
{
- repository = RDBJobEventStorage.getInstance(dataSource);
+ repository = RDBJobEventRepository.getInstance(dataSource);
}
@Override
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverter.java
similarity index 70%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverter.java
index b3a1c6fda..6cb81c55c 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverter.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverter.java
@@ -15,32 +15,34 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.datasource;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.converter;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.exception.TracingStorageUnavailableException;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.config.RDBTracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.datasource.DataSourceRegistry;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
/**
- * {@link TracingStorageConverter} for {@link DataSource}.
+ * RDB tracing storage converter.
*/
@Slf4j
-public final class DataSourceTracingStorageConverter implements
TracingStorageConverter<DataSource> {
+public final class RDBTracingStorageConverter implements
TracingStorageConverter<DataSource> {
@Override
- public TracingStorageConfiguration<DataSource>
convertObjectToConfiguration(final DataSource dataSource) {
+ public TracingStorageConfiguration<DataSource>
convertToConfiguration(final DataSource dataSource) {
try (Connection connection = dataSource.getConnection()) {
log.trace("Try to get connection from {}",
connection.getMetaData().getURL());
} catch (final SQLException ex) {
log.error(ex.getLocalizedMessage(), ex);
throw new TracingStorageUnavailableException(ex);
}
- DataSourceConfiguration result =
DataSourceConfiguration.getDataSourceConfiguration(dataSource);
+ RDBTracingStorageConfiguration result =
RDBTracingStorageConfiguration.getDataSourceConfiguration(dataSource);
DataSourceRegistry.getInstance().registerDataSource(result,
dataSource);
return result;
}
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/datasource/DataSourceRegistry.java
similarity index 66%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/datasource/DataSourceRegistry.java
index 518954e38..a80e9fb88 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistry.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/datasource/DataSourceRegistry.java
@@ -15,24 +15,25 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.datasource;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.datasource;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.config.RDBTracingStorageConfiguration;
import javax.sql.DataSource;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/**
- * Mapping tracing storage configuration} to data source.
+ * Mapping tracing storage configuration to data source.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DataSourceRegistry {
private static volatile DataSourceRegistry instance;
- private final ConcurrentMap<DataSourceConfiguration, DataSource>
dataSources = new ConcurrentHashMap<>();
+ private final ConcurrentMap<RDBTracingStorageConfiguration, DataSource>
dataSources = new ConcurrentHashMap<>();
/**
* Get instance of {@link DataSourceRegistry}.
@@ -50,17 +51,23 @@ public final class DataSourceRegistry {
return instance;
}
- void registerDataSource(final DataSourceConfiguration dataSourceConfig,
final DataSource dataSource) {
+ /**
+ * Register data source.
+ *
+ * @param dataSourceConfig data source configuration
+ * @param dataSource data source
+ */
+ public void registerDataSource(final RDBTracingStorageConfiguration
dataSourceConfig, final DataSource dataSource) {
dataSources.putIfAbsent(dataSourceConfig, dataSource);
}
/**
- * Get {@link DataSource} by {@link DataSourceConfiguration}.
+ * Get {@link DataSource} by {@link RDBTracingStorageConfiguration}.
*
* @param dataSourceConfig data source configuration
* @return instance of {@link DataSource}
*/
- public DataSource getDataSource(final DataSourceConfiguration
dataSourceConfig) {
- return dataSources.computeIfAbsent(dataSourceConfig,
DataSourceConfiguration::createDataSource);
+ public DataSource getDataSource(final RDBTracingStorageConfiguration
dataSourceConfig) {
+ return dataSources.computeIfAbsent(dataSourceConfig,
RDBTracingStorageConfiguration::createDataSource);
}
}
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/JDBCParameterDecorator.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/datasource/JDBCParameterDecorator.java
similarity index 94%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/JDBCParameterDecorator.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/datasource/JDBCParameterDecorator.java
index e924b01ef..a56efce29 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/JDBCParameterDecorator.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/datasource/JDBCParameterDecorator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.datasource;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.datasource;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorage.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepository.java
similarity index 63%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorage.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepository.java
index f59ea96e6..01124317d 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorage.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepository.java
@@ -15,17 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.storage;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.repository;
import com.google.common.base.Strings;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.elasticjob.kernel.executor.ExecutionType;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent.State;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.exception.WrapException;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.DefaultTracingStorageDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.sql.RDBStorageSQLMapper;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.sql.SQLPropertiesFactory;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl.DefaultTracingStorageDatabaseType;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import javax.sql.DataSource;
@@ -35,20 +36,16 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;
/**
- * RDB job event storage.
+ * RDB job event repository.
*/
@Slf4j
-public final class RDBJobEventStorage {
+public final class RDBJobEventRepository {
private static final String TABLE_JOB_EXECUTION_LOG = "JOB_EXECUTION_LOG";
@@ -56,7 +53,7 @@ public final class RDBJobEventStorage {
private static final String TASK_ID_STATE_INDEX = "TASK_ID_STATE_INDEX";
- private static final Map<DataSource, RDBJobEventStorage> STORAGE_MAP = new
ConcurrentHashMap<>();
+ private static final Map<DataSource, RDBJobEventRepository> STORAGE_MAP =
new ConcurrentHashMap<>();
private final DataSource dataSource;
@@ -64,7 +61,7 @@ public final class RDBJobEventStorage {
private final RDBStorageSQLMapper sqlMapper;
- private RDBJobEventStorage(final DataSource dataSource) throws
SQLException {
+ private RDBJobEventRepository(final DataSource dataSource) throws
SQLException {
this.dataSource = dataSource;
tracingStorageDatabaseType = getTracingStorageDatabaseType(dataSource);
sqlMapper = new
RDBStorageSQLMapper(SQLPropertiesFactory.getProperties(tracingStorageDatabaseType));
@@ -78,24 +75,17 @@ public final class RDBJobEventStorage {
* @return RDBJobEventStorage instance
* @throws SQLException SQLException
*/
- public static RDBJobEventStorage getInstance(final DataSource dataSource)
throws SQLException {
+ public static RDBJobEventRepository getInstance(final DataSource
dataSource) throws SQLException {
return wrapException(() -> STORAGE_MAP.computeIfAbsent(dataSource, ds
-> {
try {
- return new RDBJobEventStorage(ds);
+ return new RDBJobEventRepository(ds);
} catch (final SQLException ex) {
throw new WrapException(ex);
}
}));
}
- /**
- * WrapException util method.
- *
- * @param supplier supplier
- * @return RDBJobEventStorage
- * @throws SQLException SQLException
- */
- public static RDBJobEventStorage wrapException(final
Supplier<RDBJobEventStorage> supplier) throws SQLException {
+ private static RDBJobEventRepository wrapException(final
Supplier<RDBJobEventRepository> supplier) throws SQLException {
try {
return supplier.get();
} catch (final WrapException ex) {
@@ -187,35 +177,35 @@ public final class RDBJobEventStorage {
/**
* Add job execution event.
*
- * @param jobExecutionEvent job execution event
+ * @param event job execution event
* @return add success or not
*/
- public boolean addJobExecutionEvent(final JobExecutionEvent
jobExecutionEvent) {
- if (null == jobExecutionEvent.getCompleteTime()) {
- return insertJobExecutionEvent(jobExecutionEvent);
+ public boolean addJobExecutionEvent(final JobExecutionEvent event) {
+ if (null == event.getCompleteTime()) {
+ return insertJobExecutionEvent(event);
} else {
- if (jobExecutionEvent.isSuccess()) {
- return updateJobExecutionEventWhenSuccess(jobExecutionEvent);
+ if (event.isSuccess()) {
+ return updateJobExecutionEventWhenSuccess(event);
} else {
- return updateJobExecutionEventFailure(jobExecutionEvent);
+ return updateJobExecutionEventFailure(event);
}
}
}
- private boolean insertJobExecutionEvent(final JobExecutionEvent
jobExecutionEvent) {
+ private boolean insertJobExecutionEvent(final JobExecutionEvent event) {
boolean result = false;
try (
Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(sqlMapper.getInsertForJobExecutionLog())) {
- preparedStatement.setString(1, jobExecutionEvent.getId());
- preparedStatement.setString(2, jobExecutionEvent.getJobName());
- preparedStatement.setString(3, jobExecutionEvent.getTaskId());
- preparedStatement.setString(4, jobExecutionEvent.getHostname());
- preparedStatement.setString(5, jobExecutionEvent.getIp());
- preparedStatement.setInt(6, jobExecutionEvent.getShardingItem());
- preparedStatement.setString(7,
jobExecutionEvent.getSource().toString());
- preparedStatement.setBoolean(8, jobExecutionEvent.isSuccess());
- preparedStatement.setTimestamp(9, new
Timestamp(jobExecutionEvent.getStartTime().getTime()));
+ preparedStatement.setString(1, event.getId());
+ preparedStatement.setString(2, event.getJobName());
+ preparedStatement.setString(3, event.getTaskId());
+ preparedStatement.setString(4, event.getHostname());
+ preparedStatement.setString(5, event.getIp());
+ preparedStatement.setInt(6, event.getShardingItem());
+ preparedStatement.setString(7, event.getSource().toString());
+ preparedStatement.setBoolean(8, event.isSuccess());
+ preparedStatement.setTimestamp(9, new
Timestamp(event.getStartTime().getTime()));
preparedStatement.execute();
result = true;
} catch (final SQLException ex) {
@@ -227,16 +217,16 @@ public final class RDBJobEventStorage {
return result;
}
- private boolean updateJobExecutionEventWhenSuccess(final JobExecutionEvent
jobExecutionEvent) {
+ private boolean updateJobExecutionEventWhenSuccess(final JobExecutionEvent
event) {
boolean result = false;
try (
Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(sqlMapper.getUpdateForJobExecutionLog())) {
- preparedStatement.setBoolean(1, jobExecutionEvent.isSuccess());
- preparedStatement.setTimestamp(2, new
Timestamp(jobExecutionEvent.getCompleteTime().getTime()));
- preparedStatement.setString(3, jobExecutionEvent.getId());
+ preparedStatement.setBoolean(1, event.isSuccess());
+ preparedStatement.setTimestamp(2, new
Timestamp(event.getCompleteTime().getTime()));
+ preparedStatement.setString(3, event.getId());
if (0 == preparedStatement.executeUpdate()) {
- return insertJobExecutionEventWhenSuccess(jobExecutionEvent);
+ return insertJobExecutionEventWhenSuccess(event);
}
result = true;
} catch (final SQLException ex) {
@@ -246,26 +236,26 @@ public final class RDBJobEventStorage {
return result;
}
- private boolean insertJobExecutionEventWhenSuccess(final JobExecutionEvent
jobExecutionEvent) {
+ private boolean insertJobExecutionEventWhenSuccess(final JobExecutionEvent
event) {
boolean result = false;
try (
Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(sqlMapper.getInsertForJobExecutionLogForComplete()))
{
- preparedStatement.setString(1, jobExecutionEvent.getId());
- preparedStatement.setString(2, jobExecutionEvent.getJobName());
- preparedStatement.setString(3, jobExecutionEvent.getTaskId());
- preparedStatement.setString(4, jobExecutionEvent.getHostname());
- preparedStatement.setString(5, jobExecutionEvent.getIp());
- preparedStatement.setInt(6, jobExecutionEvent.getShardingItem());
- preparedStatement.setString(7,
jobExecutionEvent.getSource().toString());
- preparedStatement.setBoolean(8, jobExecutionEvent.isSuccess());
- preparedStatement.setTimestamp(9, new
Timestamp(jobExecutionEvent.getStartTime().getTime()));
- preparedStatement.setTimestamp(10, new
Timestamp(jobExecutionEvent.getCompleteTime().getTime()));
+ preparedStatement.setString(1, event.getId());
+ preparedStatement.setString(2, event.getJobName());
+ preparedStatement.setString(3, event.getTaskId());
+ preparedStatement.setString(4, event.getHostname());
+ preparedStatement.setString(5, event.getIp());
+ preparedStatement.setInt(6, event.getShardingItem());
+ preparedStatement.setString(7, event.getSource().toString());
+ preparedStatement.setBoolean(8, event.isSuccess());
+ preparedStatement.setTimestamp(9, new
Timestamp(event.getStartTime().getTime()));
+ preparedStatement.setTimestamp(10, new
Timestamp(event.getCompleteTime().getTime()));
preparedStatement.execute();
result = true;
} catch (final SQLException ex) {
if (isDuplicateRecord(ex)) {
- return updateJobExecutionEventWhenSuccess(jobExecutionEvent);
+ return updateJobExecutionEventWhenSuccess(event);
}
// TODO log failure directly to output log, consider to be
configurable in the future
log.error(ex.getMessage());
@@ -273,17 +263,17 @@ public final class RDBJobEventStorage {
return result;
}
- private boolean updateJobExecutionEventFailure(final JobExecutionEvent
jobExecutionEvent) {
+ private boolean updateJobExecutionEventFailure(final JobExecutionEvent
event) {
boolean result = false;
try (
Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(sqlMapper.getUpdateForJobExecutionLogForFailure()))
{
- preparedStatement.setBoolean(1, jobExecutionEvent.isSuccess());
- preparedStatement.setTimestamp(2, new
Timestamp(jobExecutionEvent.getCompleteTime().getTime()));
- preparedStatement.setString(3,
truncateString(jobExecutionEvent.getFailureCause()));
- preparedStatement.setString(4, jobExecutionEvent.getId());
+ preparedStatement.setBoolean(1, event.isSuccess());
+ preparedStatement.setTimestamp(2, new
Timestamp(event.getCompleteTime().getTime()));
+ preparedStatement.setString(3,
truncateString(event.getFailureCause()));
+ preparedStatement.setString(4, event.getId());
if (0 == preparedStatement.executeUpdate()) {
- return insertJobExecutionEventWhenFailure(jobExecutionEvent);
+ return insertJobExecutionEventWhenFailure(event);
}
result = true;
} catch (final SQLException ex) {
@@ -293,26 +283,26 @@ public final class RDBJobEventStorage {
return result;
}
- private boolean insertJobExecutionEventWhenFailure(final JobExecutionEvent
jobExecutionEvent) {
+ private boolean insertJobExecutionEventWhenFailure(final JobExecutionEvent
event) {
boolean result = false;
try (
Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(sqlMapper.getInsertForJobExecutionLogForFailure()))
{
- preparedStatement.setString(1, jobExecutionEvent.getId());
- preparedStatement.setString(2, jobExecutionEvent.getJobName());
- preparedStatement.setString(3, jobExecutionEvent.getTaskId());
- preparedStatement.setString(4, jobExecutionEvent.getHostname());
- preparedStatement.setString(5, jobExecutionEvent.getIp());
- preparedStatement.setInt(6, jobExecutionEvent.getShardingItem());
- preparedStatement.setString(7,
jobExecutionEvent.getSource().toString());
- preparedStatement.setString(8,
truncateString(jobExecutionEvent.getFailureCause()));
- preparedStatement.setBoolean(9, jobExecutionEvent.isSuccess());
- preparedStatement.setTimestamp(10, new
Timestamp(jobExecutionEvent.getStartTime().getTime()));
+ preparedStatement.setString(1, event.getId());
+ preparedStatement.setString(2, event.getJobName());
+ preparedStatement.setString(3, event.getTaskId());
+ preparedStatement.setString(4, event.getHostname());
+ preparedStatement.setString(5, event.getIp());
+ preparedStatement.setInt(6, event.getShardingItem());
+ preparedStatement.setString(7, event.getSource().toString());
+ preparedStatement.setString(8,
truncateString(event.getFailureCause()));
+ preparedStatement.setBoolean(9, event.isSuccess());
+ preparedStatement.setTimestamp(10, new
Timestamp(event.getStartTime().getTime()));
preparedStatement.execute();
result = true;
} catch (final SQLException ex) {
if (isDuplicateRecord(ex)) {
- return updateJobExecutionEventFailure(jobExecutionEvent);
+ return updateJobExecutionEventFailure(event);
}
// TODO log failure directly to output log, consider to be
configurable in the future
log.error(ex.getMessage());
@@ -327,28 +317,28 @@ public final class RDBJobEventStorage {
/**
* Add job status trace event.
*
- * @param jobStatusTraceEvent job status trace event
+ * @param event job status trace event
* @return add success or not
*/
- public boolean addJobStatusTraceEvent(final JobStatusTraceEvent
jobStatusTraceEvent) {
- String originalTaskId = jobStatusTraceEvent.getOriginalTaskId();
- if (State.TASK_STAGING != jobStatusTraceEvent.getState()) {
- originalTaskId =
getOriginalTaskId(jobStatusTraceEvent.getTaskId());
+ public boolean addJobStatusTraceEvent(final JobStatusTraceEvent event) {
+ String originalTaskId = event.getOriginalTaskId();
+ if (State.TASK_STAGING != event.getState()) {
+ originalTaskId = getOriginalTaskId(event.getTaskId());
}
boolean result = false;
try (
Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(sqlMapper.getInsertForJobStatusTraceLog())) {
preparedStatement.setString(1, UUID.randomUUID().toString());
- preparedStatement.setString(2, jobStatusTraceEvent.getJobName());
+ preparedStatement.setString(2, event.getJobName());
preparedStatement.setString(3, originalTaskId);
- preparedStatement.setString(4, jobStatusTraceEvent.getTaskId());
- preparedStatement.setString(5, jobStatusTraceEvent.getSlaveId());
- preparedStatement.setString(6,
jobStatusTraceEvent.getExecutionType().name());
- preparedStatement.setString(7,
jobStatusTraceEvent.getShardingItems());
- preparedStatement.setString(8,
jobStatusTraceEvent.getState().toString());
- preparedStatement.setString(9,
truncateString(jobStatusTraceEvent.getMessage()));
- preparedStatement.setTimestamp(10, new
Timestamp(jobStatusTraceEvent.getCreationTime().getTime()));
+ preparedStatement.setString(4, event.getTaskId());
+ preparedStatement.setString(5, event.getSlaveId());
+ preparedStatement.setString(6, event.getExecutionType().name());
+ preparedStatement.setString(7, event.getShardingItems());
+ preparedStatement.setString(8, event.getState().toString());
+ preparedStatement.setString(9, truncateString(event.getMessage()));
+ preparedStatement.setTimestamp(10, new
Timestamp(event.getCreationTime().getTime()));
preparedStatement.execute();
result = true;
} catch (final SQLException ex) {
@@ -379,25 +369,4 @@ public final class RDBJobEventStorage {
private String truncateString(final String str) {
return !Strings.isNullOrEmpty(str) && str.length() > 4000 ?
str.substring(0, 4000) : str;
}
-
- List<JobStatusTraceEvent> getJobStatusTraceEvents(final String taskId) {
- List<JobStatusTraceEvent> result = new ArrayList<>();
- try (
- Connection connection = dataSource.getConnection();
- PreparedStatement preparedStatement =
connection.prepareStatement(sqlMapper.getSelectForJobStatusTraceLog())) {
- preparedStatement.setString(1, taskId);
- try (ResultSet resultSet = preparedStatement.executeQuery()) {
- while (resultSet.next()) {
- JobStatusTraceEvent jobStatusTraceEvent = new
JobStatusTraceEvent(resultSet.getString(1), resultSet.getString(2),
resultSet.getString(3), resultSet.getString(4),
- resultSet.getString(5),
ExecutionType.valueOf(resultSet.getString(6)), resultSet.getString(7),
- State.valueOf(resultSet.getString(8)),
resultSet.getString(9), new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss").parse(resultSet.getString(10)));
- result.add(jobStatusTraceEvent);
- }
- }
- } catch (final SQLException | ParseException ex) {
- // TODO log failure directly to output log, consider to be
configurable in the future
- log.error(ex.getMessage());
- }
- return result;
- }
}
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBStorageSQLMapper.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/sql/RDBStorageSQLMapper.java
similarity index 99%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBStorageSQLMapper.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/sql/RDBStorageSQLMapper.java
index 278b26d59..c223bed43 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBStorageSQLMapper.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/sql/RDBStorageSQLMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.storage;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.sql;
import lombok.Getter;
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/SQLPropertiesFactory.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/sql/SQLPropertiesFactory.java
similarity index 95%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/SQLPropertiesFactory.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/sql/SQLPropertiesFactory.java
index 8732e7459..33607ec7d 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/SQLPropertiesFactory.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/sql/SQLPropertiesFactory.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.storage;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.sql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType;
import java.io.IOException;
import java.io.InputStream;
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/TracingStorageDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/TracingStorageDatabaseType.java
similarity index 95%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/TracingStorageDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/TracingStorageDatabaseType.java
index 2130cd02c..af1dde60f 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/TracingStorageDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/TracingStorageDatabaseType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.type;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DB2TracingStorageDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/DB2TracingStorageDatabaseType.java
similarity index 86%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DB2TracingStorageDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/DB2TracingStorageDatabaseType.java
index 40dad660a..93aa2f939 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DB2TracingStorageDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/DB2TracingStorageDatabaseType.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType;
/**
* Tracing storage database type for DB2.
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DefaultTracingStorageDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/DefaultTracingStorageDatabaseType.java
similarity index 86%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DefaultTracingStorageDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/DefaultTracingStorageDatabaseType.java
index 01a2ecd40..2c8ef3e54 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DefaultTracingStorageDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/DefaultTracingStorageDatabaseType.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType;
/**
* Default tracing storage database type.
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/H2TracingStorageDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/H2TracingStorageDatabaseType.java
similarity index 86%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/H2TracingStorageDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/H2TracingStorageDatabaseType.java
index 7402b0a47..3f6f129d9 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/H2TracingStorageDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/H2TracingStorageDatabaseType.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType;
/**
* Tracing storage database type for H2.
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/MySQLTracingStorageDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/MySQLTracingStorageDatabaseType.java
similarity index 86%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/MySQLTracingStorageDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/MySQLTracingStorageDatabaseType.java
index 7d691a6a2..bbd234a2e 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/MySQLTracingStorageDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/MySQLTracingStorageDatabaseType.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType;
/**
* Tracing storage database type for MySQL.
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/OracleTracingStorageDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/OracleTracingStorageDatabaseType.java
similarity index 86%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/OracleTracingStorageDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/OracleTracingStorageDatabaseType.java
index 804902a2d..8729f3b30 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/OracleTracingStorageDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/OracleTracingStorageDatabaseType.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType;
/**
* Tracing storage database type for Oracle.
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/PostgreSQLTracingStorageDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/PostgreSQLTracingStorageDatabaseType.java
similarity index 86%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/PostgreSQLTracingStorageDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/PostgreSQLTracingStorageDatabaseType.java
index c0ade9b55..85a7e4872 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/PostgreSQLTracingStorageDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/PostgreSQLTracingStorageDatabaseType.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType;
/**
* Tracing storage database type for PostgreSQL.
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/SQLServerTracingStorageDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/SQLServerTracingStorageDatabaseType.java
similarity index 87%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/SQLServerTracingStorageDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/SQLServerTracingStorageDatabaseType.java
index a93b9e371..11e7500fb 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/SQLServerTracingStorageDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/type/impl/SQLServerTracingStorageDatabaseType.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType;
/**
* Tracing storage database type for SQLServer.
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java
index 0f7c36c50..1c8a89471 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.yaml;
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.yaml.YamlTracingStorageConfiguration;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.datasource.DataSourceConfiguration;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.config.RDBTracingStorageConfiguration;
import javax.sql.DataSource;
import java.util.LinkedHashMap;
@@ -42,7 +42,7 @@ public final class YamlDataSourceConfiguration implements
YamlTracingStorageConf
@Override
public TracingStorageConfiguration<DataSource> toConfiguration() {
- DataSourceConfiguration result = new
DataSourceConfiguration(dataSourceClassName);
+ RDBTracingStorageConfiguration result = new
RDBTracingStorageConfiguration(dataSourceClassName);
result.getProps().putAll(props);
return result;
}
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java
index c49481f59..d995f363d 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.yaml;
import
org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.yaml.YamlTracingStorageConfiguration;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.datasource.DataSourceConfiguration;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.config.RDBTracingStorageConfiguration;
import javax.sql.DataSource;
@@ -32,7 +32,7 @@ public final class YamlDataSourceConfigurationConverter
implements YamlConfigura
@Override
public YamlTracingStorageConfiguration<DataSource>
convertToYamlConfiguration(final TracingStorageConfiguration<DataSource> data) {
- DataSourceConfiguration dataSourceConfig = (DataSourceConfiguration)
data;
+ RDBTracingStorageConfiguration dataSourceConfig =
(RDBTracingStorageConfiguration) data;
YamlDataSourceConfiguration result = new YamlDataSourceConfiguration();
result.setDataSourceClassName(dataSourceConfig.getDataSourceClassName());
result.setProps(dataSourceConfig.getProps());
@@ -41,6 +41,6 @@ public final class YamlDataSourceConfigurationConverter
implements YamlConfigura
@Override
public Class getType() {
- return DataSourceConfiguration.class;
+ return RDBTracingStorageConfiguration.class;
}
}
diff --git
a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter
b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter
index 97410b55d..a4db54032 100644
---
a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter
+++
b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.elasticjob.tracing.rdb.datasource.DataSourceTracingStorageConverter
+org.apache.shardingsphere.elasticjob.tracing.rdb.storage.converter.RDBTracingStorageConverter
diff --git
a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType
b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType
similarity index 56%
rename from
ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType
rename to
ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType
index aa7a3c3f8..a2b209dc3 100644
---
a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType
+++
b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.TracingStorageDatabaseType
@@ -15,9 +15,9 @@
# limitations under the License.
#
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.MySQLTracingStorageDatabaseType
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.PostgreSQLTracingStorageDatabaseType
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.OracleTracingStorageDatabaseType
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.SQLServerTracingStorageDatabaseType
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.DB2TracingStorageDatabaseType
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.H2TracingStorageDatabaseType
+org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl.MySQLTracingStorageDatabaseType
+org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl.PostgreSQLTracingStorageDatabaseType
+org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl.OracleTracingStorageDatabaseType
+org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl.SQLServerTracingStorageDatabaseType
+org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl.DB2TracingStorageDatabaseType
+org.apache.shardingsphere.elasticjob.tracing.rdb.storage.type.impl.H2TracingStorageDatabaseType
diff --git
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfigurationTest.java
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfigurationTest.java
similarity index 77%
rename from
ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfigurationTest.java
rename to
ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfigurationTest.java
index b8ddd1e14..2ba5f8381 100644
---
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceConfigurationTest.java
+++
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfigurationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.datasource;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.config;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.commons.dbcp2.BasicDataSource;
@@ -35,7 +35,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
-class DataSourceConfigurationTest {
+class RDBTracingStorageConfigurationTest {
@Test
void assertGetDataSourceConfiguration() throws SQLException {
@@ -45,7 +45,7 @@ class DataSourceConfigurationTest {
actualDataSource.setUsername("root");
actualDataSource.setPassword("root");
actualDataSource.setLoginTimeout(1);
- DataSourceConfiguration actual =
DataSourceConfiguration.getDataSourceConfiguration(actualDataSource);
+ RDBTracingStorageConfiguration actual =
RDBTracingStorageConfiguration.getDataSourceConfiguration(actualDataSource);
assertThat(actual.getDataSourceClassName(),
is(HikariDataSource.class.getName()));
assertThat(actual.getProps().get("driverClassName").toString(),
is("org.h2.Driver"));
assertThat(actual.getProps().get("jdbcUrl").toString(),
is("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
@@ -63,7 +63,7 @@ class DataSourceConfigurationTest {
props.put("password", "root");
props.put("loginTimeout", "5000");
props.put("test", "test");
- DataSourceConfiguration dataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
+ RDBTracingStorageConfiguration dataSourceConfig = new
RDBTracingStorageConfiguration(HikariDataSource.class.getName());
dataSourceConfig.getProps().putAll(props);
HikariDataSource actual = (HikariDataSource)
dataSourceConfig.createDataSource();
assertThat(actual.getDriverClassName(), is("org.h2.Driver"));
@@ -74,8 +74,8 @@ class DataSourceConfigurationTest {
@Test
void assertEquals() {
- DataSourceConfiguration originalDataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
- DataSourceConfiguration targetDataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
+ RDBTracingStorageConfiguration originalDataSourceConfig = new
RDBTracingStorageConfiguration(HikariDataSource.class.getName());
+ RDBTracingStorageConfiguration targetDataSourceConfig = new
RDBTracingStorageConfiguration(HikariDataSource.class.getName());
assertThat(originalDataSourceConfig, is(originalDataSourceConfig));
assertThat(originalDataSourceConfig, is(targetDataSourceConfig));
originalDataSourceConfig.getProps().put("username", "root");
@@ -85,8 +85,8 @@ class DataSourceConfigurationTest {
@Test
void assertNotEquals() {
- DataSourceConfiguration originalDataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
- DataSourceConfiguration targetDataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
+ RDBTracingStorageConfiguration originalDataSourceConfig = new
RDBTracingStorageConfiguration(HikariDataSource.class.getName());
+ RDBTracingStorageConfiguration targetDataSourceConfig = new
RDBTracingStorageConfiguration(HikariDataSource.class.getName());
originalDataSourceConfig.getProps().put("username", "root");
targetDataSourceConfig.getProps().put("username", "root0");
assertThat(originalDataSourceConfig, not(targetDataSourceConfig));
@@ -94,13 +94,13 @@ class DataSourceConfigurationTest {
@Test
void assertEqualsWithNull() {
- assertFalse(new
DataSourceConfiguration(HikariDataSource.class.getName()).equals(null));
+ assertFalse(new
RDBTracingStorageConfiguration(HikariDataSource.class.getName()).equals(null));
}
@Test
void assertSameHashCode() {
- DataSourceConfiguration originalDataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
- DataSourceConfiguration targetDataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
+ RDBTracingStorageConfiguration originalDataSourceConfig = new
RDBTracingStorageConfiguration(HikariDataSource.class.getName());
+ RDBTracingStorageConfiguration targetDataSourceConfig = new
RDBTracingStorageConfiguration(HikariDataSource.class.getName());
assertThat(originalDataSourceConfig.hashCode(),
is(targetDataSourceConfig.hashCode()));
originalDataSourceConfig.getProps().put("username", "root");
targetDataSourceConfig.getProps().put("username", "root");
@@ -112,14 +112,14 @@ class DataSourceConfigurationTest {
@Test
void assertDifferentHashCode() {
- DataSourceConfiguration originalDataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
- DataSourceConfiguration targetDataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
+ RDBTracingStorageConfiguration originalDataSourceConfig = new
RDBTracingStorageConfiguration(HikariDataSource.class.getName());
+ RDBTracingStorageConfiguration targetDataSourceConfig = new
RDBTracingStorageConfiguration(HikariDataSource.class.getName());
originalDataSourceConfig.getProps().put("username", "root");
targetDataSourceConfig.getProps().put("username", "root");
targetDataSourceConfig.getProps().put("password", "root");
assertThat(originalDataSourceConfig.hashCode(),
not(targetDataSourceConfig.hashCode()));
- originalDataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
- targetDataSourceConfig = new
DataSourceConfiguration(BasicDataSource.class.getName());
+ originalDataSourceConfig = new
RDBTracingStorageConfiguration(HikariDataSource.class.getName());
+ targetDataSourceConfig = new
RDBTracingStorageConfiguration(BasicDataSource.class.getName());
assertThat(originalDataSourceConfig.hashCode(),
not(targetDataSourceConfig.hashCode()));
}
@@ -132,7 +132,7 @@ class DataSourceConfigurationTest {
actualDataSource.setUsername("root");
actualDataSource.setPassword("root");
actualDataSource.setConnectionInitSqls(Arrays.asList("set names
utf8mb4;", "set names utf8;"));
- DataSourceConfiguration actual =
DataSourceConfiguration.getDataSourceConfiguration(actualDataSource);
+ RDBTracingStorageConfiguration actual =
RDBTracingStorageConfiguration.getDataSourceConfiguration(actualDataSource);
assertThat(actual.getDataSourceClassName(),
is(BasicDataSource.class.getName()));
assertThat(actual.getProps().get("driverClassName").toString(),
is("org.h2.Driver"));
assertThat(actual.getProps().get("url").toString(),
is("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
diff --git
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java
index e75a1c5f5..d66b25566 100644
---
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java
+++
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java
@@ -19,13 +19,13 @@ package
org.apache.shardingsphere.elasticjob.tracing.rdb.listener;
import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.shardingsphere.elasticjob.kernel.executor.ExecutionType;
-import org.apache.shardingsphere.elasticjob.kernel.tracing.JobTracingEventBus;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobTracingEventBus;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent.State;
import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.RDBJobEventStorage;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.storage.repository.RDBJobEventRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -44,7 +44,7 @@ class RDBTracingListenerTest {
private static final String JOB_NAME = "test_rdb_event_listener";
@Mock
- private RDBJobEventStorage repository;
+ private RDBJobEventRepository repository;
private JobTracingEventBus jobTracingEventBus;
diff --git
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverterTest.java
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverterTest.java
similarity index 85%
rename from
ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverterTest.java
rename to
ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverterTest.java
index 3495e8a51..5311dcd5b 100644
---
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceTracingStorageConverterTest.java
+++
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.datasource;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.converter;
import com.zaxxer.hikari.HikariDataSource;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.exception.TracingStorageUnavailableException;
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class DataSourceTracingStorageConverterTest {
+class RDBTracingStorageConverterTest {
@Mock
private DataSource dataSource;
@@ -55,16 +55,16 @@ class DataSourceTracingStorageConverterTest {
when(dataSource.getConnection()).thenReturn(connection);
when(connection.getMetaData()).thenReturn(databaseMetaData);
when(databaseMetaData.getURL()).thenReturn("jdbc:url");
- DataSourceTracingStorageConverter converter = new
DataSourceTracingStorageConverter();
- assertNotNull(converter.convertObjectToConfiguration(dataSource));
+ RDBTracingStorageConverter converter = new
RDBTracingStorageConverter();
+ assertNotNull(converter.convertToConfiguration(dataSource));
}
@Test
void assertConvertFailed() {
assertThrows(TracingStorageUnavailableException.class, () -> {
- DataSourceTracingStorageConverter converter = new
DataSourceTracingStorageConverter();
+ RDBTracingStorageConverter converter = new
RDBTracingStorageConverter();
doThrow(SQLException.class).when(dataSource).getConnection();
- converter.convertObjectToConfiguration(dataSource);
+ converter.convertToConfiguration(dataSource);
});
}
diff --git
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistryTest.java
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/datasource/DataSourceRegistryTest.java
similarity index 87%
rename from
ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistryTest.java
rename to
ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/datasource/DataSourceRegistryTest.java
index fff1dbac3..1d0206381 100644
---
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/datasource/DataSourceRegistryTest.java
+++
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/datasource/DataSourceRegistryTest.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.datasource;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.datasource;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.config.RDBTracingStorageConfiguration;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
@@ -35,7 +36,7 @@ import static org.mockito.Mockito.when;
class DataSourceRegistryTest {
@Mock
- private DataSourceConfiguration dataSourceConfig;
+ private RDBTracingStorageConfiguration dataSourceConfig;
@Test
void assertGetDataSourceBySameConfiguration() {
@@ -49,7 +50,7 @@ class DataSourceRegistryTest {
@Test
void assertGetDataSourceWithDifferentConfiguration() {
when(dataSourceConfig.createDataSource()).then(invocation ->
mock(DataSource.class));
- DataSourceConfiguration anotherDataSourceConfig =
mock(DataSourceConfiguration.class);
+ RDBTracingStorageConfiguration anotherDataSourceConfig =
mock(RDBTracingStorageConfiguration.class);
when(anotherDataSourceConfig.createDataSource()).then(invocation ->
mock(DataSource.class));
DataSource one =
DataSourceRegistry.getInstance().getDataSource(dataSourceConfig);
DataSource another =
DataSourceRegistry.getInstance().getDataSource(anotherDataSourceConfig);
diff --git
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepositoryTest.java
similarity index 61%
rename from
ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java
rename to
ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepositoryTest.java
index 3e0625511..a2950c3db 100644
---
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java
+++
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepositoryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.tracing.rdb.storage;
+package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.repository;
import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.shardingsphere.elasticjob.kernel.executor.ExecutionType;
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.sql.SQLException;
-import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.startsWith;
@@ -36,9 +35,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class RDBJobEventStorageTest {
+class RDBJobEventRepositoryTest {
- private RDBJobEventStorage storage;
+ private RDBJobEventRepository repository;
private BasicDataSource dataSource;
@@ -49,7 +48,7 @@ class RDBJobEventStorageTest {
dataSource.setUrl("jdbc:h2:mem:job_event_storage");
dataSource.setUsername("sa");
dataSource.setPassword("");
- storage = RDBJobEventStorage.getInstance(dataSource);
+ repository = RDBJobEventRepository.getInstance(dataSource);
}
@AfterEach
@@ -59,55 +58,29 @@ class RDBJobEventStorageTest {
@Test
void assertAddJobExecutionEvent() {
- assertTrue(storage.addJobExecutionEvent(new
JobExecutionEvent("localhost", "127.0.0.1", "fake_task_id", "test_job",
JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0)));
+ assertTrue(repository.addJobExecutionEvent(new
JobExecutionEvent("localhost", "127.0.0.1", "fake_task_id", "test_job",
JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0)));
}
@Test
void assertAddJobStatusTraceEvent() {
- assertTrue(storage.addJobStatusTraceEvent(
+ assertTrue(repository.addJobStatusTraceEvent(
new JobStatusTraceEvent("test_job", "fake_task_id",
"fake_slave_id", ExecutionType.READY, "0", State.TASK_RUNNING, "message is
empty.")));
}
- @Test
- void assertAddJobStatusTraceEventWhenFailoverWithTaskStagingState() {
- JobStatusTraceEvent jobStatusTraceEvent = new JobStatusTraceEvent(
- "test_job", "fake_failover_task_id", "fake_slave_id",
ExecutionType.FAILOVER, "0", State.TASK_STAGING, "message is empty.");
-
jobStatusTraceEvent.setOriginalTaskId("original_fake_failover_task_id");
-
assertThat(storage.getJobStatusTraceEvents("fake_failover_task_id").size(),
is(0));
- storage.addJobStatusTraceEvent(jobStatusTraceEvent);
-
assertThat(storage.getJobStatusTraceEvents("fake_failover_task_id").size(),
is(1));
- }
-
- @Test
- void assertAddJobStatusTraceEventWhenFailoverWithTaskFailedState() {
- JobStatusTraceEvent stagingJobStatusTraceEvent = new
JobStatusTraceEvent(
- "test_job", "fake_failed_failover_task_id", "fake_slave_id",
ExecutionType.FAILOVER, "0", State.TASK_STAGING, "message is empty.");
-
stagingJobStatusTraceEvent.setOriginalTaskId("original_fake_failed_failover_task_id");
- storage.addJobStatusTraceEvent(stagingJobStatusTraceEvent);
- JobStatusTraceEvent failedJobStatusTraceEvent = new
JobStatusTraceEvent(
- "test_job", "fake_failed_failover_task_id", "fake_slave_id",
ExecutionType.FAILOVER, "0", State.TASK_FAILED, "message is empty.");
- storage.addJobStatusTraceEvent(failedJobStatusTraceEvent);
- List<JobStatusTraceEvent> jobStatusTraceEvents =
storage.getJobStatusTraceEvents("fake_failed_failover_task_id");
- assertThat(jobStatusTraceEvents.size(), is(2));
- for (JobStatusTraceEvent jobStatusTraceEvent : jobStatusTraceEvents) {
- assertThat(jobStatusTraceEvent.getOriginalTaskId(),
is("original_fake_failed_failover_task_id"));
- }
- }
-
@Test
void assertUpdateJobExecutionEventWhenSuccess() {
JobExecutionEvent startEvent = new JobExecutionEvent("localhost",
"127.0.0.1", "fake_task_id", "test_job",
JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0);
- assertTrue(storage.addJobExecutionEvent(startEvent));
+ assertTrue(repository.addJobExecutionEvent(startEvent));
JobExecutionEvent successEvent = startEvent.executionSuccess();
- assertTrue(storage.addJobExecutionEvent(successEvent));
+ assertTrue(repository.addJobExecutionEvent(successEvent));
}
@Test
void assertUpdateJobExecutionEventWhenFailure() {
JobExecutionEvent startEvent = new JobExecutionEvent("localhost",
"127.0.0.1", "fake_task_id", "test_job",
JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0);
- assertTrue(storage.addJobExecutionEvent(startEvent));
+ assertTrue(repository.addJobExecutionEvent(startEvent));
JobExecutionEvent failureEvent =
startEvent.executionFailure("java.lang.RuntimeException: failure");
- assertTrue(storage.addJobExecutionEvent(failureEvent));
+ assertTrue(repository.addJobExecutionEvent(failureEvent));
assertThat(failureEvent.getFailureCause(),
is("java.lang.RuntimeException: failure"));
assertNotNull(failureEvent.getCompleteTime());
}
@@ -116,34 +89,34 @@ class RDBJobEventStorageTest {
void assertUpdateJobExecutionEventWhenSuccessAndConflict() {
JobExecutionEvent startEvent = new JobExecutionEvent("localhost",
"127.0.0.1", "fake_task_id", "test_job",
JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0);
JobExecutionEvent successEvent = startEvent.executionSuccess();
- assertTrue(storage.addJobExecutionEvent(successEvent));
- assertFalse(storage.addJobExecutionEvent(startEvent));
+ assertTrue(repository.addJobExecutionEvent(successEvent));
+ assertFalse(repository.addJobExecutionEvent(startEvent));
}
@Test
void assertUpdateJobExecutionEventWhenFailureAndConflict() {
JobExecutionEvent startEvent = new JobExecutionEvent("localhost",
"127.0.0.1", "fake_task_id", "test_job",
JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0);
JobExecutionEvent failureEvent =
startEvent.executionFailure("java.lang.RuntimeException: failure");
- assertTrue(storage.addJobExecutionEvent(failureEvent));
+ assertTrue(repository.addJobExecutionEvent(failureEvent));
assertThat(failureEvent.getFailureCause(),
is("java.lang.RuntimeException: failure"));
- assertFalse(storage.addJobExecutionEvent(startEvent));
+ assertFalse(repository.addJobExecutionEvent(startEvent));
}
@Test
void assertUpdateJobExecutionEventWhenFailureAndMessageExceed() {
JobExecutionEvent startEvent = new JobExecutionEvent("localhost",
"127.0.0.1", "fake_task_id", "test_job",
JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0);
- assertTrue(storage.addJobExecutionEvent(startEvent));
+ assertTrue(repository.addJobExecutionEvent(startEvent));
StringBuilder failureMsg = new StringBuilder();
for (int i = 0; i < 600; i++) {
failureMsg.append(i);
}
JobExecutionEvent failEvent =
startEvent.executionFailure("java.lang.RuntimeException: failure" + failureMsg);
- assertTrue(storage.addJobExecutionEvent(failEvent));
+ assertTrue(repository.addJobExecutionEvent(failEvent));
assertThat(failEvent.getFailureCause(),
startsWith("java.lang.RuntimeException: failure"));
}
@Test
void assertFindJobExecutionEvent() {
- storage.addJobExecutionEvent(new JobExecutionEvent("localhost",
"127.0.0.1", "fake_task_id", "test_job",
JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0));
+ repository.addJobExecutionEvent(new JobExecutionEvent("localhost",
"127.0.0.1", "fake_task_id", "test_job",
JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0));
}
}
diff --git
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverterTest.java
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlRDBTracingStorageConfigurationConverterTest.java
similarity index 87%
rename from
ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverterTest.java
rename to
ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlRDBTracingStorageConfigurationConverterTest.java
index d488e3ca1..aaabb9307 100644
---
a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverterTest.java
+++
b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlRDBTracingStorageConfigurationConverterTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.yaml;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.datasource.DataSourceConfiguration;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.config.RDBTracingStorageConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.yaml.YamlTracingStorageConfiguration;
import org.junit.jupiter.api.Test;
@@ -28,11 +28,11 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class YamlDataSourceConfigurationConverterTest {
+class YamlRDBTracingStorageConfigurationConverterTest {
@Test
void assertConvertDataSourceConfiguration() {
- DataSourceConfiguration dataSourceConfig = new
DataSourceConfiguration("org.h2.Driver");
+ RDBTracingStorageConfiguration dataSourceConfig = new
RDBTracingStorageConfiguration("org.h2.Driver");
dataSourceConfig.getProps().put("foo", "bar");
YamlDataSourceConfigurationConverter converter = new
YamlDataSourceConfigurationConverter();
YamlTracingStorageConfiguration<DataSource> actual =
converter.convertToYamlConfiguration(dataSourceConfig);
diff --git a/ecosystem/tracing/rdb/src/test/resources/logback-test.xml
b/ecosystem/tracing/rdb/src/test/resources/logback-test.xml
index 9ba216d49..17a6dfd84 100644
--- a/ecosystem/tracing/rdb/src/test/resources/logback-test.xml
+++ b/ecosystem/tracing/rdb/src/test/resources/logback-test.xml
@@ -38,5 +38,5 @@
<appender-ref ref="STDOUT" />
</root>
- <logger
name="org.apache.shardingsphere.elasticjob.tracing.rdb.datasource.DataSourceTracingStorageConverter"
level="OFF" />
+ <logger
name="org.apache.shardingsphere.elasticjob.tracing.rdb.storage.converter.RDBTracingStorageConverter"
level="OFF" />
</configuration>
diff --git
a/examples/elasticjob-example-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java
b/examples/elasticjob-example-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java
index a2ff666f7..d5502cf2f 100644
---
a/examples/elasticjob-example-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java
+++
b/examples/elasticjob-example-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java
@@ -33,7 +33,7 @@ import
org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
import
org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration;
import
org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter;
import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import javax.sql.DataSource;
import java.io.IOException;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacade.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacade.java
index 0c50332ae..98f93e8b0 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacade.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacade.java
@@ -31,8 +31,8 @@ import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionSe
import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
import
org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService;
-import org.apache.shardingsphere.elasticjob.kernel.tracing.JobTracingEventBus;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobTracingEventBus;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent.State;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java
index 2407d6b5e..e49e63bf2 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.elasticjob.kernel.internal.guarantee.GuaranteeS
import
org.apache.shardingsphere.elasticjob.kernel.internal.setup.JobClassNameProviderFactory;
import org.apache.shardingsphere.elasticjob.kernel.internal.setup.SetUpFacade;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.quartz.JobBuilder;
import org.quartz.JobDetail;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/api/TracingConfiguration.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingConfiguration.java
similarity index 92%
rename from
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/api/TracingConfiguration.java
rename to
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingConfiguration.java
index 9b656b698..cd0590458 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/api/TracingConfiguration.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.kernel.tracing.api;
+package org.apache.shardingsphere.elasticjob.kernel.tracing.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -40,6 +40,6 @@ public final class TracingConfiguration<T> implements
JobExtraConfiguration {
public TracingConfiguration(final String type, final T storage) {
this.type = type;
this.tracingStorageConfiguration =
TracingStorageConverterFactory.findConverter((Class<T>) storage.getClass())
- .orElseThrow(() -> new
TracingStorageConverterNotFoundException(storage.getClass())).convertObjectToConfiguration(storage);
+ .orElseThrow(() -> new
TracingStorageConverterNotFoundException(storage.getClass())).convertToConfiguration(storage);
}
}
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/api/TracingStorageConfiguration.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingStorageConfiguration.java
similarity index 93%
rename from
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/api/TracingStorageConfiguration.java
rename to
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingStorageConfiguration.java
index ced7a878a..615b393b7 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/api/TracingStorageConfiguration.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingStorageConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.kernel.tracing.api;
+package org.apache.shardingsphere.elasticjob.kernel.tracing.config;
/**
* Tracing storage configuration.
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/JobTracingEventBus.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBus.java
similarity index 94%
rename from
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/JobTracingEventBus.java
rename to
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBus.java
index 78f3fae23..b0acf3b00 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/JobTracingEventBus.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBus.java
@@ -15,15 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.kernel.tracing;
+package org.apache.shardingsphere.elasticjob.kernel.tracing.event;
import com.google.common.eventbus.AsyncEventBus;
import com.google.common.eventbus.EventBus;
import com.google.common.util.concurrent.MoreExecutors;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
-import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobEvent;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.exception.TracingConfigurationException;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListenerConfiguration;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverter.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverter.java
index 6bb4e6ecf..d55a2349a 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverter.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverter.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.tracing.storage;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
/**
@@ -34,7 +34,7 @@ public interface TracingStorageConverter<T> {
* @param storage storage instance
* @return instance of {@link TracingStorageConfiguration}
*/
- TracingStorageConfiguration<T> convertObjectToConfiguration(T storage);
+ TracingStorageConfiguration<T> convertToConfiguration(T storage);
/**
* Storage type.
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfiguration.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfiguration.java
index 2c0f3d704..bd1985b4b 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfiguration.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfiguration.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.elasticjob.kernel.tracing.yaml;
import lombok.Getter;
import lombok.Setter;
import
org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfiguration;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
/**
* YAML configuration for {@link TracingConfiguration}.
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverter.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverter.java
index 0cd84b84c..989f99eec 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverter.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverter.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.elasticjob.kernel.tracing.yaml;
import
org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
/**
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingStorageConfiguration.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingStorageConfiguration.java
index 8eb67fe66..c3201e6d5 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingStorageConfiguration.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingStorageConfiguration.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.elasticjob.kernel.tracing.yaml;
import
org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfiguration;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration;
/**
* YAML configuration for {@link TracingStorageConfiguration}.
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacadeTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacadeTest.java
index c587ba8ce..8806af610 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacadeTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacadeTest.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionSe
import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService;
import
org.apache.shardingsphere.elasticjob.kernel.listener.fixture.ElasticJobListenerCaller;
import
org.apache.shardingsphere.elasticjob.kernel.listener.fixture.TestElasticJobListener;
-import org.apache.shardingsphere.elasticjob.kernel.tracing.JobTracingEventBus;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobTracingEventBus;
import
org.apache.shardingsphere.elasticjob.spi.listener.param.ShardingContexts;
import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/JobTracingEventBusTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBusTest.java
similarity index 91%
rename from
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/JobTracingEventBusTest.java
rename to
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBusTest.java
index 72e23cd87..6534a1288 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/JobTracingEventBusTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBusTest.java
@@ -15,12 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.kernel.tracing;
+package org.apache.shardingsphere.elasticjob.kernel.tracing.event;
import com.google.common.eventbus.EventBus;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
-import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobEvent;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageFixture;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.listener.TestTracingListener;
import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageConfigurationFixture.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageConfigurationFixture.java
index 93576263d..95319dba1 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageConfigurationFixture.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageConfigurationFixture.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration;
@RequiredArgsConstructor
@Getter
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageFixtureConverter.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageFixtureConverter.java
index 8ea3d16dc..308e66655 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageFixtureConverter.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageFixtureConverter.java
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter;
public final class TracingStorageFixtureConverter implements
TracingStorageConverter<TracingStorageFixture> {
@Override
- public TracingStorageConfiguration<TracingStorageFixture>
convertObjectToConfiguration(final TracingStorageFixture storage) {
+ public TracingStorageConfiguration<TracingStorageFixture>
convertToConfiguration(final TracingStorageFixture storage) {
return new TracingStorageConfigurationFixture(storage);
}
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfiguration.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfiguration.java
index ae9fb238e..c5c850220 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfiguration.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfiguration.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.elasticjob.kernel.tracing.yaml;
import lombok.Getter;
import lombok.Setter;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageFixture;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageConfigurationFixture;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfigurationConverter.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfigurationConverter.java
index 89394eb7e..011f938ff 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfigurationConverter.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfigurationConverter.java
@@ -18,12 +18,12 @@
package org.apache.shardingsphere.elasticjob.kernel.tracing.yaml;
import
org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingStorageConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageFixture;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageConfigurationFixture;
/**
- * YAML JobEventCaller configuration converter.
+ * YAML job event caller configuration converter.
*/
@SuppressWarnings({"unchecked", "rawtypes"})
public final class YamlJobEventCallerConfigurationConverter
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverterTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverterTest.java
index acb9312ad..d4f3d7d60 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverterTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverterTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.tracing.yaml;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageFixture;
import org.junit.jupiter.api.Test;
diff --git a/kernel/src/test/resources/logback-test.xml
b/kernel/src/test/resources/logback-test.xml
index ea8aa3706..138f4b618 100644
--- a/kernel/src/test/resources/logback-test.xml
+++ b/kernel/src/test/resources/logback-test.xml
@@ -39,6 +39,6 @@
</root>
<logger
name="org.apache.shardingsphere.elasticjob.kernel.internal.snapshot.SnapshotService"
level="OFF" />
- <logger
name="org.apache.shardingsphere.elasticjob.kernel.tracing.JobTracingEventBus"
level="OFF" />
+ <logger
name="org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobTracingEventBus"
level="OFF" />
<logger name="org.apache.curator.framework.listen.MappingListenerManager"
level="OFF" />
</configuration>
diff --git
a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobBootstrapConfiguration.java
b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobBootstrapConfiguration.java
index ff59083bd..9441fa8d2 100644
---
a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobBootstrapConfiguration.java
+++
b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobBootstrapConfiguration.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.elasticjob.bootstrap.type.OneOffJobBootstrap;
import
org.apache.shardingsphere.elasticjob.bootstrap.type.ScheduleJobBootstrap;
import
org.apache.shardingsphere.elasticjob.spring.boot.tracing.TracingProperties;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.SmartInitializingSingleton;
import org.springframework.beans.factory.config.SingletonBeanRegistry;
diff --git
a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java
b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java
index 0df9b60ad..999250095 100644
---
a/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java
+++
b/spring/boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.elasticjob.spring.boot.tracing;
import com.zaxxer.hikari.HikariDataSource;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import org.springframework.beans.BeanUtils;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git
a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java
b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java
index c8f10ce0e..f7a93fd20 100644
---
a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java
+++
b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties;
import
org.apache.shardingsphere.elasticjob.spring.boot.tracing.TracingProperties;
import org.apache.shardingsphere.elasticjob.test.util.EmbedTestingServer;
import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git
a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingConfigurationTest.java
b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingConfigurationTest.java
index 5633e3dad..abf0e0831 100644
---
a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingConfigurationTest.java
+++
b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingConfigurationTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.elasticjob.spring.boot.tracing;
import org.apache.shardingsphere.elasticjob.test.util.EmbedTestingServer;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.ObjectProvider;
diff --git
a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java
b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java
index 1bce80815..5feadd6d8 100644
---
a/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java
+++
b/spring/namespace/src/main/java/org/apache/shardingsphere/elasticjob/spring/namespace/tracing/parser/TracingBeanDefinitionParser.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.elasticjob.spring.namespace.tracing.parser;
import
org.apache.shardingsphere.elasticjob.spring.namespace.tracing.tag.TracingBeanDefinitionTag;
-import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
+import
org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
