Skip to content
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

[#2349] improved(scripts): Add scripts directory for jdbc backend ddl scripts #2584

Merged
merged 8 commits into from
Apr 3, 2024
+22 −16
Merged

[#2349] improved(scripts): Add scripts directory for jdbc backend ddl scripts #2584

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b7fba6
split mysql scripts
Mar 27, 2024
fc728f2
Merge branch 'main' into issue-2349
Mar 27, 2024
3c9611c
Merge branch 'main' into issue-2349
Apr 1, 2024
c023a39
Merge branch 'main' into issue-2349
Apr 2, 2024
2d2c956
fix comments
Apr 2, 2024
199b2fe
fix
Apr 2, 2024
ca33c9d
fix the doc
Apr 2, 2024
8ac23e5
Merge branch 'main' into issue-2349
yuqi1129 Apr 3, 2024
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.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,7 @@ tasks {
from(projectDir.dir("conf")) { into("package/conf") }
from(projectDir.dir("bin")) { into("package/bin") }
from(projectDir.dir("web/build/libs/${rootProject.name}-web-$version.war")) { into("package/web") }
from(projectDir.dir("scripts")) { into("package/scripts") }
into(outputDir)
rename { fileName ->
fileName.replace(".template", "")
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/com/datastrato/gravitino/storage/TestEntityStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private void init(String type, Config config) {

private void prepareJdbcTable() {
// Read the ddl sql to create table
String scriptPath = "h2/h2-init.sql";
String scriptPath = "relational-entity-store/jdbc/h2/schema-0.5.0-h2.sql";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the meaning of 0.5.0?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This refers to the next release version. We may add some ddl statements to the new version in the future. Users can execute initialization statements according to the access version. Referring to the implementation in Hive Metastore:
image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it.

try (SqlSession sqlSession =
SqlSessionFactoryHelper.getInstance().getSqlSessionFactory().openSession(true);
Connection connection = sqlSession.getConnection();
Expand Down
0 core/src/test/resources/h2/h2-init.sql → ...-entity-store/jdbc/h2/schema-0.5.0-h2.sql
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/gravitino-server-config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ You can also specify filter parameters by setting configuration entries of the f
| `gravitino.entity.store.maxTransactionSkewTimeMs` | The maximum skew time of transactions in milliseconds. | `2000` | No | 0.3.0 |
| `gravitino.entity.store.kv.deleteAfterTimeMs` | The maximum time in milliseconds that deleted and old-version data is kept. Set to at least 10 minutes and no longer than 30 days. | `604800000`(7 days) | No | 0.3.0 |
| `gravitino.entity.store.relational` | Detailed implementation of Relational storage. `MySQL` is currently supported, and the implementation is `JDBCBackend`. | `JDBCBackend` | No | 0.5.0 |
| `gravitino.entity.store.relational.jdbcUrl` | The database url that the `JDBCBackend` needs to connect to. If you use `MySQL`, you should firstly initialize the database tables yourself by executing the file named `mysql_init.sql` in the `src/main/resources/mysql` directory of the `core` module. | (none) | Yes if you use `JdbcBackend` | 0.5.0 |
| `gravitino.entity.store.relational.jdbcUrl` | The database url that the `JDBCBackend` needs to connect to. If you use `MySQL`, you should firstly initialize the database tables yourself by executing the ddl scripts in the `${GRAVITINO_HOME}/scripts/relational-entity-store/jdbc/mysql` directory. | (none) | Yes if you use `JdbcBackend` | 0.5.0 |
| `gravitino.entity.store.relational.jdbcDriver` | The jdbc driver name that the `JDBCBackend` needs to use. You should place the driver Jar package in the `${GRAVITINO_HOME}/libs/` directory. | (none) | Yes if you use `JdbcBackend` | 0.5.0 |
| `gravitino.entity.store.relational.jdbcUser` | The username that the `JDBCBackend` needs to use when connecting the database. It is required for `MySQL`. | (none) | Yes if you use `JdbcBackend` | 0.5.0 |
| `gravitino.entity.store.relational.jdbcPassword` | The password that the `JDBCBackend` needs to use when connecting the database. It is required for `MySQL`. | (none) | Yes if you use `JdbcBackend` | 0.5.0 |
Expand Down
0 core/src/main/resources/mysql/mysql_init.sql → ...y-store/jdbc/mysql/schema-0.5.0-mysql.sql
View file
Open in desktop
File renamed without changes.
Loading