Skip to content

Commit

Permalink
Merge pull request #216 from qianbin/log-db
Browse files Browse the repository at this point in the history
Log db
  • Loading branch information
qianbin authored Feb 13, 2019
2 parents 4c59af1 + 0a0ff61 commit accdacd
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ignored = []

[[constraint]]
name = "github.com/mattn/go-sqlite3"
version = "1.6.0"
version = "1.10.0"

[[constraint]]
branch = "master"
Expand Down
6 changes: 5 additions & 1 deletion logdb/logdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type LogDB struct {

// New create or open log db at given path.
func New(path string) (logDB *LogDB, err error) {
db, err := sql.Open("sqlite3", path)
db, err := sql.Open("sqlite3", path+"?_journal=wal&cache=shared")
if err != nil {
return nil, err
}
Expand All @@ -34,6 +34,10 @@ func New(path string) (logDB *LogDB, err error) {
db.Close()
}
}()

// to avoid 'database is locked' error
db.SetMaxOpenConns(1)

if _, err := db.Exec(eventTableSchema + transferTableSchema); err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion vendor
Submodule vendor updated 29 files
+120 −0 github.com/mattn/go-sqlite3/sqlite3_func_crypt.go
+57 −0 github.com/mattn/go-sqlite3/sqlite3_func_crypt_test.go
+24 −0 github.com/mattn/go-sqlite3/sqlite3_load_extension_omit.go
+15 −0 github.com/mattn/go-sqlite3/sqlite3_opt_allow_uri_authority.go
+16 −0 github.com/mattn/go-sqlite3/sqlite3_opt_app_armor.go
+15 −0 github.com/mattn/go-sqlite3/sqlite3_opt_foreign_keys.go
+130 −0 github.com/mattn/go-sqlite3/sqlite3_opt_fts3_test.go
+14 −0 github.com/mattn/go-sqlite3/sqlite3_opt_fts5.go
+17 −0 github.com/mattn/go-sqlite3/sqlite3_opt_icu.go
+15 −0 github.com/mattn/go-sqlite3/sqlite3_opt_introspect.go
+13 −0 github.com/mattn/go-sqlite3/sqlite3_opt_json1.go
+15 −0 github.com/mattn/go-sqlite3/sqlite3_opt_secure_delete.go
+15 −0 github.com/mattn/go-sqlite3/sqlite3_opt_secure_delete_fast.go
+15 −0 github.com/mattn/go-sqlite3/sqlite3_opt_stat4.go
+85 −0 github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.c
+93 −0 github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.go
+222 −0 github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify_test.go
+289 −0 github.com/mattn/go-sqlite3/sqlite3_opt_userauth.go
+152 −0 github.com/mattn/go-sqlite3/sqlite3_opt_userauth_omit.go
+619 −0 github.com/mattn/go-sqlite3/sqlite3_opt_userauth_test.go
+15 −0 github.com/mattn/go-sqlite3/sqlite3_opt_vacuum_full.go
+15 −0 github.com/mattn/go-sqlite3/sqlite3_opt_vacuum_incr.go
+650 −0 github.com/mattn/go-sqlite3/sqlite3_opt_vtable.go
+486 −0 github.com/mattn/go-sqlite3/sqlite3_opt_vtable_test.go
+14 −0 github.com/mattn/go-sqlite3/sqlite3_solaris.go
+39 −0 github.com/mattn/go-sqlite3/sqlite3_usleep_windows.go
+21 −0 github.com/mattn/go-sqlite3/static_mock.go
+7 −0 github.com/mattn/go-sqlite3/upgrade/package.go
+218 −0 github.com/mattn/go-sqlite3/upgrade/upgrade.go

0 comments on commit accdacd

Please sign in to comment.