aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Makunin <igor.makunin@gmail.com>2022-02-24 01:42:02 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-24 01:42:02 +0300
commit0ba95495bf05327a5d4185560e7d737b777b58c7 (patch)
tree1e9a828e6b778290b2a290d86344d5374fd97a69
parentf32957859d3691dd4b046b821888a0fdf054a3f1 (diff)
downloadydb-0ba95495bf05327a5d4185560e7d737b777b58c7.tar.gz
KIKIMR-13928: compatibility fix
REVIEW: 2347048 x-ydb-stable-ref: 710c85458d71beb129df90d244168f46ce9a66c0
-rw-r--r--ydb/core/tx/datashard/datashard__kqp_scan.cpp25
1 files changed, 13 insertions, 12 deletions
diff --git a/ydb/core/tx/datashard/datashard__kqp_scan.cpp b/ydb/core/tx/datashard/datashard__kqp_scan.cpp
index 3da96caa87..14bc03beab 100644
--- a/ydb/core/tx/datashard/datashard__kqp_scan.cpp
+++ b/ydb/core/tx/datashard/datashard__kqp_scan.cpp
@@ -590,18 +590,19 @@ void TDataShard::Handle(TEvDataShard::TEvKqpScan::TPtr& ev, const TActorContext&
}
}
- if (request.HasOlapProgram()) {
- auto msg = TStringBuilder() << "TxId: " << request.GetTxId() << "."
- << " Unexpected process program in datashard scan at " << TabletID();
- LOG_ERROR_S(*TlsActivationContext, NKikimrServices::TX_DATASHARD, msg);
-
- auto ev = MakeHolder<TEvKqpCompute::TEvScanError>(generation);
- ev->Record.SetStatus(Ydb::StatusIds::INTERNAL_ERROR);
- auto issue = NYql::YqlIssue({}, NYql::TIssuesIds::DEFAULT_ERROR, msg);
- IssueToMessage(issue, ev->Record.MutableIssues()->Add());
- Send(scanComputeActor, ev.Release(), IEventHandle::FlagTrackDelivery);
- return;
- }
+// 21-4 compatibility....
+// if (request.HasOlapProgram()) {
+// auto msg = TStringBuilder() << "TxId: " << request.GetTxId() << "."
+// << " Unexpected process program in datashard scan at " << TabletID();
+// LOG_ERROR_S(*TlsActivationContext, NKikimrServices::TX_DATASHARD, msg);
+//
+// auto ev = MakeHolder<TEvKqpCompute::TEvScanError>(generation);
+// ev->Record.SetStatus(Ydb::StatusIds::INTERNAL_ERROR);
+// auto issue = NYql::YqlIssue({}, NYql::TIssuesIds::DEFAULT_ERROR, msg);
+// IssueToMessage(issue, ev->Record.MutableIssues()->Add());
+// Send(scanComputeActor, ev.Release(), IEventHandle::FlagTrackDelivery);
+// return;
+// }
auto& snapshot = request.GetSnapshot();