archive-gh-me/pointcloud
1
0
Fork 0
mirror of https://github.com/pgpointcloud/pointcloud.git synced 2025-12-08 20:36:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #194 from elemoine/cache

Browse Source 
Remove the generic cache
This commit is contained in:
Éric Lemoine 2018-04-26 18:08:18 +02:00 committed by GitHub
commit 83ddc8e292
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pgsql/pc_pgsql.c
View File

@ -300,12 +300,6 @@ pc_schema_from_pcid_uncached(uint32 pcid)
}
typedef struct
{
int type;
char data[1];
} GenericCache;
/**
* Hold the schema references in a list.
* We'll just search them linearly, because
@ -315,7 +309,6 @@ typedef struct
typedef struct
{
int type;
int next_slot;
int pcids[SchemaCacheSize];
PCSCHEMA* schemas[SchemaCacheSize];
@ -323,57 +316,20 @@ typedef struct
/**
* PostGIS uses this kind of structure for its
* cache objects, and we expect to be used in
* concert with PostGIS, so here we not only ape
* the container, but avoid the first 10 slots,
* so as to miss any existing cached PostGIS objects.
*/
typedef struct
{
GenericCache *entry[16];
} GenericCacheCollection;
#define PC_SCHEMA_CACHE 10
#define PC_STATS_CACHE 11
/**
* Get the generic collection off the statement, allocate a
* new one if we don't have one already.
*/
static GenericCacheCollection *
GetGenericCacheCollection(FunctionCallInfoData *fcinfo)
{
GenericCacheCollection *cache = fcinfo->flinfo->fn_extra;
if ( ! cache )
{
cache = MemoryContextAlloc(fcinfo->flinfo->fn_mcxt, sizeof(GenericCacheCollection));
memset(cache, 0, sizeof(GenericCacheCollection));
fcinfo->flinfo->fn_extra = cache;
}
return cache;
}
/**
* Get the Proj4 entry from the generic cache if one exists.
* If it doesn't exist, make a new empty one and return it.
* Get the schema entry from the schema cache if one exists.
* If it doesn't exist, make a new empty one, cache it, and
* return it.
*/
static SchemaCache *
GetSchemaCache(FunctionCallInfoData* fcinfo)
{
GenericCacheCollection *generic_cache = GetGenericCacheCollection(fcinfo);
SchemaCache* cache = (SchemaCache*)(generic_cache->entry[PC_SCHEMA_CACHE]);
SchemaCache *cache = fcinfo->flinfo->fn_extra;
if ( ! cache )
{
/* Allocate in the upper context */
cache = MemoryContextAlloc(fcinfo->flinfo->fn_mcxt, sizeof(SchemaCache));
memset(cache, 0, sizeof(SchemaCache));
cache->type = PC_SCHEMA_CACHE;
fcinfo->flinfo->fn_extra = cache;
}
generic_cache->entry[PC_SCHEMA_CACHE] = (GenericCache*)cache;
return cache;
}
@ -403,6 +359,8 @@ pc_schema_from_pcid(uint32 pcid, FunctionCallInfoData *fcinfo)
}
}
elog(DEBUG1, "schema cache miss, use pc_schema_from_pcid_uncached");
/* Not in there, load one the old-fashioned way. */
oldcontext = MemoryContextSwitchTo(fcinfo->flinfo->fn_mcxt);
schema = pc_schema_from_pcid_uncached(pcid);