Commit 8e635c53 authored by terrymanu's avatar terrymanu
Browse files

Merge branch 'dev' of https://github.com/shardingjdbc/sharding-jdbc into dev

parents 2b3c9988 a949190f

sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
                    <finalName>${project.artifactId}-${project.parent.version}</finalName>

                    <appendAssemblyId>false</appendAssemblyId>

                    <descriptors>

                        <descriptor>src/main/resources/assemblies/assembly.xml</descriptor>

                        <descriptor>src/main/resources/assembly/assembly.xml</descriptor>

                    </descriptors>

                </configuration>

                <executions>

sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/src/main/java/io/shardingjdbc/transaction/job/BASETransactionJob.java

+9 −8
Original line number Diff line number Diff line
@@ -42,7 +42,9 @@ public final class BASETransactionJob implements Job { 
        TransactionLogStorage transactionLogStorage = (TransactionLogStorage) jobExecutionContext.getJobDetail().getJobDataMap().get("transactionLogStorage");

        List<TransactionLog> transactionLogList = transactionLogStorage.findEligibleTransactionLogs(baseTransactionJobConfiguration.getJobConfig().getTransactionLogFetchDataCount(),

                baseTransactionJobConfiguration.getJobConfig().getMaxDeliveryTryTimes(), baseTransactionJobConfiguration.getJobConfig().getMaxDeliveryTryDelayMillis());

        if (null != transactionLogList) {

        if (null == transactionLogList) {

            return;

        }

        for (TransactionLog each : transactionLogList) {

            try (Connection conn = baseTransactionJobConfiguration.getTargetDataSource(each.getDataSource()).getConnection()) {

                transactionLogStorage.processData(conn, each, baseTransactionJobConfiguration.getJobConfig().getMaxDeliveryTryTimes());
@@ -53,4 +55,3 @@ public final class BASETransactionJob implements Job { 
        }

    }

}
 
}

sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/src/main/java/io/shardingjdbc/transaction/job/BASETransactionJobConfiguration.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


package io.shardingjdbc.transaction.job;



import io.shardingjdbc.transaction.config.AsyncSoftTransactionJobConfiguration;

import lombok.Getter;

import lombok.Setter;
@@ -46,7 +47,7 @@ public final class BASETransactionJobConfiguration { 
    /**

     * Asynchronized B.A.S.E transaction job configuration.

     */

    private io.shardingjdbc.transaction.config.AsyncSoftTransactionJobConfiguration jobConfig;

    private AsyncSoftTransactionJobConfiguration jobConfig;

    

    /**

     * Get one data source by name.

sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/src/main/java/io/shardingjdbc/transaction/job/BASETransactionJobFactory.java

+6 −6
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import org.quartz.impl.StdSchedulerFactory; 
@RequiredArgsConstructor

public final class BASETransactionJobFactory {

    

    private final BASETransactionJobConfiguration baseTransactionJobConfiguration;

    private final BASETransactionJobConfiguration baseTransactionJobConfig;

    

    /**

     * start job.
@@ -53,16 +53,16 @@ public final class BASETransactionJobFactory { 
    }

    

    private JobDetail buildJobDetail() {

        JobDetail jobDetail = JobBuilder.newJob(BASETransactionJob.class).withIdentity(baseTransactionJobConfiguration.getJobConfig().getName() + "-Job").build();

        jobDetail.getJobDataMap().put("baseTransactionJobConfiguration", baseTransactionJobConfiguration);

        JobDetail jobDetail = JobBuilder.newJob(BASETransactionJob.class).withIdentity(baseTransactionJobConfig.getJobConfig().getName() + "-Job").build();

        jobDetail.getJobDataMap().put("baseTransactionJobConfiguration", baseTransactionJobConfig);

        jobDetail.getJobDataMap().put("transactionLogStorage",

                TransactionLogStorageFactory.createTransactionLogStorage(new RdbTransactionLogDataSource(baseTransactionJobConfiguration.getDefaultTransactionLogDataSource())));

                TransactionLogStorageFactory.createTransactionLogStorage(new RdbTransactionLogDataSource(baseTransactionJobConfig.getDefaultTransactionLogDataSource())));

        return jobDetail;

    }

    

    private Trigger buildTrigger() {

        return TriggerBuilder.newTrigger()

                .withIdentity(baseTransactionJobConfiguration.getJobConfig().getName() + "-Trigger")

                .withSchedule(CronScheduleBuilder.cronSchedule(baseTransactionJobConfiguration.getJobConfig().getCron())).build();

                .withIdentity(baseTransactionJobConfig.getJobConfig().getName() + "-Trigger")

                .withSchedule(CronScheduleBuilder.cronSchedule(baseTransactionJobConfig.getJobConfig().getCron())).build();

    }

}

sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/src/main/resources/assemblies/assembly.xml→sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/src/main/resources/assembly/assembly.xml

+0 −0

File moved.

View file