Fixed some includes in yt/yt/client/table_client

commit_hash:3da72bd0561b117a957f5a82255e3aa4cca4f1c3

19 files changed, 46 insertions, 65 deletions

diff --git a/yt/yt/client/table_client/adapters.cpp b/yt/yt/client/table_client/adapters.cpp
index 43ac145369..35b21ce8cf 100644
--- a/yt/yt/client/table_client/adapters.cpp
+++ b/yt/yt/client/table_client/adapters.cpp
@@ -1,12 +1,11 @@
 #include "adapters.h"
-#include "private.h"
 
+#include "private.h"
+#include "schema.h"
 #include "row_batch.h"
 
 #include <yt/yt/client/api/table_writer.h>
 
-#include <yt/yt/client/table_client/schema.h>
-
 #include <yt/yt/core/concurrency/scheduler.h>
 #include <yt/yt/core/concurrency/throughput_throttler.h>
 #include <yt/yt/core/concurrency/periodic_yielder.h>
diff --git a/yt/yt/client/table_client/blob_reader.cpp b/yt/yt/client/table_client/blob_reader.cpp
index 551878b805..e354c9008b 100644
--- a/yt/yt/client/table_client/blob_reader.cpp
+++ b/yt/yt/client/table_client/blob_reader.cpp
@@ -1,12 +1,10 @@
 #include "blob_reader.h"
 
+#include "comparator.h"
 #include "name_table.h"
 #include "schema.h"
-
-#include <yt/yt/client/table_client/comparator.h>
-#include <yt/yt/client/table_client/row_batch.h>
-#include <yt/yt/client/table_client/unversioned_reader.h>
-#include <yt/yt/client/table_client/unversioned_row.h>
+#include "row_batch.h"
+#include "unversioned_row.h"
 
 #include <yt/yt/core/concurrency/async_stream.h>
 
diff --git a/yt/yt/client/table_client/columnar.cpp b/yt/yt/client/table_client/columnar.cpp
index 5bd667708f..6116c4dac9 100644
--- a/yt/yt/client/table_client/columnar.cpp
+++ b/yt/yt/client/table_client/columnar.cpp
@@ -1,7 +1,5 @@
 #include "columnar.h"
 
-#include <yt/yt/client/table_client/row_base.h>
-
 #include <yt/yt/library/numeric/algorithm_helpers.h>
 
 #include <util/system/cpu_id.h>
diff --git a/yt/yt/client/table_client/columnar_statistics.cpp b/yt/yt/client/table_client/columnar_statistics.cpp
index d483bd8c11..85a223a8a4 100644
--- a/yt/yt/client/table_client/columnar_statistics.cpp
+++ b/yt/yt/client/table_client/columnar_statistics.cpp
@@ -1,9 +1,8 @@
 #include "columnar_statistics.h"
 
-#include <yt/yt/client/table_client/name_table.h>
-#include <yt/yt/client/table_client/schema.h>
-#include <yt/yt/client/table_client/unversioned_row.h>
-#include <yt/yt/client/table_client/versioned_row.h>
+#include "name_table.h"
+#include "unversioned_row.h"
+#include "versioned_row.h"
 
 #include <library/cpp/iterator/functools.h>
 
diff --git a/yt/yt/client/table_client/config.cpp b/yt/yt/client/table_client/config.cpp
index 96ff8b5af6..49898440e2 100644
--- a/yt/yt/client/table_client/config.cpp
+++ b/yt/yt/client/table_client/config.cpp
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#include <yt/yt/client/table_client/helpers.h>
+#include "helpers.h"
 
 #include <yt/yt/client/tablet_client/config.h>
 #include <yt/yt/client/tablet_client/helpers.h>
diff --git a/yt/yt/client/table_client/logical_type.cpp b/yt/yt/client/table_client/logical_type.cpp
index 5adb7d1382..ef61f7f0c7 100644
--- a/yt/yt/client/table_client/logical_type.cpp
+++ b/yt/yt/client/table_client/logical_type.cpp
@@ -1,6 +1,5 @@
 #include "logical_type.h"
 #include "schema.h"
-#include "yt/yt/client/table_client/row_base.h"
 
 #include <yt/yt_proto/yt/client/table_chunk_format/proto/chunk_meta.pb.h>
 
diff --git a/yt/yt/client/table_client/logical_type.h b/yt/yt/client/table_client/logical_type.h
index b7db1a8143..904ff9708b 100644
--- a/yt/yt/client/table_client/logical_type.h
+++ b/yt/yt/client/table_client/logical_type.h
@@ -2,7 +2,7 @@
 
 #include "public.h"
 
-#include <yt/yt/client/table_client/row_base.h>
+#include "row_base.h"
 
 #include <yt/yt/core/yson/public.h>
 #include <yt/yt/core/ytree/public.h>
diff --git a/yt/yt/client/table_client/pipe.cpp b/yt/yt/client/table_client/pipe.cpp
index ed659808a5..be6607b232 100644
--- a/yt/yt/client/table_client/pipe.cpp
+++ b/yt/yt/client/table_client/pipe.cpp
@@ -1,9 +1,9 @@
 #include "pipe.h"
 
-#include <yt/yt/client/table_client/row_buffer.h>
-#include <yt/yt/client/table_client/unversioned_reader.h>
-#include <yt/yt/client/table_client/unversioned_writer.h>
-#include <yt/yt/client/table_client/row_batch.h>
+#include "row_batch.h"
+#include "row_buffer.h"
+#include "unversioned_reader.h"
+#include "unversioned_writer.h"
 
 #include <yt/yt/core/misc/ring_queue.h>
 
diff --git a/yt/yt/client/table_client/schema.cpp b/yt/yt/client/table_client/schema.cpp
index f3762d0951..5c231cb891 100644
--- a/yt/yt/client/table_client/schema.cpp
+++ b/yt/yt/client/table_client/schema.cpp
@@ -6,12 +6,8 @@
 #include "unversioned_row.h"
 #include "versioned_io_options.h"
 
-#include <optional>
-
 #include <yt/yt/client/tablet_client/public.h>
 
-#include <yt/yt/client/table_client/schema_serialization_helpers.h>
-
 #include <yt/yt/core/yson/public.h>
 #include <yt/yt/core/yson/pull_parser_deserialize.h>
 
@@ -25,6 +21,8 @@
 
 #include <yt/yt_proto/yt/client/tablet_client/proto/lock_mask.pb.h>
 
