use slice len/cap for stmt cache instead of separate counters

sqlite3.go

@@ -451,15 +451,14 @@ type SQLiteConn struct {
 	txlock         string
 	funcs          []*functionInfo
 	aggregators    []*aggInfo
-	// Prepared-statement cache. stmtCacheBuf is a preallocated slice of
+	// Prepared-statement cache. The slice is allocated at Open with a
-	// length stmtCacheSize holding up to stmtCacheCount live entries at
+	// fixed capacity equal to the configured cache size; cap bounds the
-	// indices [0, stmtCacheCount). Ordering is LRU-first: index 0 is the
+	// cache, len is the live count, and entries are ordered LRU-first
-	// oldest (next to be evicted), index stmtCacheCount-1 is the most
+	// (index 0 is the oldest, the tail is most recently put). Access
-	// recently put. put at the tail is O(1) when not full; eviction shifts
+	// requires mu; stmtCacheEnabled is immutable after Open and is the
-	// the remaining entries left by one.
+	// only field safe to read without the lock.
-	stmtCacheBuf   []*SQLiteStmt
+	stmtCache        []*SQLiteStmt
-	stmtCacheSize  int
+	stmtCacheEnabled bool
-	stmtCacheCount int
 }
 
 // SQLiteTx implements driver.Tx.
@@ -1617,9 +1616,10 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 	//
 
 	// Create connection to SQLite
-	conn := &SQLiteConn{db: db, loc: loc, txlock: txlock, stmtCacheSize: stmtCacheSize}
+	conn := &SQLiteConn{db: db, loc: loc, txlock: txlock}
 	if stmtCacheSize > 0 {
-		conn.stmtCacheBuf = make([]*SQLiteStmt, stmtCacheSize)
+		conn.stmtCache = make([]*SQLiteStmt, 0, stmtCacheSize)
+		conn.stmtCacheEnabled = true
 	}
 
 	// Password Cipher has to be registered before authentication
