@@ -52,6 +52,18 @@ const ColumnMap::COffsets& check_map_offsets_column(const IColumn& offsets_colum
5252 return *offsets_concrete;
5353}
5454
55+ ColumnMap::COffsets::Ptr check_map_offsets_column_ptr (const ColumnPtr& offsets_column) {
56+ return ColumnMap::COffsets::cast_to_column_ptr (&check_map_offsets_column (*offsets_column));
57+ }
58+
59+ ColumnMap::COffsets::MutablePtr assert_mutable_map_offsets (MutableColumnPtr&& offsets_column) {
60+ check_map_offsets_column (*offsets_column);
61+ auto mutable_offsets = ColumnMap::COffsets::cast_to_column_mutptr (
62+ assert_cast<ColumnMap::COffsets*, TypeCheckOnRelease::DISABLE >(offsets_column.get ()));
63+ offsets_column = nullptr ;
64+ return mutable_offsets;
65+ }
66+
5567void validate_map_columns (const IColumn& keys, const IColumn& values, const IColumn& offsets) {
5668 const auto & offsets_concrete = check_map_offsets_column (offsets);
5769
@@ -86,21 +98,21 @@ std::string ColumnMap::get_name() const {
8698ColumnMap::ColumnMap (MutableColumnPtr&& keys, MutableColumnPtr&& values, MutableColumnPtr&& offsets)
8799 : keys_column(std::move(keys)),
88100 values_column (std::move(values)),
89- offsets_column(std::move(offsets)) {
101+ offsets_column(assert_mutable_map_offsets( std::move(offsets) )) {
90102 check_const_only_in_top_level ();
91103 validate_map_columns (*static_cast <const IColumn::Ptr&>(keys_column),
92104 *static_cast <const IColumn::Ptr&>(values_column),
93- *static_cast <const IColumn ::Ptr&>(offsets_column));
105+ *static_cast <const COffsets ::Ptr&>(offsets_column));
94106}
95107
96108ColumnMap::ColumnMap (SharedTag, ColumnPtr keys, ColumnPtr values, ColumnPtr offsets) {
97109 static_cast <IColumn::Ptr&>(keys_column) = std::move (keys);
98110 static_cast <IColumn::Ptr&>(values_column) = std::move (values);
99- static_cast <IColumn ::Ptr&>(offsets_column) = std::move (offsets);
111+ static_cast <COffsets ::Ptr&>(offsets_column) = check_map_offsets_column_ptr (offsets);
100112 check_const_only_in_top_level ();
101113 validate_map_columns (*static_cast <const IColumn::Ptr&>(keys_column),
102114 *static_cast <const IColumn::Ptr&>(values_column),
103- *static_cast <const IColumn ::Ptr&>(offsets_column));
115+ *static_cast <const COffsets ::Ptr&>(offsets_column));
104116}
105117
106118// todo. here to resize every row map
@@ -547,10 +559,10 @@ void ColumnMap::insert_range_from_ignore_overflow(const IColumn& src, size_t sta
547559
548560ColumnPtr ColumnMap::filter (const Filter& filt, ssize_t result_size_hint) const {
549561 auto k_arr = ColumnArray::create (static_cast <const IColumn::Ptr&>(keys_column),
550- static_cast <const IColumn::Ptr&>(offsets_column ))
562+ static_cast <const IColumn::Ptr&>(get_offsets_ptr () ))
551563 ->filter (filt, result_size_hint);
552564 auto v_arr = ColumnArray::create (static_cast <const IColumn::Ptr&>(values_column),
553- static_cast <const IColumn::Ptr&>(offsets_column ))
565+ static_cast <const IColumn::Ptr&>(get_offsets_ptr () ))
554566 ->filter (filt, result_size_hint);
555567 return ColumnMap::create (assert_cast<const ColumnArray&>(*k_arr).get_data_ptr (),
556568 assert_cast<const ColumnArray&>(*v_arr).get_data_ptr (),
@@ -560,7 +572,7 @@ ColumnPtr ColumnMap::filter(const Filter& filt, ssize_t result_size_hint) const
560572size_t ColumnMap::filter (const Filter& filter) {
561573 // Move subcolumns out of this ColumnMap to get exclusive ownership, then write back.
562574 auto keys_mut = IColumn::mutate (std::move (static_cast <IColumn::Ptr&>(keys_column)));
563- auto offsets_mut = IColumn::mutate (std::move (static_cast <IColumn::Ptr&>(offsets_column )));
575+ auto offsets_mut = IColumn::mutate (std::move (get_offsets_ptr ( )));
564576 auto values_mut = IColumn::mutate (std::move (static_cast <IColumn::Ptr&>(values_column)));
565577 // Clone offsets for values (both keys and values share the same offsets structure)
566578 MutableColumnPtr copied_off = offsets_mut->clone_empty ();
@@ -571,19 +583,19 @@ size_t ColumnMap::filter(const Filter& filter) {
571583 v_arr->filter (filter);
572584 // Put filtered subcolumns back
573585 static_cast <IColumn::Ptr&>(keys_column) = k_arr->get_data_ptr ();
574- static_cast <IColumn::Ptr&>( offsets_column) = k_arr->get_offsets_ptr ();
586+ offsets_column = k_arr->get_offsets_ptr ();
575587 static_cast <IColumn::Ptr&>(values_column) = v_arr->get_data_ptr ();
576- // Use const access to avoid assert_mutable_ref() on the just-written-back offsets_column
577- // (k_arr still holds a ref , so use_count > 1 until k_arr goes out of scope)
578- return static_cast <const IColumn ::Ptr&>(offsets_column)->size ();
588+ // Read through a const view because k_arr still shares the just-written-back offsets
589+ // until it goes out of scope , so mutable WrappedPtr access would hit assert_mutable_ref().
590+ return static_cast <const COffsets ::Ptr&>(offsets_column)->size ();
579591}
580592
581593MutableColumnPtr ColumnMap::permute (const Permutation& perm, size_t limit) const {
582594 auto k_arr = ColumnArray::create (static_cast <const IColumn::Ptr&>(keys_column),
583- static_cast <const IColumn::Ptr&>(offsets_column ))
595+ static_cast <const IColumn::Ptr&>(get_offsets_ptr () ))
584596 ->permute (perm, limit);
585597 auto v_arr = ColumnArray::create (static_cast <const IColumn::Ptr&>(values_column),
586- static_cast <const IColumn::Ptr&>(offsets_column ))
598+ static_cast <const IColumn::Ptr&>(get_offsets_ptr () ))
587599 ->permute (perm, limit);
588600
589601 return ColumnMap::create (assert_cast<const ColumnArray&>(*k_arr).get_data_ptr (),
@@ -593,9 +605,9 @@ MutableColumnPtr ColumnMap::permute(const Permutation& perm, size_t limit) const
593605
594606Status ColumnMap::deduplicate_keys (bool recursive) {
595607 const IColumn& ck = *static_cast <const IColumn::Ptr&>(keys_column);
596- const IColumn& co = * static_cast <const IColumn::Ptr&>(offsets_column );
608+ const auto & offsets = static_cast <const ColumnMap*>( this )-> get_offsets ( );
597609 const auto inner_rows = ck.size ();
598- const auto rows = co .size ();
610+ const auto rows = offsets .size ();
599611
600612 if (recursive) {
601613 const auto & values_ptr = static_cast <const IColumn::Ptr&>(values_column);
@@ -651,8 +663,6 @@ Status ColumnMap::deduplicate_keys(bool recursive) {
651663 auto & new_offsets_data = new_offsets->get_data ();
652664
653665 IColumn::Filter filter (inner_rows, 1 );
654- const auto & offsets = static_cast <const ColumnMap*>(this )->get_offsets ();
655-
656666 Offset64 offset = 0 ;
657667 bool has_duplicated_key = false ;
658668
0 commit comments