vesoft-inc · critical27 · Feb 8, 2022 · Dec 1, 2021 · Dec 9, 2021 · Dec 9, 2021
diff --git a/src/clients/meta/stats/MetaClientStats.h b/src/clients/meta/stats/MetaClientStats.h
@@ -3,8 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
-
+#ifndef CLIENTIS_META_STATS_METACLIENTSTATS_H
+#define CLIENTIS_META_STATS_METACLIENTSTATS_H
 #include "common/stats/StatsManager.h"
 
 namespace nebula {
@@ -15,3 +15,4 @@ extern stats::CounterId kNumRpcSentToMetadFailed;
 void initMetaClientStats();
 
 } // namespace nebula
+#endif
diff --git a/src/clients/storage/StorageClient.h b/src/clients/storage/StorageClient.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef CLIENTS_STORAGE_STORAGECLIENT_H
+#define CLIENTS_STORAGE_STORAGECLIENT_H
 
 #include <gtest/gtest_prod.h>
 
@@ -192,3 +193,4 @@ class StorageClient
 
 } // namespace storage
 } // namespace nebula
+#endif
diff --git a/src/clients/storage/StorageClientBase-inl.h b/src/clients/storage/StorageClientBase-inl.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef CLIENTS_STORAGE_STORAGECLIENTBASE_INL_H
+#define CLIENTS_STORAGE_STORAGECLIENTBASE_INL_H
 
 #include <folly/Try.h>
 
@@ -379,3 +380,4 @@ StorageClientBase<ClientType, ClientManagerType>::getHostPartsWithCursor(
 
 } // namespace storage
 } // namespace nebula
+#endif
diff --git a/src/clients/storage/stats/StorageClientStats.h b/src/clients/storage/stats/StorageClientStats.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef CLIENTS_STORAGE_STATS_STORAGECLIENTSTATS_H
+#define CLIENTS_STORAGE_STATS_STORAGECLIENTSTATS_H
 
 #include "common/stats/StatsManager.h"
 
@@ -15,3 +16,4 @@ extern stats::CounterId kNumRpcSentToStoragedFailed;
 void initStorageClientStats();
 
 } // namespace nebula
+#endif
diff --git a/src/codec/include/NebulaCodec.h b/src/codec/include/NebulaCodec.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef CODEC_INCLUDE_NEBULACODEC_H
+#define CODEC_INCLUDE_NEBULACODEC_H
 
 #include "common/base/StatusOr.h"
 #include "common/meta/SchemaProviderIf.h"
@@ -24,3 +25,4 @@ class NebulaCodec {
 };
 
 } // namespace nebula
+#endif
diff --git a/src/codec/test/RowWriterV1-inl.h b/src/codec/test/RowWriterV1-inl.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef CODEC_TEST_ROWWRITERV1_INL_H
+#define CODEC_TEST_ROWWRITERV1_INL_H
 
 namespace nebula {
 
@@ -45,3 +46,4 @@ typename std::enable_if<std::is_integral<T>::value>::type RowWriterV1::writeInt(
 }
 
 } // namespace nebula
+#endif
diff --git a/src/common/base/CollectNSucceeded-inl.h b/src/common/base/CollectNSucceeded-inl.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_BASE_COLLECTNSUCCEEDED_INL_H
+#define COMMON_BASE_COLLECTNSUCCEEDED_INL_H
 
 #include <folly/ExceptionWrapper.h>
 
@@ -67,3 +68,4 @@ folly::Future<SucceededResultList<FutureIter>> collectNSucceeded(FutureIter firs
 }
 
 } // namespace nebula
+#endif
diff --git a/src/common/base/ICord.h b/src/common/base/ICord.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_BASE_ICORD_H
+#define COMMON_BASE_ICORD_H
 
 #include "common/base/Base.h"
 
@@ -244,3 +245,4 @@ class ICord {
 };
 
 } // namespace nebula
+#endif
diff --git a/src/common/datatypes/Duration.h b/src/common/datatypes/Duration.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_DATATYPES_DURATION_H
+#define COMMON_DATATYPES_DURATION_H
 
 #include <folly/dynamic.h>
 
@@ -150,3 +151,4 @@ struct hash<nebula::Duration> {
 };
 
 } // namespace std