@@ -1913,7 +1913,7 @@ func (c *SQLiteConn) dbConnOpen() bool {
 }
 
 func (c *SQLiteConn) takeCachedStmt(query string) *SQLiteStmt {
-	if c == nil || query == "" || c.stmtCacheSize <= 0 {
+	if c == nil || query == "" || !c.stmtCacheEnabled {
 		return nil
 	}
 
@@ -1925,17 +1925,15 @@ func (c *SQLiteConn) takeCachedStmt(query string) *SQLiteStmt {
 	}
 	// Scan from the MRU end (tail) so that a stmt put just before is
 	// found immediately.
-	for i := c.stmtCacheCount - 1; i >= 0; i-- {
+	for i := len(c.stmtCache) - 1; i >= 0; i-- {
-		s := c.stmtCacheBuf[i]
+		s := c.stmtCache[i]
 		if s.cacheKey != query {
 			continue
 		}
-		// Remove s from the buffer by shifting subsequent entries left.
+		n := len(c.stmtCache)
-		if i != c.stmtCacheCount-1 {
+		copy(c.stmtCache[i:n-1], c.stmtCache[i+1:n])
-			copy(c.stmtCacheBuf[i:c.stmtCacheCount-1], c.stmtCacheBuf[i+1:c.stmtCacheCount])
+		c.stmtCache[n-1] = nil
-		}
+		c.stmtCache = c.stmtCache[:n-1]
-		c.stmtCacheCount--
-		c.stmtCacheBuf[c.stmtCacheCount] = nil
 		s.closed = false
 		s.cls = false
 		s.t = ""
@@ -1945,7 +1943,7 @@ func (c *SQLiteConn) takeCachedStmt(query string) *SQLiteStmt {
 }
 
 func (c *SQLiteConn) putCachedStmt(s *SQLiteStmt) bool {
-	if c == nil || s == nil || s.s == nil || s.cacheKey == "" || c.stmtCacheSize <= 0 {
+	if c == nil || s == nil || s.s == nil || s.cacheKey == "" || !c.stmtCacheEnabled {
 		return false
 	}
 
@@ -1959,10 +1957,10 @@ func (c *SQLiteConn) putCachedStmt(s *SQLiteStmt) bool {
 	if rv != C.SQLITE_ROW && rv != C.SQLITE_OK && rv != C.SQLITE_DONE {
 		return false
 	}
-	// If full, finalize the least-recently-used entry at index 0 and
+	// If full, finalize the LRU entry at index 0 and shift left; the
-	// compact the remaining entries left by one.
+	// freed tail slot is immediately reused by the append below.
-	if c.stmtCacheCount == c.stmtCacheSize {
+	if len(c.stmtCache) == cap(c.stmtCache) {
-		victim := c.stmtCacheBuf[0]
+		victim := c.stmtCache[0]
 		runtime.SetFinalizer(victim, nil)
 		if victim.s != nil {
 			C.sqlite3_finalize(victim.s)
@@ -1970,19 +1968,16 @@ func (c *SQLiteConn) putCachedStmt(s *SQLiteStmt) bool {
 		}
 		victim.c = nil
 		victim.closed = true
-		copy(c.stmtCacheBuf[0:c.stmtCacheCount-1], c.stmtCacheBuf[1:c.stmtCacheCount])
+		copy(c.stmtCache, c.stmtCache[1:])
-		c.stmtCacheCount--
+		c.stmtCache = c.stmtCache[:len(c.stmtCache)-1]
 	}
-	// Append at the MRU tail.
+	c.stmtCache = append(c.stmtCache, s)
-	c.stmtCacheBuf[c.stmtCacheCount] = s
-	c.stmtCacheCount++
 	return true
 }
 
 func (c *SQLiteConn) closeCachedStmtsLocked() {
-	for i := 0; i < c.stmtCacheCount; i++ {
+	for i, s := range c.stmtCache {
-		s := c.stmtCacheBuf[i]
+		c.stmtCache[i] = nil
-		c.stmtCacheBuf[i] = nil
 		if s == nil || s.s == nil {
 			continue
 		}
@@ -1991,7 +1986,7 @@ func (c *SQLiteConn) closeCachedStmtsLocked() {
 		s.s = nil
 		s.c = nil
 	}
-	c.stmtCacheCount = 0
+	c.stmtCache = c.stmtCache[:0]
 }
 
 // Prepare the query string. Return a new statement.

sqlite3_stmt_cache_test.go

@@ -47,8 +47,8 @@ func TestStmtCacheLRUEviction(t *testing.T) {
 	// Fill the cache with q1 and q2.
 	prepareAndClose(q1)
 	prepareAndClose(q2)
-	if got, want := c.stmtCacheCount, 2; got != want {
+	if got, want := len(c.stmtCache), 2; got != want {
-		t.Fatalf("after filling: stmtCacheCount = %d, want %d", got, want)
+		t.Fatalf("after filling: len(stmtCache) = %d, want %d", got, want)
 	}
 	if cacheCount(c, q1) != 1 || cacheCount(c, q2) != 1 {
 		t.Fatalf("after filling: expected q1 and q2 cached, got %#v", cacheKeys(c))
@@ -56,8 +56,8 @@ func TestStmtCacheLRUEviction(t *testing.T) {
 
 	// Insert q3. q1 is the oldest entry and should be evicted.
 	prepareAndClose(q3)
-	if got, want := c.stmtCacheCount, 2; got != want {
+	if got, want := len(c.stmtCache), 2; got != want {
-		t.Fatalf("after q3: stmtCacheCount = %d, want %d", got, want)
+		t.Fatalf("after q3: len(stmtCache) = %d, want %d", got, want)
 	}
 	if cacheCount(c, q1) != 0 {
 		t.Fatalf("after q3: q1 should have been evicted, cache=%#v", cacheKeys(c))
@@ -66,14 +66,14 @@ func TestStmtCacheLRUEviction(t *testing.T) {
 		t.Fatalf("after q3: expected q2 and q3 cached, got %#v", cacheKeys(c))
 	}
 
-	// Touching q2 should make q3 the oldest (the entry at buf[0]).
+	// Touching q2 should make q3 the oldest (the entry at index 0).
 	prepareAndClose(q2)
-	if c.stmtCacheCount == 0 || c.stmtCacheBuf[0].cacheKey != q3 {
+	if len(c.stmtCache) == 0 || c.stmtCache[0].cacheKey != q3 {
 		var head string
-		if c.stmtCacheCount > 0 {
+		if len(c.stmtCache) > 0 {
-			head = c.stmtCacheBuf[0].cacheKey
+			head = c.stmtCache[0].cacheKey
 		}
-		t.Fatalf("after touching q2: expected q3 at buf[0] (LRU), got %q", head)
+		t.Fatalf("after touching q2: expected q3 at stmtCache[0] (LRU), got %q", head)
 	}
 
 	// Insert q1 again. Now q3 should be evicted (q2 is newer).
@@ -84,14 +84,15 @@ func TestStmtCacheLRUEviction(t *testing.T) {
 	if cacheCount(c, q1) != 1 || cacheCount(c, q2) != 1 {
 		t.Fatalf("after reinserting q1: expected q1 and q2 cached, got %#v", cacheKeys(c))
 	}
-	if got, want := c.stmtCacheCount, 2; got != want {
+	if got, want := len(c.stmtCache), 2; got != want {
-		t.Fatalf("after reinserting q1: stmtCacheCount = %d, want %d", got, want)
+		t.Fatalf("after reinserting q1: len(stmtCache) = %d, want %d", got, want)
 	}
 
-	// Sanity-check: no dangling entries past stmtCacheCount.
+	// Sanity-check: no dangling entries past len(stmtCache).
-	for i := c.stmtCacheCount; i < len(c.stmtCacheBuf); i++ {
+	tail := c.stmtCache[:cap(c.stmtCache)]
-		if c.stmtCacheBuf[i] != nil {
+	for i := len(c.stmtCache); i < len(tail); i++ {
-			t.Fatalf("stmtCacheBuf[%d] = %p, expected nil tail slot", i, c.stmtCacheBuf[i])
+		if tail[i] != nil {
+			t.Fatalf("stmtCache tail slot %d = %p, expected nil", i, tail[i])
 		}
 	}
 }
@@ -135,16 +136,16 @@ func TestStmtCacheReuseReturnsSameHandle(t *testing.T) {
 
 func cacheKeys(c *SQLiteConn) map[string]int {
 	out := make(map[string]int)
-	for i := 0; i < c.stmtCacheCount; i++ {
+	for _, s := range c.stmtCache {
-		out[c.stmtCacheBuf[i].cacheKey]++
+		out[s.cacheKey]++
 	}
 	return out
 }
 
 func cacheCount(c *SQLiteConn, q string) int {
 	n := 0
-	for i := 0; i < c.stmtCacheCount; i++ {
+	for _, s := range c.stmtCache {
-		if c.stmtCacheBuf[i].cacheKey == q {
+		if s.cacheKey == q {
 			n++
 		}
 	}