From 2c2e1f9924d34a317f0a76f3070930176eb1a02c Mon Sep 17 00:00:00 2001 From: Roman Nozdrin Date: Fri, 1 Jul 2022 12:31:04 +0000 Subject: [PATCH] This patch disables OOB pool in PP --- primitives/primproc/bppseeder.cpp | 2 +- primitives/primproc/primitiveserver.cpp | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/primitives/primproc/bppseeder.cpp b/primitives/primproc/bppseeder.cpp index b81628820..bdda816f4 100644 --- a/primitives/primproc/bppseeder.cpp +++ b/primitives/primproc/bppseeder.cpp @@ -1,5 +1,5 @@ /* Copyright (C) 2014 InfiniDB, Inc. - Copyright (C) 2016 MariaDB Corporation + Copyright (C) 2016-22 MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp index e17ee8378..bb7cff4b6 100644 --- a/primitives/primproc/primitiveserver.cpp +++ b/primitives/primproc/primitiveserver.cpp @@ -2084,6 +2084,7 @@ struct ReadThread } else if (ismHdr->Command == BATCH_PRIMITIVE_DESTROY) { + id = fBPPHandler->getUniqueID(bs, ismHdr->Command); functor.reset(new BPPHandler::Destroy(fBPPHandler, bs)); } else if (ismHdr->Command == BATCH_PRIMITIVE_ABORT) @@ -2092,7 +2093,7 @@ struct ReadThread functor.reset(new BPPHandler::Abort(fBPPHandler, bs)); } FairThreadPool::Job job(uniqueID, stepID, txnId, functor, outIos, weight, priority, id); - OOBPool->addJob(job); + procPoolPtr->addJob(job); break; } @@ -2107,7 +2108,6 @@ struct ReadThread uint32_t txnId = 0; uint32_t stepID = 0; uint32_t uniqueID = 0; - bool isSyscat = false; if (bRotateDest) { @@ -2157,15 +2157,7 @@ struct ReadThread isSyscat = bpps->isSysCat(); } FairThreadPool::Job job(uniqueID, stepID, txnId, functor, outIos, weight, priority, id); - - if (isSyscat) - { - OOBPool->addJob(job); - } - else - { - procPoolPtr->addJob(job); - } + procPoolPtr->addJob(job); break; }