Skip to content

[Fix-4514][metadata] Adding type to DriverPool's key #4515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jrnie wants to merge 1 commit into from
Closed

[Fix-4514][metadata] Adding type to DriverPool's key #4515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dinky-admin/src/main/java/org/dinky/controller/DataSourceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public class DataSourceController {
mode = SaMode.OR)
public Result<Void> saveOrUpdateDataBase(@RequestBody DataBaseDTO dataBaseDTO) {
if (databaseService.saveOrUpdateDataBase(dataBaseDTO)) {
DriverPool.remove(dataBaseDTO.getName());
DriverPool.remove(dataBaseDTO.getName() + dataBaseDTO.getType());
return Result.succeed(Status.SAVE_SUCCESS);
} else {
return Result.failed(Status.SAVE_FAILED);
Expand Down
16 changes: 10 additions & 6 deletions dinky-metadata/dinky-metadata-base/src/main/java/org/dinky/metadata/driver/Driver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,27 @@ static Driver getDriver(String type) {
}
}

/**
* key只用connector无法区分，需要额外增加type。<br>
* 比如mysql、postgres的connector都是jdbc，需要由jdbc+MySQL、jdbc+PostgreSql来区分
*/
static Driver build(String name, String type, Map<String, Object> config) {
if (DriverPool.exist(name)) {
return getHealthDriver(name);
if (DriverPool.exist(name + type)) {
return getHealthDriver(name + type);
}
Driver driver = getDriver(type).buildDriverConfig(name, type, config).connect();
DriverPool.push(name, driver);
DriverPool.push(name + type, driver);
return driver;
}

static <T> Driver build(DriverConfig<T> config) {
if (DriverPool.exist(config.getName())) {
return getHealthDriver(config.getName());
if (DriverPool.exist(config.getName() + config.getType())) {
return getHealthDriver(config.getName() + config.getType());
}
Driver driver = getDriver(config.getType())
.buildDriverConfig(config.getName(), config.getType(), config.getConnectConfig())
.connect();
DriverPool.push(config.getName(), driver);
DriverPool.push(config.getName() + config.getType(), driver);
return driver;
}

Expand Down