Skip to content

Commit

Permalink
upgrade 1.0.0 (apache#288)
Browse files Browse the repository at this point in the history
  • Loading branch information
@zjinlei @xingfudeshi
zjinlei authored and xingfudeshi committed Dec 24, 2019
1 parent a9ff8a2 commit be295e1
Show file tree
Hide file tree
Showing 66 changed files with 1,136 additions and 1,313 deletions.
2 changes: 1 addition & 1 deletion dubbo-multiple-datasource-mybatis-plus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-all</artifactId>
<version>0.9.0.1</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
Expand Down
64 changes: 32 additions & 32 deletions dubbo/src/main/resources/file.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ transport {
server = "NIO"
#enable heartbeat
heartbeat = true
# the client batch send request enable
enable-client-batch-send-request = true
#thread factory for netty
thread-factory {
boss-thread-prefix = "NettyBoss"
Expand All @@ -26,45 +28,43 @@ transport {
serialization = "seata"
compressor = "none"
}

service {
#vgroup->rgroup
#transaction service group mapping
vgroup_mapping.my_test_tx_group = "default"
#only support single node
#only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8091"
#degrade current not support
#degrade, current not support
enableDegrade = false
#disable
disable = false
#unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent
max.commit.retry.timeout = "-1"
max.rollback.retry.timeout = "-1"
#disable seata
disableGlobalTransaction = false
}

client {
async.commit.buffer.limit = 10000
lock {
retry.internal = 10
retry.times = 30
rm {
async.commit.buffer.limit = 10000
lock {
retry.internal = 10
retry.times = 30
retry.policy.branch-rollback-on-conflict = true
}
report.retry.count = 5
table.meta.check.enable = false
report.success.enable = true
}
report.retry.count = 5
tm.commit.retry.count = 1
tm.rollback.retry.count = 1
}

transaction {
undo.data.validation = true
undo.log.serialization = "jackson"
undo.log.save.days = 7
#schedule delete expired undo_log in milliseconds
undo.log.delete.period = 86400000
undo.log.table = "undo_log"
}

support {
## spring
spring {
tm {
commit.retry.count = 5
rollback.retry.count = 5
}
undo {
data.validation = true
log.serialization = "jackson"
log.table = "undo_log"
}
log {
exceptionRate = 100
}
support {
# auto proxy the DataSource bean
datasource.autoproxy = false
spring.datasource.autoproxy = false
}
}
}
1 change: 0 additions & 1 deletion dubbo/src/main/resources/sql/undo_log.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ CREATE TABLE `undo_log` (
`log_status` int(11) NOT NULL,
`log_created` datetime NOT NULL,
`log_modified` datetime NOT NULL,
`ext` varchar(100) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
2 changes: 1 addition & 1 deletion ha/Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ CREATE TABLE `account_tbl` (

```xml
<properties>
<seata.version>0.9.0</seata.version>
<seata.version>1.0.0</seata.version>
<dubbo.alibaba.version>2.6.5</dubbo.alibaba.version>
</properties>

Expand Down
87 changes: 32 additions & 55 deletions ha/src/main/resources/file.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ transport {
server = "NIO"
#enable heartbeat
heartbeat = true
# the client batch send request enable
enable-client-batch-send-request = true
#thread factory for netty
thread-factory {
boss-thread-prefix = "NettyBoss"
Expand All @@ -26,68 +28,43 @@ transport {
serialization = "seata"
compressor = "none"
}

service {
#vgroup->rgroup
#transaction service group mapping
vgroup_mapping.my_test_tx_group = "default"
#only support single node
#only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8091"
#degrade current not support
#degrade, current not support
enableDegrade = false
#disable
disable = false
#unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent
max.commit.retry.timeout = "-1"
max.rollback.retry.timeout = "-1"
#disable seata
disableGlobalTransaction = false
}

client {
async.commit.buffer.limit = 10000
lock {
retry.internal = 10
retry.times = 30
rm {
async.commit.buffer.limit = 10000
lock {
retry.internal = 10
retry.times = 30
retry.policy.branch-rollback-on-conflict = true
}
report.retry.count = 5
table.meta.check.enable = false
report.success.enable = true
}
report.retry.count = 5
tm.commit.retry.count = 1
tm.rollback.retry.count = 1
}

## transaction log store
store {
## store mode: file、db
mode = "db"

## file store

file {
dir = "file_store/data"

# branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
max-branch-session-size = 16384
# globe session size , if exceeded throws exceptions
max-global-session-size = 512
# file buffer size , if exceeded allocate new buffer
file-write-buffer-cache-size = 16384
# when recover batch read size
session.reload.read_size = 100
# async, sync
flush-disk-mode = async
tm {
commit.retry.count = 5
rollback.retry.count = 5
}

## database store
db {
## the implement of javax.sql.DataSource, such as DruidDataSource(druid)/BasicDataSource(dbcp) etc.
datasource = "dbcp"
## mysql/oracle/h2/oceanbase etc.
db-type = "mysql"
url = "jdbc:mysql://127.0.0.1:3306/seata_server"
user = "mysql"
password = "mysql"
min-conn = 1
max-conn = 3
global.table = "global_table"
branch.table = "branch_table"
query-limit = 100
undo {
data.validation = true
log.serialization = "jackson"
log.table = "undo_log"
}

}
log {
exceptionRate = 100
}
support {
# auto proxy the DataSource bean
spring.datasource.autoproxy = false
}
}
1 change: 0 additions & 1 deletion ha/src/main/resources/sql/undo_log.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ CREATE TABLE `undo_log` (
`log_status` int(11) NOT NULL,
`log_created` datetime NOT NULL,
`log_modified` datetime NOT NULL,
`ext` varchar(100) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
3 changes: 0 additions & 3 deletions multiple-datasource-mybatis-plus/data.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ CREATE TABLE seata_order.undo_log
log_status INT(11) NOT NULL,
log_created DATETIME NOT NULL,
log_modified DATETIME NOT NULL,
ext VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (id),
UNIQUE KEY ux_undo_log (xid, branch_id)
) ENGINE = InnoDB
Expand Down Expand Up @@ -56,7 +55,6 @@ CREATE TABLE seata_storage.undo_log
log_status INT(11) NOT NULL,
log_created DATETIME NOT NULL,
log_modified DATETIME NOT NULL,
ext VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (id),
UNIQUE KEY ux_undo_log (xid, branch_id)
) ENGINE = InnoDB
Expand Down Expand Up @@ -85,7 +83,6 @@ CREATE TABLE seata_pay.undo_log
log_status INT(11) NOT NULL,
log_created DATETIME NOT NULL,
log_modified DATETIME NOT NULL,
ext VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (id),
UNIQUE KEY ux_undo_log (xid, branch_id)
) ENGINE = InnoDB
Expand Down
2 changes: 1 addition & 1 deletion multiple-datasource-mybatis-plus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</plugins>
</build>
<properties>
<seata.version>0.9.0</seata.version>
<seata.version>1.0.0</seata.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
62 changes: 31 additions & 31 deletions multiple-datasource-mybatis-plus/src/main/resources/file.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ transport {
server = "NIO"
#enable heartbeat
heartbeat = true
# the client batch send request enable
enable-client-batch-send-request = true
#thread factory for netty
thread-factory {
boss-thread-prefix = "NettyBoss"
Expand All @@ -26,45 +28,43 @@ transport {
serialization = "seata"
compressor = "none"
}

service {
#vgroup->rgroup
#transaction service group mapping
vgroup_mapping.my_test_tx_group = "default"
#only support single node
#only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8091"
#degrade current not support
#degrade, current not support
enableDegrade = false
#disable
disable = false
#unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent
max.commit.retry.timeout = "-1"
max.rollback.retry.timeout = "-1"
#disable seata
disableGlobalTransaction = false
}

client {
async.commit.buffer.limit = 10000
lock {
retry.internal = 10
retry.times = 30
rm {
async.commit.buffer.limit = 10000
lock {
retry.internal = 10
retry.times = 30
retry.policy.branch-rollback-on-conflict = true
}
report.retry.count = 5
table.meta.check.enable = false
report.success.enable = true
}
report.retry.count = 5
tm.commit.retry.count = 1
tm.rollback.retry.count = 1
}

transaction {
undo.data.validation = true
undo.log.serialization = "jackson"
undo.log.save.days = 7
#schedule delete expired undo_log in milliseconds
undo.log.delete.period = 86400000
undo.log.table = "undo_log"
}

support {
## spring
spring {
tm {
commit.retry.count = 5
rollback.retry.count = 5
}
undo {
data.validation = true
log.serialization = "jackson"
log.table = "undo_log"
}
log {
exceptionRate = 100
}
support {
# auto proxy the DataSource bean
datasource.autoproxy = false
spring.datasource.autoproxy = false
}
}
3 changes: 0 additions & 3 deletions multiple-datasource/data.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ CREATE TABLE seata_order.undo_log
log_status INT(11) NOT NULL,
log_created DATETIME NOT NULL,
log_modified DATETIME NOT NULL,
ext VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (id),
UNIQUE KEY ux_undo_log (xid, branch_id)
) ENGINE = InnoDB
Expand Down Expand Up @@ -56,7 +55,6 @@ CREATE TABLE seata_storage.undo_log
log_status INT(11) NOT NULL,
log_created DATETIME NOT NULL,
log_modified DATETIME NOT NULL,
ext VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (id),
UNIQUE KEY ux_undo_log (xid, branch_id)
) ENGINE = InnoDB
Expand Down Expand Up @@ -85,7 +83,6 @@ CREATE TABLE seata_pay.undo_log
log_status INT(11) NOT NULL,
log_created DATETIME NOT NULL,
log_modified DATETIME NOT NULL,
ext VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (id),
UNIQUE KEY ux_undo_log (xid, branch_id)
) ENGINE = InnoDB
Expand Down
2 changes: 1 addition & 1 deletion multiple-datasource/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</plugins>
</build>
<properties>
<seata.version>0.9.0</seata.version>
<seata.version>1.0.0</seata.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
Loading

0 comments on commit be295e1

Please sign in to comment.