Merge pull request #2205 from apache/3.0.3-release
Complete 3.0.3 release
diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/WrapException.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/WrapException.java
new file mode 100644
index 0000000..8e776a8
--- /dev/null
+++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/exception/WrapException.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.elasticjob.tracing.exception;
+
+/**
+ * Use to wrap Exception.
+ */
+public class WrapException extends RuntimeException {
+
+ public WrapException(final Throwable cause) {
+ super(cause);
+ }
+}
diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java
index 5369302..3c518e8 100644
--- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java
+++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java
@@ -33,7 +33,7 @@
private final RDBJobEventStorage repository;
public RDBTracingListener(final DataSource dataSource) throws SQLException {
- repository = new RDBJobEventStorage(dataSource);
+ repository = RDBJobEventStorage.getInstance(dataSource);
}
@Override
diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorage.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorage.java
index ab7d045..8c27715 100644
--- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorage.java
+++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorage.java
@@ -23,6 +23,7 @@
import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent;
import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.Source;
import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent.State;
+import org.apache.shardingsphere.elasticjob.tracing.exception.WrapException;
import org.apache.shardingsphere.elasticjob.tracing.rdb.type.DatabaseType;
import org.apache.shardingsphere.elasticjob.tracing.rdb.type.impl.DefaultDatabaseType;
@@ -41,6 +42,8 @@
import java.util.Map;
import java.util.ServiceLoader;
import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
/**
* RDB job event storage.
@@ -55,26 +58,63 @@
private static final String TASK_ID_STATE_INDEX = "TASK_ID_STATE_INDEX";
private static final Map<String, DatabaseType> DATABASE_TYPES = new HashMap<>();
-
+
+ private static final Map<DataSource, RDBJobEventStorage> STORAGE_MAP = new ConcurrentHashMap<>();
+
private final DataSource dataSource;
-
+
private final DatabaseType databaseType;
-
+
private final RDBStorageSQLMapper sqlMapper;
-
+
static {
for (DatabaseType each : ServiceLoader.load(DatabaseType.class)) {
DATABASE_TYPES.put(each.getType(), each);
}
}
-
- public RDBJobEventStorage(final DataSource dataSource) throws SQLException {
+
+ private RDBJobEventStorage(final DataSource dataSource) throws SQLException {
this.dataSource = dataSource;
databaseType = getDatabaseType(dataSource);
sqlMapper = new RDBStorageSQLMapper(databaseType.getSQLPropertiesFile());
initTablesAndIndexes();
}
-
+
+ /**
+ * The same dataSource always return the same RDBJobEventStorage instance.
+ *
+ * @param dataSource dataSource
+ * @return RDBJobEventStorage instance
+ * @throws SQLException SQLException
+ */
+ public static RDBJobEventStorage getInstance(final DataSource dataSource) throws SQLException {
+ return wrapException(() -> STORAGE_MAP.computeIfAbsent(dataSource, ds -> {
+ try {
+ return new RDBJobEventStorage(ds);
+ } catch (SQLException e) {
+ throw new WrapException(e);
+ }
+ }));
+ }
+
+ /**
+ * WrapException util method.
+ *
+ * @param supplier supplier
+ * @return RDBJobEventStorage
+ * @throws SQLException SQLException
+ */
+ public static RDBJobEventStorage wrapException(final Supplier<RDBJobEventStorage> supplier) throws SQLException {
+ try {
+ return supplier.get();
+ } catch (WrapException e) {
+ if (e.getCause() instanceof SQLException) {
+ throw new SQLException(e.getCause());
+ }
+ throw e;
+ }
+ }
+
private DatabaseType getDatabaseType(final DataSource dataSource) throws SQLException {
try (Connection connection = dataSource.getConnection()) {
String databaseProductName = connection.getMetaData().getDatabaseProductName();
diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java
index 15ac7d3..d649feb 100644
--- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java
+++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/RDBJobEventStorageTest.java
@@ -49,7 +49,7 @@
dataSource.setUrl("jdbc:h2:mem:job_event_storage");
dataSource.setUsername("sa");
dataSource.setPassword("");
- storage = new RDBJobEventStorage(dataSource);
+ storage = RDBJobEventStorage.getInstance(dataSource);
}
@After
