Skip to content

Commit 4fb6241

Browse files
GrigoriyPAGrigoriyPA
committed
Fexed test error
1 parent 42238be commit 4fb6241

File tree

16 files changed

+48
-52
lines changed

16 files changed

+48
-52
lines changed

‎ydb/core/fq/libs/row_dispatcher/actors_factory.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#pragma once
22

3-
#include "format_handler/common/common.h"
4-
53
#include <ydb/core/fq/libs/config/protos/row_dispatcher.pb.h>
6-
#include <util/generic/ptr.h>
4+
#include <ydb/core/fq/libs/row_dispatcher/format_handler/common/common.h>
5+
76
#include <ydb/library/actors/core/actor.h>
8-
#include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
97
#include <ydb/library/yql/providers/pq/provider/yql_pq_gateway.h>
108

9+
#include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
10+
11+
#include <util/generic/ptr.h>
12+
1113
namespace NFq::NRowDispatcher {
1214

1315
struct IActorFactory : public TThrRefBase {

‎ydb/core/fq/libs/row_dispatcher/format_handler/common/common.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ TStatus::TStatus()
4646
: Status(EId::SUCCESS)
4747
{}
4848

49-
TStatus::TStatus(TStatucCode status, NYql::TIssues issues)
49+
TStatus::TStatus(TStatusCode status, NYql::TIssues issues)
5050
: Status(status)
5151
, Issues(std::move(issues))
5252
{}
5353

54-
TStatus::TStatus(TStatucCode status, TString message)
54+
TStatus::TStatus(TStatusCode status, TString message)
5555
: Status(status)
5656
, Issues({NYql::TIssue(std::move(message))})
5757
{}
@@ -60,7 +60,7 @@ bool TStatus::IsSuccess() const {
6060
return Status == EId::SUCCESS;
6161
}
6262

63-
TStatus::TStatucCode TStatus::GetStatus() const {
63+
TStatus::TStatusCode TStatus::GetStatus() const {
6464
return Status;
6565
}
6666

‎ydb/core/fq/libs/row_dispatcher/format_handler/common/common.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ struct TFormatHandlerException : public yexception {
1616
class TStatus {
1717
public:
1818
using EId = NYql::NDqProto::StatusIds;
19-
using TStatucCode = EId::StatusCode;
19+
using TStatusCode = EId::StatusCode;
2020

2121
public:
2222
TStatus();
23-
explicit TStatus(TStatucCode status, NYql::TIssues issues = {});
24-
TStatus(TStatucCode status, TString message);
23+
explicit TStatus(TStatusCode status, NYql::TIssues issues = {});
24+
TStatus(TStatusCode status, TString message);
2525

2626
virtual bool IsSuccess() const;
2727

28-
TStatucCode GetStatus() const;
28+
TStatusCode GetStatus() const;
2929
const NYql::TIssues& GetIssues() const;
3030

3131
TString ToString() const;
@@ -37,7 +37,7 @@ class TStatus {
3737
TStatus& AddIssue(TString message);
3838

3939
protected:
40-
TStatucCode Status;
40+
TStatusCode Status;
4141
NYql::TIssues Issues;
4242
};
4343

‎ydb/core/fq/libs/row_dispatcher/format_handler/format_handler.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#include "format_handler.h"
22

3-
#include "parsers/raw_parser.h"
4-
53
#include <ydb/core/fq/libs/actors/logging/log.h>
4+
#include <ydb/core/fq/libs/row_dispatcher/format_handler/parsers/raw_parser.h>
65

76
#include <ydb/library/yql/dq/common/rope_over_buffer.h>
87

‎ydb/core/fq/libs/row_dispatcher/format_handler/format_handler.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "filters/filters_set.h"
4-
#include "parsers/json_parser.h"
3+
#include <ydb/core/fq/libs/row_dispatcher/format_handler/filters/filters_set.h>
4+
#include <ydb/core/fq/libs/row_dispatcher/format_handler/parsers/json_parser.h>
55

66
#include <ydb/library/actors/util/rope.h>
77

‎ydb/core/fq/libs/row_dispatcher/format_handler/ut/common/ut_common.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void CheckSuccess(const TStatus& status) {
9090
UNIT_ASSERT_C(status.IsSuccess(), TStringBuilder() << "Status is not success, " << status.ToString());
9191
}
9292

93-
void CheckError(const TStatus& status, TStatus::TStatucCode expectedStatusCode, const TString& expectedMessage) {
93+
void CheckError(const TStatus& status, TStatus::TStatusCode expectedStatusCode, const TString& expectedMessage) {
9494
UNIT_ASSERT_C(status.GetStatus() == expectedStatusCode, TStringBuilder() << "Expected error status " << NYql::NDqProto::StatusIds_StatusCode_Name(expectedStatusCode) << ", but got: " << status.ToString());
9595
UNIT_ASSERT_STRING_CONTAINS_C(status.GetIssues().ToOneLineString(), expectedMessage, TStringBuilder() << "Unexpected error message, Status: " << NYql::NDqProto::StatusIds_StatusCode_Name(status.GetStatus()));
9696
}

‎ydb/core/fq/libs/row_dispatcher/format_handler/ut/common/ut_common.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class TBaseFixture : public NUnitTest::TBaseFixture {
4242
};
4343

4444
void CheckSuccess(const TStatus& status);
45-
void CheckError(const TStatus& status, TStatus::TStatucCode expectedStatusCode, const TString& expectedMessage);
45+
void CheckError(const TStatus& status, TStatus::TStatusCode expectedStatusCode, const TString& expectedMessage);
4646

4747
template <typename TValue>
4848
TValue CheckSuccess(TValueStatus<TValue> valueStatus) {

‎ydb/core/fq/libs/row_dispatcher/format_handler/ut/format_handler_ut.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#include "common/ut_common.h"
2-
31
#include <ydb/core/fq/libs/row_dispatcher/format_handler/format_handler.h>
2+
#include <ydb/core/fq/libs/row_dispatcher/format_handler/ut/common/ut_common.h>
43

54
namespace NFq::NRowDispatcher::NTests {
65

@@ -37,7 +36,7 @@ class TFormatHadlerFixture : public TBaseFixture {
3736
}
3837
}
3938

40-
void ExpectError(TStatus::TStatucCode statusCode, const TString& message) {
39+
void ExpectError(TStatus::TStatusCode statusCode, const TString& message) {
4140
UNIT_ASSERT_C(!ExpectedError, "Can not add existing error, client id: " << ClientId);
4241
ExpectedError = {statusCode, message};
4342
}
@@ -100,7 +99,7 @@ class TFormatHadlerFixture : public TBaseFixture {
10099
bool Frozen = false;
101100
ui64 ExpectedFilteredRows = 0;
102101
std::queue<ui64> Offsets;
103-
std::optional<std::pair<TStatus::TStatucCode, TString>> ExpectedError;
102+
std::optional<std::pair<TStatus::TStatusCode, TString>> ExpectedError;
104103
};
105104

106105
public:
@@ -143,7 +142,7 @@ class TFormatHadlerFixture : public TBaseFixture {
143142
FormatHandler->ParseMessages(messages);
144143
}
145144

146-
void CheckClientError(const TVector<NYdb::NTopic::TReadSessionEvent::TDataReceivedEvent::TMessage>& messages, NActors::TActorId clientId, TStatus::TStatucCode statusCode, const TString& message) {
145+
void CheckClientError(const TVector<NYdb::NTopic::TReadSessionEvent::TDataReceivedEvent::TMessage>& messages, NActors::TActorId clientId, TStatus::TStatusCode statusCode, const TString& message) {
147146
for (auto& client : Clients) {
148147
client->ExpectOffsets({messages.back().GetOffset()});
149148
if (client->GetClientId() == clientId) {

‎ydb/core/fq/libs/row_dispatcher/format_handler/ut/topic_filter_ut.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#include "common/ut_common.h"
2-
31
#include <ydb/core/fq/libs/row_dispatcher/format_handler/filters/filters_set.h>
42
#include <ydb/core/fq/libs/row_dispatcher/format_handler/parsers/parser_base.h>
3+
#include <ydb/core/fq/libs/row_dispatcher/format_handler/ut/common/ut_common.h>
54

65
#include <yql/essentials/minikql/mkql_string_util.h>
76

‎ydb/core/fq/libs/row_dispatcher/format_handler/ut/topic_parser_ut.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#include "common/ut_common.h"
2-
31
#include <ydb/core/fq/libs/row_dispatcher/format_handler/parsers/json_parser.h>
42
#include <ydb/core/fq/libs/row_dispatcher/format_handler/parsers/raw_parser.h>
3+
#include <ydb/core/fq/libs/row_dispatcher/format_handler/ut/common/ut_common.h>
54

65
namespace NFq::NRowDispatcher::NTests {
76

@@ -24,11 +23,11 @@ class TBaseParserFixture : public TBaseFixture {
2423
, Callback(callback)
2524
{}
2625

27-
void ExpectColumnError(ui64 columnId, TStatus::TStatucCode statusCode, const TString& message) {
26+
void ExpectColumnError(ui64 columnId, TStatus::TStatusCode statusCode, const TString& message) {
2827
UNIT_ASSERT_C(ExpectedErrors.insert({columnId, {statusCode, message}}).second, "Can not add existing column error");
2928
}
3029

31-
void ExpectCommonError(TStatus::TStatucCode statusCode, const TString& message) {
30+
void ExpectCommonError(TStatus::TStatusCode statusCode, const TString& message) {
3231
UNIT_ASSERT_C(!ExpectedCommonError, "Can not add existing common error");
3332
ExpectedCommonError = {statusCode, message};
3433
}
@@ -81,8 +80,8 @@ class TBaseParserFixture : public TBaseFixture {
8180
const TVector<TSchemaColumn> Columns;
8281
const TCallback Callback;
8382

84-
std::optional<std::pair<TStatus::TStatucCode, TString>> ExpectedCommonError;
85-
std::unordered_map<ui64, std::pair<TStatus::TStatucCode, TString>> ExpectedErrors;
83+
std::optional<std::pair<TStatus::TStatusCode, TString>> ExpectedCommonError;
84+
std::unordered_map<ui64, std::pair<TStatus::TStatusCode, TString>> ExpectedErrors;
8685
};
8786

8887
public:
@@ -126,13 +125,13 @@ class TBaseParserFixture : public TBaseFixture {
126125
Parser->ParseMessages({GetMessage(offset, data)});
127126
}
128127

129-
void CheckColumnError(const TString& data, ui64 columnId, TStatus::TStatucCode statusCode, const TString& message) {
128+
void CheckColumnError(const TString& data, ui64 columnId, TStatus::TStatusCode statusCode, const TString& message) {
130129
ExpectedBatches++;
131130
ParserHandler->ExpectColumnError(columnId, statusCode, message);
132131
Parser->ParseMessages({GetMessage(ParserHandler->CurrentOffset, data)});
133132
}
134133

135-
void CheckBatchError(const TString& data, TStatus::TStatucCode statusCode, const TString& message) {
134+
void CheckBatchError(const TString& data, TStatus::TStatusCode statusCode, const TString& message) {
136135
ExpectedBatches++;
137136
ParserHandler->ExpectCommonError(statusCode, message);
138137
Parser->ParseMessages({GetMessage(ParserHandler->CurrentOffset, data)});

0 commit comments

Comments
 (0)