fix(C++): add .clang-tidy configuration and fix missing brackets

Author: SYaoJun

.clang-tidy

@@ -0,0 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This configuration is adapted from arrow(https://github.com/apache/arrow/blob/main/.clang-tidy)
+# Licensed under the Apache License, Version 2.0.
+---
+Checks: |
+  clang-diagnostic-*,
+  clang-analyzer-*,
+  -clang-analyzer-alpha*,
+  google-*,
+  modernize-*,
+  -modernize-avoid-c-arrays,
+  -modernize-use-trailing-return-type,
+  -modernize-use-nodiscard,
+
+CheckOptions:
+  - key:             google-readability-braces-around-statements.ShortStatementLines
+    value:           '1'
+  - key:             google-readability-function-size.StatementThreshold
+    value:           '800'
+  - key:             google-readability-namespace-comments.ShortNamespaceLines
+    value:           '10'
+  - key:             google-readability-namespace-comments.SpacesBeforeComments
+    value:           '2'

.pre-commit-config.yaml

@@ -44,6 +44,15 @@ repos:
       args: [--style=file, --verbose]
       exclude: ^cpp/thirdparty/
 
+  - repo: https://github.com/pocc/pre-commit-hooks
+    rev: v1.3.5
+    hooks:
+      - id: clang-tidy
+        stages:
+          - manual
+        args: ['--quiet', '--config-file=.clang-tidy']
+        types_or: [c++, c]
+
   - repo: local
     hooks:
       - id: spotless-java-info

cpp/examples/bfs_father_example.cc

@@ -68,8 +68,9 @@ int main(int argc, char* argv[]) {
       }
     }
     std::cout << "iter " << iter << ": " << count << " vertices." << std::endl;
