fix: escaped sql scripts make database deadlock

service/instance_test.go

@@ -61,6 +61,11 @@ func TestCreateInstance(t *testing.T) {
 	defer discoverSuit.cleanServiceName(serviceResp.GetName().GetValue(), serviceResp.GetNamespace().GetValue())
 
 	t.Run("正常创建实例-服务没有提前创建", func(t *testing.T) {
+		bc := namingServer.bc
+		namingServer.bc = nil
+		defer func() {
+			namingServer.bc = bc
+		}()
 		instanceReq, instanceResp := discoverSuit.createCommonInstance(t, &apiservice.Service{
 			Name:      utils.NewStringValue("test-nocreate-service"),
 			Namespace: utils.NewStringValue(DefaultNamespace),

store/api.go

@@ -67,9 +67,6 @@ type NamespaceStore interface {
 	// UpdateNamespaceToken Update namespace token
 	UpdateNamespaceToken(name string, token string) error
 
-	// ListNamespaces Query all namespaces under Owner
-	ListNamespaces(owner string) ([]*model.Namespace, error)
-
 	// GetNamespace Get the details of the namespace according to Name
 	GetNamespace(name string) (*model.Namespace, error)
 

store/boltdb/namespace.go

@@ -131,25 +131,6 @@ func (n *namespaceStore) UpdateNamespaceToken(name string, token string) error {
 	return n.handler.UpdateValue(tblNameNamespace, name, properties)
 }
 
-// ListNamespaces query all namespaces by owner
-func (n *namespaceStore) ListNamespaces(owner string) ([]*model.Namespace, error) {
-	if owner == "" {
-		return nil, errors.New("store lst namespaces owner is empty")
-	}
-	values, err := n.handler.LoadValuesByFilter(
-		tblNameNamespace, []string{"Owner"}, &model.Namespace{}, func(value map[string]interface{}) bool {
-			ownerValue, ok := value["Owner"]
-			if !ok {
-				return false
-			}
-			return strings.Contains(ownerValue.(string), owner)
-		})
-	if err != nil {
-		return nil, err
-	}
-	return toNamespaces(values), nil
-}
-
 // GetNamespace query namespace by name
 func (n *namespaceStore) GetNamespace(name string) (*model.Namespace, error) {
 	values, err := n.handler.LoadValues(tblNameNamespace, []string{name}, &model.Namespace{})

store/boltdb/namespace_test.go

@@ -78,31 +78,6 @@ func TestNamespaceStore_AddNamespace(t *testing.T) {
 	}
 }
 
-func TestNamespaceStore_ListNamespaces(t *testing.T) {
-	_ = os.RemoveAll("./table.bolt")
-	handler, err := NewBoltHandler(&BoltConfig{FileName: "./table.bolt"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer handler.Close()
-	nsStore := &namespaceStore{handler: handler}
-
-	if err := InitNamespaceData(nsStore, nsCount); err != nil {
-		t.Fatal(err)
-	}
-
-	namespaces, err := nsStore.ListNamespaces(nsOwner)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, namespace := range namespaces {
-		fmt.Printf("namespace is %+v\n", namespace)
-	}
-	if len(namespaces) != nsCount {
-		t.Fatal(fmt.Sprintf("namespaces count not match, expect %d, got %d", nsCount, len(namespaces)))
-	}
-}
-
 func TestNamespaceStore_GetNamespaces(t *testing.T) {
 	_ = os.RemoveAll("./table.bolt")
 	handler, err := NewBoltHandler(&BoltConfig{FileName: "./table.bolt"})