pathsplit -> std::filesystem::path & ui64 -> uint64_t

Author: stanislav-shchetinin

examples/basic_example/basic_example.cpp

@@ -2,8 +2,6 @@
 
 #include <ydb-cpp-sdk/util/string/cast.h>
 
-#include <src/util/folder/pathsplit.h>
-
 #include <filesystem>
 #include <format>
 

tests/integration/basic_example_it/basic_example.cpp

@@ -1,8 +1,8 @@
 #include "basic_example.h"
 
-#include <src/util/folder/pathsplit.h>
 #include <ydb-cpp-sdk/json_value/ydb_json_value.h>
 
+#include <filesystem>
 #include <format>
 
 using namespace NYdb;
@@ -19,10 +19,10 @@ static std::string JoinPath(const std::string& basePath, const std::string& path
         return path;
     }
 
-    TPathSplitUnix prefixPathSplit(basePath);
-    prefixPathSplit.AppendComponent(path);
+    std::filesystem::path prefixPathSplit(basePath);
+    prefixPathSplit /= path;
 
-    return prefixPathSplit.Reconstruct();
+    return prefixPathSplit;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -176,7 +176,7 @@ static TStatus UpsertSimpleTransaction(TSession session, const std::string& path
 
 //! Shows usage of parameters in data queries.
 static TStatus SelectWithParamsTransaction(TSession session, const std::string& path,
-    ui64 seriesId, ui64 seasonId, std::optional<TResultSet>& resultSet)
+    uint64_t seriesId, uint64_t seasonId, std::optional<TResultSet>& resultSet)
 {
     auto query = std::format(R"(
         --!syntax_v1
@@ -216,7 +216,7 @@ static TStatus SelectWithParamsTransaction(TSession session, const std::string&
 
 //! Shows usage of prepared queries.
 static TStatus PreparedSelectTransaction(TSession session, const std::string& path,
-    ui64 seriesId, ui64 seasonId, ui64 episodeId, std::optional<TResultSet>& resultSet)
+    uint64_t seriesId, uint64_t seasonId, uint64_t episodeId, std::optional<TResultSet>& resultSet)
 {
     // Once prepared, query data is stored in the session and identified by QueryId.
     // Local query cache is used to keep track of queries, prepared in current session.
@@ -268,7 +268,7 @@ static TStatus PreparedSelectTransaction(TSession session, const std::string& pa
 }
 
 //! Shows usage of transactions consisting of multiple data queries with client logic between them.
-static TStatus MultiStepTransaction(TSession session, const std::string& path, ui64 seriesId, ui64 seasonId,
+static TStatus MultiStepTransaction(TSession session, const std::string& path, uint64_t seriesId, uint64_t seasonId,
     std::optional<TResultSet>& resultSet)
 {
     auto query1 = std::format(R"(

tests/integration/basic_example_it/main.cpp

@@ -66,7 +66,7 @@ TEST(Integration, BasicExample) {
 
         std::string expectedResultScanQuerySelect = "{\"series_id\":1,\"season_id\":1,\"title\":\"Season 1\",\"first_aired\":\"2006-02-03\"}\n{\"series_id\":1,\"season_id\":2,\"title\":\"Season 2\",\"first_aired\":\"2007-08-24\"}\n{\"series_id\":1,\"season_id\":3,\"title\":\"Season 3\",\"first_aired\":\"2008-11-21\"}\n{\"series_id\":1,\"season_id\":4,\"title\":\"Season 4\",\"first_aired\":\"2010-06-25\"}\n";
         std::vector<std::string> resultScanQuerySelectVector = ScanQuerySelect(client, path);
-        std::string resultScanQuerySelect = std::reduce(resultScanQuerySelectVector.begin(), resultScanQuerySelectVector.end(), std::string());
+        std::string resultScanQuerySelect = std::reduce(resultScanQuerySelectVector.begin(), resultScanQuerySelectVector.end());
         ASSERT_EQ(resultScanQuerySelect, expectedResultScanQuerySelect);
     }
     catch (const TYdbErrorException& e) {