fix: remove allow_forbid_func define
This commit is contained in:
parent
ac531c6d7f
commit
1ba1fbfabc
|
@ -12,7 +12,6 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#define ALLOW_FORBID_FUNC
|
|
||||||
|
|
||||||
#include "executorInt.h"
|
#include "executorInt.h"
|
||||||
#include "filter.h"
|
#include "filter.h"
|
||||||
|
@ -3228,6 +3227,7 @@ static int32_t tableMergeScanDoSkipTable(STableMergeScanInfo* pInfo, SSDataBlock
|
||||||
tSimpleHashPut(pInfo->mTableNumRows, &pBlock->info.id.uid, sizeof(pBlock->info.id.uid), &nRows, sizeof(nRows));
|
tSimpleHashPut(pInfo->mTableNumRows, &pBlock->info.id.uid, sizeof(pBlock->info.id.uid), &nRows, sizeof(nRows));
|
||||||
} else {
|
} else {
|
||||||
*(int64_t*)pNum = *(int64_t*)pNum + pBlock->info.rows;
|
*(int64_t*)pNum = *(int64_t*)pNum + pBlock->info.rows;
|
||||||
|
nRows = *(int64_t*)pNum;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nRows >= pInfo->mergeLimit) {
|
if (nRows >= pInfo->mergeLimit) {
|
||||||
|
|
Loading…
Reference in New Issue