aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorermolovd <ermolovd@yandex-team.com>2023-10-02 16:28:29 +0300
committerermolovd <ermolovd@yandex-team.com>2023-10-02 17:46:23 +0300
commit2dd58a8a79545037b218d32588215396fc850f9f (patch)
treea44470c4215792eca451ceb95f7230c1589a73d0
parent45d9242d89e0811f346018242fde0dcfd1786202 (diff)
downloadydb-2dd58a8a79545037b218d32588215396fc850f9f.tar.gz
YT-19578: Move user_job_statistics to yt/cpp/mapreduce/library
-rw-r--r--.mapping.json10
-rw-r--r--library/cpp/yt/CMakeLists.txt1
-rw-r--r--ydb/library/yql/providers/yt/job/CMakeLists.darwin-x86_64.txt2
-rw-r--r--ydb/library/yql/providers/yt/job/CMakeLists.linux-aarch64.txt2
-rw-r--r--ydb/library/yql/providers/yt/job/CMakeLists.linux-x86_64.txt2
-rw-r--r--ydb/library/yql/providers/yt/job/CMakeLists.windows-x86_64.txt2
-rw-r--r--ydb/library/yql/providers/yt/job/ya.make2
-rw-r--r--ydb/library/yql/providers/yt/job/yql_job_stats_writer.cpp2
-rw-r--r--yt/cpp/mapreduce/library/CMakeLists.txt1
-rw-r--r--yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.darwin-x86_64.txt (renamed from library/cpp/yt/user_job_statistics/CMakeLists.darwin-x86_64.txt)8
-rw-r--r--yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.linux-aarch64.txt (renamed from library/cpp/yt/user_job_statistics/CMakeLists.linux-aarch64.txt)8
-rw-r--r--yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.linux-x86_64.txt (renamed from library/cpp/yt/user_job_statistics/CMakeLists.linux-x86_64.txt)8
-rw-r--r--yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.txt (renamed from library/cpp/yt/user_job_statistics/CMakeLists.txt)0
-rw-r--r--yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.windows-x86_64.txt (renamed from library/cpp/yt/user_job_statistics/CMakeLists.windows-x86_64.txt)8
-rw-r--r--yt/cpp/mapreduce/library/user_job_statistics/user_job_statistics.cpp (renamed from library/cpp/yt/user_job_statistics/user_job_statistics.cpp)0
-rw-r--r--yt/cpp/mapreduce/library/user_job_statistics/user_job_statistics.h (renamed from library/cpp/yt/user_job_statistics/user_job_statistics.h)0
-rw-r--r--yt/cpp/mapreduce/library/user_job_statistics/ya.make (renamed from library/cpp/yt/user_job_statistics/ya.make)0
17 files changed, 28 insertions, 28 deletions
diff --git a/.mapping.json b/.mapping.json
index 80966f5860..48407d3124 100644
--- a/.mapping.json
+++ b/.mapping.json
@@ -3117,11 +3117,6 @@
"library/cpp/yt/threading/CMakeLists.linux-x86_64.txt":"",
"library/cpp/yt/threading/CMakeLists.txt":"",
"library/cpp/yt/threading/CMakeLists.windows-x86_64.txt":"",
- "library/cpp/yt/user_job_statistics/CMakeLists.darwin-x86_64.txt":"",
- "library/cpp/yt/user_job_statistics/CMakeLists.linux-aarch64.txt":"",
- "library/cpp/yt/user_job_statistics/CMakeLists.linux-x86_64.txt":"",
- "library/cpp/yt/user_job_statistics/CMakeLists.txt":"",
- "library/cpp/yt/user_job_statistics/CMakeLists.windows-x86_64.txt":"",
"library/cpp/yt/yson/CMakeLists.darwin-x86_64.txt":"",
"library/cpp/yt/yson/CMakeLists.linux-aarch64.txt":"",
"library/cpp/yt/yson/CMakeLists.linux-x86_64.txt":"",
@@ -9548,6 +9543,11 @@
"yt/cpp/mapreduce/library/table_schema/CMakeLists.linux-x86_64.txt":"",
"yt/cpp/mapreduce/library/table_schema/CMakeLists.txt":"",
"yt/cpp/mapreduce/library/table_schema/CMakeLists.windows-x86_64.txt":"",
+ "yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.darwin-x86_64.txt":"",
+ "yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.linux-aarch64.txt":"",
+ "yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.linux-x86_64.txt":"",
+ "yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.txt":"",
+ "yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.windows-x86_64.txt":"",
"yt/cpp/mapreduce/raw_client/CMakeLists.darwin-x86_64.txt":"",
"yt/cpp/mapreduce/raw_client/CMakeLists.linux-aarch64.txt":"",
"yt/cpp/mapreduce/raw_client/CMakeLists.linux-x86_64.txt":"",
diff --git a/library/cpp/yt/CMakeLists.txt b/library/cpp/yt/CMakeLists.txt
index db789d02dd..b1dc1594fc 100644
--- a/library/cpp/yt/CMakeLists.txt
+++ b/library/cpp/yt/CMakeLists.txt
@@ -20,6 +20,5 @@ add_subdirectory(small_containers)
add_subdirectory(string)
add_subdirectory(system)
add_subdirectory(threading)
-add_subdirectory(user_job_statistics)
add_subdirectory(yson)
add_subdirectory(yson_string)
diff --git a/ydb/library/yql/providers/yt/job/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/providers/yt/job/CMakeLists.darwin-x86_64.txt
index 8de7f28083..3b4e88780b 100644
--- a/ydb/library/yql/providers/yt/job/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/providers/yt/job/CMakeLists.darwin-x86_64.txt
@@ -19,7 +19,7 @@ target_link_libraries(providers-yt-job PUBLIC
library-cpp-time_provider
cpp-yson-node
cpp-mapreduce-interface
- cpp-yt-user_job_statistics
+ mapreduce-library-user_job_statistics
minikql-comp_nodes-llvm
yql-public-udf
library-yql-utils
diff --git a/ydb/library/yql/providers/yt/job/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/yt/job/CMakeLists.linux-aarch64.txt
index 1aef76e6ae..c0aae0dadb 100644
--- a/ydb/library/yql/providers/yt/job/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/yt/job/CMakeLists.linux-aarch64.txt
@@ -20,7 +20,7 @@ target_link_libraries(providers-yt-job PUBLIC
library-cpp-time_provider
cpp-yson-node
cpp-mapreduce-interface
- cpp-yt-user_job_statistics
+ mapreduce-library-user_job_statistics
minikql-comp_nodes-llvm
yql-public-udf
library-yql-utils
diff --git a/ydb/library/yql/providers/yt/job/CMakeLists.linux-x86_64.txt b/ydb/library/yql/providers/yt/job/CMakeLists.linux-x86_64.txt
index 1aef76e6ae..c0aae0dadb 100644
--- a/ydb/library/yql/providers/yt/job/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/providers/yt/job/CMakeLists.linux-x86_64.txt
@@ -20,7 +20,7 @@ target_link_libraries(providers-yt-job PUBLIC
library-cpp-time_provider
cpp-yson-node
cpp-mapreduce-interface
- cpp-yt-user_job_statistics
+ mapreduce-library-user_job_statistics
minikql-comp_nodes-llvm
yql-public-udf
library-yql-utils
diff --git a/ydb/library/yql/providers/yt/job/CMakeLists.windows-x86_64.txt b/ydb/library/yql/providers/yt/job/CMakeLists.windows-x86_64.txt
index 8de7f28083..3b4e88780b 100644
--- a/ydb/library/yql/providers/yt/job/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/providers/yt/job/CMakeLists.windows-x86_64.txt
@@ -19,7 +19,7 @@ target_link_libraries(providers-yt-job PUBLIC
library-cpp-time_provider
cpp-yson-node
cpp-mapreduce-interface
- cpp-yt-user_job_statistics
+ mapreduce-library-user_job_statistics
minikql-comp_nodes-llvm
yql-public-udf
library-yql-utils
diff --git a/ydb/library/yql/providers/yt/job/ya.make b/ydb/library/yql/providers/yt/job/ya.make
index f921cbc5f3..c508110202 100644
--- a/ydb/library/yql/providers/yt/job/ya.make
+++ b/ydb/library/yql/providers/yt/job/ya.make
@@ -17,7 +17,7 @@ PEERDIR(
library/cpp/time_provider
library/cpp/yson/node
yt/cpp/mapreduce/interface
- library/cpp/yt/user_job_statistics
+ yt/cpp/mapreduce/library/user_job_statistics
ydb/library/yql/minikql/comp_nodes/llvm
ydb/library/yql/public/udf
ydb/library/yql/utils
diff --git a/ydb/library/yql/providers/yt/job/yql_job_stats_writer.cpp b/ydb/library/yql/providers/yt/job/yql_job_stats_writer.cpp
index fb08d2fcc2..275f410f87 100644
--- a/ydb/library/yql/providers/yt/job/yql_job_stats_writer.cpp
+++ b/ydb/library/yql/providers/yt/job/yql_job_stats_writer.cpp
@@ -1,7 +1,7 @@
#include "yql_job_stats_writer.h"
#include "yql_job_base.h"
-#include <library/cpp/yt/user_job_statistics/user_job_statistics.h>
+#include <yt/cpp/mapreduce/library/user_job_statistics/user_job_statistics.h>
#include <yt/cpp/mapreduce/common/helpers.h>
using NKikimr::NMiniKQL::IStatsRegistry;
diff --git a/yt/cpp/mapreduce/library/CMakeLists.txt b/yt/cpp/mapreduce/library/CMakeLists.txt
index bc51bb2b47..104ec2b653 100644
--- a/yt/cpp/mapreduce/library/CMakeLists.txt
+++ b/yt/cpp/mapreduce/library/CMakeLists.txt
@@ -7,3 +7,4 @@
add_subdirectory(table_schema)
+add_subdirectory(user_job_statistics)
diff --git a/library/cpp/yt/user_job_statistics/CMakeLists.darwin-x86_64.txt b/yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.darwin-x86_64.txt
index 6ad2fc33f1..ac13f5f6df 100644
--- a/library/cpp/yt/user_job_statistics/CMakeLists.darwin-x86_64.txt
+++ b/yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.darwin-x86_64.txt
@@ -7,12 +7,12 @@
-add_library(cpp-yt-user_job_statistics)
-target_link_libraries(cpp-yt-user_job_statistics PUBLIC
+add_library(mapreduce-library-user_job_statistics)
+target_link_libraries(mapreduce-library-user_job_statistics PUBLIC
contrib-libs-cxxsupp
yutil
cpp-mapreduce-common
)
-target_sources(cpp-yt-user_job_statistics PRIVATE
- ${CMAKE_SOURCE_DIR}/library/cpp/yt/user_job_statistics/user_job_statistics.cpp
+target_sources(mapreduce-library-user_job_statistics PRIVATE
+ ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/library/user_job_statistics/user_job_statistics.cpp
)
diff --git a/library/cpp/yt/user_job_statistics/CMakeLists.linux-aarch64.txt b/yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.linux-aarch64.txt
index 33fb6e94cc..2c62e9c60c 100644
--- a/library/cpp/yt/user_job_statistics/CMakeLists.linux-aarch64.txt
+++ b/yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.linux-aarch64.txt
@@ -7,13 +7,13 @@
-add_library(cpp-yt-user_job_statistics)
-target_link_libraries(cpp-yt-user_job_statistics PUBLIC
+add_library(mapreduce-library-user_job_statistics)
+target_link_libraries(mapreduce-library-user_job_statistics PUBLIC
contrib-libs-linux-headers
contrib-libs-cxxsupp
yutil
cpp-mapreduce-common
)
-target_sources(cpp-yt-user_job_statistics PRIVATE
- ${CMAKE_SOURCE_DIR}/library/cpp/yt/user_job_statistics/user_job_statistics.cpp
+target_sources(mapreduce-library-user_job_statistics PRIVATE
+ ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/library/user_job_statistics/user_job_statistics.cpp
)
diff --git a/library/cpp/yt/user_job_statistics/CMakeLists.linux-x86_64.txt b/yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.linux-x86_64.txt
index 33fb6e94cc..2c62e9c60c 100644
--- a/library/cpp/yt/user_job_statistics/CMakeLists.linux-x86_64.txt
+++ b/yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.linux-x86_64.txt
@@ -7,13 +7,13 @@
-add_library(cpp-yt-user_job_statistics)
-target_link_libraries(cpp-yt-user_job_statistics PUBLIC
+add_library(mapreduce-library-user_job_statistics)
+target_link_libraries(mapreduce-library-user_job_statistics PUBLIC
contrib-libs-linux-headers
contrib-libs-cxxsupp
yutil
cpp-mapreduce-common
)
-target_sources(cpp-yt-user_job_statistics PRIVATE
- ${CMAKE_SOURCE_DIR}/library/cpp/yt/user_job_statistics/user_job_statistics.cpp
+target_sources(mapreduce-library-user_job_statistics PRIVATE
+ ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/library/user_job_statistics/user_job_statistics.cpp
)
diff --git a/library/cpp/yt/user_job_statistics/CMakeLists.txt b/yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.txt
index f8b31df0c1..f8b31df0c1 100644
--- a/library/cpp/yt/user_job_statistics/CMakeLists.txt
+++ b/yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.txt
diff --git a/library/cpp/yt/user_job_statistics/CMakeLists.windows-x86_64.txt b/yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.windows-x86_64.txt
index 6ad2fc33f1..ac13f5f6df 100644
--- a/library/cpp/yt/user_job_statistics/CMakeLists.windows-x86_64.txt
+++ b/yt/cpp/mapreduce/library/user_job_statistics/CMakeLists.windows-x86_64.txt
@@ -7,12 +7,12 @@
-add_library(cpp-yt-user_job_statistics)
-target_link_libraries(cpp-yt-user_job_statistics PUBLIC
+add_library(mapreduce-library-user_job_statistics)
+target_link_libraries(mapreduce-library-user_job_statistics PUBLIC
contrib-libs-cxxsupp
yutil
cpp-mapreduce-common
)
-target_sources(cpp-yt-user_job_statistics PRIVATE
- ${CMAKE_SOURCE_DIR}/library/cpp/yt/user_job_statistics/user_job_statistics.cpp
+target_sources(mapreduce-library-user_job_statistics PRIVATE
+ ${CMAKE_SOURCE_DIR}/yt/cpp/mapreduce/library/user_job_statistics/user_job_statistics.cpp
)
diff --git a/library/cpp/yt/user_job_statistics/user_job_statistics.cpp b/yt/cpp/mapreduce/library/user_job_statistics/user_job_statistics.cpp
index 56ab88ee9d..56ab88ee9d 100644
--- a/library/cpp/yt/user_job_statistics/user_job_statistics.cpp
+++ b/yt/cpp/mapreduce/library/user_job_statistics/user_job_statistics.cpp
diff --git a/library/cpp/yt/user_job_statistics/user_job_statistics.h b/yt/cpp/mapreduce/library/user_job_statistics/user_job_statistics.h
index 6939d20417..6939d20417 100644
--- a/library/cpp/yt/user_job_statistics/user_job_statistics.h
+++ b/yt/cpp/mapreduce/library/user_job_statistics/user_job_statistics.h
diff --git a/library/cpp/yt/user_job_statistics/ya.make b/yt/cpp/mapreduce/library/user_job_statistics/ya.make
index 7179660b31..7179660b31 100644
--- a/library/cpp/yt/user_job_statistics/ya.make
+++ b/yt/cpp/mapreduce/library/user_job_statistics/ya.make