mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate previous config keywords. Add ttr parsing (no functionality yet)

Browse Source
This commit is contained in:
Howard Chu 2009-08-16 23:26:34 +00:00
parent 84efb8773e
commit 88c6cfa814
1 changed files with 74 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
servers/slapd/overlays/pcache.c
View File

@ -132,6 +132,7 @@ typedef struct query_template_s {
time_t ttl; /* TTL for the queries of this template */ time_t ttl; /* TTL for the queries of this template */
time_t negttl; /* TTL for negative results */ time_t negttl; /* TTL for negative results */
time_t limitttl; /* TTL for sizelimit exceeding results */ time_t limitttl; /* TTL for sizelimit exceeding results */
time_t ttr; /* time to refresh */
struct attr_set t_attrs; /* filter attrs + attr_set */ struct attr_set t_attrs; /* filter attrs + attr_set */
} QueryTemplate; } QueryTemplate;
@ -2725,50 +2726,76 @@ static ConfigLDAPadd pc_ldadd;
static ConfigCfAdd pc_cfadd; static ConfigCfAdd pc_cfadd;
static ConfigTable pccfg[] = { static ConfigTable pccfg[] = {
{ "pcache", "backend> <max_entries> <numattrsets> <entry limit> "
"<cycle_time",
6, 6, 0, ARG_MAGIC|ARG_NO_DELETE|PC_MAIN, pc_cf_gen,
"( OLcfgOvAt:2.1 NAME ( 'olcPcache' 'olcProxyCache' ) "
"DESC 'Proxy Cache basic parameters' "
"SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
{ "pcacheAttrset", "index> <attributes...",
2, 0, 0, ARG_MAGIC|PC_ATTR, pc_cf_gen,
"( OLcfgOvAt:2.2 NAME ( 'olcPcacheAttrset' 'olcProxyAttrset' ) "
"DESC 'A set of attributes to cache' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
{ "pcacheTemplate", "filter> <attrset-index> <TTL> <negTTL> "
"<limitTTL> <TTR",
4, 7, 0, ARG_MAGIC|PC_TEMP, pc_cf_gen,
"( OLcfgOvAt:2.3 NAME ( 'olcPcacheTemplate' 'olcProxyCacheTemplate' ) "
"DESC 'Filter template, attrset, cache TTL, "
"optional negative TTL, optional sizelimit TTL, "
"optional TTR' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
{ "pcachePosition", "head|tail(default)",
2, 2, 0, ARG_MAGIC|PC_RESP, pc_cf_gen,
"( OLcfgOvAt:2.4 NAME 'olcPcachePosition' "
"DESC 'Response callback position in overlay stack' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
{ "pcacheMaxQueries", "queries",
2, 2, 0, ARG_INT|ARG_MAGIC|PC_QUERIES, pc_cf_gen,
"( OLcfgOvAt:2.5 NAME ( 'olcPcacheMaxQueries' 'olcProxyCacheQueries' ) "
"DESC 'Maximum number of queries to cache' "
"SYNTAX OMsInteger )", NULL, NULL },
{ "pcachePersist", "TRUE|FALSE",
2, 2, 0, ARG_ON_OFF|ARG_OFFSET, (void *)offsetof(cache_manager, save_queries),
"( OLcfgOvAt:2.6 NAME ( 'olcPcachePersist' 'olcProxySaveQueries' ) "
"DESC 'Save cached queries for hot restart' "
"SYNTAX OMsBoolean )", NULL, NULL },
{ "pcacheValidate", "TRUE|FALSE",
2, 2, 0, ARG_ON_OFF|ARG_OFFSET, (void *)offsetof(cache_manager, check_cacheability),
"( OLcfgOvAt:2.7 NAME ( 'olcPcacheValidate' 'olcProxyCheckCacheability' ) "
"DESC 'Check whether the results of a query are cacheable, e.g. for schema issues' "
"SYNTAX OMsBoolean )", NULL, NULL },
{ "pcacheOffline", "TRUE|FALSE",
2, 2, 0, ARG_ON_OFF|ARG_MAGIC|PC_OFFLINE, pc_cf_gen,
"( OLcfgOvAt:2.8 NAME 'olcPcacheOffline' "
"DESC 'Set cache to offline mode and disable expiration' "
"SYNTAX OMsBoolean )", NULL, NULL },
{ "pcache-", "private database args",
1, 0, STRLENOF("pcache-"), ARG_MAGIC|PC_PRIVATE_DB, pc_cf_gen,
NULL, NULL, NULL },
/* Legacy keywords */
{ "proxycache", "backend> <max_entries> <numattrsets> <entry limit> " { "proxycache", "backend> <max_entries> <numattrsets> <entry limit> "
"<cycle_time", "<cycle_time",
6, 6, 0, ARG_MAGIC|ARG_NO_DELETE|PC_MAIN, pc_cf_gen, 6, 6, 0, ARG_MAGIC|ARG_NO_DELETE|PC_MAIN, pc_cf_gen,
"( OLcfgOvAt:2.1 NAME 'olcProxyCache' " NULL, NULL, NULL },
"DESC 'ProxyCache basic parameters' "
"SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
{ "proxyattrset", "index> <attributes...", { "proxyattrset", "index> <attributes...",
2, 0, 0, ARG_MAGIC|PC_ATTR, pc_cf_gen, 2, 0, 0, ARG_MAGIC|PC_ATTR, pc_cf_gen,
"( OLcfgOvAt:2.2 NAME 'olcProxyAttrset' " NULL, NULL, NULL },
"DESC 'A set of attributes to cache' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
{ "proxytemplate", "filter> <attrset-index> <TTL> <negTTL", { "proxytemplate", "filter> <attrset-index> <TTL> <negTTL",
4, 6, 0, ARG_MAGIC|PC_TEMP, pc_cf_gen, 4, 6, 0, ARG_MAGIC|PC_TEMP, pc_cf_gen,
"( OLcfgOvAt:2.3 NAME 'olcProxyTemplate' " NULL, NULL, NULL },
"DESC 'Filter template, attrset, cache TTL, "
"optional negative TTL, optional sizelimit TTL' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
{ "response-callback", "head|tail(default)", { "response-callback", "head|tail(default)",
2, 2, 0, ARG_MAGIC|PC_RESP, pc_cf_gen, 2, 2, 0, ARG_MAGIC|PC_RESP, pc_cf_gen,
"( OLcfgOvAt:2.4 NAME 'olcProxyResponseCB' " NULL, NULL, NULL },
"DESC 'Response callback position in overlay stack' "
"SYNTAX OMsDirectoryString )", NULL, NULL },
{ "proxyCacheQueries", "queries", { "proxyCacheQueries", "queries",
2, 2, 0, ARG_INT|ARG_MAGIC|PC_QUERIES, pc_cf_gen, 2, 2, 0, ARG_INT|ARG_MAGIC|PC_QUERIES, pc_cf_gen,
"( OLcfgOvAt:2.5 NAME 'olcProxyCacheQueries' " NULL, NULL, NULL },
"DESC 'Maximum number of queries to cache' "
"SYNTAX OMsInteger )", NULL, NULL },
{ "proxySaveQueries", "TRUE|FALSE", { "proxySaveQueries", "TRUE|FALSE",
2, 2, 0, ARG_ON_OFF|ARG_OFFSET, (void *)offsetof(cache_manager, save_queries), 2, 2, 0, ARG_ON_OFF|ARG_OFFSET, (void *)offsetof(cache_manager, save_queries),
"( OLcfgOvAt:2.6 NAME 'olcProxySaveQueries' " NULL, NULL, NULL },
"DESC 'Save cached queries for hot restart' "
"SYNTAX OMsBoolean )", NULL, NULL },
{ "proxyCheckCacheability", "TRUE|FALSE", { "proxyCheckCacheability", "TRUE|FALSE",
2, 2, 0, ARG_ON_OFF|ARG_OFFSET, (void *)offsetof(cache_manager, check_cacheability), 2, 2, 0, ARG_ON_OFF|ARG_OFFSET, (void *)offsetof(cache_manager, check_cacheability),
"( OLcfgOvAt:2.7 NAME 'olcProxyCheckCacheability' "
"DESC 'Check whether the results of a query are cacheable, e.g. for schema issues' "
"SYNTAX OMsBoolean )", NULL, NULL },
{ "proxyCacheOffline", "TRUE|FALSE",
2, 2, 0, ARG_ON_OFF|ARG_MAGIC|PC_OFFLINE, pc_cf_gen,
"( OLcfgOvAt:2.8 NAME 'olcProxyCacheOffline' "
"DESC 'Set cache to offline mode and disable expiration' "
"SYNTAX OMsBoolean )", NULL, NULL },
{ "proxycache-", "private database args",
1, 0, STRLENOF("proxycache-"), ARG_MAGIC|PC_PRIVATE_DB, pc_cf_gen,
NULL, NULL, NULL }, NULL, NULL, NULL },
{ NULL, NULL, 0, 0, 0, ARG_IGNORED } { NULL, NULL, 0, 0, 0, ARG_IGNORED }
@ -2779,8 +2806,9 @@ static ConfigOCs pcocs[] = {
"NAME 'olcPcacheConfig' " "NAME 'olcPcacheConfig' "
"DESC 'ProxyCache configuration' " "DESC 'ProxyCache configuration' "
"SUP olcOverlayConfig " "SUP olcOverlayConfig "
"MUST ( olcProxyCache $ olcProxyAttrset $ olcProxyTemplate ) " "MUST ( olcPcache $ olcPcacheAttrset $ olcPcacheSet ) "
"MAY ( olcProxyResponseCB $ olcProxyCacheQueries $ olcProxySaveQueries $ olcProxyCheckCacheability $ olcProxyCacheOffline ) )", "MAY ( olcPcachePosition $ olcPcacheMaxQueries $ olcPcachePersist $ "
"olcPcacheValidate $ olcPcacheOffline ) )",
Cft_Overlay, pccfg, NULL, pc_cfadd }, Cft_Overlay, pccfg, NULL, pc_cfadd },
{ "( OLcfgOvOc:2.2 " { "( OLcfgOvOc:2.2 "
"NAME 'olcPcacheDatabase' " "NAME 'olcPcacheDatabase' "
@ -2900,11 +2928,12 @@ pc_cf_gen( ConfigArgs *c )
/* HEADS-UP: always print all; /* HEADS-UP: always print all;
* if optional == 0, ignore */ * if optional == 0, ignore */
bv.bv_len = snprintf( c->cr_msg, sizeof( c->cr_msg ), bv.bv_len = snprintf( c->cr_msg, sizeof( c->cr_msg ),
" %d %ld %ld %ld", " %d %ld %ld %ld %ld",
temp->attr_set_index, temp->attr_set_index,
temp->ttl, temp->ttl,
temp->negttl, temp->negttl,
temp->limitttl ); temp->limitttl,
temp->ttr );
bv.bv_len += temp->querystr.bv_len + 2; bv.bv_len += temp->querystr.bv_len + 2;
bv.bv_val = ch_malloc( bv.bv_len+1 ); bv.bv_val = ch_malloc( bv.bv_len+1 );
ptr = bv.bv_val; ptr = bv.bv_val;
@ -3169,7 +3198,19 @@ pc_cf_gen( ConfigArgs *c )
temp->ttl = (time_t)t; temp->ttl = (time_t)t;
temp->negttl = (time_t)0; temp->negttl = (time_t)0;
temp->limitttl = (time_t)0; temp->limitttl = (time_t)0;
temp->ttr = (time_t)0;
switch ( c->argc ) { switch ( c->argc ) {
case 7:
if ( lutil_parse_time( c->argv[6], &t ) != 0 ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"unable to parse template ttr=\"%s\"",
c->argv[6] );
Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->cr_msg, 0 );
return( 1 );
}
temp->ttr = (time_t)t;
/* fallthru */
case 6: case 6:
if ( lutil_parse_time( c->argv[5], &t ) != 0 ) { if ( lutil_parse_time( c->argv[5], &t ) != 0 ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ), snprintf( c->cr_msg, sizeof( c->cr_msg ),