diff --git a/go.mod b/go.mod
index 829cf200..5862877a 100644
--- a/go.mod
+++ b/go.mod
@@ -9,14 +9,14 @@ require (
 	github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.20.0
+	github.com/prometheus/client_golang v1.20.5
 	github.com/scylladb/go-set v1.0.2
 	github.com/scylladb/gocqlx/v2 v2.8.0
 	github.com/spf13/cobra v1.8.1
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
-	golang.org/x/net v0.28.0
+	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
+	golang.org/x/net v0.30.0
 	golang.org/x/sync v0.8.0
 	gonum.org/v1/gonum v0.15.1
 	gopkg.in/inf.v0 v0.9.1
@@ -25,21 +25,21 @@ require (
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/fatih/color v1.17.0 // indirect
+	github.com/fatih/color v1.18.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/common v0.60.1 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/scylladb/go-reflectx v1.0.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/term v0.23.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 )
 
 replace github.com/gocql/gocql => github.com/scylladb/gocql v1.14.3
diff --git a/go.sum b/go.sum
index 8b8764b4..1bf37a74 100644
--- a/go.sum
+++ b/go.sum
@@ -17,6 +17,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
 github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/fatih/set v0.2.1 h1:nn2CaJyknWE/6txyUDGwysr3G5QC6xWB/PtVjPBbeaA=
 github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -31,6 +33,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -55,12 +59,16 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ
 github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
 github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI=
 github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
+github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8=
 github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ=
 github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
 github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
+github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc=
+github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -94,11 +102,15 @@ golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 h1:LoYXNGAShUG3m/ehNk4iFctuh
 golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI=
 golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
 golang.org/x/net v0.0.0-20220526153639-5463443f8c37/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
 golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
@@ -111,11 +123,15 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
 golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
 golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
 golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
 golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -127,6 +143,8 @@ google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFW
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
diff --git a/pkg/jobs/errors.go b/pkg/jobs/errors.go
new file mode 100644
index 00000000..cff27b0f
--- /dev/null
+++ b/pkg/jobs/errors.go
@@ -0,0 +1,40 @@
+// Copyright 2024 ScyllaDB
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package jobs
+
+import (
+	"fmt"
+
+	"github.com/scylladb/gemini/pkg/typedef"
+)
+
+type PrettyCQLError struct {
+	PrettyCQL error
+	Err       error
+	Stmt      *typedef.Stmt
+}
+
+func (e PrettyCQLError) Error() string {
+	query, _ := e.Stmt.Query.ToCql()
+	values := e.Stmt.Values.Copy()
+
+	return fmt.Sprintf(
+		"Failed to format CQL Statement: prettyCQL {Query(%s) Values(%+v) PrettyCQLError(%+v) Error(%+v)}",
+		query,
+		values,
+		e.PrettyCQL,
+		e.Err,
+	)
+}
diff --git a/pkg/jobs/gen_utils_test.go b/pkg/jobs/gen_utils_test.go
index 04ad7a7d..4c61c48e 100644
--- a/pkg/jobs/gen_utils_test.go
+++ b/pkg/jobs/gen_utils_test.go
@@ -184,7 +184,7 @@ func convertStmtToResults(stmt *typedef.Stmt) *result {
 		Names:       strings.TrimSpace(fmt.Sprintf("%s", names)),
 		Values:      strings.TrimSpace(fmt.Sprintf("%v", stmt.Values)),
 		Types:       types,
-		QueryType:   fmt.Sprintf("%v", stmt.QueryType),
+		QueryType:   stmt.QueryType.String(),
 	}
 }
 
diff --git a/pkg/jobs/jobs.go b/pkg/jobs/jobs.go
index ac21c09f..3730b7de 100644
--- a/pkg/jobs/jobs.go
+++ b/pkg/jobs/jobs.go
@@ -17,21 +17,20 @@ package jobs
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"time"
 
-	"github.com/scylladb/gemini/pkg/generators"
-	"github.com/scylladb/gemini/pkg/store"
-	"github.com/scylladb/gemini/pkg/typedef"
+	"github.com/pkg/errors"
+	"go.uber.org/zap"
+	"golang.org/x/exp/rand"
+	"golang.org/x/sync/errgroup"
 
+	"github.com/scylladb/gemini/pkg/generators"
 	"github.com/scylladb/gemini/pkg/joberror"
 	"github.com/scylladb/gemini/pkg/status"
 	"github.com/scylladb/gemini/pkg/stop"
-
-	"go.uber.org/zap"
-	"golang.org/x/exp/rand"
-	"golang.org/x/sync/errgroup"
+	"github.com/scylladb/gemini/pkg/store"
+	"github.com/scylladb/gemini/pkg/typedef"
 )
 
 const (
@@ -177,9 +176,15 @@ func mutationJob(
 		}
 		ind := r.Intn(1000000)
 		if ind%100000 == 0 {
-			_ = ddl(ctx, schema, schemaConfig, table, s, r, p, globalStatus, logger, verbose)
+			err := ddl(ctx, schema, schemaConfig, table, s, r, p, globalStatus, logger, verbose)
+			if err != nil {
+				return err
+			}
 		} else {
-			_ = mutation(ctx, schema, schemaConfig, table, s, r, p, g, globalStatus, true, logger)
+			err := mutation(ctx, schema, schemaConfig, table, s, r, p, g, globalStatus, true, logger)
+			if err != nil {
+				return err
+			}
 		}
 		if failFast && globalStatus.HasErrors() {
 			stopFlag.SetSoft(true)
@@ -239,11 +244,20 @@ func validationJob(
 		case errors.Is(err, context.Canceled):
 			return nil
 		default:
+			query, prettyErr := stmt.PrettyCQL()
+			if prettyErr != nil {
+				return PrettyCQLError{
+					PrettyCQL: prettyErr,
+					Stmt:      stmt,
+					Err:       err,
+				}
+			}
+
 			globalStatus.AddReadError(&joberror.JobError{
 				Timestamp: time.Now(),
-				StmtType:  stmt.QueryType.ToString(),
+				StmtType:  stmt.QueryType.String(),
 				Message:   "Validation failed: " + err.Error(),
-				Query:     stmt.PrettyCQL(),
+				Query:     query,
 			})
 		}
 
@@ -283,7 +297,11 @@ func warmupJob(
 			return nil
 		}
 		// Do we care about errors during warmup?
-		_ = mutation(ctx, schema, schemaConfig, table, s, r, p, g, globalStatus, false, logger)
+		err := mutation(ctx, schema, schemaConfig, table, s, r, p, g, globalStatus, false, logger)
+		if err != nil {
+			return err
+		}
+
 		if failFast && globalStatus.HasErrors() {
 			stopFlag.SetSoft(true)
 			return nil
@@ -319,26 +337,48 @@ func ddl(
 		globalStatus.WriteErrors.Add(1)
 		return err
 	}
+
 	if ddlStmts == nil {
 		if w := logger.Check(zap.DebugLevel, "no statement generated"); w != nil {
 			w.Write(zap.String("job", "ddl"))
 		}
 		return nil
 	}
+
 	for _, ddlStmt := range ddlStmts.List {
 		if w := logger.Check(zap.DebugLevel, "ddl statement"); w != nil {
-			w.Write(zap.String("pretty_cql", ddlStmt.PrettyCQL()))
+			prettyCQL, prettyCQLErr := ddlStmt.PrettyCQL()
+			if prettyCQLErr != nil {
+				return PrettyCQLError{
+					PrettyCQL: prettyCQLErr,
+					Stmt:      ddlStmt,
+				}
+			}
+
+			w.Write(zap.String("pretty_cql", prettyCQL))
 		}
+
 		if err = s.Mutate(ctx, ddlStmt); err != nil {
 			if errors.Is(err, context.Canceled) {
 				return nil
 			}
+
+			prettyCQL, prettyCQLErr := ddlStmt.PrettyCQL()
+			if prettyCQLErr != nil {
+				return PrettyCQLError{
+					PrettyCQL: prettyCQLErr,
+					Stmt:      ddlStmt,
+					Err:       err,
+				}
+			}
+
 			globalStatus.AddWriteError(&joberror.JobError{
 				Timestamp: time.Now(),
-				StmtType:  ddlStmts.QueryType.ToString(),
+				StmtType:  ddlStmts.QueryType.String(),
 				Message:   "DDL failed: " + err.Error(),
-				Query:     ddlStmt.PrettyCQL(),
+				Query:     prettyCQL,
 			})
+
 			return err
 		}
 		globalStatus.WriteOps.Add(1)
@@ -378,22 +418,44 @@ func mutation(
 	}
 
 	if w := logger.Check(zap.DebugLevel, "mutation statement"); w != nil {
-		w.Write(zap.String("pretty_cql", mutateStmt.PrettyCQL()))
+		prettyCQL, prettyCQLErr := mutateStmt.PrettyCQL()
+		if prettyCQLErr != nil {
+			return PrettyCQLError{
+				PrettyCQL: prettyCQLErr,
+				Stmt:      mutateStmt,
+				Err:       err,
+			}
+		}
+
+		w.Write(zap.String("pretty_cql", prettyCQL))
 	}
 	if err = s.Mutate(ctx, mutateStmt); err != nil {
 		if errors.Is(err, context.Canceled) {
 			return nil
 		}
+
+		prettyCQL, prettyCQLErr := mutateStmt.PrettyCQL()
+		if prettyCQLErr != nil {
+			return PrettyCQLError{
+				PrettyCQL: prettyCQLErr,
+				Stmt:      mutateStmt,
+				Err:       err,
+			}
+		}
+
 		globalStatus.AddWriteError(&joberror.JobError{
 			Timestamp: time.Now(),
-			StmtType:  mutateStmt.QueryType.ToString(),
+			StmtType:  mutateStmt.QueryType.String(),
 			Message:   "Mutation failed: " + err.Error(),
-			Query:     mutateStmt.PrettyCQL(),
+			Query:     prettyCQL,
 		})
-	} else {
-		globalStatus.WriteOps.Add(1)
-		g.GiveOlds(mutateStmt.ValuesWithToken)
+
+		return err
 	}
+
+	globalStatus.WriteOps.Add(1)
+	g.GiveOlds(mutateStmt.ValuesWithToken)
+
 	return nil
 }
 
@@ -406,7 +468,15 @@ func validation(
 	logger *zap.Logger,
 ) error {
 	if w := logger.Check(zap.DebugLevel, "validation statement"); w != nil {
-		w.Write(zap.String("pretty_cql", stmt.PrettyCQL()))
+		prettyCQL, prettyCQLErr := stmt.PrettyCQL()
+		if prettyCQLErr != nil {
+			return PrettyCQLError{
+				PrettyCQL: prettyCQLErr,
+				Stmt:      stmt,
+			}
+		}
+
+		w.Write(zap.String("pretty_cql", prettyCQL))
 	}
 
 	maxAttempts := 1
diff --git a/pkg/jobs/test_expected_data/check/clustering_range.json b/pkg/jobs/test_expected_data/check/clustering_range.json
index c05018d1..2a4bad29 100644
--- a/pkg/jobs/test_expected_data/check/clustering_range.json
+++ b/pkg/jobs/test_expected_data/check/clustering_range.json
@@ -5,7 +5,7 @@
       "Names": "[pk0 ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[pk0 ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[pk0 pk1 pk2 ck0 ck1 ck2 ck2]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 1970-01-01 0.001 0.001]",
       "Types": " bigint float inet ascii date decimal decimal",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -50,7 +50,7 @@
       "Names": "[pk0 pk1 pk2 ck0 ck0]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 00]",
       "Types": " bigint float inet ascii ascii",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -65,7 +65,7 @@
       "Names": "[pk0 pk1 pk2 ck0 ck1 ck2 ck2]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 1970-01-01 0.001 0.001]",
       "Types": " bigint float inet ascii date decimal decimal",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -80,7 +80,7 @@
       "Names": "[pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18 ck0 ck0]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 00]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii ascii",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -95,7 +95,7 @@
       "Names": "[pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18 ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18 ck18]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 1]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time time",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -104,4 +104,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/check/clustering_range_mv.json b/pkg/jobs/test_expected_data/check/clustering_range_mv.json
index ce8c88fc..854aa93c 100644
--- a/pkg/jobs/test_expected_data/check/clustering_range_mv.json
+++ b/pkg/jobs/test_expected_data/check/clustering_range_mv.json
@@ -5,7 +5,7 @@
       "Names": "[pk0 ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[col0 pk0 ck0 ck0]",
       "Values": "[1970-01-01 1 1970-01-01 1970-01-01]",
       "Types": " date bigint date date",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[pk0 ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -50,7 +50,7 @@
       "Names": "[pk0 pk1 pk2 ck0 ck1 ck2 ck2]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 1970-01-01 0.001 0.001]",
       "Types": " bigint float inet ascii date decimal decimal",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -65,7 +65,7 @@
       "Names": "[pk0 pk1 pk2 ck0 ck0]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 00]",
       "Types": " bigint float inet ascii ascii",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -80,7 +80,7 @@
       "Names": "[pk0 pk1 pk2 ck0 ck1 ck2 ck2]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 1970-01-01 0.001 0.001]",
       "Types": " bigint float inet ascii date decimal decimal",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -95,7 +95,7 @@
       "Names": "[col0 pk0 pk1 pk2 ck0 ck0]",
       "Values": "[01 1 1.110223e-16 1.1.1.1 00 00]",
       "Types": " ascii bigint float inet ascii ascii",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -110,7 +110,7 @@
       "Names": "[col0 pk0 pk1 pk2 ck0 ck1 ck2 ck2]",
       "Values": "[01 1 1.110223e-16 1.1.1.1 00 1970-01-01 0.001 0.001]",
       "Types": " ascii bigint float inet ascii date decimal decimal",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -125,7 +125,7 @@
       "Names": "[pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18 ck0 ck0]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 00]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii ascii",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -140,7 +140,7 @@
       "Names": "[pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18 ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18 ck18]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 1]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time time",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -155,7 +155,7 @@
       "Names": "[col1 pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18 ck0 ck0]",
       "Values": "[01 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 00 00]",
       "Types": " ascii ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii ascii",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -170,7 +170,7 @@
       "Names": "[col1 pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18 ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18 ck18]",
       "Values": "[01 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 00 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 01 1 1 1]",
       "Types": " ascii ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time time",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -179,4 +179,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/check/multiple_partition.json b/pkg/jobs/test_expected_data/check/multiple_partition.json
index 1555f265..4dcbec41 100644
--- a/pkg/jobs/test_expected_data/check/multiple_partition.json
+++ b/pkg/jobs/test_expected_data/check/multiple_partition.json
@@ -5,7 +5,7 @@
       "Names": "[pk0[0]]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[pk0[0]]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[pk0[0]]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -50,7 +50,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2]]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1]",
       "Types": " bigint bigint bigint float float float inet inet inet",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -73,7 +73,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0]]",
       "Values": "[1 1.110223e-16 1.1.1.1]",
       "Types": " bigint float inet",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -88,7 +88,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2]]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1]",
       "Types": " bigint bigint bigint float float float inet inet inet",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -111,7 +111,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0] pk3[0] pk4[0] pk5[0] pk6[0] pk7[0] pk8[0] pk9[0] pk10[0] pk11[0] pk12[0] pk13[0] pk14[0] pk15[0] pk16[0] pk17[0] pk18[0]]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -126,7 +126,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk0[3] pk0[4] pk0[5] pk0[6] pk0[7] pk0[8] pk0[9] pk0[10] pk0[11] pk0[12] pk0[13] pk0[14] pk0[15] pk0[16] pk0[17] pk0[18] pk1[0] pk1[1] pk1[2] pk1[3] pk1[4] pk1[5] pk1[6] pk1[7] pk1[8] pk1[9] pk1[10] pk1[11] pk1[12] pk1[13] pk1[14] pk1[15] pk1[16] pk1[17] pk1[18] pk2[0] pk2[1] pk2[2] pk2[3] pk2[4] pk2[5] pk2[6] pk2[7] pk2[8] pk2[9] pk2[10] pk2[11] pk2[12] pk2[13] pk2[14] pk2[15] pk2[16] pk2[17] pk2[18] pk3[0] pk3[1] pk3[2] pk3[3] pk3[4] pk3[5] pk3[6] pk3[7] pk3[8] pk3[9] pk3[10] pk3[11] pk3[12] pk3[13] pk3[14] pk3[15] pk3[16] pk3[17] pk3[18] pk4[0] pk4[1] pk4[2] pk4[3] pk4[4] pk4[5] pk4[6] pk4[7] pk4[8] pk4[9] pk4[10] pk4[11] pk4[12] pk4[13] pk4[14] pk4[15] pk4[16] pk4[17] pk4[18] pk5[0] pk5[1] pk5[2] pk5[3] pk5[4] pk5[5] pk5[6] pk5[7] pk5[8] pk5[9] pk5[10] pk5[11] pk5[12] pk5[13] pk5[14] pk5[15] pk5[16] pk5[17] pk5[18] pk6[0] pk6[1] pk6[2] pk6[3] pk6[4] pk6[5] pk6[6] pk6[7] pk6[8] pk6[9] pk6[10] pk6[11] pk6[12] pk6[13] pk6[14] pk6[15] pk6[16] pk6[17] pk6[18] pk7[0] pk7[1] pk7[2] pk7[3] pk7[4] pk7[5] pk7[6] pk7[7] pk7[8] pk7[9] pk7[10] pk7[11] pk7[12] pk7[13] pk7[14] pk7[15] pk7[16] pk7[17] pk7[18] pk8[0] pk8[1] pk8[2] pk8[3] pk8[4] pk8[5] pk8[6] pk8[7] pk8[8] pk8[9] pk8[10] pk8[11] pk8[12] pk8[13] pk8[14] pk8[15] pk8[16] pk8[17] pk8[18] pk9[0] pk9[1] pk9[2] pk9[3] pk9[4] pk9[5] pk9[6] pk9[7] pk9[8] pk9[9] pk9[10] pk9[11] pk9[12] pk9[13] pk9[14] pk9[15] pk9[16] pk9[17] pk9[18] pk10[0] pk10[1] pk10[2] pk10[3] pk10[4] pk10[5] pk10[6] pk10[7] pk10[8] pk10[9] pk10[10] pk10[11] pk10[12] pk10[13] pk10[14] pk10[15] pk10[16] pk10[17] pk10[18] pk11[0] pk11[1] pk11[2] pk11[3] pk11[4] pk11[5] pk11[6] pk11[7] pk11[8] pk11[9] pk11[10] pk11[11] pk11[12] pk11[13] pk11[14] pk11[15] pk11[16] pk11[17] pk11[18] pk12[0] pk12[1] pk12[2] pk12[3] pk12[4] pk12[5] pk12[6] pk12[7] pk12[8] pk12[9] pk12[10] pk12[11] pk12[12] pk12[13] pk12[14] pk12[15] pk12[16] pk12[17] pk12[18] pk13[0] pk13[1] pk13[2] pk13[3] pk13[4] pk13[5] pk13[6] pk13[7] pk13[8] pk13[9] pk13[10] pk13[11] pk13[12] pk13[13] pk13[14] pk13[15] pk13[16] pk13[17] pk13[18] pk14[0] pk14[1] pk14[2] pk14[3] pk14[4] pk14[5] pk14[6] pk14[7] pk14[8] pk14[9] pk14[10] pk14[11] pk14[12] pk14[13] pk14[14] pk14[15] pk14[16] pk14[17] pk14[18] pk15[0] pk15[1] pk15[2] pk15[3] pk15[4] pk15[5] pk15[6] pk15[7] pk15[8] pk15[9] pk15[10] pk15[11] pk15[12] pk15[13] pk15[14] pk15[15] pk15[16] pk15[17] pk15[18] pk16[0] pk16[1] pk16[2] pk16[3] pk16[4] pk16[5] pk16[6] pk16[7] pk16[8] pk16[9] pk16[10] pk16[11] pk16[12] pk16[13] pk16[14] pk16[15] pk16[16] pk16[17] pk16[18] pk17[0] pk17[1] pk17[2] pk17[3] pk17[4] pk17[5] pk17[6] pk17[7] pk17[8] pk17[9] pk17[10] pk17[11] pk17[12] pk17[13] pk17[14] pk17[15] pk17[16] pk17[17] pk17[18] pk18[0] pk18[1] pk18[2] pk18[3] pk18[4] pk18[5] pk18[6] pk18[7] pk18[8] pk18[9] pk18[10] pk18[11] pk18[12] pk18[13] pk18[14] pk18[15] pk18[16] pk18[17] pk18[18]]",
       "Values": "[01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 false false false false false false false false false false false false false false false false false false false 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1]",
       "Types": " ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean date date date date date date date date date date date date date date date date date date date decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal double double double double double double double double double double double double double double double double double double double float float float float float float float float float float float float float float float float float float float inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet int int int int int int int int int int int int int int int int int int int smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint text text text text text text text text text text text text text text text text text text text timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint time time time time time time time time time time time time time time time time time time time",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -207,4 +207,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/check/multiple_partition_clustering_range.json b/pkg/jobs/test_expected_data/check/multiple_partition_clustering_range.json
index b78d9397..6c936061 100644
--- a/pkg/jobs/test_expected_data/check/multiple_partition_clustering_range.json
+++ b/pkg/jobs/test_expected_data/check/multiple_partition_clustering_range.json
@@ -5,7 +5,7 @@
       "Names": "[pk0[0] ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[pk0[0] ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[pk0[0] ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -50,7 +50,7 @@
       "Names": "[pk0[0] ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -65,7 +65,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2] ck0 ck0]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 01 00]",
       "Types": " bigint bigint bigint float float float inet inet inet ascii ascii",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -88,7 +88,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2] ck0 ck1 ck2 ck2]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 01 1970-01-01 0.001 0.001]",
       "Types": " bigint bigint bigint float float float inet inet inet ascii date decimal decimal",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -111,7 +111,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0] ck0 ck0]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 00]",
       "Types": " bigint float inet ascii ascii",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -126,7 +126,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0] ck0 ck1 ck2 ck2]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 1970-01-01 0.001 0.001]",
       "Types": " bigint float inet ascii date decimal decimal",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -141,7 +141,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2] ck0 ck0]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 01 00]",
       "Types": " bigint bigint bigint float float float inet inet inet ascii ascii",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -164,7 +164,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2] ck0 ck1 ck2 ck2]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 01 1970-01-01 0.001 0.001]",
       "Types": " bigint bigint bigint float float float inet inet inet ascii date decimal decimal",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -187,7 +187,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0] pk3[0] pk4[0] pk5[0] pk6[0] pk7[0] pk8[0] pk9[0] pk10[0] pk11[0] pk12[0] pk13[0] pk14[0] pk15[0] pk16[0] pk17[0] pk18[0] ck0 ck0]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 00]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii ascii",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -202,7 +202,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0] pk3[0] pk4[0] pk5[0] pk6[0] pk7[0] pk8[0] pk9[0] pk10[0] pk11[0] pk12[0] pk13[0] pk14[0] pk15[0] pk16[0] pk17[0] pk18[0] ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18 ck18]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 1]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time time",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -217,7 +217,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk0[3] pk0[4] pk0[5] pk0[6] pk0[7] pk0[8] pk0[9] pk0[10] pk0[11] pk0[12] pk0[13] pk0[14] pk0[15] pk0[16] pk0[17] pk0[18] pk1[0] pk1[1] pk1[2] pk1[3] pk1[4] pk1[5] pk1[6] pk1[7] pk1[8] pk1[9] pk1[10] pk1[11] pk1[12] pk1[13] pk1[14] pk1[15] pk1[16] pk1[17] pk1[18] pk2[0] pk2[1] pk2[2] pk2[3] pk2[4] pk2[5] pk2[6] pk2[7] pk2[8] pk2[9] pk2[10] pk2[11] pk2[12] pk2[13] pk2[14] pk2[15] pk2[16] pk2[17] pk2[18] pk3[0] pk3[1] pk3[2] pk3[3] pk3[4] pk3[5] pk3[6] pk3[7] pk3[8] pk3[9] pk3[10] pk3[11] pk3[12] pk3[13] pk3[14] pk3[15] pk3[16] pk3[17] pk3[18] pk4[0] pk4[1] pk4[2] pk4[3] pk4[4] pk4[5] pk4[6] pk4[7] pk4[8] pk4[9] pk4[10] pk4[11] pk4[12] pk4[13] pk4[14] pk4[15] pk4[16] pk4[17] pk4[18] pk5[0] pk5[1] pk5[2] pk5[3] pk5[4] pk5[5] pk5[6] pk5[7] pk5[8] pk5[9] pk5[10] pk5[11] pk5[12] pk5[13] pk5[14] pk5[15] pk5[16] pk5[17] pk5[18] pk6[0] pk6[1] pk6[2] pk6[3] pk6[4] pk6[5] pk6[6] pk6[7] pk6[8] pk6[9] pk6[10] pk6[11] pk6[12] pk6[13] pk6[14] pk6[15] pk6[16] pk6[17] pk6[18] pk7[0] pk7[1] pk7[2] pk7[3] pk7[4] pk7[5] pk7[6] pk7[7] pk7[8] pk7[9] pk7[10] pk7[11] pk7[12] pk7[13] pk7[14] pk7[15] pk7[16] pk7[17] pk7[18] pk8[0] pk8[1] pk8[2] pk8[3] pk8[4] pk8[5] pk8[6] pk8[7] pk8[8] pk8[9] pk8[10] pk8[11] pk8[12] pk8[13] pk8[14] pk8[15] pk8[16] pk8[17] pk8[18] pk9[0] pk9[1] pk9[2] pk9[3] pk9[4] pk9[5] pk9[6] pk9[7] pk9[8] pk9[9] pk9[10] pk9[11] pk9[12] pk9[13] pk9[14] pk9[15] pk9[16] pk9[17] pk9[18] pk10[0] pk10[1] pk10[2] pk10[3] pk10[4] pk10[5] pk10[6] pk10[7] pk10[8] pk10[9] pk10[10] pk10[11] pk10[12] pk10[13] pk10[14] pk10[15] pk10[16] pk10[17] pk10[18] pk11[0] pk11[1] pk11[2] pk11[3] pk11[4] pk11[5] pk11[6] pk11[7] pk11[8] pk11[9] pk11[10] pk11[11] pk11[12] pk11[13] pk11[14] pk11[15] pk11[16] pk11[17] pk11[18] pk12[0] pk12[1] pk12[2] pk12[3] pk12[4] pk12[5] pk12[6] pk12[7] pk12[8] pk12[9] pk12[10] pk12[11] pk12[12] pk12[13] pk12[14] pk12[15] pk12[16] pk12[17] pk12[18] pk13[0] pk13[1] pk13[2] pk13[3] pk13[4] pk13[5] pk13[6] pk13[7] pk13[8] pk13[9] pk13[10] pk13[11] pk13[12] pk13[13] pk13[14] pk13[15] pk13[16] pk13[17] pk13[18] pk14[0] pk14[1] pk14[2] pk14[3] pk14[4] pk14[5] pk14[6] pk14[7] pk14[8] pk14[9] pk14[10] pk14[11] pk14[12] pk14[13] pk14[14] pk14[15] pk14[16] pk14[17] pk14[18] pk15[0] pk15[1] pk15[2] pk15[3] pk15[4] pk15[5] pk15[6] pk15[7] pk15[8] pk15[9] pk15[10] pk15[11] pk15[12] pk15[13] pk15[14] pk15[15] pk15[16] pk15[17] pk15[18] pk16[0] pk16[1] pk16[2] pk16[3] pk16[4] pk16[5] pk16[6] pk16[7] pk16[8] pk16[9] pk16[10] pk16[11] pk16[12] pk16[13] pk16[14] pk16[15] pk16[16] pk16[17] pk16[18] pk17[0] pk17[1] pk17[2] pk17[3] pk17[4] pk17[5] pk17[6] pk17[7] pk17[8] pk17[9] pk17[10] pk17[11] pk17[12] pk17[13] pk17[14] pk17[15] pk17[16] pk17[17] pk17[18] pk18[0] pk18[1] pk18[2] pk18[3] pk18[4] pk18[5] pk18[6] pk18[7] pk18[8] pk18[9] pk18[10] pk18[11] pk18[12] pk18[13] pk18[14] pk18[15] pk18[16] pk18[17] pk18[18] ck0 ck0]",
       "Values": "[01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 false false false false false false false false false false false false false false false false false false false 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 01 00]",
       "Types": " ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean date date date date date date date date date date date date date date date date date date date decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal double double double double double double double double double double double double double double double double double double double float float float float float float float float float float float float float float float float float float float inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet int int int int int int int int int int int int int int int int int int int smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint text text text text text text text text text text text text text text text text text text text timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint time time time time time time time time time time time time time time time time time time time ascii ascii",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -304,7 +304,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk0[3] pk0[4] pk0[5] pk0[6] pk0[7] pk0[8] pk0[9] pk0[10] pk0[11] pk0[12] pk0[13] pk0[14] pk0[15] pk0[16] pk0[17] pk0[18] pk1[0] pk1[1] pk1[2] pk1[3] pk1[4] pk1[5] pk1[6] pk1[7] pk1[8] pk1[9] pk1[10] pk1[11] pk1[12] pk1[13] pk1[14] pk1[15] pk1[16] pk1[17] pk1[18] pk2[0] pk2[1] pk2[2] pk2[3] pk2[4] pk2[5] pk2[6] pk2[7] pk2[8] pk2[9] pk2[10] pk2[11] pk2[12] pk2[13] pk2[14] pk2[15] pk2[16] pk2[17] pk2[18] pk3[0] pk3[1] pk3[2] pk3[3] pk3[4] pk3[5] pk3[6] pk3[7] pk3[8] pk3[9] pk3[10] pk3[11] pk3[12] pk3[13] pk3[14] pk3[15] pk3[16] pk3[17] pk3[18] pk4[0] pk4[1] pk4[2] pk4[3] pk4[4] pk4[5] pk4[6] pk4[7] pk4[8] pk4[9] pk4[10] pk4[11] pk4[12] pk4[13] pk4[14] pk4[15] pk4[16] pk4[17] pk4[18] pk5[0] pk5[1] pk5[2] pk5[3] pk5[4] pk5[5] pk5[6] pk5[7] pk5[8] pk5[9] pk5[10] pk5[11] pk5[12] pk5[13] pk5[14] pk5[15] pk5[16] pk5[17] pk5[18] pk6[0] pk6[1] pk6[2] pk6[3] pk6[4] pk6[5] pk6[6] pk6[7] pk6[8] pk6[9] pk6[10] pk6[11] pk6[12] pk6[13] pk6[14] pk6[15] pk6[16] pk6[17] pk6[18] pk7[0] pk7[1] pk7[2] pk7[3] pk7[4] pk7[5] pk7[6] pk7[7] pk7[8] pk7[9] pk7[10] pk7[11] pk7[12] pk7[13] pk7[14] pk7[15] pk7[16] pk7[17] pk7[18] pk8[0] pk8[1] pk8[2] pk8[3] pk8[4] pk8[5] pk8[6] pk8[7] pk8[8] pk8[9] pk8[10] pk8[11] pk8[12] pk8[13] pk8[14] pk8[15] pk8[16] pk8[17] pk8[18] pk9[0] pk9[1] pk9[2] pk9[3] pk9[4] pk9[5] pk9[6] pk9[7] pk9[8] pk9[9] pk9[10] pk9[11] pk9[12] pk9[13] pk9[14] pk9[15] pk9[16] pk9[17] pk9[18] pk10[0] pk10[1] pk10[2] pk10[3] pk10[4] pk10[5] pk10[6] pk10[7] pk10[8] pk10[9] pk10[10] pk10[11] pk10[12] pk10[13] pk10[14] pk10[15] pk10[16] pk10[17] pk10[18] pk11[0] pk11[1] pk11[2] pk11[3] pk11[4] pk11[5] pk11[6] pk11[7] pk11[8] pk11[9] pk11[10] pk11[11] pk11[12] pk11[13] pk11[14] pk11[15] pk11[16] pk11[17] pk11[18] pk12[0] pk12[1] pk12[2] pk12[3] pk12[4] pk12[5] pk12[6] pk12[7] pk12[8] pk12[9] pk12[10] pk12[11] pk12[12] pk12[13] pk12[14] pk12[15] pk12[16] pk12[17] pk12[18] pk13[0] pk13[1] pk13[2] pk13[3] pk13[4] pk13[5] pk13[6] pk13[7] pk13[8] pk13[9] pk13[10] pk13[11] pk13[12] pk13[13] pk13[14] pk13[15] pk13[16] pk13[17] pk13[18] pk14[0] pk14[1] pk14[2] pk14[3] pk14[4] pk14[5] pk14[6] pk14[7] pk14[8] pk14[9] pk14[10] pk14[11] pk14[12] pk14[13] pk14[14] pk14[15] pk14[16] pk14[17] pk14[18] pk15[0] pk15[1] pk15[2] pk15[3] pk15[4] pk15[5] pk15[6] pk15[7] pk15[8] pk15[9] pk15[10] pk15[11] pk15[12] pk15[13] pk15[14] pk15[15] pk15[16] pk15[17] pk15[18] pk16[0] pk16[1] pk16[2] pk16[3] pk16[4] pk16[5] pk16[6] pk16[7] pk16[8] pk16[9] pk16[10] pk16[11] pk16[12] pk16[13] pk16[14] pk16[15] pk16[16] pk16[17] pk16[18] pk17[0] pk17[1] pk17[2] pk17[3] pk17[4] pk17[5] pk17[6] pk17[7] pk17[8] pk17[9] pk17[10] pk17[11] pk17[12] pk17[13] pk17[14] pk17[15] pk17[16] pk17[17] pk17[18] pk18[0] pk18[1] pk18[2] pk18[3] pk18[4] pk18[5] pk18[6] pk18[7] pk18[8] pk18[9] pk18[10] pk18[11] pk18[12] pk18[13] pk18[14] pk18[15] pk18[16] pk18[17] pk18[18] ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18 ck18]",
       "Values": "[01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 false false false false false false false false false false false false false false false false false false false 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 1]",
       "Types": " ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean date date date date date date date date date date date date date date date date date date date decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal double double double double double double double double double double double double double double double double double double double float float float float float float float float float float float float float float float float float float float inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet int int int int int int int int int int int int int int int int int int int smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint text text text text text text text text text text text text text text text text text text text timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint time time time time time time time time time time time time time time time time time time time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time time",
