Commit4405ce7

Ekaterina Sokolova

committed

Fix progress calculation for the Filter node.

1 parent8ad70f8 commit4405ce7Copy full SHA for 4405ce7

File tree

-12

lines changed

-12

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# contrib/pg_query_state/Makefile`
`3`	`3`
`4`	`4`	`MODULE_big = pg_query_state`
`5`		`-OBJS = pg_query_state.o signal_handler.oprogress_bar.o$(WIN32RES)`
	`5`	`+OBJS = pg_query_state.o signal_handler.o$(WIN32RES)`
`6`	`6`	`EXTENSION = pg_query_state`
`7`	`7`	`EXTVERSION = 1.1`
`8`	`8`	`DATA = pg_query_state--1.0--1.1.sql`

Lines changed: 7 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1280,24 +1280,20 @@ CountProgress(char *plan_text)`
`1280`	`1280`	`{`
`1281`	`1281`	`if ((rows=strstr(node,"Rows Removed by Filter"))!=NULL)`
`1282`	`1282`	`{`
	`1283`	`+node_amount++;`
	`1284`	`+rows= (char) (rows+strlen("Rows Removed by Filter\": ")sizeof(char));`
	`1285`	`+`
`1283`	`1286`	`/*`
`1284`	`1287`	`* Filter node have 2 conditions:`
`1285`	`1288`	`* 1) Was not filtered (current progress = 0)`
`1286`	`1289`	`* 2) Was filtered (current progress = 1)`
`1287`	`1290`	`*/`
`1288`		`-node_amount++;`
`1289`		`-plan_rows=1;`
`1290`		`-rows= (char) (rows+strlen("Rows Removed by Filter\": ")sizeof(char));`
`1291`		`-if (rows[0]=='0')`
`1292`		`-actual_rows=0;`
`1293`		`-else`
`1294`		`-actual_rows=1;`
`1295`		`-}elseif ((rows=strstr(node,"\"Actual Rows\": "))!=NULL)`
	`1291`	`+if (rows[0]!='0')`
	`1292`	`+progress+=1;`
	`1293`	`+}`
	`1294`	`+elseif ((rows=strstr(node,"\"Actual Rows\": "))!=NULL)`
`1296`	`1295`	`{`
`1297`	`1296`	`node_amount++;`
`1298`		`-actual_rows=0;`
`1299`		`-plan_rows=0;`
`1300`		`-`
`1301`	`1297`	`rows= (char) (rows+strlen("\"Actual Rows\": ")sizeof(char));`
`1302`	`1298`	`len=strstr(rows,"\n")-rows;`
`1303`	`1299`	`if ((strstr(rows,",")-rows)<len)`

Comments

(0)