From df0436084bbc1611fbc15f38ab34dc6a123ddc46 Mon Sep 17 00:00:00 2001 From: guo-shaoge Date: Wed, 29 Mar 2023 11:16:40 +0800 Subject: [PATCH] fix build Signed-off-by: guo-shaoge --- .../DataStreams/GeneratedColumnPlaceholderBlockInputStream.h | 4 ++-- dbms/src/Flash/Coprocessor/DAGStorageInterpreter.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbms/src/DataStreams/GeneratedColumnPlaceholderBlockInputStream.h b/dbms/src/DataStreams/GeneratedColumnPlaceholderBlockInputStream.h index f220f1377d4..1adff01a328 100644 --- a/dbms/src/DataStreams/GeneratedColumnPlaceholderBlockInputStream.h +++ b/dbms/src/DataStreams/GeneratedColumnPlaceholderBlockInputStream.h @@ -54,11 +54,11 @@ class GeneratedColumnPlaceholderBlockInputStream : public IProfilingBlockInputSt protected: void readPrefix() override { - RUNTIME_CHECK(!generated_column_infos.empty()); + RUNTIME_CHECK(!generated_column_infos.empty(), Exception, "generated_column_infos cannot be empty"); // Validation check. for (size_t i = 1; i < generated_column_infos.size(); ++i) { - RUNTIME_CHECK(std::get<0>(generated_column_infos[i]) > std::get<0>(generated_column_infos[i - 1])); + RUNTIME_CHECK(std::get<0>(generated_column_infos[i]) > std::get<0>(generated_column_infos[i - 1]), Exception, "generated column index should be ordered"); } } diff --git a/dbms/src/Flash/Coprocessor/DAGStorageInterpreter.cpp b/dbms/src/Flash/Coprocessor/DAGStorageInterpreter.cpp index 21e429a6d0a..79b9b4476ec 100644 --- a/dbms/src/Flash/Coprocessor/DAGStorageInterpreter.cpp +++ b/dbms/src/Flash/Coprocessor/DAGStorageInterpreter.cpp @@ -965,7 +965,7 @@ std::tuple> DAGStorageIn auto const & ci = table_scan.getColumns()[i]; ColumnID cid = ci.column_id(); - if (ci.hasGeneratedColumnFlag()) + if (ci.has_flag() && ((ci.flag() & TiDB::ColumnFlagGeneratedColumn) != 0)) { LOG_DEBUG(log, "got column({}) with generated column flag", i); const auto & data_type = getDataTypeByColumnInfoForComputingLayer(ci);