Skip to content

Commit 508fff4

Browse files
breglerjbreglerj
committed
BATCH-2515: Integrate SAP Hana as supported Spring Batch database
This commit adds SAP HANA as a supported Spring Batch database, enabling developers to seamlessly move their existing Spring Batch projects to SAP HANA or easily starting new Spring Batch projects on SAP HANA. This commit contains the following changes: - Add SAP HANA to the DatabaseType enum - Add HanaPagingQueryProvider and tests - Add properties files for SAP HANA
1 parent 743da96 commit 508fff4

File tree

20 files changed

+547
-4
lines changed

20 files changed

+547
-4
lines changed

‎spring-batch-core/src/main/resources/batch-hana.properties

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Placeholders batch.*
2+
# for SAP HANA:
3+
batch.jdbc.driver=com.sap.db.jdbc.Driver
4+
batch.jdbc.url=jdbc:sap://localhost:39015/
5+
batch.jdbc.user=SPRING_TEST
6+
batch.jdbc.password=Spr1ng_test
7+
batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.HanaSequenceMaxValueIncrementer
8+
batch.schema.script=classpath:/org/springframework/batch/core/schema-hana.sql
9+
batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-hana.sql
10+
batch.jdbc.testWhileIdle=true
11+
batch.jdbc.validationQuery=
12+
13+
14+
# Non-platform dependent settings that you might like to change
15+
batch.data.source.init=true
16+
batch.table.prefix=BATCH_
17+

‎spring-batch-core/src/main/resources/org/springframework/batch/core/migration/migration-hana.sql

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
-- create the requisite table
3+
4+
CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
5+
JOB_EXECUTION_ID BIGINT NOT NULL ,
6+
TYPE_CD VARCHAR(6) NOT NULL ,
7+
KEY_NAME VARCHAR(100) NOT NULL ,
8+
STRING_VAL VARCHAR(250) ,
9+
DATE_VAL TIMESTAMP DEFAULT NULL ,
10+
LONG_VAL BIGINT ,
11+
DOUBLE_VAL DOUBLE ,
12+
IDENTIFYING VARCHAR(1) NOT NULL ,
13+
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
14+
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
15+
);
16+
17+
-- insert script that 'copies' existing batch_job_params to batch_job_execution_params
18+
-- sets new params to identifying ones
19+
-- verified on h2,
20+
21+
INSERT INTO BATCH_JOB_EXECUTION_PARAMS
22+
( JOB_EXECUTION_ID , TYPE_CD, KEY_NAME, STRING_VAL, DATE_VAL, LONG_VAL, DOUBLE_VAL, IDENTIFYING )
23+
SELECT
24+
JE.JOB_EXECUTION_ID , JP.TYPE_CD , JP.KEY_NAME , JP.STRING_VAL , JP.DATE_VAL , JP.LONG_VAL , JP.DOUBLE_VAL , 'Y'
25+
FROM
26+
BATCH_JOB_PARAMS JP,BATCH_JOB_EXECUTION JE
27+
WHERE
28+
JP.JOB_INSTANCE_ID = JE.JOB_INSTANCE_ID;

‎spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-hana.sql

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
-- Autogenerated: do not edit this file
2+
DROP TABLE BATCH_STEP_EXECUTION_CONTEXT ;
3+
DROP TABLE BATCH_JOB_EXECUTION_CONTEXT ;
4+
DROP TABLE BATCH_JOB_EXECUTION_PARAMS ;
5+
DROP TABLE BATCH_STEP_EXECUTION ;
6+
DROP TABLE BATCH_JOB_EXECUTION ;
7+
DROP TABLE BATCH_JOB_INSTANCE ;
8+
9+
DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ ;
10+
DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ ;
11+
DROP SEQUENCE BATCH_JOB_SEQ ;

