NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitb283096

committed

Allow the delay in psql's \watch command to be a fractional second.

Instead of just "2" seconds, allow eg. "2.5" seconds. Per requestfrom Alvaro Herrera. No docs change since the docs didn't say youcouldn't do this already.

1 parentdea2b59 commitb283096Copy full SHA for b283096

File tree

1 file changed

+15

-10

lines changed

src/bin/psql
- command.c

1 file changed

+15

-10

lines changed

`‎src/bin/psql/command.c`

Lines changed: 15 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ static bool do_edit(const char *filename_arg, PQExpBuffer query_buf,`
`66`	`66`	`intlineno,bool*edited);`
`67`	`67`	`staticbooldo_connect(chardbname,charuser,charhost,charport);`
`68`	`68`	`staticbooldo_shell(constchar*command);`
`69`		`-staticbooldo_watch(PQExpBufferquery_buf,longsleep);`
	`69`	`+staticbooldo_watch(PQExpBufferquery_buf,doublesleep);`
`70`	`70`	`staticboollookup_object_oid(EditableObjectTypeobj_type,constchar*desc,`
`71`	`71`	`Oid*obj_oid);`
`72`	`72`	`staticboolget_create_object_cmd(EditableObjectTypeobj_type,Oidoid,`
`@@ -1577,12 +1577,12 @@ exec_command(const char *cmd,`
`1577`	`1577`	`{`
`1578`	`1578`	`char*opt=psql_scan_slash_option(scan_state,`
`1579`	`1579`	`OT_NORMAL,NULL, true);`
`1580`		`-longsleep=2;`
	`1580`	`+doublesleep=2;`
`1581`	`1581`
`1582`	`1582`	`/* Convert optional sleep-length argument */`
`1583`	`1583`	`if (opt)`
`1584`	`1584`	`{`
`1585`		`-sleep=strtol(opt,NULL,10);`
	`1585`	`+sleep=strtod(opt,NULL);`
`1586`	`1586`	`if (sleep <=0)`
`1587`	`1587`	`sleep=1;`
`1588`	`1588`	`free(opt);`
`@@ -3017,8 +3017,9 @@ do_shell(const char *command)`
`3017`	`3017`	`* onto a bunch of exec_command's variables to silence stupider compilers.`
`3018`	`3018`	`*/`
`3019`	`3019`	`staticbool`
`3020`		`-do_watch(PQExpBufferquery_buf,longsleep)`
	`3020`	`+do_watch(PQExpBufferquery_buf,doublesleep)`
`3021`	`3021`	`{`
	`3022`	`+longsleep_ms= (long) (sleep*1000);`
`3022`	`3023`	`printQueryOptmyopt=pset.popt;`
`3023`	`3024`	`constchar*user_title;`
`3024`	`3025`	`char*title;`
`@@ -3064,10 +3065,10 @@ do_watch(PQExpBuffer query_buf, long sleep)`
`3064`	`3065`	`asctimebuf[i]='\0';`
`3065`	`3066`
`3066`	`3067`	`if (user_title)`
`3067`		`-snprintf(title,title_len,_("%s\t%s (every %lds)\n"),`
	`3068`	`+snprintf(title,title_len,_("%s\t%s (every %gs)\n"),`
`3068`	`3069`	`user_title,asctimebuf,sleep);`
`3069`	`3070`	`else`
`3070`		`-snprintf(title,title_len,_("%s (every %lds)\n"),`
	`3071`	`+snprintf(title,title_len,_("%s (every %gs)\n"),`
`3071`	`3072`	`asctimebuf,sleep);`
`3072`	`3073`	`myopt.title=title;`
`3073`	`3074`
`@@ -3091,15 +3092,19 @@ do_watch(PQExpBuffer query_buf, long sleep)`
`3091`	`3092`
`3092`	`3093`	`/*`
`3093`	`3094`	`* Enable 'watch' cancellations and wait a while before running the`
`3094`		`- * query again. Break the sleep into short intervalssince pg_usleep`
`3095`		`- * isn't interruptible on some platforms.`
	`3095`	`+ * query again. Break the sleep into short intervals(at most 1s)`
	`3096`	`+ *since pg_usleepisn't interruptible on some platforms.`
`3096`	`3097`	`*/`
`3097`	`3098`	`sigint_interrupt_enabled= true;`
`3098`		`-for (i=0;i<sleep;i++)`
	`3099`	`+i=sleep_ms;`
	`3100`	`+while (i>0)`
`3099`	`3101`	`{`
`3100`		`-pg_usleep(1000000L);`
	`3102`	`+longs=Min(i,1000L);`
	`3103`	`+`
	`3104`	`+pg_usleep(s*1000L);`
`3101`	`3105`	`if (cancel_pressed)`
`3102`	`3106`	`break;`
	`3107`	`+i-=s;`
`3103`	`3108`	`}`
`3104`	`3109`	`sigint_interrupt_enabled= false;`
`3105`	`3110`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb283096

File tree

1 file changed

1 file changed

`‎src/bin/psql/command.c`

0 commit comments