Skip to content

Commit

Permalink
Add support for sqlite3_unlock_notify
Browse files Browse the repository at this point in the history
  • Loading branch information
typeless authored and Mura Li committed Sep 30, 2018
1 parent 43064d7 commit ad29852
Show file tree
Hide file tree
Showing 3 changed files with 183 additions and 4 deletions.
45 changes: 41 additions & 4 deletions sqlite3.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,38 @@ _sqlite3_exec(sqlite3* db, const char* pcmd, long long* rowid, long long* change
return rv;
}
#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
extern int sqlite3_step_blocking(sqlite3_stmt *stmt);
extern int _sqlite3_step_blocking(sqlite3_stmt* stmt, long long* rowid, long long* changes);
extern int sqlite3_prepare_v2_blocking(sqlite3 *db, const char *zSql, int nBytes, sqlite3_stmt **ppStmt, const char **pzTail);
static int
sqlite3_step_internal(sqlite3_stmt *stmt)
{
return sqlite3_step_blocking(stmt);
}
static int
_sqlite3_step_internal(sqlite3_stmt* stmt, long long* rowid, long long* changes)
{
return _sqlite3_step_blocking(stmt, rowid, changes);
}
static int
_sqlite3_step(sqlite3_stmt* stmt, long long* rowid, long long* changes)
sqlite3_prepare_v2_internal(sqlite3 *db, const char *zSql, int nBytes, sqlite3_stmt **ppStmt, const char **pzTail)
{
return sqlite3_prepare_v2_blocking(db, zSql, nBytes, ppStmt, pzTail);
}
#else
static int
sqlite3_step_internal(sqlite3_stmt *stmt)
{
return sqlite3_step(stmt);
}
static int
_sqlite3_step_internal(sqlite3_stmt* stmt, long long* rowid, long long* changes)
{
int rv = sqlite3_step(stmt);
sqlite3* db = sqlite3_db_handle(stmt);
Expand All @@ -88,6 +118,13 @@ _sqlite3_step(sqlite3_stmt* stmt, long long* rowid, long long* changes)
return rv;
}
static int
sqlite3_prepare_v2_internal(sqlite3 *db, const char *zSql, int nBytes, sqlite3_stmt **ppStmt, const char **pzTail)
{
return sqlite3_prepare_v2(db, zSql, nBytes, ppStmt, pzTail);
}
#endif
void _sqlite3_result_text(sqlite3_context* ctx, const char* s) {
sqlite3_result_text(ctx, s, -1, &free);
}
Expand Down Expand Up @@ -1637,7 +1674,7 @@ func (c *SQLiteConn) prepare(ctx context.Context, query string) (driver.Stmt, er
defer C.free(unsafe.Pointer(pquery))
var s *C.sqlite3_stmt
var tail *C.char
rv := C.sqlite3_prepare_v2(c.db, pquery, -1, &s, &tail)
rv := C.sqlite3_prepare_v2_internal(c.db, pquery, -1, &s, &tail)
if rv != C.SQLITE_OK {
return nil, c.lastError()
}
Expand Down Expand Up @@ -1871,7 +1908,7 @@ func (s *SQLiteStmt) exec(ctx context.Context, args []namedValue) (driver.Result
}

var rowid, changes C.longlong
rv := C._sqlite3_step(s.s, &rowid, &changes)
rv := C._sqlite3_step_internal(s.s, &rowid, &changes)
if rv != C.SQLITE_ROW && rv != C.SQLITE_OK && rv != C.SQLITE_DONE {
err := s.c.lastError()
C.sqlite3_reset(s.s)
Expand Down Expand Up @@ -1943,7 +1980,7 @@ func (rc *SQLiteRows) Next(dest []driver.Value) error {
if rc.s.closed {
return io.EOF
}
rv := C.sqlite3_step(rc.s.s)
rv := C.sqlite3_step_internal(rc.s.s)
if rv == C.SQLITE_DONE {
return io.EOF
}
Expand Down
89 changes: 89 additions & 0 deletions sqlite3_opt_unlock_notify.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
// Copyright (C) 2018 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
//
// Use of this source code is governed by an MIT-style
// license that can be found in the LICENSE file.

#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
#include <sqlite3-binding.h>

extern int unlock_notify_wait(sqlite3 *db);

void _unlock_notify_callback(void *arg, int argc)
{
extern void unlock_notify_callback(void *, int);
unlock_notify_callback(arg, argc);
}

int
sqlite3_step_blocking(sqlite3_stmt *stmt)
{
int rv;
sqlite3* db = sqlite3_db_handle(stmt);

for (;;) {
rv = sqlite3_step(stmt);
if (rv != SQLITE_LOCKED) {
break;
}
if (sqlite3_extended_errcode(db) != SQLITE_LOCKED_SHAREDCACHE) {
break;
}
rv = unlock_notify_wait(db);
if (rv != SQLITE_OK) {
break;
}
sqlite3_reset(stmt);
}

return rv;
}

int
_sqlite3_step_blocking(sqlite3_stmt* stmt, long long* rowid, long long* changes)
{
int rv;
sqlite3* db;

for (;;) {
rv = sqlite3_step(stmt);
if (rv!=SQLITE_LOCKED) {
break;
}
if (sqlite3_extended_errcode(db) != SQLITE_LOCKED_SHAREDCACHE) {
break;
}
rv = unlock_notify_wait(db);
if (rv != SQLITE_OK) {
break;
}
sqlite3_reset(stmt);
}

db = sqlite3_db_handle(stmt);
*rowid = (long long) sqlite3_last_insert_rowid(db);
*changes = (long long) sqlite3_changes(db);
return rv;
}

int
sqlite3_prepare_v2_blocking(sqlite3 *db, const char *zSql, int nBytes, sqlite3_stmt **ppStmt, const char **pzTail)
{
int rv;

for (;;) {
rv = sqlite3_prepare_v2(db, zSql, nBytes, ppStmt, pzTail);
if (rv!=SQLITE_LOCKED) {
break;
}
if (sqlite3_extended_errcode(db) != SQLITE_LOCKED_SHAREDCACHE) {
break;
}
rv = unlock_notify_wait(db);
if (rv != SQLITE_OK) {
break;
}
}

return rv;
}
#endif
53 changes: 53 additions & 0 deletions sqlite3_opt_unlock_notify.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// Copyright (C) 2018 Yasuhiro Matsumoto <mattn.jp@gmail.com>.
//
// Use of this source code is governed by an MIT-style
// license that can be found in the LICENSE file.

// +build cgo
// +build sqlite_unlock_notify

package sqlite3

/*
#cgo CFLAGS: -DSQLITE_ENABLE_UNLOCK_NOTIFY
#include <sqlite3-binding.h>
extern void _unlock_notify_callback(void *arg, int argc);
*/
import "C"
import (
"sync"
"unsafe"
)

type unlockNotification struct {
notify chan struct{}
lock sync.Mutex
}

//export unlock_notify_callback
func unlock_notify_callback(pargv unsafe.Pointer, argc C.int) {
argv := *(*uintptr)(pargv)
v := (*[1 << 30]uintptr)(unsafe.Pointer(argv))
for i := 0; i < int(argc); i++ {
un := lookupHandle(v[i]).(unlockNotification)
un.notify <- struct{}{}
}
}

var notifyMutex sync.Mutex

//export unlock_notify_wait
func unlock_notify_wait(db *C.sqlite3) C.int {
var un unlockNotification
un.notify = make(chan struct{})
defer close(un.notify)

argv := [1]uintptr{newHandle(nil, un)}
if rv := C.sqlite3_unlock_notify(db, (*[0]byte)(C._unlock_notify_callback), unsafe.Pointer(&argv)); rv != C.SQLITE_OK {
return rv
}
<-un.notify
return C.SQLITE_OK
}

0 comments on commit ad29852

Please sign in to comment.