You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2019/08/13 12:50:34 UTC
[dubbo-go] branch develop updated: Mod: translate Chinese comments
to English
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/develop by this push:
new 828dce7 Mod: translate Chinese comments to English
new 9bcb593 Merge pull request #165 from amudong/develop
828dce7 is described below
commit 828dce733b52d4462a5a77102a0212e63ad1c4b3
Author: amudong <xi...@gmail.com>
AuthorDate: Tue Aug 13 20:47:12 2019 +0800
Mod: translate Chinese comments to English
---
cluster/cluster_impl/base_cluster_invoker.go | 2 +-
config_center/zookeeper/impl.go | 2 +-
.../zookeeper/dubbo/with-configcenter-go-client/app/client.go | 4 ++--
.../zookeeper/dubbo/with-configcenter-go-client/app/user.go | 2 +-
.../zookeeper/dubbo/with-configcenter-go-server/app/server.go | 2 +-
.../zookeeper/dubbo/with-configcenter-go-server/app/user.go | 2 +-
.../zookeeper/jsonrpc/with-configcenter-go-client/app/client.go | 2 +-
.../zookeeper/jsonrpc/with-configcenter-go-server/app/server.go | 2 +-
examples/general/dubbo/go-client/app/client.go | 2 +-
examples/general/dubbo/go-client/app/user.go | 2 +-
examples/general/dubbo/go-server/app/server.go | 2 +-
examples/general/dubbo/go-server/app/user.go | 4 ++--
.../java-client/src/main/java/com/ikurento/user/Consumer.java | 6 +++---
.../src/main/java/com/ikurento/user/UserProviderAnotherImpl.java | 4 ++--
.../src/main/java/com/ikurento/user/UserProviderImpl.java | 4 ++--
examples/general/jsonrpc/go-client/app/client.go | 2 +-
examples/general/jsonrpc/go-server/app/server.go | 2 +-
.../java-client/src/main/java/com/ikurento/user/Consumer.java | 6 +++---
.../src/main/java/com/ikurento/user/UserProviderAnotherImpl.java | 4 ++--
.../src/main/java/com/ikurento/user/UserProviderImpl.java | 4 ++--
examples/helloworld/dubbo/go-server/app/server.go | 2 +-
.../src/main/java/com/ikurento/user/UserProviderImpl.java | 2 +-
registry/zookeeper/listener.go | 2 +-
registry/zookeeper/registry.go | 8 ++++----
remoting/zookeeper/facade.go | 4 ++--
25 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/cluster/cluster_impl/base_cluster_invoker.go b/cluster/cluster_impl/base_cluster_invoker.go
index 2426258..d42a099 100644
--- a/cluster/cluster_impl/base_cluster_invoker.go
+++ b/cluster/cluster_impl/base_cluster_invoker.go
@@ -84,7 +84,7 @@ func (invoker *baseClusterInvoker) checkWhetherDestroyed() error {
}
func (invoker *baseClusterInvoker) doSelect(lb cluster.LoadBalance, invocation protocol.Invocation, invokers []protocol.Invoker, invoked []protocol.Invoker) protocol.Invoker {
- //todo:ticky connect 粘纸连接
+ //todo:sticky connect
if len(invokers) == 1 {
return invokers[0]
}
diff --git a/config_center/zookeeper/impl.go b/config_center/zookeeper/impl.go
index ef0761e..f2827b2 100644
--- a/config_center/zookeeper/impl.go
+++ b/config_center/zookeeper/impl.go
@@ -196,7 +196,7 @@ func (r *zookeeperDynamicConfiguration) closeConfigs() {
r.cltLock.Lock()
defer r.cltLock.Unlock()
logger.Infof("begin to close provider zk client")
- // 先关闭旧client，以关闭tmp node
+ // Close the old client first to close the tmp node
r.client.Close()
r.client = nil
}
diff --git a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go
index fb2e0ef..5da8506 100644
--- a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go
+++ b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/client.go
@@ -27,7 +27,7 @@ import (
)
import (
- "github.com/apache/dubbo-go-hessian2"
+ hessian "github.com/apache/dubbo-go-hessian2"
)
import (
@@ -140,7 +140,7 @@ func initSignal() {
os.Exit(1)
})
- // 要么fastFailTimeout时间内执行完毕下面的逻辑然后程序退出，要么执行上面的超时函数程序强行退出
+ // The program exits normally or timeout forcibly exits.//
fmt.Println("app exit now...")
return
}
diff --git a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go
index 8140aca..5bddf1e 100644
--- a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go
+++ b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-client/app/user.go
@@ -83,7 +83,7 @@ type User struct {
Name string
Age int32
Time time.Time
- Sex Gender // 注意此处，java enum Object <--> go string
+ Sex Gender // notice: java enum Object <--> go string
}
func (u User) String() string {
diff --git a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-server/app/server.go b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-server/app/server.go
index 8149785..cd98299 100644
--- a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-server/app/server.go
+++ b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-server/app/server.go
@@ -78,7 +78,7 @@ func initSignal() {
os.Exit(1)
})
- // 要么fastFailTimeout时间内执行完毕下面的逻辑然后程序退出，要么执行上面的超时函数程序强行退出
+ // The program exits normally or timeout forcibly exits.
fmt.Println("provider app exit now...")
return
}
diff --git a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-server/app/user.go b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-server/app/user.go
index d0ac61e..0e4d057 100644
--- a/examples/configcenter/zookeeper/dubbo/with-configcenter-go-server/app/user.go
+++ b/examples/configcenter/zookeeper/dubbo/with-configcenter-go-server/app/user.go
@@ -84,7 +84,7 @@ type (
Name string
Age int32
Time time.Time
- Sex Gender // 注意此处，java enum Object <--> go string
+ Sex Gender // notice: java enum Object <--> go string
}
UserProvider struct {
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-configcenter-go-client/app/client.go b/examples/configcenter/zookeeper/jsonrpc/with-configcenter-go-client/app/client.go
index 642b45a..5b16347 100644
--- a/examples/configcenter/zookeeper/jsonrpc/with-configcenter-go-client/app/client.go
+++ b/examples/configcenter/zookeeper/jsonrpc/with-configcenter-go-client/app/client.go
@@ -125,7 +125,7 @@ func initSignal() {
os.Exit(1)
})
- // 要么fastFailTimeout时间内执行完毕下面的逻辑然后程序退出，要么执行上面的超时函数程序强行退出
+ // The program exits normally or timeout forcibly exits.
fmt.Println("app exit now...")
return
}
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-configcenter-go-server/app/server.go b/examples/configcenter/zookeeper/jsonrpc/with-configcenter-go-server/app/server.go
index 851a97c..0a0e729 100644
--- a/examples/configcenter/zookeeper/jsonrpc/with-configcenter-go-server/app/server.go
+++ b/examples/configcenter/zookeeper/jsonrpc/with-configcenter-go-server/app/server.go
@@ -67,7 +67,7 @@ func initSignal() {
os.Exit(1)
})
- // 要么fastFailTimeout时间内执行完毕下面的逻辑然后程序退出，要么执行上面的超时函数程序强行退出
+ // The program exits normally or timeout forcibly exits.
fmt.Println("provider app exit now...")
return
}
diff --git a/examples/general/dubbo/go-client/app/client.go b/examples/general/dubbo/go-client/app/client.go
index b7ee0e6..47f453c 100644
--- a/examples/general/dubbo/go-client/app/client.go
+++ b/examples/general/dubbo/go-client/app/client.go
@@ -86,7 +86,7 @@ func initSignal() {
os.Exit(1)
})
- // 要么fastFailTimeout时间内执行完毕下面的逻辑然后程序退出，要么执行上面的超时函数程序强行退出
+ // The program exits normally or timeout forcibly exits.
fmt.Println("app exit now...")
return
}
diff --git a/examples/general/dubbo/go-client/app/user.go b/examples/general/dubbo/go-client/app/user.go
index affa541..104d325 100644
--- a/examples/general/dubbo/go-client/app/user.go
+++ b/examples/general/dubbo/go-client/app/user.go
@@ -89,7 +89,7 @@ type User struct {
Name string
Age int32
Time time.Time
- Sex Gender // 注意此处，java enum Object <--> go string
+ Sex Gender // notice: java enum Object <--> go string
}
func (u User) String() string {
diff --git a/examples/general/dubbo/go-server/app/server.go b/examples/general/dubbo/go-server/app/server.go
index de9c287..ac92b87 100644
--- a/examples/general/dubbo/go-server/app/server.go
+++ b/examples/general/dubbo/go-server/app/server.go
@@ -79,7 +79,7 @@ func initSignal() {
os.Exit(1)
})
- // 要么fastFailTimeout时间内执行完毕下面的逻辑然后程序退出，要么执行上面的超时函数程序强行退出
+ // The program exits normally or timeout forcibly exits.
fmt.Println("provider app exit now...")
return
}
diff --git a/examples/general/dubbo/go-server/app/user.go b/examples/general/dubbo/go-server/app/user.go
index ce53bca..e07a02e 100644
--- a/examples/general/dubbo/go-server/app/user.go
+++ b/examples/general/dubbo/go-server/app/user.go
@@ -24,7 +24,7 @@ import (
)
import (
- "github.com/apache/dubbo-go-hessian2"
+ hessian "github.com/apache/dubbo-go-hessian2"
)
type Gender hessian.JavaEnum
@@ -73,7 +73,7 @@ type (
Name string
Age int32
Time time.Time
- Sex Gender // 注意此处，java enum Object <--> go string
+ Sex Gender // notice: java enum Object <--> go string
}
)
diff --git a/examples/general/dubbo/java-client/src/main/java/com/ikurento/user/Consumer.java b/examples/general/dubbo/java-client/src/main/java/com/ikurento/user/Consumer.java
index 9122a62..5c9870e 100644
--- a/examples/general/dubbo/java-client/src/main/java/com/ikurento/user/Consumer.java
+++ b/examples/general/dubbo/java-client/src/main/java/com/ikurento/user/Consumer.java
@@ -17,12 +17,12 @@ import com.alibaba.dubbo.rpc.service.EchoService;
import java.util.List;
public class Consumer {
- //定义一个私有变量 （Spring中要求）
+ // Define a private variable (Required in Spring)
private UserProvider userProvider;
private UserProvider userProvider1;
private UserProvider userProvider2;
- //Spring注入（Spring中要求）
+ // Spring DI (Required in Spring)
public void setUserProvider(UserProvider u) {
this.userProvider = u;
}
@@ -33,7 +33,7 @@ public class Consumer {
this.userProvider2 = u;
}
- //启动consumer的入口函数(在配置文件中指定)
+ // Start the entry function for consumer (Specified in the configuration file)
public void start() throws Exception {
System.out.println("\n\ntest");
testGetUser();
diff --git a/examples/general/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderAnotherImpl.java b/examples/general/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderAnotherImpl.java
index d600545..04729fb 100644
--- a/examples/general/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderAnotherImpl.java
+++ b/examples/general/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderAnotherImpl.java
@@ -9,8 +9,8 @@ import org.slf4j.LoggerFactory;
import java.util.*;
public class UserProviderAnotherImpl implements UserProvider {
- // private static final Logger logger = LoggerFactory.getLogger(getClass()); // 只输出到dubbo的log(logs/server.log)
- private static final Logger logger = LoggerFactory.getLogger("userLogger"); // 输出到user-server.log
+ // private static final Logger logger = LoggerFactory.getLogger(getClass()); // Only output to dubbo's log(logs/server.log)
+ private static final Logger logger = LoggerFactory.getLogger("userLogger"); // Output to user-server.log
private Map<String, User> userMap = new HashMap<String, User>();
diff --git a/examples/general/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java b/examples/general/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java
index 47a4e2d..1efbf82 100644
--- a/examples/general/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java
+++ b/examples/general/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java
@@ -14,8 +14,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class UserProviderImpl implements UserProvider {
- // private static final Logger logger = LoggerFactory.getLogger(getClass()); // 只输出到dubbo的log(logs/server.log)
- private static final Logger LOG = LoggerFactory.getLogger("UserLogger"); // 输出到user-server.log
+ // private static final Logger logger = LoggerFactory.getLogger(getClass()); // Only output to dubbo's log(logs/server.log)
+ private static final Logger LOG = LoggerFactory.getLogger("UserLogger"); // Output to user-server.log
Map<String, User> userMap = new HashMap<String, User>();
public UserProviderImpl() {
diff --git a/examples/general/jsonrpc/go-client/app/client.go b/examples/general/jsonrpc/go-client/app/client.go
index b781f86..abbe586 100644
--- a/examples/general/jsonrpc/go-client/app/client.go
+++ b/examples/general/jsonrpc/go-client/app/client.go
@@ -78,7 +78,7 @@ func initSignal() {
os.Exit(1)
})
- // 要么fastFailTimeout时间内执行完毕下面的逻辑然后程序退出，要么执行上面的超时函数程序强行退出
+ // The program exits normally or timeout forcibly exits.
fmt.Println("app exit now...")
return
}
diff --git a/examples/general/jsonrpc/go-server/app/server.go b/examples/general/jsonrpc/go-server/app/server.go
index 231082b..e36b6ef 100644
--- a/examples/general/jsonrpc/go-server/app/server.go
+++ b/examples/general/jsonrpc/go-server/app/server.go
@@ -69,7 +69,7 @@ func initSignal() {
os.Exit(1)
})
- // 要么fastFailTimeout时间内执行完毕下面的逻辑然后程序退出，要么执行上面的超时函数程序强行退出
+ // The program exits normally or timeout forcibly exits.
fmt.Println("provider app exit now...")
return
}
diff --git a/examples/general/jsonrpc/java-client/src/main/java/com/ikurento/user/Consumer.java b/examples/general/jsonrpc/java-client/src/main/java/com/ikurento/user/Consumer.java
index 2c7b27b..1a38dbf 100644
--- a/examples/general/jsonrpc/java-client/src/main/java/com/ikurento/user/Consumer.java
+++ b/examples/general/jsonrpc/java-client/src/main/java/com/ikurento/user/Consumer.java
@@ -17,12 +17,12 @@ import com.alibaba.dubbo.rpc.service.EchoService;
import java.util.List;
public class Consumer {
- //定义一个私有变量 （Spring中要求）
+ // Define a private variable (Required in Spring)
private UserProvider userProvider;
private UserProvider userProvider1;
private UserProvider userProvider2;
- //Spring注入（Spring中要求）
+ // Spring DI (Required in Spring)
public void setUserProvider(UserProvider u) {
this.userProvider = u;
}
@@ -33,7 +33,7 @@ public class Consumer {
this.userProvider2 = u;
}
- //启动consumer的入口函数(在配置文件中指定)
+ // Start the entry function for consumer (Specified in the configuration file)
public void start() throws Exception {
System.out.println("\n\ntest");
testGetUser();
diff --git a/examples/general/jsonrpc/java-server/src/main/java/com/ikurento/user/UserProviderAnotherImpl.java b/examples/general/jsonrpc/java-server/src/main/java/com/ikurento/user/UserProviderAnotherImpl.java
index 753a6f8..9e22b78 100644
--- a/examples/general/jsonrpc/java-server/src/main/java/com/ikurento/user/UserProviderAnotherImpl.java
+++ b/examples/general/jsonrpc/java-server/src/main/java/com/ikurento/user/UserProviderAnotherImpl.java
@@ -9,8 +9,8 @@ import org.slf4j.LoggerFactory;
import java.util.*;
public class UserProviderAnotherImpl implements UserProvider {
- // private static final Logger logger = LoggerFactory.getLogger(getClass()); // 只输出到dubbo的log(logs/server.log)
- private static final Logger logger = LoggerFactory.getLogger("userLogger"); // 输出到user-server.log
+ // private static final Logger logger = LoggerFactory.getLogger(getClass()); // Only output to dubbo's log(logs/server.log)
+ private static final Logger logger = LoggerFactory.getLogger("userLogger"); // Output to user-server.log
private Map<String, User> userMap = new HashMap<String, User>();
diff --git a/examples/general/jsonrpc/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java b/examples/general/jsonrpc/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java
index 960c678..1ff8afa 100644
--- a/examples/general/jsonrpc/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java
+++ b/examples/general/jsonrpc/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java
@@ -14,8 +14,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class UserProviderImpl implements UserProvider {
- // private static final Logger logger = LoggerFactory.getLogger(getClass()); // 只输出到dubbo的log(logs/server.log)
- private static final Logger LOG = LoggerFactory.getLogger("UserLogger"); // 输出到user-server.log
+ // private static final Logger logger = LoggerFactory.getLogger(getClass()); // Only output to dubbo's log(logs/server.log)
+ private static final Logger LOG = LoggerFactory.getLogger("UserLogger"); // Output to user-server.log
Map<String, User> userMap = new HashMap<String, User>();
public UserProviderImpl() {
diff --git a/examples/helloworld/dubbo/go-server/app/server.go b/examples/helloworld/dubbo/go-server/app/server.go
index 29f2ad5..f02a6ba 100644
--- a/examples/helloworld/dubbo/go-server/app/server.go
+++ b/examples/helloworld/dubbo/go-server/app/server.go
@@ -69,7 +69,7 @@ func initSignal() {
os.Exit(1)
})
- // 要么fastFailTimeout时间内执行完毕下面的逻辑然后程序退出，要么执行上面的超时函数程序强行退出
+ // The program exits normally or timeout forcibly exits.
fmt.Println("provider app exit now...")
return
}
diff --git a/examples/helloworld/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java b/examples/helloworld/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java
index ddbccab..d57ae54 100644
--- a/examples/helloworld/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java
+++ b/examples/helloworld/dubbo/java-server/src/main/java/com/ikurento/user/UserProviderImpl.java
@@ -6,7 +6,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class UserProviderImpl implements UserProvider {
- private static final Logger LOG = LoggerFactory.getLogger("UserLogger"); // 输出到user-server.log
+ private static final Logger LOG = LoggerFactory.getLogger("UserLogger"); // Output to user��user-server.log
public User GetUser(String userId) {
return new User(userId, "zhangsan", 18);
diff --git a/registry/zookeeper/listener.go b/registry/zookeeper/listener.go
index 67f2037..19f2569 100644
--- a/registry/zookeeper/listener.go
+++ b/registry/zookeeper/listener.go
@@ -45,7 +45,7 @@ func (l *RegistryDataListener) AddInterestedURL(url *common.URL) {
}
func (l *RegistryDataListener) DataChange(eventType remoting.Event) bool {
- //截取最后一位
+ // Intercept the last bit
url := eventType.Path[strings.Index(eventType.Path, "/providers/")+len("/providers/"):]
serviceURL, err := common.NewURL(context.TODO(), url)
if err != nil {
diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go
index c272c5b..9ce3ee5 100644
--- a/registry/zookeeper/registry.go
+++ b/registry/zookeeper/registry.go
@@ -230,7 +230,7 @@ func (r *zkRegistry) Register(conf common.URL) error {
case common.PROVIDER:
- // 检验服务是否已经注册过
+ // Check if the service has been registered
r.cltLock.Lock()
// 注意此处与consumerZookeeperRegistry的差异，consumer用的是conf.Path，
// 因为consumer要提供watch功能给selector使用, provider允许注册同一个service的多个group or version
@@ -320,7 +320,7 @@ func (r *zkRegistry) register(c common.URL) error {
rawURL = fmt.Sprintf("%s://%s%s?%s", c.Protocol, host, c.Path, params.Encode())
encodedURL = url.QueryEscape(rawURL)
- // 把自己注册service providers
+ // Print your own registration service providers.
dubboPath = fmt.Sprintf("/dubbo/%s/%s", c.Service(), (common.RoleType(common.PROVIDER)).String())
logger.Debugf("provider path:%s, url:%s", dubboPath, rawURL)
@@ -416,7 +416,7 @@ func (r *zkRegistry) getListener(conf common.URL) (*RegistryConfigurationListene
r.listenerLock.Unlock()
}
- //注册到dataconfig的interested
+ //Interested register to dataconfig.
r.dataListener.AddInterestedURL(&conf)
go r.listener.ListenServiceEvent(fmt.Sprintf("/dubbo/%s/providers", conf.Service()), r.dataListener)
@@ -428,7 +428,7 @@ func (r *zkRegistry) closeRegisters() {
r.cltLock.Lock()
defer r.cltLock.Unlock()
logger.Infof("begin to close provider zk client")
- // 先关闭旧client，以关闭tmp node
+ // Close the old client first to close the tmp node.
r.client.Close()
r.client = nil
r.services = nil
diff --git a/remoting/zookeeper/facade.go b/remoting/zookeeper/facade.go
index 4eace5e..cdc7ead 100644
--- a/remoting/zookeeper/facade.go
+++ b/remoting/zookeeper/facade.go
@@ -63,14 +63,14 @@ LOOP:
r.SetZkClient(nil)
r.ZkClientLock().Unlock()
- // 接zk，直至成功
+ // Connect zk until success.
failTimes = 0
for {
select {
case <-r.GetDone():
logger.Warnf("(ZkProviderRegistry)reconnectZkRegistry goroutine exit now...")
break LOOP
- case <-getty.GetTimeWheel().After(timeSecondDuration(failTimes * ConnDelay)): // 防止疯狂重连zk
+ case <-getty.GetTimeWheel().After(timeSecondDuration(failTimes * ConnDelay)): // Prevent crazy reconnection zk.
}
err = ValidateZookeeperClient(r, WithZkName(zkName))
logger.Infof("ZkProviderRegistry.validateZookeeperClient(zkAddr{%s}) = error{%#v}",