Fixed build with Clang (vesoft-inc#967)

CMakeLists.txt

@@ -58,6 +58,7 @@ if (!CMAKE_CXX_COMPILER)
 endif()
 
 set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++ -no-pie")
 

cmake/FindPCHSupport.cmake

@@ -10,7 +10,7 @@
 # Macro:
 #   ADD_PRECOMPILED_HEADER
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
+IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
     EXEC_PROGRAM(
         ${CMAKE_CXX_COMPILER}
         ARGS 			--version
@@ -20,13 +20,15 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
     IF(gcc_compiler_version MATCHES "[4-9]\\.[0-9]\\.[0-9]")
         SET(PCHSupport_FOUND TRUE)
         MESSAGE("-- Found PCH Support: gcc compiler version is " ${gcc_compiler_version})
-    ELSE(gcc_compiler_version MATCHES "[4-9]\\.[0-9]\\.[0-9]")
+    ELSE()
         IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
             SET(PCHSupport_FOUND TRUE)
             MESSAGE("-- Found PCH Support: gcc compiler version is " ${gcc_compiler_version})
-        ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
-    ENDIF(gcc_compiler_version MATCHES "[4-9]\\.[0-9]\\.[0-9]")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+        ENDIF()
+    ENDIF()
+ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+    SET(PCHSupport_FOUND TRUE)
+ENDIF()
 
 
 

src/common/filter/Expressions.cpp

@@ -684,17 +684,17 @@ const char* UnaryExpression::decode(const char *pos, const char *end) {
 
 std::string columnTypeToString(ColumnType type) {
     switch (type) {
-        case INT:
+        case ColumnType::INT:
             return "int";
-        case STRING:
+        case ColumnType::STRING:
             return "string";
-        case DOUBLE:
+        case ColumnType::DOUBLE:
             return "double";
-        case BIGINT:
+        case ColumnType::BIGINT:
             return "bigint";
-        case BOOL:
+        case ColumnType::BOOL:
             return "bool";
-        case TIMESTAMP:
+        case ColumnType::TIMESTAMP:
             return  "timestamp";
         default:
             return "unknown";
@@ -722,16 +722,16 @@ OptVariantType TypeCastingExpression::eval() const {
     }
 
     switch (type_) {
-        case INT:
-        case TIMESTAMP:
+        case ColumnType::INT:
+        case ColumnType::TIMESTAMP:
             return Expression::toInt(result.value());
-        case STRING:
+        case ColumnType::STRING:
             return Expression::toString(result.value());
-        case DOUBLE:
+        case ColumnType::DOUBLE:
             return Expression::toDouble(result.value());
-        case BOOL:
+        case ColumnType::BOOL:
             return Expression::toBool(result.value());
-        case BIGINT:
+        case ColumnType::BIGINT:
             return Status::Error("Type bigint not supported yet");
     }
     LOG(FATAL) << "casting to unknown type: " << static_cast<int>(type_);

src/common/filter/Expressions.h

@@ -17,7 +17,7 @@ namespace nebula {
 class Cord;
 using OptVariantType = StatusOr<VariantType>;
 
-enum ColumnType {
+enum class ColumnType {
     INT, STRING, DOUBLE, BIGINT, BOOL, TIMESTAMP,
 };
 

src/graph/Executor.cpp

@@ -276,15 +276,15 @@ StatusOr<int64_t> Executor::toTimestamp(const VariantType &value) {
 
 nebula::cpp2::SupportedType Executor::ColumnTypeToSupportedType(ColumnType type) const {
     switch (type) {
-        case INT:
+        case ColumnType::INT:
             return nebula::cpp2::SupportedType::INT;
-        case STRING:
+        case ColumnType::STRING:
             return nebula::cpp2::SupportedType::STRING;
-        case DOUBLE:
+        case ColumnType::DOUBLE:
             return nebula::cpp2::SupportedType::DOUBLE;
-        case BOOL:
+        case ColumnType::BOOL:
             return nebula::cpp2::SupportedType::BOOL;
-        case TIMESTAMP:
+        case ColumnType::TIMESTAMP:
             return nebula::cpp2::SupportedType::TIMESTAMP;
         default:
             LOG(ERROR) << "Unknown type: " << static_cast<int32_t>(type);

src/graph/InterimResult.h

@@ -23,8 +23,8 @@ class InterimResult final {
 public:
     InterimResult() = default;
     ~InterimResult() = default;
-    InterimResult(const InterimResult &) = default;
-    InterimResult& operator=(const InterimResult &) = default;
+    InterimResult(const InterimResult &) = delete;
+    InterimResult& operator=(const InterimResult &) = delete;
     InterimResult(InterimResult &&) = default;
     InterimResult& operator=(InterimResult &&) = default;
 

src/graph/SchemaHelper.cpp

@@ -14,15 +14,15 @@ namespace graph {
 // static
 nebula::cpp2::SupportedType SchemaHelper::columnTypeToSupportedType(ColumnType type) {
     switch (type) {
-        case BOOL:
+        case ColumnType::BOOL:
             return nebula::cpp2::SupportedType::BOOL;
-        case INT:
+        case ColumnType::INT:
             return nebula::cpp2::SupportedType::INT;
-        case DOUBLE:
+        case ColumnType::DOUBLE:
             return nebula::cpp2::SupportedType::DOUBLE;
-        case STRING:
+        case ColumnType::STRING:
             return nebula::cpp2::SupportedType::STRING;
-        case TIMESTAMP:
+        case ColumnType::TIMESTAMP:
             return nebula::cpp2::SupportedType::TIMESTAMP;
         default:
             return nebula::cpp2::SupportedType::UNKNOWN;

src/storage/UpdateEdgeProcessor.cpp

@@ -210,7 +210,7 @@ std::string UpdateEdgeProcessor::updateAndWriteBack() {
     }
 
     std::vector<kvstore::KV> data;
-    data.emplace_back(key_, std::move(updater_->encode()));
+    data.emplace_back(key_, updater_->encode());
     auto log = kvstore::encodeMultiValues(kvstore::OP_MULTI_PUT, data);
     return log;
 }

src/storage/UpdateVertexProcessor.cpp

@@ -227,7 +227,7 @@ std::string UpdateVertexProcessor::updateAndWriteBack() {
     std::vector<kvstore::KV> data;
     for (const auto& u : tagUpdaters_) {
         data.emplace_back(std::move(u.second->key),
-                          std::move(u.second->updater->encode()));
+                          u.second->updater->encode());
     }
     auto log = kvstore::encodeMultiValues(kvstore::OP_MULTI_PUT, data);
     return log;