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

Commitdffc6c8

Browse files
committed
Back-patch fix for extraction of fixed prefixes from regular expressions.
Back-patch of commits628cbb5 andc6aae30. This has been broken since7.3, so back-patch to all supported branches.
1 parent647ae3c commitdffc6c8

File tree

11 files changed

+421
-188
lines changed

11 files changed

+421
-188
lines changed

‎src/backend/regex/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ subdir = src/backend/regex
1212
top_builddir = ../../..
1313
include$(top_builddir)/src/Makefile.global
1414

15-
OBJS = regcomp.o regerror.o regexec.o regfree.o
15+
OBJS = regcomp.o regerror.o regexec.o regfree.o regprefix.o
1616

1717
include$(top_srcdir)/src/backend/common.mk
1818

‎src/backend/regex/regc_color.c‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ initcm(struct vars * v,
6666
cd=cm->cd;/* cm->cd[WHITE] */
6767
cd->sub=NOSUB;
6868
cd->arcs=NULL;
69-
cd->flags=0;
69+
cd->firstchr=CHR_MIN;
7070
cd->nchrs=CHR_MAX-CHR_MIN+1;
71+
cd->flags=0;
7172

7273
/* upper levels of tree */
7374
for (t=&cm->tree[0],j=NBYTS-1;j>0;t=nextt,j--)
@@ -272,6 +273,7 @@ newcolor(struct colormap * cm)
272273
cd->nchrs=0;
273274
cd->sub=NOSUB;
274275
cd->arcs=NULL;
276+
cd->firstchr=CHR_MIN;/* in case never set otherwise */
275277
cd->flags=0;
276278
cd->block=NULL;
277279

@@ -371,6 +373,8 @@ subcolor(struct colormap * cm, chr c)
371373
if (co==sco)/* already in an open subcolor */
372374
returnco;/* rest is redundant */
373375
cm->cd[co].nchrs--;
376+
if (cm->cd[sco].nchrs==0)
377+
cm->cd[sco].firstchr=c;
374378
cm->cd[sco].nchrs++;
375379
setcolor(cm,c,sco);
376380
returnsco;
@@ -438,6 +442,11 @@ subrange(struct vars * v,
438442

439443
/*
440444
* subblock - allocate new subcolors for one tree block of chrs, fill in arcs
445+
*
446+
* Note: subcolors that are created during execution of this function
447+
* will not be given a useful value of firstchr; it'll be left as CHR_MIN.
448+
* For the current usage of firstchr in pg_regprefix, this does not matter
449+
* because such subcolors won't occur in the common prefix of a regex.
441450
*/
442451
staticvoid
443452
subblock(structvars*v,

‎src/backend/regex/regc_nfa.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,14 +1330,16 @@ compact(struct nfa * nfa,
13301330
for (s=nfa->states;s!=NULL;s=s->next)
13311331
{
13321332
nstates++;
1333-
narcs+=1+s->nouts+1;
1334-
/* 1 as a fake for flags, nouts for arcs, 1 as endmarker */
1333+
narcs+=s->nouts+1;/* need one extra for endmarker */
13351334
}
13361335

1336+
cnfa->stflags= (char*)MALLOC(nstates*sizeof(char));
13371337
cnfa->states= (structcarc**)MALLOC(nstates*sizeof(structcarc*));
13381338
cnfa->arcs= (structcarc*)MALLOC(narcs*sizeof(structcarc));
1339-
if (cnfa->states==NULL||cnfa->arcs==NULL)
1339+
if (cnfa->stflags==NULL||cnfa->states==NULL||cnfa->arcs==NULL)
13401340
{
1341+
if (cnfa->stflags!=NULL)
1342+
FREE(cnfa->stflags);
13411343
if (cnfa->states!=NULL)
13421344
FREE(cnfa->states);
13431345
if (cnfa->arcs!=NULL)
@@ -1359,9 +1361,8 @@ compact(struct nfa * nfa,
13591361
for (s=nfa->states;s!=NULL;s=s->next)
13601362
{
13611363
assert((size_t)s->no<nstates);
1364+
cnfa->stflags[s->no]=0;
13621365
cnfa->states[s->no]=ca;
1363-
ca->co=0;/* clear and skip flags "arc" */
1364-
ca++;
13651366
first=ca;
13661367
for (a=s->outs;a!=NULL;a=a->outchain)
13671368
switch (a->type)
@@ -1392,8 +1393,8 @@ compact(struct nfa * nfa,
13921393

13931394
/* mark no-progress states */
13941395
for (a=nfa->pre->outs;a!=NULL;a=a->outchain)
1395-
cnfa->states[a->to->no]->co=1;
1396-
cnfa->states[nfa->pre->no]->co=1;
1396+
cnfa->stflags[a->to->no]=CNFA_NOPROGRESS;
1397+
cnfa->stflags[nfa->pre->no]=CNFA_NOPROGRESS;
13971398
}
13981399

13991400
/*
@@ -1433,6 +1434,7 @@ freecnfa(struct cnfa * cnfa)
14331434
{
14341435
assert(cnfa->nstates!=0);/* not empty already */
14351436
cnfa->nstates=0;
1437+
FREE(cnfa->stflags);
14361438
FREE(cnfa->states);
14371439
FREE(cnfa->arcs);
14381440
}
@@ -1617,7 +1619,7 @@ dumpcnfa(struct cnfa * cnfa,
16171619
fprintf(f,", haslacons");
16181620
fprintf(f,"\n");
16191621
for (st=0;st<cnfa->nstates;st++)
1620-
dumpcstate(st,cnfa->states[st],cnfa,f);
1622+
dumpcstate(st,cnfa,f);
16211623
fflush(f);
16221624
}
16231625
#endif
@@ -1629,22 +1631,20 @@ dumpcnfa(struct cnfa * cnfa,
16291631
*/
16301632
staticvoid
16311633
dumpcstate(intst,
1632-
structcarc*ca,
16331634
structcnfa*cnfa,
16341635
FILE*f)
16351636
{
1636-
inti;
1637+
structcarc*ca;
16371638
intpos;
16381639

1639-
fprintf(f,"%d%s",st, (ca[0].co) ?":" :".");
1640+
fprintf(f,"%d%s",st, (cnfa->stflags[st]&CNFA_NOPROGRESS) ?":" :".");
16401641
pos=1;
1641-
for (i=1;ca[i].co!=COLORLESS;i++)
1642+
for (ca=cnfa->states[st];ca->co!=COLORLESS;ca++)
16421643
{
1643-
if (ca[i].co<cnfa->ncolors)
1644-
fprintf(f,"\t[%ld]->%d", (long)ca[i].co,ca[i].to);
1644+
if (ca->co<cnfa->ncolors)
1645+
fprintf(f,"\t[%ld]->%d", (long)ca->co,ca->to);
16451646
else
1646-
fprintf(f,"\t:%ld:->%d", (long)ca[i].co-cnfa->ncolors,
1647-
ca[i].to);
1647+
fprintf(f,"\t:%ld:->%d", (long) (ca->co-cnfa->ncolors),ca->to);
16481648
if (pos==5)
16491649
{
16501650
fprintf(f,"\n");
@@ -1653,7 +1653,7 @@ dumpcstate(int st,
16531653
else
16541654
pos++;
16551655
}
1656-
if (i==1||pos!=1)
1656+
if (ca==cnfa->states[st]||pos!=1)
16571657
fprintf(f,"\n");
16581658
fflush(f);
16591659
}

‎src/backend/regex/regcomp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ static void dumparcs(struct state *, FILE *);
162162
staticintdumprarcs(structarc*,structstate*,FILE*,int);
163163
staticvoiddumparc(structarc*,structstate*,FILE*);
164164
staticvoiddumpcnfa(structcnfa*,FILE*);
165-
staticvoiddumpcstate(int,structcarc*,structcnfa*,FILE*);
165+
staticvoiddumpcstate(int,structcnfa*,FILE*);
166166
#endif
167167
/* === regc_cvec.c === */
168168
staticstructcvec*newcvec(int,int);

‎src/backend/regex/rege_dfa.c‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -458,14 +458,14 @@ miss(struct vars * v,/* used only for debug flags */
458458
gotstate=0;
459459
for (i=0;i<d->nstates;i++)
460460
if (ISBSET(css->states,i))
461-
for (ca=cnfa->states[i]+1;ca->co!=COLORLESS;ca++)
461+
for (ca=cnfa->states[i];ca->co!=COLORLESS;ca++)
462462
if (ca->co==co)
463463
{
464464
BSET(d->work,ca->to);
465465
gotstate=1;
466466
if (ca->to==cnfa->post)
467467
ispost=1;
468-
if (!cnfa->states[ca->to]->co)
468+
if (!(cnfa->stflags[ca->to]&CNFA_NOPROGRESS))
469469
noprogress=0;
470470
FDEBUG(("%d -> %d\n",i,ca->to));
471471
}
@@ -476,10 +476,9 @@ miss(struct vars * v,/* used only for debug flags */
476476
dolacons=0;
477477
for (i=0;i<d->nstates;i++)
478478
if (ISBSET(d->work,i))
479-
for (ca=cnfa->states[i]+1;ca->co!=COLORLESS;
480-
ca++)
479+
for (ca=cnfa->states[i];ca->co!=COLORLESS;ca++)
481480
{
482-
if (ca->co <=cnfa->ncolors)
481+
if (ca->co<cnfa->ncolors)
483482
continue;/* NOTE CONTINUE */
484483
sawlacons=1;
485484
if (ISBSET(d->work,ca->to))
@@ -490,7 +489,7 @@ miss(struct vars * v,/* used only for debug flags */
490489
dolacons=1;
491490
if (ca->to==cnfa->post)
492491
ispost=1;
493-
if (!cnfa->states[ca->to]->co)
492+
if (!(cnfa->stflags[ca->to]&CNFA_NOPROGRESS))
494493
noprogress=0;
495494
FDEBUG(("%d :> %d\n",i,ca->to));
496495
}

0 commit comments

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