+#include <optional>
+
 namespace NYT::NTableClient {
 
 using namespace NChunkClient;
diff --git a/yt/yt/client/table_client/schema_serialization_helpers.cpp b/yt/yt/client/table_client/schema_serialization_helpers.cpp
index 4f344101d8..3ff0b2bec0 100644
--- a/yt/yt/client/table_client/schema_serialization_helpers.cpp
+++ b/yt/yt/client/table_client/schema_serialization_helpers.cpp
@@ -1,10 +1,9 @@
+#include "schema_serialization_helpers.h"
 
 #include "comparator.h"
 
 #include <yt/yt/core/ytree/fluent.h>
 
-#include <yt/yt/client/table_client/schema_serialization_helpers.h>
-
 namespace NYT::NTableClient {
 
 void Deserialize(TMaybeDeletedColumnSchema& schema, NYson::TYsonPullParserCursor* cursor)
diff --git a/yt/yt/client/table_client/schema_serialization_helpers.h b/yt/yt/client/table_client/schema_serialization_helpers.h
index 24ff8511c9..f573ac4f4b 100644
--- a/yt/yt/client/table_client/schema_serialization_helpers.h
+++ b/yt/yt/client/table_client/schema_serialization_helpers.h
@@ -1,12 +1,11 @@
 #pragma once
 
+#include "logical_type.h"
+#include "schema.h"
+
 #include <yt/yt/core/yson/pull_parser.h>
 #include <yt/yt/core/ytree/yson_struct.h>
 
-#include <yt/yt/client/table_client/logical_type.h>
-
-#include <yt/yt/client/table_client/schema.h>
-
 namespace NYT::NTableClient {
 
 struct TMaybeDeletedColumnSchema : public TColumnSchema
diff --git a/yt/yt/client/table_client/schemaless_row_reorderer.cpp b/yt/yt/client/table_client/schemaless_row_reorderer.cpp
index 88a11d7cc8..65d5d165be 100644
--- a/yt/yt/client/table_client/schemaless_row_reorderer.cpp
+++ b/yt/yt/client/table_client/schemaless_row_reorderer.cpp
@@ -1,7 +1,7 @@
 #include "schemaless_row_reorderer.h"
 
-#include <yt/yt/client/table_client/name_table.h>
-#include <yt/yt/client/table_client/row_buffer.h>
+#include "name_table.h"
+#include "row_buffer.h"
 
 namespace NYT::NTableClient {
 
diff --git a/yt/yt/client/table_client/table_consumer.cpp b/yt/yt/client/table_client/table_consumer.cpp
index 68a38b549f..af6da8f76c 100644
--- a/yt/yt/client/table_client/table_consumer.cpp
+++ b/yt/yt/client/table_client/table_consumer.cpp
@@ -1,16 +1,13 @@
 #include "table_consumer.h"
 
-#include <yt/yt/client/table_client/logical_type.h>
-#include <yt/yt/client/table_client/name_table.h>
-#include <yt/yt/client/table_client/schema.h>
+#include "logical_type.h"
+#include "name_table.h"
+#include "schema.h"
 
 #include <yt/yt/core/concurrency/scheduler.h>
 
 #include <util/string/cast.h>
 
-#include <cmath>
-#include <variant>
-
 namespace NYT::NTableClient {
 
 using namespace NFormats;
diff --git a/yt/yt/client/table_client/table_consumer.h b/yt/yt/client/table_client/table_consumer.h
index 9355d695ba..6aa37b4244 100644
--- a/yt/yt/client/table_client/table_consumer.h
+++ b/yt/yt/client/table_client/table_consumer.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include "public.h"
+#include "value_consumer.h"
+#include "name_table.h"
 
 #include <yt/yt/client/complex_types/yson_format_conversion.h>
-#include <yt/yt/client/formats/public.h>
 
-#include <yt/yt/client/table_client/value_consumer.h>
-#include <yt/yt/client/table_client/name_table.h>
+#include <yt/yt/client/formats/public.h>
 
 #include <yt/yt/core/misc/error.h>
 
diff --git a/yt/yt/client/table_client/unordered_schemaful_reader.cpp b/yt/yt/client/table_client/unordered_schemaful_reader.cpp
index bceaeba8c3..a8a38f83f8 100644
--- a/yt/yt/client/table_client/unordered_schemaful_reader.cpp
+++ b/yt/yt/client/table_client/unordered_schemaful_reader.cpp
@@ -1,8 +1,7 @@
 #include "unordered_schemaful_reader.h"
 
-#include <yt/yt/client/table_client/unversioned_row.h>
-#include <yt/yt/client/table_client/unversioned_reader.h>
-#include <yt/yt/client/table_client/row_batch.h>
+#include "unversioned_reader.h"
+#include "row_batch.h"
 
 #include <yt/yt/core/actions/cancelable_context.h>
 
diff --git a/yt/yt/client/table_client/unversioned_row.cpp b/yt/yt/client/table_client/unversioned_row.cpp
index 4ed43b4092..8d0a430767 100644
--- a/yt/yt/client/table_client/unversioned_row.cpp
+++ b/yt/yt/client/table_client/unversioned_row.cpp
@@ -2,14 +2,13 @@
 
 #include "composite_compare.h"
 #include "helpers.h"
+#include "name_table.h"
+#include "row_buffer.h"
+#include "schema.h"
 #include "serialize.h"
 #include "unversioned_value.h"
 #include "validate_logical_type.h"
 
-#include <yt/yt/client/table_client/name_table.h>
-#include <yt/yt/client/table_client/row_buffer.h>
-#include <yt/yt/client/table_client/schema.h>
-
 #include <yt/yt/library/decimal/decimal.h>
 
 #include <yt/yt/core/misc/range.h>
@@ -31,6 +30,7 @@
 #include <util/generic/ymath.h>
 
 #include <util/charset/utf8.h>
+
 #include <util/stream/str.h>
 
 #include <cmath>
diff --git a/yt/yt/client/table_client/value_consumer.cpp b/yt/yt/client/table_client/value_consumer.cpp
index b6865a4c68..80c8568673 100644
--- a/yt/yt/client/table_client/value_consumer.cpp
+++ b/yt/yt/client/table_client/value_consumer.cpp
@@ -1,10 +1,10 @@
 #include "value_consumer.h"
-#include "helpers.h"
 
-#include <yt/yt/client/table_client/name_table.h>
-#include <yt/yt/client/table_client/row_buffer.h>
-#include <yt/yt/client/table_client/schema.h>
-#include <yt/yt/client/table_client/unversioned_writer.h>
+#include "helpers.h"
+#include "name_table.h"
+#include "row_buffer.h"
+#include "schema.h"
+#include "unversioned_writer.h"
 
 #include <yt/yt/core/concurrency/scheduler.h>
 
diff --git a/yt/yt/client/table_client/wire_protocol.cpp b/yt/yt/client/table_client/wire_protocol.cpp
index d473573986..59638588f2 100644
--- a/yt/yt/client/table_client/wire_protocol.cpp
+++ b/yt/yt/client/table_client/wire_protocol.cpp
@@ -1,14 +1,11 @@
 #include "wire_protocol.h"
 
 #include "private.h"
+#include "row_batch.h"
+#include "row_buffer.h"
+#include "unversioned_row.h"
 
 #include <yt/yt_proto/yt/client/table_chunk_format/proto/chunk_meta.pb.h>
-#include <yt/yt/client/table_client/row_buffer.h>
-#include <yt/yt/client/table_client/schema.h>
-#include <yt/yt/client/table_client/unversioned_reader.h>
-#include <yt/yt/client/table_client/unversioned_writer.h>
-#include <yt/yt/client/table_client/unversioned_row.h>
-#include <yt/yt/client/table_client/row_batch.h>
 
 #include <yt/yt/core/actions/future.h>
 
diff --git a/yt/yt/client/table_client/wire_protocol.h b/yt/yt/client/table_client/wire_protocol.h
index e8a496280e..340f3d6263 100644
--- a/yt/yt/client/table_client/wire_protocol.h
+++ b/yt/yt/client/table_client/wire_protocol.h
@@ -2,14 +2,13 @@
 
 #include "public.h"
 #include "schema.h"
+#include "unversioned_reader.h"
+#include "unversioned_row.h"
+#include "unversioned_writer.h"
+#include "versioned_row.h"
 
 #include <yt/yt/client/api/public.h>
 
-#include <yt/yt/client/table_client/unversioned_reader.h>
-#include <yt/yt/client/table_client/unversioned_writer.h>
-#include <yt/yt/client/table_client/versioned_row.h>
-#include <yt/yt/client/table_client/unversioned_row.h>
-
 #include <yt/yt_proto/yt/client/table_chunk_format/proto/wire_protocol.pb.h>
 
 #include <yt/yt/core/misc/range.h>