-      "QueryType": "1",
+      "QueryType": "SelectRangeStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -385,4 +385,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/check/multiple_partition_clustering_range_mv.json b/pkg/jobs/test_expected_data/check/multiple_partition_clustering_range_mv.json
index 7ca0c1d5..524c9b13 100644
--- a/pkg/jobs/test_expected_data/check/multiple_partition_clustering_range_mv.json
+++ b/pkg/jobs/test_expected_data/check/multiple_partition_clustering_range_mv.json
@@ -5,7 +5,7 @@
       "Names": "[pk0[0] ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[pk0[0] ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[col0[0] pk0[0] ck0 ck0]",
       "Values": "[1970-01-01 1 1970-01-01 1970-01-01]",
       "Types": " date bigint date date",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -50,7 +50,7 @@
       "Names": "[col0[0] pk0[0] ck0 ck0]",
       "Values": "[1970-01-01 1 1970-01-01 1970-01-01]",
       "Types": " date bigint date date",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -65,7 +65,7 @@
       "Names": "[pk0[0] ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -80,7 +80,7 @@
       "Names": "[pk0[0] ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -95,7 +95,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2] ck0 ck0]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 01 00]",
       "Types": " bigint bigint bigint float float float inet inet inet ascii ascii",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -118,7 +118,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2] ck0 ck1 ck2 ck2]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 01 1970-01-01 0.001 0.001]",
       "Types": " bigint bigint bigint float float float inet inet inet ascii date decimal decimal",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -141,7 +141,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0] ck0 ck0]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 00]",
       "Types": " bigint float inet ascii ascii",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -156,7 +156,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0] ck0 ck1 ck2 ck2]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 1970-01-01 0.001 0.001]",
       "Types": " bigint float inet ascii date decimal decimal",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -171,7 +171,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2] ck0 ck0]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 01 00]",
       "Types": " bigint bigint bigint float float float inet inet inet ascii ascii",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -194,7 +194,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2] ck0 ck1 ck2 ck2]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 01 1970-01-01 0.001 0.001]",
       "Types": " bigint bigint bigint float float float inet inet inet ascii date decimal decimal",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -217,7 +217,7 @@
       "Names": "[col0[0] pk0[0] pk1[0] pk2[0] ck0 ck0]",
       "Values": "[01 1 1.110223e-16 1.1.1.1 00 00]",
       "Types": " ascii bigint float inet ascii ascii",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -232,7 +232,7 @@
       "Names": "[col0[0] pk0[0] pk1[0] pk2[0] ck0 ck1 ck2 ck2]",
       "Values": "[01 1 1.110223e-16 1.1.1.1 00 1970-01-01 0.001 0.001]",
       "Types": " ascii bigint float inet ascii date decimal decimal",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -247,7 +247,7 @@
       "Names": "[col0[0] col0[1] col0[2] pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2] ck0 ck0]",
       "Values": "[01 00 00 1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 00 01]",
       "Types": " ascii ascii ascii bigint bigint bigint float float float inet inet inet ascii ascii",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -270,7 +270,7 @@
       "Names": "[col0[0] col0[1] col0[2] pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2] ck0 ck1 ck2 ck2]",
       "Values": "[01 00 00 1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 00 1970-01-01 0.001 0.001]",
       "Types": " ascii ascii ascii bigint bigint bigint float float float inet inet inet ascii date decimal decimal",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -293,7 +293,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0] pk3[0] pk4[0] pk5[0] pk6[0] pk7[0] pk8[0] pk9[0] pk10[0] pk11[0] pk12[0] pk13[0] pk14[0] pk15[0] pk16[0] pk17[0] pk18[0] ck0 ck0]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 00]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii ascii",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -308,7 +308,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0] pk3[0] pk4[0] pk5[0] pk6[0] pk7[0] pk8[0] pk9[0] pk10[0] pk11[0] pk12[0] pk13[0] pk14[0] pk15[0] pk16[0] pk17[0] pk18[0] ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18 ck18]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 1]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time time",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -323,7 +323,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk0[3] pk0[4] pk0[5] pk0[6] pk0[7] pk0[8] pk0[9] pk0[10] pk0[11] pk0[12] pk0[13] pk0[14] pk0[15] pk0[16] pk0[17] pk0[18] pk1[0] pk1[1] pk1[2] pk1[3] pk1[4] pk1[5] pk1[6] pk1[7] pk1[8] pk1[9] pk1[10] pk1[11] pk1[12] pk1[13] pk1[14] pk1[15] pk1[16] pk1[17] pk1[18] pk2[0] pk2[1] pk2[2] pk2[3] pk2[4] pk2[5] pk2[6] pk2[7] pk2[8] pk2[9] pk2[10] pk2[11] pk2[12] pk2[13] pk2[14] pk2[15] pk2[16] pk2[17] pk2[18] pk3[0] pk3[1] pk3[2] pk3[3] pk3[4] pk3[5] pk3[6] pk3[7] pk3[8] pk3[9] pk3[10] pk3[11] pk3[12] pk3[13] pk3[14] pk3[15] pk3[16] pk3[17] pk3[18] pk4[0] pk4[1] pk4[2] pk4[3] pk4[4] pk4[5] pk4[6] pk4[7] pk4[8] pk4[9] pk4[10] pk4[11] pk4[12] pk4[13] pk4[14] pk4[15] pk4[16] pk4[17] pk4[18] pk5[0] pk5[1] pk5[2] pk5[3] pk5[4] pk5[5] pk5[6] pk5[7] pk5[8] pk5[9] pk5[10] pk5[11] pk5[12] pk5[13] pk5[14] pk5[15] pk5[16] pk5[17] pk5[18] pk6[0] pk6[1] pk6[2] pk6[3] pk6[4] pk6[5] pk6[6] pk6[7] pk6[8] pk6[9] pk6[10] pk6[11] pk6[12] pk6[13] pk6[14] pk6[15] pk6[16] pk6[17] pk6[18] pk7[0] pk7[1] pk7[2] pk7[3] pk7[4] pk7[5] pk7[6] pk7[7] pk7[8] pk7[9] pk7[10] pk7[11] pk7[12] pk7[13] pk7[14] pk7[15] pk7[16] pk7[17] pk7[18] pk8[0] pk8[1] pk8[2] pk8[3] pk8[4] pk8[5] pk8[6] pk8[7] pk8[8] pk8[9] pk8[10] pk8[11] pk8[12] pk8[13] pk8[14] pk8[15] pk8[16] pk8[17] pk8[18] pk9[0] pk9[1] pk9[2] pk9[3] pk9[4] pk9[5] pk9[6] pk9[7] pk9[8] pk9[9] pk9[10] pk9[11] pk9[12] pk9[13] pk9[14] pk9[15] pk9[16] pk9[17] pk9[18] pk10[0] pk10[1] pk10[2] pk10[3] pk10[4] pk10[5] pk10[6] pk10[7] pk10[8] pk10[9] pk10[10] pk10[11] pk10[12] pk10[13] pk10[14] pk10[15] pk10[16] pk10[17] pk10[18] pk11[0] pk11[1] pk11[2] pk11[3] pk11[4] pk11[5] pk11[6] pk11[7] pk11[8] pk11[9] pk11[10] pk11[11] pk11[12] pk11[13] pk11[14] pk11[15] pk11[16] pk11[17] pk11[18] pk12[0] pk12[1] pk12[2] pk12[3] pk12[4] pk12[5] pk12[6] pk12[7] pk12[8] pk12[9] pk12[10] pk12[11] pk12[12] pk12[13] pk12[14] pk12[15] pk12[16] pk12[17] pk12[18] pk13[0] pk13[1] pk13[2] pk13[3] pk13[4] pk13[5] pk13[6] pk13[7] pk13[8] pk13[9] pk13[10] pk13[11] pk13[12] pk13[13] pk13[14] pk13[15] pk13[16] pk13[17] pk13[18] pk14[0] pk14[1] pk14[2] pk14[3] pk14[4] pk14[5] pk14[6] pk14[7] pk14[8] pk14[9] pk14[10] pk14[11] pk14[12] pk14[13] pk14[14] pk14[15] pk14[16] pk14[17] pk14[18] pk15[0] pk15[1] pk15[2] pk15[3] pk15[4] pk15[5] pk15[6] pk15[7] pk15[8] pk15[9] pk15[10] pk15[11] pk15[12] pk15[13] pk15[14] pk15[15] pk15[16] pk15[17] pk15[18] pk16[0] pk16[1] pk16[2] pk16[3] pk16[4] pk16[5] pk16[6] pk16[7] pk16[8] pk16[9] pk16[10] pk16[11] pk16[12] pk16[13] pk16[14] pk16[15] pk16[16] pk16[17] pk16[18] pk17[0] pk17[1] pk17[2] pk17[3] pk17[4] pk17[5] pk17[6] pk17[7] pk17[8] pk17[9] pk17[10] pk17[11] pk17[12] pk17[13] pk17[14] pk17[15] pk17[16] pk17[17] pk17[18] pk18[0] pk18[1] pk18[2] pk18[3] pk18[4] pk18[5] pk18[6] pk18[7] pk18[8] pk18[9] pk18[10] pk18[11] pk18[12] pk18[13] pk18[14] pk18[15] pk18[16] pk18[17] pk18[18] ck0 ck0]",
       "Values": "[01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 false false false false false false false false false false false false false false false false false false false 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 01 00]",
       "Types": " ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean date date date date date date date date date date date date date date date date date date date decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal double double double double double double double double double double double double double double double double double double double float float float float float float float float float float float float float float float float float float float inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet int int int int int int int int int int int int int int int int int int int smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint text text text text text text text text text text text text text text text text text text text timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint time time time time time time time time time time time time time time time time time time time ascii ascii",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -410,7 +410,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk0[3] pk0[4] pk0[5] pk0[6] pk0[7] pk0[8] pk0[9] pk0[10] pk0[11] pk0[12] pk0[13] pk0[14] pk0[15] pk0[16] pk0[17] pk0[18] pk1[0] pk1[1] pk1[2] pk1[3] pk1[4] pk1[5] pk1[6] pk1[7] pk1[8] pk1[9] pk1[10] pk1[11] pk1[12] pk1[13] pk1[14] pk1[15] pk1[16] pk1[17] pk1[18] pk2[0] pk2[1] pk2[2] pk2[3] pk2[4] pk2[5] pk2[6] pk2[7] pk2[8] pk2[9] pk2[10] pk2[11] pk2[12] pk2[13] pk2[14] pk2[15] pk2[16] pk2[17] pk2[18] pk3[0] pk3[1] pk3[2] pk3[3] pk3[4] pk3[5] pk3[6] pk3[7] pk3[8] pk3[9] pk3[10] pk3[11] pk3[12] pk3[13] pk3[14] pk3[15] pk3[16] pk3[17] pk3[18] pk4[0] pk4[1] pk4[2] pk4[3] pk4[4] pk4[5] pk4[6] pk4[7] pk4[8] pk4[9] pk4[10] pk4[11] pk4[12] pk4[13] pk4[14] pk4[15] pk4[16] pk4[17] pk4[18] pk5[0] pk5[1] pk5[2] pk5[3] pk5[4] pk5[5] pk5[6] pk5[7] pk5[8] pk5[9] pk5[10] pk5[11] pk5[12] pk5[13] pk5[14] pk5[15] pk5[16] pk5[17] pk5[18] pk6[0] pk6[1] pk6[2] pk6[3] pk6[4] pk6[5] pk6[6] pk6[7] pk6[8] pk6[9] pk6[10] pk6[11] pk6[12] pk6[13] pk6[14] pk6[15] pk6[16] pk6[17] pk6[18] pk7[0] pk7[1] pk7[2] pk7[3] pk7[4] pk7[5] pk7[6] pk7[7] pk7[8] pk7[9] pk7[10] pk7[11] pk7[12] pk7[13] pk7[14] pk7[15] pk7[16] pk7[17] pk7[18] pk8[0] pk8[1] pk8[2] pk8[3] pk8[4] pk8[5] pk8[6] pk8[7] pk8[8] pk8[9] pk8[10] pk8[11] pk8[12] pk8[13] pk8[14] pk8[15] pk8[16] pk8[17] pk8[18] pk9[0] pk9[1] pk9[2] pk9[3] pk9[4] pk9[5] pk9[6] pk9[7] pk9[8] pk9[9] pk9[10] pk9[11] pk9[12] pk9[13] pk9[14] pk9[15] pk9[16] pk9[17] pk9[18] pk10[0] pk10[1] pk10[2] pk10[3] pk10[4] pk10[5] pk10[6] pk10[7] pk10[8] pk10[9] pk10[10] pk10[11] pk10[12] pk10[13] pk10[14] pk10[15] pk10[16] pk10[17] pk10[18] pk11[0] pk11[1] pk11[2] pk11[3] pk11[4] pk11[5] pk11[6] pk11[7] pk11[8] pk11[9] pk11[10] pk11[11] pk11[12] pk11[13] pk11[14] pk11[15] pk11[16] pk11[17] pk11[18] pk12[0] pk12[1] pk12[2] pk12[3] pk12[4] pk12[5] pk12[6] pk12[7] pk12[8] pk12[9] pk12[10] pk12[11] pk12[12] pk12[13] pk12[14] pk12[15] pk12[16] pk12[17] pk12[18] pk13[0] pk13[1] pk13[2] pk13[3] pk13[4] pk13[5] pk13[6] pk13[7] pk13[8] pk13[9] pk13[10] pk13[11] pk13[12] pk13[13] pk13[14] pk13[15] pk13[16] pk13[17] pk13[18] pk14[0] pk14[1] pk14[2] pk14[3] pk14[4] pk14[5] pk14[6] pk14[7] pk14[8] pk14[9] pk14[10] pk14[11] pk14[12] pk14[13] pk14[14] pk14[15] pk14[16] pk14[17] pk14[18] pk15[0] pk15[1] pk15[2] pk15[3] pk15[4] pk15[5] pk15[6] pk15[7] pk15[8] pk15[9] pk15[10] pk15[11] pk15[12] pk15[13] pk15[14] pk15[15] pk15[16] pk15[17] pk15[18] pk16[0] pk16[1] pk16[2] pk16[3] pk16[4] pk16[5] pk16[6] pk16[7] pk16[8] pk16[9] pk16[10] pk16[11] pk16[12] pk16[13] pk16[14] pk16[15] pk16[16] pk16[17] pk16[18] pk17[0] pk17[1] pk17[2] pk17[3] pk17[4] pk17[5] pk17[6] pk17[7] pk17[8] pk17[9] pk17[10] pk17[11] pk17[12] pk17[13] pk17[14] pk17[15] pk17[16] pk17[17] pk17[18] pk18[0] pk18[1] pk18[2] pk18[3] pk18[4] pk18[5] pk18[6] pk18[7] pk18[8] pk18[9] pk18[10] pk18[11] pk18[12] pk18[13] pk18[14] pk18[15] pk18[16] pk18[17] pk18[18] ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18 ck18]",
       "Values": "[01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 false false false false false false false false false false false false false false false false false false false 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 1]",
       "Types": " ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean date date date date date date date date date date date date date date date date date date date decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal double double double double double double double double double double double double double double double double double double double float float float float float float float float float float float float float float float float float float float inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet int int int int int int int int int int int int int int int int int int int smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint text text text text text text text text text text text text text text text text text text text timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint time time time time time time time time time time time time time time time time time time time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time time",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -497,7 +497,7 @@
       "Names": "[col1[0] pk0[0] pk1[0] pk2[0] pk3[0] pk4[0] pk5[0] pk6[0] pk7[0] pk8[0] pk9[0] pk10[0] pk11[0] pk12[0] pk13[0] pk14[0] pk15[0] pk16[0] pk17[0] pk18[0] ck0 ck0]",
       "Values": "[01 00 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 01 1 1 00 00]",
       "Types": " ascii ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii ascii",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4728710883122643287",
