Skip to content

(feat) Add support for Hikari Datasource #570

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

(feat) Add support for Hikari Datasource #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9656405
Add support for Hikari CP
Aug 12, 2025
3dfed29
Downgrade to hikari 4
Aug 12, 2025
4944a45
Merge branch 'master' into rakhi/hikari22
Aug 13, 2025
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
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ project.ext.externalDependency = [
'flywayCore': 'org.flywaydb:flyway-core:7.15.0',
'guava': 'com.google.guava:guava:32.0.0-jre',
'h2': 'com.h2database:h2:1.4.196',
'hikariCP': 'com.zaxxer:HikariCP:4.0.3',
'jacksonCore': 'com.fasterxml.jackson.core:jackson-core:2.17.2',
'jacksonDataBind': 'com.fasterxml.jackson.core:jackson-databind:2.17.2',
'javatuples': 'org.javatuples:javatuples:1.2',
Expand Down
1 change: 1 addition & 0 deletions dao-impl/ebean-dao/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies {
compile externalDependency.guava
compile externalDependency.jsonSimple
compile externalDependency.log4j
compile externalDependency.hikariCP

compileOnly externalDependency.ebeanAgent
compileOnly externalDependency.lombok
Expand Down
23 changes: 17 additions & 6 deletions dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/EbeanLocalAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.linkedin.metadata.query.IndexGroupByCriterion;
import com.linkedin.metadata.query.IndexSortCriterion;
import com.linkedin.metadata.query.ListResultMetadata;
import com.zaxxer.hikari.HikariDataSource;
import io.ebean.EbeanServer;
import io.ebean.SqlQuery;
import io.ebean.SqlRow;
Expand Down Expand Up @@ -623,19 +624,29 @@ private String toJsonString(@Nonnull URN urn) {

@Nonnull
private SchemaEvolutionManager createSchemaEvolutionManager(@Nonnull ServerConfig serverConfig) {

String name = serverConfig.getName();
String identifier = null;

if (name != null && name.endsWith(EBEAN_SERVER_CONFIG)) {
identifier = name.substring(0, name.length() - EBEAN_SERVER_CONFIG.length());
}
String connectionUrl = null;
String username = null;
String password = null;

if (serverConfig.getDataSource() instanceof HikariDataSource) {
HikariDataSource dataSource = (HikariDataSource) serverConfig.getDataSource();
connectionUrl = dataSource.getJdbcUrl();
username = dataSource.getUsername();
password = dataSource.getPassword();
} else if (serverConfig.getDataSourceConfig() != null) {
connectionUrl = serverConfig.getDataSourceConfig().getUrl();
username = serverConfig.getDataSourceConfig().getUsername();
password = serverConfig.getDataSourceConfig().getPassword();
}

SchemaEvolutionManager.Config config = new SchemaEvolutionManager.Config(
serverConfig.getDataSourceConfig().getUrl(),
serverConfig.getDataSourceConfig().getPassword(),
serverConfig.getDataSourceConfig().getUsername(),
identifier);
SchemaEvolutionManager.Config config =
new SchemaEvolutionManager.Config(connectionUrl, password, username, identifier);

return new FlywaySchemaEvolutionManager(config);
}
Expand Down
Loading