Skip to content

Commit a7cb65e

Browse files
azevaykinazevaykin
authored
Simplify TTypeInfo constructors (#9480)
1 parent ba6253c commit a7cb65e

29 files changed

+46
-55
lines changed

‎ydb/core/engine/mkql_keys.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ NScheme::TTypeInfo UnpackTypeInfo(NKikimr::NMiniKQL::TType *type, bool &isOption
4444
if (type->GetKind() == TType::EKind::Pg) {
4545
auto pgType = static_cast<TPgType*>(type);
4646
auto pgTypeId = pgType->GetTypeId();
47-
return NScheme::TTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(pgTypeId));
47+
return NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(pgTypeId));
4848
} else {
4949
auto dataType = UnpackOptionalData(type, isOptional);
5050
return NScheme::TTypeInfo(dataType->GetSchemeType());
@@ -198,7 +198,7 @@ THolder<TKeyDesc> ExtractUpdateRow(TCallable& callable, const TTypeEnvironment&
198198
if (cmd.GetStaticType()->IsVoid()) {
199199
// erase
200200
op.Operation = TKeyDesc::EColumnOperation::Set;
201-
op.ExpectedType = NScheme::TTypeInfo(0);
201+
op.ExpectedType = NScheme::TTypeInfo();
202202
} else if (cmd.GetStaticType()->IsTuple()) {
203203
// inplace update
204204
TTupleLiteral* tuple = AS_VALUE(TTupleLiteral, cmd);

‎ydb/core/grpc_services/rpc_read_rows.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class TReadRowsRPC : public TActorBootstrapped<TReadRowsRPC> {
171171
return false;
172172
}
173173

174-
const auto typeInRequest = NScheme::TTypeInfo(NScheme::NTypeIds::Pg, typeDesc);
174+
const auto typeInRequest = NScheme::TTypeInfo(typeDesc);
175175
if (typeInRequest != colInfo.PType) {
176176
errorMessage = Sprintf("Type mismatch for column %s: expected %s, got %s",
177177
name.c_str(), NScheme::TypeName(colInfo.PType).c_str(),

‎ydb/core/kqp/common/kqp_resolve.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ struct TTableConstInfo : public TAtomicRefCount<TTableConstInfo> {
4949
if (phyColumn.GetTypeId() != NScheme::NTypeIds::Pg) {
5050
column.Type = NScheme::TTypeInfo(phyColumn.GetTypeId());
5151
} else {
52-
column.Type = NScheme::TTypeInfo(phyColumn.GetTypeId(),
53-
NPg::TypeDescFromPgTypeName(phyColumn.GetPgTypeName()));
52+
column.Type = NScheme::TTypeInfo(NPg::TypeDescFromPgTypeName(phyColumn.GetPgTypeName()));
5453
}
5554
column.NotNull = phyColumn.GetNotNull();
5655
column.IsBuildInProgress = phyColumn.GetIsBuildInProgress();

‎ydb/core/kqp/common/kqp_types.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ TTypeInfo TypeInfoFromProtoMiniKQLType(const NKikimrMiniKQL::TType& type) {
2020
case NKikimrMiniKQL::Data:
2121
return TTypeInfo((NScheme::TTypeId)type.GetData().GetScheme());
2222
case NKikimrMiniKQL::Pg:
23-
return TTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(type.GetPg().Getoid()));
23+
return TTypeInfo(NPg::TypeDescFromPgTypeId(type.GetPg().Getoid()));
2424
default:
2525
Y_ENSURE(false, "not a data or pg type");
2626
}
@@ -39,7 +39,7 @@ TTypeInfo TypeInfoFromMiniKQLType(const NMiniKQL::TType* type) {
3939
case NMiniKQL::TType::EKind::Data:
4040
return TTypeInfo((NScheme::TTypeId)AS_TYPE(NMiniKQL::TDataType, type)->GetSchemeType());
4141
case NMiniKQL::TType::EKind::Pg:
42-
return TTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(AS_TYPE(NMiniKQL::TPgType, type)->GetTypeId()));
42+
return TTypeInfo(NPg::TypeDescFromPgTypeId(AS_TYPE(NMiniKQL::TPgType, type)->GetTypeId()));
4343
default:
4444
Y_ENSURE(false, "not a data or pg type");
4545
}

‎ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ TKqpScanFetcherActor::TKqpScanFetcherActor(const NKikimrKqp::TKqpSnapshot& snaps
4747
for (size_t i = 0; i < Meta.KeyColumnTypesSize(); i++) {
4848
NScheme::TTypeId typeId = Meta.GetKeyColumnTypes().at(i);
4949
NScheme::TTypeInfo typeInfo = typeId == NScheme::NTypeIds::Pg ?
50-
NScheme::TTypeInfo(typeId, NPg::TypeDescFromPgTypeId(Meta.GetKeyColumnTypeInfos().at(i).GetPgTypeId())) :
50+
NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(Meta.GetKeyColumnTypeInfos().at(i).GetPgTypeId())) :
5151
NScheme::TTypeInfo(typeId);
5252
KeyColumnTypes.push_back(typeInfo);
5353
}

‎ydb/core/kqp/executer_actor/kqp_executer_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ class TKqpExecuterBase : public TActorBootstrapped<TDerived> {
14011401
auto memberType = resultStructType->GetMemberType(i);
14021402
if (memberType->GetKind() == NKikimr::NMiniKQL::TType::EKind::Pg) {
14031403
const auto memberPgType = static_cast<NKikimr::NMiniKQL::TPgType*>(memberType);
1404-
taskMeta.ReadInfo.ResultColumnsTypes.back() = NScheme::TTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(memberPgType->GetTypeId()));
1404+
taskMeta.ReadInfo.ResultColumnsTypes.back() = NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(memberPgType->GetTypeId()));
14051405
} else {
14061406
if (memberType->GetKind() == NKikimr::NMiniKQL::TType::EKind::Optional) {
14071407
memberType = static_cast<NKikimr::NMiniKQL::TOptionalType*>(memberType)->GetItemType();

‎ydb/core/kqp/provider/yql_kikimr_type_ann.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -906,10 +906,7 @@ virtual TStatus HandleCreateTable(TKiCreateTable create, TExprContext& ctx) over
906906

907907
if (actualType->GetKind() == ETypeAnnotationKind::Pg) {
908908
auto pgTypeId = actualType->Cast<TPgExprType>()->GetId();
909-
columnMeta.TypeInfo = NKikimr::NScheme::TTypeInfo(
910-
NKikimr::NScheme::NTypeIds::Pg,
911-
NKikimr::NPg::TypeDescFromPgTypeId(pgTypeId)
912-
);
909+
columnMeta.TypeInfo = NKikimr::NScheme::TTypeInfo(NKikimr::NPg::TypeDescFromPgTypeId(pgTypeId));
913910
}
914911

915912
if (columnTuple.Size() > 2) {

‎ydb/core/kqp/runtime/kqp_read_actor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ class TKqpReadActor : public TActorBootstrapped<TKqpReadActor>, public NYql::NDq
379379
for (size_t i = 0; i < Settings->KeyColumnTypesSize(); ++i) {
380380
NScheme::TTypeId typeId = Settings->GetKeyColumnTypes(i);
381381
NScheme::TTypeInfo typeInfo = typeId == NScheme::NTypeIds::Pg ?
382-
NScheme::TTypeInfo(typeId, NPg::TypeDescFromPgTypeId(Settings->GetKeyColumnTypeInfos(i).GetPgTypeId())) :
382+
NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(Settings->GetKeyColumnTypeInfos(i).GetPgTypeId())) :
383383
NScheme::TTypeInfo(typeId);
384384
KeyColumnTypes.push_back(typeInfo);
385385
}
@@ -1462,7 +1462,7 @@ class TKqpReadActor : public TActorBootstrapped<TKqpReadActor>, public NYql::NDq
14621462
NScheme::TTypeInfo MakeTypeInfo(const NKikimrTxDataShard::TKqpTransaction_TColumnMeta& info) {
14631463
NScheme::TTypeId typeId = info.GetType();
14641464
if (typeId == NScheme::NTypeIds::Pg) {
1465-
return {typeId, NPg::TypeDescFromPgTypeId(info.GetTypeInfo().GetPgTypeId())};
1465+
return {NPg::TypeDescFromPgTypeId(info.GetTypeInfo().GetPgTypeId())};
14661466
} else {
14671467
return {typeId};
14681468
}

‎ydb/core/kqp/runtime/kqp_read_table.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bool StructHoldsPgType(const TStructType& structType, ui32 index) {
2929

3030
NScheme::TTypeInfo UnwrapPgTypeFromStruct(const TStructType& structType, ui32 index) {
3131
TPgType* type = AS_TYPE(TPgType, structType.GetMemberType(index));
32-
return NScheme::TTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(type->GetTypeId()));
32+
return NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(type->GetTypeId()));
3333
}
3434

3535
NUdf::TDataTypeId UnwrapDataTypeFromStruct(const TStructType& structType, ui32 index) {

‎ydb/core/kqp/runtime/kqp_sequencer_actor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ NScheme::TTypeInfo BuildTypeInfo(const ::NKikimrKqp::TKqpColumnMetadataProto& pr
2929
if (typeId != NKikimr::NScheme::NTypeIds::Pg) {
3030
return NScheme::TTypeInfo(typeId);
3131
} else {
32-
return NScheme::TTypeInfo(typeId, NPg::TypeDescFromPgTypeId(proto.GetTypeInfo().GetPgTypeId()));
32+
return NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(proto.GetTypeInfo().GetPgTypeId()));
3333
}
3434
}
3535

‎ydb/core/kqp/runtime/kqp_stream_lookup_worker.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ NScheme::TTypeInfo UnpackTypeInfo(NKikimr::NMiniKQL::TType* type) {
6161
if (type->GetKind() == NMiniKQL::TType::EKind::Pg) {
6262
auto pgType = static_cast<NMiniKQL::TPgType*>(type);
6363
auto pgTypeId = pgType->GetTypeId();
64-
return NScheme::TTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(pgTypeId));
64+
return NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(pgTypeId));
6565
} else {
6666
bool isOptional = false;
6767
auto dataType = NMiniKQL::UnpackOptionalData(type, isOptional);
@@ -149,7 +149,7 @@ TKqpStreamLookupWorker::TKqpStreamLookupWorker(NKikimrKqp::TKqpStreamLookupSetti
149149
i32 keyOrder = 0;
150150
for (const auto& keyColumn : settings.GetKeyColumns()) {
151151
NScheme::TTypeInfo typeInfo = keyColumn.GetTypeId() == NScheme::NTypeIds::Pg ?
152-
NScheme::TTypeInfo(keyColumn.GetTypeId(), NPg::TypeDescFromPgTypeId(keyColumn.GetTypeInfo().GetPgTypeId())) :
152+
NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(keyColumn.GetTypeInfo().GetPgTypeId())) :
153153
NScheme::TTypeInfo(keyColumn.GetTypeId());
154154

155155
KeyColumns.emplace(
@@ -174,7 +174,7 @@ TKqpStreamLookupWorker::TKqpStreamLookupWorker(NKikimrKqp::TKqpStreamLookupSetti
174174
Columns.reserve(settings.GetColumns().size());
175175
for (const auto& column : settings.GetColumns()) {
176176
NScheme::TTypeInfo typeInfo = column.GetTypeId() == NScheme::NTypeIds::Pg ?
177-
NScheme::TTypeInfo(column.GetTypeId(), NPg::TypeDescFromPgTypeId(column.GetTypeInfo().GetPgTypeId())) :
177+
NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(column.GetTypeInfo().GetPgTypeId())) :
178178
NScheme::TTypeInfo(column.GetTypeId());
179179

180180
Columns.emplace_back(TSysTables::TTableColumnInfo{

‎ydb/core/kqp/runtime/kqp_write_table.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ TVector<TSysTables::TTableColumnInfo> BuildColumns(const TConstArrayRef<NKikimrK
6262
i32 number = 0;
6363
for (const auto& column : inputColumns) {
6464
NScheme::TTypeInfo typeInfo = (column.GetTypeId() == NScheme::NTypeIds::Pg) ?
65-
NScheme::TTypeInfo(column.GetTypeId(), NPg::TypeDescFromPgTypeId(column.GetTypeInfo().GetPgTypeId())) :
65+
NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(column.GetTypeInfo().GetPgTypeId())) :
6666
NScheme::TTypeInfo(column.GetTypeId());
6767
result.emplace_back(
6868
column.GetName(),

‎ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7853,7 +7853,7 @@ Y_UNIT_TEST_SUITE(KqpOlapScheme) {
78537853
TVector<TTestHelper::TColumnSchema> schema = {
78547854
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int32).SetNullable(false),
78557855
TTestHelper::TColumnSchema().SetName("resource_id").SetType(NScheme::NTypeIds::Utf8),
7856-
TTestHelper::TColumnSchema().SetName("level").SetTypeInfo({NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeName("pgint4")})
7856+
TTestHelper::TColumnSchema().SetName("level").SetTypeInfo({NPg::TypeDescFromPgTypeName("pgint4")})
78577857
};
78587858
TTestHelper::TColumnTableStore testTableStore;
78597859

@@ -7873,7 +7873,7 @@ Y_UNIT_TEST_SUITE(KqpOlapScheme) {
78737873
testHelper.ReadData("SELECT * FROM `/Root/TableStoreTest/ColumnTableTest` WHERE id=1", "[[1;#;[\"test_res_1\"]]]");
78747874

78757875
{
7876-
schema.push_back(TTestHelper::TColumnSchema().SetName("new_column").SetTypeInfo({NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeName("pgfloat4")}));
7876+
schema.push_back(TTestHelper::TColumnSchema().SetName("new_column").SetTypeInfo({NPg::TypeDescFromPgTypeName("pgfloat4")}));
78777877
auto alterQuery = TStringBuilder() << "ALTER TABLESTORE `" << testTableStore.GetName() << "` ADD COLUMN new_column pgfloat4;";
78787878

78797879
auto alterResult = testHelper.GetSession().ExecuteSchemeQuery(alterQuery).GetValueSync();

‎ydb/core/scheme/scheme_types_proto.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ TTypeInfoMod TypeInfoModFromProtoColumnType(ui32 typeId, const NKikimrProto::TTy
3636
case NTypeIds::Pg: {
3737
Y_ABORT_UNLESS(typeInfo, "no type info for pg type");
3838
TTypeInfoMod res = {
39-
.TypeInfo = {type, NPg::TypeDescFromPgTypeId(typeInfo->GetPgTypeId())},
39+
.TypeInfo = {NPg::TypeDescFromPgTypeId(typeInfo->GetPgTypeId())},
4040
.TypeMod = (typeInfo->HasPgTypeMod() ? typeInfo->GetPgTypeMod() : TProtoStringType{})
4141
};
4242
return res;
4343
}
4444
case NTypeIds::Decimal: {
4545
Y_ABORT_UNLESS(typeInfo, "no type info for decimal type");
4646
TTypeInfoMod res = {
47-
.TypeInfo = {type, {typeInfo->GetDecimalPrecision(), typeInfo->GetDecimalScale()}},
47+
.TypeInfo = {{typeInfo->GetDecimalPrecision(), typeInfo->GetDecimalScale()}},
4848
.TypeMod = {}
4949
};
5050
return res;

‎ydb/core/scheme_types/scheme_raw_type_value.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class TRawTypeValue
1414
TRawTypeValue()
1515
: Buffer(nullptr)
1616
, BufferSize(0)
17-
, ValueType(0)
17+
, ValueType()
1818
{}
1919

2020
TRawTypeValue(const void* buf, ui32 bufSize, NScheme::TTypeInfo vtype)

‎ydb/core/scheme_types/scheme_type_info.h

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,16 @@ class TTypeInfo {
3232
//Y_ABORT_UNLESS(NTypeIds::IsParametrizedType(TypeId))
3333
}
3434

35-
constexpr TTypeInfo(TTypeId typeId, const NKikimr::NPg::ITypeDesc* typeDesc)
36-
: TypeId(typeId)
35+
constexpr TTypeInfo(const NKikimr::NPg::ITypeDesc* typeDesc)
36+
: TypeId(NTypeIds::Pg)
3737
, PgTypeDesc(typeDesc)
38-
{
39-
Y_ABORT_UNLESS(TypeId == NTypeIds::Pg);
40-
}
38+
{}
4139

42-
constexpr TTypeInfo(TTypeId typeId, const TDecimalType& decimalType)
43-
: TypeId(typeId)
40+
constexpr TTypeInfo(const TDecimalType& decimalType)
41+
: TypeId(NTypeIds::Decimal)
4442
// TODO Remove after parametrized decimal in KQP
4543
, DecimalTypeDesc(decimalType.GetPrecision() == 0 && decimalType.GetScale() == 0 ? TDecimalType(DECIMAL_PRECISION, DECIMAL_SCALE) : decimalType)
46-
{
47-
Y_ABORT_UNLESS(TypeId == NTypeIds::Decimal);
48-
}
44+
{}
4945

5046
constexpr bool operator==(const TTypeInfo& other) const {
5147
return TypeId == other.TypeId && RawDesc == other.RawDesc;

‎ydb/core/scheme_types/scheme_type_registry.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ bool TTypeRegistry::GetTypeInfo(const TStringBuf& typeName, const TStringBuf& co
6060
}
6161
typeInfo = NScheme::TTypeInfo(type->GetTypeId());
6262
} else if (const auto decimalType = NScheme::TDecimalType::ParseTypeName(typeName)) {
63-
typeInfo = NScheme::TTypeInfo(NScheme::NTypeIds::Decimal, *decimalType);
63+
typeInfo = NScheme::TTypeInfo(*decimalType);
6464
} else if (const auto pgTypeDesc = NPg::TypeDescFromPgTypeName(typeName)) {
65-
typeInfo = NScheme::TTypeInfo(NScheme::NTypeIds::Pg, pgTypeDesc);
65+
typeInfo = NScheme::TTypeInfo(pgTypeDesc);
6666
} else {
6767
errorStr = Sprintf("Type '%s' specified for column '%s' is not supported by storage", typeName.data(), columnName.data());
6868
return false;

‎ydb/core/sys_view/common/schema.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ TVector<Schema::PgColumn> GetPgStaticTableColumns(const TString& schema, const T
2121

2222
Schema::PgColumn::PgColumn(NIceDb::TColumnId columnId, TStringBuf columnTypeName, TStringBuf columnName)
2323
: _ColumnId(columnId)
24-
, _ColumnTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(NYql::NPg::LookupType(TString(columnTypeName)).TypeId))
24+
, _ColumnTypeInfo(NPg::TypeDescFromPgTypeId(NYql::NPg::LookupType(TString(columnTypeName)).TypeId))
2525
, _ColumnName(columnName)
2626
{}
2727

‎ydb/core/tablet_flat/flat_cxx_database.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ template <NScheme::TTypeId ValType>
244244
class TConvertTypeValue : public TRawTypeValue {
245245
public:
246246
TConvertTypeValue(const TRawTypeValue& value)
247-
: TRawTypeValue(value.Data(), value.Size(), value.IsEmpty() ? NScheme::TTypeInfo(0) : NScheme::TTypeInfo(ValType))
247+
: TRawTypeValue(value.Data(), value.Size(), value.IsEmpty() ? NScheme::TTypeInfo() : NScheme::TTypeInfo(ValType))
248248
{}
249249

250250
template <typename ValueType> static typename NSchemeTypeMapper<ValType>::Type ConvertFrom(ValueType value) {
@@ -257,7 +257,7 @@ template <>
257257
class TConvertTypeValue<NScheme::NTypeIds::String> : public TRawTypeValue {
258258
public:
259259
TConvertTypeValue(const TRawTypeValue& value)
260-
: TRawTypeValue(value.Data(), value.Size(), value.IsEmpty() ? NScheme::TTypeInfo(0) : NScheme::TTypeInfo(NScheme::NTypeIds::String))
260+
: TRawTypeValue(value.Data(), value.Size(), value.IsEmpty() ? NScheme::TTypeInfo() : NScheme::TTypeInfo(NScheme::NTypeIds::String))
261261
{}
262262

263263
static typename NSchemeTypeMapper<NScheme::NTypeIds::String>::Type ConvertFrom(const TString& value) {

‎ydb/core/tablet_flat/ut/ut_decimal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Y_UNIT_TEST_SUITE(TFlatDatabaseDecimal) {
2121
NTest::TDbExec db;
2222

2323
auto makeDecimalTypeInfo = [] (ui32 precision, ui32 scale) {
24-
return NScheme::TTypeInfo(NScheme::NTypeIds::Decimal, NScheme::TDecimalType(precision, scale));
24+
return NScheme::TTypeInfo(NScheme::TDecimalType(precision, scale));
2525
};
2626

2727
auto makeDecimalTypeInfoProto = [] (ui32 precision, ui32 scale) {

‎ydb/core/tablet_flat/ut_pg/flat_database_pg_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Y_UNIT_TEST_SUITE(TFlatDatabasePgTest) {
3030
NTest::TDbExec db;
3131

3232
auto makePgType = [] (ui32 oid) {
33-
return NScheme::TTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(oid));
33+
return NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(oid));
3434
};
3535

3636
auto makePgTypeInfo = [] (ui32 pgTypeId) {

‎ydb/core/tx/columnshard/transactions/operators/schema.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ NKikimr::TConclusionStatus TSchemaTransactionOperator::ValidateTableSchema(const
122122
NScheme::TTypeId typeId = column.GetTypeId();
123123
NScheme::TTypeInfo schemeType;
124124
if (column.GetTypeId() == NTypeIds::Pg && column.HasTypeInfo()) {
125-
auto typeDescr = NPg::TypeDescFromPgTypeId(column.GetTypeInfo().GetPgTypeId());
126-
schemeType = {typeId, typeDescr};
125+
schemeType = {NPg::TypeDescFromPgTypeId(column.GetTypeInfo().GetPgTypeId())};
127126
} else {
128127
schemeType = {typeId};
129128
}

‎ydb/core/tx/datashard/datashard_kqp_delete_rows.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ IComputationNode* WrapKqpDeleteRows(TCallable& callable, const TComputationNodeF
148148

149149
if (memberType->IsPg()) {
150150
auto pgType = AS_TYPE(TPgType, memberType);
151-
rowTypes[i] = NScheme::TTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(pgType->GetTypeId()));
151+
rowTypes[i] = NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(pgType->GetTypeId()));
152152
} else {
153153
rowTypes[i] = NScheme::TTypeInfo(AS_TYPE(TDataType, memberType)->GetSchemeType());
154154
}

‎ydb/core/tx/datashard/datashard_kqp_lookup_table.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ TParseLookupTableResult ParseLookupTable(TCallable& callable) {
7474
NKikimr::NMiniKQL::TType* type = keyTypes->GetMemberType(i);
7575
if (type->GetKind() == TType::EKind::Pg) {
7676
auto itemType = AS_TYPE(TPgType, type);
77-
result.KeyTypes[i] = NScheme::TTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(itemType->GetTypeId()));
77+
result.KeyTypes[i] = NScheme::TTypeInfo(NPg::TypeDescFromPgTypeId(itemType->GetTypeId()));
7878
} else {
7979
if (type->IsOptional()) {
8080
type = AS_TYPE(TOptionalType, keyTypes->GetMemberType(i))->GetItemType();

‎ydb/core/tx/schemeshard/olap/columns/schema.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ bool TOlapColumnsDescription::Validate(const NKikimrSchemeOp::TColumnTableSchema
179179
errors.AddError("Type '" + colProto.GetType() + "' specified for column '" + colName + "' is not supported");
180180
return false;
181181
}
182-
typeInfo = NScheme::TTypeInfo(NScheme::NTypeIds::Pg, typeDesc);
182+
typeInfo = NScheme::TTypeInfo(typeDesc);
183183
} else if (const auto decimalType = NScheme::TDecimalType::ParseTypeName(typeName)) {
184-
typeInfo = NScheme::TTypeInfo(NScheme::NTypeIds::Decimal, *decimalType);
184+
typeInfo = NScheme::TTypeInfo(*decimalType);
185185
} else {
186186
const NScheme::IType* type = typeRegistry->GetType(typeName);
187187
if (!type || !TOlapColumnAdd::IsAllowedType(type->GetTypeId())) {

‎ydb/core/tx/schemeshard/olap/columns/update.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ namespace NKikimr::NSchemeShard {
5353
errors.AddError(TStringBuilder() << "Type '" << typeName << "' specified for column '" << Name << "' is not supported");
5454
return false;
5555
}
56-
Type = NScheme::TTypeInfo(NScheme::NTypeIds::Pg, typeDesc);
56+
Type = NScheme::TTypeInfo(typeDesc);
5757
} else if (const auto decimalType = NScheme::TDecimalType::ParseTypeName(typeName)) {
58-
Type = NScheme::TTypeInfo(NScheme::NTypeIds::Decimal, *decimalType);
58+
Type = NScheme::TTypeInfo(*decimalType);
5959
}else {
6060
Y_ABORT_UNLESS(AppData()->TypeRegistry);
6161
const NScheme::IType* type = AppData()->TypeRegistry->GetType(typeName);

‎ydb/core/tx/tx_proxy/datareq.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ struct TReadTableRequest : public TThrRefBase {
177177
, RequestVersion(tx.HasApiVersion() ? tx.GetApiVersion() : (ui32)NKikimrTxUserProxy::TReadTableTransaction::UNSPECIFIED)
178178
{
179179
for (auto &col : tx.GetColumns()) {
180-
Columns.emplace_back(col, 0, NScheme::TTypeInfo(0));
180+
Columns.emplace_back(col, 0, NScheme::TTypeInfo());
181181
}
182182

183183
if (tx.HasSnapshotStep() && tx.HasSnapshotTxId()) {

0 commit comments

Comments
 (0)