Commit 66c4031

committed

Merge branch 'pgexplain-scan-direction' into 'master'

fix: do not lose scan direction when rendering EXPLAIN plan in textual format See merge request postgres-ai/joe!174

2 parents 9627741 + 6fbcae5 commit 66c4031Copy full SHA for 66c4031

File tree

+19

-3

lines changed

+19

-3

lines changed

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,9 @@ func writePlanTextNodeCaption(outputFn func(string, ...interface{}) (int, error)`
`619`	`619`	`parallel = "Parallel "`
`620`	`620`	`}`
`621`	`621`
`622`		`- outputFn("%s%v%s%s%s", parallel, nodeType, using, on, costsAndTiming)`
	`622`	`+ details := formatDetails(plan)`
	`623`	`+`
	`624`	`+ _, _ = outputFn("%s%v%s%s%s%s", parallel, nodeType, details, using, on, costsAndTiming)`
`623`	`625`	`}`
`624`	`626`
`625`	`627`	`func writePlanTextNodeDetails(outputFn func(string, ...interface{}) (int, error), plan *Plan) {`
`@@ -741,3 +743,17 @@ func writePlanTextNodeDetails(outputFn func(string, ...interface{}) (int, error)`
`741`	`743`	`outputFn("I/O Timings:%s", ioTiming)`
`742`	`744`	`}`
`743`	`745`	`}`
	`746`	`+`
	`747`	`+func formatDetails(plan *Plan) string {`
	`748`	`+ var details []string`
	`749`	`+`
	`750`	`+ if plan.ScanDirection != "" && plan.ScanDirection != "Forward" {`
	`751`	`+ details = append(details, plan.ScanDirection)`
	`752`	`+ }`
	`753`	`+`
	`754`	`+ if len(details) > 0 {`
	`755`	`+ return fmt.Sprintf(" %v", strings.Join(details, ", "))`
	`756`	`+ }`
	`757`	`+`
	`758`	`+ return ""`
	`759`	`+}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -1309,7 +1309,7 @@ const InputJSON2 = `[
`1309`	`1309`	`"Node Type": "Index Only Scan",`
`1310`	`1310`	`"Parent Relationship": "Outer",`
`1311`	`1311`	`"Parallel Aware": false,`
`1312`		`- "Scan Direction": "Forward",`
	`1312`	`+ "Scan Direction": "Backward",`
`1313`	`1313`	`"Index Name": "i_user_col",`
`1314`	`1314`	`"Relation Name": "table_1",`
`1315`	`1315`	`"Alias": "table_1",`
@@ -1346,7 +1346,7 @@ const InputJSON2 = `[
`1346`	`1346`
`1347`	`1347`	const ExpectedText2 = ` Limit (cost=0.43..8.45 rows=1 width=22) (actual time=0.026..0.035 rows=1 loops=1)
`1348`	`1348`	`Buffers: shared hit=4`
`1349`		`- -> Index Only Scan using i_user_col on table_1 (cost=0.43..8.45 rows=1 width=22) (actual time=0.021..0.026 rows=1 loops=1)`
	`1349`	`+ -> Index Only Scan Backward using i_user_col on table_1 (cost=0.43..8.45 rows=1 width=22) (actual time=0.021..0.026 rows=1 loops=1)`
`1350`	`1350`	`Index Cond: (col = 'xxxx'::text)`
`1351`	`1351`	`Heap Fetches: 0`
`1352`	`1352`	`Buffers: shared hit=4`

Comments

(0)