pike.git/ lib/ modules/ Sql.pmod/ pgsql_util.pmod

2014-11-28

2014-11-28 02:29:10 by Stephen R. van den Berg <srb@cuci.nl>

• 5cb4f27af3cede6af89e9d4dd869654fc5804401 (49 lines) (+33/-16) ^{[ Show | Annotate ]}
  Branch: 8.1

pgsql: Timeout queries only when needed.

142:    return local_backend->call_out(f,delay,@args);   }    - private void nop() { } -  +    // Some pgsql utility functions      class bufcon {
187:       final Thread.Condition fillread;    final Thread.Mutex fillreadmux; -  final function(:void) gottimeout; -  final int timeout; +     private int didreadcb;       protected bool range_error(int howmuch) {
197:    error("Out of range %d\n",howmuch);   #endif    if(fillread) { -  array cid=callout(gottimeout,timeout); +     Thread.MutexKey lock=fillreadmux->lock();    if(!didreadcb)    fillread.wait(lock);    didreadcb=0;    lock=0; -  local_backend->remove_call_out(cid); +     } else    throw(MAGICTERMINATE);    return true;
219:       protected void create() {    i::create(); -  gottimeout=nop; // Preset it with a NOP -  timeout=128; // Just a reasonable amount +     fillreadmux=Thread.Mutex();    fillread=Thread.Condition();    }
472:    final string _query;    final string _preparedname;    final mapping(string:mixed) _tprepared; +  private function(:void) gottimeout; +  private int timeout;       private string _sprintf(int type, void|mapping flags) {    string res=UNDEFINED;
491:    }       protected void create(object _pgsqlsess,conxion _c,string query, -  int _portalbuffersize,int alltyped,array params,int forcetext) { +  int _portalbuffersize,int alltyped,array params,int forcetext, +  int _timeout) {    pgsqlsess = _pgsqlsess;    cr = (c = _c)->i;    _query = query;
504:    _params = params;    _forcetext = forcetext;    _state = PORTALINIT; +  timeout = _timeout; +  gottimeout = _pgsqlsess->cancelquery;    }       //! Returns the command-complete status for this query.
1011:    if(arrayp(datarow=datarows->try_read()))    return datarow;    if(!eoffound) { -  if(!datarow -  && (PD("%O Block for datarow\n",_portalname), -  arrayp(datarow=datarows->read()))) +  if(!datarow) { +  PD("%O Block for datarow\n",_portalname); +  array cid=callout(gottimeout,timeout); +  datarow=datarows->read(); +  local_backend->remove_call_out(cid); +  if(arrayp(datarow))    return datarow; -  +  }    eoffound=1;    datarows->write(1); // Signal EOF for other threads    }
1034:    if(eoffound)    return 0;    array(array|int) datarow=datarows->try_read_array(); -  if(!datarow) +  if(!datarow) { +  array cid=callout(gottimeout,timeout);    datarow=datarows->read_array(); -  +  local_backend->remove_call_out(cid); +  }    if(arrayp(datarow[-1]))    return datarow;    trydelayederror();
1069:    function(sql_result, array(mixed), mixed ...:void) callback,    array(mixed) args) {    int|array datarow; -  while(arrayp(datarow=datarows->read_array())) +  for(;;) { +  array cid=callout(gottimeout,timeout); +  datarow=datarows->read(); +  local_backend->remove_call_out(cid); +  if(!arrayp(datarow)) +  break;    callout(callback, 0, this, datarow, @args); -  +  }    trydelayederror();    eoffound=1;    callout(callback, 0, this, 0, @args);
1093:    function(sql_result, array(array(mixed)), mixed ...:void) callback,    array(mixed) args) {    array(array|int) datarow; -  while((datarow=datarows->read_array()) && arrayp(datarow[-1])) +  for(;;) { +  array cid=callout(gottimeout,timeout); +  datarow=datarows->read_array(); +  local_backend->remove_call_out(cid); +  if(!datarow || !arrayp(datarow[-1])) +  break;    callout(callback, 0, this, datarow, @args); -  +  }    trydelayederror();    eoffound=1;    if(sizeof(datarow)>1)