qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: qcast3:d5a43e2ae6d93a185def55c6cd297e62a23d2468
Branches Tags
qcast3:main
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/jp-0331
qcast3:feature/rjy-0430
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
..
compare: qcast3:59918fe25ca96a134d45ea7e3bd8a889ffa31150
Branches Tags
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/jp-0331
qcast3:feature/rjy-0430
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
qcast3:main

No commits in common. "d5a43e2ae6d93a185def55c6cd297e62a23d2468" and "59918fe25ca96a134d45ea7e3bd8a889ffa31150" have entirely different histories.
d5a43e2ae6 ... 59918fe25c

6 changed files with 18 additions and 166 deletions
Show Stats Expand all files Collapse all files

11
src/main/java/com/interplug/qcast/config/batch/BatchConfiguration.java
View File

@ -6,7 +6,6 @@ import javax.sql.DataSource;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
@ -31,8 +30,6 @@ public class BatchConfiguration {
JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
factory.setDataSource(dataSource);
factory.setTransactionManager(transactionManager);
factory.setIncrementerFactory(new CustomDefaultDataFieldMaxValueIncrementerFactory(dataSource));
// Use TABLE_PREFIX to map to Spring Batch tables
factory.setTablePrefix("BATCH_");
@ -41,7 +38,6 @@ public class BatchConfiguration {
factory.setIsolationLevelForCreate("ISOLATION_SERIALIZABLE");
// Set to "SQLSERVER" for Spring Batch compatibility
factory.setDatabaseType("SQLSERVER");
// Finalize factory setup
@ -49,13 +45,6 @@ public class BatchConfiguration {
return factory.getObject();
}
@Bean
public DataFieldMaxValueIncrementerFactory customIncrementerFactory(DataSource dataSource) {
return new CustomDefaultDataFieldMaxValueIncrementerFactory(dataSource);
}
/**
* TaskExecutor for batch processing (multithreading support).
*/

22
src/main/java/com/interplug/qcast/config/batch/CustomDefaultDataFieldMaxValueIncrementerFactory.java
View File

@ -1,22 +0,0 @@
package com.interplug.qcast.config.batch;
import org.springframework.batch.item.database.support.DefaultDataFieldMaxValueIncrementerFactory;
import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
import org.springframework.jdbc.support.incrementer.SqlServerSequenceMaxValueIncrementer;
import javax.sql.DataSource;
public class CustomDefaultDataFieldMaxValueIncrementerFactory extends DefaultDataFieldMaxValueIncrementerFactory {
private final DataSource dataSource;
public CustomDefaultDataFieldMaxValueIncrementerFactory(DataSource dataSource) {
super(dataSource);
this.dataSource = dataSource;
}
@Override
public DataFieldMaxValueIncrementer getIncrementer(String databaseType, String incrementerName) {
CustomIncrementer customIncrementer = new CustomIncrementer(this.dataSource, incrementerName);
return customIncrementer;
}
}

39
src/main/java/com/interplug/qcast/config/batch/CustomIncrementer.java
View File

@ -1,39 +0,0 @@
package com.interplug.qcast.config.batch;
import org.springframework.jdbc.support.incrementer.AbstractColumnMaxValueIncrementer;
import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
public class CustomIncrementer extends AbstractColumnMaxValueIncrementer {
public CustomIncrementer(DataSource dataSource, String incrementerName) {
super(dataSource, incrementerName, "ID");
}
@Override
protected long getNextKey() {
long nextKey = 0;
try (Connection conn = this.getDataSource().getConnection()) {
PreparedStatement psSelect = conn.prepareStatement("SELECT ID FROM " + getIncrementerName() + " WITH (UPDLOCK, HOLDLOCK)");
ResultSet rs = psSelect.executeQuery();
if (rs.next()) {
nextKey = rs.getLong(1);
}
rs.close();
psSelect.close();
PreparedStatement psUpdate = conn.prepareStatement("UPDATE " + getIncrementerName() + " SET ID = ?");
psUpdate.setLong(1, nextKey + 1);
psUpdate.executeUpdate();
psUpdate.close();
} catch (SQLException e) {
throw new RuntimeException("Could not get next key for " + getIncrementerName(), e);
}
return nextKey + 1;
}
}

94
src/main/java/com/interplug/qcast/config/batch/SqlServer.sql
View File

@ -1,94 +0,0 @@
CREATE TABLE BATCH_JOB_INSTANCE (
JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY ,
VERSION BIGINT NULL,
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 ,
VERSION BIGINT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
CREATE_TIME DATETIME NOT NULL,
START_TIME DATETIME DEFAULT NULL ,
END_TIME DATETIME DEFAULT NULL ,
STATUS VARCHAR(10) NULL,
EXIT_CODE VARCHAR(2500) NULL,
EXIT_MESSAGE VARCHAR(2500) NULL,
LAST_UPDATED DATETIME 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 ,
PARAMETER_NAME VARCHAR(100) NOT NULL ,
PARAMETER_TYPE VARCHAR(100) NOT NULL ,
PARAMETER_VALUE VARCHAR(2500) ,
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 ,
VERSION BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
CREATE_TIME DATETIME NOT NULL,
START_TIME DATETIME DEFAULT NULL ,
END_TIME DATETIME DEFAULT NULL ,
STATUS VARCHAR(10) NULL,
COMMIT_COUNT BIGINT NULL,
READ_COUNT BIGINT NULL,
FILTER_COUNT BIGINT NULL,
WRITE_COUNT BIGINT NULL,
READ_SKIP_COUNT BIGINT NULL,
WRITE_SKIP_COUNT BIGINT NULL,
PROCESS_SKIP_COUNT BIGINT NULL,
ROLLBACK_COUNT BIGINT NULL,
EXIT_CODE VARCHAR(2500) NULL,
EXIT_MESSAGE VARCHAR(2500) NULL,
LAST_UPDATED DATETIME NULL,
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 VARCHAR(MAX) NULL,
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 VARCHAR(MAX) NULL,
constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
) ;
CREATE TABLE BATCH_JOB_SEQ (
ID BIGINT NOT NULL PRIMARY KEY,
NEXT_VAL BIGINT NOT NULL
);
-- 첫 번째 ID 값 초기화
INSERT INTO BATCH_JOB_SEQ (ID, NEXT_VAL) VALUES (1, 1);
CREATE TABLE BATCH_JOB_EXECUTION_SEQ (
ID BIGINT PRIMARY KEY
);
INSERT INTO BATCH_JOB_EXECUTION_SEQ (ID) VALUES (1);
CREATE TABLE BATCH_STEP_EXECUTION_SEQ (
ID BIGINT NOT NULL PRIMARY KEY
);
-- 초기 키 값을 삽입
INSERT INTO BATCH_STEP_EXECUTION_SEQ (ID) VALUES (0);

2
src/main/resources/config/application-dev.yml
View File

@ -20,6 +20,8 @@ spring:
batch:
jdbc:
initialize-schema: never
table-prefix: BATCH_
schema:
job:
names: ${job.name:NONE}
enabled: false

16
src/main/resources/config/application-local.yml
View File

@ -15,6 +15,21 @@ spring:
username: pvDBuser
maximum-pool-size: 4
pool-name: Master-HikariPool
# datasource:
# master:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4
# pool-name: Master-HikariPool
# read:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4
# pool-name: Read-HikariPool
jackson:
time-zone: Asia/Seoul
batch:
@ -25,6 +40,7 @@ spring:
enabled: false
profiles:
scheduler: Y
batch:
job:
enabled: true