Fix ShardHint for read actor

1 files changed, 6 insertions, 1 deletions

diff --git a/ydb/core/kqp/executer_actor/kqp_executer_impl.h b/ydb/core/kqp/executer_actor/kqp_executer_impl.h
index d0350fec89..a190b06670 100644
--- a/ydb/core/kqp/executer_actor/kqp_executer_impl.h
+++ b/ydb/core/kqp/executer_actor/kqp_executer_impl.h
@@ -949,7 +949,7 @@ protected:
                 settings->SetMaxInFlightShards(*maxInFlightShards);
             }
 
-            if (!limitTasksPerNode && shardId) {
+            if (shardId) {
                 settings->SetShardIdHint(*shardId);
             }
 
@@ -1025,6 +1025,11 @@ protected:
                     NKikimrTxDataShard::TKqpReadRangesSourceSettings* settings = input.Meta.SourceSettings;
 
                     const auto& shardsRangesForTask = rangesDistribution[taskIndex];
+
+                    if (shardsRangesForTask.size() > 1) {
+                        settings->ClearShardIdHint();
+                    }
+
                     for (const auto& shardRanges : shardsRangesForTask) {
                         shardRanges->SerializeTo(settings);
                     }