Roxen.git/ server/ base_server/ roxen.pike

2009-11-23

2009-11-23 17:21:22 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 8240bf9324bdc426936c56b1e0d898a9b278416a (59 lines) (+41/-18) ^{[ Show | Annotate ]}
  Branch: 5.2

Reduce the number of ArgCache sql queries for the common case where there is no timeout.

Rev: server/base_server/roxen.pike:1.1048

6:   // Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.   // ABS and suicide systems contributed freely by Francesco Chemolli    - constant cvs_version="$Id: roxen.pike,v 1.1047 2009/11/23 16:52:01 grubba Exp $"; + constant cvs_version="$Id: roxen.pike,v 1.1048 2009/11/23 17:21:22 grubba Exp $";      //! @appears roxen   //!
4195:   #define dwerror(ARGS...) 0   #endif    +  //! Cache of the latest entries requested or stored. +  //! Limited to @[CACHE_SIZE] (currently @expr{900@}) entries.    protected mapping(string|int:mixed) cache = ([ ]);    -  +  //! Cache of cache-ids that have no expiration time. +  //! This cache is maintained in sync with @[cache]. +  //! Note that entries not in this cache may still have +  //! unlimited expiration time. +  protected mapping(string|int:int) no_expiry = ([ ]); +     protected void setup_table()    {    // New style argument2 table.
4271:    // Delay DBManager resolving to before the 'roxen' object is    // compiled.    cache = ([]); +  no_expiry = ([]);    db = dbm_cached_get("local");    setup_table( );   
4385:    //! Timeout for the entry in seconds from now. If @expr{UNDEFINED@},    //! the entry will not expire.    { -  args += ([]); +     if (!zero_type(timeout)) timeout += time();    string encoded_args = encode_value_canonic( args );    string id = Gmp.mpz(Crypto.SHA1.hash(encoded_args), 256)->digits(36);    if( cache[ id ] ) { -  +  if (!no_expiry[id]) { +  // The cache id may have a timeout.    if (zero_type(timeout)) { -  // No timeout. +  // No timeout now, but there may have been one earlier.    QUERY("UPDATE LOW_PRIORITY "+name+"2 "    " SET timeout = NULL " -  " WHERE id = %s", id); +  " WHERE id = %s " +  " AND timeout IS NOT NULL", id); +  no_expiry[id] = 1;    } else { -  +  // Attempt to bump the timeout.    QUERY("UPDATE LOW_PRIORITY "+name+"2 "    " SET timeout = %d "    " WHERE id = %s "
4403:    " AND timeout < %d",    timeout, id, timeout);    } +  }    return id;    }    create_key(id, encoded_args, timeout); -  if( sizeof( cache ) >= CACHE_SIZE ) +  if( sizeof( cache ) >= CACHE_SIZE ) {    cache = ([]); -  if( !cache[ id ] ) -  cache[ id ] = args; +  no_expiry = ([]); +  } +  if( !cache[ id ] ) { +  cache[ id ] = args + ([]); +  } +  if (zero_type(timeout)) { +  no_expiry[ id ] = 1; +  }    return id;    }   
4425:    error("Requesting unknown key (not found in db)\n");    }    mapping args = decode_value(encoded_args); -  if( sizeof( cache ) >= CACHE_SIZE ) +  if( sizeof( cache ) >= CACHE_SIZE ) {    // Yowza! Garbing bulldoze style. /mast    cache = ([]); -  +  no_expiry = ([]); +  }    cache[id] = args + ([]);    return args;    }