‎spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hana.sql

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
-- Autogenerated: do not edit this file
2+
3+
CREATE TABLE BATCH_JOB_INSTANCE (
4+
JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
5+
VERSION BIGINT ,
6+
JOB_NAME VARCHAR(100) NOT NULL,
7+
JOB_KEY VARCHAR(32) NOT NULL,
8+
constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
9+
) ;
10+
11+
CREATE TABLE BATCH_JOB_EXECUTION (
12+
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
13+
VERSION BIGINT ,
14+
JOB_INSTANCE_ID BIGINT NOT NULL,
15+
CREATE_TIME TIMESTAMP NOT NULL,
16+
START_TIME TIMESTAMP DEFAULT NULL ,
17+
END_TIME TIMESTAMP DEFAULT NULL ,
18+
STATUS VARCHAR(10) ,
19+
EXIT_CODE VARCHAR(2500) ,
20+
EXIT_MESSAGE VARCHAR(2500) ,
21+
LAST_UPDATED TIMESTAMP,
22+
JOB_CONFIGURATION_LOCATION VARCHAR(2500) ,
23+
constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
24+
references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
25+
) ;
26+
27+
CREATE TABLE BATCH_JOB_EXECUTION_PARAMS (
28+
JOB_EXECUTION_ID BIGINT NOT NULL ,
29+
TYPE_CD VARCHAR(6) NOT NULL ,
30+
KEY_NAME VARCHAR(100) NOT NULL ,
31+
STRING_VAL VARCHAR(250) ,
32+
DATE_VAL TIMESTAMP DEFAULT NULL ,
33+
LONG_VAL BIGINT ,
34+
DOUBLE_VAL DOUBLE ,
35+
IDENTIFYING VARCHAR(1) NOT NULL ,
36+
constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
37+
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
38+
) ;
39+
40+
CREATE TABLE BATCH_STEP_EXECUTION (
41+
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
42+
VERSION BIGINT NOT NULL,
43+
STEP_NAME VARCHAR(100) NOT NULL,
44+
JOB_EXECUTION_ID BIGINT NOT NULL,
45+
START_TIME TIMESTAMP NOT NULL ,
46+
END_TIME TIMESTAMP DEFAULT NULL ,
47+
STATUS VARCHAR(10) ,
48+
COMMIT_COUNT BIGINT ,
49+
READ_COUNT BIGINT ,
50+
FILTER_COUNT BIGINT ,
51+
WRITE_COUNT BIGINT ,
52+
READ_SKIP_COUNT BIGINT ,
53+
WRITE_SKIP_COUNT BIGINT ,
54+
PROCESS_SKIP_COUNT BIGINT ,
55+
ROLLBACK_COUNT BIGINT ,
56+
EXIT_CODE VARCHAR(2500) ,
57+
EXIT_MESSAGE VARCHAR(2500) ,
58+
LAST_UPDATED TIMESTAMP,
59+
constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
60+
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
61+
) ;
62+
63+
CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT (
64+
STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
65+
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
66+
SERIALIZED_CONTEXT CLOB ,
67+
constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
68+
references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
69+
) ;
70+
71+
CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT (
72+
JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
73+
SHORT_CONTEXT VARCHAR(2500) NOT NULL,
74+
SERIALIZED_CONTEXT CLOB ,
75+
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
76+
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
77+
) ;
78+
79+
CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ START WITH 0 MINVALUE 0 NO CYCLE;
80+
CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ START WITH 0 MINVALUE 0 NO CYCLE;
81+
CREATE SEQUENCE BATCH_JOB_SEQ START WITH 0 MINVALUE 0 NO CYCLE;

‎spring-batch-core/src/main/sql/hana.properties

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
platform=hana
2+
# SQL language oddities
3+
BIGINT = BIGINT
4+
IDENTITY =
5+
GENERATED = GENERATED BY DEFAULT AS IDENTITY
6+
IFEXISTSBEFORE =
7+
DOUBLE = DOUBLE
8+
BLOB = BLOB
9+
CLOB = CLOB
10+
TIMESTAMP = TIMESTAMP
11+
VARCHAR = VARCHAR
12+
CHAR = VARCHAR
13+
# for generating drop statements...
14+
SEQUENCE = SEQUENCE

‎spring-batch-core/src/main/sql/hana.vpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#macro (sequence $name $value)CREATE SEQUENCE ${name} START WITH ${value} MINVALUE 0 NO CYCLE;
2+
#end
3+
#macro (notnull $name $type)ALTER (${name} ${type} NOT NULL)#end

‎spring-batch-infrastructure-tests/src/test/resources/batch-hana.properties

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Placeholders batch.*
2+
# for SAP HANA:
3+
batch.jdbc.driver=com.sap.db.jdbc.Driver
4+
batch.jdbc.url=jdbc:sap://localhost:39015/
5+
batch.jdbc.user=SPRING_TEST
6+
batch.jdbc.password=Spr1ng_test
7+
batch.jdbc.testWhileIdle=false
8+
batch.jdbc.validationQuery=
9+
batch.schema.script=classpath:org/springframework/batch/item/database/init-foo-schema-hana.sql
10+
batch.business.schema.script=classpath:/org/springframework/batch/jms/init.sql
11+
batch.data.source.init=true
12+
batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.HanaSequenceMaxValueIncrementer
13+
batch.database.incrementer.parent=sequenceIncrementerParent
14+
batch.verify.cursor.position=true

