Skip to content

Commit 6f5bd3f

Browse files
fix macroses conflict for windows (#6187)
1 parent 5427e99 commit 6f5bd3f

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

ydb/core/protos/tx_columnshard.proto

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ message TEvWrite {
7272
optional uint32 WritePartId = 9 [default = 0];
7373
optional uint32 GranuleShardingVersion = 10;
7474
enum EModificationType {
75-
UPSERT = 1;
76-
INSERT = 2;
77-
UPDATE = 3;
78-
REPLACE = 4;
79-
DELETE = 5;
75+
OPERATION_UPSERT = 1;
76+
OPERATION_INSERT = 2;
77+
OPERATION_UPDATE = 3;
78+
OPERATION_REPLACE = 4;
79+
OPERATION_DELETE = 5;
8080
}
8181
optional EModificationType ModificationType = 11;
8282

ydb/core/tx/data_events/common/modification_type.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ class TEnumOperator<NEvWrite::EModificationType> {
5252
static TProto SerializeToProto(const NEvWrite::EModificationType value) {
5353
switch (value) {
5454
case NEvWrite::EModificationType::Upsert:
55-
return NKikimrTxColumnShard::TEvWrite::UPSERT;
55+
return NKikimrTxColumnShard::TEvWrite::OPERATION_UPSERT;
5656
case NEvWrite::EModificationType::Insert:
57-
return NKikimrTxColumnShard::TEvWrite::INSERT;
57+
return NKikimrTxColumnShard::TEvWrite::OPERATION_INSERT;
5858
case NEvWrite::EModificationType::Delete:
59-
return NKikimrTxColumnShard::TEvWrite::DELETE;
59+
return NKikimrTxColumnShard::TEvWrite::OPERATION_DELETE;
6060
case NEvWrite::EModificationType::Replace:
61-
return NKikimrTxColumnShard::TEvWrite::REPLACE;
61+
return NKikimrTxColumnShard::TEvWrite::OPERATION_REPLACE;
6262
case NEvWrite::EModificationType::Update:
63-
return NKikimrTxColumnShard::TEvWrite::UPDATE;
63+
return NKikimrTxColumnShard::TEvWrite::OPERATION_UPDATE;
6464
}
6565
}
6666

@@ -83,15 +83,15 @@ class TEnumOperator<NEvWrite::EModificationType> {
8383

8484
static NEvWrite::EModificationType DeserializeFromProto(const NKikimrTxColumnShard::TEvWrite::EModificationType value) {
8585
switch (value) {
86-
case NKikimrTxColumnShard::TEvWrite::UPSERT:
86+
case NKikimrTxColumnShard::TEvWrite::OPERATION_UPSERT:
8787
return NEvWrite::EModificationType::Upsert;
88-
case NKikimrTxColumnShard::TEvWrite::INSERT:
88+
case NKikimrTxColumnShard::TEvWrite::OPERATION_INSERT:
8989
return NEvWrite::EModificationType::Insert;
90-
case NKikimrTxColumnShard::TEvWrite::UPDATE:
90+
case NKikimrTxColumnShard::TEvWrite::OPERATION_UPDATE:
9191
return NEvWrite::EModificationType::Update;
92-
case NKikimrTxColumnShard::TEvWrite::DELETE:
92+
case NKikimrTxColumnShard::TEvWrite::OPERATION_DELETE:
9393
return NEvWrite::EModificationType::Delete;
94-
case NKikimrTxColumnShard::TEvWrite::REPLACE:
94+
case NKikimrTxColumnShard::TEvWrite::OPERATION_REPLACE:
9595
return NEvWrite::EModificationType::Replace;
9696
}
9797
}

0 commit comments

Comments
 (0)