Intermediate changes

3 files changed, 1 insertions, 167 deletions

diff --git a/yt/yt/client/driver/driver.cpp b/yt/yt/client/driver/driver.cpp
index 6ab6f64d4a..2f9db97950 100644
--- a/yt/yt/client/driver/driver.cpp
+++ b/yt/yt/client/driver/driver.cpp
@@ -377,7 +377,7 @@ public:
         REGISTER    (TStartPipelineCommand,                "start_pipeline",                  Null,       Structured, true,  false, ApiVersion4);
         REGISTER    (TStopPipelineCommand,                 "stop_pipeline",                   Null,       Structured, true,  false, ApiVersion4);
         REGISTER    (TPausePipelineCommand,                "pause_pipeline",                  Null,       Structured, true,  false, ApiVersion4);
-        REGISTER    (TGetPipelineStateCommand,            "get_pipeline_state",             Null,       Structured, false, false, ApiVersion4);
+        REGISTER    (TGetPipelineStateCommand,             "get_pipeline_state",              Null,       Structured, false, false, ApiVersion4);
         REGISTER    (TGetFlowViewCommand,                  "get_flow_view",                   Null,       Structured, false, false, ApiVersion4);
 
         if (Config_->EnableInternalCommands) {
diff --git a/yt/yt/core/test_framework/test_proxy_service.h b/yt/yt/core/test_framework/test_proxy_service.h
index eb54e6f183..d1e710c559 100644
--- a/yt/yt/core/test_framework/test_proxy_service.h
+++ b/yt/yt/core/test_framework/test_proxy_service.h
@@ -2,18 +2,12 @@
 
 #include "public.h"
 
-#include <yt/yt/library/query/base/public.h>
-
-#include <yt/yt/core/bus/public.h>
 #include <yt/yt/core/bus/bus.h>
 
 #include <yt/yt/core/net/address.h>
 
-#include <yt/yt/core/rpc/public.h>
 #include <yt/yt/core/rpc/channel.h>
 
-#include <yt/yt/core/rpc/bus/channel.h>
-
 #include <yt/yt/core/logging/log.h>
 
 #include <yt/yt/core/misc/atomic_object.h>
diff --git a/yt/yt/library/query/base/public.h b/yt/yt/library/query/base/public.h
deleted file mode 100644
index 72f4315ee2..0000000000
--- a/yt/yt/library/query/base/public.h
+++ /dev/null
@@ -1,160 +0,0 @@
-#pragma once
-
-#include <yt/yt/client/query_client/public.h>
-
-#include <yt/yt/client/transaction_client/public.h>
-
-#include <yt/yt/client/table_client/public.h>
-
-#include <yt/yt/core/ypath/public.h>
-
-namespace NYT::NQueryClient {
-
-using NTransactionClient::TTimestamp;
-
-using NTableClient::TRowRange;
-
-using TReadSessionId = TGuid;
-
-struct TDataSplit;
-
-////////////////////////////////////////////////////////////////////////////////
-
-namespace NProto {
-
-class TColumnDescriptor;
-class TExpression;
-class TGroupClause;
-class TProjectClause;
-class TWhenThenExpression;
-class TJoinClause;
-class TQuery;
-class TQueryOptions;
-class TDataSource;
-
-} // namespace NProto
-
-////////////////////////////////////////////////////////////////////////////////
-
-DECLARE_REFCOUNTED_STRUCT(TExpression)
-using TConstExpressionPtr = TIntrusivePtr<const TExpression>;
-
-DECLARE_REFCOUNTED_STRUCT(TFunctionExpression)
-using TConstFunctionExpressionPtr = TIntrusivePtr<const TFunctionExpression>;
-
-DECLARE_REFCOUNTED_STRUCT(TAggregateFunctionExpression)
-using TConstAggregateFunctionExpressionPtr = TIntrusivePtr<const TAggregateFunctionExpression>;
-
-DECLARE_REFCOUNTED_STRUCT(TArrayJoinClause)
-using TConstArrayJoinClausePtr = TIntrusivePtr<const TArrayJoinClause>;
-
-DECLARE_REFCOUNTED_STRUCT(TJoinClause)
-using TConstJoinClausePtr = TIntrusivePtr<const TJoinClause>;
-
-DECLARE_REFCOUNTED_STRUCT(TGroupClause)
-using TConstGroupClausePtr = TIntrusivePtr<const TGroupClause>;
-
-DECLARE_REFCOUNTED_STRUCT(TOrderClause)
-using TConstOrderClausePtr = TIntrusivePtr<const TOrderClause>;
-
-DECLARE_REFCOUNTED_STRUCT(TProjectClause)
-using TConstProjectClausePtr = TIntrusivePtr<const TProjectClause>;
-
-DECLARE_REFCOUNTED_STRUCT(TWhenThenExpression)
-using TConstWhenThenExpressionPtr = TIntrusivePtr<const TWhenThenExpression>;
-
-DECLARE_REFCOUNTED_STRUCT(TBaseQuery)
-using TConstBaseQueryPtr = TIntrusivePtr<const TBaseQuery>;
-
-DECLARE_REFCOUNTED_STRUCT(TFrontQuery)
-using TConstFrontQueryPtr = TIntrusivePtr<const TFrontQuery>;
-
-DECLARE_REFCOUNTED_STRUCT(TQuery)
-using TConstQueryPtr = TIntrusivePtr<const TQuery>;
-
-struct IPrepareCallbacks;
-
-struct TQueryStatistics;
-
-struct TQueryOptions;
-
-DECLARE_REFCOUNTED_STRUCT(IAggregateFunctionDescriptor)
-
-DECLARE_REFCOUNTED_STRUCT(ICallingConvention)
-
-DECLARE_REFCOUNTED_STRUCT(IExecutor)
-
-DECLARE_REFCOUNTED_STRUCT(IEvaluator)
-
-DECLARE_REFCOUNTED_CLASS(TExecutorConfig)
-
-DECLARE_REFCOUNTED_STRUCT(IColumnEvaluatorCache)
-DECLARE_REFCOUNTED_CLASS(TColumnEvaluator)
-DECLARE_REFCOUNTED_CLASS(TColumnEvaluatorCacheConfig)
-DECLARE_REFCOUNTED_CLASS(TColumnEvaluatorCacheDynamicConfig)
-
-DECLARE_REFCOUNTED_STRUCT(IExpressionEvaluatorCache)
-DECLARE_REFCOUNTED_CLASS(TExpressionEvaluator)
-DECLARE_REFCOUNTED_CLASS(TExpressionEvaluatorCacheConfig)
-
-DECLARE_REFCOUNTED_STRUCT(TExternalCGInfo)
-using TConstExternalCGInfoPtr = TIntrusivePtr<const TExternalCGInfo>;
-
-DECLARE_REFCOUNTED_STRUCT(TTypeInferrerMap)
-using TConstTypeInferrerMapPtr = TIntrusivePtr<const TTypeInferrerMap>;
-
-const TConstTypeInferrerMapPtr GetBuiltinTypeInferrers();
-
-DECLARE_REFCOUNTED_STRUCT(IFunctionRegistry)
-DECLARE_REFCOUNTED_STRUCT(ITypeInferrer)
-
-DECLARE_REFCOUNTED_CLASS(TFunctionImplCache)
-
-using NTableClient::ISchemafulUnversionedReader;
-using NTableClient::ISchemafulUnversionedReaderPtr;
-using NTableClient::ISchemalessUnversionedReader;
-using NTableClient::ISchemalessUnversionedReaderPtr;
-using NTableClient::IUnversionedRowsetWriter;
-using NTableClient::IUnversionedRowsetWriterPtr;
-using NTableClient::EValueType;
-using NTableClient::TTableSchema;
-using NTableClient::TTableSchemaPtr;
-using NTableClient::TColumnSchema;
-using NTableClient::TKeyColumns;
-using NTableClient::TColumnFilter;
-using NTableClient::TRowRange;
-
-using NTransactionClient::TTimestamp;
-using NTransactionClient::NullTimestamp;
-
-using NTableClient::TRowBuffer;
-using NTableClient::TRowBufferPtr;
-
-using TSchemaColumns = std::vector<NTableClient::TColumnSchema>;
-
-using TRow = NTableClient::TUnversionedRow;
-using TMutableRow = NTableClient::TMutableUnversionedRow;
-using TRowHeader = NTableClient::TUnversionedRowHeader;
-using TRowBuilder = NTableClient::TUnversionedRowBuilder;
-using TOwningRow = NTableClient::TUnversionedOwningRow;
-using TOwningRowBuilder = NTableClient::TUnversionedOwningRowBuilder;
-using TValue = NTableClient::TUnversionedValue;
-using TValueData = NTableClient::TUnversionedValueData;
-using TOwningValue = NTableClient::TUnversionedOwningValue;
-using TLegacyOwningKey = NTableClient::TLegacyOwningKey;
-
-using TKeyRange = std::pair<TLegacyOwningKey, TLegacyOwningKey>;
-using TMutableRowRange = std::pair<TMutableRow, TMutableRow>;
-using TRowRanges = std::vector<TRowRange>;
-using TMutableRowRanges = std::vector<TMutableRowRange>;
-
-using TColumnSet = THashSet<TString>;
-
-////////////////////////////////////////////////////////////////////////////////
-
-extern const NYPath::TYPath QueryPoolsPath;
-
-////////////////////////////////////////////////////////////////////////////////
-
-} // namespace NYT::NQueryClient
-