Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc3e3844

Browse files
committed
Make psql's \set display variables in alphabetical order.
"\set" with no arguments displays all defined variables, but it does soin the order that they appear in variables.c's list, which previouslywas mostly creation order. That makes the list ugly and hard to findthings in, and it exposes some psql implementation details to users.(For instance, ordinary variables will move to the bottom of the listif unset and set again, but variables that have hooks won't.)Fix that by keeping the list in alphabetical order at all times, whichisn't much more complicated than breaking out of the insertion searchloops once we reach an entry that should be after the one to be inserted.Discussion:https://postgr.es/m/31785.1485900786@sss.pgh.pa.us
1 parent86322dc commitc3e3844

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

‎src/bin/psql/variables.c

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ valid_variable_name(const char *name)
4343
/*
4444
* A "variable space" is represented by an otherwise-unused struct _variable
4545
* that serves as list header.
46+
*
47+
* The list entries are kept in name order (according to strcmp). This
48+
* is mainly to make the results of PrintVariables() more pleasing.
4649
*/
4750
VariableSpace
4851
CreateVariableSpace(void)
@@ -74,11 +77,15 @@ GetVariable(VariableSpace space, const char *name)
7477

7578
for (current=space->next;current;current=current->next)
7679
{
77-
if (strcmp(current->name,name)==0)
80+
intcmp=strcmp(current->name,name);
81+
82+
if (cmp==0)
7883
{
7984
/* this is correct answer when value is NULL, too */
8085
returncurrent->value;
8186
}
87+
if (cmp>0)
88+
break;/* it's not there */
8289
}
8390

8491
returnNULL;
@@ -247,7 +254,9 @@ SetVariable(VariableSpace space, const char *name, const char *value)
247254
current;
248255
previous=current,current=current->next)
249256
{
250-
if (strcmp(current->name,name)==0)
257+
intcmp=strcmp(current->name,name);
258+
259+
if (cmp==0)
251260
{
252261
/*
253262
* Found entry, so update, unless assign hook returns false.
@@ -293,6 +302,8 @@ SetVariable(VariableSpace space, const char *name, const char *value)
293302

294303
returnconfirmed;
295304
}
305+
if (cmp>0)
306+
break;/* it's not there */
296307
}
297308

298309
/* not present, make new entry ... unless we were asked to delete */
@@ -303,7 +314,7 @@ SetVariable(VariableSpace space, const char *name, const char *value)
303314
current->value=pg_strdup(value);
304315
current->substitute_hook=NULL;
305316
current->assign_hook=NULL;
306-
current->next=NULL;
317+
current->next=previous->next;
307318
previous->next=current;
308319
}
309320
return true;
@@ -343,7 +354,9 @@ SetVariableHooks(VariableSpace space, const char *name,
343354
current;
344355
previous=current,current=current->next)
345356
{
346-
if (strcmp(current->name,name)==0)
357+
intcmp=strcmp(current->name,name);
358+
359+
if (cmp==0)
347360
{
348361
/* found entry, so update */
349362
current->substitute_hook=shook;
@@ -354,6 +367,8 @@ SetVariableHooks(VariableSpace space, const char *name,
354367
(void) (*ahook) (current->value);
355368
return;
356369
}
370+
if (cmp>0)
371+
break;/* it's not there */
357372
}
358373

359374
/* not present, make new entry */
@@ -362,7 +377,7 @@ SetVariableHooks(VariableSpace space, const char *name,
362377
current->value=NULL;
363378
current->substitute_hook=shook;
364379
current->assign_hook=ahook;
365-
current->next=NULL;
380+
current->next=previous->next;
366381
previous->next=current;
367382
if (shook)
368383
current->value= (*shook) (current->value);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp