Merge pull request #268 from ydb-platform/disable-keep-in-cache

* Disabled the `KeepInCache` policy for queries without params

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Disabled the `KeepInCache` policy for queries without params
+
 ## v3.26.4
 * Update indirect dependency to `gopkg.in/yaml.v3`
 

internal/table/keep_in_cache_test.go

@@ -11,29 +11,56 @@ import (
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table/options"
+	"github.com/ydb-platform/ydb-go-sdk/v3/table/types"
 	"github.com/ydb-platform/ydb-go-sdk/v3/testutil"
 )
 
 func TestQueryCachePolicyKeepInCache(t *testing.T) {
 	for _, test := range [...]struct {
 		name                    string
+		params                  *table.QueryParameters
 		executeDataQueryOptions []options.ExecuteDataQueryOption
 		keepInCache             bool
 	}{
 		{
-			name:                    "no options",
+			name:                    "no params, no options",
+			params:                  table.NewQueryParameters(),
+			executeDataQueryOptions: nil,
+			keepInCache:             false,
+		},
+		{
+			name:                    "not empty params, no options",
+			params:                  table.NewQueryParameters(table.ValueParam("a", types.UTF8Value("b"))),
 			executeDataQueryOptions: nil,
 			keepInCache:             true,
 		},
 		{
-			name: "with server cache",
+			name:   "no params, with server cache",
+			params: table.NewQueryParameters(),
 			executeDataQueryOptions: []options.ExecuteDataQueryOption{
 				options.WithKeepInCache(true),
 			},
 			keepInCache: true,
 		},
 		{
-			name: "no server cache",
+			name:   "not empty params, with server cache",
+			params: table.NewQueryParameters(table.ValueParam("a", types.UTF8Value("b"))),
+			executeDataQueryOptions: []options.ExecuteDataQueryOption{
+				options.WithKeepInCache(true),
+			},
+			keepInCache: true,
+		},
+		{
+			name:   "no params, no server cache",
+			params: table.NewQueryParameters(),
+			executeDataQueryOptions: []options.ExecuteDataQueryOption{
+				options.WithKeepInCache(false),
+			},
+			keepInCache: false,
+		},
+		{
+			name:   "not empty params, no server cache",
+			params: table.NewQueryParameters(table.ValueParam("a", types.UTF8Value("b"))),
 			executeDataQueryOptions: []options.ExecuteDataQueryOption{
 				options.WithKeepInCache(false),
 			},
@@ -81,7 +108,7 @@ func TestQueryCachePolicyKeepInCache(t *testing.T) {
 					table.CommitTx(),
 				),
 				"SELECT 1",
-				table.NewQueryParameters(),
+				test.params,
 				test.executeDataQueryOptions...,
 			)
 			if err != nil {

internal/table/session.go

@@ -687,7 +687,7 @@ func (s *session) executeDataQuery(
 		Parameters: params.Params(),
 		Query:      &query.query,
 		QueryCachePolicy: &Ydb_Table.QueryCachePolicy{
-			KeepInCache: true,
+			KeepInCache: len(params.Params()) > 0,
 		},
 		OperationParams: operation.Params(
 			ctx,

table/table.go

@@ -107,7 +107,7 @@ type Session interface {
 
 	// Execute executes query.
 	//
-	// By default, Execute have a flag options.WithKeepInCache(true). For redefine behavior -
+	// By default, Execute have a flag options.WithKeepInCache(true) if params is not empty. For redefine behavior -
 	// append option options.WithKeepInCache(false)
 	Execute(
 		ctx context.Context,