@@ -512,7 +512,7 @@
       "Names": "[col1[0] pk0[0] pk1[0] pk2[0] pk3[0] pk4[0] pk5[0] pk6[0] pk7[0] pk8[0] pk9[0] pk10[0] pk11[0] pk12[0] pk13[0] pk14[0] pk15[0] pk16[0] pk17[0] pk18[0] ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18 ck18]",
       "Values": "[01 00 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 01 1 1 00 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 01 1 1 1]",
       "Types": " ascii ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time time",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "4728710883122643287",
@@ -527,7 +527,7 @@
       "Names": "[col1[0] col1[1] col1[2] col1[3] col1[4] col1[5] col1[6] col1[7] col1[8] col1[9] col1[10] col1[11] col1[12] col1[13] col1[14] col1[15] col1[16] col1[17] col1[18] pk0[0] pk0[1] pk0[2] pk0[3] pk0[4] pk0[5] pk0[6] pk0[7] pk0[8] pk0[9] pk0[10] pk0[11] pk0[12] pk0[13] pk0[14] pk0[15] pk0[16] pk0[17] pk0[18] pk1[0] pk1[1] pk1[2] pk1[3] pk1[4] pk1[5] pk1[6] pk1[7] pk1[8] pk1[9] pk1[10] pk1[11] pk1[12] pk1[13] pk1[14] pk1[15] pk1[16] pk1[17] pk1[18] pk2[0] pk2[1] pk2[2] pk2[3] pk2[4] pk2[5] pk2[6] pk2[7] pk2[8] pk2[9] pk2[10] pk2[11] pk2[12] pk2[13] pk2[14] pk2[15] pk2[16] pk2[17] pk2[18] pk3[0] pk3[1] pk3[2] pk3[3] pk3[4] pk3[5] pk3[6] pk3[7] pk3[8] pk3[9] pk3[10] pk3[11] pk3[12] pk3[13] pk3[14] pk3[15] pk3[16] pk3[17] pk3[18] pk4[0] pk4[1] pk4[2] pk4[3] pk4[4] pk4[5] pk4[6] pk4[7] pk4[8] pk4[9] pk4[10] pk4[11] pk4[12] pk4[13] pk4[14] pk4[15] pk4[16] pk4[17] pk4[18] pk5[0] pk5[1] pk5[2] pk5[3] pk5[4] pk5[5] pk5[6] pk5[7] pk5[8] pk5[9] pk5[10] pk5[11] pk5[12] pk5[13] pk5[14] pk5[15] pk5[16] pk5[17] pk5[18] pk6[0] pk6[1] pk6[2] pk6[3] pk6[4] pk6[5] pk6[6] pk6[7] pk6[8] pk6[9] pk6[10] pk6[11] pk6[12] pk6[13] pk6[14] pk6[15] pk6[16] pk6[17] pk6[18] pk7[0] pk7[1] pk7[2] pk7[3] pk7[4] pk7[5] pk7[6] pk7[7] pk7[8] pk7[9] pk7[10] pk7[11] pk7[12] pk7[13] pk7[14] pk7[15] pk7[16] pk7[17] pk7[18] pk8[0] pk8[1] pk8[2] pk8[3] pk8[4] pk8[5] pk8[6] pk8[7] pk8[8] pk8[9] pk8[10] pk8[11] pk8[12] pk8[13] pk8[14] pk8[15] pk8[16] pk8[17] pk8[18] pk9[0] pk9[1] pk9[2] pk9[3] pk9[4] pk9[5] pk9[6] pk9[7] pk9[8] pk9[9] pk9[10] pk9[11] pk9[12] pk9[13] pk9[14] pk9[15] pk9[16] pk9[17] pk9[18] pk10[0] pk10[1] pk10[2] pk10[3] pk10[4] pk10[5] pk10[6] pk10[7] pk10[8] pk10[9] pk10[10] pk10[11] pk10[12] pk10[13] pk10[14] pk10[15] pk10[16] pk10[17] pk10[18] pk11[0] pk11[1] pk11[2] pk11[3] pk11[4] pk11[5] pk11[6] pk11[7] pk11[8] pk11[9] pk11[10] pk11[11] pk11[12] pk11[13] pk11[14] pk11[15] pk11[16] pk11[17] pk11[18] pk12[0] pk12[1] pk12[2] pk12[3] pk12[4] pk12[5] pk12[6] pk12[7] pk12[8] pk12[9] pk12[10] pk12[11] pk12[12] pk12[13] pk12[14] pk12[15] pk12[16] pk12[17] pk12[18] pk13[0] pk13[1] pk13[2] pk13[3] pk13[4] pk13[5] pk13[6] pk13[7] pk13[8] pk13[9] pk13[10] pk13[11] pk13[12] pk13[13] pk13[14] pk13[15] pk13[16] pk13[17] pk13[18] pk14[0] pk14[1] pk14[2] pk14[3] pk14[4] pk14[5] pk14[6] pk14[7] pk14[8] pk14[9] pk14[10] pk14[11] pk14[12] pk14[13] pk14[14] pk14[15] pk14[16] pk14[17] pk14[18] pk15[0] pk15[1] pk15[2] pk15[3] pk15[4] pk15[5] pk15[6] pk15[7] pk15[8] pk15[9] pk15[10] pk15[11] pk15[12] pk15[13] pk15[14] pk15[15] pk15[16] pk15[17] pk15[18] pk16[0] pk16[1] pk16[2] pk16[3] pk16[4] pk16[5] pk16[6] pk16[7] pk16[8] pk16[9] pk16[10] pk16[11] pk16[12] pk16[13] pk16[14] pk16[15] pk16[16] pk16[17] pk16[18] pk17[0] pk17[1] pk17[2] pk17[3] pk17[4] pk17[5] pk17[6] pk17[7] pk17[8] pk17[9] pk17[10] pk17[11] pk17[12] pk17[13] pk17[14] pk17[15] pk17[16] pk17[17] pk17[18] pk18[0] pk18[1] pk18[2] pk18[3] pk18[4] pk18[5] pk18[6] pk18[7] pk18[8] pk18[9] pk18[10] pk18[11] pk18[12] pk18[13] pk18[14] pk18[15] pk18[16] pk18[17] pk18[18] ck0 ck0]",
       "Values": "[01 00 00 00 01 00 00 00 01 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 false false false false false false false false false false false false false false false false false false false 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00 01]",
       "Types": " ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean date date date date date date date date date date date date date date date date date date date decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal double double double double double double double double double double double double double double double double double double double float float float float float float float float float float float float float float float float float float float inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet int int int int int int int int int int int int int int int int int int int smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint text text text text text text text text text text text text text text text text text text text timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint time time time time time time time time time time time time time time time time time time time ascii ascii",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "7454320090462070421",
@@ -614,7 +614,7 @@
       "Names": "[col1[0] col1[1] col1[2] col1[3] col1[4] col1[5] col1[6] col1[7] col1[8] col1[9] col1[10] col1[11] col1[12] col1[13] col1[14] col1[15] col1[16] col1[17] col1[18] pk0[0] pk0[1] pk0[2] pk0[3] pk0[4] pk0[5] pk0[6] pk0[7] pk0[8] pk0[9] pk0[10] pk0[11] pk0[12] pk0[13] pk0[14] pk0[15] pk0[16] pk0[17] pk0[18] pk1[0] pk1[1] pk1[2] pk1[3] pk1[4] pk1[5] pk1[6] pk1[7] pk1[8] pk1[9] pk1[10] pk1[11] pk1[12] pk1[13] pk1[14] pk1[15] pk1[16] pk1[17] pk1[18] pk2[0] pk2[1] pk2[2] pk2[3] pk2[4] pk2[5] pk2[6] pk2[7] pk2[8] pk2[9] pk2[10] pk2[11] pk2[12] pk2[13] pk2[14] pk2[15] pk2[16] pk2[17] pk2[18] pk3[0] pk3[1] pk3[2] pk3[3] pk3[4] pk3[5] pk3[6] pk3[7] pk3[8] pk3[9] pk3[10] pk3[11] pk3[12] pk3[13] pk3[14] pk3[15] pk3[16] pk3[17] pk3[18] pk4[0] pk4[1] pk4[2] pk4[3] pk4[4] pk4[5] pk4[6] pk4[7] pk4[8] pk4[9] pk4[10] pk4[11] pk4[12] pk4[13] pk4[14] pk4[15] pk4[16] pk4[17] pk4[18] pk5[0] pk5[1] pk5[2] pk5[3] pk5[4] pk5[5] pk5[6] pk5[7] pk5[8] pk5[9] pk5[10] pk5[11] pk5[12] pk5[13] pk5[14] pk5[15] pk5[16] pk5[17] pk5[18] pk6[0] pk6[1] pk6[2] pk6[3] pk6[4] pk6[5] pk6[6] pk6[7] pk6[8] pk6[9] pk6[10] pk6[11] pk6[12] pk6[13] pk6[14] pk6[15] pk6[16] pk6[17] pk6[18] pk7[0] pk7[1] pk7[2] pk7[3] pk7[4] pk7[5] pk7[6] pk7[7] pk7[8] pk7[9] pk7[10] pk7[11] pk7[12] pk7[13] pk7[14] pk7[15] pk7[16] pk7[17] pk7[18] pk8[0] pk8[1] pk8[2] pk8[3] pk8[4] pk8[5] pk8[6] pk8[7] pk8[8] pk8[9] pk8[10] pk8[11] pk8[12] pk8[13] pk8[14] pk8[15] pk8[16] pk8[17] pk8[18] pk9[0] pk9[1] pk9[2] pk9[3] pk9[4] pk9[5] pk9[6] pk9[7] pk9[8] pk9[9] pk9[10] pk9[11] pk9[12] pk9[13] pk9[14] pk9[15] pk9[16] pk9[17] pk9[18] pk10[0] pk10[1] pk10[2] pk10[3] pk10[4] pk10[5] pk10[6] pk10[7] pk10[8] pk10[9] pk10[10] pk10[11] pk10[12] pk10[13] pk10[14] pk10[15] pk10[16] pk10[17] pk10[18] pk11[0] pk11[1] pk11[2] pk11[3] pk11[4] pk11[5] pk11[6] pk11[7] pk11[8] pk11[9] pk11[10] pk11[11] pk11[12] pk11[13] pk11[14] pk11[15] pk11[16] pk11[17] pk11[18] pk12[0] pk12[1] pk12[2] pk12[3] pk12[4] pk12[5] pk12[6] pk12[7] pk12[8] pk12[9] pk12[10] pk12[11] pk12[12] pk12[13] pk12[14] pk12[15] pk12[16] pk12[17] pk12[18] pk13[0] pk13[1] pk13[2] pk13[3] pk13[4] pk13[5] pk13[6] pk13[7] pk13[8] pk13[9] pk13[10] pk13[11] pk13[12] pk13[13] pk13[14] pk13[15] pk13[16] pk13[17] pk13[18] pk14[0] pk14[1] pk14[2] pk14[3] pk14[4] pk14[5] pk14[6] pk14[7] pk14[8] pk14[9] pk14[10] pk14[11] pk14[12] pk14[13] pk14[14] pk14[15] pk14[16] pk14[17] pk14[18] pk15[0] pk15[1] pk15[2] pk15[3] pk15[4] pk15[5] pk15[6] pk15[7] pk15[8] pk15[9] pk15[10] pk15[11] pk15[12] pk15[13] pk15[14] pk15[15] pk15[16] pk15[17] pk15[18] pk16[0] pk16[1] pk16[2] pk16[3] pk16[4] pk16[5] pk16[6] pk16[7] pk16[8] pk16[9] pk16[10] pk16[11] pk16[12] pk16[13] pk16[14] pk16[15] pk16[16] pk16[17] pk16[18] pk17[0] pk17[1] pk17[2] pk17[3] pk17[4] pk17[5] pk17[6] pk17[7] pk17[8] pk17[9] pk17[10] pk17[11] pk17[12] pk17[13] pk17[14] pk17[15] pk17[16] pk17[17] pk17[18] pk18[0] pk18[1] pk18[2] pk18[3] pk18[4] pk18[5] pk18[6] pk18[7] pk18[8] pk18[9] pk18[10] pk18[11] pk18[12] pk18[13] pk18[14] pk18[15] pk18[16] pk18[17] pk18[18] ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18 ck18]",
       "Values": "[01 00 00 00 01 00 00 00 01 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 3031 false false false false false false false false false false false false false false false false false false false 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00 1 3031 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 1]",
       "Types": " ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean date date date date date date date date date date date date date date date date date date date decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal double double double double double double double double double double double double double double double double double double double float float float float float float float float float float float float float float float float float float float inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet int int int int int int int int int int int int int int int int int int int smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint text text text text text text text text text text text text text text text text text text text timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint time time time time time time time time time time time time time time time time time time time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time time",
