This is an automated email from the ASF dual-hosted git repository.
panjuan 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 ba734384c Rename TracingStorageDatabaseType
new da259cc49 Merge pull request #2347 from terrymanu/dev
ba734384c is described below
commit ba734384cffe49f0a9ae5e8b860f41d35fafe8c2
Author: zhangliang <[email protected]>
AuthorDate: Tue Oct 31 14:24:33 2023 +0800
Rename TracingStorageDatabaseType
---
.../tracing/rdb/storage/RDBJobEventStorage.java | 18 +++++++++---------
...tabaseType.java => TracingStorageDatabaseType.java} | 4 ++--
...aseType.java => DB2TracingStorageDatabaseType.java} | 6 +++---
...ype.java => DefaultTracingStorageDatabaseType.java} | 6 +++---
...baseType.java => H2TracingStorageDatabaseType.java} | 6 +++---
...eType.java => MySQLTracingStorageDatabaseType.java} | 6 +++---
...Type.java => OracleTracingStorageDatabaseType.java} | 6 +++---
....java => PostgreSQLTracingStorageDatabaseType.java} | 6 +++---
...e.java => SQLServerTracingStorageDatabaseType.java} | 6 +++---
...ticjob.tracing.rdb.type.TracingStorageDatabaseType} | 12 ++++++------
.../kernel/tracing/yaml/YamlTracingConfiguration.java | 2 --
11 files changed, 38 insertions(+), 40 deletions(-)
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/RDBJobEventStorage.java
index 8c87fa876..de6302285 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/RDBJobEventStorage.java
@@ -24,8 +24,8 @@ import
org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEve
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.DatabaseType;
-import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.DefaultDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.DefaultTracingStorageDatabaseType;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import javax.sql.DataSource;
@@ -60,14 +60,14 @@ public final class RDBJobEventStorage {
private final DataSource dataSource;
- private final DatabaseType databaseType;
+ private final TracingStorageDatabaseType tracingStorageDatabaseType;
private final RDBStorageSQLMapper sqlMapper;
private RDBJobEventStorage(final DataSource dataSource) throws
SQLException {
this.dataSource = dataSource;
- databaseType = getDatabaseType(dataSource);
- sqlMapper = new
RDBStorageSQLMapper(databaseType.getSQLPropertiesFile());
+ tracingStorageDatabaseType = getDatabaseType(dataSource);
+ sqlMapper = new
RDBStorageSQLMapper(tracingStorageDatabaseType.getSQLPropertiesFile());
initTablesAndIndexes();
}
@@ -106,16 +106,16 @@ public final class RDBJobEventStorage {
}
}
- private DatabaseType getDatabaseType(final DataSource dataSource) throws
SQLException {
+ private TracingStorageDatabaseType getDatabaseType(final DataSource
dataSource) throws SQLException {
try (Connection connection = dataSource.getConnection()) {
String databaseProductName =
connection.getMetaData().getDatabaseProductName();
- for (DatabaseType each :
ShardingSphereServiceLoader.getServiceInstances(DatabaseType.class)) {
+ for (TracingStorageDatabaseType each :
ShardingSphereServiceLoader.getServiceInstances(TracingStorageDatabaseType.class))
{
if (each.getDatabaseProductName().equals(databaseProductName))
{
return each;
}
}
}
- return new DefaultDatabaseType();
+ return new DefaultTracingStorageDatabaseType();
}
private void initTablesAndIndexes() throws SQLException {
@@ -321,7 +321,7 @@ public final class RDBJobEventStorage {
}
private boolean isDuplicateRecord(final SQLException ex) {
- return null != databaseType &&
databaseType.getDuplicateRecordErrorCode() == ex.getErrorCode();
+ return null != tracingStorageDatabaseType &&
tracingStorageDatabaseType.getDuplicateRecordErrorCode() == ex.getErrorCode();
}
/**
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/DatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/TracingStorageDatabaseType.java
similarity index 94%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/DatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/TracingStorageDatabaseType.java
index 17ffdf76e..16f644665 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/DatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/TracingStorageDatabaseType.java
@@ -21,10 +21,10 @@ import
org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
/**
- * Database type.
+ * Tracing storage database type.
*/
@SingletonSPI
-public interface DatabaseType extends TypedSPI {
+public interface TracingStorageDatabaseType extends TypedSPI {
/**
* Get database product name.
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DB2DatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DB2TracingStorageDatabaseType.java
similarity index 82%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DB2DatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DB2TracingStorageDatabaseType.java
index dc8e3e911..40dad660a 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DB2DatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DB2TracingStorageDatabaseType.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
-import org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
/**
- * DB2 database type.
+ * Tracing storage database type for DB2.
*/
-public final class DB2DatabaseType implements DatabaseType {
+public final class DB2TracingStorageDatabaseType implements
TracingStorageDatabaseType {
@Override
public String getType() {
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DefaultDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DefaultTracingStorageDatabaseType.java
similarity index 83%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DefaultDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DefaultTracingStorageDatabaseType.java
index 4e52ec713..01a2ecd40 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DefaultDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/DefaultTracingStorageDatabaseType.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
-import org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
/**
- * Default database type.
+ * Default tracing storage database type.
*/
-public class DefaultDatabaseType implements DatabaseType {
+public class DefaultTracingStorageDatabaseType implements
TracingStorageDatabaseType {
@Override
public String getType() {
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/H2DatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/H2TracingStorageDatabaseType.java
similarity index 82%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/H2DatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/H2TracingStorageDatabaseType.java
index 755af133f..7402b0a47 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/H2DatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/H2TracingStorageDatabaseType.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
-import org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
/**
- * H2 database type.
+ * Tracing storage database type for H2.
*/
-public final class H2DatabaseType implements DatabaseType {
+public final class H2TracingStorageDatabaseType implements
TracingStorageDatabaseType {
@Override
public String getType() {
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/MySQLDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/MySQLTracingStorageDatabaseType.java
similarity index 82%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/MySQLDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/MySQLTracingStorageDatabaseType.java
index 2b1c19850..7d691a6a2 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/MySQLDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/MySQLTracingStorageDatabaseType.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
-import org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
/**
- * MySQL database type.
+ * Tracing storage database type for MySQL.
*/
-public final class MySQLDatabaseType implements DatabaseType {
+public final class MySQLTracingStorageDatabaseType implements
TracingStorageDatabaseType {
@Override
public String getType() {
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/OracleDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/OracleTracingStorageDatabaseType.java
similarity index 82%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/OracleDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/OracleTracingStorageDatabaseType.java
index 97fba19aa..804902a2d 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/OracleDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/OracleTracingStorageDatabaseType.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
-import org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
/**
- * Oracle database type.
+ * Tracing storage database type for Oracle.
*/
-public final class OracleDatabaseType implements DatabaseType {
+public final class OracleTracingStorageDatabaseType implements
TracingStorageDatabaseType {
@Override
public String getType() {
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/PostgreSQLDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/PostgreSQLTracingStorageDatabaseType.java
similarity index 81%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/PostgreSQLDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/PostgreSQLTracingStorageDatabaseType.java
index e24df8e75..c0ade9b55 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/PostgreSQLDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/PostgreSQLTracingStorageDatabaseType.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
-import org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
/**
- * PostgreSQL database type.
+ * Tracing storage database type for PostgreSQL.
*/
-public final class PostgreSQLDatabaseType implements DatabaseType {
+public final class PostgreSQLTracingStorageDatabaseType implements
TracingStorageDatabaseType {
@Override
public String getType() {
diff --git
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/SQLServerDatabaseType.java
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/SQLServerTracingStorageDatabaseType.java
similarity index 83%
rename from
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/SQLServerDatabaseType.java
rename to
ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/SQLServerTracingStorageDatabaseType.java
index a917f4532..a93b9e371 100644
---
a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/SQLServerDatabaseType.java
+++
b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/type/impl/SQLServerTracingStorageDatabaseType.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl;
-import org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType;
+import
org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType;
/**
- * SQLServer database type.
+ * Tracing storage database type for SQLServer.
*/
-public final class SQLServerDatabaseType implements DatabaseType {
+public final class SQLServerTracingStorageDatabaseType implements
TracingStorageDatabaseType {
@Override
public String getType() {
diff --git
a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType
b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType
similarity index 77%
rename from
ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType
rename to
ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType
index 374dab71c..aa7a3c3f8 100644
---
a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType
+++
b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.tracing.rdb.type.TracingStorageDatabaseType
@@ -15,9 +15,9 @@
# limitations under the License.
#
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.MySQLDatabaseType
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.PostgreSQLDatabaseType
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.OracleDatabaseType
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.SQLServerDatabaseType
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.DB2DatabaseType
-org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.H2DatabaseType
+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
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 b426ad5ca..2c0f3d704 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
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.elasticjob.kernel.tracing.yaml;
import lombok.Getter;
-import lombok.NoArgsConstructor;
import lombok.Setter;
import
org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfiguration;
import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfiguration;
@@ -28,7 +27,6 @@ import
org.apache.shardingsphere.elasticjob.kernel.tracing.api.TracingConfigurat
*
* @param <T> type of storage
*/
-@NoArgsConstructor
@Getter
@Setter
public final class YamlTracingConfiguration<T> implements
YamlConfiguration<TracingConfiguration<T>> {
