Refactored QL

commit_hash:7fd7fbd4c772138efc15fd6f7e3d7a01810dbef5

3 files changed, 14 insertions, 10 deletions

diff --git a/yt/yt/client/api/client_common.h b/yt/yt/client/api/client_common.h
index 373d4ac61b..642e32ee9d 100644
--- a/yt/yt/client/api/client_common.h
+++ b/yt/yt/client/api/client_common.h
@@ -140,12 +140,14 @@ struct TSelectRowsOptionsBase
     : public TTabletReadOptions
     , public TSuppressableAccessTrackingOptions
 {
+    //! Add |$timestamp:columnName| to result if read_mode is latest_timestamp.
+    NTableClient::TVersionedReadOptions VersionedReadOptions;
     //! Limits range expanding.
     ui64 RangeExpansionLimit = 200'000;
     //! Limits parallel subqueries by row count.
     i64 MinRowCountPerSubquery = 100'000;
     //! Path in Cypress with UDFs.
-    std::optional<TString> UdfRegistryPath;
+    std::optional<NYPath::TYPath> UdfRegistryPath;
     //! Limits maximum parallel subqueries.
     int MaxSubqueries = std::numeric_limits<int>::max();
     //! Query language syntax version.
@@ -184,8 +186,6 @@ struct TSelectRowsOptions
     //! Expected schemas for tables in a query (used for replica fallback in replicated tables).
     using TExpectedTableSchemas = THashMap<NYPath::TYPath, NTableClient::TTableSchemaPtr>;
     TExpectedTableSchemas ExpectedTableSchemas;
-    //! Add |$timestamp:columnName| to result if read_mode is latest_timestamp.
-    NTableClient::TVersionedReadOptions VersionedReadOptions;
     //! Explicitly allow or forbid the usage of row cache.
     std::optional<bool> UseLookupCache;
     //! Allow queries without any condition on key columns.
diff --git a/yt/yt/client/api/rpc_proxy/table_mount_cache.cpp b/yt/yt/client/api/rpc_proxy/table_mount_cache.cpp
index 025dc42cfa..14da1232b2 100644
--- a/yt/yt/client/api/rpc_proxy/table_mount_cache.cpp
+++ b/yt/yt/client/api/rpc_proxy/table_mount_cache.cpp
@@ -100,7 +100,7 @@ private:
 
                 tableInfo->Indices.reserve(rsp->indices_size());
                 for (const auto& protoIndexInfo : rsp->indices()) {
-                    TIndexInfo indexInfo{
+                    auto indexInfo = TIndexInfo{
                         .TableId = FromProto<NObjectClient::TObjectId>(protoIndexInfo.index_table_id()),
                         .Kind = FromProto<ESecondaryIndexKind>(protoIndexInfo.index_kind()),
                         .Predicate = YT_PROTO_OPTIONAL(protoIndexInfo, predicate),
diff --git a/yt/yt/client/tablet_client/public.h b/yt/yt/client/tablet_client/public.h
index 44dbc18ddc..81a57c70ca 100644
--- a/yt/yt/client/tablet_client/public.h
+++ b/yt/yt/client/tablet_client/public.h
@@ -220,12 +220,6 @@ DEFINE_ENUM(ETabletServiceFeatures,
     ((SharedWriteLocks)         (1))
 );
 
-DEFINE_ENUM(ESecondaryIndexKind,
-    ((FullSync)                 (0))
-    ((Unfolding)                (1))
-    ((Unique)                   (2))
-);
-
 DEFINE_ENUM(ERowMergerType,
     ((Legacy)               (0))
     ((Watermark)            (1))
@@ -238,6 +232,16 @@ struct TWatermarkRuntimeData;
 
 ////////////////////////////////////////////////////////////////////////////////
 
+DEFINE_ENUM(ESecondaryIndexKind,
+    ((FullSync)                 (0))
+    ((Unfolding)                (1))
+    ((Unique)                   (2))
+);
+
+struct TIndexInfo;
+
+////////////////////////////////////////////////////////////////////////////////
+
 DECLARE_REFCOUNTED_CLASS(TTableMountCacheConfig)
 DECLARE_REFCOUNTED_CLASS(TTableMountCacheDynamicConfig)
 DECLARE_REFCOUNTED_CLASS(TRemoteDynamicStoreReaderConfig)