-      "QueryType": "3",
+      "QueryType": "SelectFromMaterializedViewStatement",
       "TokenValues": [
         {
           "Token": "7454320090462070421",
@@ -695,4 +695,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/check/multiple_partition_mv.json b/pkg/jobs/test_expected_data/check/multiple_partition_mv.json
index 67453eee..33cd3871 100644
--- a/pkg/jobs/test_expected_data/check/multiple_partition_mv.json
+++ b/pkg/jobs/test_expected_data/check/multiple_partition_mv.json
@@ -5,7 +5,7 @@
       "Names": "[pk0[0]]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[pk0[0]]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[pk0[0]]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -50,7 +50,7 @@
       "Names": "[pk0[0]]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -65,7 +65,7 @@
       "Names": "[pk0[0]]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -80,7 +80,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2]]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1]",
       "Types": " bigint bigint bigint float float float inet inet inet",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -103,7 +103,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0]]",
       "Values": "[1 1.110223e-16 1.1.1.1]",
       "Types": " bigint float inet",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -118,7 +118,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2]]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1]",
       "Types": " bigint bigint bigint float float float inet inet inet",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -141,7 +141,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0]]",
       "Values": "[1 1.110223e-16 1.1.1.1]",
       "Types": " bigint float inet",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -156,7 +156,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk1[0] pk1[1] pk1[2] pk2[0] pk2[1] pk2[2]]",
       "Values": "[1 1 1 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1]",
       "Types": " bigint bigint bigint float float float inet inet inet",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -179,7 +179,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0] pk3[0] pk4[0] pk5[0] pk6[0] pk7[0] pk8[0] pk9[0] pk10[0] pk11[0] pk12[0] pk13[0] pk14[0] pk15[0] pk16[0] pk17[0] pk18[0]]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -194,7 +194,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk0[3] pk0[4] pk0[5] pk0[6] pk0[7] pk0[8] pk0[9] pk0[10] pk0[11] pk0[12] pk0[13] pk0[14] pk0[15] pk0[16] pk0[17] pk0[18] pk1[0] pk1[1] pk1[2] pk1[3] pk1[4] pk1[5] pk1[6] pk1[7] pk1[8] pk1[9] pk1[10] pk1[11] pk1[12] pk1[13] pk1[14] pk1[15] pk1[16] pk1[17] pk1[18] pk2[0] pk2[1] pk2[2] pk2[3] pk2[4] pk2[5] pk2[6] pk2[7] pk2[8] pk2[9] pk2[10] pk2[11] pk2[12] pk2[13] pk2[14] pk2[15] pk2[16] pk2[17] pk2[18] pk3[0] pk3[1] pk3[2] pk3[3] pk3[4] pk3[5] pk3[6] pk3[7] pk3[8] pk3[9] pk3[10] pk3[11] pk3[12] pk3[13] pk3[14] pk3[15] pk3[16] pk3[17] pk3[18] pk4[0] pk4[1] pk4[2] pk4[3] pk4[4] pk4[5] pk4[6] pk4[7] pk4[8] pk4[9] pk4[10] pk4[11] pk4[12] pk4[13] pk4[14] pk4[15] pk4[16] pk4[17] pk4[18] pk5[0] pk5[1] pk5[2] pk5[3] pk5[4] pk5[5] pk5[6] pk5[7] pk5[8] pk5[9] pk5[10] pk5[11] pk5[12] pk5[13] pk5[14] pk5[15] pk5[16] pk5[17] pk5[18] pk6[0] pk6[1] pk6[2] pk6[3] pk6[4] pk6[5] pk6[6] pk6[7] pk6[8] pk6[9] pk6[10] pk6[11] pk6[12] pk6[13] pk6[14] pk6[15] pk6[16] pk6[17] pk6[18] pk7[0] pk7[1] pk7[2] pk7[3] pk7[4] pk7[5] pk7[6] pk7[7] pk7[8] pk7[9] pk7[10] pk7[11] pk7[12] pk7[13] pk7[14] pk7[15] pk7[16] pk7[17] pk7[18] pk8[0] pk8[1] pk8[2] pk8[3] pk8[4] pk8[5] pk8[6] pk8[7] pk8[8] pk8[9] pk8[10] pk8[11] pk8[12] pk8[13] pk8[14] pk8[15] pk8[16] pk8[17] pk8[18] pk9[0] pk9[1] pk9[2] pk9[3] pk9[4] pk9[5] pk9[6] pk9[7] pk9[8] pk9[9] pk9[10] pk9[11] pk9[12] pk9[13] pk9[14] pk9[15] pk9[16] pk9[17] pk9[18] pk10[0] pk10[1] pk10[2] pk10[3] pk10[4] pk10[5] pk10[6] pk10[7] pk10[8] pk10[9] pk10[10] pk10[11] pk10[12] pk10[13] pk10[14] pk10[15] pk10[16] pk10[17] pk10[18] pk11[0] pk11[1] pk11[2] pk11[3] pk11[4] pk11[5] pk11[6] pk11[7] pk11[8] pk11[9] pk11[10] pk11[11] pk11[12] pk11[13] pk11[14] pk11[15] pk11[16] pk11[17] pk11[18] pk12[0] pk12[1] pk12[2] pk12[3] pk12[4] pk12[5] pk12[6] pk12[7] pk12[8] pk12[9] pk12[10] pk12[11] pk12[12] pk12[13] pk12[14] pk12[15] pk12[16] pk12[17] pk12[18] pk13[0] pk13[1] pk13[2] pk13[3] pk13[4] pk13[5] pk13[6] pk13[7] pk13[8] pk13[9] pk13[10] pk13[11] pk13[12] pk13[13] pk13[14] pk13[15] pk13[16] pk13[17] pk13[18] pk14[0] pk14[1] pk14[2] pk14[3] pk14[4] pk14[5] pk14[6] pk14[7] pk14[8] pk14[9] pk14[10] pk14[11] pk14[12] pk14[13] pk14[14] pk14[15] pk14[16] pk14[17] pk14[18] pk15[0] pk15[1] pk15[2] pk15[3] pk15[4] pk15[5] pk15[6] pk15[7] pk15[8] pk15[9] pk15[10] pk15[11] pk15[12] pk15[13] pk15[14] pk15[15] pk15[16] pk15[17] pk15[18] pk16[0] pk16[1] pk16[2] pk16[3] pk16[4] pk16[5] pk16[6] pk16[7] pk16[8] pk16[9] pk16[10] pk16[11] pk16[12] pk16[13] pk16[14] pk16[15] pk16[16] pk16[17] pk16[18] pk17[0] pk17[1] pk17[2] pk17[3] pk17[4] pk17[5] pk17[6] pk17[7] pk17[8] pk17[9] pk17[10] pk17[11] pk17[12] pk17[13] pk17[14] pk17[15] pk17[16] pk17[17] pk17[18] pk18[0] pk18[1] pk18[2] pk18[3] pk18[4] pk18[5] pk18[6] pk18[7] pk18[8] pk18[9] pk18[10] pk18[11] pk18[12] pk18[13] pk18[14] pk18[15] pk18[16] pk18[17] pk18[18]]",
       "Values": "[01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 false false false false false false false false false false false false false false false false false false false 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1]",
       "Types": " ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean date date date date date date date date date date date date date date date date date date date decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal double double double double double double double double double double double double double double double double double double double float float float float float float float float float float float float float float float float float float float inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet int int int int int int int int int int int int int int int int int int int smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint text text text text text text text text text text text text text text text text text text text timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint time time time time time time time time time time time time time time time time time time time",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -281,7 +281,7 @@
       "Names": "[pk0[0] pk1[0] pk2[0] pk3[0] pk4[0] pk5[0] pk6[0] pk7[0] pk8[0] pk9[0] pk10[0] pk11[0] pk12[0] pk13[0] pk14[0] pk15[0] pk16[0] pk17[0] pk18[0]]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -296,7 +296,7 @@
       "Names": "[pk0[0] pk0[1] pk0[2] pk0[3] pk0[4] pk0[5] pk0[6] pk0[7] pk0[8] pk0[9] pk0[10] pk0[11] pk0[12] pk0[13] pk0[14] pk0[15] pk0[16] pk0[17] pk0[18] pk1[0] pk1[1] pk1[2] pk1[3] pk1[4] pk1[5] pk1[6] pk1[7] pk1[8] pk1[9] pk1[10] pk1[11] pk1[12] pk1[13] pk1[14] pk1[15] pk1[16] pk1[17] pk1[18] pk2[0] pk2[1] pk2[2] pk2[3] pk2[4] pk2[5] pk2[6] pk2[7] pk2[8] pk2[9] pk2[10] pk2[11] pk2[12] pk2[13] pk2[14] pk2[15] pk2[16] pk2[17] pk2[18] pk3[0] pk3[1] pk3[2] pk3[3] pk3[4] pk3[5] pk3[6] pk3[7] pk3[8] pk3[9] pk3[10] pk3[11] pk3[12] pk3[13] pk3[14] pk3[15] pk3[16] pk3[17] pk3[18] pk4[0] pk4[1] pk4[2] pk4[3] pk4[4] pk4[5] pk4[6] pk4[7] pk4[8] pk4[9] pk4[10] pk4[11] pk4[12] pk4[13] pk4[14] pk4[15] pk4[16] pk4[17] pk4[18] pk5[0] pk5[1] pk5[2] pk5[3] pk5[4] pk5[5] pk5[6] pk5[7] pk5[8] pk5[9] pk5[10] pk5[11] pk5[12] pk5[13] pk5[14] pk5[15] pk5[16] pk5[17] pk5[18] pk6[0] pk6[1] pk6[2] pk6[3] pk6[4] pk6[5] pk6[6] pk6[7] pk6[8] pk6[9] pk6[10] pk6[11] pk6[12] pk6[13] pk6[14] pk6[15] pk6[16] pk6[17] pk6[18] pk7[0] pk7[1] pk7[2] pk7[3] pk7[4] pk7[5] pk7[6] pk7[7] pk7[8] pk7[9] pk7[10] pk7[11] pk7[12] pk7[13] pk7[14] pk7[15] pk7[16] pk7[17] pk7[18] pk8[0] pk8[1] pk8[2] pk8[3] pk8[4] pk8[5] pk8[6] pk8[7] pk8[8] pk8[9] pk8[10] pk8[11] pk8[12] pk8[13] pk8[14] pk8[15] pk8[16] pk8[17] pk8[18] pk9[0] pk9[1] pk9[2] pk9[3] pk9[4] pk9[5] pk9[6] pk9[7] pk9[8] pk9[9] pk9[10] pk9[11] pk9[12] pk9[13] pk9[14] pk9[15] pk9[16] pk9[17] pk9[18] pk10[0] pk10[1] pk10[2] pk10[3] pk10[4] pk10[5] pk10[6] pk10[7] pk10[8] pk10[9] pk10[10] pk10[11] pk10[12] pk10[13] pk10[14] pk10[15] pk10[16] pk10[17] pk10[18] pk11[0] pk11[1] pk11[2] pk11[3] pk11[4] pk11[5] pk11[6] pk11[7] pk11[8] pk11[9] pk11[10] pk11[11] pk11[12] pk11[13] pk11[14] pk11[15] pk11[16] pk11[17] pk11[18] pk12[0] pk12[1] pk12[2] pk12[3] pk12[4] pk12[5] pk12[6] pk12[7] pk12[8] pk12[9] pk12[10] pk12[11] pk12[12] pk12[13] pk12[14] pk12[15] pk12[16] pk12[17] pk12[18] pk13[0] pk13[1] pk13[2] pk13[3] pk13[4] pk13[5] pk13[6] pk13[7] pk13[8] pk13[9] pk13[10] pk13[11] pk13[12] pk13[13] pk13[14] pk13[15] pk13[16] pk13[17] pk13[18] pk14[0] pk14[1] pk14[2] pk14[3] pk14[4] pk14[5] pk14[6] pk14[7] pk14[8] pk14[9] pk14[10] pk14[11] pk14[12] pk14[13] pk14[14] pk14[15] pk14[16] pk14[17] pk14[18] pk15[0] pk15[1] pk15[2] pk15[3] pk15[4] pk15[5] pk15[6] pk15[7] pk15[8] pk15[9] pk15[10] pk15[11] pk15[12] pk15[13] pk15[14] pk15[15] pk15[16] pk15[17] pk15[18] pk16[0] pk16[1] pk16[2] pk16[3] pk16[4] pk16[5] pk16[6] pk16[7] pk16[8] pk16[9] pk16[10] pk16[11] pk16[12] pk16[13] pk16[14] pk16[15] pk16[16] pk16[17] pk16[18] pk17[0] pk17[1] pk17[2] pk17[3] pk17[4] pk17[5] pk17[6] pk17[7] pk17[8] pk17[9] pk17[10] pk17[11] pk17[12] pk17[13] pk17[14] pk17[15] pk17[16] pk17[17] pk17[18] pk18[0] pk18[1] pk18[2] pk18[3] pk18[4] pk18[5] pk18[6] pk18[7] pk18[8] pk18[9] pk18[10] pk18[11] pk18[12] pk18[13] pk18[14] pk18[15] pk18[16] pk18[17] pk18[18]]",
       "Values": "[01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 3030 false false false false false false false false false false false false false false false false false false false 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 1970-01-01 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.1102230246251565e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.110223e-16 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 1.1.1.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00000001-0000-1000-8000-3132372e302e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1]",
       "Types": " ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii ascii bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint bigint blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob blob boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean boolean date date date date date date date date date date date date date date date date date date date decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal decimal double double double double double double double double double double double double double double double double double double double float float float float float float float float float float float float float float float float float float float inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet inet int int int int int int int int int int int int int int int int int int int smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint smallint text text text text text text text text text text text text text text text text text text text timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timestamp timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid timeuuid tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint tinyint uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid uuid varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varchar varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint varint time time time time time time time time time time time time time time time time time time time",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -377,4 +377,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/check/single_index.json b/pkg/jobs/test_expected_data/check/single_index.json
index c2a8a4af..4bc3e928 100644
--- a/pkg/jobs/test_expected_data/check/single_index.json
+++ b/pkg/jobs/test_expected_data/check/single_index.json
@@ -5,7 +5,7 @@
       "Names": "[col0]",
       "Values": "[1970-01-01]",
       "Types": " date",
-      "QueryType": "2",
+      "QueryType": "SelectByIndexStatement",
       "TokenValues": null
     }
   ],
@@ -15,7 +15,7 @@
       "Names": "[col0]",
       "Values": "[01]",
       "Types": " ascii",
-      "QueryType": "2",
+      "QueryType": "SelectByIndexStatement",
       "TokenValues": null
     }
   ],
@@ -25,8 +25,8 @@
       "Names": "[col0 col1 col2 col3 col4 col5 col6 col7 col8 col9 col10 col11 col12 col13 col14 col15 col16 col17 col18 col19]",
       "Values": "[1m0s 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1]",
       "Types": " duration ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time",
-      "QueryType": "2",
+      "QueryType": "SelectByIndexStatement",
       "TokenValues": null
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/check/single_partition.json b/pkg/jobs/test_expected_data/check/single_partition.json
index e2ff3934..e099b929 100644
--- a/pkg/jobs/test_expected_data/check/single_partition.json
+++ b/pkg/jobs/test_expected_data/check/single_partition.json
@@ -5,7 +5,7 @@
       "Names": "[pk0]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[pk0]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[pk0]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -50,7 +50,7 @@
       "Names": "[pk0 pk1 pk2]",
       "Values": "[1 1.110223e-16 1.1.1.1]",
       "Types": " bigint float inet",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -65,7 +65,7 @@
       "Names": "[pk0 pk1 pk2]",
       "Values": "[1 1.110223e-16 1.1.1.1]",
       "Types": " bigint float inet",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -80,7 +80,7 @@
       "Names": "[pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -89,4 +89,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/check/single_partition_mv.json b/pkg/jobs/test_expected_data/check/single_partition_mv.json
index a3de8f77..58dcdfb0 100644
--- a/pkg/jobs/test_expected_data/check/single_partition_mv.json
+++ b/pkg/jobs/test_expected_data/check/single_partition_mv.json
@@ -5,7 +5,7 @@
       "Names": "[pk0]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[pk0]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[col0 pk0]",
       "Values": "[1970-01-01 1]",
       "Types": " date bigint",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -50,7 +50,7 @@
       "Names": "[pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -65,7 +65,7 @@
       "Names": "[col1 pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18]",
       "Values": "[01 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1]",
       "Types": " ascii ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -74,4 +74,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/ddl/add_column.json b/pkg/jobs/test_expected_data/ddl/add_column.json
index 3c211f6d..4c88227d 100644
--- a/pkg/jobs/test_expected_data/ddl/add_column.json
+++ b/pkg/jobs/test_expected_data/ddl/add_column.json
@@ -5,7 +5,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -15,7 +15,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -25,7 +25,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -35,7 +35,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -45,7 +45,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -55,7 +55,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -65,7 +65,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -75,7 +75,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -85,7 +85,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -95,7 +95,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -105,7 +105,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -115,7 +115,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -125,7 +125,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -135,7 +135,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -145,7 +145,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -155,7 +155,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -165,7 +165,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -175,7 +175,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ],
@@ -185,8 +185,8 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "0",
+      "QueryType": "SelectStatement",
       "TokenValues": null
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/ddl/drop_column.json b/pkg/jobs/test_expected_data/ddl/drop_column.json
index f49365f3..aec265d1 100644
--- a/pkg/jobs/test_expected_data/ddl/drop_column.json
+++ b/pkg/jobs/test_expected_data/ddl/drop_column.json
@@ -5,7 +5,7 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "9",
+      "QueryType": "DropColumnStatement",
       "TokenValues": null
     }
   ],
