Temp commented out finalize code

Author: djthorpe

pkg/sqlite3/cache_test.go

@@ -26,16 +26,16 @@ func Test_Cache_001(t *testing.T) {
 
 	// Perform caching in a transaction
 	conn.Do(context.Background(), 0, func(txn SQTransaction) error {
-		// SELECT n between 0-9 over 100 executions in parallel should
+		// SELECT n between 0-9 over 1000 executions in parallel should
 		// return the same result, with a perfect cache hit rate of 9 in 10?
 		var wg sync.WaitGroup
-		for i := 0; i < 10000; i++ {
+		for i := 0; i < 1000; i++ {
 			wg.Add(1)
 			go func() {
 				txn.Lock()
 				defer txn.Unlock()
 				defer wg.Done()
-				n := rand.Uint32() % 200
+				n := rand.Uint32() % 10
 				r, err := txn.Query(Q("SELECT ", n))
 				if err != nil {
 					t.Error("Query Error: ", err)

pkg/sqlite3/pool_test.go

@@ -33,11 +33,11 @@ func Test_Pool_002(t *testing.T) {
 	} else {
 		t.Log(pool)
 	}
-	pool.SetMax(5000)
+	pool.SetMax(500)
 
 	// Get/put connections
 	var wg sync.WaitGroup
-	for i := 0; i < 5000; i++ {
+	for i := 0; i < 500; i++ {
 		wg.Add(1)
 		go func(i int) {
 			defer wg.Done()

pkg/sqlite3/results.go

@@ -38,7 +38,7 @@ func (r *Results) Close() error {
 	if !r.st.Cached() {
 		return r.st.Close()
 	} else {
-		return nil
+		return r.st.Close()
 	}
 }
 

sys/sqlite3/statementex.go

@@ -3,7 +3,6 @@ package sqlite3
 import (
 	"errors"
 	"fmt"
-	"runtime"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -19,7 +18,7 @@ type StatementEx struct {
 	sync.Mutex
 	st     []*Statement
 	cached bool
-	n      uint32
+	n      uint64
 	ts     int64
 }
 
@@ -45,13 +44,15 @@ func (c *ConnEx) Prepare(q string) (*StatementEx, error) {
 	s.ts = time.Now().UnixNano()
 
 	// Report on missing close
-	_, file, line, _ := runtime.Caller(2)
-	runtime.SetFinalizer(s, func(s *StatementEx) {
-		if s.st != nil {
-			fmt.Println(s, s.cached)
-			panic(fmt.Sprintf("%s:%d: Prepare() missing call to Close()", file, line))
-		}
-	})
+	/*
+		_, file, line, _ := runtime.Caller(2)
+		runtime.SetFinalizer(s, func(s *StatementEx) {
+			if s.st != nil {
+				fmt.Println(s, s.cached)
+				panic(fmt.Sprintf("%s:%d: Prepare() missing call to Close()", file, line))
+			}
+		})
+	*/
 
 	// Return statement
 	return s, nil
@@ -142,14 +143,14 @@ func (s *StatementEx) Exec(n uint, v ...interface{}) (*Results, error) {
 }
 
 // Increment adds n to the statement counter and updates the timestamp
-func (s *StatementEx) Inc(n uint32) uint32 {
+func (s *StatementEx) Inc(n uint64) uint64 {
 	atomic.StoreInt64(&s.ts, time.Now().UnixNano())
-	return atomic.AddUint32(&s.n, n)
+	return atomic.AddUint64(&s.n, n)
 }
 
 // Returns current count. Used to count the frequency of calls for caching purposes.
-func (s *StatementEx) Count() uint32 {
-	return atomic.LoadUint32(&s.n)
+func (s *StatementEx) Count() uint64 {
+	return atomic.LoadUint64(&s.n)
 }
 
 // Returns last accessed timestamp for caching purposes as an int64