tianxiaoliang commented on a change in pull request #228: URL: https://github.com/apache/servicecomb-kie/pull/228#discussion_r757192064
########## File path: server/datasource/etcd/kv/kv_dao_trans.go ########## @@ -0,0 +1,239 @@ +/* + * 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 kv + +import ( + "context" + "encoding/json" + + "github.com/go-chassis/cari/sync" + "github.com/go-chassis/openlog" + "github.com/little-cui/etcdadpt" + + "github.com/apache/servicecomb-kie/pkg/model" + "github.com/apache/servicecomb-kie/server/datasource" + "github.com/apache/servicecomb-kie/server/datasource/etcd/key" +) + +func (s *Dao) createWithTask(ctx context.Context, kv *model.KVDoc) (*model.KVDoc, error) { + kvBytes, err := json.Marshal(kv) + if err != nil { + openlog.Error("marshal kv ") + return nil, err + } + task, err := datasource.NewTask(datasource.CreateAction, datasource.ConfigResource) + if err != nil { + openlog.Error("fail to create task" + err.Error()) + return nil, err + } + task.Data = kv + taskBytes, err := json.Marshal(task) + if err != nil { + openlog.Error("fail to marshal task ") + return nil, err + } + kvOpPut := etcdadpt.OpPut(etcdadpt.WithStrKey(key.KV(kv.Domain, kv.Project, kv.ID)), etcdadpt.WithValue(kvBytes)) + taskOpPut := etcdadpt.OpPut(etcdadpt.WithStrKey(key.TaskKey(kv.Domain, kv.Project, task.TaskID, task.Timestamp)), etcdadpt.WithValue(taskBytes)) + err = etcdadpt.Txn(ctx, []etcdadpt.OpOptions{kvOpPut, taskOpPut}) + if err != nil { + openlog.Error("create error", openlog.WithTags(openlog.Tags{ + "err": err.Error(), + "kv": kv, + "task": task, + })) + return nil, err + } + return kv, nil +} + +func (s *Dao) updateWithTask(ctx context.Context, kv *model.KVDoc) error { + keyKV := key.KV(kv.Domain, kv.Project, kv.ID) + resp, err := etcdadpt.Get(ctx, keyKV) + if err != nil { + openlog.Error(err.Error()) + return err + } + if resp == nil { + return datasource.ErrKeyNotExists + } + + var old model.KVDoc + err = json.Unmarshal(resp.Value, &old) + if err != nil { + openlog.Error(err.Error()) + return err + } + old.LabelFormat = kv.LabelFormat + old.Value = kv.Value + old.Status = kv.Status + old.Checker = kv.Checker + old.UpdateTime = kv.UpdateTime + old.UpdateRevision = kv.UpdateRevision + + bytes, err := json.Marshal(old) + if err != nil { + openlog.Error(err.Error()) + return err + } + task, err := datasource.NewTask(datasource.UpdateAction, datasource.ConfigResource) + if err != nil { + openlog.Error("fail to create task" + err.Error()) + return err + } + // update data + task.Data = old + taskBytes, err := json.Marshal(task) + if err != nil { + openlog.Error(err.Error()) + return err + } + kvOpPut := etcdadpt.OpPut(etcdadpt.WithStrKey(keyKV), etcdadpt.WithValue(bytes)) + taskOpPut := etcdadpt.OpPut(etcdadpt.WithStrKey(key.TaskKey(kv.Domain, kv.Project, task.TaskID, task.Timestamp)), etcdadpt.WithValue(taskBytes)) + err = etcdadpt.Txn(ctx, []etcdadpt.OpOptions{kvOpPut, taskOpPut}) + if err != nil { + openlog.Error("update error", openlog.WithTags(openlog.Tags{ + "err": err.Error(), + "kv": kv, + "task": task, + })) + return err + } + return nil +} + +func (s *Dao) findOneAndDeleteWithTask(ctx context.Context, kvID, project, domain string) (*model.KVDoc, error) { + kvKey := key.KV(domain, project, kvID) + kvDoc := model.KVDoc{} + kvResp, err := etcdadpt.Get(ctx, kvKey) + if err != nil { + openlog.Error(err.Error()) + return nil, err + } + if kvResp == nil { + return nil, datasource.ErrKeyNotExists + } + err = json.Unmarshal(kvResp.Value, &kvDoc) + if err != nil { + openlog.Error("fail to unmarshal kv" + err.Error()) + return nil, err + } + // create task + task, err := datasource.NewTask(datasource.DeleteAction, datasource.ConfigResource) + if err != nil { + openlog.Error("fail to create task" + err.Error()) + return nil, err + } + + task.Data = kvDoc + taskBytes, err := json.Marshal(task) + if err != nil { + openlog.Error("fail to marshal task" + err.Error()) + return nil, err + } + // create tombstone Review comment: 减少行间注释，增加函数注释，或者抽取函数，可以参考单一职责设计原则 ########## File path: server/datasource/etcd/kv/kv_dao.go ########## @@ -60,17 +69,24 @@ func (s *Dao) Create(ctx context.Context, kv *model.KVDoc) (*model.KVDoc, error) } //Update update key value -func (s *Dao) Update(ctx context.Context, kv *model.KVDoc) error { - keyKv := key.KV(kv.Domain, kv.Project, kv.ID) - resp, err := etcdadpt.Get(ctx, keyKv) +func (s *Dao) Update(ctx context.Context, kv *model.KVDoc, options ...datasource.CUDOption) error { + opts := datasource.NewDefaultCUDOpts() + for _, op := range options { + op(&opts) + } + // if syncEnable is true, will create kv with task + if opts.SyncEnable { + return s.updateWithTask(ctx, kv) Review comment: 这里必须是createWithTask -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
