Improve GitHub action (#110)

Signed-off-by: sunby <[email protected]>

.github/workflows/cpp-ci.yml

@@ -34,28 +34,26 @@ jobs:
 
       - name: Build
         working-directory: ./cpp
-        run: |
-          mkdir build && cd build
-          conan install .. --build missing
-          conan build ..
+        run: 
+          make build
       # - uses: actions/cache/save@v3
       #   if: always()
       #   with:
       #     path: ~/.conan
       #     key: conan-${{ hashFiles('./cpp/conanfile.py') }}
+      - name: check-format
+        working-directory: ./cpp
+        run: 
+          make check-format
+
+      - name: check-tidy
+        working-directory: ./cpp
+        run:
+          make check-tidy
 
       - name : Test
         working-directory: ./cpp/build/Release
         run: 
           ctest .
 
-      - name: Format
-        working-directory: ./cpp
-        run: 
-          make format
-
-      - name: Tidy
-        working-directory: ./cpp
-        run:
-          make tidy-check
 

cpp/Makefile

@@ -6,29 +6,29 @@ ifneq ($(TIDY_THREADS),)
 endif
 
 build:
-	conan install . -if build --build=missing
-	conan install .
-	conan build .
+	mkdir -p build && cd build && \
+	conan install .. --build=missing && \
+	conan build ..
 debug:
-	conan install . -if build --build=missing -s build_type=Debug
-	conan install .
-	conan build . -s build_type=Debug
+	mkdir -p build && cd build && \
+	conan install .. --build=missing -s build_type=Debug && \
+	conan build ..
 clean:
 	rm -rf build
 
 test: build
 	cd build/Release && ctest . -j ${TEST_THREADS} --output-on-failure
 
-format:
+fix-format:
 	find ./src -type f ! -name "*.pb.h"  -iname *.h -o -iname *.cpp | xargs clang-format -i
 	find ./test -type f ! -name "*.pb.h"  -iname *.h -o -iname *.cpp | xargs clang-format -i
 
+check-format:
+	find ./src -type f ! -name "*.pb.h"  -iname *.h -o -iname *.cpp | xargs clang-format --dry-run --Werror
+	find ./test -type f ! -name "*.pb.h"  -iname *.h -o -iname *.cpp | xargs clang-format --dry-run --Werror
 
-tidy-check: build
-	cd build/Release && \
-	python3 ../../scripts/run-clang-tidy.py ${TIDY_THREAD_PARAMETER}
+check-tidy:
+	python3 ./scripts/run-clang-tidy.py -p build/Release
 
-
-tidy-fix: build
-	cd build/Release && \
-	python3 ../../scripts/run-clang-tidy.py -fix
+fix-tidy: 
+	python3 ./scripts/run-clang-tidy.py -fix -p build/Release

cpp/src/common/arrow_util.cpp

@@ -25,8 +25,8 @@ Result<std::unique_ptr<parquet::arrow::FileReader>> MakeArrowFileReader(arrow::f
   return std::move(file_reader);
 }
 
-Result<std::unique_ptr<arrow::RecordBatchReader>> MakeArrowRecordBatchReader(
-    parquet::arrow::FileReader& reader, const ReadOptions& options) {
+Result<std::unique_ptr<arrow::RecordBatchReader>> MakeArrowRecordBatchReader(parquet::arrow::FileReader& reader,
+                                                                             const ReadOptions& options) {
   auto metadata = reader.parquet_reader()->metadata();
   std::vector<int> row_group_indices;
   std::vector<int> column_indices;

cpp/src/common/fs_util.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/common/log.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/common/opendal_fs.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/common/result.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/common/status.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/common/utils.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/file/blob.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/file/file.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/file/fragment.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/filter/conjunction_filter.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/filter/constant_filter.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/filter/value.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/format/parquet/file_reader.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.
@@ -27,8 +27,7 @@
 
 namespace milvus_storage {
 
-ParquetFileReader::ParquetFileReader(std::unique_ptr<parquet::arrow::FileReader> reader)
-    : reader_(std::move(reader)) {}
+ParquetFileReader::ParquetFileReader(std::unique_ptr<parquet::arrow::FileReader> reader) : reader_(std::move(reader)) {}
 
 Result<std::shared_ptr<arrow::RecordBatch>> GetRecordAtOffset(arrow::RecordBatchReader* reader, int64_t offset) {
   int64_t skipped = 0;

cpp/src/reader/common/delete_reader.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/reader/common/filter_reader.cpp

@@ -20,7 +20,7 @@
 
 namespace milvus_storage {
 std::unique_ptr<FilterReader> FilterReader::Make(std::unique_ptr<arrow::RecordBatchReader> reader,
-                                                         const ReadOptions& option) {
+                                                 const ReadOptions& option) {
   return std::make_unique<FilterReader>(std::move(reader), option);
 }
 

cpp/src/reader/filter_query_record_reader.cpp

@@ -94,8 +94,7 @@ Result<std::unique_ptr<arrow::RecordBatchReader>> FilterQueryRecordReader::MakeI
   auto scalar_file = scalar_files_[next_pos_], vector_file = vector_files_[next_pos_];
   ASSIGN_OR_RETURN_NOT_OK(holding_scalar_file_reader_, MakeArrowFileReader(fs_, scalar_file));
   ASSIGN_OR_RETURN_NOT_OK(holding_vector_file_reader_, MakeArrowFileReader(fs_, vector_file));
-  ASSIGN_OR_RETURN_NOT_OK(auto scalar_rec_reader,
-                          MakeArrowRecordBatchReader(*holding_scalar_file_reader_, options_));
+  ASSIGN_OR_RETURN_NOT_OK(auto scalar_rec_reader, MakeArrowRecordBatchReader(*holding_scalar_file_reader_, options_));
   auto current_vector_reader = std::make_unique<ParquetFileReader>(std::move(holding_vector_file_reader_));
 
   auto combine_reader =

cpp/src/reader/multi_files_sequential_reader.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.

cpp/src/storage/options.cpp

@@ -1,11 +1,11 @@
 // Copyright 2023 Zilliz
-// 
+//
 // Licensed 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.
@@ -56,7 +56,7 @@ Status SchemaOptions::Validate(const arrow::Schema* schema) const {
   return Status::OK();
 }
 
-std::unique_ptr<schema_proto::SchemaOptions> SchemaOptions::ToProtobuf() const{
+std::unique_ptr<schema_proto::SchemaOptions> SchemaOptions::ToProtobuf() const {
   auto options = std::make_unique<schema_proto::SchemaOptions>();
   options->set_primary_column(primary_column);
   options->set_version_column(version_column);