Skip to content

fix: correct clang-format include ordering in reorganized utils/io headers #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

fix: correct clang-format include ordering in reorganized utils/io headers #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36b167e
Initial plan
Copilot Jun 29, 2026
66d7828
refactor: reorganize utils IO under neug/utils/io/
luoxiaojian Jun 12, 2026
7f12eb8
fix: apply clang-format to fix include ordering in header files
Copilot Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions extension/httpfs/include/http_filesystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include <vector>
#include "neug/compiler/common/case_insensitive_map.h"
#include "neug/utils/exception/exception.h"
#include "neug/utils/file_sys/file_system.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/io/read/common/schema.h"
#include "neug/utils/io/vfs/file_system.h"

namespace neug {
namespace extension {
Expand Down
4 changes: 2 additions & 2 deletions extension/httpfs/include/s3_filesystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <vector>
#include "glob_utils.h"
#include "neug/utils/exception/exception.h"
#include "neug/utils/file_sys/file_system.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/io/read/common/schema.h"
#include "neug/utils/io/vfs/file_system.h"

namespace neug {
namespace extension {
Expand Down
4 changes: 2 additions & 2 deletions extension/httpfs/include/s3_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <arrow/filesystem/s3fs.h>
#include <string>
#include "neug/utils/exception/exception.h"
#include "neug/utils/reader/options.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/io/read/common/options.h"
#include "neug/utils/io/read/common/schema.h"

namespace neug {
namespace extension {
Expand Down
2 changes: 1 addition & 1 deletion extension/httpfs/src/http_filesystem.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <sstream>
#include <thread>
#include <chrono>
#include "neug/utils/file_sys/file_system.h"
#include "neug/utils/io/vfs/file_system.h"

namespace neug {
namespace extension {
Expand Down
2 changes: 1 addition & 1 deletion extension/httpfs/src/s3_extension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <arrow/filesystem/s3fs.h>
#include "neug/compiler/main/metadata_registry.h"
#include "neug/utils/exception/exception.h"
#include "neug/utils/file_sys/file_system.h"
#include "neug/utils/io/vfs/file_system.h"
#include "s3_filesystem.h"
#include "http_filesystem.h"
#include "s3_options.h"
Expand Down
2 changes: 1 addition & 1 deletion extension/httpfs/src/s3_filesystem.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <algorithm>
#include <arrow/io/api.h>
#include "neug/utils/exception/exception.h"
#include "neug/utils/file_sys/file_system.h"
#include "neug/utils/io/vfs/file_system.h"

namespace {

Expand Down
2 changes: 1 addition & 1 deletion extension/httpfs/src/s3_options.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <string>
#include <vector>
#include "neug/utils/exception/exception.h"
#include "neug/utils/reader/options.h"
#include "neug/utils/io/read/common/options.h"

namespace neug {
namespace extension {
Expand Down
4 changes: 2 additions & 2 deletions extension/httpfs/tests/s3_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <glog/logging.h>
#include "s3_filesystem.h"
#include "glob_utils.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/reader/options.h"
#include "neug/utils/io/read/common/schema.h"
#include "neug/utils/io/read/common/options.h"
#include "neug/utils/exception/exception.h"
#include <arrow/buffer.h>
#include <arrow/filesystem/s3fs.h>
Expand Down
4 changes: 2 additions & 2 deletions extension/parquet/include/parquet/arrow_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include <arrow/dataset/scanner.h>
#include <memory>

#include "neug/utils/reader/options.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/io/read/common/options.h"
#include "neug/utils/io/read/common/schema.h"

namespace neug {
namespace reader {
Expand Down
2 changes: 1 addition & 1 deletion extension/parquet/include/parquet/arrow_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <arrow/filesystem/filesystem.h>
#include <arrow/type.h>

#include "neug/utils/reader/reader.h"
#include "neug/utils/io/reader.h"
#include "parquet/arrow_options.h"

namespace neug {
Expand Down
2 changes: 1 addition & 1 deletion extension/parquet/include/parquet/arrow_sniffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <memory>

#include "neug/utils/reader/sniffer.h"
#include "neug/utils/io/read/common/sniffer.h"
#include "parquet/arrow_reader.h"

namespace neug {
Expand Down
2 changes: 1 addition & 1 deletion extension/parquet/include/parquet/arrow_type_converter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <memory>

#include "neug/generated/proto/plan/basic_type.pb.h"
#include "neug/utils/reader/type_converter.h"
#include "neug/utils/io/read/common/type_converter.h"

namespace arrow {
class DataType;
Expand Down
2 changes: 1 addition & 1 deletion extension/parquet/include/parquet_export_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <memory>

#include "neug/compiler/function/export/export_function.h"
#include "neug/utils/writer/writer.h"
#include "neug/utils/io/write/writer.h"

namespace neug {
namespace writer {
Expand Down
4 changes: 2 additions & 2 deletions extension/parquet/include/parquet_read_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include "neug/compiler/function/read_function.h"
#include "neug/compiler/main/metadata_registry.h"
#include "neug/execution/execute/ops/batch/batch_update_utils.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/reader/sniffer.h"
#include "neug/utils/io/read/common/schema.h"
#include "neug/utils/io/read/common/sniffer.h"
#include "parquet/arrow_fs_resolver.h"
#include "parquet/arrow_reader.h"
#include "parquet/arrow_sniffer.h"
Expand Down
2 changes: 1 addition & 1 deletion extension/parquet/src/arrow_fs_resolver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <arrow/filesystem/localfs.h>
#include <memory>

#include "neug/utils/file_sys/file_system.h"
#include "neug/utils/io/vfs/file_system.h"

namespace neug {
namespace parquet {
Expand Down
2 changes: 1 addition & 1 deletion extension/parquet/src/arrow_options.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <glog/logging.h>

#include "neug/utils/exception/exception.h"
#include "neug/utils/reader/reader.h"
#include "neug/utils/io/reader.h"
#include "parquet/arrow_type_converter.h"
#include "parquet/expression_converter.h"

Expand Down
2 changes: 1 addition & 1 deletion extension/parquet/src/arrow_reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "neug/execution/common/context.h"
#include "neug/storages/loader/loader_utils.h"
#include "neug/utils/exception/exception.h"
#include "neug/utils/reader/options.h"
#include "neug/utils/io/read/common/options.h"

namespace neug {
namespace reader {
Expand Down
2 changes: 1 addition & 1 deletion extension/parquet/src/arrow_sniffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <arrow/type.h>

#include "neug/utils/exception/exception.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/io/read/common/schema.h"
#include "parquet/arrow_type_converter.h"
#include "neug/utils/result.h"

Expand Down
2 changes: 1 addition & 1 deletion extension/parquet/src/parquet_export_function.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "neug/compiler/main/metadata_registry.h"
#include "neug/utils/exception/exception.h"
#include "neug/utils/property/types.h"
#include "neug/utils/writer/writer.h"
#include "neug/utils/io/write/writer.h"
#include "parquet/arrow_fs_resolver.h"
#include "parquet_options.h"

Expand Down
6 changes: 3 additions & 3 deletions extension/parquet/src/parquet_options.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
#include <glog/logging.h>
#include <memory>
#include "neug/utils/exception/exception.h"
#include "neug/utils/reader/options.h"
#include "neug/utils/reader/reader.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/io/read/common/options.h"
#include "neug/utils/io/reader.h"
#include "neug/utils/io/read/common/schema.h"

namespace neug {
namespace reader {
Expand Down
4 changes: 2 additions & 2 deletions extension/parquet/tests/parquet_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
#include "neug/execution/common/context.h"
#include "neug/generated/proto/plan/basic_type.pb.h"
#include "neug/utils/exception/exception.h"
#include "neug/utils/reader/options.h"
#include "neug/utils/io/read/common/options.h"
#include "parquet/arrow_reader.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/io/read/common/schema.h"

#include "../../extension/parquet/include/parquet_options.h"
#include "../../extension/parquet/include/parquet_export_function.h"
Expand Down
2 changes: 1 addition & 1 deletion include/neug/compiler/function/export/export_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "neug/compiler/function/function.h"
#include "neug/execution/common/context.h"
#include "neug/storages/graph/graph_interface.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/io/read/common/schema.h"

namespace neug {
namespace function {
Expand Down
2 changes: 1 addition & 1 deletion include/neug/compiler/function/export/json_export_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include <vector>

#include "neug/compiler/function/export/export_function.h"
#include "neug/utils/io/write/writer.h"
#include "neug/utils/result.h"
#include "neug/utils/writer/writer.h"
#include "rapidjson/document.h"

namespace neug {
Expand Down
8 changes: 4 additions & 4 deletions include/neug/compiler/function/import/csv_read_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
#include "neug/compiler/main/metadata_registry.h"
#include "neug/execution/execute/ops/batch/batch_update_utils.h"
#include "neug/utils/exception/exception.h"
#include "neug/utils/reader/options.h"
#include "neug/utils/reader/reader.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/reader/sniffer.h"
#include "neug/utils/io/read/common/options.h"
#include "neug/utils/io/read/common/schema.h"
#include "neug/utils/io/read/common/sniffer.h"
#include "neug/utils/io/reader.h"
namespace neug {
namespace function {
struct CSVReadFunction {
Expand Down
8 changes: 4 additions & 4 deletions include/neug/compiler/function/import/json_read_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
#include "neug/compiler/function/read_function.h"
#include "neug/compiler/main/metadata_registry.h"
#include "neug/execution/execute/ops/batch/batch_update_utils.h"
#include "neug/utils/reader/options.h"
#include "neug/utils/reader/reader.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/reader/sniffer.h"
#include "neug/utils/io/read/common/options.h"
#include "neug/utils/io/read/common/schema.h"
#include "neug/utils/io/read/common/sniffer.h"
#include "neug/utils/io/reader.h"
namespace neug {
namespace function {

Expand Down
4 changes: 2 additions & 2 deletions include/neug/compiler/function/read_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include "neug/compiler/function/table/table_function.h"
#include "neug/execution/common/context.h"
#include "neug/execution/execute/ops/batch/batch_update_utils.h"
#include "neug/utils/reader/reader.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/io/read/common/schema.h"
#include "neug/utils/io/reader.h"

namespace neug {
namespace function {
Expand Down
2 changes: 1 addition & 1 deletion include/neug/compiler/main/metadata_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "neug/compiler/main/option_config.h"
#include "neug/compiler/storage/buffer_manager/memory_manager.h"
#include "neug/utils/api.h"
#include "neug/utils/file_sys/file_system.h"
#include "neug/utils/io/vfs/file_system.h"

namespace neug {
namespace common {
Expand Down
2 changes: 1 addition & 1 deletion include/neug/execution/execute/ops/batch/data_source.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "neug/execution/execute/operator.h"
#include "neug/execution/execute/ops/batch/batch_update_utils.h"
#include "neug/utils/reader/reader.h"
#include "neug/utils/io/reader.h"

namespace neug {
using namespace reader;
Expand Down
2 changes: 1 addition & 1 deletion include/neug/storages/allocators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "neug/storages/container/container_utils.h"
#include "neug/storages/container/file_header.h"
#include "neug/storages/container/mmap_container.h"
#include "neug/utils/file_utils.h"
#include "neug/utils/io/file/file_utils.h"
#include "neug/utils/property/types.h"

namespace neug {
Expand Down
2 changes: 1 addition & 1 deletion include/neug/storages/csr/mutable_csr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "neug/storages/csr/csr_view.h"
#include "neug/storages/csr/nbr.h"
#include "neug/storages/module/type_name.h"
#include "neug/utils/file_utils.h"
#include "neug/utils/io/file/file_utils.h"
#include "neug/utils/property/types.h"
#include "neug/utils/spinlock.h"

Expand Down
2 changes: 1 addition & 1 deletion include/neug/storages/loader/loader_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
#include <vector>

#include "neug/execution/common/data_chunk.h"
#include "neug/storages/loader/csv_read_config.h"
#include "neug/storages/loader/loading_config.h"
#include "neug/utils/exception/exception.h"
#include "neug/utils/io/read/csv/csv_read_config.h"
#include "neug/utils/string_utils.h"

namespace neug {
Expand Down
0 include/neug/utils/file_utils.h → include/neug/utils/io/file/file_utils.h
View file
Open in desktop
File renamed without changes.
0 ...e/neug/utils/reader/operator_precedence.h → ...tils/io/read/common/operator_precedence.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions include/neug/utils/reader/options.h → include/neug/utils/io/read/common/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
#include <string>

#include "neug/compiler/common/case_insensitive_map.h"
#include "neug/storages/loader/csv_read_config.h"
#include "neug/storages/loader/json_read_config.h"
#include "neug/utils/exception/exception.h"
#include "neug/utils/reader/schema.h"
#include "neug/utils/io/read/common/schema.h"
#include "neug/utils/io/read/csv/csv_read_config.h"
#include "neug/utils/io/read/json/json_read_config.h"

namespace neug {
namespace reader {
Expand Down
Loading