NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitfd33d90

committed

Simplify CREATE TEXT SEARCH CONFIGURATION by eliminating the separate

'with map' parameter; as things now stand there's really not much pointin specifying a config-to-copy if you don't copy its map. Also, useCOPY instead of TEMPLATE as the key word for a config-to-copy, so asto avoid confusion with text search templates. Per discussion; thejust-committed reference page for the command already describes itthis way.

1 parent3e3bb36 commitfd33d90Copy full SHA for fd33d90

File tree

1 file changed

+14

-19

lines changed

src/backend/commands
- tsearchcmds.c

1 file changed

+14

-19

lines changed

`‎src/backend/commands/tsearchcmds.c‎`

Lines changed: 14 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/commands/tsearchcmds.c,v 1.1 2007/08/2101:11:15 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/commands/tsearchcmds.c,v 1.2 2007/08/2121:24:00 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -1192,10 +1192,9 @@ DefineTSConfiguration(List names, List parameters)`
`1192`	`1192`	`Oidnamespaceoid;`
`1193`	`1193`	`char*cfgname;`
`1194`	`1194`	`NameDatacname;`
`1195`		`-List*templateName=NIL;`
`1196`		`-OidtemplateOid=InvalidOid;`
	`1195`	`+List*sourceName=NIL;`
	`1196`	`+OidsourceOid=InvalidOid;`
`1197`	`1197`	`OidprsOid=InvalidOid;`
`1198`		`-boolwith_map= false;`
`1199`	`1198`	`OidcfgOid;`
`1200`	`1199`	`ListCell*pl;`
`1201`	`1200`
`@@ -1217,10 +1216,8 @@ DefineTSConfiguration(List names, List parameters)`
`1217`	`1216`
`1218`	`1217`	`if (pg_strcasecmp(defel->defname,"parser")==0)`
`1219`	`1218`	`prsOid=TSParserGetPrsid(defGetQualifiedName(defel), false);`
`1220`		`-elseif (pg_strcasecmp(defel->defname,"template")==0)`
`1221`		`-templateName=defGetQualifiedName(defel);`
`1222`		`-elseif (pg_strcasecmp(defel->defname,"map")==0)`
`1223`		`-with_map=defGetBoolean(defel);`
	`1219`	`+elseif (pg_strcasecmp(defel->defname,"copy")==0)`
	`1220`	`+sourceName=defGetQualifiedName(defel);`
`1224`	`1221`	`else`
`1225`	`1222`	`ereport(ERROR,`
`1226`	`1223`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`@@ -1229,26 +1226,24 @@ DefineTSConfiguration(List names, List parameters)`
`1229`	`1226`	`}`
`1230`	`1227`
`1231`	`1228`	`/*`
`1232`		`- * Look up template if given. XXX the "template" is an existing config`
`1233`		`- * that we copy, not a pg_ts_template entry. This seems confusing.`
`1234`		`- * Maybe should use "source" or some other word?`
	`1229`	`+ * Look up source config if given.`
`1235`	`1230`	`*/`
`1236`		`-if (templateName)`
	`1231`	`+if (sourceName)`
`1237`	`1232`	`{`
`1238`	`1233`	`Form_pg_ts_configcfg;`
`1239`	`1234`
`1240`		`-templateOid=TSConfigGetCfgid(templateName, false);`
	`1235`	`+sourceOid=TSConfigGetCfgid(sourceName, false);`
`1241`	`1236`
`1242`	`1237`	`tup=SearchSysCache(TSCONFIGOID,`
`1243`		`-ObjectIdGetDatum(templateOid),`
	`1238`	`+ObjectIdGetDatum(sourceOid),`
`1244`	`1239`	`0,0,0);`
`1245`	`1240`	`if (!HeapTupleIsValid(tup))`
`1246`	`1241`	`elog(ERROR,"cache lookup failed for text search configuration %u",`
`1247`		`-templateOid);`
	`1242`	`+sourceOid);`
`1248`	`1243`
`1249`	`1244`	`cfg= (Form_pg_ts_config)GETSTRUCT(tup);`
`1250`	`1245`
`1251`		`-/* Usetemplate's parser if no other was specified */`
	`1246`	`+/* Usesource's parser if no other was specified */`
`1252`	`1247`	`if (!OidIsValid(prsOid))`
`1253`	`1248`	`prsOid=cfg->cfgparser;`
`1254`	`1249`
`@@ -1283,10 +1278,10 @@ DefineTSConfiguration(List names, List parameters)`
`1283`	`1278`
`1284`	`1279`	`CatalogUpdateIndexes(cfgRel,tup);`
`1285`	`1280`
`1286`		`-if (OidIsValid(templateOid)&&with_map)`
	`1281`	`+if (OidIsValid(sourceOid))`
`1287`	`1282`	`{`
`1288`	`1283`	`/*`
`1289`		`- * Copy token-dicts map fromtemplate`
	`1284`	`+ * Copy token-dicts map fromsource config`
`1290`	`1285`	`*/`
`1291`	`1286`	`ScanKeyDataskey;`
`1292`	`1287`	`SysScanDescscan;`
`@@ -1297,7 +1292,7 @@ DefineTSConfiguration(List names, List parameters)`
`1297`	`1292`	`ScanKeyInit(&skey,`
`1298`	`1293`	`Anum_pg_ts_config_map_mapcfg,`
`1299`	`1294`	`BTEqualStrategyNumber,F_OIDEQ,`
`1300`		`-ObjectIdGetDatum(templateOid));`
	`1295`	`+ObjectIdGetDatum(sourceOid));`
`1301`	`1296`
`1302`	`1297`	`scan=systable_beginscan(mapRel,TSConfigMapIndexId, true,`
`1303`	`1298`	`SnapshotNow,1,&skey);`

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!

Commitfd33d90

File tree

1 file changed

1 file changed

`‎src/backend/commands/tsearchcmds.c‎`

0 commit comments