You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by lo...@apache.org on 2016/12/20 06:09:21 UTC
[1/5] incubator-rocketmq git commit: Update the description for
command 'updateTopicPerm' , incidentally,
commit minor update for pom. Review by @vongosling [Forced Update!]
Repository: incubator-rocketmq
Updated Branches:
refs/heads/master 9875a7d9e -> ec977e77d (forced update)
Update the description for command 'updateTopicPerm' , incidentally, commit minor update for pom. Review by @vongosling
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/0eff1f28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/0eff1f28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/0eff1f28
Branch: refs/heads/master
Commit: 0eff1f28e3e19834d495a1be05289dd0653705e3
Parents: c818198
Author: lollipop <lo...@apache.org>
Authored: Tue Dec 20 11:00:06 2016 +0800
Committer: lollipop <lo...@apache.org>
Committed: Tue Dec 20 12:01:01 2016 +0800
----------------------------------------------------------------------
pom.xml | 4 ++--
.../rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/0eff1f28/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 93748a5..381cdb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
<id>stevenschew</id>
<name>Wei Zhou</name>
<email>stevenschew@@apache.org</email>
- <url>https://github.com/zhouwei198732</url>
+ <url>https://github.com/stevenschew</url>
<roles>
<role>committer</role>
</roles>
@@ -113,7 +113,7 @@
<id>lollipop</id>
<name>Jixiang Jin</name>
<email>lollipop@apache.org</email>
- <url>https://github.com/jinjixiang</url>
+ <url>https://github.com/lollipopjin</url>
<roles>
<role>committer</role>
</roles>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/0eff1f28/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
----------------------------------------------------------------------
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java b/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
index 1938934..abff611 100644
--- a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
+++ b/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
@@ -60,7 +60,7 @@ public class UpdateTopicPermSubCommand implements SubCommand {
opt.setRequired(true);
options.addOption(opt);
- opt = new Option("p", "perm", true, "set topic's permission(2|4|6), intro[2:R; 4:W; 6:RW]");
+ opt = new Option("p", "perm", true, "set topic's permission(2|4|6), intro[2:W; 4:R; 6:RW]");
opt.setRequired(true);
options.addOption(opt);
[4/5] incubator-rocketmq git commit: Merge remote-tracking branch
'origin/master'
Posted by lo...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/f4a39870
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/f4a39870
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/f4a39870
Branch: refs/heads/master
Commit: f4a39870ae4050c6e513481efeea541cefb8b5f1
Parents: 0eff1f2 b72519d
Author: lollipop <lo...@apache.org>
Authored: Tue Dec 20 11:02:30 2016 +0800
Committer: lollipop <lo...@apache.org>
Committed: Tue Dec 20 14:01:30 2016 +0800
----------------------------------------------------------------------
bin/README.md | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
[5/5] incubator-rocketmq git commit: Remove independent mysql jdbc
driver statement. reviewed by @zhouxinyu
Posted by lo...@apache.org.
Remove independent mysql jdbc driver statement. reviewed by @zhouxinyu
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/c8181981
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/c8181981
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/c8181981
Branch: refs/heads/master
Commit: c81819813ab502cd99caaf1aeae466894e2fcd1d
Parents: c01a7fd
Author: vongosling <vo...@apache.org>
Authored: Mon Dec 19 20:18:19 2016 +0800
Committer: lollipop <lo...@apache.org>
Committed: Tue Dec 20 14:08:09 2016 +0800
----------------------------------------------------------------------
NOTICE | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c8181981/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 913ef38..fea5b4c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,7 +2,4 @@ RocketMQ
Copyright 2016 Alibaba Group.
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This distribution has producerGroup binary dependency on mysql-connector-java, which is available under gpl 2.0.
-The source code of mysql-connector-java can be found at http://dev.mysql.com/downloads/connector/reconsumeTimes/.
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
[3/5] incubator-rocketmq git commit: Revert
SendMessageRequestHeaderV2. Reviewed by @vintagewang @vongosling
Posted by lo...@apache.org.
Revert SendMessageRequestHeaderV2. Reviewed by @vintagewang @vongosling
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/ec977e77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/ec977e77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/ec977e77
Branch: refs/heads/master
Commit: ec977e77d9df5eef0131c341606e52574a4ad08b
Parents: f4a3987
Author: yukon <yu...@apache.org>
Authored: Tue Dec 20 12:56:56 2016 +0800
Committer: yukon <yu...@apache.org>
Committed: Tue Dec 20 12:59:25 2016 +0800
----------------------------------------------------------------------
.../header/SendMessageRequestHeaderV2.java | 171 ++++++++++---------
1 file changed, 86 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/ec977e77/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java
----------------------------------------------------------------------
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java
index dadf4bf..6ce4cd5 100644
--- a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java
+++ b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java
@@ -24,65 +24,66 @@ import com.alibaba.rocketmq.remoting.exception.RemotingCommandException;
/**
+ * Use short variable name to speed up FastJson deserialization process.
* @author shijia.wxr
*/
public class SendMessageRequestHeaderV2 implements CommandCustomHeader {
@CFNotNull
- private String producerGroup;
+ private String a; // producerGroup;
@CFNotNull
- private String topic;
+ private String b; // topic;
@CFNotNull
- private String defaultTopic;
+ private String c; // defaultTopic;
@CFNotNull
- private Integer defaultTopicQueueNums;
+ private Integer d; // defaultTopicQueueNums;
@CFNotNull
- private Integer queueId;
+ private Integer e; // queueId;
@CFNotNull
- private Integer sysFlag;
+ private Integer f; // sysFlag;
@CFNotNull
- private Long bornTimestamp;
+ private Long g; // bornTimestamp;
@CFNotNull
- private Integer flag;
+ private Integer h; // flag;
@CFNullable
- private String properties;
+ private String i; // properties;
@CFNullable
- private Integer reconsumeTimes;
+ private Integer j; // reconsumeTimes;
@CFNullable
- private boolean unitMode;
+ private boolean k; // unitMode = false;
- private Integer consumeRetryTimes;
+ private Integer l; // consumeRetryTimes
public static SendMessageRequestHeader createSendMessageRequestHeaderV1(final SendMessageRequestHeaderV2 v2) {
SendMessageRequestHeader v1 = new SendMessageRequestHeader();
- v1.setProducerGroup(v2.producerGroup);
- v1.setTopic(v2.topic);
- v1.setDefaultTopic(v2.defaultTopic);
- v1.setDefaultTopicQueueNums(v2.defaultTopicQueueNums);
- v1.setQueueId(v2.queueId);
- v1.setSysFlag(v2.sysFlag);
- v1.setBornTimestamp(v2.bornTimestamp);
- v1.setFlag(v2.flag);
- v1.setProperties(v2.properties);
- v1.setReconsumeTimes(v2.reconsumeTimes);
- v1.setUnitMode(v2.unitMode);
- v1.setMaxReconsumeTimes(v2.consumeRetryTimes);
+ v1.setProducerGroup(v2.a);
+ v1.setTopic(v2.b);
+ v1.setDefaultTopic(v2.c);
+ v1.setDefaultTopicQueueNums(v2.d);
+ v1.setQueueId(v2.e);
+ v1.setSysFlag(v2.f);
+ v1.setBornTimestamp(v2.g);
+ v1.setFlag(v2.h);
+ v1.setProperties(v2.i);
+ v1.setReconsumeTimes(v2.j);
+ v1.setUnitMode(v2.k);
+ v1.setMaxReconsumeTimes(v2.l);
return v1;
}
public static SendMessageRequestHeaderV2 createSendMessageRequestHeaderV2(final SendMessageRequestHeader v1) {
SendMessageRequestHeaderV2 v2 = new SendMessageRequestHeaderV2();
- v2.producerGroup = v1.getProducerGroup();
- v2.topic = v1.getTopic();
- v2.defaultTopic = v1.getDefaultTopic();
- v2.defaultTopicQueueNums = v1.getDefaultTopicQueueNums();
- v2.queueId = v1.getQueueId();
- v2.sysFlag = v1.getSysFlag();
- v2.bornTimestamp = v1.getBornTimestamp();
- v2.flag = v1.getFlag();
- v2.properties = v1.getProperties();
- v2.reconsumeTimes = v1.getReconsumeTimes();
- v2.unitMode = v1.isUnitMode();
- v2.consumeRetryTimes = v1.getMaxReconsumeTimes();
+ v2.a = v1.getProducerGroup();
+ v2.b = v1.getTopic();
+ v2.c = v1.getDefaultTopic();
+ v2.d = v1.getDefaultTopicQueueNums();
+ v2.e = v1.getQueueId();
+ v2.f = v1.getSysFlag();
+ v2.g = v1.getBornTimestamp();
+ v2.h = v1.getFlag();
+ v2.i = v1.getProperties();
+ v2.j = v1.getReconsumeTimes();
+ v2.k = v1.isUnitMode();
+ v2.l = v1.getMaxReconsumeTimes();
return v2;
}
@@ -90,122 +91,122 @@ public class SendMessageRequestHeaderV2 implements CommandCustomHeader {
public void checkFields() throws RemotingCommandException {
}
- public String getProducerGroup() {
- return producerGroup;
+ public String getA() {
+ return a;
}
- public void setProducerGroup(String producerGroup) {
- this.producerGroup = producerGroup;
+ public void setA(String a) {
+ this.a = a;
}
- public String getTopic() {
- return topic;
+ public String getB() {
+ return b;
}
- public void setTopic(String topic) {
- this.topic = topic;
+ public void setB(String b) {
+ this.b = b;
}
- public String getDefaultTopic() {
- return defaultTopic;
+ public String getC() {
+ return c;
}
- public void setDefaultTopic(String defaultTopic) {
- this.defaultTopic = defaultTopic;
+ public void setC(String c) {
+ this.c = c;
}
- public Integer getDefaultTopicQueueNums() {
- return defaultTopicQueueNums;
+ public Integer getD() {
+ return d;
}
- public void setDefaultTopicQueueNums(Integer defaultTopicQueueNums) {
- this.defaultTopicQueueNums = defaultTopicQueueNums;
+ public void setD(Integer d) {
+ this.d = d;
}
- public Integer getQueueId() {
- return queueId;
+ public Integer getE() {
+ return e;
}
- public void setQueueId(Integer queueId) {
- this.queueId = queueId;
+ public void setE(Integer e) {
+ this.e = e;
}
- public Integer getSysFlag() {
- return sysFlag;
+ public Integer getF() {
+ return f;
}
- public void setSysFlag(Integer sysFlag) {
- this.sysFlag = sysFlag;
+ public void setF(Integer f) {
+ this.f = f;
}
- public Long getBornTimestamp() {
- return bornTimestamp;
+ public Long getG() {
+ return g;
}
- public void setBornTimestamp(Long bornTimestamp) {
- this.bornTimestamp = bornTimestamp;
+ public void setG(Long g) {
+ this.g = g;
}
- public Integer getFlag() {
- return flag;
+ public Integer getH() {
+ return h;
}
- public void setFlag(Integer flag) {
- this.flag = flag;
+ public void setH(Integer h) {
+ this.h = h;
}
- public String getProperties() {
- return properties;
+ public String getI() {
+ return i;
}
- public void setProperties(String properties) {
- this.properties = properties;
+ public void setI(String i) {
+ this.i = i;
}
- public Integer getReconsumeTimes() {
- return reconsumeTimes;
+ public Integer getJ() {
+ return j;
}
- public void setReconsumeTimes(Integer reconsumeTimes) {
- this.reconsumeTimes = reconsumeTimes;
+ public void setJ(Integer j) {
+ this.j = j;
}
- public boolean isUnitMode() {
- return unitMode;
+ public boolean isK() {
+ return k;
}
- public void setUnitMode(boolean unitMode) {
- this.unitMode = unitMode;
+ public void setK(boolean k) {
+ this.k = k;
}
- public Integer getConsumeRetryTimes() {
- return consumeRetryTimes;
+ public Integer getL() {
+ return l;
}
- public void setConsumeRetryTimes(final Integer consumeRetryTimes) {
- this.consumeRetryTimes = consumeRetryTimes;
+ public void setL(final Integer l) {
+ this.l = l;
}
-}
+}
\ No newline at end of file
[2/5] incubator-rocketmq git commit: Remove native characters in
README. reviewed by @vongosling
Posted by lo...@apache.org.
Remove native characters in README. reviewed by @vongosling
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/b72519d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/b72519d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/b72519d9
Branch: refs/heads/master
Commit: b72519d9c5908e3376f525b286723a23a7bbf0a8
Parents: c818198
Author: stevenschew <st...@apache.org>
Authored: Tue Dec 20 10:16:13 2016 +0800
Committer: lollipop <lo...@apache.org>
Committed: Tue Dec 20 12:09:41 2016 +0800
----------------------------------------------------------------------
bin/README.md | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/b72519d9/bin/README.md
----------------------------------------------------------------------
diff --git a/bin/README.md b/bin/README.md
index 58903a1..d028475 100644
--- a/bin/README.md
+++ b/bin/README.md
@@ -1,34 +1,37 @@
-### \u64cd\u4f5c\u7cfb\u7edf\u8c03\u4f18
-\u5728\u751f\u4ea7\u73af\u5883\u90e8\u7f72Broker\u524d\uff0c\u5fc5\u987b\u8981\u6267\u884cos.sh\uff0c\u5bf9\u64cd\u4f5c\u7cfb\u7edf\u8fdb\u884c\u8c03\u4f18
+### Operating system tuning
+Before the broker deployment, you must run **os.sh**, which is optimized for your operating system.
-**P.S: os.sh\u53ea\u80fd\u6267\u884c\u4e00\u6b21\uff0c\u9700\u8981sudo root\u6743\u9650**
+## Notice
+### os.sh should be executed only once with the root permission.
+### os.sh parameter settings is just for reference. You can tune it in your target host systems.
-### \u542f\u52a8broker
-* Unix\u5e73\u53f0
- `nohup sh mqbroker &`
+### Start broker
+* Unix platform
-* Windows\u5e73\u53f0\uff08\u4ec5\u652f\u630164\u4f4d\uff09
+ `nohup sh mqbroker &`
- `mqbroker.exe`
+* Windows platform\uff08Only support 64 bit\uff09
-### \u5173\u95edbroker
- sh mqshutdown broker
+ `mqbroker.exe`
-### \u542f\u52a8Name Server
-* Unix\u5e73\u53f0
+### Shutodwn broker
+ sh mqshutdown broker
- `nohup sh mqnamesrv &`
+### Start Nameserver
+* Unix platform
-* Windows\u5e73\u53f0\uff08\u4ec5\u652f\u630164\u4f4d\uff09
+ `nohup sh mqnamesrv &`
- `mqnamesrv.exe`
+* Windows platform\uff08Only support 64 bit\uff09
-### \u5173\u95edName Server
- sh mqshutdown namesrv
+ `mqnamesrv.exe`
-### \u66f4\u65b0\u6216\u521b\u5efaTopic
- sh mqadmin updateTopic -b 127.0.0.1:10911 -t TopicA
+### Shutdown Nameserver
+ sh mqshutdown namesrv
-### \u66f4\u65b0\u6216\u521b\u5efa\u8ba2\u9605\u7ec4
- sh mqadmin updateSubGroup -b 127.0.0.1:10911 -g SubGroupA
\ No newline at end of file
+### Update or create Topic
+ sh mqadmin updateTopic -b 127.0.0.1:10911 -t TopicA
+
+### Update or create subscription group
+ sh mqadmin updateSubGroup -b 127.0.0.1:10911 -g SubGroupA
\ No newline at end of file