Repository: incubator-griffin Updated Branches: refs/heads/master 0e34cc243 -> 384cf5cf8
change default database to h2 Author: ahutsunshine <ahutsunsh...@gmail.com> Closes #309 from ahutsunshine/h2. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/384cf5cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/384cf5cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/384cf5cf Branch: refs/heads/master Commit: 384cf5cf8e5376434d4d5745a5803ac021dd0a14 Parents: 0e34cc2 Author: ahutsunshine <ahutsunsh...@gmail.com> Authored: Sat Jun 16 22:47:46 2018 +0800 Committer: William Guo <gu...@apache.org> Committed: Sat Jun 16 22:47:46 2018 +0800 ---------------------------------------------------------------------- service/src/main/resources/Init_quartz_h2.sql | 266 +++++++++++++++++++ .../main/resources/application-dev.properties | 27 +- .../main/resources/application-prod.properties | 18 +- service/src/main/resources/quartz.properties | 1 + 4 files changed, 295 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/384cf5cf/service/src/main/resources/Init_quartz_h2.sql ---------------------------------------------------------------------- diff --git a/service/src/main/resources/Init_quartz_h2.sql b/service/src/main/resources/Init_quartz_h2.sql new file mode 100644 index 0000000..34e4509 --- /dev/null +++ b/service/src/main/resources/Init_quartz_h2.sql @@ -0,0 +1,266 @@ +-- 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. + +-- +-- Quartz seems to work best with the driver mm.mysql-2.0.7-bin.jar +-- +-- PLEASE consider using mysql with innodb tables to avoid locking issues +-- +-- In your Quartz properties file, you'll need to set +-- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate +-- + + +CREATE TABLE QRTZ_CALENDARS ( + SCHED_NAME VARCHAR(120) NOT NULL, + CALENDAR_NAME VARCHAR (200) NOT NULL , + CALENDAR IMAGE NOT NULL +); + +CREATE TABLE QRTZ_CRON_TRIGGERS ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR (200) NOT NULL , + TRIGGER_GROUP VARCHAR (200) NOT NULL , + CRON_EXPRESSION VARCHAR (120) NOT NULL , + TIME_ZONE_ID VARCHAR (80) +); + +CREATE TABLE QRTZ_FIRED_TRIGGERS ( + SCHED_NAME VARCHAR(120) NOT NULL, + ENTRY_ID VARCHAR (95) NOT NULL , + TRIGGER_NAME VARCHAR (200) NOT NULL , + TRIGGER_GROUP VARCHAR (200) NOT NULL , + INSTANCE_NAME VARCHAR (200) NOT NULL , + FIRED_TIME BIGINT NOT NULL , + SCHED_TIME BIGINT NOT NULL , + PRIORITY INTEGER NOT NULL , + STATE VARCHAR (16) NOT NULL, + JOB_NAME VARCHAR (200) NULL , + JOB_GROUP VARCHAR (200) NULL , + IS_NONCONCURRENT BOOLEAN NULL , + REQUESTS_RECOVERY BOOLEAN NULL +); + +CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_GROUP VARCHAR (200) NOT NULL +); + +CREATE TABLE QRTZ_SCHEDULER_STATE ( + SCHED_NAME VARCHAR(120) NOT NULL, + INSTANCE_NAME VARCHAR (200) NOT NULL , + LAST_CHECKIN_TIME BIGINT NOT NULL , + CHECKIN_INTERVAL BIGINT NOT NULL +); + +CREATE TABLE QRTZ_LOCKS ( + SCHED_NAME VARCHAR(120) NOT NULL, + LOCK_NAME VARCHAR (40) NOT NULL +); + +CREATE TABLE QRTZ_JOB_DETAILS ( + SCHED_NAME VARCHAR(120) NOT NULL, + JOB_NAME VARCHAR (200) NOT NULL , + JOB_GROUP VARCHAR (200) NOT NULL , + DESCRIPTION VARCHAR (250) NULL , + JOB_CLASS_NAME VARCHAR (250) NOT NULL , + IS_DURABLE BOOLEAN NOT NULL , + IS_NONCONCURRENT BOOLEAN NOT NULL , + IS_UPDATE_DATA BOOLEAN NOT NULL , + REQUESTS_RECOVERY BOOLEAN NOT NULL , + JOB_DATA IMAGE NULL +); + +CREATE TABLE QRTZ_SIMPLE_TRIGGERS ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR (200) NOT NULL , + TRIGGER_GROUP VARCHAR (200) NOT NULL , + REPEAT_COUNT BIGINT NOT NULL , + REPEAT_INTERVAL BIGINT NOT NULL , + TIMES_TRIGGERED BIGINT NOT NULL +); + +CREATE TABLE qrtz_simprop_triggers + ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR(200) NOT NULL, + TRIGGER_GROUP VARCHAR(200) NOT NULL, + STR_PROP_1 VARCHAR(512) NULL, + STR_PROP_2 VARCHAR(512) NULL, + STR_PROP_3 VARCHAR(512) NULL, + INT_PROP_1 INTEGER NULL, + INT_PROP_2 INTEGER NULL, + LONG_PROP_1 BIGINT NULL, + LONG_PROP_2 BIGINT NULL, + DEC_PROP_1 NUMERIC(13,4) NULL, + DEC_PROP_2 NUMERIC(13,4) NULL, + BOOL_PROP_1 BOOLEAN NULL, + BOOL_PROP_2 BOOLEAN NULL, +); + +CREATE TABLE QRTZ_BLOB_TRIGGERS ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR (200) NOT NULL , + TRIGGER_GROUP VARCHAR (200) NOT NULL , + BLOB_DATA IMAGE NULL +); + +CREATE TABLE QRTZ_TRIGGERS ( + SCHED_NAME VARCHAR(120) NOT NULL, + TRIGGER_NAME VARCHAR (200) NOT NULL , + TRIGGER_GROUP VARCHAR (200) NOT NULL , + JOB_NAME VARCHAR (200) NOT NULL , + JOB_GROUP VARCHAR (200) NOT NULL , + DESCRIPTION VARCHAR (250) NULL , + NEXT_FIRE_TIME BIGINT NULL , + PREV_FIRE_TIME BIGINT NULL , + PRIORITY INTEGER NULL , + TRIGGER_STATE VARCHAR (16) NOT NULL , + TRIGGER_TYPE VARCHAR (8) NOT NULL , + START_TIME BIGINT NOT NULL , + END_TIME BIGINT NULL , + CALENDAR_NAME VARCHAR (200) NULL , + MISFIRE_INSTR SMALLINT NULL , + JOB_DATA IMAGE NULL +); + +ALTER TABLE QRTZ_CALENDARS ADD + CONSTRAINT PK_QRTZ_CALENDARS PRIMARY KEY + ( + SCHED_NAME, + CALENDAR_NAME + ); + +ALTER TABLE QRTZ_CRON_TRIGGERS ADD + CONSTRAINT PK_QRTZ_CRON_TRIGGERS PRIMARY KEY + ( + SCHED_NAME, + TRIGGER_NAME, + TRIGGER_GROUP + ); + +ALTER TABLE QRTZ_FIRED_TRIGGERS ADD + CONSTRAINT PK_QRTZ_FIRED_TRIGGERS PRIMARY KEY + ( + SCHED_NAME, + ENTRY_ID + ); + +ALTER TABLE QRTZ_PAUSED_TRIGGER_GRPS ADD + CONSTRAINT PK_QRTZ_PAUSED_TRIGGER_GRPS PRIMARY KEY + ( + SCHED_NAME, + TRIGGER_GROUP + ); + +ALTER TABLE QRTZ_SCHEDULER_STATE ADD + CONSTRAINT PK_QRTZ_SCHEDULER_STATE PRIMARY KEY + ( + SCHED_NAME, + INSTANCE_NAME + ); + +ALTER TABLE QRTZ_LOCKS ADD + CONSTRAINT PK_QRTZ_LOCKS PRIMARY KEY + ( + SCHED_NAME, + LOCK_NAME + ); + +ALTER TABLE QRTZ_JOB_DETAILS ADD + CONSTRAINT PK_QRTZ_JOB_DETAILS PRIMARY KEY + ( + SCHED_NAME, + JOB_NAME, + JOB_GROUP + ); + +ALTER TABLE QRTZ_SIMPLE_TRIGGERS ADD + CONSTRAINT PK_QRTZ_SIMPLE_TRIGGERS PRIMARY KEY + ( + SCHED_NAME, + TRIGGER_NAME, + TRIGGER_GROUP + ); + +ALTER TABLE QRTZ_SIMPROP_TRIGGERS ADD + CONSTRAINT PK_QRTZ_SIMPROP_TRIGGERS PRIMARY KEY + ( + SCHED_NAME, + TRIGGER_NAME, + TRIGGER_GROUP + ); + +ALTER TABLE QRTZ_TRIGGERS ADD + CONSTRAINT PK_QRTZ_TRIGGERS PRIMARY KEY + ( + SCHED_NAME, + TRIGGER_NAME, + TRIGGER_GROUP + ); + +ALTER TABLE QRTZ_CRON_TRIGGERS ADD + CONSTRAINT FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS FOREIGN KEY + ( + SCHED_NAME, + TRIGGER_NAME, + TRIGGER_GROUP + ) REFERENCES QRTZ_TRIGGERS ( + SCHED_NAME, + TRIGGER_NAME, + TRIGGER_GROUP + ) ON DELETE CASCADE; + + +ALTER TABLE QRTZ_SIMPLE_TRIGGERS ADD + CONSTRAINT FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS FOREIGN KEY + ( + SCHED_NAME, + TRIGGER_NAME, + TRIGGER_GROUP + ) REFERENCES QRTZ_TRIGGERS ( + SCHED_NAME, + TRIGGER_NAME, + TRIGGER_GROUP + ) ON DELETE CASCADE; + +ALTER TABLE QRTZ_SIMPROP_TRIGGERS ADD + CONSTRAINT FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS FOREIGN KEY + ( + SCHED_NAME, + TRIGGER_NAME, + TRIGGER_GROUP + ) REFERENCES QRTZ_TRIGGERS ( + SCHED_NAME, + TRIGGER_NAME, + TRIGGER_GROUP + ) ON DELETE CASCADE; + + +ALTER TABLE QRTZ_TRIGGERS ADD + CONSTRAINT FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS FOREIGN KEY + ( + SCHED_NAME, + JOB_NAME, + JOB_GROUP + ) REFERENCES QRTZ_JOB_DETAILS ( + SCHED_NAME, + JOB_NAME, + JOB_GROUP + ); + +COMMIT; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/384cf5cf/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 741fe5e..e39cd4e 100644 --- a/service/src/main/resources/application-dev.properties +++ b/service/src/main/resources/application-dev.properties @@ -17,20 +17,18 @@ # under the License. # -spring.datasource.url = jdbc:postgresql://localhost:5432/quartz?autoReconnect=true&useSSL=false +spring.datasource.url = jdbc:h2:mem:quartz;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE spring.datasource.username = griffin spring.datasource.password = 123456 -spring.jpa.generate-ddl=true - -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect -spring.datasource.driverClassName = org.postgresql.Driver +spring.jpa.generate-ddl = true +spring.datasource.driver-class-name = org.h2.Driver +# Create quartz table structure +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 -#spring.jpa.properties.eclipselink.weaving=static -#spring.jpa.properties.persistence-unit-name=eclipselink-example -#spring.jpa.properties.persistence-xml-location=persistence.xml - # Hive metastore hive.metastore.uris = thrift://localhost:9083 hive.metastore.dbname = default @@ -55,6 +53,9 @@ 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 @@ -72,4 +73,10 @@ elasticsearch.host = localhost elasticsearch.port = 9200 elasticsearch.scheme = http # elasticsearch.user = user -# elasticsearch.password = password \ No newline at end of file +# elasticsearch.password = password + +# livy +livy.uri=http://localhost:8998/batches + +# spark-admin +spark.uri=http://localhost:8088 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/384cf5cf/service/src/main/resources/application-prod.properties ---------------------------------------------------------------------- diff --git a/service/src/main/resources/application-prod.properties b/service/src/main/resources/application-prod.properties index 741fe5e..3cf4cb5 100644 --- a/service/src/main/resources/application-prod.properties +++ b/service/src/main/resources/application-prod.properties @@ -22,15 +22,10 @@ spring.datasource.username = griffin spring.datasource.password = 123456 spring.jpa.generate-ddl=true -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect -spring.datasource.driverClassName = org.postgresql.Driver +spring.datasource.driver-class-name = org.postgresql.Driver spring.jpa.show-sql = true -#spring.jpa.properties.eclipselink.weaving=static -#spring.jpa.properties.persistence-unit-name=eclipselink-example -#spring.jpa.properties.persistence-xml-location=persistence.xml - # Hive metastore hive.metastore.uris = thrift://localhost:9083 hive.metastore.dbname = default @@ -55,6 +50,9 @@ 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 @@ -72,4 +70,10 @@ elasticsearch.host = localhost elasticsearch.port = 9200 elasticsearch.scheme = http # elasticsearch.user = user -# elasticsearch.password = password \ No newline at end of file +# elasticsearch.password = password + +# livy +livy.uri=http://localhost:8998/batches + +# spark-admin +spark.uri=http://localhost:8088 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/384cf5cf/service/src/main/resources/quartz.properties ---------------------------------------------------------------------- diff --git a/service/src/main/resources/quartz.properties b/service/src/main/resources/quartz.properties index 503a8bc..49c6b56 100644 --- a/service/src/main/resources/quartz.properties +++ b/service/src/main/resources/quartz.properties @@ -24,6 +24,7 @@ org.quartz.threadPool.threadCount=5 org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX # If you use postgresql as your database,set this property value to org.quartz.impl.jdbcjobstore.PostgreSQLDelegate # If you use mysql as your database,set this property value to org.quartz.impl.jdbcjobstore.StdJDBCDelegate +# If you use h2 as your database, it's ok to set this property value to StdJDBCDelegate, PostgreSQLDelegate or others org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate org.quartz.jobStore.useProperties=true org.quartz.jobStore.misfireThreshold=60000
