mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor formatting cleanup for 2a6368343f

Browse Source
This commit is contained in:
Alexander Korotkov 2018-09-27 23:29:50 +03:00
parent 0f64595894
commit 4ec90f53f1
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/access/spgist/spgkdtreeproc.c
View File

@ -317,16 +317,14 @@ spg_kd_inner_consistent(PG_FUNCTION_ARGS)
if (in->norderbys > 0) if (in->norderbys > 0)
{ {
MemoryContext oldCtx = MemoryContextSwitchTo( MemoryContext oldCtx = MemoryContextSwitchTo(in->traversalMemoryContext);
in->traversalMemoryContext);
BOX *box = box_copy(&bboxes[i - 1]); BOX *box = box_copy(&bboxes[i - 1]);
MemoryContextSwitchTo(oldCtx); MemoryContextSwitchTo(oldCtx);
out->traversalValues[out->nNodes] = box; out->traversalValues[out->nNodes] = box;
out->distances[out->nNodes] = spg_key_orderbys_distances( out->distances[out->nNodes] = spg_key_orderbys_distances(BoxPGetDatum(box), false,
BoxPGetDatum(box), false,
in->orderbys, in->norderbys); in->orderbys, in->norderbys);
} }

12
src/backend/access/spgist/spgquadtreeproc.c
View File

@ -278,8 +278,7 @@ spg_quad_inner_consistent(PG_FUNCTION_ARGS)
if (in->norderbys > 0) if (in->norderbys > 0)
{ {
MemoryContext oldCtx = MemoryContextSwitchTo( MemoryContext oldCtx = MemoryContextSwitchTo(in->traversalMemoryContext);
in->traversalMemoryContext);
/* Use parent quadrant box as traversalValue */ /* Use parent quadrant box as traversalValue */
BOX *quadrant = box_copy(bbox); BOX *quadrant = box_copy(bbox);
@ -287,8 +286,7 @@ spg_quad_inner_consistent(PG_FUNCTION_ARGS)
MemoryContextSwitchTo(oldCtx); MemoryContextSwitchTo(oldCtx);
out->traversalValues[i] = quadrant; out->traversalValues[i] = quadrant;
out->distances[i] = spg_key_orderbys_distances( out->distances[i] = spg_key_orderbys_distances(BoxPGetDatum(quadrant), false,
BoxPGetDatum(quadrant), false,
in->orderbys, in->norderbys); in->orderbys, in->norderbys);
} }
} }
@ -385,16 +383,14 @@ spg_quad_inner_consistent(PG_FUNCTION_ARGS)
if (in->norderbys > 0) if (in->norderbys > 0)
{ {
MemoryContext oldCtx = MemoryContextSwitchTo( MemoryContext oldCtx = MemoryContextSwitchTo(in->traversalMemoryContext);
in->traversalMemoryContext);
BOX *quadrant = getQuadrantArea(bbox, centroid, i); BOX *quadrant = getQuadrantArea(bbox, centroid, i);
MemoryContextSwitchTo(oldCtx); MemoryContextSwitchTo(oldCtx);
out->traversalValues[out->nNodes] = quadrant; out->traversalValues[out->nNodes] = quadrant;
out->distances[out->nNodes] = spg_key_orderbys_distances( out->distances[out->nNodes] = spg_key_orderbys_distances(BoxPGetDatum(quadrant), false,
BoxPGetDatum(quadrant), false,
in->orderbys, in->norderbys); in->orderbys, in->norderbys);
} }