Repository: griffin Updated Branches: refs/heads/master 80f18bd17 -> f2292ac74
Mysql as storage profile Author: William Guo <[email protected]> Closes #472 from guoyuepeng/mysql_as_storage_profile. Project: http://git-wip-us.apache.org/repos/asf/griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/griffin/commit/f2292ac7 Tree: http://git-wip-us.apache.org/repos/asf/griffin/tree/f2292ac7 Diff: http://git-wip-us.apache.org/repos/asf/griffin/diff/f2292ac7 Branch: refs/heads/master Commit: f2292ac74f259d81047fe9e69def5e7f5a634b9d Parents: 80f18bd Author: William Guo <[email protected]> Authored: Wed Dec 19 13:01:57 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Wed Dec 19 13:01:57 2018 +0800 ---------------------------------------------------------------------- service/pom.xml | 53 +++++++++++++++----- .../main/resources/application-dev.properties | 40 --------------- .../main/resources/application-mysql.properties | 27 ++++++++++ service/src/main/resources/banner.txt | 2 +- 4 files changed, 68 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/griffin/blob/f2292ac7/service/pom.xml ---------------------------------------------------------------------- diff --git a/service/pom.xml b/service/pom.xml index 325ae71..5a30833 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -46,6 +46,8 @@ under the License. <spring-boot-maven-plugin.version>1.5.1.RELEASE</spring-boot-maven-plugin.version> <derby.version>10.14.1.0</derby.version> <eclipselink.version>2.6.0</eclipselink.version> + <mysql.java.version>5.1.47</mysql.java.version> + <postgresql.version>9.4.1212.jre7</postgresql.version> </properties> <repositories> @@ -103,20 +105,23 @@ under the License. <artifactId>org.eclipse.persistence.jpa</artifactId> <version>${eclipselink.version}</version> </dependency> - <dependency> - <groupId>org.springframework.retry</groupId> - <artifactId>spring-retry</artifactId> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${postgresql.version}</version> </dependency> - - <!--prod db--> <!--<dependency>--> - <!--<groupId>mysql</groupId>--> - <!--<artifactId>mysql-connector-java</artifactId>--> + <!--<groupId>mysql</groupId>--> + <!--<artifactId>mysql-connector-java</artifactId>--> + <!--<version>${mysql.java.version}</version>--> <!--</dependency>--> <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.retry</groupId> + <artifactId>spring-retry</artifactId> </dependency> <dependency> @@ -218,16 +223,38 @@ under the License. </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> <groupId>org.elasticsearch.client</groupId> <artifactId>elasticsearch-rest-client</artifactId> <version>6.2.4</version> </dependency> </dependencies> <profiles> + <!--if you need mysql, please uncomment mysql-connector-java --> + <!--<profile>--> + <!--<id>mysql</id>--> + <!--<activation>--> + <!--<property>--> + <!--<name>mysql</name>--> + <!--</property>--> + <!--</activation>--> + <!--</profile>--> + <profile> + <id>dev</id> + <activation> + <property> + <name>dev</name> + </property> + </activation> + </profile> + <profile> + <id>postgresql</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>prod</name> + </property> + </activation> + </profile> </profiles> <build> <plugins> http://git-wip-us.apache.org/repos/asf/griffin/blob/f2292ac7/service/src/main/resources/application-dev.properties ---------------------------------------------------------------------- diff --git a/service/src/main/resources/application-dev.properties b/service/src/main/resources/application-dev.properties index 02512bb..544dbb4 100644 --- a/service/src/main/resources/application-dev.properties +++ b/service/src/main/resources/application-dev.properties @@ -26,43 +26,3 @@ spring.datasource.schema=classpath:init_quartz_h2.sql # enable h2 console, default path: http://localhost:8080/h2-console/ spring.h2.console.enabled=true spring.jpa.show-sql=true -# Hive metastore -hive.metastore.uris=thrift://localhost:9083 -hive.metastore.dbname=default -hive.hmshandler.retry.attempts=15 -hive.hmshandler.retry.interval=2000ms -# Hive cache time -cache.evict.hive.fixedRate.in.milliseconds=900000 -# Kafka schema registry -kafka.schema.registry.url=http://localhost:8081 -# Update job instance state at regular intervals -jobInstance.fixedDelay.in.milliseconds=60000 -# Expired time of job instance which is 7 days that is 604800000 milliseconds.Time unit only supports milliseconds -jobInstance.expired.milliseconds=604800000 -# schedule predicate job every 5 minutes and repeat 12 times at most -#interval time unit s:second m:minute h:hour d:day,only support these four units -predicate.job.interval=5m -predicate.job.repeat.count=12 -# external properties directory location -external.config.location= -# external BATCH or STREAMING env -external.env.location= -# login strategy ("default" or "ldap") -login.strategy=default -# ldap -ldap.url=ldap://hostname:port [email protected] -ldap.searchBase=DC=org,DC=example -ldap.searchPattern=(sAMAccountName={0}) -# hdfs default name -fs.defaultFS= -# elasticsearch -elasticsearch.host=localhost -elasticsearch.port=9200 -elasticsearch.scheme=http -# elasticsearch.user = user -# elasticsearch.password = password -# livy -livy.uri=http://localhost:8998/batches -# yarn url -yarn.uri=http://localhost:8088 http://git-wip-us.apache.org/repos/asf/griffin/blob/f2292ac7/service/src/main/resources/application-mysql.properties ---------------------------------------------------------------------- diff --git a/service/src/main/resources/application-mysql.properties b/service/src/main/resources/application-mysql.properties new file mode 100644 index 0000000..0b124ef --- /dev/null +++ b/service/src/main/resources/application-mysql.properties @@ -0,0 +1,27 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +#Data Access Properties +spring.datasource.url=jdbc:mysql://localhost:3306/quartz?autoReconnect=true&useSSL=false +spring.datasource.username=griffin +spring.datasource.password=123456 +spring.jpa.generate-ddl=true +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.jpa.show-sql=true +spring.jpa.hibernate.ddl-auto=update http://git-wip-us.apache.org/repos/asf/griffin/blob/f2292ac7/service/src/main/resources/banner.txt ---------------------------------------------------------------------- diff --git a/service/src/main/resources/banner.txt b/service/src/main/resources/banner.txt index 1546074..a29770f 100644 --- a/service/src/main/resources/banner.txt +++ b/service/src/main/resources/banner.txt @@ -2,4 +2,4 @@ _________________ _________________________________________ __ __ ____/___ __ \____ _/___ ____/___ ____/____ _/___ | / / _ / __ __ /_/ / __ / __ /_ __ /_ __ / __ |/ / / /_/ / _ _, _/ __/ / _ __/ _ __/ __/ / _ /| / -\____/ /_/ |_| /___/ /_/ /_/ /___/ /_/ |_/ version: 0.3.0 +\____/ /_/ |_| /___/ /_/ /_/ /___/ /_/ |_/ version: 0.4.0
