pike.git/
lib/
modules/
Sql.pmod/
pgsql_util.pmod
Branch:
Tag:
Non-build tags
All tags
No tags
2014-11-17
2014-11-17 22:49:46 by Stephen R. van den Berg <srb@cuci.nl>
05b1f505b3657ea88f0eea10d6885bc338e52256 (
176
lines) (+
91
/-
85
)
[
Show
|
Annotate
]
Branch:
8.1
pgsql: Cleanup & ensure gotdatarowdesc runs at most once per query.
410:
class sql_result { private object pgsqlsess;
-
private int numrows;
+
private int eoffound; private conxion c; final mixed _delayederror;
421:
final string _portalname;
+
private int rowsreceived;
+
private int inflight;
+
private int portalbuffersize;
+
private Stdio.Buffer prepbuffer;
+
private Thread.Condition prepbufferready;
+
private Thread.Mutex prepbuffermux;
+
private Thread.Mutex closemux;
+
private Thread.Queue datarows;
+
private string statuscmdcomplete;
final int _bytesreceived;
-
final int _rowsreceived;
-
final int _inflight;
-
final int _portalbuffersize;
+
final int _synctransact; final Thread.Condition _ddescribe; final Thread.Mutex _ddescribemux; final Thread.MutexKey _unnamedportalkey,_unnamedstatementkey;
-
private Thread.Mutex closemux;
+
final array _params;
-
final string _statuscmdcomplete;
+
final string _query;
-
final Thread.Queue _datarows;
+
final array(mapping(string:mixed)) _datarowdesc;
-
final int _oldpbpos;
-
private Stdio.Buffer prepbuffer;
-
private Thread.Condition prepbufferready;
-
private Thread.Mutex prepbuffermux;
+
final string _preparedname; final mapping(string:mixed) _tprepared;
446:
string res=UNDEFINED; switch(type) { case 'O':
-
res=sprintf("sql_result numrows: %d
eof: %d inflight: %d\n"
+
res=sprintf("sql_result
state:
%d
numrows: %d eof: %d inflight: %d\n"
"query: %O\n" "portalname: %O datarows: %d" " laststatus: %s\n",
-
numrows
,eoffound,
_
inflight,
+
_state
,
rowsreceived,
eoffound,inflight,
_query, _portalname,_datarowdesc&&sizeof(_datarowdesc),
-
_
statuscmdcomplete||"");
+
statuscmdcomplete||
(_unnamedstatementkey?
"
*parsing*
"
:""
)
)
;
break; } return res; } 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) {
pgsqlsess = _pgsqlsess; c = _c; _query = query;
-
_
datarows = Thread.Queue();
numrows = UNDEFINED;
+
datarows = Thread.Queue();
_ddescribe=Thread.Condition(); _ddescribemux=Thread.Mutex(); closemux=Thread.Mutex(); prepbufferready=Thread.Condition(); prepbuffermux=Thread.Mutex();
-
_
portalbuffersize=portalbuffersize;
+
portalbuffersize=
_
portalbuffersize;
_alltext = !alltyped; _params = params; _forcetext = forcetext;
486:
//! This function is PostgreSQL-specific, and thus it is not available //! through the generic SQL-interface. string status_command_complete() {
-
return
_
statuscmdcomplete;
+
return statuscmdcomplete;
} //! Returns the number of affected rows by this query.
499:
//! through the generic SQL-interface. int affected_rows() { int rows;
-
if(
_
statuscmdcomplete)
-
sscanf(
_
statuscmdcomplete,"%*s %d",rows);
+
if(statuscmdcomplete)
+
sscanf(statuscmdcomplete,"%*s %d",rows);
return rows; }
524:
//! @[Sql.sql_result()->num_rows()] int num_rows() { trydelayederror();
-
return
_
rowsreceived;
+
return rowsreceived;
} private inline void trydelayederror() {
686:
} if(_tprepared) if(_tprepared.datarowdesc)
-
prepbuffer=plugbuffer,
gotdatarowdesc();
+
gotdatarowdesc(
plugbuffer
);
else if(dontcacheprefix->match(_query)) // Don't cache FETCH/COPY m_delete(pgsqlsess->_prepareds,_query),_tprepared=0;
-
if(
!prepbuffer
) {
+
if(
prepbufferready
) {
Thread.MutexKey lock=prepbuffermux->lock(); prepbuffer=plugbuffer; catch(prepbufferready->signal());
699:
final void _processrowdesc(array(mapping(string:mixed)) datarowdesc) { _setrowdesc(datarowdesc);
-
mapping
(
string:mixed) tp=
_tprepared
;
//
FIXME
Is
caching this worthwhile?
-
if(
!tp || !tp.datarowdesc
)
+
if
(_tprepared
)
+
_tprepared.datarowdesc=datarowdesc;
+
if(
prepbufferready
)
Thread.Thread(gotdatarowdesc); // Do not use callout, it deadlocks
-
if(tp)
-
tp.datarowdesc=datarowdesc;
+
}
-
private void gotdatarowdesc() {
+
private void gotdatarowdesc(
void|Stdio.Buffer plugbuffer
) {
Thread.MutexKey lock=prepbuffermux->lock();
-
+
if(!plugbuffer) {
if(!prepbuffer) catch(prepbufferready->wait(lock));
-
destruct(prepbufferready);
+
plugbuffer=prepbuffer;
+
prepbuffer=0; // Free memory when plugbuffer leaves scope
+
}
+
if(!prepbufferready || _state==CLOSED)
+
lock=_unnamedstatementkey=0;
+
else {
+
destruct(prepbufferready);
// Make sure we do this exactly once
lock=0;
-
if(_state==CLOSED)
-
return;
-
Stdio.Buffer plugbuffer=prepbuffer;
-
prepbuffer=0; // Free memory early
+
plugbuffer->add_int16(sizeof(_datarowdesc)); if(sizeof(_datarowdesc)) foreach(_datarowdesc;;mapping col) plugbuffer->add_int16(oidformat(col.type)); else if(commitprefix->match(_query)) {
-
Thread.MutexKey
lock=pgsqlsess->_commitmux->lock();
+
lock=pgsqlsess->_commitmux->lock();
if(pgsqlsess->_portalsinflight) { pgsqlsess->_waittocommit++; PD("Commit waiting for portals to finish\n");
744:
execfetchlimit->match(_query)) && FETCHLIMITLONGRUN,bindbuffer); }
+
}
final void _openportal() { pgsqlsess->_portalsinflight++; Thread.MutexKey lock=closemux->lock(); _state=BOUND; lock=0;
-
_
statuscmdcomplete=UNDEFINED;
+
statuscmdcomplete=UNDEFINED;
} final void _purgeportal() {
760:
switch(_state) { case COPYINPROGRESS: case BOUND:
-
_
datarows->write(1); // Signal EOF
+
datarows->write(1);
// Signal EOF
--pgsqlsess->_portalsinflight; } _state=CLOSED;
811:
return retval; }
-
final void _processdataready() {
-
_
rowsreceived++;
-
if(
_
rowsreceived==1)
-
PD("<%O _fetchlimit %d=min(%d||1,%d),
_
inflight %d\n",_portalname,
-
_fetchlimit,(
_
portalbuffersize>>1)*
_
rowsreceived/_bytesreceived,
-
pgsqlsess._fetchlimit,
_
inflight);
+
final void _processdataready(
array datarow
) {
+
inflight--;
+
datarows->write(datarow);
+
rowsreceived++;
+
if(rowsreceived==1)
+
PD("<%O _fetchlimit %d=min(%d||1,%d), inflight %d\n",_portalname,
+
_fetchlimit,(portalbuffersize>>1)*rowsreceived/_bytesreceived,
+
pgsqlsess._fetchlimit,inflight);
if(_fetchlimit) { _fetchlimit=
-
min((
_
portalbuffersize>>1)*
_
rowsreceived/_bytesreceived||1,
+
min((portalbuffersize>>1)*rowsreceived/_bytesreceived||1,
pgsqlsess._fetchlimit); Thread.MutexKey lock=closemux->lock();
-
if(_fetchlimit &&
_
inflight<=_fetchlimit-1)
+
if(_fetchlimit && inflight<=_fetchlimit-1)
_sendexecute(_fetchlimit); else if(!_fetchlimit)
-
PD("<%O _fetchlimit %d,
_
inflight %d, skip execute\n",
-
_portalname,_fetchlimit,
_
inflight);
+
PD("<%O _fetchlimit %d, inflight %d, skip execute\n",
+
_portalname,_fetchlimit,inflight);
lock=0; } }
846:
lock=0; }
-
final void _releasesession() {
-
_
inflight=0;
-
_
datarows->write(1); // Signal EOF
+
final void _releasesession(
void|string statusccomplete
) {
+
if(statusccomplete && !statuscmdcomplete)
+
statuscmdcomplete=statusccomplete;
+
inflight=0;
+
datarows->write(1);
// Signal EOF
conxion plugbuffer=c->start(1); plugbuffer->sendcmd(_closeportal(plugbuffer)); releaseconditions();
870:
if(!fetchlimit) flushmode=_closeportal(plugbuffer)==SYNCSEND?SYNCSEND:FLUSHSEND; else
-
_
inflight+=fetchlimit, flushmode=FLUSHSEND;
+
inflight+=fetchlimit, flushmode=FLUSHSEND;
plugbuffer->sendcmd(flushmode,this); }
884:
//! @[eof()], @[send_row()] array(mixed) fetch_row() { int|array datarow;
-
if(arrayp(datarow=
_
datarows->try_read()))
+
if(arrayp(datarow=datarows->try_read()))
return datarow; if(!eoffound) { if(!datarow && (PD("%O Block for datarow\n",_portalname),
-
arrayp(datarow=
_
datarows->read())))
+
arrayp(datarow=datarows->read())))
return datarow; eoffound=1;
-
_
datarows->write(1); // Signal EOF for other threads
+
datarows->write(1);
// Signal EOF for other threads
} trydelayederror(); return 0;
909:
array(array(mixed)) fetch_row_array() { if(eoffound) return 0;
-
array(array|int) datarow=
_
datarows->try_read_array();
+
array(array|int) datarow=datarows->try_read_array();
if(!datarow)
-
datarow=
_
datarows->read_array();
+
datarow=datarows->read_array();
if(arrayp(datarow[-1])) return datarow; trydelayederror(); eoffound=1;
-
_
datarows->write(1); // Signal EOF for other threads
+
datarows->write(1);
// Signal EOF for other threads
return (datarow=datarow[..<1]); }
945:
function(sql_result, array(mixed), mixed ...:void) callback, array(mixed) args) { int|array datarow;
-
while(arrayp(datarow=
_
datarows->read_array()))
+
while(arrayp(datarow=datarows->read_array()))
callout(callback, 0, this, datarow, @args); trydelayederror(); eoffound=1;
969:
function(sql_result, array(array(mixed)), mixed ...:void) callback, array(mixed) args) { array(array|int) datarow;
-
while((datarow=
_
datarows->read_array()) && arrayp(datarow[-1]))
+
while((datarow=datarows->read_array()) && arrayp(datarow[-1]))
callout(callback, 0, this, datarow, @args); trydelayederror(); eoffound=1;