Minor formatting cleanup for 2a63683

akorotkov · akorotkov · commit 4ec90f53f101 · 2018-09-27T23:29:50.000+03:00
diff --git 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
@@ -278,17 +278,15 @@ 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);
 
 				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);
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -317,16 +317,14 @@ spg_kd_inner_consistent(PG_FUNCTION_ARGS)`
`317`	`317`
`318`	`318`	`if (in->norderbys > 0)`
`319`	`319`	`{`
`320`		`- MemoryContext oldCtx = MemoryContextSwitchTo(`
`321`		`- in->traversalMemoryContext);`
	`320`	`+ MemoryContext oldCtx = MemoryContextSwitchTo(in->traversalMemoryContext);`
`322`	`321`	`BOX *box = box_copy(&bboxes[i - 1]);`
`323`	`322`
`324`	`323`	`MemoryContextSwitchTo(oldCtx);`
`325`	`324`
`326`	`325`	`out->traversalValues[out->nNodes] = box;`
`327`	`326`
`328`		`- out->distances[out->nNodes] = spg_key_orderbys_distances(`
`329`		`- BoxPGetDatum(box), false,`
	`327`	`+ out->distances[out->nNodes] = spg_key_orderbys_distances(BoxPGetDatum(box), false,`
`330`	`328`	`in->orderbys, in->norderbys);`
`331`	`329`	`}`
`332`	`330`
Original file line number	Diff line number	Diff line change
`@@ -278,17 +278,15 @@ spg_quad_inner_consistent(PG_FUNCTION_ARGS)`
`278`	`278`
`279`	`279`	`if (in->norderbys > 0)`
`280`	`280`	`{`
`281`		`- MemoryContext oldCtx = MemoryContextSwitchTo(`
`282`		`- in->traversalMemoryContext);`
	`281`	`+ MemoryContext oldCtx = MemoryContextSwitchTo(in->traversalMemoryContext);`
`283`	`282`
`284`	`283`	`/* Use parent quadrant box as traversalValue */`
`285`	`284`	`BOX *quadrant = box_copy(bbox);`
`286`	`285`
`287`	`286`	`MemoryContextSwitchTo(oldCtx);`
`288`	`287`
`289`	`288`	`out->traversalValues[i] = quadrant;`
`290`		`- out->distances[i] = spg_key_orderbys_distances(`
`291`		`- BoxPGetDatum(quadrant), false,`
	`289`	`+ out->distances[i] = spg_key_orderbys_distances(BoxPGetDatum(quadrant), false,`
`292`	`290`	`in->orderbys, in->norderbys);`
`293`	`291`	`}`
`294`	`292`	`}`
`@@ -385,16 +383,14 @@ spg_quad_inner_consistent(PG_FUNCTION_ARGS)`
`385`	`383`
`386`	`384`	`if (in->norderbys > 0)`
`387`	`385`	`{`
`388`		`- MemoryContext oldCtx = MemoryContextSwitchTo(`
`389`		`- in->traversalMemoryContext);`
	`386`	`+ MemoryContext oldCtx = MemoryContextSwitchTo(in->traversalMemoryContext);`
`390`	`387`	`BOX *quadrant = getQuadrantArea(bbox, centroid, i);`
`391`	`388`
`392`	`389`	`MemoryContextSwitchTo(oldCtx);`
`393`	`390`
`394`	`391`	`out->traversalValues[out->nNodes] = quadrant;`
`395`	`392`
`396`		`- out->distances[out->nNodes] = spg_key_orderbys_distances(`
`397`		`- BoxPGetDatum(quadrant), false,`
	`393`	`+ out->distances[out->nNodes] = spg_key_orderbys_distances(BoxPGetDatum(quadrant), false,`
`398`	`394`	`in->orderbys, in->norderbys);`
`399`	`395`	`}`
`400`	`396`