Skip to content

Replace nil: string with "" so that it compiles for 0.19.0. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replace nil: string with "" so that it compiles for 0.19.0. #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15c3e44
Replace string nil with "" so that it compiles.
treeform Oct 29, 2018
bf392e9
Fix issue with exceeding conneciton pool max connections.
treeform Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 15 additions & 22 deletions asyncpg/apg_core.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,24 +58,14 @@ proc pqserverVersion(conn: PPGconn): cint

proc getFreeConnection(pool: apgPool): Future[int] =
var retFuture = newFuture[int]("asyncpg.getFreeConnection")
proc cb() =
if not retFuture.finished:
var index = 0
while index < len(pool.futures):
let fut = pool.futures[index]
if fut == nil or fut.finished:
var replaceFuture = newFuture[void]("asyncpg.pool." & $index)
pool.futures[index] = replaceFuture
retFuture.complete(index)
break
inc(index)
cb()
# this code will run only if there no available connections left
if not retFuture.finished:
var index = 0
while index < len(pool.futures):
pool.futures[index].callback = cb
inc(index)
for index, f in pool.futures:
if f == nil or f.finished:
var replaceFuture = newFuture[void]("asyncpg.pool." & $index)
pool.futures[index] = replaceFuture
retFuture.complete(index)
return retFuture
# could not find a free connection, return -1
retFuture.complete(-1)
return retFuture

# proc getIndexConnection(pool: apgPool, index: int): Future[int] =
Expand Down Expand Up @@ -238,7 +228,7 @@ template processPendingNotifications(conn: apgConnection, notify: bool) =
proc copyTo*(conn: apgConnection, buffer: pointer,
nbytes: int32): Future[apgResult] =
## Copy data from buffer ``buffer`` of size ``nbytes`` to PostgreSQL's
## stdin.
## stdin.
## Be sure to execute ``COPY FROM`` statement before start sending data with
## this function. After all data have been sent, you need to finish sending
## process with call ``copyTo(conn, nil, 0)``.
Expand Down Expand Up @@ -345,7 +335,7 @@ proc copyFromInto*(conn: apgConnection, buffer: pointer,

proc cb(fd: AsyncFD): bool {.closure,gcsafe.} =
if not retFuture.finished:
let res = pqgetCopyData(conn.pgconn, cast[cstringArray](addr copyString),
let res = pqgetCopyData(conn.pgconn, cast[cstringArray](addr copyString),
1)
if res > 0:
doAssert(res.int <= nbytes)
Expand Down Expand Up @@ -466,6 +456,9 @@ proc execPoolAsync(pool: apgPool, statement: string, pN: int32, pT: POid,
pV: cstringArray, pL, pF: ptr int32,
rF: int32): Future[apgResult] {.async.} =
var index = await getFreeConnection(pool)
while index == -1:
index = await getFreeConnection(pool)
await sleepAsync(1)
result = await execAsync(pool.connections[index], statement, pN, pT,
pV, pL, pF, rF, false)
# processing connection notifies
Expand Down Expand Up @@ -500,7 +493,7 @@ template setRow(pgres: PPGresult, r, line, cols) =
for col in 0..<cols:
let x = pqgetvalue(pgres, line.int32, col.int32)
if x.isNil:
r[col] = nil
r[col] = ""
else:
r[col] = $x

Expand All @@ -509,7 +502,7 @@ template setRowInline(pgres: PPGresult, r, line, cols) =
setLen(r[col], 0)
let x = pqgetvalue(pgres, line.int32, col.int32)
if x.isNil:
r[col] = nil
r[col] = ""
else:
add(r[col], x)

Expand Down