‎spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/item/database/init-foo-schema-hana.sql

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
DROP TABLE T_FOOS;
2+
DROP TABLE T_WRITE_FOOS;
3+
4+
CREATE TABLE T_FOOS (
5+
ID BIGINT NOT NULL,
6+
NAME VARCHAR(45),
7+
CODE VARCHAR(10),
8+
VALUE BIGINT
9+
);
10+
11+
ALTER TABLE T_FOOS ADD PRIMARY KEY (ID);
12+
13+
INSERT INTO t_foos (id, name, value) VALUES (1, 'bar2', 2);
14+
INSERT INTO t_foos (id, name, value) VALUES (2, 'bar4', 4);
15+
INSERT INTO t_foos (id, name, value) VALUES (3, 'bar1', 1);
16+
INSERT INTO t_foos (id, name, value) VALUES (4, 'bar5', 5);
17+
INSERT INTO t_foos (id, name, value) VALUES (5, 'bar3', 3);
18+
19+
CREATE TABLE T_WRITE_FOOS (
20+
ID BIGINT NOT NULL,
21+
NAME VARCHAR(45),
22+
VALUE BIGINT
23+
);
24+
25+
ALTER TABLE T_WRITE_FOOS ADD PRIMARY KEY (ID);

‎spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/builder/JdbcPagingItemReaderBuilder.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springframework.batch.item.database.support.Db2PagingQueryProvider;
2626
import org.springframework.batch.item.database.support.DerbyPagingQueryProvider;
2727
import org.springframework.batch.item.database.support.H2PagingQueryProvider;
28+
import org.springframework.batch.item.database.support.HanaPagingQueryProvider;
2829
import org.springframework.batch.item.database.support.HsqlPagingQueryProvider;
2930
import org.springframework.batch.item.database.support.MySqlPagingQueryProvider;
3031
import org.springframework.batch.item.database.support.OraclePagingQueryProvider;
@@ -359,6 +360,7 @@ private PagingQueryProvider determineQueryProvider(DataSource dataSource) {
359360
case DB2ZOS:
360361
case DB2AS400: provider = new Db2PagingQueryProvider(); break;
361362
case H2: provider = new H2PagingQueryProvider(); break;
363+
case HANA: provider = new HanaPagingQueryProvider(); break;
362364
case HSQL: provider = new HsqlPagingQueryProvider(); break;
363365
case SQLSERVER: provider = new SqlServerPagingQueryProvider(); break;
364366
case MYSQL: provider = new MySqlPagingQueryProvider(); break;

‎spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
2626
import org.springframework.jdbc.support.incrementer.DerbyMaxValueIncrementer;
2727
import org.springframework.jdbc.support.incrementer.H2SequenceMaxValueIncrementer;
28+
import org.springframework.jdbc.support.incrementer.HanaSequenceMaxValueIncrementer;
2829
import org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer;
2930
import org.springframework.jdbc.support.incrementer.MySQLMaxValueIncrementer;
3031
import org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer;
@@ -37,6 +38,7 @@
3738
import static org.springframework.batch.support.DatabaseType.DB2ZOS;
3839
import static org.springframework.batch.support.DatabaseType.DERBY;
3940
import static org.springframework.batch.support.DatabaseType.H2;
41+
import static org.springframework.batch.support.DatabaseType.HANA;
4042
import static org.springframework.batch.support.DatabaseType.HSQL;
4143
import static org.springframework.batch.support.DatabaseType.MYSQL;
4244
import static org.springframework.batch.support.DatabaseType.ORACLE;
@@ -98,6 +100,9 @@ else if (databaseType == HSQL) {
98100
else if (databaseType == H2) {
99101
return new H2SequenceMaxValueIncrementer(dataSource, incrementerName);
100102
}
103+
else if (databaseType == HANA) {
104+
return new HanaSequenceMaxValueIncrementer(dataSource, incrementerName);
105+
}
101106
else if (databaseType == MYSQL) {
102107
MySQLMaxValueIncrementer mySQLMaxValueIncrementer = new MySQLMaxValueIncrementer(dataSource, incrementerName, incrementerColumnName);
103108
mySQLMaxValueIncrementer.setUseNewConnection(true);

0 commit comments

Comments
 (0)