Skip to content

Commit

Permalink
Synchronize the enterprise version to reduce conflicts (vesoft-inc#441)
Browse files Browse the repository at this point in the history
#### What type of PR is this?
- [ ] bug
- [ ] feature
- [X] enhancement

#### What does this PR do?
Because this feature has been modified in the enterprise version, in order to avoid a large number of conflicts with the enterprise version, it is synchronized in the community version.

#### Which issue(s)/PR(s) this PR relates to?

  
#### Special notes for your reviewer, ex. impact of this fix, etc:


#### Additional context/ Design document:


#### Checklist:
- [ ] Documentation affected (Please add the label if documentation needs to be modified.)
- [ ] Incompatibility (If it breaks the compatibility, please describe it and add the corresponding label.)
- [ ] If it's needed to cherry-pick (If cherry-pick to some branches is required, please label the destination version(s).)
- [ ] Performance impacted: Consumes more CPU/Memory

#### Release notes:

Please confirm whether to be reflected in release notes and how to describe:
>                                                                 `


Migrated from vesoft-inc#3588

Co-authored-by: panda-sheep <59197347+panda-sheep@users.noreply.github.com>
  • Loading branch information
nebula-bots and panda-sheep authored Jan 6, 2022
1 parent cff8082 commit a840f87
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 42 deletions.
41 changes: 0 additions & 41 deletions src/graph/executor/admin/ShowTSClientsExecutor.cpp

This file was deleted.

2 changes: 1 addition & 1 deletion src/storage/InternalStorageServiceHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class InternalStorageServiceHandler final : public cpp2::InternalStorageServiceS
folly::Future<cpp2::ExecResponse> future_syncData(const cpp2::SyncDataRequest& req) override;

folly::Future<cpp2::ExecResponse> future_chainDeleteEdges(
const cpp2::ChainDeleteEdgesRequest& p_req);
const cpp2::ChainDeleteEdgesRequest& p_req) override;

private:
StorageEnv* env_{nullptr};
Expand Down

0 comments on commit a840f87

Please sign in to comment.