+#endif
diff --git a/src/common/datatypes/DurationOps-inl.h b/src/common/datatypes/DurationOps-inl.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_DATATYPES_DURATIONOPS_INL_H
+#define COMMON_DATATYPES_DURATIONOPS_INL_H
 
 #include <thrift/lib/cpp2/GeneratedCodeHelper.h>
 #include <thrift/lib/cpp2/gen/module_types_tcc.h>
@@ -199,3 +200,4 @@ uint32_t Cpp2Ops<nebula::Duration>::serializedSizeZC(Protocol const* proto,
 
 } // namespace thrift
 } // namespace apache
+#endif
diff --git a/src/common/datatypes/Geography.h b/src/common/datatypes/Geography.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_DATATYPES_GEOGRAPHY_H
+#define COMMON_DATATYPES_GEOGRAPHY_H
 
 #include <s2/s2point.h>
 #include <s2/s2point_region.h>
@@ -239,3 +240,4 @@ struct hash<nebula::Geography> {
 };
 
 } // namespace std
+#endif
diff --git a/src/common/geo/GeoFunction.h b/src/common/geo/GeoFunction.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_GEO_GEOFUNCTION_H
+#define COMMON_GEO_GEOFUNCTION_H
 
 #include <s2/s2region_coverer.h>
 
@@ -73,3 +74,4 @@ class GeoFunction {
 
 } // namespace geo
 } // namespace nebula
+#endif
diff --git a/src/common/geo/GeoIndex.h b/src/common/geo/GeoIndex.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_GEO_GEOINDEX_H
+#define COMMON_GEO_GEOINDEX_H
 
 #include <s2/s2region_coverer.h>
 
@@ -101,3 +102,4 @@ struct hash<S2CellId> {
 };
 
 } // namespace std
+#endif
diff --git a/src/common/geo/GeoUtils.h b/src/common/geo/GeoUtils.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_GEO_GEOUTILS_H
+#define COMMON_GEO_GEOUTILS_H
 
 #include <s2/s2latlng.h>
 #include <s2/s2loop.h>
@@ -96,3 +97,4 @@ class GeoUtils final {
 
 } // namespace geo
 } // namespace nebula
+#endif
diff --git a/src/common/geo/io/CMakeLists.txt b/src/common/geo/io/CMakeLists.txt
@@ -2,10 +2,18 @@
 #
 # This source code is licensed under Apache 2.0 License.
 
-if(ENABLE_VERBOSE_BISON)
- set(bison_flags "-Werror -v")
+if(ENABLE_ERROR)
+ if(ENABLE_VERBOSE_BISON)
+ set(bison_flags "-Werror -v")
+ else()
+ set(bison_flags "-Werror")
+ endif()
 else()
- set(bison_flags "-Werror")
+ if(ENABLE_VERBOSE_BISON)
+ set(bison_flags "-v")
+ else()
+ set(bison_flags "")
+ endif()
 endif()
 bison_target(Parser wkt/wkt_parser.yy ${CMAKE_CURRENT_BINARY_DIR}/wkt/WKTParser.cpp COMPILE_FLAGS ${bison_flags})
 flex_target(Scanner wkt/wkt_scanner.lex ${CMAKE_CURRENT_BINARY_DIR}/wkt/WKTScanner.cpp)

diff --git a/src/common/geo/io/wkb/ByteOrder.h b/src/common/geo/io/wkb/ByteOrder.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_GEO_IO_WKB_BYTEORDER_H
+#define COMMON_GEO_IO_WKB_BYTEORDER_H
 
 #include <boost/endian/conversion.hpp>
 
@@ -76,3 +77,4 @@ struct ByteOrderData {
 
 } // namespace geo
 } // namespace nebula
+#endif
diff --git a/src/common/geo/io/wkb/ByteOrderDataIOStream.h b/src/common/geo/io/wkb/ByteOrderDataIOStream.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_GEO_IO_WKB_BYTEORDERDATAIOSTREAM_H
+#define COMMON_GEO_IO_WKB_BYTEORDERDATAIOSTREAM_H
 
 #include <sstream>
 
@@ -73,3 +74,4 @@ class ByteOrderDataOutStream {
 
 } // namespace geo
 } // namespace nebula
