Merge pull request #53 from zhaoyunxing92/nacos

add:nacos client

database/kv/nacos/client.go

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package nacos
+
+import (
+	"sync"
+)
+
+import (
+	"github.com/nacos-group/nacos-sdk-go/clients"
+	"github.com/nacos-group/nacos-sdk-go/clients/config_client"
+	"github.com/nacos-group/nacos-sdk-go/clients/naming_client"
+	"github.com/nacos-group/nacos-sdk-go/common/constant"
+	"github.com/nacos-group/nacos-sdk-go/vo"
+)
+
+var (
+	clientPool     nacosClientPool
+	clientPoolOnce sync.Once
+)
+
+var (
+	configClientPool     nacosConfigClientPool
+	configClientPoolOnce sync.Once
+)
+
+type nacosClientPool struct {
+	sync.Mutex
+	namingClient map[string]naming_client.INamingClient
+}
+
+type nacosConfigClientPool struct {
+	sync.Mutex
+	configClient map[string]config_client.IConfigClient
+}
+
+func initNacosClientPool() {
+	clientPool.namingClient = make(map[string]naming_client.INamingClient)
+}
+
+func initNacosConfigClientPool() {
+	configClientPool.configClient = make(map[string]config_client.IConfigClient)
+}
+
+// NewNacosNamingClient create nacos client
+func NewNacosNamingClient(name string, share bool, sc []constant.ServerConfig,
+	cc constant.ClientConfig) (naming_client.INamingClient, error) {
+	if !share {
+		return newNamingClient(sc, cc)
+	}
+	clientPoolOnce.Do(initNacosClientPool)
+	clientPool.Lock()
+	defer clientPool.Unlock()
+	if client, ok := clientPool.namingClient[name]; ok {
+		return client, nil
+	}
+
+	client, err := newNamingClient(sc, cc)
+	if err == nil {
+		clientPool.namingClient[name] = client
+	}
+	return client, err
+}
+
+// NewNacosConfigClient create config client
+func NewNacosConfigClient(name string, share bool, sc []constant.ServerConfig,
+	cc constant.ClientConfig) (config_client.IConfigClient, error) {
+	if !share {
+		return newConfigClient(sc, cc)
+	}
+	configClientPoolOnce.Do(initNacosConfigClientPool)
+	configClientPool.Lock()
+	defer configClientPool.Unlock()
+	if client, ok := configClientPool.configClient[name]; ok {
+		return client, nil
+	}
+
+	client, err := newConfigClient(sc, cc)
+	if err == nil {
+		configClientPool.configClient[name] = client
+	}
+	return client, err
+}
+
+func newNamingClient(sc []constant.ServerConfig, cc constant.ClientConfig) (naming_client.INamingClient, error) {
+	cfg := vo.NacosClientParam{ClientConfig: &cc, ServerConfigs: sc}
+	return clients.NewNamingClient(cfg)
+}
+
+func newConfigClient(sc []constant.ServerConfig, cc constant.ClientConfig) (config_client.IConfigClient, error) {
+	cfg := vo.NacosClientParam{ClientConfig: &cc, ServerConfigs: sc}
+	return clients.NewConfigClient(cfg)
+}

database/kv/nacos/client_test.go

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package nacos
+
+import (
+	"testing"
+)
+
+import (
+	"github.com/nacos-group/nacos-sdk-go/common/constant"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewNacosClient(t *testing.T) {
+
+	scs := []constant.ServerConfig{
+		*constant.NewServerConfig("console.nacos.io", 80),
+	}
+
+	cc := constant.ClientConfig{
+		TimeoutMs:           5 * 1000,
+		NotLoadCacheAtStart: true,
+	}
+
+	t.Run("naming_client", func(t *testing.T) {
+		client1, err := NewNacosNamingClient("nacos", true, scs, cc)
+		client2, err := NewNacosNamingClient("nacos", true, scs, cc)
+		client3, err := NewNacosNamingClient("nacos", false, scs, cc)
+		client4, err := NewNacosNamingClient("test", true, scs, cc)
+
+		assert.Nil(t, err)
+		assert.Equal(t, client1, client2)
+		assert.NotEqual(t, client1, client3)
+		assert.NotEqual(t, client1, client4)
+	})
+
+	t.Run("config_client", func(t *testing.T) {
+		client1, err := NewNacosConfigClient("nacos", true, scs, cc)
+		client2, err := NewNacosConfigClient("nacos", true, scs, cc)
+		client3, err := NewNacosConfigClient("nacos", false, scs, cc)
+		client4, err := NewNacosConfigClient("test", true, scs, cc)
+
+		assert.Nil(t, err)
+		assert.Equal(t, client1, client2)
+		assert.Equal(t, client1, client3)
+		assert.Equal(t, client1, client4)
+	})
+}

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/k0kubun/pp v3.0.1+incompatible
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/mattn/go-isatty v0.0.12
+	github.com/nacos-group/nacos-sdk-go v1.0.8
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.9.0 // indirect

time/ticker_test.go

@@ -43,8 +43,8 @@ func TestTickFunc(t *testing.T) {
 	cw.Start()
 	TickFunc(TimeSecondDuration(0.5), f)
 	TickFunc(TimeSecondDuration(1.3), f)
-	TickFunc(TimeSecondDuration(61.5), f)
-	time.Sleep(62e9)
+	TickFunc(TimeSecondDuration(6.5), f)
+	time.Sleep(6e9)
 	// xassert.Equal(defaultTimerWheel.TimerNumber(), num, "") // just equal in this ut
 }
 

time/wheel_test.go

@@ -40,7 +40,7 @@ func TestWheel(t *testing.T) {
 
 	cw.Start()
 	for {
-		<-wheel.After(TimeMillisecondDuration(1000))
+		<-wheel.After(TimeMillisecondDuration(100))
 		t.Log("loop:", index)
 		index++
 		if index >= 30 {