Merge 3dc6696 into 7525b05

Author: ivanmorozov333

ydb/core/tx/columnshard/columnshard__scan.cpp

@@ -253,9 +253,9 @@ class TColumnShardScan : public TActorBootstrapped<TColumnShardScan>, NArrow::IR
             Bytes += NArrow::GetBatchDataSize(batch);
             ACFL_DEBUG("stage", "data_format")("batch_size", NArrow::GetBatchDataSize(batch))("num_rows", numRows)("batch_columns", JoinSeq(",", batch->schema()->field_names()));
         }
-        if (CurrentLastReadKey) {
-            NOlap::NIndexedReader::TSortableBatchPosition pNew(result.GetLastReadKey(), 0, result.GetLastReadKey()->schema()->field_names(), {}, false);
-            NOlap::NIndexedReader::TSortableBatchPosition pOld(CurrentLastReadKey, 0, CurrentLastReadKey->schema()->field_names(), {}, false);
+        if (CurrentLastReadKey && ReadMetadataRanges.size() == 1) {
+            NOlap::NIndexedReader::TSortableBatchPosition pNew(result.GetLastReadKey(), 0, result.GetLastReadKey()->schema()->field_names(), {}, ReadMetadataRanges.front()->IsDescSorted());
+            NOlap::NIndexedReader::TSortableBatchPosition pOld(CurrentLastReadKey, 0, CurrentLastReadKey->schema()->field_names(), {}, ReadMetadataRanges.front()->IsDescSorted());
             AFL_VERIFY(pOld < pNew)("old", pOld.DebugJson().GetStringRobust())("new", pNew.DebugJson().GetStringRobust());
         }
         CurrentLastReadKey = result.GetLastReadKey();