external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Columnar: do not bother building unnecessary RestrictInfo. (#4852) 

Co-authored-by: Jeff Davis <jefdavi@microsoft.com>
pull/4848/head
jeff-davis 2021-03-24 16:05:08 -07:00 committed by GitHub
parent c01507a91b
commit 248c6cb91a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/backend/columnar/columnar_reader.c
View File

@ -30,7 +30,6 @@
#include "optimizer/clauses.h" #include "optimizer/clauses.h"
#include "optimizer/predtest.h" #include "optimizer/predtest.h"
#endif #endif
#include "optimizer/restrictinfo.h"
#include "storage/fd.h" #include "storage/fd.h"
#include "utils/guc.h" #include "utils/guc.h"
#include "utils/memutils.h" #include "utils/memutils.h"
@ -115,7 +114,6 @@ static ColumnBuffers * LoadColumnBuffers(Relation relation,
static bool * SelectedChunkMask(StripeSkipList *stripeSkipList, static bool * SelectedChunkMask(StripeSkipList *stripeSkipList,
List *projectedColumnList, List *whereClauseList, List *projectedColumnList, List *whereClauseList,
int64 *chunkGroupsFiltered); int64 *chunkGroupsFiltered);
static List * BuildRestrictInfoList(List *whereClauseList);
static Node * BuildBaseConstraint(Var *variable); static Node * BuildBaseConstraint(Var *variable);
static OpExpr * MakeOpExpression(Var *variable, int16 strategyNumber); static OpExpr * MakeOpExpression(Var *variable, int16 strategyNumber);
static Oid GetOperatorByType(Oid typeId, Oid accessMethodId, int16 strategyNumber); static Oid GetOperatorByType(Oid typeId, Oid accessMethodId, int16 strategyNumber);
@ -656,7 +654,6 @@ SelectedChunkMask(StripeSkipList *stripeSkipList, List *projectedColumnList,
{ {
ListCell *columnCell = NULL; ListCell *columnCell = NULL;
uint32 chunkIndex = 0; uint32 chunkIndex = 0;
List *restrictInfoList = BuildRestrictInfoList(whereClauseList);
bool *selectedChunkMask = palloc0(stripeSkipList->chunkCount * sizeof(bool)); bool *selectedChunkMask = palloc0(stripeSkipList->chunkCount * sizeof(bool));
memset(selectedChunkMask, true, stripeSkipList->chunkCount * sizeof(bool)); memset(selectedChunkMask, true, stripeSkipList->chunkCount * sizeof(bool));
@ -696,7 +693,7 @@ SelectedChunkMask(StripeSkipList *stripeSkipList, List *projectedColumnList,
List *constraintList = list_make1(baseConstraint); List *constraintList = list_make1(baseConstraint);
bool predicateRefuted = bool predicateRefuted =
predicate_refuted_by(constraintList, restrictInfoList, false); predicate_refuted_by(constraintList, whereClauseList, false);
if (predicateRefuted && selectedChunkMask[chunkIndex]) if (predicateRefuted && selectedChunkMask[chunkIndex])
{ {
selectedChunkMask[chunkIndex] = false; selectedChunkMask[chunkIndex] = false;
@ -746,29 +743,6 @@ GetFunctionInfoOrNull(Oid typeId, Oid accessMethodId, int16 procedureId)
} }
/*
* BuildRestrictInfoList builds restrict info list using the selection criteria,
* and then return this list. The function is copied from CitusDB's shard pruning
* logic.
*/
static List *
BuildRestrictInfoList(List *whereClauseList)
{
List *restrictInfoList = NIL;
ListCell *qualCell = NULL;
foreach(qualCell, whereClauseList)
{
Node *qualNode = (Node *) lfirst(qualCell);
RestrictInfo *restrictInfo = make_simple_restrictinfo((Expr *) qualNode);
restrictInfoList = lappend(restrictInfoList, restrictInfo);
}
return restrictInfoList;
}
/* /*
* BuildBaseConstraint builds and returns a base constraint. This constraint * BuildBaseConstraint builds and returns a base constraint. This constraint
* implements an expression in the form of (var <= max && var >= min), where * implements an expression in the form of (var <= max && var >= min), where