Skip to content

Commit

Permalink
[Bugfix] fix "unsupport decode_dict_codes" error in late_materized (#…
Browse files Browse the repository at this point in the history
…9046)

After PR #8869, GlobalDictCodeColumnIterator won't support `decode_dict_codes(const int32_t* codes, size_t size, vectorized::Column* words)`,
we need to decode_dict_codes(const vectorized::Column& codes, vectorized::Column* words) instead it

(cherry picked from commit 9ac7855)

# Conflicts:
#	be/src/storage/rowset/dictcode_column_iterator.h
  • Loading branch information
stdpain authored and mergify[bot] committed Sep 28, 2022
1 parent b368ec0 commit 96aac95
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions be/src/storage/rowset/dictcode_column_iterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,16 @@
#include <memory>

#include "column/column.h"
<<<<<<< HEAD
#include "runtime/global_dicts.h"
=======
#include "column/nullable_column.h"
#include "column/vectorized_fwd.h"
#include "exprs/expr_context.h"
#include "runtime/global_dict/config.h"
#include "runtime/global_dict/dict_column.h"
#include "runtime/global_dict/types.h"
>>>>>>> 9ac785507 ([Bugfix] fix "unsupport decode_dict_codes" error in late_materized (#9046))
#include "simd/gather.h"
#include "storage/range.h"
#include "storage/rowset/column_iterator.h"
Expand Down

0 comments on commit 96aac95

Please sign in to comment.