database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Remove redundant has_null member from PartitionBoundInfoData.

Browse Source 
Jeevan Ladhe, with some changes by me.

Discussion: http://postgr.es/m/CAOgcT0NZ_30-pjBpW2OgneV1ammArHkZDZ8B_KFC3q+_Xb2H9A@mail.gmail.com
This commit is contained in:
Robert Haas 2017-05-17 12:48:16 -04:00
parent 3db22794b7
commit 236d6d462d
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/backend/catalog/partition.c
View File

@ -53,7 +53,7 @@
* Information about bounds of a partitioned relation * Information about bounds of a partitioned relation
* *
* A list partition datum that is known to be NULL is never put into the * A list partition datum that is known to be NULL is never put into the
* datums array. Instead, it is tracked using has_null and null_index fields. * datums array. Instead, it is tracked using the null_index field.
* *
* In the case of range partitioning, ndatums will typically be far less than * In the case of range partitioning, ndatums will typically be far less than
* 2 * nparts, because a partition's upper bound and the next partition's lower * 2 * nparts, because a partition's upper bound and the next partition's lower
@ -86,12 +86,12 @@ typedef struct PartitionBoundInfoData
int *indexes; /* Partition indexes; one entry per member of int *indexes; /* Partition indexes; one entry per member of
* the datums array (plus one if range * the datums array (plus one if range
* partitioned table) */ * partitioned table) */
bool has_null; /* Is there a null-accepting partition? false
* for range partitioned tables */
int null_index; /* Index of the null-accepting partition; -1 int null_index; /* Index of the null-accepting partition; -1
* for range partitioned tables */ * if there isn't one */
} PartitionBoundInfoData; } PartitionBoundInfoData;
#define partition_bound_accepts_nulls(bi) ((bi)->null_index != -1)
/* /*
* When qsort'ing partition bounds after reading from the catalog, each bound * When qsort'ing partition bounds after reading from the catalog, each bound
* is represented with one of the following structs. * is represented with one of the following structs.
@ -173,7 +173,6 @@ RelationBuildPartitionDesc(Relation rel)
/* List partitioning specific */ /* List partitioning specific */
PartitionListValue **all_values = NULL; PartitionListValue **all_values = NULL;
bool found_null = false;
int null_index = -1; int null_index = -1;
/* Range partitioning specific */ /* Range partitioning specific */
@ -245,7 +244,6 @@ RelationBuildPartitionDesc(Relation rel)
* Create a unified list of non-null values across all partitions. * Create a unified list of non-null values across all partitions.
*/ */
i = 0; i = 0;
found_null = false;
null_index = -1; null_index = -1;
foreach(cell, boundspecs) foreach(cell, boundspecs)
{ {
@ -274,9 +272,8 @@ RelationBuildPartitionDesc(Relation rel)
* instead for the code further down below where we * instead for the code further down below where we
* construct the actual relcache struct. * construct the actual relcache struct.
*/ */
if (found_null) if (null_index != -1)
elog(ERROR, "found null more than once"); elog(ERROR, "found null more than once");
found_null = true;
null_index = i; null_index = i;
} }
@ -466,7 +463,6 @@ RelationBuildPartitionDesc(Relation rel)
{ {
case PARTITION_STRATEGY_LIST: case PARTITION_STRATEGY_LIST:
{ {
boundinfo->has_null = found_null;
boundinfo->indexes = (int *) palloc(ndatums * sizeof(int)); boundinfo->indexes = (int *) palloc(ndatums * sizeof(int));
/* /*
@ -498,20 +494,18 @@ RelationBuildPartitionDesc(Relation rel)
* accepts only null and hence not covered in the above * accepts only null and hence not covered in the above
* loop which only handled non-null values. * loop which only handled non-null values.
*/ */
if (found_null) if (null_index != -1)
{ {
Assert(null_index >= 0); Assert(null_index >= 0);
if (mapping[null_index] == -1) if (mapping[null_index] == -1)
mapping[null_index] = next_index++; mapping[null_index] = next_index++;
boundinfo->null_index = mapping[null_index];
} }
else
boundinfo->null_index = -1;
/* All partition must now have a valid mapping */ /* All partition must now have a valid mapping */
Assert(next_index == nparts); Assert(next_index == nparts);
if (found_null)
boundinfo->null_index = mapping[null_index];
else
boundinfo->null_index = -1;
break; break;
} }
@ -611,9 +605,6 @@ partition_bounds_equal(PartitionKey key,
if (b1->ndatums != b2->ndatums) if (b1->ndatums != b2->ndatums)
return false; return false;
if (b1->has_null != b2->has_null)
return false;
if (b1->null_index != b2->null_index) if (b1->null_index != b2->null_index)
return false; return false;
@ -696,7 +687,8 @@ check_new_partition_bound(char *relname, Relation parent, Node *bound)
Assert(boundinfo && Assert(boundinfo &&
boundinfo->strategy == PARTITION_STRATEGY_LIST && boundinfo->strategy == PARTITION_STRATEGY_LIST &&
(boundinfo->ndatums > 0 || boundinfo->has_null)); (boundinfo->ndatums > 0 ||
partition_bound_accepts_nulls(boundinfo)));
foreach(cell, spec->listdatums) foreach(cell, spec->listdatums)
{ {
@ -717,7 +709,7 @@ check_new_partition_bound(char *relname, Relation parent, Node *bound)
break; break;
} }
} }
else if (boundinfo->has_null) else if (partition_bound_accepts_nulls(boundinfo))
{ {
overlap = true; overlap = true;
with = boundinfo->null_index; with = boundinfo->null_index;
@ -1985,7 +1977,7 @@ get_partition_for_tuple(PartitionDispatch *pd,
* partition exists. * partition exists.
*/ */
cur_index = -1; cur_index = -1;
if (isnull[0] && partdesc->boundinfo->has_null) if (isnull[0] && partition_bound_accepts_nulls(partdesc->boundinfo))
cur_index = partdesc->boundinfo->null_index; cur_index = partdesc->boundinfo->null_index;
else if (!isnull[0]) else if (!isnull[0])
{ {