Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions be/src/vec/exec/scan/olap_scanner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,11 @@ Status OlapScanner::init() {
olap_scan_node.schema_version);
cached_schema = SchemaCache::instance()->get_schema(schema_key);
}
if (cached_schema) {
if (cached_schema && cached_schema->num_virtual_columns() == 0) {
tablet_schema = cached_schema;
} else {
// If schema is not cached or cached schema has virtual columns,
// we need to create a new TabletSchema.
tablet_schema = std::make_shared<TabletSchema>();
tablet_schema->copy_from(*tablet->tablet_schema());
if (olap_scan_node.__isset.columns_desc && !olap_scan_node.columns_desc.empty() &&
Expand Down Expand Up @@ -238,7 +240,9 @@ Status OlapScanner::init() {
read_columns_to_string(tablet_schema, _return_columns));
}

if (!cached_schema && !schema_key.empty()) {
// Add newly created tablet schema to schema cache if it does not have virtual columns.
if (cached_schema == nullptr && !schema_key.empty() &&
tablet_schema->num_virtual_columns() == 0) {
SchemaCache::instance()->insert_schema(schema_key, tablet_schema);
}

Expand Down
Loading