Rename inline headers

.linters/cpp/hooks/pre-commit.sh

@@ -25,11 +25,11 @@ if [ $# -eq 0 ];then
         echo "You have unstaged changes, please stage or stash them first."
         exit 1
     fi
-    CHECK_FILES=$(git diff --name-only --diff-filter=ACMRTUXB HEAD | egrep '.*\.cpp$|.*\.h$|.*\.inl$' | grep -v 'com_vesoft_client_NativeClient.h' | grep -v 'com_vesoft_nebula_NebulaCodec.h')
+    CHECK_FILES=$(git diff --name-only --diff-filter=ACMRTUXB HEAD | egrep '.*\.cpp$|.*\.h$' | grep -v 'com_vesoft_client_NativeClient.h' | grep -v 'com_vesoft_nebula_NebulaCodec.h')
 else
     CHECK_FILES=$(find $@ -not \( -path src/CMakeFiles -prune \) \
                           -not \( -path src/interface/gen-cpp2 -prune \) \
-                          -name "*.[h]" -o -name "*.cpp" -o -name '*.inl' \
+                          -name "*.[h]" -o -name "*.cpp" \
                           | grep -v 'GraphScanner.*' | grep -v 'GraphParser.*' \
                           | grep -v 'com_vesoft_client_NativeClient.h' \
                           | grep -v 'com_vesoft_nebula_NebulaCodec.h')
@@ -43,7 +43,7 @@ fi
 
 echo "Performing C++ linters..."
 
-CPPLINT_EXTENS=cpp,h,inl
+CPPLINT_EXTENS=cpp,h
 CPPLINT_FILTER=-whitespace/indent,-build/include_what_you_use,-readability/todo,-build/include,-build/header_guard,-runtime/references,-build/c++11
 
 python3 $CPPLINT --quiet --extensions=$CPPLINT_EXTENS \

src/clients/storage/StorageClientBase.inl → src/clients/storage/StorageClientBase-inl.h

@@ -4,14 +4,14 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
+#pragma once
+
 #include <folly/Try.h>
 #include "common/time/WallClock.h"
 
 namespace nebula {
 namespace storage {
 
-namespace {
-
 template<class Request, class RemoteFunc, class Response>
 struct ResponseContext {
 public:
@@ -68,7 +68,6 @@ struct ResponseContext {
     bool fulfilled_{false};
 };
 
-}  // Anonymous namespace
 
 
 template<typename ClientType>

src/clients/storage/StorageClientBase.h

@@ -259,6 +259,6 @@ class StorageClientBase {
 }   // namespace storage
 }   // namespace nebula
 
-#include "clients/storage/StorageClientBase.inl"
+#include "clients/storage/StorageClientBase-inl.h"
 
 #endif  // CLIENTS_STORAGE_STORAGECLIENTBASE_H_

src/codec/test/RowWriterV1.inl → src/codec/test/RowWriterV1-inl.h

@@ -4,6 +4,8 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
+#pragma once
+
 namespace nebula {
 
 template<typename T>
@@ -46,4 +48,3 @@ RowWriterV1::writeInt(T v) {
 }
 
 }  // namespace nebula
-

src/codec/test/RowWriterV1.h

@@ -88,7 +88,7 @@ class RowWriterV1 {
 }  // namespace nebula
 
 
-#include "codec/test/RowWriterV1.inl"
+#include "codec/test/RowWriterV1-inl.h"
 
 #endif  // CODEC_TEST_ROWWRITERV1_H_
 

src/common/base/CollectNSucceeded.inl → src/common/base/CollectNSucceeded-inl.h

@@ -4,6 +4,8 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
+#pragma once
+
 #include <folly/ExceptionWrapper.h>
 
 namespace nebula {

src/common/base/CollectNSucceeded.h

@@ -77,6 +77,6 @@ auto collectNSucceeded(Collection&& c,
 
 }  // namespace nebula
 
-#include "common/base/CollectNSucceeded.inl"
+#include "common/base/CollectNSucceeded-inl.h"
 
 #endif  // COMMON_BASE_COLLECTNSUCCEEDED_H_

src/common/datatypes/ValueOps.inl → src/common/datatypes/ValueOps-inl.h

@@ -16,14 +16,14 @@
 
 #include "common/datatypes/CommonCpp2Ops.h"
 #include "common/datatypes/Value.h"
-#include "common/datatypes/DataSetOps.inl"
-#include "common/datatypes/DateOps.inl"
-#include "common/datatypes/PathOps.inl"
-#include "common/datatypes/VertexOps.inl"
-#include "common/datatypes/EdgeOps.inl"
-#include "common/datatypes/ListOps.inl"
-#include "common/datatypes/MapOps.inl"
-#include "common/datatypes/SetOps.inl"
+#include "common/datatypes/DataSetOps-inl.h"
+#include "common/datatypes/DateOps-inl.h"
+#include "common/datatypes/PathOps-inl.h"
+#include "common/datatypes/VertexOps-inl.h"
+#include "common/datatypes/EdgeOps-inl.h"
+#include "common/datatypes/ListOps-inl.h"
+#include "common/datatypes/MapOps-inl.h"
+#include "common/datatypes/SetOps-inl.h"
 
 namespace apache {
 namespace thrift {

src/common/expression/Expression.cpp

@@ -8,7 +8,7 @@
 
 #include <thrift/lib/cpp2/protocol/Serializer.h>
 
-#include "common/datatypes/ValueOps.inl"
+#include "common/datatypes/ValueOps-inl.h"
 #include "common/expression/ArithmeticExpression.h"
 #include "common/expression/AttributeExpression.h"
 #include "common/expression/ConstantExpression.h"

src/common/stats/StatsManager.inl → src/common/stats/StatsManager-inl.h

@@ -4,6 +4,8 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
+#pragma once
+
 namespace nebula {
 namespace stats {
 
@@ -29,4 +31,3 @@ StatsManager::VT StatsManager::readValue(StatsHolder& stats,
 
 }  // namespace stats
 }  // namespace nebula
-

src/common/stats/StatsManager.h

@@ -214,6 +214,6 @@ class StatsManager final {
 }  // namespace stats
 }  // namespace nebula
 
-#include "common/stats/StatsManager.inl"
+#include "common/stats/StatsManager-inl.h"
 
 #endif  // COMMON_STATS_STATSMANAGER_H_

src/common/thrift/ThriftClientManager.inl → src/common/thrift/ThriftClientManager-inl.h

@@ -4,6 +4,8 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
+#pragma once
+
 #include <thrift/lib/cpp2/async/HeaderClientChannel.h>
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/system/ThreadName.h>

src/common/thrift/ThriftClientManager.h

@@ -42,6 +42,6 @@ class ThriftClientManager final {
 }  // namespace thrift
 }  // namespace nebula
 
-#include "common/thrift/ThriftClientManager.inl"
+#include "common/thrift/ThriftClientManager-inl.h"
 
 #endif  // COMMON_THRIFT_THRIFTCLIENTMANAGER_H_

src/interface/common.thrift

@@ -14,17 +14,17 @@ namespace csharp nebula
 namespace py nebula2.common
 
 cpp_include "common/thrift/ThriftTypes.h"
-cpp_include "common/datatypes/DateOps.inl"
-cpp_include "common/datatypes/VertexOps.inl"
-cpp_include "common/datatypes/EdgeOps.inl"
-cpp_include "common/datatypes/PathOps.inl"
-cpp_include "common/datatypes/ValueOps.inl"
-cpp_include "common/datatypes/MapOps.inl"
-cpp_include "common/datatypes/ListOps.inl"
-cpp_include "common/datatypes/SetOps.inl"
-cpp_include "common/datatypes/DataSetOps.inl"
-cpp_include "common/datatypes/KeyValueOps.inl"
-cpp_include "common/datatypes/HostAddrOps.inl"
+cpp_include "common/datatypes/DateOps-inl.h"
+cpp_include "common/datatypes/VertexOps-inl.h"
+cpp_include "common/datatypes/EdgeOps-inl.h"
+cpp_include "common/datatypes/PathOps-inl.h"
+cpp_include "common/datatypes/ValueOps-inl.h"
+cpp_include "common/datatypes/MapOps-inl.h"
+cpp_include "common/datatypes/ListOps-inl.h"
+cpp_include "common/datatypes/SetOps-inl.h"
+cpp_include "common/datatypes/DataSetOps-inl.h"
+cpp_include "common/datatypes/KeyValueOps-inl.h"
+cpp_include "common/datatypes/HostAddrOps-inl.h"
 
 /*
  *

src/interface/graph.thrift

@@ -14,13 +14,13 @@ namespace py nebula2.graph
 
 include "common.thrift"
 
-cpp_include "common/graph/PairOps.inl"
-cpp_include "common/graph/ProfilingStatsOps.inl"
-cpp_include "common/graph/PlanNodeBranchInfoOps.inl"
-cpp_include "common/graph/PlanNodeDescriptionOps.inl"
-cpp_include "common/graph/PlanDescriptionOps.inl"
-cpp_include "common/graph/ExecutionResponseOps.inl"
-cpp_include "common/graph/AuthResponseOps.inl"
+cpp_include "common/graph/PairOps-inl.h"
+cpp_include "common/graph/ProfilingStatsOps-inl.h"
+cpp_include "common/graph/PlanNodeBranchInfoOps-inl.h"
+cpp_include "common/graph/PlanNodeDescriptionOps-inl.h"
+cpp_include "common/graph/PlanDescriptionOps-inl.h"
+cpp_include "common/graph/ExecutionResponseOps-inl.h"
+cpp_include "common/graph/AuthResponseOps-inl.h"
 
 /*
  *

src/kvstore/LogEncoder.cpp

@@ -6,7 +6,7 @@
 
 #include "common/base/Base.h"
 #include "common/time/WallClock.h"
-#include "common/datatypes/HostAddrOps.inl"
+#include "common/datatypes/HostAddrOps-inl.h"
 #include "kvstore/LogEncoder.h"
 #include <thrift/lib/cpp2/protocol/Serializer.h>
 #include <thrift/lib/cpp2/protocol/CompactProtocol.h>

src/meta/processors/BaseProcessor.inl → src/meta/processors/BaseProcessor-inl.h

@@ -4,6 +4,8 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
+#pragma once
+
 #include "meta/processors/BaseProcessor.h"
 
 namespace nebula {

src/meta/processors/BaseProcessor.h

@@ -272,7 +272,7 @@ class BaseProcessor {
 }  // namespace meta
 }  // namespace nebula
 
-#include "meta/processors/BaseProcessor.inl"
+#include "meta/processors/BaseProcessor-inl.h"
 
 #endif  // META_BASEPROCESSOR_H_
 

src/storage/BaseProcessor.inl → src/storage/BaseProcessor-inl.h

@@ -4,6 +4,8 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
+#pragma once
+
 #include "storage/BaseProcessor.h"
 
 namespace nebula {

src/storage/BaseProcessor.h

@@ -132,6 +132,6 @@ class BaseProcessor {
 }  // namespace storage
 }  // namespace nebula
 
-#include "storage/BaseProcessor.inl"
+#include "storage/BaseProcessor-inl.h"
 
 #endif  // STORAGE_BASEPROCESSOR_H_

src/storage/index/LookupBaseProcessor.inl → src/storage/index/LookupBaseProcessor-inl.h

@@ -4,6 +4,8 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
+#pragma once
+
 #include "LookupBaseProcessor.h"
 namespace nebula {
 namespace storage {

src/storage/index/LookupBaseProcessor.h

@@ -89,5 +89,5 @@ class LookupBaseProcessor : public BaseProcessor<RESP> {
 }  // namespace storage
 }  // namespace nebula
 
-#include "storage/index/LookupBaseProcessor.inl"
+#include "storage/index/LookupBaseProcessor-inl.h"
 #endif  // STORAGE_QUERY_LOOKUPBASEPROCESSOR_H_

src/storage/query/QueryBaseProcessor.h

@@ -211,6 +211,6 @@ class QueryBaseProcessor : public BaseProcessor<RESP> {
 }  // namespace storage
 }  // namespace nebula
 
-#include "storage/query/QueryBaseProcessor.inl"
+#include "storage/query/QueryBaseProcessor-inl.h"
 
 #endif  // STORAGE_QUERY_QUERYBASEPROCESSOR_H_