update license & fix gcc compile error

liuyu85cn · liuyu85cn · commit 421473b011ed · 2021-12-13T16:32:05.000+08:00
diff --git 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
@@ -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 <folly/Benchmark.h>
diff --git 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,15 +29,15 @@ 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()
                       ? nebula::cpp2::ErrorCode::SUCCEEDED
                       : 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<Code> ChainDeleteEdgesResumeRemoteProcessor::processLocal(Code
 
     folly::Baton<true, std::atomic> 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ void DeleteEdgesProcessor::process(const cpp2::DeleteEdgesRequest& req) {`
`86`	`86`	`spaceId_,`
`87`	`87`	`partId,`
`88`	`88`	`std::move(para.result.value()),`
`89`		`- [partId, this](nebula::cpp2::ErrorCode code) { handleAsync(spaceId_, partId, code); });`
	`89`	`+ [partId, this](nebula::cpp2::ErrorCode rc) { handleAsync(spaceId_, partId, rc); });`
`90`	`90`	`} else {`
`91`	`91`	`doRemove(spaceId_, partId, std::move(keys));`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`/* Copyright (c) 2021 vesoft inc. All rights reserved.`
`2`	`2`	`*`
`3`		`- * This source code is licensed under Apache 2.0 License,`
`4`		`- * attached with Common Clause Condition 1.0, found in the LICENSES directory.`
	`3`	`+ * This source code is licensed under Apache 2.0 License.`
`5`	`4`	`*/`
`6`	`5`
`7`	`6`	`#include <folly/Benchmark.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`/* Copyright (c) 2021 vesoft inc. All rights reserved.`
`2`	`2`	`*`
`3`	`3`	`* This source code is licensed under Apache 2.0 License,`
`4`		`- * attached with Common Clause Condition 1.0, found in the LICENSES directory.`
`5`	`4`	`*/`
`6`	`5`
`7`	`6`	`#pragma once`