-    if (count == 0)
+    if (count == 0) {
       break;
+    }
   }
   for (int i = 0; i < num_vertices; i++) {
     std::cout << i << ", distance: " << distance[i] << ", father: " << pre[i]

cpp/examples/bfs_pull_example.cc

@@ -51,17 +51,19 @@ int main(int argc, char* argv[]) {
   // run bfs algorithm
   graphar::IdType root = 0;
   std::vector<int32_t> distance(num_vertices);
-  for (graphar::IdType i = 0; i < num_vertices; i++)
+  for (graphar::IdType i = 0; i < num_vertices; i++) {
     distance[i] = (i == root ? 0 : -1);
+  }
   auto it_begin = edges->begin(), it_end = edges->end();
   auto it = it_begin;
   for (int iter = 0;; iter++) {
     graphar::IdType count = 0;
     it.to_begin();
     for (graphar::IdType vid = 0; vid < num_vertices; vid++) {
       if (distance[vid] == -1) {
-        if (!it.first_dst(it, vid))
+        if (!it.first_dst(it, vid)) {
           continue;
+        }
         // if (!it.first_dst(it_begin, vid)) continue;
         do {
           graphar::IdType src = it.source(), dst = it.destination();
@@ -74,8 +76,9 @@ int main(int argc, char* argv[]) {
       }
     }
     std::cout << "iter " << iter << ": " << count << " vertices." << std::endl;
-    if (count == 0)
+    if (count == 0) {
       break;
+    }
   }
   for (int i = 0; i < num_vertices; i++) {
     std::cout << i << ", distance: " << distance[i] << std::endl;

cpp/examples/bfs_push_example.cc

@@ -51,17 +51,19 @@ int main(int argc, char* argv[]) {
   // run bfs algorithm
   graphar::IdType root = 0;
   std::vector<int32_t> distance(num_vertices);
-  for (graphar::IdType i = 0; i < num_vertices; i++)
+  for (graphar::IdType i = 0; i < num_vertices; i++) {
     distance[i] = (i == root ? 0 : -1);
+  }
   auto it_begin = edges->begin(), it_end = edges->end();
   auto it = it_begin;
   for (int iter = 0;; iter++) {
     graphar::IdType count = 0;
     it.to_begin();
     for (graphar::IdType vid = 0; vid < num_vertices; vid++) {
       if (distance[vid] == iter) {
-        if (!it.first_src(it, vid))
+        if (!it.first_src(it, vid)) {
           continue;
+        }
         // if (!it.first_src(it_begin, vid)) continue;
         do {
           graphar::IdType src = it.source(), dst = it.destination();
@@ -73,8 +75,9 @@ int main(int argc, char* argv[]) {
       }
     }
     std::cout << "iter " << iter << ": " << count << " vertices." << std::endl;
-    if (count == 0)
+    if (count == 0) {
       break;
+    }
   }
   for (int i = 0; i < num_vertices; i++) {
     std::cout << i << ", distance: " << distance[i] << std::endl;

cpp/examples/bfs_stream_example.cc

@@ -51,8 +51,9 @@ int main(int argc, char* argv[]) {
   // run bfs algorithm
   graphar::IdType root = 0;
   std::vector<int32_t> distance(num_vertices);
-  for (graphar::IdType i = 0; i < num_vertices; i++)
+  for (graphar::IdType i = 0; i < num_vertices; i++) {
     distance[i] = (i == root ? 0 : -1);
+  }
   auto it_begin = edges->begin(), it_end = edges->end();
   for (int iter = 0;; iter++) {
     graphar::IdType count = 0;
@@ -64,8 +65,9 @@ int main(int argc, char* argv[]) {
       }
     }
     std::cout << "iter " << iter << ": " << count << " vertices." << std::endl;
-    if (count == 0)
+    if (count == 0) {
       break;
+    }
   }
   for (int i = 0; i < num_vertices; i++) {
     std::cout << i << ", distance: " << distance[i] << std::endl;

cpp/examples/pagerank_example.cc

@@ -74,8 +74,9 @@ int main(int argc, char* argv[]) {
     for (graphar::IdType i = 0; i < num_vertices; i++) {
       pr_next[i] = damping * pr_next[i] +
                    (1 - damping) * (1 / static_cast<double>(num_vertices));
-      if (out_degree[i] == 0)
+      if (out_degree[i] == 0) {
         pr_next[i] += damping * pr_curr[i];
+      }
       pr_curr[i] = pr_next[i];
       pr_next[i] = 0;
     }

cpp/src/graphar/high-level/graph_reader.cc

@@ -138,8 +138,9 @@ Result<std::vector<std::string>> VertexIter::label() noexcept {
 static inline bool IsValid(bool* state, int column_number) {
   for (int i = 0; i < column_number; ++i) {
     // AND case
-    if (!state[i])
+    if (!state[i]) {
       return false;
+    }
     // OR case
     // if (state[i]) return true;
   }

cpp/src/graphar/label.cc

@@ -94,11 +94,11 @@ int read_parquet_file_and_get_valid_indices(
     }
     if (IsValid(state.get(), tested_label_num)) {
       count++;
-      if (query_type == QUERY_TYPE::INDEX)
-
+      if (query_type == QUERY_TYPE::INDEX) {
         indices->push_back(i + offset);
-      else if (query_type == QUERY_TYPE::BITMAP)
+      } else if (query_type == QUERY_TYPE::BITMAP) {
         SetBitmap(bitmap, i);
+      }
     }
   }
 

cpp/test/test_arrow_chunk_reader.cc

@@ -718,7 +718,8 @@ TEST_CASE_METHOD(GlobalFixture, "ArrowChunkReader") {
               idx++;
               sum += table->num_rows();
             } while (!reader->next_chunk().IsIndexError());
-            REQUIRE(table->num_columns() == (int) expected_cols.size());
+            REQUIRE(table->num_columns() ==
+                    static_cast<int>(expected_cols.size()));
 
             std::cout << "Total Nums: " << sum << "/"
                       << idx * edge_info->GetChunkSize() << '\n';