From 421473b011ed64a0020999af4d700fafdc737cf7 Mon Sep 17 00:00:00 2001 From: liuyu <52276794+liuyu85cn@users.noreply.github.com> Date: Mon, 13 Dec 2021 16:30:11 +0800 Subject: [PATCH] update license & fix gcc compile error --- src/storage/mutate/DeleteEdgesProcessor.cpp | 2 +- src/storage/test/ChainDeleteEdgesTest.cpp | 3 +-- src/storage/transaction/ChainDeleteEdgesGroupProcessor.cpp | 7 +++---- src/storage/transaction/ChainDeleteEdgesGroupProcessor.h | 3 +-- src/storage/transaction/ChainDeleteEdgesLocalProcessor.cpp | 3 +-- src/storage/transaction/ChainDeleteEdgesLocalProcessor.h | 3 +-- .../transaction/ChainDeleteEdgesRemoteProcessor.cpp | 3 +-- src/storage/transaction/ChainDeleteEdgesRemoteProcessor.h | 3 +-- .../transaction/ChainDeleteEdgesResumeProcessor.cpp | 3 +-- src/storage/transaction/ChainDeleteEdgesResumeProcessor.h | 3 +-- .../transaction/ChainDeleteEdgesResumeRemoteProcessor.cpp | 7 +++---- .../transaction/ChainDeleteEdgesResumeRemoteProcessor.h | 3 +-- src/storage/transaction/ConsistTypes.h | 1 - 13 files changed, 16 insertions(+), 28 deletions(-) diff --git a/src/storage/mutate/DeleteEdgesProcessor.cpp b/src/storage/mutate/DeleteEdgesProcessor.cpp index 0f1ecb18bf6..d3f4fc8f5f9 100644 --- a/src/storage/mutate/DeleteEdgesProcessor.cpp +++ b/src/storage/mutate/DeleteEdgesProcessor.cpp @@ -86,7 +86,7 @@ void DeleteEdgesProcessor::process(const cpp2::DeleteEdgesRequest& req) { spaceId_, partId, std::move(para.result.value()), - [partId, this](nebula::cpp2::ErrorCode code) { handleAsync(spaceId_, partId, code); }); + [partId, this](nebula::cpp2::ErrorCode rc) { handleAsync(spaceId_, partId, rc); }); } else { doRemove(spaceId_, partId, std::move(keys)); } diff --git a/src/storage/test/ChainDeleteEdgesTest.cpp b/src/storage/test/ChainDeleteEdgesTest.cpp index 5584fa93204..d15db702e2f 100644 --- a/src/storage/test/ChainDeleteEdgesTest.cpp +++ b/src/storage/test/ChainDeleteEdgesTest.cpp @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * - * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. + * This source code is licensed under Apache 2.0 License. */ #include diff --git a/src/storage/transaction/ChainDeleteEdgesGroupProcessor.cpp b/src/storage/transaction/ChainDeleteEdgesGroupProcessor.cpp index a3c37330721..99c03e4eb10 100644 --- a/src/storage/transaction/ChainDeleteEdgesGroupProcessor.cpp +++ b/src/storage/transaction/ChainDeleteEdgesGroupProcessor.cpp @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * - * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. + * This source code is licensed under Apache 2.0 License. */ #include "storage/transaction/ChainDeleteEdgesGroupProcessor.h" @@ -30,7 +29,7 @@ void ChainDeleteEdgesGroupProcessor::process(const cpp2::DeleteEdgesRequest& req callingNum_ = splitedRequest.size(); - auto fnSplit = [&](auto& req) { + auto fnSplit = [&](auto& request) { auto* proc = ChainDeleteEdgesLocalProcessor::instance(env_); proc->getFuture().thenValue([=](auto&& resp) { auto code = resp.get_result().get_failed_parts().empty() @@ -38,7 +37,7 @@ void ChainDeleteEdgesGroupProcessor::process(const cpp2::DeleteEdgesRequest& req : resp.get_result().get_failed_parts().begin()->get_code(); handleAsync(spaceId, localPartId, code); }); - proc->process(req.second); + proc->process(request.second); }; std::for_each(splitedRequest.begin(), splitedRequest.end(), fnSplit); diff --git a/src/storage/transaction/ChainDeleteEdgesGroupProcessor.h b/src/storage/transaction/ChainDeleteEdgesGroupProcessor.h index 0c0f777e2ad..ea195b700fc 100644 --- a/src/storage/transaction/ChainDeleteEdgesGroupProcessor.h +++ b/src/storage/transaction/ChainDeleteEdgesGroupProcessor.h @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * - * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. + * This source code is licensed under Apache 2.0 License. */ #pragma once diff --git a/src/storage/transaction/ChainDeleteEdgesLocalProcessor.cpp b/src/storage/transaction/ChainDeleteEdgesLocalProcessor.cpp index 13c4ed2879a..5537afe08f5 100644 --- a/src/storage/transaction/ChainDeleteEdgesLocalProcessor.cpp +++ b/src/storage/transaction/ChainDeleteEdgesLocalProcessor.cpp @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * - * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. + * This source code is licensed under Apache 2.0 License. */ #include "storage/transaction/ChainDeleteEdgesLocalProcessor.h" diff --git a/src/storage/transaction/ChainDeleteEdgesLocalProcessor.h b/src/storage/transaction/ChainDeleteEdgesLocalProcessor.h index 0d5e26b8c0a..e5fe7f12219 100644 --- a/src/storage/transaction/ChainDeleteEdgesLocalProcessor.h +++ b/src/storage/transaction/ChainDeleteEdgesLocalProcessor.h @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * - * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. + * This source code is licensed under Apache 2.0 License. */ #pragma once diff --git a/src/storage/transaction/ChainDeleteEdgesRemoteProcessor.cpp b/src/storage/transaction/ChainDeleteEdgesRemoteProcessor.cpp index 599a5c2c271..8d1afcc49a4 100644 --- a/src/storage/transaction/ChainDeleteEdgesRemoteProcessor.cpp +++ b/src/storage/transaction/ChainDeleteEdgesRemoteProcessor.cpp @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * - * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. + * This source code is licensed under Apache 2.0 License. */ #include "storage/transaction/ChainDeleteEdgesRemoteProcessor.h" diff --git a/src/storage/transaction/ChainDeleteEdgesRemoteProcessor.h b/src/storage/transaction/ChainDeleteEdgesRemoteProcessor.h index 933c4839528..f4675f25b30 100644 --- a/src/storage/transaction/ChainDeleteEdgesRemoteProcessor.h +++ b/src/storage/transaction/ChainDeleteEdgesRemoteProcessor.h @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * - * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. + * This source code is licensed under Apache 2.0 License. */ #pragma once diff --git a/src/storage/transaction/ChainDeleteEdgesResumeProcessor.cpp b/src/storage/transaction/ChainDeleteEdgesResumeProcessor.cpp index f36fd84f858..19698798cff 100644 --- a/src/storage/transaction/ChainDeleteEdgesResumeProcessor.cpp +++ b/src/storage/transaction/ChainDeleteEdgesResumeProcessor.cpp @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * - * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. + * This source code is licensed under Apache 2.0 License. */ #include "storage/transaction/ChainDeleteEdgesResumeProcessor.h" diff --git a/src/storage/transaction/ChainDeleteEdgesResumeProcessor.h b/src/storage/transaction/ChainDeleteEdgesResumeProcessor.h index bcd7b1f7d4f..d7ff4060260 100644 --- a/src/storage/transaction/ChainDeleteEdgesResumeProcessor.h +++ b/src/storage/transaction/ChainDeleteEdgesResumeProcessor.h @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * - * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. + * This source code is licensed under Apache 2.0 License. */ #pragma once diff --git a/src/storage/transaction/ChainDeleteEdgesResumeRemoteProcessor.cpp b/src/storage/transaction/ChainDeleteEdgesResumeRemoteProcessor.cpp index 7c9e3de48e7..7e50a43b484 100644 --- a/src/storage/transaction/ChainDeleteEdgesResumeRemoteProcessor.cpp +++ b/src/storage/transaction/ChainDeleteEdgesResumeRemoteProcessor.cpp @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * - * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. + * This source code is licensed under Apache 2.0 License. */ #include "storage/transaction/ChainDeleteEdgesResumeRemoteProcessor.h" @@ -52,8 +51,8 @@ folly::SemiFuture ChainDeleteEdgesResumeRemoteProcessor::processLocal(Code folly::Baton baton; env_->kvstore_->asyncMultiRemove( - spaceId_, localPartId_, std::move(doublePrimeKeys), [this](auto&& code) { - this->code_ = code; + spaceId_, localPartId_, std::move(doublePrimeKeys), [this](auto&& rc) { + this->code_ = rc; }); baton.wait(); } diff --git a/src/storage/transaction/ChainDeleteEdgesResumeRemoteProcessor.h b/src/storage/transaction/ChainDeleteEdgesResumeRemoteProcessor.h index a91621ae072..31c091f5962 100644 --- a/src/storage/transaction/ChainDeleteEdgesResumeRemoteProcessor.h +++ b/src/storage/transaction/ChainDeleteEdgesResumeRemoteProcessor.h @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * - * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. + * This source code is licensed under Apache 2.0 License. */ #pragma once diff --git a/src/storage/transaction/ConsistTypes.h b/src/storage/transaction/ConsistTypes.h index 89bdb17c2a7..61e45749ac4 100644 --- a/src/storage/transaction/ConsistTypes.h +++ b/src/storage/transaction/ConsistTypes.h @@ -1,7 +1,6 @@ /* Copyright (c) 2021 vesoft inc. All rights reserved. * * This source code is licensed under Apache 2.0 License, - * attached with Common Clause Condition 1.0, found in the LICENSES directory. */ #pragma once