remove get then put method

projecteru2 · Dec 4, 2019 · af8c8e4 · af8c8e4
1 parent ea6bab7
commit af8c8e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/store/etcdv3/container.go b/store/etcdv3/container.go
@@ -90,8 +90,9 @@ func (m *Mercury) SetContainerStatus(ctx context.Context, container *types.Conta
 		}
 		opts = append(opts, clientv3.WithLease(lease.ID))
 	}
-	containerKey := fmt.Sprintf(containerInfoKey, container.ID)
-	_, err = m.GetThenPut(ctx, []string{containerKey}, statusKey, string(data), opts...)
+	ops := []clientv3.Op{clientv3.OpPut(statusKey, string(data), opts...)}
+	conds := []clientv3.Cmp{clientv3.Compare(clientv3.Version(fmt.Sprintf(containerInfoKey, container.ID)), "!=", 0)}
+	_, err = m.doBatchOp(ctx, conds, ops, []clientv3.Op{})
 	return err
 }
 

diff --git a/store/etcdv3/mercury.go b/store/etcdv3/mercury.go
@@ -153,17 +153,6 @@ func (m *Mercury) Update(ctx context.Context, key, val string, opts ...clientv3.
 	return m.batchUpdate(ctx, map[string]string{key: val}, opts...)
 }
 
-// GetThenPut if key exists, then put
-func (m *Mercury) GetThenPut(ctx context.Context, getKeys []string, key, val string, opts ...clientv3.OpOption) (*clientv3.TxnResponse, error) {
-	ops := []clientv3.Op{clientv3.OpPut(key, val, opts...)}
-	conds := []clientv3.Cmp{}
-	for _, getKey := range getKeys {
-		cond := clientv3.Compare(clientv3.Version(getKey), "!=", 0)
-		conds = append(conds, cond)
-	}
-	return m.doBatchOp(ctx, conds, ops, []clientv3.Op{})
-}
-
 // Watch wath a key
 func (m *Mercury) watch(ctx context.Context, key string, opts ...clientv3.OpOption) clientv3.WatchChan {
 	return m.cliv3.Watch(ctx, key, opts...)