Cleanup include headers in C++ files

Signed-off-by: Tao He <[email protected]>
v6d-io · Aug 29, 2023 · 62ae135 · 62ae135
1 parent 89b3b17
commit 62ae135
Show file tree

Hide file tree

Showing 118 changed files with 157 additions and 334 deletions.
diff --git a/k8s/go.mod b/k8s/go.mod
@@ -15,6 +15,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5
+	github.com/stretchr/testify v1.8.0
 	github.com/v6d-io/v6d/go/vineyard v0.0.0-00010101000000-000000000000
 	go.uber.org/multierr v1.9.0
 	go.uber.org/zap v1.24.0
@@ -87,6 +88,7 @@ require (
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/selinux v1.10.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.12.2 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect

diff --git a/modules/basic/ds/array.h b/modules/basic/ds/array.h
@@ -17,15 +17,13 @@ limitations under the License.
 #define MODULES_BASIC_DS_ARRAY_H_
 
 #include <memory>
-#include <string>
 #include <utility>
 #include <vector>
 
 #include "basic/ds/array.vineyard.h"
 #include "client/client.h"
 #include "client/ds/blob.h"
 #include "client/ds/i_object.h"
-#include "common/util/uuid.h"
 
 namespace vineyard {
 

diff --git a/modules/basic/ds/array.vineyard-mod b/modules/basic/ds/array.vineyard-mod
@@ -16,16 +16,11 @@ limitations under the License.
 #ifndef MODULES_BASIC_DS_ARRAY_VINEYARD_MOD_
 #define MODULES_BASIC_DS_ARRAY_VINEYARD_MOD_
 
-#include <cstdint>
 #include <memory>
-#include <string>
-#include <utility>
-#include <vector>
 
 #include "client/client.h"
 #include "client/ds/blob.h"
 #include "client/ds/i_object.h"
-#include "common/util/uuid.h"
 
 namespace vineyard {
 

diff --git a/modules/basic/ds/arrow.cc b/modules/basic/ds/arrow.cc
@@ -15,17 +15,17 @@ limitations under the License.
 
 #include "basic/ds/arrow.h"  // NOLINT(build/include)
 
-#include <iostream>
+#include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "arrow/api.h"
-#include "arrow/io/api.h"
-#include "arrow/ipc/api.h"
+#include "arrow/api.h"      // IWYU pragma: keep
+#include "arrow/io/api.h"   // IWYU pragma: keep
+#include "arrow/ipc/api.h"  // IWYU pragma: keep
 #if defined(ARROW_VERSION) && ARROW_VERSION >= 7000000
-#include "arrow/visit_type_inline.h"
+#include "arrow/visit_type_inline.h"  // IWYU pragma: keep
 #else
 #include "arrow/visitor_inline.h"
 #endif
@@ -35,7 +35,7 @@ limitations under the License.
 #include "basic/ds/arrow_utils.h"
 #include "client/client.h"
 #include "client/ds/blob.h"
-#include "common/memory/memcpy.h"
+#include "common/util/logging.h"  // IWYU pragma: keep
 
 namespace vineyard {
 

diff --git a/modules/basic/ds/arrow.h b/modules/basic/ds/arrow.h
@@ -16,16 +16,14 @@ limitations under the License.
 #ifndef MODULES_BASIC_DS_ARROW_H_
 #define MODULES_BASIC_DS_ARROW_H_
 
-#include <algorithm>
-#include <iostream>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "arrow/api.h"
-#include "arrow/io/api.h"
-#include "arrow/ipc/api.h"
+#include "arrow/api.h"      // IWYU pragma: keep
+#include "arrow/io/api.h"   // IWYU pragma: keep
+#include "arrow/ipc/api.h"  // IWYU pragma: keep
 
 #include "basic/ds/arrow.vineyard.h"
 #include "basic/ds/arrow_utils.h"

diff --git a/modules/basic/ds/arrow.vineyard-mod b/modules/basic/ds/arrow.vineyard-mod
@@ -16,22 +16,19 @@ limitations under the License.
 #ifndef MODULES_BASIC_DS_ARROW_VINEYARD_MOD_
 #define MODULES_BASIC_DS_ARROW_VINEYARD_MOD_
 
-#include <iostream>
 #include <memory>
-#include <string>
-#include <utility>
 #include <vector>
 
-#include "arrow/api.h"
-#include "arrow/io/api.h"
-#include "arrow/ipc/api.h"
+#include "arrow/api.h"      // IWYU pragma: keep
+#include "arrow/io/api.h"   // IWYU pragma: keep
+#include "arrow/ipc/api.h"  // IWYU pragma: keep
 
 #include "basic/ds/arrow_utils.h"
 #include "client/client.h"
 #include "client/ds/blob.h"
 #include "client/ds/collection.h"
 #include "client/ds/core_types.h"
-#include "client/ds/stream.h"
+#include "client/ds/stream.h"  // IWYU pragma: keep
 
 namespace vineyard {
 

diff --git a/modules/basic/ds/arrow_shim/concatenate.h b/modules/basic/ds/arrow_shim/concatenate.h
@@ -33,7 +33,6 @@
 
 #include "arrow/type_fwd.h"
 #include "arrow/util/macros.h"
-#include "arrow/util/visibility.h"
 
 namespace vineyard {
 

diff --git a/modules/basic/ds/arrow_shim/memory_pool.cc b/modules/basic/ds/arrow_shim/memory_pool.cc
@@ -15,13 +15,11 @@ limitations under the License.
 
 #include "basic/ds/arrow_shim/memory_pool.h"
 
-#include <limits>
 #include <memory>
 #include <string>
 #include <utility>
 
-#include "arrow/api.h"
-#include "arrow/io/api.h"
+#include "arrow/buffer.h"
 
 #include "client/ds/blob.h"
 #include "common/memory/memcpy.h"

diff --git a/modules/basic/ds/arrow_utils.cc b/modules/basic/ds/arrow_utils.cc
@@ -18,16 +18,18 @@ limitations under the License.
 #include <algorithm>
 #include <map>
 #include <unordered_map>
+#include <utility>
 
 #include "arrow/api.h"
 #include "arrow/compute/api.h"
-#include "arrow/io/api.h"
-#include "arrow/ipc/api.h"
-
-#include "boost/algorithm/string.hpp"
+#include "arrow/ipc/api.h"  // IWYU pragma: keep
+#include "boost/algorithm/string/classification.hpp"
+#include "boost/algorithm/string/join.hpp"
+#include "boost/algorithm/string/split.hpp"
 
 #include "client/ds/blob.h"
 #include "client/ds/remote_blob.h"
+#include "common/util/logging.h"  // IWYU pragma: keep
 #include "common/util/typename.h"
 
 namespace vineyard {

diff --git a/modules/basic/ds/arrow_utils.h b/modules/basic/ds/arrow_utils.h
@@ -20,16 +20,14 @@ limitations under the License.
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include <utility>
 #include <vector>
 
-#include "arrow/api.h"
-#include "arrow/io/api.h"
+#include "arrow/api.h"     // IWYU pragma: keep
+#include "arrow/io/api.h"  // IWYU pragma: keep
 
 #include "basic/ds/types.h"
 #include "client/ds/blob.h"
 #include "common/util/arrow.h"
-#include "common/util/logging.h"
 #include "common/util/status.h"
 
 namespace vineyard {

diff --git a/modules/basic/ds/dataframe.cc b/modules/basic/ds/dataframe.cc
@@ -15,6 +15,10 @@ limitations under the License.
 
 #include "basic/ds/dataframe.h"  // NOLINT(build/include)
 
+#include <string>
+
+#include "common/util/logging.h"  // IWYU pragma: keep
+
 namespace vineyard {
 
 class DataFrameBuilder;

diff --git a/modules/basic/ds/dataframe.h b/modules/basic/ds/dataframe.h
@@ -16,19 +16,12 @@ limitations under the License.
 #ifndef MODULES_BASIC_DS_DATAFRAME_H_
 #define MODULES_BASIC_DS_DATAFRAME_H_
 
-#include <algorithm>
-#include <functional>
-#include <map>
 #include <memory>
-#include <set>
-#include <string>
-#include <tuple>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "basic/ds/array.h"
-#include "basic/ds/arrow.h"
+#include "basic/ds/arrow.h"  // IWYU pragma: keep
 #include "basic/ds/dataframe.vineyard.h"
 #include "basic/ds/tensor.h"
 #include "client/client.h"

diff --git a/modules/basic/ds/dataframe.vineyard-mod b/modules/basic/ds/dataframe.vineyard-mod
@@ -16,26 +16,18 @@ limitations under the License.
 #ifndef MODULES_BASIC_DS_DATAFRAME_VINEYARD_MOD_
 #define MODULES_BASIC_DS_DATAFRAME_VINEYARD_MOD_
 
-#include <algorithm>
-#include <functional>
-#include <map>
 #include <memory>
-#include <set>
-#include <string>
-#include <tuple>
-#include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "arrow/api.h"
-#include "arrow/io/api.h"
+#include "arrow/api.h"     // IWYU pragma: keep
+#include "arrow/io/api.h"  // IWYU pragma: keep
 
-#include "basic/ds/array.vineyard.h"
-#include "basic/ds/arrow.vineyard.h"
+#include "basic/ds/arrow.vineyard.h"  // IWYU pragma: keep
 #include "basic/ds/tensor.vineyard.h"
 #include "client/client.h"
 #include "client/ds/i_object.h"
-#include "client/ds/stream.h"
+#include "client/ds/stream.h"  // IWYU pragma: keep
 #include "common/util/json.h"
 
 namespace vineyard {

diff --git a/modules/basic/ds/hashmap.h b/modules/basic/ds/hashmap.h
@@ -19,19 +19,16 @@ limitations under the License.
 #include <algorithm>
 #include <functional>
 #include <memory>
-#include <string>
 #include <utility>
-#include <vector>
 
 #include "flat_hash_map/flat_hash_map.hpp"
-#include "wyhash/wyhash.hpp"
+#include "wyhash/wyhash.hpp"  // IWYU pragma: keep
 
 #include "basic/ds/array.h"
 #include "basic/ds/hashmap.vineyard.h"
 #include "client/ds/blob.h"
 #include "client/ds/i_object.h"
-#include "common/util/arrow.h"
-#include "common/util/uuid.h"
+#include "common/util/arrow.h"  // IWYU pragma: keep
 
 #ifdef __GNUC__
 #pragma GCC diagnostic push

diff --git a/modules/basic/ds/hashmap.vineyard-mod b/modules/basic/ds/hashmap.vineyard-mod
@@ -28,14 +28,12 @@ limitations under the License.
 #include "wyhash/wyhash.hpp"
 
 #include "basic/ds/array.vineyard.h"
-#include "basic/ds/arrow.vineyard.h"
+#include "basic/ds/arrow.vineyard.h"  // IWYU pragma: keep
 #include "basic/ds/arrow_utils.h"
 #include "basic/utils.h"
 #include "client/ds/blob.h"
 #include "client/ds/i_object.h"
 #include "common/util/arrow.h"
-#include "common/util/functions.h"
-#include "common/util/uuid.h"
 
 #ifdef __GNUC__
 #pragma GCC diagnostic push

diff --git a/modules/basic/ds/hashmap_mvcc.h b/modules/basic/ds/hashmap_mvcc.h
@@ -19,16 +19,15 @@ limitations under the License.
 #include <algorithm>
 #include <functional>
 #include <memory>
-#include <string>
 #include <utility>
-#include <vector>
 
 #include "flat_hash_map/flat_hash_map.hpp"
-#include "wyhash/wyhash.hpp"
+#include "wyhash/wyhash.hpp"  // IWYU pragma: keep
 
-#include "basic/ds/hashmap.h"
+#include "basic/ds/hashmap.h"  // IWYU pragma: keep
 #include "client/ds/blob.h"
 #include "client/ds/i_object.h"
+#include "common/util/logging.h"  // IWYU pragma: keep
 #include "common/util/uuid.h"
 
 namespace vineyard {

diff --git a/modules/basic/ds/scalar.h b/modules/basic/ds/scalar.h
@@ -16,18 +16,10 @@ limitations under the License.
 #ifndef MODULES_BASIC_DS_SCALAR_H_
 #define MODULES_BASIC_DS_SCALAR_H_
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "boost/lexical_cast.hpp"
-
 #include "basic/ds/scalar.vineyard.h"
 #include "client/client.h"
 #include "client/ds/blob.h"
 #include "client/ds/i_object.h"
-#include "common/util/uuid.h"
 
 namespace vineyard {
 

diff --git a/modules/basic/ds/scalar.vineyard-mod b/modules/basic/ds/scalar.vineyard-mod
@@ -16,18 +16,10 @@ limitations under the License.
 #ifndef MODULES_BASIC_DS_SCALAR_VINEYARD_MOD_
 #define MODULES_BASIC_DS_SCALAR_VINEYARD_MOD_
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "boost/lexical_cast.hpp"
-
 #include "basic/ds/types.h"
 #include "client/client.h"
 #include "client/ds/blob.h"
 #include "client/ds/i_object.h"
-#include "common/util/uuid.h"
 
 namespace vineyard {
 

diff --git a/modules/basic/ds/sequence.h b/modules/basic/ds/sequence.h
@@ -17,16 +17,13 @@ limitations under the License.
 #define MODULES_BASIC_DS_SEQUENCE_H_
 
 #include <memory>
-#include <string>
-#include <utility>
 #include <vector>
 
 #include "basic/ds/sequence.vineyard.h"
 #include "client/client.h"
 #include "client/ds/blob.h"
 #include "client/ds/i_object.h"
-#include "common/util/logging.h"
-#include "common/util/uuid.h"
+#include "common/util/logging.h"  // IWYU pragma: keep
 
 namespace vineyard {
 

diff --git a/modules/basic/ds/sequence.vineyard-mod b/modules/basic/ds/sequence.vineyard-mod
@@ -17,16 +17,13 @@ limitations under the License.
 #define MODULES_BASIC_DS_SEQUENCE_VINEYARD_MOD_
 
 #include <memory>
-#include <string>
-#include <utility>
 #include <vector>
 
 #include "client/client.h"
 #include "client/ds/blob.h"
 #include "client/ds/core_types.h"
 #include "client/ds/i_object.h"
-#include "common/util/logging.h"
-#include "common/util/uuid.h"
+#include "common/util/logging.h"  // IWYU pragma: keep
 
 namespace vineyard {