Replace Sprintf, Printf and GetEnv (#117)

Author: Gazizonoki

.github/workflows/pr_check.yaml

@@ -59,4 +59,7 @@ jobs:
       shell: bash
       run: |
         cd ../build
-        examples/basic_example/basic_example -e localhost:2136 -d /local
+        examples/basic_example/basic_example -e localhost:2136 -d /local -p /local/basic
+        examples/bulk_upsert_simple/bulk_upsert_simple -e localhost:2136 -d /local -p /local/bulk
+        examples/pagination/pagination -e localhost:2136 -d /local -p /local/pagination
+        examples/ttl/ttl -e localhost:2136 -d /local -p /local/ttl

clang.toolchain

@@ -1,6 +1,5 @@
 set(CMAKE_C_COMPILER clang)
 set(CMAKE_CXX_COMPILER clang++)
-# set(CMAKE_CXX_FLAGS "-stdlib=libc++")
 set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=lld -rdynamic")
 set(CMAKE_SHARED_LINKER_FLAGS "-fuse-ld=lld")
 set(CMAKE_C_STANDARD_LIBRARIES "-lc -lm")

client/ydb_persqueue_core/impl/read_session.cpp

@@ -14,7 +14,6 @@
 #include <util/generic/utility.h>
 #include <util/generic/yexception.h>
 #include <util/stream/mem.h>
-#include <util/system/env.h>
 
 #include <variant>
 

client/ydb_persqueue_core/impl/read_session.ipp

@@ -20,7 +20,6 @@
 #include <util/generic/utility.h>
 #include <util/generic/yexception.h>
 #include <util/stream/mem.h>
-#include <util/system/env.h>
 
 #include <utility>
 #include <variant>
@@ -41,7 +40,7 @@ namespace NYdb::NTopic::NCompressionDetails {
 
 namespace NYdb::NPersQueue {
 
-static const bool RangesMode = !GetEnv("PQ_OFFSET_RANGES_MODE").empty();
+static const bool RangesMode = !std::string{std::getenv("PQ_OFFSET_RANGES_MODE") ? std::getenv("PQ_OFFSET_RANGES_MODE") : ""}.empty();
 
 template <typename TReaderCounters>
 void MakeCountersNotNull(TReaderCounters& counters);

client/ydb_persqueue_core/ut/basic_usage_ut.cpp

@@ -11,6 +11,7 @@
 #include <util/stream/str.h>
 
 #include <atomic>
+#include <format>
 
 using namespace NThreading;
 using namespace NKikimr;
@@ -123,7 +124,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
 
         UNIT_ASSERT_VALUES_EQUAL(previousOffset + 1, committedOffset);
         UNIT_ASSERT_VALUES_EQUAL(readMessageCount, messageCount);
-        log.Write(TLOG_INFO, Sprintf("Time took to write and read %u messages, %lu [MiB] in total is %lu [s]",
+        log.Write(TLOG_INFO, std::format("Time took to write and read {} messages, {} [MiB] in total is {} [s]",
                                      messageCount, (totalSize / 1_MB), (TInstant::Now() - start).Seconds()));
     }
 

cmake/common.cmake

@@ -2,8 +2,6 @@
 
 find_package(Python3 REQUIRED)
 
-add_compile_definitions(CATBOOST_OPENSOURCE=yes)
-
 # assumes ToolName is always both the binary and the target name
 function(get_built_tool_path OutBinPath SrcPath ToolName)
   set(${OutBinPath} "${CMAKE_BINARY_DIR}/${SrcPath}/${ToolName}${CMAKE_EXECUTABLE_SUFFIX}" PARENT_SCOPE)

cmake/global_flags.cmake

@@ -12,6 +12,7 @@ string(APPEND ${COMMON_C_CXX_FLAGS} "\
   -ffunction-sections \
   -fdata-sections \
   -Wall \
+  -Wunused \
   -Wextra \
   -Wno-parentheses \
   -Wno-implicit-const-int-float-conversion \

examples/basic_example/basic_example.cpp

@@ -1,7 +1,8 @@
 #include "basic_example.h"
 
 #include <util/folder/pathsplit.h>
-#include <util/string/printf.h>
+
+#include <format>
 
 using namespace NYdb;
 using namespace NYdb::NTable;
@@ -104,8 +105,8 @@ static void DescribeTable(TTableClient client, const std::string& path, const st
 
 //! Fills sample tables with data in single parameterized data query.
 static TStatus FillTableDataTransaction(TSession session, const std::string& path) {
-    auto query = Sprintf(R"(
-        PRAGMA TablePathPrefix("%s");
+    auto query = std::format(R"(
+        PRAGMA TablePathPrefix("{}");
 
         DECLARE $seriesData AS List<Struct<
             series_id: Uint64,
@@ -152,7 +153,7 @@ static TStatus FillTableDataTransaction(TSession session, const std::string& pat
             title,
             CAST(air_date AS Uint16) AS air_date
         FROM AS_TABLE($episodesData);
-    )", path.c_str());
+    )", path);
 
     auto params = GetTablesDataParams();
 
@@ -166,13 +167,13 @@ static TStatus FillTableDataTransaction(TSession session, const std::string& pat
 static TStatus SelectSimpleTransaction(TSession session, const std::string& path,
     std::optional<TResultSet>& resultSet)
 {
-    auto query = Sprintf(R"(
-        PRAGMA TablePathPrefix("%s");
+    auto query = std::format(R"(
+        PRAGMA TablePathPrefix("{}");
 
         SELECT series_id, title, CAST(CAST(release_date AS Date) AS String) AS release_date
         FROM series
         WHERE series_id = 1;
-    )", path.c_str());
+    )", path);
 
     auto txControl =
         // Begin new transaction with SerializableRW mode
@@ -193,13 +194,13 @@ static TStatus SelectSimpleTransaction(TSession session, const std::string& path
 
 //! Shows basic usage of mutating operations.
 static TStatus UpsertSimpleTransaction(TSession session, const std::string& path) {
-    auto query = Sprintf(R"(
+    auto query = std::format(R"(
         --!syntax_v1
-        PRAGMA TablePathPrefix("%s");
+        PRAGMA TablePathPrefix("{}");
 
         UPSERT INTO episodes (series_id, season_id, episode_id, title) VALUES
             (2, 6, 1, "TBD");
-    )", path.c_str());
+    )", path);
 
     return session.ExecuteDataQuery(query,
         TTxControl::BeginTx(TTxSettings::SerializableRW()).CommitTx()).GetValueSync();
@@ -209,9 +210,9 @@ static TStatus UpsertSimpleTransaction(TSession session, const std::string& path
 static TStatus SelectWithParamsTransaction(TSession session, const std::string& path,
     ui64 seriesId, ui64 seasonId, std::optional<TResultSet>& resultSet)
 {
-    auto query = Sprintf(R"(
+    auto query = std::format(R"(
         --!syntax_v1
-        PRAGMA TablePathPrefix("%s");
+        PRAGMA TablePathPrefix("{}");
 
         DECLARE $seriesId AS Uint64;
         DECLARE $seasonId AS Uint64;
@@ -221,7 +222,7 @@ static TStatus SelectWithParamsTransaction(TSession session, const std::string&
         INNER JOIN series AS sr
         ON sa.series_id = sr.series_id
         WHERE sa.series_id = $seriesId AND sa.season_id = $seasonId;
-    )", path.c_str());
+    )", path);
 
     // Type of parameter values should be exactly the same as in DECLARE statements.
     auto params = session.GetParamsBuilder()
@@ -251,9 +252,9 @@ static TStatus PreparedSelectTransaction(TSession session, const std::string& pa
 {
     // 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.
-    auto query = Sprintf(R"(
+    auto query = std::format(R"(
         --!syntax_v1
-        PRAGMA TablePathPrefix("%s");
+        PRAGMA TablePathPrefix("{}");
 
         DECLARE $seriesId AS Uint64;
         DECLARE $seasonId AS Uint64;
@@ -262,7 +263,7 @@ static TStatus PreparedSelectTransaction(TSession session, const std::string& pa
         SELECT *
         FROM episodes
         WHERE series_id = $seriesId AND season_id = $seasonId AND episode_id = $episodeId;
-    )", path.c_str());
+    )", path);
 
     // Prepare query or get result from query cache
     auto prepareResult = session.PrepareDataQuery(query).GetValueSync();
@@ -302,16 +303,16 @@ static TStatus PreparedSelectTransaction(TSession session, const std::string& pa
 static TStatus MultiStepTransaction(TSession session, const std::string& path, ui64 seriesId, ui64 seasonId,
     std::optional<TResultSet>& resultSet)
 {
-    auto query1 = Sprintf(R"(
+    auto query1 = std::format(R"(
         --!syntax_v1
-        PRAGMA TablePathPrefix("%s");
+        PRAGMA TablePathPrefix("{}");
 
         DECLARE $seriesId AS Uint64;
         DECLARE $seasonId AS Uint64;
 
         SELECT first_aired AS from_date FROM seasons
         WHERE series_id = $seriesId AND season_id = $seasonId;
-    )", path.c_str());
+    )", path);
 
     auto params1 = session.GetParamsBuilder()
         .AddParam("$seriesId")
@@ -350,17 +351,17 @@ static TStatus MultiStepTransaction(TSession session, const std::string& path, u
     TInstant toDate = userFunc(fromDate);
 
     // Construct next query based on the results of client logic
-    auto query2 = Sprintf(R"(
+    auto query2 = std::format(R"(
         --!syntax_v1
-        PRAGMA TablePathPrefix("%s");
+        PRAGMA TablePathPrefix("{}");
 
         DECLARE $seriesId AS Uint64;
         DECLARE $fromDate AS Uint64;
         DECLARE $toDate AS Uint64;
 
         SELECT season_id, episode_id, title, air_date FROM episodes
         WHERE series_id = $seriesId AND air_date >= $fromDate AND air_date <= $toDate;
-    )", path.c_str());
+    )", path);
 
     auto params2 = session.GetParamsBuilder()
         .AddParam("$seriesId")
@@ -401,14 +402,14 @@ static TStatus ExplicitTclTransaction(TSession session, const std::string& path,
     // Get newly created transaction id
     auto tx = beginResult.GetTransaction();
 
-    auto query = Sprintf(R"(
+    auto query = std::format(R"(
         --!syntax_v1
-        PRAGMA TablePathPrefix("%s");
+        PRAGMA TablePathPrefix("{}");
 
         DECLARE $airDate AS Date;
 
         UPDATE episodes SET air_date = CAST($airDate AS Uint16) WHERE title = "TBD";
-    )", path.c_str());
+    )", path);
 
     auto params = session.GetParamsBuilder()
         .AddParam("$airDate")
@@ -512,16 +513,16 @@ void ExplicitTcl(TTableClient client, const std::string& path) {
 }
 
 void ScanQuerySelect(TTableClient client, const std::string& path) {
-    auto query = Sprintf(R"(
+    auto query = std::format(R"(
         --!syntax_v1
-        PRAGMA TablePathPrefix("%s");
+        PRAGMA TablePathPrefix("{}");
 
         DECLARE $series AS List<UInt64>;
 
         SELECT series_id, season_id, title, CAST(CAST(first_aired AS Date) AS String) AS first_aired
         FROM seasons
         WHERE series_id IN $series
-    )", path.c_str());
+    )", path);
 
     auto parameters = TParamsBuilder()
         .AddParam("$series")

examples/basic_example/main.cpp

@@ -2,9 +2,10 @@
 
 #include <library/cpp/getopt/last_getopt.h>
 
-#include <util/system/env.h>
 #include <util/stream/file.h>
 
+#include <cstdlib>
+
 using namespace NLastGetopt;
 using namespace NYdb;
 
@@ -41,7 +42,7 @@ int main(int argc, char** argv) {
     auto driverConfig = TDriverConfig()
         .SetEndpoint(endpoint)
         .SetDatabase(database)
-        .SetAuthToken(GetEnv("YDB_TOKEN"));
+        .SetAuthToken(std::getenv("YDB_TOKEN") ? std::getenv("YDB_TOKEN") : "");
 
     if (!certPath.empty()) {
         std::string cert = TFileInput(certPath).ReadAll();

examples/bulk_upsert_simple/main.cpp

@@ -2,7 +2,6 @@
 
 #include <library/cpp/getopt/last_getopt.h>
 
-#include <util/system/env.h>
 #include <util/folder/pathsplit.h>
 
 Y_DECLARE_OUT_SPEC(, NYdb::TStatus, stream, value) {
@@ -151,7 +150,7 @@ int main(int argc, char** argv) {
     auto driverConfig = NYdb::TDriverConfig()
         .SetEndpoint(endpoint)
         .SetDatabase(database)
-        .SetAuthToken(GetEnv("YDB_TOKEN"));
+        .SetAuthToken(std::getenv("YDB_TOKEN") ? std::getenv("YDB_TOKEN") : "");
 
     NYdb::TDriver driver(driverConfig);
 

examples/pagination/main.cpp

@@ -1,7 +1,6 @@
 #include "pagination.h"
 
 #include <library/cpp/getopt/last_getopt.h>
-#include <util/system/env.h>
 
 using namespace NLastGetopt;
 using namespace NYdb;
@@ -35,7 +34,7 @@ int main(int argc, char** argv) {
     auto driverConfig = TDriverConfig()
         .SetEndpoint(endpoint)
         .SetDatabase(database)
-        .SetAuthToken(GetEnv("YDB_TOKEN"));
+        .SetAuthToken(std::getenv("YDB_TOKEN") ? std::getenv("YDB_TOKEN") : "");
     TDriver driver(driverConfig);
 
     if (!Run(driver, path)) {

examples/pagination/pagination.cpp

@@ -1,7 +1,6 @@
 #include "pagination.h"
 
 #include <util/folder/pathsplit.h>
-#include <util/string/printf.h>
 
 using namespace NYdb;
 using namespace NYdb::NTable;
@@ -54,9 +53,9 @@ static void CreateTable(TTableClient client, const std::string& path) {
 
 //! Fills sample tables with data in single parameterized data query.
 static TStatus FillTableDataTransaction(TSession& session, const std::string& path) {
-    auto query = Sprintf(R"(
+    auto query = std::format(R"(
         --!syntax_v1
-        PRAGMA TablePathPrefix("%s");
+        PRAGMA TablePathPrefix("{}");
 
         DECLARE $schoolsData AS List<Struct<
             city: Utf8,
@@ -69,7 +68,7 @@ static TStatus FillTableDataTransaction(TSession& session, const std::string& pa
             number,
             address
         FROM AS_TABLE($schoolsData);
-    )", path.c_str());
+    )", path);
 
     auto params = GetTablesDataParams();
 
@@ -83,9 +82,9 @@ static TStatus FillTableDataTransaction(TSession& session, const std::string& pa
 static TStatus SelectPagingTransaction(TSession& session, const std::string& path,
     ui64 pageLimit, const std::string& lastCity, ui32 lastNumber, std::optional<TResultSet>& resultSet)
 {
-    auto query = Sprintf(R"(
+    auto query = std::format(R"(
         --!syntax_v1
-        PRAGMA TablePathPrefix("%s");
+        PRAGMA TablePathPrefix("{}");
 
         DECLARE $limit AS Uint64;
         DECLARE $lastCity AS Utf8;
@@ -111,7 +110,7 @@ static TStatus SelectPagingTransaction(TSession& session, const std::string& pat
 
         SELECT * FROM $union
         ORDER BY city, number LIMIT $limit;
-    )", path.c_str());
+    )", path);
 
     auto params = session.GetParamsBuilder()
         .AddParam("$limit")

examples/secondary_index/main.cpp

@@ -1,7 +1,5 @@
 #include "secondary_index.h"
 
-#include <util/system/env.h>
-
 using namespace NLastGetopt;
 using namespace NYdb;
 
@@ -42,7 +40,7 @@ int main(int argc, char** argv) {
     auto config = TDriverConfig()
         .SetEndpoint(endpoint)
         .SetDatabase(database)
-        .SetAuthToken(GetEnv("YDB_TOKEN"));
+        .SetAuthToken(std::getenv("YDB_TOKEN") ? std::getenv("YDB_TOKEN") : "");
     TDriver driver(config);
 
     try {

examples/secondary_index/secondary_index.h

@@ -5,12 +5,6 @@
 
 #include <library/cpp/getopt/last_getopt.h>
 
-#include <string>
-#include <util/generic/yexception.h>
-#include <util/stream/output.h>
-#include <util/string/builder.h>
-#include <util/string/printf.h>
-
 ////////////////////////////////////////////////////////////////////////////////
 
 #define TABLE_SERIES "series"