+#endif
diff --git a/src/common/geo/io/wkb/WKBReader.h b/src/common/geo/io/wkb/WKBReader.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_GEO_IO_WKB_WKBREADER_H
+#define COMMON_GEO_IO_WKB_WKBREADER_H
 
 #include "common/base/Base.h"
 #include "common/base/StatusOr.h"
@@ -45,3 +46,4 @@ class WKBReader {
 
 } // namespace geo
 } // namespace nebula
+#endif
diff --git a/src/common/geo/io/wkb/WKBWriter.h b/src/common/geo/io/wkb/WKBWriter.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_GEO_IO_WKB_WKBWRITER_H
+#define COMMON_GEO_IO_WKB_WKBWRITER_H
 
 #include "common/base/Base.h"
 #include "common/datatypes/Geography.h"
@@ -43,3 +44,4 @@ class WKBWriter {
 
 } // namespace geo
 } // namespace nebula
+#endif
diff --git a/src/common/geo/io/wkt/WKTReader.h b/src/common/geo/io/wkt/WKTReader.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_GEO_IO_WKT_WKTREADER_H
+#define COMMON_GEO_IO_WKT_WKTREADER_H
 
 #include "common/base/Base.h"
 #include "common/base/StatusOr.h"
@@ -81,3 +82,4 @@ class WKTReader {
 
 } // namespace geo
 } // namespace nebula
+#endif
diff --git a/src/common/geo/io/wkt/WKTScanner.h b/src/common/geo/io/wkt/WKTScanner.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_GEO_IO_WKT_WKTSCANNER_H
+#define COMMON_GEO_IO_WKT_WKTSCANNER_H
 
 #include "common/base/Base.h"
 
@@ -75,3 +76,4 @@ class WKTScanner : public yyFlexLexer {
 
 } // namespace geo
 } // namespace nebula
+#endif
diff --git a/src/common/geo/io/wkt/WKTWriter.h b/src/common/geo/io/wkt/WKTWriter.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_GEO_IO_WKT_WKTWRITER_H
+#define COMMON_GEO_IO_WKT_WKTWRITER_H
 
 #include "common/base/Base.h"
 #include "common/datatypes/Geography.h"
@@ -31,3 +32,4 @@ class WKTWriter {
 
 } // namespace geo
 } // namespace nebula
+#endif
diff --git a/src/common/log/LogMonitor.h b/src/common/log/LogMonitor.h
@@ -2,7 +2,8 @@
  *
  * This source code is licensed under Apache 2.0 License.
  */
-#pragma once
+#ifndef COMMON_LOG_LOGMONITOR_H
+#define COMMON_LOG_LOGMONITOR_H
 
 #include <boost/filesystem.hpp>
 #include <boost/system/error_code.hpp>
@@ -41,3 +42,4 @@ class LogMonitor {
 };
 
 } // namespace nebula
+#endif
diff --git a/src/common/memory/MemoryUtils.h b/src/common/memory/MemoryUtils.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_MEMORY_MEMORYUTILS_H
+#define COMMON_MEMORY_MEMORYUTILS_H
 
 #include <atomic>
 #include <cstdint>
@@ -33,3 +34,4 @@ class MemoryUtils final {
 };
 
 } // namespace nebula
+#endif
diff --git a/src/common/ssl/SSLConfig.h b/src/common/ssl/SSLConfig.h
@@ -4,7 +4,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_SSL_SSLCONFIG_H
+#define COMMON_SSL_SSLCONFIG_H
 
 #include <folly/io/async/SSLContext.h>
 #include <gflags/gflags.h>
@@ -23,3 +24,4 @@ extern std::shared_ptr<wangle::SSLContextConfig> sslContextConfig();
 extern std::shared_ptr<folly::SSLContext> createSSLContext();
 
 } // namespace nebula
+#endif
diff --git a/src/common/stats/StatsManager-inl.h b/src/common/stats/StatsManager-inl.h
@@ -3,7 +3,8 @@
  * This source code is licensed under Apache 2.0 License.
  */
 
-#pragma once
+#ifndef COMMON_STATS_STATSMANAGER_INL_H
+#define COMMON_STATS_STATSMANAGER_INL_H
 
 namespace nebula {
 namespace stats {
@@ -30,3 +31,4 @@ StatsManager::VT StatsManager::readValue(StatsHolder& stats,
 
 } // namespace stats
 } // namespace nebula
+#endif