From 52c17dfce0889f0c43382497158cfed27a084505 Mon Sep 17 00:00:00 2001
From: jianchenma <jianchenma@qq.com>
Date: Tue, 26 Jan 2021 14:33:35 +0800
Subject: [PATCH] add example for tracing feature

---
 database/gdb/gdb_model_cache.go  |  2 +-
 database/gdb/gdb_model_select.go | 11 ++++++++---
 go.mod                           |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/database/gdb/gdb_model_cache.go b/database/gdb/gdb_model_cache.go
index f8f4b5578..376e02c55 100644
--- a/database/gdb/gdb_model_cache.go
+++ b/database/gdb/gdb_model_cache.go
@@ -38,6 +38,6 @@ func (m *Model) Cache(duration time.Duration, name ...string) *Model {
 // cache feature is enabled.
 func (m *Model) checkAndRemoveCache() {
 	if m.cacheEnabled && m.cacheDuration < 0 && len(m.cacheName) > 0 {
-		m.db.GetCache().Remove(m.cacheName)
+		m.db.GetCache().Ctx(m.db.GetCtx()).Remove(m.cacheName)
 	}
 }
diff --git a/database/gdb/gdb_model_select.go b/database/gdb/gdb_model_select.go
index 5670033d0..e14438826 100644
--- a/database/gdb/gdb_model_select.go
+++ b/database/gdb/gdb_model_select.go
@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"github.com/gogf/gf/container/gset"
 	"github.com/gogf/gf/container/gvar"
+	"github.com/gogf/gf/internal/intlog"
 	"github.com/gogf/gf/internal/json"
 	"github.com/gogf/gf/text/gstr"
 	"github.com/gogf/gf/util/gconv"
@@ -435,7 +436,7 @@ func (m *Model) FindScan(pointer interface{}, where ...interface{}) error {
 // doGetAllBySql does the select statement on the database.
 func (m *Model) doGetAllBySql(sql string, args ...interface{}) (result Result, err error) {
 	cacheKey := ""
-	cacheObj := m.db.GetCache()
+	cacheObj := m.db.GetCache().Ctx(m.db.GetCtx())
 	// Retrieve from cache.
 	if m.cacheEnabled && m.tx == nil {
 		cacheKey = m.cacheName
@@ -461,9 +462,13 @@ func (m *Model) doGetAllBySql(sql string, args ...interface{}) (result Result, e
 	// Cache the result.
 	if cacheKey != "" && err == nil {
 		if m.cacheDuration < 0 {
-			cacheObj.Remove(cacheKey)
+			if _, err := cacheObj.Remove(cacheKey); err != nil {
+				intlog.Error(err)
+			}
 		} else {
-			cacheObj.Set(cacheKey, result, m.cacheDuration)
+			if err := cacheObj.Set(cacheKey, result, m.cacheDuration); err != nil {
+				intlog.Error(err)
+			}
 		}
 	}
 	return result, err
diff --git a/go.mod b/go.mod
index efe36c7b9..4222f512a 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/clbanning/mxj v1.8.5-0.20200714211355-ff02cfb8ea28
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/gogf/gcache-adapter v0.0.3
+	github.com/gogf/gcache-adapter v0.0.4-0.20210126062229-c84b9cefa528
 	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/gorilla/websocket v1.4.1
 	github.com/grokify/html-strip-tags-go v0.0.0-20190921062105-daaa06bf1aaf