@@ -15,8 +15,8 @@
       "Names": "[]",
       "Values": "[]",
       "Types": "",
-      "QueryType": "9",
+      "QueryType": "DropColumnStatement",
       "TokenValues": null
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/mutate/delete.json b/pkg/jobs/test_expected_data/mutate/delete.json
index 8210a6fe..99c0939b 100644
--- a/pkg/jobs/test_expected_data/mutate/delete.json
+++ b/pkg/jobs/test_expected_data/mutate/delete.json
@@ -5,7 +5,7 @@
       "Names": "[pk0]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "4",
+      "QueryType": "DeleteStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[pk0 ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "4",
+      "QueryType": "DeleteStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[pk0 ck0 ck0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "4",
+      "QueryType": "DeleteStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -50,7 +50,7 @@
       "Names": "[pk0 pk1 pk2 ck0 ck0]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 00]",
       "Types": " bigint float inet ascii ascii",
-      "QueryType": "4",
+      "QueryType": "DeleteStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -65,7 +65,7 @@
       "Names": "[pk0 pk1 pk2 ck0 ck0]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 00]",
       "Types": " bigint float inet ascii ascii",
-      "QueryType": "4",
+      "QueryType": "DeleteStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -80,7 +80,7 @@
       "Names": "[pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18 ck0 ck0]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 00]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii ascii",
-      "QueryType": "4",
+      "QueryType": "DeleteStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -89,4 +89,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/mutate/insert.json b/pkg/jobs/test_expected_data/mutate/insert.json
index aaa7ef3b..28aae71e 100644
--- a/pkg/jobs/test_expected_data/mutate/insert.json
+++ b/pkg/jobs/test_expected_data/mutate/insert.json
@@ -5,7 +5,7 @@
       "Names": "[pk0]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "5",
+      "QueryType": "InsertStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[pk0]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "5",
+      "QueryType": "InsertStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[pk0 ck0 col0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "5",
+      "QueryType": "InsertStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -50,7 +50,7 @@
       "Names": "[pk0 ck0 col0]",
       "Values": "[1 1970-01-01 1970-01-01]",
       "Types": " bigint date date",
-      "QueryType": "5",
+      "QueryType": "InsertStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -65,7 +65,7 @@
       "Names": "[pk0 ck0 col0]",
       "Values": "[1 1970-01-01 1]",
       "Types": " bigint date counter",
-      "QueryType": "5",
+      "QueryType": "InsertStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -80,7 +80,7 @@
       "Names": "[pk0 ck0 col0]",
       "Values": "[1 1970-01-01 1]",
       "Types": " bigint date counter",
-      "QueryType": "5",
+      "QueryType": "InsertStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -95,7 +95,7 @@
       "Names": "[pk0 pk1 pk2 ck0 ck1 ck2 col0 col1 col2]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 1970-01-01 0.001 1 1 1]",
       "Types": " bigint float inet ascii date decimal counter counter counter",
-      "QueryType": "5",
+      "QueryType": "InsertStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -110,7 +110,7 @@
       "Names": "[pk0 pk1 pk2 ck0 ck1 ck2 col0 col1 col2 col3 col4]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 1970-01-01 0.001 00 1970-01-01 3030 1 1.110223e-16]",
       "Types": " bigint float inet ascii date decimal ascii date blob bigint float",
-      "QueryType": "5",
+      "QueryType": "InsertStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -125,7 +125,7 @@
       "Names": "[pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18 ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18 col0 col1 col2 col3 col4 col5 col6 col7 col8 col9 col10 col11 col12 col13 col14 col15 col16 col17 col18 col19]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 1m0s 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time duration ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time",
-      "QueryType": "5",
+      "QueryType": "InsertStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -140,7 +140,7 @@
       "Names": "[pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18 ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18 col0 col1 col2 col3 col4 col5 col6 col7 col8 col9 col10 col11 col12 col13 col14 col15 col16 col17 col18 col19]",
       "Values": "[01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 1m0s 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1]",
       "Types": " ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time duration ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time",
-      "QueryType": "5",
+      "QueryType": "InsertStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -149,4 +149,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/mutate/insert_j.json b/pkg/jobs/test_expected_data/mutate/insert_j.json
index aba79a3b..bfd4ccfa 100644
--- a/pkg/jobs/test_expected_data/mutate/insert_j.json
+++ b/pkg/jobs/test_expected_data/mutate/insert_j.json
@@ -5,7 +5,7 @@
       "Names": "[]",
       "Values": "[{\"pk0\":1}]",
       "Types": " text",
-      "QueryType": "6",
+      "QueryType": "InsertJSONStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[]",
       "Values": "[{\"ck0\":\"1970-01-01\",\"col0\":\"1970-01-01\",\"pk0\":1}]",
       "Types": " text",
-      "QueryType": "6",
+      "QueryType": "InsertJSONStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[]",
       "Values": "[{\"ck0\":\"01\",\"ck1\":\"1970-01-01\",\"ck2\":\"0.001\",\"col0\":\"00\",\"col1\":\"1970-01-01\",\"col2\":\"0x3030\",\"col3\":1,\"col4\":1.110223e-16,\"pk0\":1,\"pk1\":1.110223e-16,\"pk2\":\"1.1.1.1\"}]",
       "Types": " text",
-      "QueryType": "6",
+      "QueryType": "InsertJSONStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -50,7 +50,7 @@
       "Names": "[]",
       "Values": "[{\"ck0\":\"01\",\"ck1\":1,\"ck10\":1,\"ck11\":\"00\",\"ck12\":1,\"ck13\":\"00000001-0000-1000-8000-3132372e302e\",\"ck14\":1,\"ck15\":\"00000001-0000-1000-8000-3132372e302e\",\"ck16\":\"00\",\"ck17\":1,\"ck18\":\"00:00:00.000000001\",\"ck2\":\"0x3030\",\"ck3\":false,\"ck4\":\"1970-01-01\",\"ck5\":\"0.001\",\"ck6\":1.1102230246251565e-16,\"ck7\":1.110223e-16,\"ck8\":\"1.1.1.1\",\"ck9\":0,\"col0\":\"1m0s\",\"col1\":\"01\",\"col10\":0,\"col11\":1,\"col12\":\"00\",\"col13\":1,\"col14\":\"00000001-0000-1000-8000-3132372e302e\",\"col15\":1,\"col16\":\"00000001-0000-1000-8000-3132372e302e\",\"col17\":\"00\",\"col18\":1,\"col19\":\"00:00:00.000000001\",\"col2\":1,\"col3\":\"0x3030\",\"col4\":false,\"col5\":\"1970-01-01\",\"col6\":\"0.001\",\"col7\":1.1102230246251565e-16,\"col8\":1.110223e-16,\"col9\":\"1.1.1.1\",\"pk0\":\"01\",\"pk1\":1,\"pk10\":1,\"pk11\":\"00\",\"pk12\":1,\"pk13\":\"00000001-0000-1000-8000-3132372e302e\",\"pk14\":1,\"pk15\":\"00000001-0000-1000-8000-3132372e302e\",\"pk16\":\"00\",\"pk17\":1,\"pk18\":\"00:00:00.000000001\",\"pk2\":\"0x3030\",\"pk3\":false,\"pk4\":\"1970-01-01\",\"pk5\":\"0.001\",\"pk6\":1.1102230246251565e-16,\"pk7\":1.110223e-16,\"pk8\":\"1.1.1.1\",\"pk9\":0}]",
       "Types": " text",
-      "QueryType": "6",
+      "QueryType": "InsertJSONStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -59,4 +59,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/jobs/test_expected_data/mutate/update.json b/pkg/jobs/test_expected_data/mutate/update.json
index 55972f3f..02a6d9fb 100644
--- a/pkg/jobs/test_expected_data/mutate/update.json
+++ b/pkg/jobs/test_expected_data/mutate/update.json
@@ -5,7 +5,7 @@
       "Names": "[pk0]",
       "Values": "[1]",
       "Types": " bigint",
-      "QueryType": "7",
+      "QueryType": "UpdateStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -20,7 +20,7 @@
       "Names": "[col0 pk0 ck0]",
       "Values": "[1970-01-01 1 1970-01-01]",
       "Types": " date bigint date",
-      "QueryType": "7",
+      "QueryType": "UpdateStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -35,7 +35,7 @@
       "Names": "[pk0 ck0]",
       "Values": "[1 1970-01-01]",
       "Types": " bigint date",
