You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@submarine.apache.org by zh...@apache.org on 2019/11/21 12:08:59 UTC
[submarine] branch master updated: SUBMARINE-295. Modify mysql database submarineDB to submarine

This is an automated email from the ASF dual-hosted git repository.

zhouquan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git


The following commit(s) were added to refs/heads/master by this push:
     new 64ecfe9  SUBMARINE-295. Modify mysql database submarineDB to submarine
64ecfe9 is described below

commit 64ecfe9ae7227656c964e9e2ab1122a8c00b7759
Author: Xun Liu <li...@apache.org>
AuthorDate: Wed Nov 20 22:48:13 2019 +0800

    SUBMARINE-295. Modify mysql database submarineDB to submarine
    
    ### What is this PR for?
    Because the mysql database name is case sensitive,
    Now submarine has 2 mysql databases. They are `submarineDB` and `submarineDB_test`.
    It is easy to write `DB` as `db` in program development, Causes a program error and is difficult to troubleshoot.
    So modify the `submarineDB` and `submarineDB_test` database to `submarine` and `submarine_test`.
    
    ### What type of PR is it?
    Improvement
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/SUBMARINE-295
    
    ### How should this be tested?
    * [CI Pass](https://travis-ci.org/liuxunorg/submarine/builds/614558566)
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Xun Liu <li...@apache.org>
    
    Closes #95 from liuxunorg/SUBMARINE-295 and squashes the following commits:
    
    549c12a [Xun Liu] SUBMARINE-295. Modify mysql database submarineDB to submarine
---
 .travis.yml                                                |  6 +++---
 dev-support/mini-submarine/conf/setup-mysql.sh             | 12 ++++++------
 docs/database/README.md                                    | 14 +++++++-------
 docs/submarine-sdk/pysubmarine/tracking.md                 |  2 +-
 .../submarine/commons/utils/SubmarineConfiguration.java    |  2 +-
 submarine-sdk/pysubmarine/submarine/store/__init__.py      |  2 +-
 .../pysubmarine/tests/store/test_sqlalchemy_store.py       |  2 +-
 submarine-sdk/pysubmarine/tests/tracking/test_tracking.py  |  2 +-
 .../submarine/server/workbench/database/MyBatisUtil.java   |  2 +-
 .../server-core/src/main/resources/mbgConfiguration.xml    |  2 +-
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6e7daa1..b8bf4fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,10 +48,10 @@ env:
 
 before_install:
   - sudo service mysql restart
-  - mysql -e "create database submarineDB_test;"
+  - mysql -e "create database submarine_test;"
   - mysql -e "CREATE USER 'submarine_test'@'%' IDENTIFIED BY 'password_test';"
-  - mysql -e "GRANT ALL PRIVILEGES ON * . * TO 'submarine_test'@'%';"
-  - mysql -e "use submarineDB_test; source ./docs/database/submarine.sql; show tables;"
+  - mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'submarine_test'@'%';"
+  - mysql -e "use submarine_test; source ./docs/database/submarine.sql; show tables;"
   - ./dev-support/travis/install_external_dependencies.sh
 
 matrix:
diff --git a/dev-support/mini-submarine/conf/setup-mysql.sh b/dev-support/mini-submarine/conf/setup-mysql.sh
index 7156a1c..e9743a4 100755
--- a/dev-support/mini-submarine/conf/setup-mysql.sh
+++ b/dev-support/mini-submarine/conf/setup-mysql.sh
@@ -17,12 +17,12 @@
 # Install mariadb
 apt-get -y install mariadb-server
 service mysql start
-mysql -e "CREATE DATABASE submarineDB_test;"
+mysql -e "CREATE DATABASE submarine_test;"
 mysql -e "CREATE USER 'submarine_test'@'%' IDENTIFIED BY 'password_test';"
-mysql -e "GRANT ALL PRIVILEGES ON * . * TO 'submarine_test'@'%';"
-mysql -e "use submarineDB_test; source /home/yarn/database/submarine.sql; source /home/yarn/database/submarine-data.sql;"
+mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'submarine_test'@'%';"
+mysql -e "use submarine_test; source /home/yarn/database/submarine.sql; source /home/yarn/database/submarine-data.sql;"
 
-mysql -e "CREATE DATABASE submarineDB;"
+mysql -e "CREATE DATABASE submarine;"
 mysql -e "CREATE USER 'submarine'@'%' IDENTIFIED BY 'password';"
-mysql -e "GRANT ALL PRIVILEGES ON * . * TO 'submarine'@'%';"
-mysql -e "use submarineDB; source /home/yarn/database/submarine.sql; source /home/yarn/database/submarine-data.sql;"
+mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'submarine'@'%';"
+mysql -e "use submarine; source /home/yarn/database/submarine.sql; source /home/yarn/database/submarine-data.sql;"
diff --git a/docs/database/README.md b/docs/database/README.md
index 0c95562..6f2ad5e 100644
--- a/docs/database/README.md
+++ b/docs/database/README.md
@@ -93,14 +93,14 @@ Development database for development environment.
 bash > mysql -uroot -ppassword
 mysql> CREATE USER 'submarine'@'%' IDENTIFIED BY 'password';
 mysql> GRANT ALL PRIVILEGES ON * . * TO 'submarine'@'%';
-mysql> CREATE DATABASE submarineDB CHARACTER SET utf8 COLLATE utf8_general_ci;
-mysql> use submarineDB;
+mysql> CREATE DATABASE submarine CHARACTER SET utf8 COLLATE utf8_general_ci;
+mysql> use submarine;
 mysql> source /submarine.sql;
 mysql> source /submarine-data.sql;
 mysql> quit
 ```
 
->  NOTE: submarine development database name is  `submarineDB` and user name is `submarine`, password is `password`, This is the default value in the system's `submarine-site.xml` configuration file and is not recommended for modification.
+>  NOTE: submarine development database name is  `submarine` and user name is `submarine`, password is `password`, This is the default value in the system's `submarine-site.xml` configuration file and is not recommended for modification.
 
 
 ### Create test database
@@ -112,18 +112,18 @@ Test database for program unit testing and Travis test environment.
 bash > mysql -uroot -ppassword
 mysql> CREATE USER 'submarine_test'@'%' IDENTIFIED BY 'password_test';
 mysql> GRANT ALL PRIVILEGES ON * . * TO 'submarine_test'@'%';
-mysql> CREATE DATABASE `submarineDB_test` CHARACTER SET utf8 COLLATE utf8_general_ci;
-mysql> use `submarineDB_test`;
+mysql> CREATE DATABASE `submarine_test` CHARACTER SET utf8 COLLATE utf8_general_ci;
+mysql> use `submarine_test`;
 mysql> source /submarine.sql;
 mysql> quit
 ```
 
->  NOTE: submarine test database name is  `submarineDB_test` and user name is `submarine_test`, password is `password_test`, Cannot be configured, values that cannot be modified.
+>  NOTE: submarine test database name is  `submarine_test` and user name is `submarine_test`, password is `password_test`, Cannot be configured, values that cannot be modified.
 
 ### mysqldump
 
 ```$xslt
-mysqldump -uroot -ppassword --databases submarineDB > submarineDB.sql;
+mysqldump -uroot -ppassword --databases submarine > submarine.sql;
 ```
 
 
diff --git a/docs/submarine-sdk/pysubmarine/tracking.md b/docs/submarine-sdk/pysubmarine/tracking.md
index 056e0ef..09a5773 100644
--- a/docs/submarine-sdk/pysubmarine/tracking.md
+++ b/docs/submarine-sdk/pysubmarine/tracking.md
@@ -45,7 +45,7 @@ there. The URI should be database connection string.
 
 - URI - Submarine record data to Mysql server. The database URL
 is expected in the format ``<dialect>+<driver>://<username>:<password>@<host>:<port>/<database>``.
-By default it's `mysql+pymysql://submarine:password@localhost:3306/submarineDB`.
+By default it's `mysql+pymysql://submarine:password@localhost:3306/submarine`.
 More detail : [SQLAlchemy docs](https://docs.sqlalchemy.org/en/latest/core/engines.html#database-urls)
 
 <!--
diff --git a/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfiguration.java b/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfiguration.java
index 6a0944b..dc19752 100644
--- a/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfiguration.java
+++ b/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfiguration.java
@@ -433,7 +433,7 @@ public class SubmarineConfiguration extends XMLConfiguration {
     CLUSTER_HEARTBEAT_INTERVAL("cluster.heartbeat.interval", 3000),
     CLUSTER_HEARTBEAT_TIMEOUT("cluster.heartbeat.timeout", 9000),
     JDBC_DRIVERCLASSNAME("jdbc.driverClassName", "com.mysql.jdbc.Driver"),
-    JDBC_URL("jdbc.url", "jdbc:mysql://127.0.0.1:3306/submarineDB" +
+    JDBC_URL("jdbc.url", "jdbc:mysql://127.0.0.1:3306/submarine" +
         "?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;" +
         "failOverReadOnly=false&amp;zeroDateTimeBehavior=convertToNull&amp;useSSL=false"),
     JDBC_USERNAME("jdbc.username", "submarine"),
diff --git a/submarine-sdk/pysubmarine/submarine/store/__init__.py b/submarine-sdk/pysubmarine/submarine/store/__init__.py
index a8362d7..60412a9 100644
--- a/submarine-sdk/pysubmarine/submarine/store/__init__.py
+++ b/submarine-sdk/pysubmarine/submarine/store/__init__.py
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEFAULT_SUBMARINE_JDBC_URL = "mysql+pymysql://submarine:password@localhost:3306/submarineDB"
+DEFAULT_SUBMARINE_JDBC_URL = "mysql+pymysql://submarine:password@localhost:3306/submarine"
 
 __all__ = ["DEFAULT_SUBMARINE_JDBC_URL"]
diff --git a/submarine-sdk/pysubmarine/tests/store/test_sqlalchemy_store.py b/submarine-sdk/pysubmarine/tests/store/test_sqlalchemy_store.py
index 6798986..f2d3263 100644
--- a/submarine-sdk/pysubmarine/tests/store/test_sqlalchemy_store.py
+++ b/submarine-sdk/pysubmarine/tests/store/test_sqlalchemy_store.py
@@ -29,7 +29,7 @@ JOB_NAME = "application_123456789"
 class TestSqlAlchemyStore(unittest.TestCase):
     def setUp(self):
         submarine.set_tracking_uri(
-            "mysql+pymysql://submarine_test:password_test@localhost:3306/submarineDB_test")
+            "mysql+pymysql://submarine_test:password_test@localhost:3306/submarine_test")
         self.tracking_uri = utils.get_tracking_uri()
         self.store = utils.get_sqlalchemy_store(self.tracking_uri)
 
diff --git a/submarine-sdk/pysubmarine/tests/tracking/test_tracking.py b/submarine-sdk/pysubmarine/tests/tracking/test_tracking.py
index 6695282..20efbca 100644
--- a/submarine-sdk/pysubmarine/tests/tracking/test_tracking.py
+++ b/submarine-sdk/pysubmarine/tests/tracking/test_tracking.py
@@ -28,7 +28,7 @@ class TestTracking(unittest.TestCase):
     def setUp(self):
         environ["SUBMARINE_JOB_NAME"] = JOB_NAME
         submarine.set_tracking_uri(
-            "mysql+pymysql://submarine_test:password_test@localhost:3306/submarineDB_test")
+            "mysql+pymysql://submarine_test:password_test@localhost:3306/submarine_test")
         self.tracking_uri = utils.get_tracking_uri()
         self.store = utils.get_sqlalchemy_store(self.tracking_uri)
 
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/MyBatisUtil.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/MyBatisUtil.java
index dd9a935..733159c 100755
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/MyBatisUtil.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/MyBatisUtil.java
@@ -96,7 +96,7 @@ public class MyBatisUtil {
     LOG.info("Run the test unit using the test database");
     // Run the test unit using the test database
     SubmarineConfiguration conf = SubmarineConfiguration.getInstance();
-    conf.setJdbcUrl("jdbc:mysql://127.0.0.1:3306/submarineDB_test?" +
+    conf.setJdbcUrl("jdbc:mysql://127.0.0.1:3306/submarine_test?" +
         "useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;" +
         "failOverReadOnly=false&amp;zeroDateTimeBehavior=convertToNull&amp;useSSL=false");
     conf.setJdbcUserName("submarine_test");
diff --git a/submarine-server/server-core/src/main/resources/mbgConfiguration.xml b/submarine-server/server-core/src/main/resources/mbgConfiguration.xml
index d7610a8..888d6fe 100644
--- a/submarine-server/server-core/src/main/resources/mbgConfiguration.xml
+++ b/submarine-server/server-core/src/main/resources/mbgConfiguration.xml
@@ -28,7 +28,7 @@
     </commentGenerator>
 
     <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                    connectionURL="jdbc:mysql://127.0.0.1:3306/submarineDB"
+                    connectionURL="jdbc:mysql://127.0.0.1:3306/submarine"
                     userId="submarine"
                     password="password">
     </jdbcConnection>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@submarine.apache.org
For additional commands, e-mail: dev-help@submarine.apache.org