database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

chore(): merge cleanup

Browse Source
This commit is contained in:
drrtuy
2025-03-19 13:26:43 +00:00
parent 729db829a2
commit b649af5a0c
3 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dbcon/joblist/tuplehashjoin.cpp
View File

@ -365,30 +365,6 @@ void TupleHashJoinStep::outOfMemoryHandler(std::shared_ptr<joiner::TupleJoiner>
} }
} }
void TupleHashJoinStep::outOfMemoryHandler(std::shared_ptr<joiner::TupleJoiner> joiner)
{
boost::unique_lock<boost::mutex> sl(saneErrMsg);
if (cancelled())
return;
if (!allowDJS || isDML || (fSessionId & 0x80000000) || (tableOid() < 3000 && tableOid() >= 1000))
{
joinIsTooBig = true;
ostringstream oss;
oss << "(" << __LINE__ << ") " << logging::IDBErrorInfo::instance()->errorMsg(logging::ERR_JOIN_TOO_BIG);
fLogger->logMessage(logging::LOG_TYPE_INFO, oss.str());
errorMessage(oss.str());
status(logging::ERR_JOIN_TOO_BIG);
cout << "Join is too big, raise the UM join limit for now (small runner)" << endl;
abort();
}
else if (allowDJS)
{
joiner->setConvertToDiskJoin();
// TODO RGData that triggers this path is lost. Need to store it to pass it future.
}
}
/* Index is which small input to read. */ /* Index is which small input to read. */
void TupleHashJoinStep::smallRunnerFcn(uint32_t index, uint threadID, uint64_t* jobs) void TupleHashJoinStep::smallRunnerFcn(uint32_t index, uint threadID, uint64_t* jobs)
{ {

1
utils/rowgroup/rowgroup.h
View File

@ -609,7 +609,6 @@ class Row
} }
const CHARSET_INFO* getCharset(uint32_t col) const; const CHARSET_INFO* getCharset(uint32_t col) const;
inline bool inStringTable(uint32_t col) const;
private: private:
inline bool inStringTable(uint32_t col) const; inline bool inStringTable(uint32_t col) const;

2
utils/windowfunction/idborderby.h
View File

@ -52,7 +52,7 @@ class ReservablePQ : private std::priority_queue<_Tp, _Sequence, _Compare>
{ {
public: public:
typedef typename std::priority_queue<_Tp, _Sequence, _Compare>::size_type size_type; typedef typename std::priority_queue<_Tp, _Sequence, _Compare>::size_type size_type;
explicit explicit ReservablePQ(size_type capacity, std::atomic<int64_t>* memoryLimit, explicit ReservablePQ(size_type capacity, std::atomic<int64_t>* memoryLimit,
const int64_t checkPointStepSize = allocators::CheckPointStepSize, const int64_t checkPointStepSize = allocators::CheckPointStepSize,
const int64_t lowerBound = allocators::MemoryLimitLowerBound) const int64_t lowerBound = allocators::MemoryLimitLowerBound)
: std::priority_queue<_Tp, _Sequence, _Compare>(_Compare(), : std::priority_queue<_Tp, _Sequence, _Compare>(_Compare(),