From d5509d2444af14620994108c904e791ff4ba7b8f Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Sat, 14 Aug 2021 08:53:16 +0200 Subject: [PATCH] Remove SQLFire support Resolves #3839 --- .../src/main/resources/batch-sqlf.properties | 19 ---- .../batch/core/schema-drop-sqlf.sql | 13 --- .../batch/core/schema-sqlf.sql | 82 -------------- .../src/main/resources/batch-sqlf.properties | 25 ----- .../main/resources/business-schema-sqlf.sql | 102 ------------------ 5 files changed, 241 deletions(-) delete mode 100644 spring-batch-core/src/main/resources/batch-sqlf.properties delete mode 100644 spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlf.sql delete mode 100644 spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlf.sql delete mode 100644 spring-batch-samples/src/main/resources/batch-sqlf.properties delete mode 100644 spring-batch-samples/src/main/resources/business-schema-sqlf.sql diff --git a/spring-batch-core/src/main/resources/batch-sqlf.properties b/spring-batch-core/src/main/resources/batch-sqlf.properties deleted file mode 100644 index 4f577e512..000000000 --- a/spring-batch-core/src/main/resources/batch-sqlf.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Placeholders batch.* -# for SQLFire: -# As of v4.3, SQLFire support is deprecated and scheduled for removal in v5.0 - -batch.jdbc.driver=com.vmware.sqlfire.jdbc.ClientDriver -batch.jdbc.url=jdbc:sqlfire://localhost:1257/;update=true -batch.jdbc.user=SAMPLES -batch.jdbc.password=SAMPLES -batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.DerbyMaxValueIncrementer -batch.schema.script=classpath:/org/springframework/batch/core/schema-sqlf.sql -batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-sqlf.sql -batch.jdbc.testWhileIdle=false -batch.jdbc.validationQuery= - - -# Non-platform dependent settings that you might like to change -batch.data.source.init=true -batch.table.prefix=BATCH_ - diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlf.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlf.sql deleted file mode 100644 index 5b39eacf8..000000000 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-sqlf.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Autogenerated: do not edit this file --- As of v4.3, SQLFire support is deprecated and scheduled for removal in v5.0 - -DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT ; -DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT ; -DROP TABLE IF EXISTS BATCH_STEP_EXECUTION ; -DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_PARAMS ; -DROP TABLE IF EXISTS BATCH_JOB_EXECUTION ; -DROP TABLE IF EXISTS BATCH_JOB_INSTANCE ; - -DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ ; -DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ ; -DROP TABLE IF EXISTS BATCH_JOB_SEQ ; diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlf.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlf.sql deleted file mode 100644 index 3ed2b996c..000000000 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlf.sql +++ /dev/null @@ -1,82 +0,0 @@ --- Autogenerated: do not edit this file --- As of v4.3, SQLFire support is deprecated and scheduled for removal in v5.0 - -CREATE TABLE BATCH_JOB_INSTANCE ( - JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, - VERSION BIGINT , - JOB_NAME VARCHAR(100) NOT NULL, - JOB_KEY VARCHAR(32) NOT NULL, - constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) -) ; - -CREATE TABLE BATCH_JOB_EXECUTION ( - JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, - VERSION BIGINT , - JOB_INSTANCE_ID BIGINT NOT NULL, - CREATE_TIME TIMESTAMP NOT NULL, - START_TIME TIMESTAMP DEFAULT NULL , - END_TIME TIMESTAMP DEFAULT NULL , - STATUS VARCHAR(10) , - EXIT_CODE VARCHAR(2500) , - EXIT_MESSAGE VARCHAR(2500) , - LAST_UPDATED TIMESTAMP, - JOB_CONFIGURATION_LOCATION VARCHAR(2500) NULL, - constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) - references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) -) ; - -CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( - JOB_EXECUTION_ID BIGINT NOT NULL , - TYPE_CD VARCHAR(6) NOT NULL , - KEY_NAME VARCHAR(100) NOT NULL , - STRING_VAL VARCHAR(250) , - DATE_VAL TIMESTAMP DEFAULT NULL , - LONG_VAL BIGINT , - DOUBLE_VAL DOUBLE PRECISION , - IDENTIFYING CHAR(1) NOT NULL , - constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) - references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) -) ; - -CREATE TABLE BATCH_STEP_EXECUTION ( - STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, - VERSION BIGINT NOT NULL, - STEP_NAME VARCHAR(100) NOT NULL, - JOB_EXECUTION_ID BIGINT NOT NULL, - START_TIME TIMESTAMP NOT NULL , - END_TIME TIMESTAMP DEFAULT NULL , - STATUS VARCHAR(10) , - COMMIT_COUNT BIGINT , - READ_COUNT BIGINT , - FILTER_COUNT BIGINT , - WRITE_COUNT BIGINT , - READ_SKIP_COUNT BIGINT , - WRITE_SKIP_COUNT BIGINT , - PROCESS_SKIP_COUNT BIGINT , - ROLLBACK_COUNT BIGINT , - EXIT_CODE VARCHAR(2500) , - EXIT_MESSAGE VARCHAR(2500) , - LAST_UPDATED TIMESTAMP, - constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) - references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) -) ; - -CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( - STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, - SHORT_CONTEXT VARCHAR(2500) NOT NULL, - SERIALIZED_CONTEXT CLOB , - constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID) - references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID) -) ; - -CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT ( - JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, - SHORT_CONTEXT VARCHAR(2500) NOT NULL, - SERIALIZED_CONTEXT CLOB , - constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID) - references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) -) ; - -CREATE TABLE BATCH_STEP_EXECUTION_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1)); -CREATE TABLE BATCH_JOB_EXECUTION_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1)); -CREATE TABLE BATCH_JOB_SEQ (ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1)); diff --git a/spring-batch-samples/src/main/resources/batch-sqlf.properties b/spring-batch-samples/src/main/resources/batch-sqlf.properties deleted file mode 100644 index 9ec5fc1bc..000000000 --- a/spring-batch-samples/src/main/resources/batch-sqlf.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Placeholders batch.* -# for SQLFire: -# As of v4.3, SQLFire support is deprecated and scheduled for removal in v5.0 - -batch.jdbc.driver=com.vmware.sqlfire.jdbc.ClientDriver -batch.jdbc.url=jdbc:sqlfire://localhost:1257/;update=true -batch.jdbc.user=SAMPLES -batch.jdbc.password=SAMPLES -batch.jdbc.testWhileIdle=false -batch.jdbc.validationQuery= -batch.jdbc.verifyCursorPosition=false -batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-sqlf.sql -batch.schema.script=classpath:/org/springframework/batch/core/schema-sqlf.sql -batch.business.schema.script=business-schema-sqlf.sql -batch.data.source.init=true -batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.DerbyMaxValueIncrementer -batch.database.incrementer.parent=columnIncrementerParent -batch.lob.handler.class=org.springframework.jdbc.support.lob.DefaultLobHandler -batch.grid.size=2 -batch.jdbc.pool.size=6 -batch.verify.cursor.position=false -#add this for your jobRepository bean p:isolationLevelForCreate = "${batch.isolationlevel}" -#see simple-job-launcher-context.xml for example -batch.isolationlevel=ISOLATION_READ_COMMITTED -batch.table.prefix=BATCH_ diff --git a/spring-batch-samples/src/main/resources/business-schema-sqlf.sql b/spring-batch-samples/src/main/resources/business-schema-sqlf.sql deleted file mode 100644 index 7578d0147..000000000 --- a/spring-batch-samples/src/main/resources/business-schema-sqlf.sql +++ /dev/null @@ -1,102 +0,0 @@ --- Autogenerated: do not edit this file --- You might need to remove this section the first time you run against a clean database --- As of v4.3, SQLFire support is deprecated and scheduled for removal in v5.0 - -DROP TABLE IF EXISTS BATCH_STAGING_SEQ ; -DROP TABLE IF EXISTS TRADE_SEQ ; -DROP TABLE IF EXISTS CUSTOMER_SEQ ; -DROP TABLE IF EXISTS BATCH_STAGING ; -DROP TABLE IF EXISTS TRADE ; -DROP TABLE IF EXISTS CUSTOMER ; -DROP TABLE IF EXISTS PLAYERS ; -DROP TABLE IF EXISTS GAMES ; -DROP TABLE IF EXISTS PLAYER_SUMMARY ; -DROP TABLE IF EXISTS ERROR_LOG ; - --- Autogenerated: do not edit this file - -CREATE TABLE CUSTOMER_SEQ (ID BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY (start with 5), DUMMY VARCHAR(1)); -CREATE TABLE BATCH_STAGING_SEQ (ID BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY (start with 0), DUMMY VARCHAR(1)); -CREATE TABLE TRADE_SEQ (ID BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY (start with 0), DUMMY VARCHAR(1)); - -CREATE TABLE BATCH_STAGING ( - ID BIGINT NOT NULL PRIMARY KEY, - JOB_ID BIGINT NOT NULL, - VALUE BLOB NOT NULL, - PROCESSED CHAR(1) NOT NULL -) ; - -CREATE TABLE TRADE ( - ID BIGINT NOT NULL PRIMARY KEY, - VERSION BIGINT , - ISIN VARCHAR(45) NOT NULL, - QUANTITY BIGINT , - PRICE DECIMAL(8,2) , - CUSTOMER VARCHAR(45) -) ; - -CREATE TABLE CUSTOMER ( - ID BIGINT NOT NULL PRIMARY KEY, - VERSION BIGINT , - NAME VARCHAR(45) , - CREDIT DECIMAL(10,2) -) ; - - -INSERT INTO CUSTOMER (ID, VERSION, NAME, CREDIT) VALUES (1, 0, 'customer1', 100000); -INSERT INTO CUSTOMER (ID, VERSION, NAME, CREDIT) VALUES (2, 0, 'customer2', 100000); -INSERT INTO CUSTOMER (ID, VERSION, NAME, CREDIT) VALUES (3, 0, 'customer3', 100000); -INSERT INTO CUSTOMER (ID, VERSION, NAME, CREDIT) VALUES (4, 0, 'customer4', 100000); - ---INSERT INTO CUSTOMER (VERSION, NAME, CREDIT) VALUES (0, 'customer1', 100000); ---INSERT INTO CUSTOMER (VERSION, NAME, CREDIT) VALUES (0, 'customer2', 100000); ---INSERT INTO CUSTOMER (VERSION, NAME, CREDIT) VALUES (0, 'customer3', 100000); ---INSERT INTO CUSTOMER (VERSION, NAME, CREDIT) VALUES (0, 'customer4', 100000); - -CREATE TABLE PLAYERS ( - PLAYER_ID CHAR(8) NOT NULL PRIMARY KEY, - LAST_NAME VARCHAR(35) NOT NULL, - FIRST_NAME VARCHAR(25) NOT NULL, - POS VARCHAR(10) , - YEAR_OF_BIRTH BIGINT NOT NULL, - YEAR_DRAFTED BIGINT NOT NULL -) ; - -CREATE TABLE GAMES ( - PLAYER_ID CHAR(8) NOT NULL, - YEAR_NO BIGINT NOT NULL, - TEAM CHAR(3) NOT NULL, - WEEK BIGINT NOT NULL, - OPPONENT CHAR(3) , - COMPLETES BIGINT , - ATTEMPTS BIGINT , - PASSING_YARDS BIGINT , - PASSING_TD BIGINT , - INTERCEPTIONS BIGINT , - RUSHES BIGINT , - RUSH_YARDS BIGINT , - RECEPTIONS BIGINT , - RECEPTIONS_YARDS BIGINT , - TOTAL_TD BIGINT -) ; - -CREATE TABLE PLAYER_SUMMARY ( - ID CHAR(8) NOT NULL, - YEAR_NO BIGINT NOT NULL, - COMPLETES BIGINT NOT NULL , - ATTEMPTS BIGINT NOT NULL , - PASSING_YARDS BIGINT NOT NULL , - PASSING_TD BIGINT NOT NULL , - INTERCEPTIONS BIGINT NOT NULL , - RUSHES BIGINT NOT NULL , - RUSH_YARDS BIGINT NOT NULL , - RECEPTIONS BIGINT NOT NULL , - RECEPTIONS_YARDS BIGINT NOT NULL , - TOTAL_TD BIGINT NOT NULL -) ; - -CREATE TABLE ERROR_LOG ( - JOB_NAME CHAR(20) , - STEP_NAME CHAR(20) , - MESSAGE VARCHAR(300) NOT NULL -) ;