From 568c2df4da824e15c52fa91d444e64827575c00d Mon Sep 17 00:00:00 2001 From: "scott.wang" <scottwangsxll@gmail.com> Date: Fri, 13 Mar 2020 14:56:20 +0800 Subject: [PATCH] Delete unused method --- registry/kubernetes/listener_test.go | 3 +-- registry/kubernetes/registry.go | 1 + remoting/kubernetes/client.go | 12 ------------ remoting/kubernetes/store_test.go | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/registry/kubernetes/listener_test.go b/registry/kubernetes/listener_test.go index 866f594d3..152f2adf9 100644 --- a/registry/kubernetes/listener_test.go +++ b/registry/kubernetes/listener_test.go @@ -18,7 +18,6 @@ package kubernetes import ( - "context" "testing" ) @@ -34,7 +33,7 @@ import ( func Test_DataChange(t *testing.T) { listener := NewRegistryDataListener(&MockDataListener{}) - url, _ := common.NewURL(context.TODO(), "jsonrpc%3A%2F%2F127.0.0.1%3A20001%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26app.version%3D0.0.1%26application%3DBDTService%26category%3Dproviders%26cluster%3Dfailover%26dubbo%3Ddubbo-provider-golang-2.6.0%26environment%3Ddev%26group%3D%26interface%3Dcom.ikurento.user.UserProvider%26ip%3D10.32.20.124%26loadbalance%3Drandom%26methods.GetUser.loadbalance%3Drandom%26methods.GetUser.retries%3D1%26methods.GetUser.weight%3D0%26module%3Ddubbogo%2Buser-info%2Bserver%26name%3DBDTService%26organization%3Dikurento.com%26owner%3DZX%26pid%3D74500%26retries%3D0%26service.filter%3Decho%26side%3Dprovider%26timestamp%3D1560155407%26version%3D%26warmup%3D100") + url, _ := common.NewURL("jsonrpc%3A%2F%2F127.0.0.1%3A20001%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26app.version%3D0.0.1%26application%3DBDTService%26category%3Dproviders%26cluster%3Dfailover%26dubbo%3Ddubbo-provider-golang-2.6.0%26environment%3Ddev%26group%3D%26interface%3Dcom.ikurento.user.UserProvider%26ip%3D10.32.20.124%26loadbalance%3Drandom%26methods.GetUser.loadbalance%3Drandom%26methods.GetUser.retries%3D1%26methods.GetUser.weight%3D0%26module%3Ddubbogo%2Buser-info%2Bserver%26name%3DBDTService%26organization%3Dikurento.com%26owner%3DZX%26pid%3D74500%26retries%3D0%26service.filter%3Decho%26side%3Dprovider%26timestamp%3D1560155407%26version%3D%26warmup%3D100") listener.AddInterestedURL(&url) int := listener.DataChange(remoting.Event{Path: "/dubbo/com.ikurento.user.UserProvider/providers/jsonrpc%3A%2F%2F127.0.0.1%3A20001%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26app.version%3D0.0.1%26application%3DBDTService%26category%3Dproviders%26cluster%3Dfailover%26dubbo%3Ddubbo-provider-golang-2.6.0%26environment%3Ddev%26group%3D%26interface%3Dcom.ikurento.user.UserProvider%26ip%3D10.32.20.124%26loadbalance%3Drandom%26methods.GetUser.loadbalance%3Drandom%26methods.GetUser.retries%3D1%26methods.GetUser.weight%3D0%26module%3Ddubbogo%2Buser-info%2Bserver%26name%3DBDTService%26organization%3Dikurento.com%26owner%3DZX%26pid%3D74500%26retries%3D0%26service.filter%3Decho%26side%3Dprovider%26timestamp%3D1560155407%26version%3D%26warmup%3D100"}) assert.Equal(t, true, int) diff --git a/registry/kubernetes/registry.go b/registry/kubernetes/registry.go index 7880cf3a9..61ac32fb4 100644 --- a/registry/kubernetes/registry.go +++ b/registry/kubernetes/registry.go @@ -61,6 +61,7 @@ func init() { type kubernetesRegistry struct { *common.URL birth int64 // time of file birth, seconds since Epoch; 0 if unknown + registry.BaseRegistry cltLock sync.Mutex client *kubernetes.Client diff --git a/remoting/kubernetes/client.go b/remoting/kubernetes/client.go index 794491ebc..dd1c0a391 100644 --- a/remoting/kubernetes/client.go +++ b/remoting/kubernetes/client.go @@ -597,18 +597,6 @@ func (c *Client) GetChildren(k string) ([]string, []string, error) { return kList, vList, nil } -// Get -// get k's value from kubernetes-store -func (c *Client) Get(k string) (string, error) { - - objectList, err := c.store.Get(k, false) - if err != nil { - return "", perrors.WithMessagef(err, "get from store on (%s)", k) - } - - return objectList[0].Value, nil -} - // Watch // watch on spec key func (c *Client) Watch(k string) (<-chan *Object, error) { diff --git a/remoting/kubernetes/store_test.go b/remoting/kubernetes/store_test.go index e4acee4b3..2bc8b277a 100644 --- a/remoting/kubernetes/store_test.go +++ b/remoting/kubernetes/store_test.go @@ -28,7 +28,7 @@ import ( func TestStore(t *testing.T) { - ctx, cancel := context.WithTimeout(context.Background(), 4*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() s := newStore(ctx) -- GitLab