fix tests (ydb-platform#1653)

* fix tests * fix build
ivanmorozov333 · Apr 16, 2024 · 7566c9b · 7566c9b
1 parent d5dc6cf
commit 7566c9b
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 16 deletions.
diff --git a/ydb/core/tx/columnshard/engines/ut/helper.cpp b/ydb/core/tx/columnshard/engines/ut/helper.cpp
@@ -0,0 +1,11 @@
+#include "helper.h"
+
+namespace  NKikimr::NOlap::NEngines::NTest {
+
+NKikimrTxColumnShard::TLogicalMetadata TLocalHelper::GetMetaProto() {
+    NKikimrTxColumnShard::TLogicalMetadata result;
+    result.SetDirtyWriteTimeSeconds(TInstant::Now().Seconds());
+    return result;
+}
+
+}
diff --git a/ydb/core/tx/columnshard/engines/ut/helper.h b/ydb/core/tx/columnshard/engines/ut/helper.h
@@ -0,0 +1,11 @@
+#pragma once
+#include <ydb/core/tx/columnshard/engines/insert_table/meta.h>
+
+namespace NKikimr::NOlap::NEngines::NTest {
+
+class TLocalHelper {
+public:
+    static NKikimrTxColumnShard::TLogicalMetadata GetMetaProto();
+};
+
+};
diff --git a/...x/columnshard/engines/ut_insert_table.cpp → ...olumnshard/engines/ut/ut_insert_table.cpp b/...x/columnshard/engines/ut_insert_table.cpp → ...olumnshard/engines/ut/ut_insert_table.cpp
@@ -1,5 +1,6 @@
-#include "db_wrapper.h"
-#include "insert_table/insert_table.h"
+#include "helper.h"
+#include <ydb/core/tx/columnshard/engines/db_wrapper.h>
+#include <ydb/core/tx/columnshard/engines/insert_table/insert_table.h>
 
 #include <ydb/core/tx/columnshard/columnshard_schema.h>
 
@@ -9,6 +10,7 @@
 namespace NKikimr {
 
 using namespace NOlap;
+using namespace NKikimr::NOlap::NEngines::NTest;
 
 namespace {
 
@@ -40,7 +42,6 @@ class TTestInsertTableDB: public IDbWrapper {
 
 }
 
-
 Y_UNIT_TEST_SUITE(TColumnEngineTestInsertTable) {
     Y_UNIT_TEST(TestInsertCommit) {
         ui64 writeId = 0;
@@ -53,16 +54,16 @@ Y_UNIT_TEST_SUITE(TColumnEngineTestInsertTable) {
         ui64 indexSnapshot = 0;
 
         // insert, not commited
-        bool ok = insertTable.Insert(dbTable, TInsertedData(writeId, tableId, dedupId, blobId1, {}, indexSnapshot, {}));
+        bool ok = insertTable.Insert(dbTable, TInsertedData(writeId, tableId, dedupId, blobId1, TLocalHelper::GetMetaProto(), indexSnapshot, {}));
         UNIT_ASSERT(ok);
 
         // insert the same blobId1 again
-        ok = insertTable.Insert(dbTable, TInsertedData(writeId, tableId, dedupId, blobId1, {}, indexSnapshot, {}));
+        ok = insertTable.Insert(dbTable, TInsertedData(writeId, tableId, dedupId, blobId1, TLocalHelper::GetMetaProto(), indexSnapshot, {}));
         UNIT_ASSERT(!ok);
 
         // insert different blodId with the same writeId and dedupId
         TUnifiedBlobId blobId2(2222, 1, 2, 100, 1);
-        ok = insertTable.Insert(dbTable, TInsertedData(writeId, tableId, dedupId, blobId2, {}, indexSnapshot, {}));
+        ok = insertTable.Insert(dbTable, TInsertedData(writeId, tableId, dedupId, blobId2, TLocalHelper::GetMetaProto(), indexSnapshot, {}));
         UNIT_ASSERT(!ok);
 
         // read nothing

diff --git a/...tx/columnshard/engines/ut_logs_engine.cpp → ...columnshard/engines/ut/ut_logs_engine.cpp b/...tx/columnshard/engines/ut_logs_engine.cpp → ...columnshard/engines/ut/ut_logs_engine.cpp
@@ -1,7 +1,8 @@
+#include "helper.h"
 #include <library/cpp/testing/unittest/registar.h>
-#include "column_engine_logs.h"
-#include "predicate/predicate.h"
-#include "changes/cleanup.h"
+#include <ydb/core/tx/columnshard/engines/column_engine_logs.h>
+#include <ydb/core/tx/columnshard/engines/predicate/predicate.h>
+#include <ydb/core/tx/columnshard/engines/changes/cleanup.h>
 
 #include <ydb/core/tx/columnshard/columnshard_ut_common.h>
 #include <ydb/core/tx/columnshard/engines/changes/compaction.h>
@@ -16,6 +17,7 @@ namespace NTypeIds = NScheme::NTypeIds;
 using TTypeId = NScheme::TTypeId;
 using TTypeInfo = NScheme::TTypeInfo;
 using TDefaultTestsController = NKikimr::NYDBTest::NColumnShard::TController;
+using namespace NKikimr::NOlap::NEngines::NTest;
 
 namespace {
 
@@ -411,8 +413,8 @@ Y_UNIT_TEST_SUITE(TColumnEngineTestLogs) {
         engine.Load(db);
 
         std::vector<TInsertedData> dataToIndex = {
-            TInsertedData(2, paths[0], "", blobRanges[0].BlobId, {}, 0, {}),
-            TInsertedData(1, paths[0], "", blobRanges[1].BlobId, {}, 0, {})
+            TInsertedData(2, paths[0], "", blobRanges[0].BlobId, TLocalHelper::GetMetaProto(), 0, {}),
+            TInsertedData(1, paths[0], "", blobRanges[1].BlobId, TLocalHelper::GetMetaProto(), 0, {})
         };
 
         // write
@@ -507,7 +509,7 @@ Y_UNIT_TEST_SUITE(TColumnEngineTestLogs) {
             // PlanStep, TxId, PathId, DedupId, BlobId, Data, [Metadata]
             std::vector<TInsertedData> dataToIndex;
             dataToIndex.push_back(
-                TInsertedData(txId, pathId, "", blobRange.BlobId, {}, 0, {}));
+                TInsertedData(txId, pathId, "", blobRange.BlobId, TLocalHelper::GetMetaProto(), 0, {}));
 
             bool ok = Insert(engine, db, TSnapshot(planStep, txId), std::move(dataToIndex), blobs, step);
             UNIT_ASSERT(ok);
@@ -605,7 +607,7 @@ Y_UNIT_TEST_SUITE(TColumnEngineTestLogs) {
             // PlanStep, TxId, PathId, DedupId, BlobId, Data, [Metadata]
             std::vector<TInsertedData> dataToIndex;
             dataToIndex.push_back(
-                TInsertedData(txId, pathId, "", blobRange.BlobId, {}, 0, {}));
+                TInsertedData(txId, pathId, "", blobRange.BlobId, TLocalHelper::GetMetaProto(), 0, {}));
 
             bool ok = Insert(engine, db, TSnapshot(planStep, txId), std::move(dataToIndex), blobs, step);
             for (auto&& i : blobs) {
@@ -639,7 +641,7 @@ Y_UNIT_TEST_SUITE(TColumnEngineTestLogs) {
             // PlanStep, TxId, PathId, DedupId, BlobId, Data, [Metadata]
             std::vector<TInsertedData> dataToIndex;
             dataToIndex.push_back(
-                TInsertedData(txId, pathId, "", blobRange.BlobId, {}, 0, {}));
+                TInsertedData(txId, pathId, "", blobRange.BlobId, TLocalHelper::GetMetaProto(), 0, {}));
 
             bool ok = Insert(engine, db, TSnapshot(planStep, txId), std::move(dataToIndex), blobs, step);
             UNIT_ASSERT(ok);
@@ -680,7 +682,7 @@ Y_UNIT_TEST_SUITE(TColumnEngineTestLogs) {
                 // PlanStep, TxId, PathId, DedupId, BlobId, Data, [Metadata]
                 std::vector<TInsertedData> dataToIndex;
                 dataToIndex.push_back(
-                    TInsertedData(txId, pathId, "", blobRange.BlobId, {}, 0, {}));
+                    TInsertedData(txId, pathId, "", blobRange.BlobId, TLocalHelper::GetMetaProto(), 0, {}));
 
                 bool ok = Insert(engine, db, TSnapshot(planStep, txId), std::move(dataToIndex), blobs, step);
                 UNIT_ASSERT(ok);

diff --git a/...ore/tx/columnshard/engines/ut_program.cpp → .../tx/columnshard/engines/ut/ut_program.cpp b/...ore/tx/columnshard/engines/ut_program.cpp → .../tx/columnshard/engines/ut/ut_program.cpp
@@ -1,4 +1,4 @@
-#include "index_info.h"
+#include <ydb/core/tx/columnshard/engines/index_info.h>
 
 #include <ydb/core/tx/columnshard/columnshard__index_scan.h>
 #include <ydb/core/tx/columnshard/columnshard_ut_common.h>

diff --git a/ydb/core/tx/columnshard/engines/ut/ya.make b/ydb/core/tx/columnshard/engines/ut/ya.make
@@ -35,6 +35,7 @@ SRCS(
     ut_insert_table.cpp
     ut_logs_engine.cpp
     ut_program.cpp
+    helper.cpp
     ydb/core/tx/columnshard/columnshard_ut_common.cpp
 )