Roxen.git/ server/ base_server/ roxen.pike

2001-08-09

2001-08-09 07:57:14 by Per Hedbor <ph@opera.com>

• 4afcd4eaaa3ee174fc5c853254f548565dad5b91 (117 lines) (+64/-53) ^{[ Show | Annotate ]}
  Branch: 5.2

Merged the two tables created for each image cache into one table

Rev: server/base_server/roxen.pike:1.689

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.688 2001/08/05 20:06:33 nilsson Exp $"; + constant cvs_version="$Id: roxen.pike,v 1.689 2001/08/09 07:57:14 per Exp $";      // The argument cache. Used by the image cache.   ArgCache argcache;
2012:       static mapping meta_cache_insert( string i, mapping what )    { +  call_out( meta_cache_insert, 400, i, 0 ); +  if( what )    return meta_cache[i] = what; -  +  else +  m_delete( meta_cache, i ); +  return 0;    }       static mixed frommapp( mapping what )
2025:       static void draw( string name, RequestID id )    { -  mixed args = Array.map( Array.map( name/"$", -  argcache->lookup, +  mixed args = Array.map( Array.map( name/"$", argcache->lookup,    id->client ), frommapp);       mapping meta;
2523:    if(!stringp(data)) return;    meta_cache_insert( id, meta );    string meta_data = encode_value( meta ); -  QUERY( "INSERT INTO "+name+"_data (id,meta,data) VALUES (%s,%s,%s)", -  id,meta_data,data); -  QUERY( "REPLACE INTO "+name+" (id,size,mtime,atime) VALUES " -  "(%s,%d,UNIX_TIMESTAMP(), UNIX_TIMESTAMP())", id, strlen(data) ); +  QUERY( "UPDATE "+name+" SET size=%d, atime=%d, meta=%s, data=%s WHERE id=%s", +  strlen(data), time(1), meta_data, data, id );    }       static mapping restore_meta( string id, RequestID rid )
2534:    if( meta_cache[ id ] )    return meta_cache[ id ];    -  array(mapping(string:string)) q = QUERY("SELECT meta FROM "+ -  name+"_data WHERE id='"+ -  id+"'"); +  array(mapping(string:string)) q = QUERY("SELECT meta FROM "+name+" WHERE id=%s", id ); +     if(!sizeof(q))    return 0;   
2547:    if (catch (m = decode_value (s)))    {    report_error( "Corrupt data in cache-entry "+id+".\n" ); -  QUERY( "DELETE FROM "+name+" WHERE id='"+id+"'" ); -  QUERY( "DELETE FROM "+name+"_data WHERE id='"+id+"'" ); +  QUERY( "DELETE FROM "+name+" WHERE id=%s", id);    return 0;    }    return meta_cache_insert( id, m );
2559:    //! <pi>time()</pi>) is provided, only images with their latest access before    //! that time are flushed.    { -  report_debug("Flushing "+name+" image cache.\n"); +  report_debug("Cleaning "+name+" image cache.\n");    meta_cache = ([]);    uid_cache = ([]);    rst_cache = ([]);    if( !age )    {    QUERY( "DELETE FROM "+name ); -  QUERY( "DELETE FROM "+name+"_data" ); +     return;    }   
2575:       int q;    while(q<sizeof(ids)) { -  string list = ids[q..q+100] * "','"; +  string list = ids[q..q+99] * "','";    q+=100; -  QUERY( "DELETE FROM "+name+ " WHERE id in ('"+list+"')" ); -  QUERY( "DELETE FROM "+name+"_data WHERE id in ('"+list+"')" ); +  QUERY( "DELETE FROM "+name+" WHERE id in ('"+list+"')" );    }       catch
2586:    // Old versions of Mysql lacks OPTIMIZE. Not that we support    // them, really, but it might be nice not to throw an error, at    // least. -  QUERY( "OPTIMIZE TABLE "+name+"_data" ); +     QUERY( "OPTIMIZE TABLE "+name );    };   
2619:       static mapping(string:mapping) rst_cache = ([ ]);    static mapping(string:string) uid_cache = ([ ]); +     static mapping restore( string id, RequestID rid )    {    array q;
2626:       if( zero_type(uid = uid_cache[id]) )    { -  q = QUERY( "SELECT uid FROM "+name+" WHERE id=%s",id); +  q = QUERY( "SELECT uid FROM "+name+" WHERE id=%s",id);    if( sizeof(q) )    uid = q[0]->uid;    else
2638:    {    User u;    if( !(u=rid->conf->authenticate(rid)) || (u->name() != uid ) ) -  { - // werror("Did not get authentication. Expected "+uid+", got "+ - // (u&&u->name())+"\n"); - // werror("Returning %O\n", rid->conf->authenticate_throw(rid, "User")); - // werror("Headers: %O\n", rid->request_headers ); +     return rid->conf->authenticate_throw(rid, "User");    } -  } +     -  +     if( rst_cache[ id ] )    return rst_cache[ id ] + ([]);       -  q = QUERY( "SELECT data FROM "+name+"_data WHERE id=%s",id); +  q = QUERY( "SELECT data FROM "+name+" WHERE id=%s",id);    if( sizeof(q) )    { -  +  if( sizeof(q[0]->data) ) +  {    string f = q[0]->data;       // restore_meta caches. Thus, it's faster calling it than doing
2673:    return rst_cache[ id ] + ([]);    }    } +  else +  { +  User u = rid->conf->authenticate(rid); +  string uid = ""; +  if( u ) uid = u->name(); +  QUERY("INSERT INTO "+name+" (id,uid) VALUES (%s,%s)", id, uid ); +  }    -  +  return 0; +  }    -  +     string data( array|string|mapping args, RequestID id, int|void nodraw )    //! Returns the actual raw image data of the image rendered from the    //! `data' instructions.
2771:    a["\0u"] = user = id->misc->authenticated_user->name();    };    -  if( mappingp( data ) ) { +  if( mappingp( data ) ) +  {    update_args( data );    ci = argcache->store( data ); -  } else if( arrayp( data ) ) { +  } +  else if( arrayp( data ) ) +  {    if( !mappingp( data[0] ) )    error("Expected mapping as the first element of the argument array\n");    update_args( data[0] );
2782:    } else    ci = data;    -  if( user && ! uid_cache[ ci ] ) +  if( user && !uid_cache[ ci ] )    {    uid_cache[ci] = user; -  QUERY( "REPLACE INTO "+name+" (id,uid) VALUES (%s,%s)", ci, user); +  if( catch(QUERY( "UPDATE "+name+" SET uid=%s WHERE id=%s", user, ci )) ) +  QUERY("INSERT INTO "+name+" (id,uid,atime) VALUES (%s,%s,%d)", +  ci, user, time(1) );    } -  +     return ci;    }   
2799:       static void setup_tables()    { -  if(catch(QUERY("select uid from "+name+" where id=''"))) +  if(catch(QUERY("SELECT DATA FROM "+name+" WHERE id=''")))    {    werror("Creating image-cache tables for '"+name+"'\n");    catch(QUERY("DROP TABLE "+name)); -  +  +  // The old tables. This is only useful for people who have run +  // Roxen 2.2 from cvs before    catch(QUERY("DROP TABLE "+name+"_data"));       QUERY("CREATE TABLE "+name+" ("    "id CHAR(64) NOT NULL PRIMARY KEY, "    "size INT UNSIGNED NOT NULL DEFAULT 0, "    "uid CHAR(32) NOT NULL DEFAULT '', " -  "ctime INT UNSIGNED NOT NULL DEFAULT 0, " -  "atime INT UNSIGNED NOT NULL DEFAULT 0)"); -  -  QUERY("CREATE TABLE "+name+"_data (" -  "id CHAR(64) NOT NULL PRIMARY KEY, " +  "atime INT UNSIGNED NOT NULL DEFAULT 0,"    "meta MEDIUMBLOB NOT NULL DEFAULT ''," -  "data MEDIUMBLOB NOT NULL DEFAULT '')"); +  "data MEDIUMBLOB NOT NULL DEFAULT ''," +  "INDEX atime (atime)" +  ")" );    }    }   
2851:    master()->resolv( "DBManager.add_dblist_changed_callback" )( init_db );       // Always remove entries that are older than one week. -  do_cleanup(); +  call_out( do_cleanup, 10 );    }   }