Skip to content

Commit 1956c5a

Browse files
ncrucesncruces
committed
Cleanup.
1 parent 1165211 commit 1956c5a

8 files changed

Lines changed: 113 additions & 117 deletions

File tree

‎config.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (c *Conn) ConfigLog(cb func(code ExtendedErrorCode, msg string)) error {
7171
return nil
7272
}
7373

74-
func (e env) Xgo_log(_, iCode, zMsg int32) {
74+
func (e *env) Xgo_log(_, iCode, zMsg int32) {
7575
if c, ok := e.DB.(*Conn); ok && c.log != nil {
7676
msg := e.ReadString(ptr_t(zMsg), _MAX_LENGTH)
7777
c.log(xErrorCode(iCode), msg)
@@ -213,7 +213,7 @@ func (c *Conn) SetAuthorizer(cb func(action AuthorizerActionCode, name3rd, name4
213213
return nil
214214
}
215215

216-
func (e env) Xgo_authorizer(pDB, action, zName3rd, zName4th, zSchema, zInner int32) (rc int32) {
216+
func (e *env) Xgo_authorizer(pDB, action, zName3rd, zName4th, zSchema, zInner int32) (rc int32) {
217217
if c, ok := e.DB.(*Conn); ok && c.handle == ptr_t(pDB) && c.authorizer != nil {
218218
var name3rd, name4th, schema, inner string
219219
if zName3rd != 0 {
@@ -245,7 +245,7 @@ func (c *Conn) Trace(mask TraceEvent, cb func(evt TraceEvent, arg1 any, arg2 any
245245
return nil
246246
}
247247

248-
func (e env) Xgo_trace(evt, pDB, pArg1, pArg2 int32) int32 {
248+
func (e *env) Xgo_trace(evt, pDB, pArg1, pArg2 int32) int32 {
249249
if c, ok := e.DB.(*Conn); ok && c.handle == ptr_t(pDB) && c.trace != nil {
250250
var arg1, arg2 any
251251
if TraceEvent(evt) == TRACE_CLOSE {
@@ -312,7 +312,7 @@ func (c *Conn) WALHook(cb func(db *Conn, schema string, pages int) error) {
312312
c.wal = cb
313313
}
314314

315-
func (e env) Xgo_wal_hook(_, pDB, zSchema, pages int32) int32 {
315+
func (e *env) Xgo_wal_hook(_, pDB, zSchema, pages int32) int32 {
316316
if c, ok := e.DB.(*Conn); ok && c.handle == ptr_t(pDB) && c.wal != nil {
317317
schema := e.ReadString(ptr_t(zSchema), _MAX_NAME)
318318
err := c.wal(c, schema, int(pages))
@@ -334,7 +334,7 @@ func (c *Conn) AutoVacuumPages(cb func(schema string, dbPages, freePages, bytesP
334334
return c.error(rc)
335335
}
336336

337-
func (e env) Xgo_autovacuum_pages(pApp, zSchema, nDbPage, nFreePage, nBytePerPage int32) int32 {
337+
func (e *env) Xgo_autovacuum_pages(pApp, zSchema, nDbPage, nFreePage, nBytePerPage int32) int32 {
338338
fn := e.GetHandle(ptr_t(pApp)).(func(schema string, dbPages, freePages, bytesPerPage uint) uint)
339339
schema := e.ReadString(ptr_t(zSchema), _MAX_NAME)
340340
return int32(fn(schema, uint(uint32(nDbPage)), uint(uint32(nFreePage)), uint(uint32(nBytePerPage))))

‎conn.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ func (c *Conn) SetInterrupt(ctx context.Context) (old context.Context) {
347347
return old
348348
}
349349

350-
func (e env) Xgo_progress_handler(_ int32) (interrupt int32) {
350+
func (e *env) Xgo_progress_handler(_ int32) (interrupt int32) {
351351
if c, ok := e.DB.(*Conn); ok {
352352
if c.gosched++; c.gosched%16 == 0 {
353353
runtime.Gosched()
@@ -368,7 +368,7 @@ func (c *Conn) BusyTimeout(timeout time.Duration) error {
368368
return c.error(rc)
369369
}
370370

371-
func (e env) Xgo_busy_timeout(count, tmout int32) (retry int32) {
371+
func (e *env) Xgo_busy_timeout(count, tmout int32) (retry int32) {
372372
// https://fractaledmind.github.io/2024/04/15/sqlite-on-rails-the-how-and-why-of-optimal-performance/
373373
if c, ok := e.DB.(*Conn); ok && c.interrupt.Err() == nil {
374374
switch {
@@ -403,7 +403,7 @@ func (c *Conn) BusyHandler(cb func(ctx context.Context, count int) (retry bool))
403403
return nil
404404
}
405405

406-
func (e env) Xgo_busy_handler(pDB, count int32) (retry int32) {
406+
func (e *env) Xgo_busy_handler(pDB, count int32) (retry int32) {
407407
if c, ok := e.DB.(*Conn); ok && c.handle == ptr_t(pDB) && c.busy != nil {
408408
if interrupt := c.interrupt; interrupt.Err() == nil &&
409409
c.busy(interrupt, int(count)) {

‎func.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,41 +175,41 @@ func (c *Conn) OverloadFunction(name string, nArg int) error {
175175
return c.error(rc)
176176
}
177177

178-
func (e env) Xgo_destroy(pApp int32) {
178+
func (e *env) Xgo_destroy(pApp int32) {
179179
e.DelHandle(ptr_t(pApp))
180180
}
181181

182-
func (e env) Xgo_collation_needed(pArg, pDB, eTextRep, zName int32) {
182+
func (e *env) Xgo_collation_needed(pArg, pDB, eTextRep, zName int32) {
183183
if c, ok := e.DB.(*Conn); ok && c.handle == ptr_t(pDB) && c.collation != nil {
184184
name := e.ReadString(ptr_t(zName), _MAX_NAME)
185185
c.collation(c, name)
186186
}
187187
}
188188

189-
func (e env) Xgo_compare(pApp, nKey1, pKey1, nKey2, pKey2 int32) int32 {
189+
func (e *env) Xgo_compare(pApp, nKey1, pKey1, nKey2, pKey2 int32) int32 {
190190
fn := e.GetHandle(ptr_t(pApp)).(CollatingFunction)
191191
return int32(fn(
192192
e.Slice(ptr_t(pKey1), int64(nKey1)),
193193
e.Slice(ptr_t(pKey2), int64(nKey2))))
194194
}
195195

196-
func (e env) Xgo_func(pCtx, pApp, nArg, pArg int32) {
196+
func (e *env) Xgo_func(pCtx, pApp, nArg, pArg int32) {
197197
db := e.DB.(*Conn)
198198
args := callbackArgs(db, nArg, ptr_t(pArg))
199199
defer returnArgs(args)
200200
fn := db.wrp.GetHandle(ptr_t(pApp)).(ScalarFunction)
201201
fn(Context{db, ptr_t(pCtx)}, *args...)
202202
}
203203

204-
func (e env) Xgo_step(pCtx, pAgg, pApp, nArg, pArg int32) {
204+
func (e *env) Xgo_step(pCtx, pAgg, pApp, nArg, pArg int32) {
205205
db := e.DB.(*Conn)
206206
args := callbackArgs(db, nArg, ptr_t(pArg))
207207
defer returnArgs(args)
208208
fn, _ := callbackAggregate(db, ptr_t(pAgg), ptr_t(pApp))
209209
fn.Step(Context{db, ptr_t(pCtx)}, *args...)
210210
}
211211

212-
func (e env) Xgo_value(pCtx, pAgg, pApp, final int32) {
212+
func (e *env) Xgo_value(pCtx, pAgg, pApp, final int32) {
213213
db := e.DB.(*Conn)
214214
fn, handle := callbackAggregate(db, ptr_t(pAgg), ptr_t(pApp))
215215
fn.Value(Context{db, ptr_t(pCtx)})
@@ -229,7 +229,7 @@ func (e env) Xgo_value(pCtx, pAgg, pApp, final int32) {
229229
}
230230
}
231231

232-
func (e env) Xgo_inverse(pCtx, pAgg, nArg, pArg int32) {
232+
func (e *env) Xgo_inverse(pCtx, pAgg, nArg, pArg int32) {
233233
db := e.DB.(*Conn)
234234
args := callbackArgs(db, nArg, ptr_t(pArg))
235235
defer returnArgs(args)

‎internal/sqlite3_wrap/mem.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ const (
1414
)
1515

1616
type (
17-
i8 = interface{ ~int8 | ~uint8 }
18-
i32 = interface{ ~int32 | ~uint32 }
19-
i64 = interface{ ~int64 | ~uint64 }
20-
2117
Ptr_t uint32
2218
Res_t int32
2319
)

‎txn.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ func (c *Conn) UpdateHook(cb func(action AuthorizerActionCode, schema, table str
264264
c.update = cb
265265
}
266266

267-
func (e env) Xgo_commit_hook(pDB int32) (rollback int32) {
267+
func (e *env) Xgo_commit_hook(pDB int32) (rollback int32) {
268268
if c, ok := e.DB.(*Conn); ok && c.handle == ptr_t(pDB) && c.commit != nil {
269269
if !c.commit() {
270270
rollback = 1
@@ -273,13 +273,13 @@ func (e env) Xgo_commit_hook(pDB int32) (rollback int32) {
273273
return rollback
274274
}
275275

276-
func (e env) Xgo_rollback_hook(pDB int32) {
276+
func (e *env) Xgo_rollback_hook(pDB int32) {
277277
if c, ok := e.DB.(*Conn); ok && c.handle == ptr_t(pDB) && c.rollback != nil {
278278
c.rollback()
279279
}
280280
}
281281

282-
func (e env) Xgo_update_hook(pDB, action, zSchema, zTabName int32, rowid int64) {
282+
func (e *env) Xgo_update_hook(pDB, action, zSchema, zTabName int32, rowid int64) {
283283
if c, ok := e.DB.(*Conn); ok && c.handle == ptr_t(pDB) && c.update != nil {
284284
schema := e.ReadString(ptr_t(zSchema), _MAX_NAME)
285285
table := e.ReadString(ptr_t(zTabName), _MAX_NAME)

‎vtab.go‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ const (
444444
INDEX_SCAN_HEX IndexScanFlag = 0x00000002
445445
)
446446

447-
func (e env) vtabModuleCallback(kind vtabConstructor, pMod, nArg, pArg, ppVTab, pzErr int32) int32 {
447+
func (e *env) vtabModuleCallback(kind vtabConstructor, pMod, nArg, pArg, ppVTab, pzErr int32) int32 {
448448
arg := make([]reflect.Value, 1+nArg)
449449
arg[0] = reflect.ValueOf(e.DB)
450450

@@ -463,26 +463,26 @@ func (e env) vtabModuleCallback(kind vtabConstructor, pMod, nArg, pArg, ppVTab,
463463
return e.vtabError(pzErr, _PTR_ERROR, err, ERROR)
464464
}
465465

466-
func (e env) Xgo_vtab_create(pMod, nArg, pArg, ppVTab, pzErr int32) int32 {
466+
func (e *env) Xgo_vtab_create(pMod, nArg, pArg, ppVTab, pzErr int32) int32 {
467467
return e.vtabModuleCallback(xCreate, pMod, nArg, pArg, ppVTab, pzErr)
468468
}
469469

470-
func (e env) Xgo_vtab_connect(pMod, nArg, pArg, ppVTab, pzErr int32) int32 {
470+
func (e *env) Xgo_vtab_connect(pMod, nArg, pArg, ppVTab, pzErr int32) int32 {
471471
return e.vtabModuleCallback(xConnect, pMod, nArg, pArg, ppVTab, pzErr)
472472
}
473473

474-
func (e env) Xgo_vtab_disconnect(pVTab int32) int32 {
474+
func (e *env) Xgo_vtab_disconnect(pVTab int32) int32 {
475475
err := e.vtabDelHandle(pVTab)
476476
return e.vtabError(0, _PTR_ERROR, err, ERROR)
477477
}
478478

479-
func (e env) Xgo_vtab_destroy(pVTab int32) int32 {
479+
func (e *env) Xgo_vtab_destroy(pVTab int32) int32 {
480480
vtab := e.vtabGetHandle(pVTab).(VTabDestroyer)
481481
err := errors.Join(vtab.Destroy(), e.vtabDelHandle(pVTab))
482482
return e.vtabError(0, _PTR_ERROR, err, ERROR)
483483
}
484484

485-
func (e env) Xgo_vtab_best_index(pVTab, pIdxInfo int32) int32 {
485+
func (e *env) Xgo_vtab_best_index(pVTab, pIdxInfo int32) int32 {
486486
var info IndexInfo
487487
info.handle = ptr_t(pIdxInfo)
488488
info.c = e.DB.(*Conn)
@@ -495,7 +495,7 @@ func (e env) Xgo_vtab_best_index(pVTab, pIdxInfo int32) int32 {
495495
return e.vtabError(pVTab, _VTAB_ERROR, err, ERROR)
496496
}
497497

498-
func (e env) Xgo_vtab_update(pVTab, nArg, pArg, pRowID int32) int32 {
498+
func (e *env) Xgo_vtab_update(pVTab, nArg, pArg, pRowID int32) int32 {
499499
db := e.DB.(*Conn)
500500
args := callbackArgs(db, nArg, ptr_t(pArg))
501501
defer returnArgs(args)
@@ -509,13 +509,13 @@ func (e env) Xgo_vtab_update(pVTab, nArg, pArg, pRowID int32) int32 {
509509
return e.vtabError(pVTab, _VTAB_ERROR, err, ERROR)
510510
}
511511

512-
func (e env) Xgo_vtab_rename(pVTab, zNew int32) int32 {
512+
func (e *env) Xgo_vtab_rename(pVTab, zNew int32) int32 {
513513
vtab := e.vtabGetHandle(pVTab).(VTabRenamer)
514514
err := vtab.Rename(e.ReadString(ptr_t(zNew), _MAX_NAME))
515515
return e.vtabError(pVTab, _VTAB_ERROR, err, ERROR)
516516
}
517517

518-
func (e env) Xgo_vtab_find_function(pVTab, nArg, zName, pxFunc int32) int32 {
518+
func (e *env) Xgo_vtab_find_function(pVTab, nArg, zName, pxFunc int32) int32 {
519519
vtab := e.vtabGetHandle(pVTab).(VTabOverloader)
520520
f, op := vtab.FindFunction(int(nArg), e.ReadString(ptr_t(zName), _MAX_NAME))
521521
if op != 0 {
@@ -529,7 +529,7 @@ func (e env) Xgo_vtab_find_function(pVTab, nArg, zName, pxFunc int32) int32 {
529529
return int32(op)
530530
}
531531

532-
func (e env) Xgo_vtab_integrity(pVTab, zSchema, zTabName, mFlags, pzErr int32) int32 {
532+
func (e *env) Xgo_vtab_integrity(pVTab, zSchema, zTabName, mFlags, pzErr int32) int32 {
533533
vtab := e.vtabGetHandle(pVTab).(VTabChecker)
534534
schema := e.ReadString(ptr_t(zSchema), _MAX_NAME)
535535
table := e.ReadString(ptr_t(zTabName), _MAX_NAME)
@@ -539,49 +539,49 @@ func (e env) Xgo_vtab_integrity(pVTab, zSchema, zTabName, mFlags, pzErr int32) i
539539
return e.vtabError(pzErr, _PTR_ERROR, err, _OK)
540540
}
541541

542-
func (e env) Xgo_vtab_begin(pVTab int32) int32 {
542+
func (e *env) Xgo_vtab_begin(pVTab int32) int32 {
543543
vtab := e.vtabGetHandle(pVTab).(VTabTxn)
544544
err := vtab.Begin()
545545
return e.vtabError(pVTab, _VTAB_ERROR, err, ERROR)
546546
}
547547

548-
func (e env) Xgo_vtab_sync(pVTab int32) int32 {
548+
func (e *env) Xgo_vtab_sync(pVTab int32) int32 {
549549
vtab := e.vtabGetHandle(pVTab).(VTabTxn)
550550
err := vtab.Sync()
551551
return e.vtabError(pVTab, _VTAB_ERROR, err, ERROR)
552552
}
553553

554-
func (e env) Xgo_vtab_commit(pVTab int32) int32 {
554+
func (e *env) Xgo_vtab_commit(pVTab int32) int32 {
555555
vtab := e.vtabGetHandle(pVTab).(VTabTxn)
556556
err := vtab.Commit()
557557
return e.vtabError(pVTab, _VTAB_ERROR, err, ERROR)
558558
}
559559

560-
func (e env) Xgo_vtab_rollback(pVTab int32) int32 {
560+
func (e *env) Xgo_vtab_rollback(pVTab int32) int32 {
561561
vtab := e.vtabGetHandle(pVTab).(VTabTxn)
562562
err := vtab.Rollback()
563563
return e.vtabError(pVTab, _VTAB_ERROR, err, ERROR)
564564
}
565565

566-
func (e env) Xgo_vtab_savepoint(pVTab, id int32) int32 {
566+
func (e *env) Xgo_vtab_savepoint(pVTab, id int32) int32 {
567567
vtab := e.vtabGetHandle(pVTab).(VTabSavepointer)
568568
err := vtab.Savepoint(int(id))
569569
return e.vtabError(pVTab, _VTAB_ERROR, err, ERROR)
570570
}
571571

572-
func (e env) Xgo_vtab_release(pVTab, id int32) int32 {
572+
func (e *env) Xgo_vtab_release(pVTab, id int32) int32 {
573573
vtab := e.vtabGetHandle(pVTab).(VTabSavepointer)
574574
err := vtab.Release(int(id))
575575
return e.vtabError(pVTab, _VTAB_ERROR, err, ERROR)
576576
}
577577

578-
func (e env) Xgo_vtab_rollback_to(pVTab, id int32) int32 {
578+
func (e *env) Xgo_vtab_rollback_to(pVTab, id int32) int32 {
579579
vtab := e.vtabGetHandle(pVTab).(VTabSavepointer)
580580
err := vtab.RollbackTo(int(id))
581581
return e.vtabError(pVTab, _VTAB_ERROR, err, ERROR)
582582
}
583583

584-
func (e env) Xgo_cur_open(pVTab, ppCur int32) int32 {
584+
func (e *env) Xgo_cur_open(pVTab, ppCur int32) int32 {
585585
vtab := e.vtabGetHandle(pVTab).(VTab)
586586

587587
cursor, err := vtab.Open()
@@ -592,12 +592,12 @@ func (e env) Xgo_cur_open(pVTab, ppCur int32) int32 {
592592
return e.vtabError(pVTab, _VTAB_ERROR, err, ERROR)
593593
}
594594

595-
func (e env) Xgo_cur_close(pCur int32) int32 {
595+
func (e *env) Xgo_cur_close(pCur int32) int32 {
596596
err := e.vtabDelHandle(pCur)
597597
return e.vtabError(0, _PTR_ERROR, err, ERROR)
598598
}
599599

600-
func (e env) Xgo_cur_filter(pCur, idxNum, idxStr, nArg, pArg int32) int32 {
600+
func (e *env) Xgo_cur_filter(pCur, idxNum, idxStr, nArg, pArg int32) int32 {
601601
db := e.DB.(*Conn)
602602
args := callbackArgs(db, nArg, ptr_t(pArg))
603603
defer returnArgs(args)
@@ -612,28 +612,28 @@ func (e env) Xgo_cur_filter(pCur, idxNum, idxStr, nArg, pArg int32) int32 {
612612
return e.vtabError(pCur, _CURSOR_ERROR, err, ERROR)
613613
}
614614

615-
func (e env) Xgo_cur_eof(pCur int32) int32 {
615+
func (e *env) Xgo_cur_eof(pCur int32) int32 {
616616
cursor := e.vtabGetHandle(pCur).(VTabCursor)
617617
if cursor.EOF() {
618618
return 1
619619
}
620620
return 0
621621
}
622622

623-
func (e env) Xgo_cur_next(pCur int32) int32 {
623+
func (e *env) Xgo_cur_next(pCur int32) int32 {
624624
cursor := e.vtabGetHandle(pCur).(VTabCursor)
625625
err := cursor.Next()
626626
return e.vtabError(pCur, _CURSOR_ERROR, err, ERROR)
627627
}
628628

629-
func (e env) Xgo_cur_column(pCur, pCtx, n int32) int32 {
629+
func (e *env) Xgo_cur_column(pCur, pCtx, n int32) int32 {
630630
cursor := e.vtabGetHandle(pCur).(VTabCursor)
631631
db := e.DB.(*Conn)
632632
err := cursor.Column(Context{db, ptr_t(pCtx)}, int(n))
633633
return e.vtabError(pCur, _CURSOR_ERROR, err, ERROR)
634634
}
635635

636-
func (e env) Xgo_cur_rowid(pCur, pRowID int32) int32 {
636+
func (e *env) Xgo_cur_rowid(pCur, pRowID int32) int32 {
637637
cursor := e.vtabGetHandle(pCur).(VTabCursor)
638638

639639
rowID, err := cursor.RowID()
@@ -650,7 +650,7 @@ const (
650650
_CURSOR_ERROR
651651
)
652652

653-
func (e env) vtabError(ptr int32, kind uint32, err error, def ErrorCode) int32 {
653+
func (e *env) vtabError(ptr int32, kind uint32, err error, def ErrorCode) int32 {
654654
const zErrMsgOffset = 8
655655
msg, code := errorCode(err, def)
656656
if ptr != 0 && msg != "" {
@@ -669,19 +669,19 @@ func (e env) vtabError(ptr int32, kind uint32, err error, def ErrorCode) int32 {
669669
return int32(code)
670670
}
671671

672-
func (e env) vtabGetHandle(ptr int32) any {
672+
func (e *env) vtabGetHandle(ptr int32) any {
673673
const handleOffset = 4
674674
handle := ptr_t(e.Memory.Read32(ptr_t(ptr) - handleOffset))
675675
return e.GetHandle(handle)
676676
}
677677

678-
func (e env) vtabDelHandle(ptr int32) error {
678+
func (e *env) vtabDelHandle(ptr int32) error {
679679
const handleOffset = 4
680680
handle := ptr_t(e.Memory.Read32(ptr_t(ptr) - handleOffset))
681681
return e.DelHandle(handle)
682682
}
683683

684-
func (e env) vtabPutHandle(pptr int32, val any) {
684+
func (e *env) vtabPutHandle(pptr int32, val any) {
685685
const handleOffset = 4
686686
handle := e.AddHandle(val)
687687
ptr := ptr_t(e.Memory.Read32(ptr_t(pptr)))

0 commit comments

Comments
 (0)