Merge pull request #306 from ydb-platform/check-code-generation

fix check codegen code

Author: asmyasnikov

.github/workflows/gtrace.yml renamed to .github/workflows/check-codegen.yml

@@ -1,4 +1,4 @@
-name: gtrace
+name: check-codegen
 on:
   push:
     branches:
@@ -28,14 +28,20 @@ jobs:
     - name: Build
       run: |
         go install ./internal/cmd/gtrace
+        go install github.com/golang/mock/[email protected]        
 
     - name: Clean and re-generate *_gtrace.go files
       run: |
-        cd ./trace && rm -f *_gtrace.go && go generate
+        rm -f ./trace/*_gtrace.go
+        go generate ./trace
+        go generate ./...
 
     - name: Check generation
       run: |
-        if [[ $(git status --porcelain) -ne 0 ]]; then
-          echo "code-generation not compatible with gtrace output";
+        CODE_DIFF="$(git diff)"
+        if [ -n "$CODE_DIFF"  ]; then
+          echo "code-generation not equal with committed"
+          echo
+          echo "$CODE_DIFF"
           exit 1;
         fi

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Fix write KeepInCacheFlag for table traces
+
 ## v3.29.5
 * Fixed regression of `table/types.WriteTypeStringTo`
 

internal/table/session.go

@@ -645,7 +645,19 @@ func (s *session) Execute(
 		params = table.NewQueryParameters()
 	}
 
-	onDone := trace.TableOnSessionQueryExecute(s.config.Trace(), &ctx, s, q, params)
+	var optsResult options.ExecuteDataQueryDesc
+	for _, f := range opts {
+		f(&optsResult)
+	}
+
+	onDone := trace.TableOnSessionQueryExecute(
+		s.config.Trace(),
+		&ctx,
+		s,
+		q,
+		params,
+		optsResult.QueryCachePolicy.GetKeepInCache(),
+	)
 	defer func() {
 		onDone(txr, true, r, err)
 	}()

internal/table/statement.go

@@ -26,12 +26,18 @@ func (s *statement) Execute(
 ) (
 	txr table.Transaction, r result.Result, err error,
 ) {
+	var optsResult options.ExecuteDataQueryDesc
+	for _, f := range opts {
+		f(&optsResult)
+	}
+
 	onDone := trace.TableOnSessionQueryExecute(
 		s.session.config.Trace(),
 		&ctx,
 		s.session,
 		s.query,
 		params,
+		optsResult.QueryCachePolicy.GetKeepInCache(),
 	)
 	defer func() {
 		onDone(txr, true, r, err)