Elgato_dark/hypopg
1
0
Fork 0
mirror of https://github.com/HypoPG/hypopg synced 2026-05-24 09:38:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from kmosolov/9.5_fix

Browse source 
Fixed server crash and compilation issue
This commit is contained in:
Julien Rouhaud 2016-06-07 18:39:42 +02:00
commit 2225e71e22
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
hypopg.c
View file

@ -523,7 +523,7 @@ hypo_entry_store_parsetree(IndexStmt *node, const char *queryString)
{
elog(WARNING, "hypopg: hypothetical indexes on expression are"
" not supported yet");
return false;
return NULL;
}
relid =
@ -1288,10 +1288,13 @@ hypopg_create_index(PG_FUNCTION_ARGS)
else
{
entry = hypo_entry_store_parsetree((IndexStmt *) parsetree, sql);
values[0] = ObjectIdGetDatum(entry->oid);
values[1] = CStringGetTextDatum(strdup(entry->indexname));
if (entry != NULL)
{
values[0] = ObjectIdGetDatum(entry->oid);
values[1] = CStringGetTextDatum(strdup(entry->indexname));
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
}
}
i++;
}
@ -1604,7 +1607,7 @@ hypo_estimate_index(hypoEntry *entry, RelOptInfo *rel)
entry->pages += data_size;
}
#endif
#if PG_VERSION_NUM >= 90500
#if PG_VERSION_NUM >= 90600
else if (entry->relam == BLOOM_AM_OID)
{
/* ----------------------------
@ -1740,7 +1743,7 @@ hypo_discover_am(char *amname, Oid oid)
#if PG_VERSION_NUM < 90600
/* no (reliable) external am before 9.6 */
return;
#endif
#else
/* don't try to handle builtin access method */
if (oid == BTREE_AM_OID ||
@ -1754,4 +1757,5 @@ hypo_discover_am(char *amname, Oid oid)
/* Is it the bloom access method? */
if (strcmp(amname, "bloom") == 0)
BLOOM_AM_OID = oid;
#endif
}