X-Git-Url: http://sigaev.ru/git/gitweb.cgi?p=plantuner.git;a=blobdiff_plain;f=plantuner.c;h=cf5ccf34fbc5306d74a3b2b3e6c9d702243ebd2f;hp=a91bf067bb5f0bc20f6c61459fb21730505952fc;hb=aea20c9709fd91c0b0d7118881c2cdbc6acfe4b3;hpb=6c66d17a2dc6e5372e0136ae495370a359a3f913 diff --git a/plantuner.c b/plantuner.c index a91bf06..cf5ccf3 100644 --- a/plantuner.c +++ b/plantuner.c @@ -81,7 +81,13 @@ indexesAssign(const char * newval, bool doit, GucSource source, bool isDisable) foreach(l, namelist) { char *curname = (char *) lfirst(l); - Oid indexOid = RangeVarGetRelid(makeRangeVarFromNameList(stringToQualifiedNameList(curname)), true); +#if PG_VERSION_NUM >= 90200 + Oid indexOid = RangeVarGetRelid(makeRangeVarFromNameList(stringToQualifiedNameList(curname)), + NoLock, true); +#else + Oid indexOid = RangeVarGetRelid(makeRangeVarFromNameList(stringToQualifiedNameList(curname)), + true); +#endif if (indexOid == InvalidOid) { @@ -219,13 +225,6 @@ indexFilter(PlannerInfo *root, Oid relationObjectId, bool inhparent, RelOptInfo } } } - - if (fix_empty_table && rel) - { - - - } - } static void @@ -266,7 +265,7 @@ IndexFilterShow(Oid* indexes, int nIndexes) len = 1 /* \0 */ + nIndexes * (2 * NAMEDATALEN + 2 /* ', ' */ + 1 /* . */); ptr = val = palloc(len); - *ptr ='\0'; + *ptr =(char)'\0'; for(i=0; i