Ydb stable 23-4-6

x-stable-origin-commit: e1771646ac638eac5a77678e11eebf7c1fb51f6a

Author: Gazizonoki

ydb/core/tx/scheme_board/replica.cpp

@@ -248,17 +248,6 @@ class TReplica: public TMonitorableActor<TReplica> {
             TrackMemory();
         }
 
-        explicit TDescription(
-                TReplica* owner,
-                const TPathId& pathId,
-                TOpaquePathDescription&& pathDescription)
-            : Owner(owner)
-            , PathId(pathId)
-            , PathDescription(std::move(pathDescription))
-        {
-            TrackMemory();
-        }
-
         explicit TDescription(
                 TReplica* owner,
                 const TString& path,
@@ -540,13 +529,13 @@ class TReplica: public TMonitorableActor<TReplica> {
     }
 
     // upsert description only by pathId
-    TDescription& UpsertDescription(const TPathId& pathId, TOpaquePathDescription&& pathDescription) {
+    TDescription& UpsertDescriptionByPathId(const TString& path, const TPathId& pathId, TOpaquePathDescription&& pathDescription) {
         SBR_LOG_I("Upsert description"
             << ": pathId# " << pathId
             << ", pathDescription# " << pathDescription.ToString()
         );
 
-        return Descriptions.Upsert(pathId, TDescription(this, pathId, std::move(pathDescription)));
+        return Descriptions.Upsert(pathId, TDescription(this, path, pathId, std::move(pathDescription)));
     }
 
     // upsert description by path AND pathId both
@@ -898,7 +887,7 @@ class TReplica: public TMonitorableActor<TReplica> {
             if (abandonedSchemeShards.contains(pathId.OwnerId)) { // TSS is ignored, present GSS reverted it
                 log("Replace GSS by TSS description is rejected, GSS implicitly knows that TSS has been reverted"
                     ", but still inject description only by pathId for safe");
-                UpsertDescription(pathId, std::move(pathDescription));
+                UpsertDescriptionByPathId(path, pathId, std::move(pathDescription));
                 return AckUpdate(ev);
             }
 
@@ -923,7 +912,7 @@ class TReplica: public TMonitorableActor<TReplica> {
             }
 
             log("Inject description only by pathId, it is update from GSS");
-            UpsertDescription(pathId, std::move(pathDescription));
+            UpsertDescriptionByPathId(path, pathId, std::move(pathDescription));
             return AckUpdate(ev);
         }
 

ydb/library/yql/minikql/mkql_node.cpp

@@ -2387,7 +2387,7 @@ EValueRepresentation GetValueRepresentation(const TType* type) {
 }
 
 TArrayRef<TType* const> GetWideComponents(const TFlowType* type) {
-    if (RuntimeVersion > 35) {
+    if (type->GetItemType()->IsMulti()) {
         return AS_TYPE(TMultiType, type->GetItemType())->GetElements();
     }
     return AS_TYPE(TTupleType, type->GetItemType())->GetElements();

ydb/services/lib/actors/pq_schema_actor.cpp

@@ -135,12 +135,6 @@ namespace NKikimr::NGRpcProxy::V1 {
         }
 
         if (rr.important()) {
-            if (AppData(ctx)->PQConfig.GetTopicsAreFirstClassCitizen()) {
-                return TMsgPqCodes(
-                    TStringBuilder() << "important flag is forbiden for consumer " << rr.consumer_name(),
-                    Ydb::PersQueue::ErrorCode::VALIDATION_ERROR
-                );
-            }
             config->MutablePartitionConfig()->AddImportantClientId(consumerName);
         }