-      "QueryType": "7",
+      "QueryType": "UpdateStatement",
       "TokenValues": [
         {
           "Token": "6292367497774912474",
@@ -50,7 +50,7 @@
       "Names": "[pk0 pk1 pk2 ck0 ck1 ck2]",
       "Values": "[1 1.110223e-16 1.1.1.1 01 1970-01-01 0.001]",
       "Types": " bigint float inet ascii date decimal",
-      "QueryType": "7",
+      "QueryType": "UpdateStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -65,7 +65,7 @@
       "Names": "[col0 col1 col2 col3 col4 pk0 pk1 pk2 ck0 ck1 ck2]",
       "Values": "[01 1970-01-01 3030 1 1.110223e-16 1 1.110223e-16 1.1.1.1 00 1970-01-01 0.001]",
       "Types": " ascii date blob bigint float bigint float inet ascii date decimal",
-      "QueryType": "7",
+      "QueryType": "UpdateStatement",
       "TokenValues": [
         {
           "Token": "4281341066124197361",
@@ -80,7 +80,7 @@
       "Names": "[col0 col1 col2 col3 col4 col5 col6 col7 col8 col9 col10 col11 col12 col13 col14 col15 col16 col17 col18 col19 pk0 pk1 pk2 pk3 pk4 pk5 pk6 pk7 pk8 pk9 pk10 pk11 pk12 pk13 pk14 pk15 pk16 pk17 pk18 ck0 ck1 ck2 ck3 ck4 ck5 ck6 ck7 ck8 ck9 ck10 ck11 ck12 ck13 ck14 ck15 ck16 ck17 ck18]",
       "Values": "[1m0s 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1 01 1 3030 false 1970-01-01 0.001 1.1102230246251565e-16 1.110223e-16 1.1.1.1 0 1 00 1 00000001-0000-1000-8000-3132372e302e 1 00000001-0000-1000-8000-3132372e302e 00 1 1]",
       "Types": " duration ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time ascii bigint blob boolean date decimal double float inet int smallint text timestamp timeuuid tinyint uuid varchar varint time",
-      "QueryType": "7",
+      "QueryType": "UpdateStatement",
       "TokenValues": [
         {
           "Token": "16493010564613190464",
@@ -89,4 +89,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/querycache/querycache.go b/pkg/querycache/querycache.go
index f76a6312..6336a9b7 100644
--- a/pkg/querycache/querycache.go
+++ b/pkg/querycache/querycache.go
@@ -181,6 +181,7 @@ func genDeleteStmtCache(s *typedef.Schema, t *typedef.Table) *typedef.StmtCache
 		builder = builder.Where(qb.GtOrEq(ck.Name)).Where(qb.LtOrEq(ck.Name))
 		allTypes = append(allTypes, ck.Type, ck.Type)
 	}
+
 	return &typedef.StmtCache{
 		Query:     builder,
 		Types:     allTypes,
diff --git a/pkg/stmtlogger/filelogger.go b/pkg/stmtlogger/filelogger.go
index d2217670..b785ead5 100644
--- a/pkg/stmtlogger/filelogger.go
+++ b/pkg/stmtlogger/filelogger.go
@@ -15,135 +15,158 @@
 package stmtlogger
 
 import (
+	"bufio"
+	"bytes"
+	"context"
+	"io"
 	"log"
 	"os"
 	"strconv"
+	"sync"
 	"sync/atomic"
 	"time"
 
 	"github.com/pkg/errors"
+	"go.uber.org/multierr"
 
 	"github.com/scylladb/gemini/pkg/typedef"
 )
 
 const (
-	defaultChanSize   = 1000
+	defaultChanSize   = 1024
+	defaultBufferSize = 2048
 	errorsOnFileLimit = 5
 )
 
-type StmtToFile interface {
-	LogStmt(*typedef.Stmt)
-	LogStmtWithTimeStamp(stmt *typedef.Stmt, ts time.Time)
-	Close() error
-}
+type (
+	StmtToFile interface {
+		LogStmt(stmt *typedef.Stmt, ts ...time.Time)
+		Close() error
+	}
 
-type fileLogger struct {
-	fd                   *os.File
-	activeChannel        atomic.Pointer[loggerChan]
-	channel              loggerChan
-	filename             string
-	isFileNonOperational bool
-}
+	logger struct {
+		writer  *bufio.Writer
+		fd      io.Writer
+		channel chan *bytes.Buffer
+		cancel  context.CancelFunc
+		pool    sync.Pool
+		wg      sync.WaitGroup
+		active  atomic.Bool
+	}
+)
+
+func NewFileLogger(filename string) (StmtToFile, error) {
+	if filename == "" {
+		return &nopFileLogger{}, nil
+	}
 
-type loggerChan chan logRec
+	fd, err := os.OpenFile(filename, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0o644)
+	if err != nil {
+		return nil, err
+	}
 
-type logRec struct {
-	stmt *typedef.Stmt
-	ts   time.Time
+	return NewLogger(fd)
 }
 
-func (fl *fileLogger) LogStmt(stmt *typedef.Stmt) {
-	ch := fl.activeChannel.Load()
-	if ch != nil {
-		*ch <- logRec{
-			stmt: stmt,
-		}
+func NewLogger(w io.Writer) (StmtToFile, error) {
+	ctx, cancel := context.WithCancel(context.Background())
+
+	out := &logger{
+		writer:  bufio.NewWriterSize(w, 8192),
+		fd:      w,
+		channel: make(chan *bytes.Buffer, defaultChanSize),
+		cancel:  cancel,
+		pool: sync.Pool{
+			New: func() any {
+				return bytes.NewBuffer(make([]byte, 0, defaultBufferSize))
+			},
+		},
 	}
+	out.active.Store(true)
+
+	go out.committer(ctx)
+	return out, nil
 }
 
-func (fl *fileLogger) LogStmtWithTimeStamp(stmt *typedef.Stmt, ts time.Time) {
-	ch := fl.activeChannel.Load()
-	if ch != nil {
-		*ch <- logRec{
-			stmt: stmt,
-			ts:   ts,
-		}
+func (fl *logger) LogStmt(stmt *typedef.Stmt, ts ...time.Time) {
+	buffer := fl.pool.Get().(*bytes.Buffer)
+	if err := stmt.PrettyCQLBuffered(buffer); err != nil {
+		log.Printf("failed to pretty print query: %s", err)
+		return
 	}
-}
 
-func (fl *fileLogger) Close() error {
-	return fl.fd.Close()
+	opType := stmt.QueryType.OpType()
+
+	if len(ts) > 0 && !ts[0].IsZero() && (opType == typedef.OpInsert || opType == typedef.OpUpdate || opType == typedef.OpDelete) {
+		buffer.WriteString(" USING TIMESTAMP ")
+		buffer.WriteString(strconv.FormatInt(ts[0].UnixMicro(), 10))
+	}
+
+	buffer.WriteString(";\n")
+
+	if fl.active.Load() {
+		fl.channel <- buffer
+	}
 }
 
-func (fl *fileLogger) committer() {
-	var err2 error
+func (fl *logger) Close() error {
+	fl.cancel()
+	fl.active.Swap(false)
+	close(fl.channel)
 
-	defer func() {
-		fl.activeChannel.Swap(nil)
-		close(fl.channel)
-	}()
+	// Wait for commiter to drain the channel
+	fl.wg.Wait()
 
-	errsAtRow := 0
+	err := multierr.Append(nil, fl.writer.Flush())
 
-	for rec := range fl.channel {
-		if fl.isFileNonOperational {
-			continue
-		}
+	if closer, ok := fl.fd.(io.Closer); ok {
+		err = multierr.Append(err, closer.Close())
+	}
+
+	return err
+}
 
-		_, err1 := fl.fd.Write([]byte(rec.stmt.PrettyCQL()))
-		opType := rec.stmt.QueryType.OpType()
-		if rec.ts.IsZero() || !(opType == typedef.OpInsert || opType == typedef.OpUpdate || opType == typedef.OpDelete) {
-			_, err2 = fl.fd.Write([]byte(";\n"))
+func (fl *logger) committer(ctx context.Context) {
+	fl.wg.Add(1)
+	defer fl.wg.Done()
+	errsAtRow := 0
+
+	drain := func(rec *bytes.Buffer) {
+		defer func() {
+			rec.Reset()
+			fl.pool.Put(rec)
+		}()
+
+		if _, err := rec.WriteTo(fl.writer); err != nil {
+			if errors.Is(err, os.ErrClosed) || errsAtRow > errorsOnFileLimit {
+				return
+			}
+			errsAtRow++
+			log.Printf("failed to write to writer %+v", err)
 		} else {
-			_, err2 = fl.fd.Write([]byte(" USING TIMESTAMP " + strconv.FormatInt(rec.ts.UnixNano()/1000, 10) + ";\n"))
-		}
-		if err2 == nil && err1 == nil {
 			errsAtRow = 0
-			continue
 		}
+	}
 
-		if errors.Is(err2, os.ErrClosed) || errors.Is(err1, os.ErrClosed) {
-			fl.isFileNonOperational = true
+	for {
+		select {
+		case <-ctx.Done():
+			for rec := range fl.channel {
+				drain(rec)
+			}
 			return
-		}
-
-		errsAtRow++
-		if errsAtRow > errorsOnFileLimit {
-			fl.isFileNonOperational = true
-		}
+		case rec, ok := <-fl.channel:
+			if !ok {
+				return
+			}
 
-		if err2 != nil {
-			err1 = err2
+			drain(rec)
 		}
-		log.Printf("failed to write to file %q: %s", fl.filename, err1)
-		return
-	}
-}
-
-func NewFileLogger(filename string) (StmtToFile, error) {
-	if filename == "" {
-		return &nopFileLogger{}, nil
 	}
-	fd, err := os.OpenFile(filename, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0o644)
-	if err != nil {
-		return nil, err
-	}
-
-	out := &fileLogger{
-		filename: filename,
-		fd:       fd,
-		channel:  make(loggerChan, defaultChanSize),
-	}
-	out.activeChannel.Store(&out.channel)
-
-	go out.committer()
-	return out, nil
 }
 
 type nopFileLogger struct{}
 
-func (n *nopFileLogger) LogStmtWithTimeStamp(_ *typedef.Stmt, _ time.Time) {}
+func (n *nopFileLogger) LogStmt(_ *typedef.Stmt, _ ...time.Time) {}
 
 func (n *nopFileLogger) Close() error { return nil }
-
-func (n *nopFileLogger) LogStmt(_ *typedef.Stmt) {}
diff --git a/pkg/store/cqlstore.go b/pkg/store/cqlstore.go
index 60448c4d..cf6e0a0f 100644
--- a/pkg/store/cqlstore.go
+++ b/pkg/store/cqlstore.go
@@ -72,12 +72,14 @@ func (cs *cqlStore) mutate(ctx context.Context, stmt *typedef.Stmt) (err error)
 func (cs *cqlStore) doMutate(ctx context.Context, stmt *typedef.Stmt, ts time.Time) error {
 	queryBody, _ := stmt.Query.ToCql()
 	query := cs.session.Query(queryBody, stmt.Values...).WithContext(ctx)
+	defer query.Release()
+
 	if cs.useServerSideTimestamps {
 		query = query.DefaultTimestamp(false)
 		cs.stmtLogger.LogStmt(stmt)
 	} else {
 		query = query.WithTimestamp(ts.UnixNano() / 1000)
-		cs.stmtLogger.LogStmtWithTimeStamp(stmt, ts)
+		cs.stmtLogger.LogStmt(stmt, ts)
 	}
 
 	if err := query.Exec(); err != nil {
@@ -94,14 +96,17 @@ func (cs *cqlStore) doMutate(ctx context.Context, stmt *typedef.Stmt, ts time.Ti
 }
 
 func (cs *cqlStore) load(ctx context.Context, stmt *typedef.Stmt) (result []map[string]any, err error) {
-	query, _ := stmt.Query.ToCql()
+	cql, _ := stmt.Query.ToCql()
 	cs.stmtLogger.LogStmt(stmt)
-	iter := cs.session.Query(query, stmt.Values...).WithContext(ctx).Iter()
+	query := cs.session.Query(cql, stmt.Values...).WithContext(ctx)
+	defer query.Release()
+
+	iter := query.Iter()
 	cs.ops.WithLabelValues(cs.system, opType(stmt)).Inc()
 	return loadSet(iter), iter.Close()
 }
 
-func (cs cqlStore) close() error {
+func (cs *cqlStore) close() error {
 	cs.session.Close()
 	return nil
 }
diff --git a/pkg/typedef/bag.go b/pkg/typedef/bag.go
index 51a9d619..adc78bfe 100644
--- a/pkg/typedef/bag.go
+++ b/pkg/typedef/bag.go
@@ -15,10 +15,11 @@
 package typedef
 
 import (
-	"fmt"
+	"bytes"
 	"math"
 	"reflect"
-	"strings"
+
+	"github.com/pkg/errors"
 
 	"github.com/gocql/gocql"
 	"golang.org/x/exp/rand"
@@ -59,20 +60,32 @@ func (ct *BagType) CQLHolder() string {
 	return "?"
 }
 
-func (ct *BagType) CQLPretty(value any) string {
+func (ct *BagType) CQLPretty(builder *bytes.Buffer, value any) error {
 	if reflect.TypeOf(value).Kind() != reflect.Slice {
-		panic(fmt.Sprintf("set cql pretty, unknown type %v", ct))
+		return errors.Errorf("expected slice, got [%T]%v", value, value)
 	}
-	s := reflect.ValueOf(value)
-	format := "[%s]"
+
 	if ct.ComplexType == TYPE_SET {
-		format = "{%s}"
+		builder.WriteRune('{')
+		defer builder.WriteRune('}')
+	} else {
+		builder.WriteRune('[')
+		defer builder.WriteRune(']')
 	}
-	out := make([]string, s.Len())
+
+	s := reflect.ValueOf(value)
+
 	for i := 0; i < s.Len(); i++ {
-		out[i] = ct.ValueType.CQLPretty(s.Index(i).Interface())
+		if err := ct.ValueType.CQLPretty(builder, s.Index(i).Interface()); err != nil {
+			return err
+		}
+
+		if i < s.Len()-1 {
+			builder.WriteRune(',')
+		}
 	}
-	return fmt.Sprintf(format, strings.Join(out, ","))
+
+	return nil
 }
 
 func (ct *BagType) GenValue(r *rand.Rand, p *PartitionRangeConfig) []any {
diff --git a/pkg/typedef/interfaces.go b/pkg/typedef/interfaces.go
index 1e6e5d65..f083f383 100644
--- a/pkg/typedef/interfaces.go
+++ b/pkg/typedef/interfaces.go
@@ -15,6 +15,8 @@
 package typedef
 
 import (
+	"bytes"
+
 	"github.com/gocql/gocql"
 	"golang.org/x/exp/rand"
 )
@@ -23,7 +25,7 @@ type Type interface {
 	Name() string
 	CQLDef() string
 	CQLHolder() string
-	CQLPretty(any) string
+	CQLPretty(*bytes.Buffer, any) error
 	GenValue(*rand.Rand, *PartitionRangeConfig) []any
 	GenJSONValue(*rand.Rand, *PartitionRangeConfig) any
 	LenValue() int
@@ -35,7 +37,7 @@ type Type interface {
 
 type Statement interface {
 	ToCql() (stmt string, names []string)
-	PrettyCQL() string
+	PrettyCQL() (string, error)
 }
 
 type Types []Type
diff --git a/pkg/typedef/simple_type.go b/pkg/typedef/simple_type.go
index f2ad0c04..4a02a612 100644
--- a/pkg/typedef/simple_type.go
+++ b/pkg/typedef/simple_type.go
@@ -15,14 +15,17 @@
 package typedef
 
 import (
+	"bytes"
 	"encoding/hex"
 	"fmt"
 	"math"
 	"math/big"
 	"net"
+	"strconv"
 	"time"
 
 	"github.com/gocql/gocql"
+	"github.com/pkg/errors"
 	"golang.org/x/exp/rand"
 	"gopkg.in/inf.v0"
 
@@ -66,50 +69,136 @@ func (st SimpleType) LenValue() int {
 	return 1
 }
 
-func (st SimpleType) CQLPretty(value any) string {
+func (st SimpleType) CQLPretty(builder *bytes.Buffer, value any) error {
 	switch st {
-	case TYPE_ASCII, TYPE_TEXT, TYPE_VARCHAR, TYPE_INET, TYPE_DATE:
-		return fmt.Sprintf("'%s'", value)
+	case TYPE_INET:
+		builder.WriteRune('\'')
+		defer builder.WriteRune('\'')
+
+		switch v := value.(type) {
+		case net.IP:
+			builder.WriteString(v.String())
+		case net.IPMask:
+			builder.WriteString(v.String())
+		case string:
+			builder.WriteString(v)
+		default:
+			return errors.Errorf("unexpected inet value [%T]%+v", value, value)
+		}
+
+		return nil
+	case TYPE_ASCII, TYPE_TEXT, TYPE_VARCHAR, TYPE_DATE:
+		if v, ok := value.(string); ok {
+			builder.WriteRune('\'')
+			builder.WriteString(v)
+			builder.WriteRune('\'')
+			return nil
+		}
+
+		return errors.Errorf("unexpected string value [%T]%+v", value, value)
 	case TYPE_BLOB:
 		if v, ok := value.(string); ok {
 			if len(v) > 100 {
 				v = v[:100]
 			}
-			return "textasblob('" + v + "')"
+			builder.WriteString("textasblob('")
+			builder.WriteString(v)
+			builder.WriteString("')")
+			return nil
 		}
-		panic(fmt.Sprintf("unexpected blob value [%T]%+v", value, value))
+
+		return errors.Errorf("unexpected blob value [%T]%+v", value, value)
 	case TYPE_BIGINT, TYPE_INT, TYPE_SMALLINT, TYPE_TINYINT:
-		return fmt.Sprintf("%d", value)
+		var i int64
+		switch v := value.(type) {
+		case int8:
+			i = int64(v)
+		case int16:
+			i = int64(v)
+		case int32:
+			i = int64(v)
+		case int:
+			i = int64(v)
+		case int64:
+			i = v
+		case *big.Int:
+			builder.WriteString(v.Text(10))
+
+			return nil
+		default:
+			return errors.Errorf("unexpected int value [%T]%+v", value, value)
+		}
+
+		builder.WriteString(strconv.FormatInt(i, 10))
+
+		return nil
 	case TYPE_DECIMAL, TYPE_DOUBLE, TYPE_FLOAT:
-		return fmt.Sprintf("%.2f", value)
+		var f float64
+		switch v := value.(type) {
+		case float32:
+			f = float64(v)
+		case float64:
+			f = v
+		case *inf.Dec:
+			builder.WriteString(v.String())
+
+			return nil
+		default:
+			return errors.Errorf("unexpected float value [%T]%+v", value, value)
+		}
+
+		builder.WriteString(strconv.FormatFloat(f, 'f', 2, 64))
+		return nil
 	case TYPE_BOOLEAN:
 		if v, ok := value.(bool); ok {
-			return fmt.Sprintf("%t", v)
+			builder.WriteString(strconv.FormatBool(v))
+
+			return nil
 		}
-		panic(fmt.Sprintf("unexpected boolean value [%T]%+v", value, value))
+
+		return errors.Errorf("unexpected boolean value [%T]%+v", value, value)
 	case TYPE_TIME:
 		if v, ok := value.(int64); ok {
+			builder.WriteRune('\'')
 			// CQL supports only 3 digits microseconds:
 			// '10:10:55.83275+0000': marshaling error: Milliseconds length exceeds expected (5)"
-			return fmt.Sprintf("'%s'", time.Time{}.Add(time.Duration(v)).Format("15:04:05.999"))
+			builder.WriteString(time.Time{}.Add(time.Duration(v)).Format("15:04:05.999"))
+			builder.WriteRune('\'')
+
+			return nil
 		}
-		panic(fmt.Sprintf("unexpected time value [%T]%+v", value, value))
+
+		return errors.Errorf("unexpected time value [%T]%+v", value, value)
 	case TYPE_TIMESTAMP:
 		if v, ok := value.(int64); ok {
 			// CQL supports only 3 digits milliseconds:
 			// '1976-03-25T10:10:55.83275+0000': marshaling error: Milliseconds length exceeds expected (5)"
-			return time.UnixMilli(v).UTC().Format("'2006-01-02T15:04:05.999-0700'")
+			builder.WriteString(time.UnixMilli(v).UTC().Format("'2006-01-02T15:04:05.999-0700'"))
+			return nil
 		}
-		panic(fmt.Sprintf("unexpected timestamp value [%T]%+v", value, value))
+
+		return errors.Errorf("unexpected timestamp value [%T]%+v", value, value)
 	case TYPE_DURATION, TYPE_TIMEUUID, TYPE_UUID:
-		return fmt.Sprintf("%s", value)
+		switch v := value.(type) {
+		case string:
+			builder.WriteString(v)
+		case time.Duration:
+			builder.WriteString(v.String())
+		case gocql.UUID:
+			builder.WriteString(v.String())
+		default:
+			return errors.Errorf("unexpected (duration|timeuuid|uuid) value [%T]%+v", value, value)
+		}
+		return nil
 	case TYPE_VARINT:
 		if s, ok := value.(*big.Int); ok {
-			return fmt.Sprintf("%d", s.Int64())
+			builder.WriteString(s.Text(10))
+			return nil
 		}
-		panic(fmt.Sprintf("unexpected varint value [%T]%+v", value, value))
+
+		return errors.Errorf("unexpected varint value [%T]%+v", value, value)
 	default:
-		panic(fmt.Sprintf("cql pretty: not supported type %s", st))
+		return errors.Errorf("cql pretty: not supported type %s [%T]%+v", st, value, value)
 	}
 }
 
diff --git a/pkg/typedef/tuple.go b/pkg/typedef/tuple.go
index 6c720b08..c1761d43 100644
--- a/pkg/typedef/tuple.go
+++ b/pkg/typedef/tuple.go
@@ -15,9 +15,11 @@
 package typedef
 
 import (
-	"fmt"
+	"bytes"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	"github.com/gocql/gocql"
 	"golang.org/x/exp/rand"
 )
@@ -55,16 +57,34 @@ func (t *TupleType) CQLHolder() string {
 	return "(" + strings.TrimRight(strings.Repeat("?,", len(t.ValueTypes)), ",") + ")"
 }
 
-func (t *TupleType) CQLPretty(value any) string {
+func (t *TupleType) CQLPretty(builder *bytes.Buffer, value any) error {
 	values, ok := value.([]any)
 	if !ok {
-		return "()"
+		values, ok = value.(Values)
+		if !ok {
+			return errors.Errorf("expected []any, got [%T]%v", value, value)
+		}
+	}
+
+	if len(values) == 0 {
+		return nil
+	}
+
+	if len(values) != len(t.ValueTypes) {
+		return errors.Errorf("expected %d values, got %d", len(t.ValueTypes), len(values))
 	}
-	out := make([]string, len(values))
+
 	for i, tp := range t.ValueTypes {
-		out[i] = tp.CQLPretty(values[i])
+		if err := tp.CQLPretty(builder, values[i]); err != nil {
+			return err
+		}
+
+		if i < len(values)-1 {
+			builder.WriteRune(',')
+		}
 	}
-	return fmt.Sprintf("(%s)", strings.Join(out, ","))
+
+	return nil
 }
 
 func (t *TupleType) Indexable() bool {
diff --git a/pkg/typedef/typedef.go b/pkg/typedef/typedef.go
index 910841de..bb2278e2 100644
--- a/pkg/typedef/typedef.go
+++ b/pkg/typedef/typedef.go
@@ -15,9 +15,11 @@
 package typedef
 
 import (
+	"bytes"
 	"fmt"
 	"strings"
 
+	"github.com/pkg/errors"
 	"github.com/scylladb/gocqlx/v2/qb"
 
 	"github.com/scylladb/gemini/pkg/replication"
@@ -88,18 +90,36 @@ func SimpleStmt(query string, queryType StatementType) *Stmt {
 	}
 }
 
-func (s *Stmt) PrettyCQL() string {
+func (s *Stmt) PrettyCQL() (string, error) {
+	buffer := bytes.NewBuffer(nil)
+
+	if err := s.PrettyCQLBuffered(buffer); err != nil {
+		return "", err
+	}
+
+	return buffer.String(), nil
+}
+
+func (s *Stmt) PrettyCQLBuffered(buffer *bytes.Buffer) error {
 	query, _ := s.Query.ToCql()
 	values := s.Values.Copy()
-	if len(values) == 0 {
-		return query
+	return prettyCQL(buffer, query, values, s.Types)
+}
+
+func (s *Stmt) ToCql() (string, []string) {
+	return s.Query.ToCql()
+}
+
+func (s *Stmt) Clone() *Stmt {
+	return &Stmt{
+		StmtCache: s.StmtCache,
+		Values:    s.Values.Copy(),
 	}
-	return prettyCQL(query, values, s.Types)
 }
 
 type StatementType uint8
 
-func (st StatementType) ToString() string {
+func (st StatementType) String() string {
 	switch st {
 	case SelectStatementType:
 		return "SelectStatement"
@@ -197,32 +217,57 @@ const (
 	CacheArrayLen
 )
 
-func prettyCQL(query string, values Values, types Types) string {
-	if len(values) == 0 {
-		return query
-	}
-
-	k := 0
-	out := make([]string, 0, len(values)*2)
-	queryChunks := strings.Split(query, "?")
-	out = append(out, queryChunks[0])
-	qID := 1
-	for _, typ := range types {
-		tupleType, ok := typ.(*TupleType)
-		if !ok {
-			out = append(out, typ.CQLPretty(values[k]))
-			out = append(out, queryChunks[qID])
-			qID++
-			k++
+func prettyCQL(builder *bytes.Buffer, q string, values Values, types []Type) error {
+	builder.Grow(len(q))
+
+	if len(types) == 0 {
+		builder.WriteString(q)
+		return nil
+	}
+
+	if len(values) < len(types) {
+		return errors.Errorf("expected at least %d values, got %d", len(types), len(values))
+	}
+
+	var (
+		skip int
+		idx  int
+	)
+
+	for pos, i := strings.Index(q[idx:], "?"), 0; pos != -1; pos = strings.Index(q[idx:], "?") {
+		str := q[idx : idx+pos]
+		// Just to skip the ? in the query, happens only in TUPLE TYPES
+		if skip > 0 {
+			skip--
+			idx += pos + 1
 			continue
 		}
-		for _, t := range tupleType.ValueTypes {
-			out = append(out, t.CQLPretty(values[k]))
-			out = append(out, queryChunks[qID])
-			qID++
-			k++
+
+		builder.WriteString(str)
+
+		var value any
+
+		if i >= len(types) {
+			return errors.Errorf("there are more(%d) ? in the query than types(%d), invalid Query: %s", len(types), i, q)
+		}
+
+		switch tt := types[i].(type) {
+		case *TupleType:
+			skip = tt.LenValue()
+			value = values[i : i+skip]
+			values = values[skip:]
+		default:
+			value = values[i]
+		}
+
+		if err := types[i].CQLPretty(builder, value); err != nil {
+			return err
 		}
+
+		i++
+		idx += pos + 1
 	}
-	out = append(out, queryChunks[qID:]...)
-	return strings.Join(out, "")
+
+	builder.WriteString(q[idx:])
+	return nil
 }
diff --git a/pkg/typedef/typedef_test.go b/pkg/typedef/typedef_test.go
index 3a67b887..daecb3c1 100644
--- a/pkg/typedef/typedef_test.go
+++ b/pkg/typedef/typedef_test.go
@@ -15,7 +15,15 @@
 package typedef
 
 import (
+	"bytes"
+	"fmt"
+	"math/big"
+	"net"
+	"strings"
 	"testing"
+	"time"
+
+	"gopkg.in/inf.v0"
 
 	"github.com/google/go-cmp/cmp"
 )
@@ -41,3 +49,136 @@ func TestValues(t *testing.T) {
 		t.Error("%i != %i", tmp, expected)
 	}
 }
+
+var stmt = &Stmt{
+	StmtCache: &StmtCache{
+		//nolint:lll
+		Query:     SimpleQuery{`INSERT INTO tbl(col1, col2, col3, col4, col5, col6,col7,col8,col9,cold10,col11,col12,col13,col14,col15,col16,col17,col18,col19,col20) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);`},
+		QueryType: InsertStatementType,
+		Types: Types{
+			TYPE_ASCII,
+			TYPE_BIGINT,
+			TYPE_BLOB,
+			TYPE_BOOLEAN,
+			TYPE_DATE,
+			TYPE_DECIMAL,
+			TYPE_DOUBLE,
+			TYPE_DURATION,
+			TYPE_FLOAT,
+			TYPE_INET,
+			TYPE_INT,
+			TYPE_SMALLINT,
+			TYPE_TEXT,
+			TYPE_TIME,
+			TYPE_TIMESTAMP,
+			TYPE_TIMEUUID,
+			TYPE_UUID,
+			TYPE_TINYINT,
+			TYPE_VARCHAR,
+			TYPE_VARINT,
+		},
+	},
+	Values: Values{
+		"a",
+		big.NewInt(10),
+		"a",
+		true,
+		millennium.Format("2006-01-02"),
+		inf.NewDec(1000, 0),
+		10.0,
+		10 * time.Minute,
+		10.0,
+		net.ParseIP("192.168.0.1"),
+		10,
+		2,
+		"a",
+		millennium.UnixNano(),
+		millennium.UnixMilli(),
+		"63176980-bfde-11d3-bc37-1c4d704231dc",
+		"63176980-bfde-11d3-bc37-1c4d704231dc",
+		1,
+		"a",
+		big.NewInt(1001),
+	},
+}
+
+func TestPrettyCQL(t *testing.T) {
+	t.Parallel()
+
+	query, err := stmt.PrettyCQL()
+	if err != nil {
+		t.Errorf("failed to generate prettyCQL %v", err)
+	}
+	//nolint:lll
+	expected := fmt.Sprintf(
+		`INSERT INTO tbl(col1, col2, col3, col4, col5, col6,col7,col8,col9,cold10,col11,col12,col13,col14,col15,col16,col17,col18,col19,col20) VALUES ('a',10,textasblob('a'),true,'1999-12-31',1000,10.00,10m0s,10.00,'192.168.0.1',10,2,'a','%s','%s',63176980-bfde-11d3-bc37-1c4d704231dc,63176980-bfde-11d3-bc37-1c4d704231dc,1,'a',1001);`,
+		millennium.Format("15:04:05.999"),
+		millennium.Format("2006-01-02T15:04:05.999-0700"),
+	)
+
+	if query != expected {
+		t.Error("expected", expected, "got", query)
+	}
+}
+
+func prettyCQLOld(query string, values Values, types Types) string {
+	if len(values) == 0 {
+		return query
+	}
+
+	k := 0
+	out := make([]string, 0, len(values)*2)
+	queryChunks := strings.Split(query, "?")
+	out = append(out, queryChunks[0])
+	qID := 1
+	builder := bytes.NewBuffer(nil)
+	for _, typ := range types {
+		builder.Reset()
+		tupleType, ok := typ.(*TupleType)
+		if !ok {
+			_ = typ.CQLPretty(builder, values[k])
+			out = append(out, builder.String())
+			out = append(out, queryChunks[qID])
+			qID++
+			k++
+			continue
+		}
+		for _, t := range tupleType.ValueTypes {
+			builder.Reset()
+			_ = t.CQLPretty(builder, values[k])
+			out = append(out, builder.String())
+			out = append(out, queryChunks[qID])
+			qID++
+			k++
+		}
+	}
+	out = append(out, queryChunks[qID:]...)
+	return strings.Join(out, "")
+}
+
+func BenchmarkPrettyCQLOLD(b *testing.B) {
+	b.Run("New", func(b *testing.B) {
+		b.ReportAllocs()
+		b.ResetTimer()
+
+		for i := 0; i < b.N; i++ {
+			query, _ := stmt.Query.ToCql()
+			values := stmt.Values.Copy()
+			builder := bytes.NewBuffer(nil)
+
+			if err := prettyCQL(builder, query, values, stmt.Types); err != nil {
+				b.Error(err)
+			}
+		}
+	})
+
+	b.Run("Old", func(b *testing.B) {
+		b.ReportAllocs()
+		b.ResetTimer()
+		for i := 0; i < b.N; i++ {
+			query, _ := stmt.Query.ToCql()
+			values := stmt.Values.Copy()
+			prettyCQLOld(query, values, stmt.Types)
+		}
+	})
+}
diff --git a/pkg/typedef/types.go b/pkg/typedef/types.go
index 8854613b..99f20ea8 100644
--- a/pkg/typedef/types.go
+++ b/pkg/typedef/types.go
@@ -15,12 +15,14 @@
 package typedef
 
 import (
-	"fmt"
+	"bytes"
 	"math"
 	"reflect"
-	"strings"
+	"strconv"
 	"sync/atomic"
 
+	"github.com/pkg/errors"
+
 	"github.com/gocql/gocql"
 	"golang.org/x/exp/rand"
 
@@ -140,19 +142,34 @@ func (mt *MapType) CQLHolder() string {
 	return "?"
 }
 
-func (mt *MapType) CQLPretty(value any) string {
+func (mt *MapType) CQLPretty(builder *bytes.Buffer, value any) error {
 	if reflect.TypeOf(value).Kind() != reflect.Map {
-		panic(fmt.Sprintf("map cql pretty, unknown type %v", mt))
+		return errors.Errorf("expected map, got [%T]%v", value, value)
 	}
+
+	builder.WriteRune('{')
+	defer builder.WriteRune('}')
+
 	vof := reflect.ValueOf(value)
 	s := vof.MapRange()
-	out := make([]string, len(vof.MapKeys()))
-	id := 0
-	for s.Next() {
-		out[id] = fmt.Sprintf("%s:%s", mt.KeyType.CQLPretty(s.Key().Interface()), mt.ValueType.CQLPretty(s.Value().Interface()))
-		id++
+	length := vof.Len()
+
+	for id := 0; s.Next(); id++ {
+		if err := mt.KeyType.CQLPretty(builder, s.Key().Interface()); err != nil {
+			return err
+		}
+		builder.WriteRune(':')
+
+		if err := mt.ValueType.CQLPretty(builder, s.Value().Interface()); err != nil {
+			return err
+		}
+
+		if id < length-1 {
+			builder.WriteRune(',')
+		}
 	}
-	return fmt.Sprintf("{%s}", strings.Join(out, ","))
+
+	return nil
 }
 
 func (mt *MapType) GenJSONValue(r *rand.Rand, p *PartitionRangeConfig) any {
@@ -209,8 +226,25 @@ func (ct *CounterType) CQLHolder() string {
 	return "?"
 }
 
-func (ct *CounterType) CQLPretty(value any) string {
-	return fmt.Sprintf("%d", value)
+func (ct *CounterType) CQLPretty(builder *bytes.Buffer, value any) error {
+	switch v := value.(type) {
+	case int64:
+		builder.WriteString(strconv.FormatInt(v, 10))
+	case int:
+		builder.WriteString(strconv.FormatInt(int64(v), 10))
+	case int32:
+		builder.WriteString(strconv.FormatInt(int64(v), 10))
+	case uint64:
+		builder.WriteString(strconv.FormatUint(v, 10))
+	case uint32:
+		builder.WriteString(strconv.FormatUint(uint64(v), 10))
+	case uint:
+		builder.WriteString(strconv.FormatUint(uint64(v), 10))
+	default:
+		return errors.Errorf("counter cql pretty, unknown type [%T]%v", value, value)
+	}
+
+	return nil
 }
 
 func (ct *CounterType) GenJSONValue(r *rand.Rand, _ *PartitionRangeConfig) any {
diff --git a/pkg/typedef/types_test.go b/pkg/typedef/types_test.go
index fa028dde..e15a9e09 100644
--- a/pkg/typedef/types_test.go
+++ b/pkg/typedef/types_test.go
@@ -15,6 +15,7 @@
 package typedef
 
 import (
+	"bytes"
 	"math/big"
 	"net"
 	"testing"
@@ -196,18 +197,18 @@ var prettytests = []struct {
 			ValueTypes: []SimpleType{TYPE_ASCII},
 			Frozen:     false,
 		},
-		query:    "SELECT * FROM tbl WHERE pk0=?",
-		values:   []any{"a"},
-		expected: "SELECT * FROM tbl WHERE pk0='a'",
+		query:    "SELECT * FROM tbl WHERE pk0=(?)",
+		values:   []interface{}{"a"},
+		expected: "SELECT * FROM tbl WHERE pk0=('a')",
 	},
 	{
 		typ: &TupleType{
 			ValueTypes: []SimpleType{TYPE_ASCII, TYPE_ASCII},
 			Frozen:     false,
 		},
-		query:    "SELECT * FROM tbl WHERE pk0={?,?}",
-		values:   []any{"a", "b"},
-		expected: "SELECT * FROM tbl WHERE pk0={'a','b'}",
+		query:    "SELECT * FROM tbl WHERE pk0=(?,?)",
+		values:   []interface{}{"a", "b"},
+		expected: "SELECT * FROM tbl WHERE pk0=('a','b')",
 	},
 }
 
@@ -217,9 +218,13 @@ func TestCQLPretty(t *testing.T) {
 	for id := range prettytests {
 		test := prettytests[id]
 		t.Run(test.typ.Name(), func(t *testing.T) {
-			t.Parallel()
+			builder := bytes.NewBuffer(nil)
+			err := prettyCQL(builder, test.query, test.values, []Type{test.typ})
+			if err != nil {
+				t.Errorf("unexpected error: %v", err)
+			}
 
-			result := prettyCQL(test.query, test.values, []Type{test.typ})
+			result := builder.String()
 			if result != test.expected {
 				t.Errorf("expected '%s', got '%s' for values %v and type '%v'", test.expected, result, test.values, test.typ)
 			}
diff --git a/pkg/typedef/udt.go b/pkg/typedef/udt.go
index d8899e49..04345be1 100644
--- a/pkg/typedef/udt.go
+++ b/pkg/typedef/udt.go
@@ -15,8 +15,9 @@
 package typedef
 
 import (
-	"fmt"
-	"strings"
+	"bytes"
+
+	"github.com/pkg/errors"
 
 	"github.com/gocql/gocql"
 	"golang.org/x/exp/rand"
@@ -48,29 +49,44 @@ func (t *UDTType) CQLHolder() string {
 	return "?"
 }
 
-func (t *UDTType) CQLPretty(value any) string {
+func (t *UDTType) CQLPretty(builder *bytes.Buffer, value any) error {
 	s, ok := value.(map[string]any)
 	if !ok {
-		panic(fmt.Sprintf("udt pretty, unknown type %v", t))
+		return errors.Errorf("udt pretty, expected map[string]any, got [%T]%v", value, value)
 	}
 
-	out := make([]string, 0, len(t.ValueTypes))
+	builder.WriteRune('{')
+	defer builder.WriteRune('}')
+
+	i := 0
 	for k, v := range t.ValueTypes {
 		keyVal, kexExists := s[k]
 		if !kexExists {
 			continue
 		}
-		out = append(out, fmt.Sprintf("%s:%s", k, v.CQLPretty(keyVal)))
+
+		builder.WriteString(k)
+		builder.WriteRune(':')
+		if err := v.CQLPretty(builder, keyVal); err != nil {
+			return err
+		}
+
+		if i != len(s)-1 {
+			builder.WriteRune(',')
+		}
+		i++
 	}
-	return fmt.Sprintf("{%s}", strings.Join(out, ","))
+
+	return nil
 }
 
 func (t *UDTType) Indexable() bool {
-	for _, t := range t.ValueTypes {
-		if t == TYPE_DURATION {
+	for _, ty := range t.ValueTypes {
+		if ty == TYPE_DURATION {
 			return false
 		}
 	}
+
 	return true
 }
 
diff --git a/results/.gitignore b/results/.gitignore
new file mode 100644
index 00000000..d6b7ef32
--- /dev/null
+++ b/results/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore