lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化createDataSource和createCacheSource

Browse Source
This commit is contained in:
Redkale
2022-12-21 13:43:25 +08:00
parent 3ac01eca15
commit 66a1850c49
4 changed files with 120 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/main/java/org/redkale/boot/Application.java
View File

@@ -1189,47 +1189,18 @@ public final class Application {
CacheSource source = new CacheMemorySource(sourceName); CacheSource source = new CacheMemorySource(sourceName);
cacheSources.add(source); cacheSources.add(source);
resourceFactory.register(sourceName, CacheSource.class, source); resourceFactory.register(sourceName, CacheSource.class, source);
resourceFactory.inject(sourceName, source);
if (!compileMode && source instanceof Service) ((Service) source).init(sourceConf); if (!compileMode && source instanceof Service) ((Service) source).init(sourceConf);
logger.info("[" + Thread.currentThread().getName() + "] Load CacheSource resourceName = " + sourceName + ", source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); logger.info("[" + Thread.currentThread().getName() + "] Load CacheSource resourceName = " + sourceName + ", source = " + source + " in " + (System.currentTimeMillis() - st) + " ms");
return source; return source;
} }
String classVal = sourceConf.getValue("type");
try { try {
CacheSource source = null; CacheSource source = AbstractCacheSource.createCacheSource(serverClassLoader, resourceFactory, sourceConf, sourceName, compileMode);
if (classVal == null || classVal.isEmpty()) {
RedkaleClassLoader.putServiceLoader(CacheSourceProvider.class);
List<CacheSourceProvider> providers = new ArrayList<>();
Iterator<CacheSourceProvider> it = ServiceLoader.load(CacheSourceProvider.class, serverClassLoader).iterator();
while (it.hasNext()) {
CacheSourceProvider provider = it.next();
if (provider != null) RedkaleClassLoader.putReflectionPublicConstructors(provider.getClass(), provider.getClass().getName());
if (provider != null && provider.acceptsConf(sourceConf)) {
providers.add(provider);
}
}
for (CacheSourceProvider provider : InstanceProvider.sort(providers)) {
source = provider.createInstance();
if (source != null) break;
}
if (source == null) {
if (CacheMemorySource.acceptsConf(sourceConf)) {
source = new CacheMemorySource(sourceName);
}
}
} else {
Class sourceType = serverClassLoader.loadClass(classVal);
RedkaleClassLoader.putReflectionPublicConstructors(sourceType, sourceType.getName());
source = (CacheSource) sourceType.getConstructor().newInstance();
}
if (source == null) throw new RuntimeException("Not found CacheSourceProvider for config=" + sourceConf);
cacheSources.add(source); cacheSources.add(source);
resourceFactory.register(sourceName, source); resourceFactory.register(sourceName, source);
resourceFactory.inject(sourceName, source);
if (!compileMode && source instanceof Service) ((Service) source).init(sourceConf);
logger.info("[" + Thread.currentThread().getName() + "] Load CacheSource resourceName = " + sourceName + ", source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); logger.info("[" + Thread.currentThread().getName() + "] Load CacheSource resourceName = " + sourceName + ", source = " + source + " in " + (System.currentTimeMillis() - st) + " ms");
return source; return source;
} catch (RuntimeException ex) {
throw ex;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "load application CaheSource error: " + sourceConf, e); logger.log(Level.SEVERE, "load application CaheSource error: " + sourceConf, e);
} }
@@ -1243,55 +1214,23 @@ public final class Application {
if (sourceConf == null) { if (sourceConf == null) {
if (!autoMemory) return null; if (!autoMemory) return null;
DataSource source = new DataMemorySource(sourceName); DataSource source = new DataMemorySource(sourceName);
if (!compileMode && source instanceof Service) {
resourceFactory.inject(sourceName, source);
((Service) source).init(sourceConf);
}
dataSources.add(source); dataSources.add(source);
resourceFactory.register(sourceName, DataSource.class, source); resourceFactory.register(sourceName, DataSource.class, source);
resourceFactory.inject(sourceName, source);
if (!compileMode && source instanceof Service) ((Service) source).init(sourceConf);
logger.info("[" + Thread.currentThread().getName() + "] Load DataSource resourceName = " + sourceName + ", source = " + source); logger.info("[" + Thread.currentThread().getName() + "] Load DataSource resourceName = " + sourceName + ", source = " + source);
return source; return source;
} }
String classVal = sourceConf.getValue("type");
try { try {
DataSource source = null; DataSource source = AbstractDataSource.createDataSource(serverClassLoader, resourceFactory, sourceConf, sourceName, compileMode);
if (classVal == null || classVal.isEmpty()) {
if (DataJdbcSource.acceptsConf(sourceConf)) {
source = new DataJdbcSource();
} else {
RedkaleClassLoader.putServiceLoader(DataSourceProvider.class);
List<DataSourceProvider> providers = new ArrayList<>();
Iterator<DataSourceProvider> it = ServiceLoader.load(DataSourceProvider.class, serverClassLoader).iterator();
while (it.hasNext()) {
DataSourceProvider provider = it.next();
if (provider != null) RedkaleClassLoader.putReflectionPublicConstructors(provider.getClass(), provider.getClass().getName());
if (provider != null && provider.acceptsConf(sourceConf)) {
providers.add(provider);
}
}
for (DataSourceProvider provider : InstanceProvider.sort(providers)) {
source = provider.createInstance();
if (source != null) break;
}
if (source == null) {
if (DataMemorySource.acceptsConf(sourceConf)) {
source = new DataMemorySource(sourceName);
}
}
}
} else {
Class sourceType = serverClassLoader.loadClass(classVal);
RedkaleClassLoader.putReflectionPublicConstructors(sourceType, sourceType.getName());
source = (DataSource) sourceType.getConstructor().newInstance();
}
if (source == null) throw new RuntimeException("Not found DataSourceProvider for config=" + sourceConf);
dataSources.add(source); dataSources.add(source);
if (source instanceof DataMemorySource && DataMemorySource.isSearchType(sourceConf)) { if (source instanceof DataMemorySource && DataMemorySource.isSearchType(sourceConf)) {
resourceFactory.register(sourceName, SearchSource.class, source); resourceFactory.register(sourceName, SearchSource.class, source);
} else { } else {
resourceFactory.register(sourceName, source); resourceFactory.register(sourceName, source);
} }
resourceFactory.inject(sourceName, source);
if (!compileMode && source instanceof Service) ((Service) source).init(sourceConf);
logger.info("[" + Thread.currentThread().getName() + "] Load DataSource resourceName = " + sourceName + ", source = " + source); logger.info("[" + Thread.currentThread().getName() + "] Load DataSource resourceName = " + sourceName + ", source = " + source);
return source; return source;
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
@@ -1655,7 +1594,7 @@ public final class Application {
} }
if (server == null) { if (server == null) {
logger.log(Level.SEVERE, "Not found Server Class for protocol({0})", serconf.getValue("protocol")); logger.log(Level.SEVERE, "Not found Server Class for protocol({0})", serconf.getValue("protocol"));
System.exit(0); System.exit(1);
} }
server.init(serconf); server.init(serconf);
if (!singletonMode && !compileMode) { if (!singletonMode && !compileMode) {
@@ -1669,6 +1608,7 @@ public final class Application {
} catch (Exception ex) { } catch (Exception ex) {
logger.log(Level.WARNING, serconf + " runServers error", ex); logger.log(Level.WARNING, serconf + " runServers error", ex);
Application.this.shutdownLatch.countDown(); Application.this.shutdownLatch.countDown();
System.exit(1);
} }
} }
}; };

52
src/main/java/org/redkale/source/AbstractCacheSource.java
View File

@@ -2,6 +2,7 @@
*/ */
package org.redkale.source; package org.redkale.source;
import java.util.*;
import org.redkale.annotation.AutoLoad; import org.redkale.annotation.AutoLoad;
import org.redkale.annotation.ResourceListener; import org.redkale.annotation.ResourceListener;
import org.redkale.annotation.ResourceType; import org.redkale.annotation.ResourceType;
@@ -49,4 +50,55 @@ public abstract class AbstractCacheSource extends AbstractService implements Cac
@ResourceListener @ResourceListener
public abstract void onResourceChange(ResourceEvent[] events); public abstract void onResourceChange(ResourceEvent[] events);
//从Properties配置中创建DataSource
public static CacheSource createCacheSource(Properties sourceProperties, String sourceName) throws Exception {
AnyValue redConf = AnyValue.loadFromProperties(sourceProperties);
AnyValue sourceConf = redConf.getAnyValue("cachesource").getAnyValue(sourceName);
return createCacheSource(null, null, sourceConf, sourceName, false);
}
//根据配置中创建DataSource
public static CacheSource createCacheSource(ClassLoader serverClassLoader, ResourceFactory resourceFactory, AnyValue sourceConf, String sourceName, boolean compileMode) throws Exception {
CacheSource source = null;
if (serverClassLoader == null) {
serverClassLoader = Thread.currentThread().getContextClassLoader();
}
String classVal = sourceConf.getValue("type");
if (classVal == null || classVal.isEmpty()) {
RedkaleClassLoader.putServiceLoader(CacheSourceProvider.class);
List<CacheSourceProvider> providers = new ArrayList<>();
Iterator<CacheSourceProvider> it = ServiceLoader.load(CacheSourceProvider.class, serverClassLoader).iterator();
while (it.hasNext()) {
CacheSourceProvider provider = it.next();
if (provider != null) RedkaleClassLoader.putReflectionPublicConstructors(provider.getClass(), provider.getClass().getName());
if (provider != null && provider.acceptsConf(sourceConf)) {
providers.add(provider);
}
}
for (CacheSourceProvider provider : InstanceProvider.sort(providers)) {
source = provider.createInstance();
if (source != null) break;
}
if (source == null) {
if (CacheMemorySource.acceptsConf(sourceConf)) {
source = new CacheMemorySource(sourceName);
}
}
} else {
Class sourceType = serverClassLoader.loadClass(classVal);
RedkaleClassLoader.putReflectionPublicConstructors(sourceType, sourceType.getName());
source = (CacheSource) sourceType.getConstructor().newInstance();
}
if (source == null) {
throw new RuntimeException("Not found CacheSourceProvider for config=" + sourceConf);
}
if (!compileMode && resourceFactory != null) {
resourceFactory.inject(sourceName, source);
}
if (!compileMode && source instanceof Service) {
((Service) source).init(sourceConf);
}
return source;
}
} }

55
src/main/java/org/redkale/source/AbstractDataSource.java
View File

@@ -102,6 +102,61 @@ public abstract class AbstractDataSource extends AbstractService implements Data
@ResourceListener @ResourceListener
public abstract void onResourceChange(ResourceEvent[] events); public abstract void onResourceChange(ResourceEvent[] events);
//从Properties配置中创建DataSource
public static DataSource createDataSource(Properties sourceProperties, String sourceName) throws Exception {
AnyValue redConf = AnyValue.loadFromProperties(sourceProperties);
AnyValue sourceConf = redConf.getAnyValue("datasource").getAnyValue(sourceName);
return createDataSource(null, null, sourceConf, sourceName, false);
}
//根据配置中创建DataSource
public static DataSource createDataSource(ClassLoader serverClassLoader, ResourceFactory resourceFactory, AnyValue sourceConf, String sourceName, boolean compileMode) throws Exception {
DataSource source = null;
if (serverClassLoader == null) {
serverClassLoader = Thread.currentThread().getContextClassLoader();
}
String classVal = sourceConf.getValue("type");
if (classVal == null || classVal.isEmpty()) {
if (DataJdbcSource.acceptsConf(sourceConf)) {
source = new DataJdbcSource();
} else {
RedkaleClassLoader.putServiceLoader(DataSourceProvider.class);
List<DataSourceProvider> providers = new ArrayList<>();
Iterator<DataSourceProvider> it = ServiceLoader.load(DataSourceProvider.class, serverClassLoader).iterator();
while (it.hasNext()) {
DataSourceProvider provider = it.next();
if (provider != null) RedkaleClassLoader.putReflectionPublicConstructors(provider.getClass(), provider.getClass().getName());
if (provider != null && provider.acceptsConf(sourceConf)) {
providers.add(provider);
}
}
for (DataSourceProvider provider : InstanceProvider.sort(providers)) {
source = provider.createInstance();
if (source != null) break;
}
if (source == null) {
if (DataMemorySource.acceptsConf(sourceConf)) {
source = new DataMemorySource(sourceName);
}
}
}
} else {
Class sourceType = serverClassLoader.loadClass(classVal);
RedkaleClassLoader.putReflectionPublicConstructors(sourceType, sourceType.getName());
source = (DataSource) sourceType.getConstructor().newInstance();
}
if (source == null) {
throw new RuntimeException("Not found DataSourceProvider for config=" + sourceConf);
}
if (!compileMode && resourceFactory != null) {
resourceFactory.inject(sourceName, source);
}
if (!compileMode && source instanceof Service) {
((Service) source).init(sourceConf);
}
return source;
}
public static String parseDbtype(String url) { public static String parseDbtype(String url) {
String dbtype = null; String dbtype = null;
if (url == null) return dbtype; if (url == null) return dbtype;

7
src/main/java/org/redkale/source/DataSqlSource.java
View File

@@ -24,7 +24,6 @@ import org.redkale.service.Local;
import org.redkale.source.EntityInfo.EntityColumn; import org.redkale.source.EntityInfo.EntityColumn;
import org.redkale.util.*; import org.redkale.util.*;
/** /**
* DataSource的SQL抽象实现类 <br> * DataSource的SQL抽象实现类 <br>
* 注意: 所有的操作只能作用在一张表上，不能同时变更多张表 * 注意: 所有的操作只能作用在一张表上，不能同时变更多张表
@@ -56,10 +55,10 @@ public abstract class DataSqlSource extends AbstractDataSource implements Functi
protected Properties writeConfProps; protected Properties writeConfProps;
@Resource(name = RESNAME_APP_CLIENT_ASYNCGROUP) @Resource(name = RESNAME_APP_CLIENT_ASYNCGROUP, required = false)
protected AsyncGroup clientAsyncGroup; protected AsyncGroup clientAsyncGroup;
@Resource(name = RESNAME_APP_EXECUTOR) @Resource(name = RESNAME_APP_EXECUTOR, required = false)
protected ExecutorService workExecutor; protected ExecutorService workExecutor;
protected BiFunction<EntityInfo, Object, CharSequence> sqlFormatter; protected BiFunction<EntityInfo, Object, CharSequence> sqlFormatter;
@@ -125,7 +124,7 @@ public abstract class DataSqlSource extends AbstractDataSource implements Functi
this.tableNotExistSqlstates = ";" + readConfProps.getProperty(DATA_SOURCE_TABLENOTEXIST_SQLSTATES, "42000;42S02") + ";"; this.tableNotExistSqlstates = ";" + readConfProps.getProperty(DATA_SOURCE_TABLENOTEXIST_SQLSTATES, "42000;42S02") + ";";
this.tablecopySQL = readConfProps.getProperty(DATA_SOURCE_TABLECOPY_SQLTEMPLATE, "CREATE TABLE IF NOT EXISTS ${newtable} LIKE ${oldtable}"); this.tablecopySQL = readConfProps.getProperty(DATA_SOURCE_TABLECOPY_SQLTEMPLATE, "CREATE TABLE IF NOT EXISTS ${newtable} LIKE ${oldtable}");
this.cacheForbidden = "NONE".equalsIgnoreCase(readConfProps.getProperty(DATA_SOURCE_CACHEMODE)); this.cacheForbidden = "NONE".equalsIgnoreCase(readConfProps.getProperty(DATA_SOURCE_CACHEMODE));
this.slowms = Integer.parseInt(readConfProps.getProperty(DATA_SOURCE_SLOWMS, "3000").trim()); this.slowms = Integer.parseInt(readConfProps.getProperty(DATA_SOURCE_SLOWMS, "3000").trim());
} }