From 4ec90f53f10141867d8b86f58d72990a13ff267b Mon Sep 17 00:00:00 2001 From: Alexander Korotkov Date: Thu, 27 Sep 2018 23:29:50 +0300 Subject: [PATCH] Minor formatting cleanup for 2a6368343f --- src/backend/access/spgist/spgkdtreeproc.c | 6 ++---- src/backend/access/spgist/spgquadtreeproc.c | 12 ++++-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/backend/access/spgist/spgkdtreeproc.c b/src/backend/access/spgist/spgkdtreeproc.c index 105fc72c7a2..41d2b9cac9a 100644 --- a/src/backend/access/spgist/spgkdtreeproc.c +++ b/src/backend/access/spgist/spgkdtreeproc.c @@ -317,16 +317,14 @@ spg_kd_inner_consistent(PG_FUNCTION_ARGS) if (in->norderbys > 0) { - MemoryContext oldCtx = MemoryContextSwitchTo( - in->traversalMemoryContext); + MemoryContext oldCtx = MemoryContextSwitchTo(in->traversalMemoryContext); BOX *box = box_copy(&bboxes[i - 1]); MemoryContextSwitchTo(oldCtx); out->traversalValues[out->nNodes] = box; - out->distances[out->nNodes] = spg_key_orderbys_distances( - BoxPGetDatum(box), false, + out->distances[out->nNodes] = spg_key_orderbys_distances(BoxPGetDatum(box), false, in->orderbys, in->norderbys); } diff --git a/src/backend/access/spgist/spgquadtreeproc.c b/src/backend/access/spgist/spgquadtreeproc.c index 90cc7768994..4e175d2664e 100644 --- a/src/backend/access/spgist/spgquadtreeproc.c +++ b/src/backend/access/spgist/spgquadtreeproc.c @@ -278,8 +278,7 @@ spg_quad_inner_consistent(PG_FUNCTION_ARGS) if (in->norderbys > 0) { - MemoryContext oldCtx = MemoryContextSwitchTo( - in->traversalMemoryContext); + MemoryContext oldCtx = MemoryContextSwitchTo(in->traversalMemoryContext); /* Use parent quadrant box as traversalValue */ BOX *quadrant = box_copy(bbox); @@ -287,8 +286,7 @@ spg_quad_inner_consistent(PG_FUNCTION_ARGS) MemoryContextSwitchTo(oldCtx); out->traversalValues[i] = quadrant; - out->distances[i] = spg_key_orderbys_distances( - BoxPGetDatum(quadrant), false, + out->distances[i] = spg_key_orderbys_distances(BoxPGetDatum(quadrant), false, in->orderbys, in->norderbys); } } @@ -385,16 +383,14 @@ spg_quad_inner_consistent(PG_FUNCTION_ARGS) if (in->norderbys > 0) { - MemoryContext oldCtx = MemoryContextSwitchTo( - in->traversalMemoryContext); + MemoryContext oldCtx = MemoryContextSwitchTo(in->traversalMemoryContext); BOX *quadrant = getQuadrantArea(bbox, centroid, i); MemoryContextSwitchTo(oldCtx); out->traversalValues[out->nNodes] = quadrant; - out->distances[out->nNodes] = spg_key_orderbys_distances( - BoxPGetDatum(quadrant), false, + out->distances[out->nNodes] = spg_key_orderbys_distances(BoxPGetDatum(quadrant), false, in->orderbys, in->norderbys); }