[incubator-dubbo] branch master updated (affc976 -> b2bfbc7)
This is an automated email from the ASF dual-hosted git repository. kexianjun pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. omit affc976 fix-3678 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master (b2bfbc7) \ O -- O -- O (affc976) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/dubbo/remoting/exchange/support/DefaultFuture.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[incubator-dubbo-admin] branch 0.2.0-release created (now 926fd9e)
This is an automated email from the ASF dual-hosted git repository. min pushed a change to branch 0.2.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-admin.git. at 926fd9e fix #334 No new revisions were added by this update.
[incubator-dubbo-website] branch asf-site updated: fix #330 [blog] update Fescar `undo_log` table meta and ignore .iml (#331)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new fe9a71d fix #330 [blog] update Fescar `undo_log` table meta and ignore .iml (#331) fe9a71d is described below commit fe9a71de9624424430951008ba4ba1cec93cf26b Author: jimin AuthorDate: Sat Mar 16 21:30:35 2019 +0800 fix #330 [blog] update Fescar `undo_log` table meta and ignore .iml (#331) * add doc How to use Fescar to ensure consistency between Dubbo Microservices * fix #330 [blog] update Fescar `undo_log` table meta and ignore .iml --- .gitignore | 1 + blog/en-us/dubbo-fescar.md | 7 --- blog/zh-cn/dubbo-fescar.md | 7 --- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f538a9d..7a04d2d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ node_modules/ npm-debug.log *.orig package-lock.json +*.iml \ No newline at end of file diff --git a/blog/en-us/dubbo-fescar.md b/blog/en-us/dubbo-fescar.md index fd68f49..75736f8 100644 --- a/blog/en-us/dubbo-fescar.md +++ b/blog/en-us/dubbo-fescar.md @@ -149,11 +149,12 @@ dubbo-storage-service.xml ``` -### Step 2: Create UNDO_LOG table for Fescar +### Step 2: Create undo_log table for Fescar `UNDO_LOG` table is required by Fescar AT mode. ```sql +-- Note that when Fescar version is upgraded to 0.3.0+, it is changed from the previous normal index to the unique index. CREATE TABLE `undo_log` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `branch_id` bigint(20) NOT NULL, @@ -164,8 +165,8 @@ CREATE TABLE `undo_log` ( `log_modified` datetime NOT NULL, `ext` varchar(100) DEFAULT NULL, PRIMARY KEY (`id`), - KEY `idx_unionkey` (`xid`,`branch_id`) -) ENGINE=InnoDB AUTO_INCREMENT=159 DEFAULT CHARSET=utf8 + UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; ``` ### Step 3: Create tables for example business diff --git a/blog/zh-cn/dubbo-fescar.md b/blog/zh-cn/dubbo-fescar.md index 2dd2bb3..b61afc4 100644 --- a/blog/zh-cn/dubbo-fescar.md +++ b/blog/zh-cn/dubbo-fescar.md @@ -149,11 +149,12 @@ dubbo-storage-service.xml ``` -### Step 2: 为 Fescar 创建 UNDO_LOG 表 +### Step 2: 为 Fescar 创建 undo_log 表 `UNDO_LOG` 此表用于 Fescar 的AT模式。 ```sql +-- 注意当 Fescar 版本升级至 0.3.0+ 将由之前的普通索引变更为唯一索引。 CREATE TABLE `undo_log` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `branch_id` bigint(20) NOT NULL, @@ -164,8 +165,8 @@ CREATE TABLE `undo_log` ( `log_modified` datetime NOT NULL, `ext` varchar(100) DEFAULT NULL, PRIMARY KEY (`id`), - KEY `idx_unionkey` (`xid`,`branch_id`) -) ENGINE=InnoDB AUTO_INCREMENT=159 DEFAULT CHARSET=utf8 + UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; ``` ### Step 3: 创建相关业务表
[incubator-dubbo-website] branch asf-site updated: delete incubator-dubbo-website.iml (#332)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new bc2138d delete incubator-dubbo-website.iml (#332) bc2138d is described below commit bc2138d83360781e2699e0b7f7e38d323da62300 Author: jimin AuthorDate: Sat Mar 16 17:34:44 2019 +0800 delete incubator-dubbo-website.iml (#332) --- incubator-dubbo-website.iml | 9 - 1 file changed, 9 deletions(-) diff --git a/incubator-dubbo-website.iml b/incubator-dubbo-website.iml deleted file mode 100644 index 8021953..000 --- a/incubator-dubbo-website.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file
[incubator-dubbo] branch 2.7.1-release updated: fix the issue that maven javadoc plugin goes into interactive mode
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch 2.7.1-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.7.1-release by this push:
new b6fce14 fix the issue that maven javadoc plugin goes into interactive
mode
b6fce14 is described below
commit b6fce1450279338edad35e8e9810cd74a8708f70
Author: Ian Luo
AuthorDate: Sat Mar 16 14:03:51 2019 +0800
fix the issue that maven javadoc plugin goes into interactive mode
---
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
index 24b14e9..355ec04 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
@@ -35,10 +35,12 @@
${project.parent.version}
-org.apache.dubbo
-dubbo-dependencies-zookeeper
-${project.parent.version}
-pom
+org.apache.curator
+curator-recipes
+
+
+org.apache.zookeeper
+zookeeper
org.apache.curator
