1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00

MCOL-3536 Collation

This commit is contained in:
David Hall
2020-06-01 15:08:15 -05:00
parent 516a3fa37e
commit 78ac310e42
14 changed files with 126 additions and 262 deletions

View File

@ -126,9 +126,6 @@ public:
void createBPP(messageqcpp::ByteStream&) const;
void destroyBPP(messageqcpp::ByteStream&) const;
void useJoiner(boost::shared_ptr<joiner::Joiner>);
bool nextJoinerMsg(messageqcpp::ByteStream&);
/* Call this one last */
// void addDeliveryStep(const DeliveryStep &);
@ -154,8 +151,7 @@ public:
/* Turn a ByteStream into ElementTypes or StringElementTypes */
void getElementTypes(messageqcpp::ByteStream& in, std::vector<ElementType>* out,
bool* validCPData, uint64_t* lbid, int64_t* min, int64_t* max, uint32_t* cachedIO, uint32_t* physIO,
uint32_t* touchedBlocks,
uint16_t* preJoinRidCount) const;
uint32_t* touchedBlocks) const;
void getStringElementTypes(messageqcpp::ByteStream& in,
std::vector<StringElementType>* out, bool* validCPData, uint64_t* lbid,
int64_t* min, int64_t* max, uint32_t* cachedIO, uint32_t* physIO,
@ -314,7 +310,6 @@ private:
/* for Joiner serialization */
bool pickNextJoinerNum();
uint32_t pos, joinerNum;
boost::shared_ptr<joiner::Joiner> joiner;
boost::shared_ptr<std::vector<ElementType> > smallSide;
boost::scoped_array<uint32_t> posByJoinerNum;