gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-15 08:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve logging of timings (log time taken for connection separately from

Browse source 
that to query/execute a statement).
This commit is contained in:
Richard Frith-Macdonald 2020-03-21 17:15:27 +00:00
parent c3557e74be
commit ca2f44a323
3 changed files with 58 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2020-03-21 Richard Frith-Macdonald <rfm@gnu.org>
* Postgres.m: Don't attempt to establish connection before query or
execute (the superclass should do it).
* SQLClient.m: Ensure connection is established before calling backend
methods where possible. Add timing to establishment of connection.
2020-02-27 Richard Frith-Macdonald <rfm@gnu.org> 2020-02-27 Richard Frith-Macdonald <rfm@gnu.org>
* SQLClient.m: Make the code aware of the tiny string class used by * SQLClient.m: Make the code aware of the tiny string class used by

20
Postgres.m
View file

@ -686,16 +686,6 @@ connectQuote(NSString *str)
const char *tuples; const char *tuples;
unsigned length; unsigned length;
/*
* Ensure we have a working connection.
*/
if ([self connect] == NO)
{
[NSException raise: SQLConnectionException
format: @"Unable to connect to '%@' to execute statement %@",
[self name], stmt];
}
statement = (char*)[stmt UTF8String]; statement = (char*)[stmt UTF8String];
length = strlen(statement); length = strlen(statement);
statement = [self insertBLOBs: info statement = [self insertBLOBs: info
@ -1108,16 +1098,6 @@ static inline unsigned int trim(char *str, unsigned len)
{ {
char *statement; char *statement;
/*
* Ensure we have a working connection.
*/
if ([self connect] == NO)
{
[NSException raise: SQLConnectionException
format: @"Unable to connect to '%@' to run query %@",
[self name], stmt];
}
statement = (char*)[stmt UTF8String]; statement = (char*)[stmt UTF8String];
result = PQexec(connection, statement); result = PQexec(connection, statement);
if (0 == result if (0 == result

52
SQLClient.m
View file

@ -2733,6 +2733,17 @@ static int poolConnections = 0;
[lock lock]; [lock lock];
statement = [info objectAtIndex: 0]; statement = [info objectAtIndex: 0];
/* Ensure we have a working connection.
*/
if ([self connect] == NO)
{
[lock unlock];
[NSException raise: SQLConnectionException
format: @"Unable to connect to '%@' to run statement %@",
[self name], statement];
}
if ([statement isEqualToString: commitString]) if ([statement isEqualToString: commitString])
{ {
isCommit = YES; isCommit = YES;
@ -2741,7 +2752,6 @@ static int poolConnections = 0;
{ {
isRollback = YES; isRollback = YES;
} }
_lastStart = GSTickerTimeNow();
while (NO == done) while (NO == done)
{ {
@ -2749,6 +2759,7 @@ static int poolConnections = 0;
done = YES; done = YES;
NS_DURING NS_DURING
{ {
_lastStart = GSTickerTimeNow();
result = [self backendExecute: info]; result = [self backendExecute: info];
_lastOperation = GSTickerTimeNow(); _lastOperation = GSTickerTimeNow();
[_statements addObject: statement]; [_statements addObject: statement];
@ -2851,6 +2862,13 @@ static int poolConnections = 0;
if (rtype == 0) rtype = rClass; if (rtype == 0) rtype = rClass;
if (ltype == 0) ltype = aClass; if (ltype == 0) ltype = aClass;
[lock lock]; [lock lock];
if ([self connect] == NO)
{
[lock unlock];
[NSException raise: SQLConnectionException
format: @"Unable to connect to '%@' to run query %@",
[self name], stmt];
}
while (NO == done) while (NO == done)
{ {
done = YES; done = YES;
@ -2912,6 +2930,8 @@ static int poolConnections = 0;
{ {
NS_DURING NS_DURING
{ {
NSTimeInterval _lastListen = 0.0;
if (_connectFails > 1) if (_connectFails > 1)
{ {
NSTimeInterval delay; NSTimeInterval delay;
@ -2941,6 +2961,7 @@ static int poolConnections = 0;
NSEnumerator *e; NSEnumerator *e;
NSString *n; NSString *n;
_lastListen = GSTickerTimeNow();
e = [_names objectEnumerator]; e = [_names objectEnumerator];
while (nil != (n = [e nextObject])) while (nil != (n = [e nextObject]))
{ {
@ -2955,6 +2976,28 @@ static int poolConnections = 0;
_lastOperation = GSTickerTimeNow(); _lastOperation = GSTickerTimeNow();
_connectFails++; _connectFails++;
} }
if (_duration >= 0)
{
NSTimeInterval d;
d = _lastOperation - _lastStart;
if (d >= _duration)
{
if (_lastListen > 0.0)
{
[self debug: @"Duration %g for connection (%@)"
@", of which %g adding observers.",
d, (0 == _connectFails ? @"success" : @"failure"),
_lastOperation - _lastListen];
}
else
{
[self debug: @"Duration %g for connection (%@).",
d, (0 == _connectFails ? @"success" : @"failure")];
}
}
}
} }
NS_HANDLER NS_HANDLER
{ {
@ -4424,6 +4467,13 @@ validName(NSString *name)
} }
} }
[lock lock]; [lock lock];
if ([self connect] == NO)
{
[lock unlock];
[NSException raise: SQLConnectionException
format: @"Unable to connect to '%@' to notify %@ with %@",
[self name], name, more];
}
NS_DURING NS_DURING
{ {
[self backendNotify: [self quoteName: name] [self backendNotify: [self quoteName: name]