fix regexp

Author: rekby

tools/greenplum-to-pg-tests/cmd/extrace_sessions_test.go

@@ -0,0 +1,33 @@
+package cmd
+
+import (
+	"strconv"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestFixSchemaName(t *testing.T) {
+	table := []struct {
+		from   string
+		result string
+	}{
+		{
+			from: `DELETE
+FROM "eda_dds_partner"."a__item__item_name__h2" t
+USING "for_delete_extend" AS base
+WHERE`,
+			result: `DELETE
+FROM eda_dds_partner___a__item__item_name__h2 t
+USING "for_delete_extend" AS base
+WHERE`,
+		},
+	}
+
+	for i, test := range table {
+		t.Run(strconv.Itoa(i), func(t *testing.T) {
+			res := fixSchemaNames(test.from)
+			require.Equal(t, test.result, res)
+		})
+	}
+}

tools/greenplum-to-pg-tests/cmd/extraxtSessions.go

@@ -53,7 +53,7 @@ func init() {
 
 	extractSessionsCmd.PersistentFlags().BoolVar(&extractSessionsConfig.includeFailed, "include-failed", false, "Extract sessions with failed transactions")
 	extractSessionsCmd.PersistentFlags().StringVar(&extractSessionsConfig.ydbConnectionString, "ydb-connection", "grpc://localhost:2136/local", "Connection string to ydb server for check queries")
-	extractSessionsCmd.PersistentFlags().IntVar(&extractSessionsConfig.limitRequests, "requests-limit", 100, "Limit number of parse requests, 0 mean unlimited")
+	extractSessionsCmd.PersistentFlags().IntVar(&extractSessionsConfig.limitRequests, "requests-limit", 1000, "Limit number of parse requests, 0 mean unlimited")
 	extractSessionsCmd.PersistentFlags().StringVar(&extractSessionsConfig.rulesFile, "rules-file", "issues.yaml", "Rules for detect issue. Set empty for skip read rules.")
 	extractSessionsCmd.PersistentFlags().StringVar(&extractSessionsConfig.writeRulesWithStat, "write-updated-rules", "", "Write rules with updated stats, may be same or other file as for rules-file")
 	extractSessionsCmd.PersistentFlags().BoolVar(&extractSessionsConfig.sortRulesByCount, "sort-updates-rules-by-count", true, "")
@@ -238,7 +238,8 @@ func checkQueries(rules Rules, stats *QueryStats, pgSchema *internal.PgSchema, d
 			for _, pgQuery := range transaction.Queries {
 				queryIndex++
 				if queryIndex%extractSessionsConfig.printProgressEveryQueries == 0 {
-					log.Printf("Checking query %8d/%v", queryIndex, totalQueries)
+					percent := float64(queryIndex) / float64(totalQueries) * 100
+					log.Printf("Checking query %8d/%v (%v)", queryIndex, totalQueries, percent)
 				}
 				//if checked[pgQuery.Text] {
 				//	continue
@@ -332,7 +333,7 @@ type ReplacePair struct {
 	To   string
 }
 
-var schemaTableRegexp = regexp.MustCompile(`(?i)(CREATE TABLE|FROM|INSERT INTO|JOIN|UPDATE)\s+"?([^\s.]+)"?\."?([^\s.]+)"?`)
+var schemaTableRegexp = regexp.MustCompile(`(?i)(CREATE TABLE|FROM|INSERT INTO|JOIN|UPDATE)\s+"?([^\s."]+)"?\."?([^\s."]+)"?`)
 
 func fixSchemaNames(queryText string) string {
 	queryText = schemaTableRegexp.ReplaceAllString(queryText, "${1} ${2}___${3}")

tools/greenplum-to-pg-tests/go.mod

@@ -4,26 +4,29 @@ go 1.22.3
 
 require (
 	github.com/spf13/cobra v1.8.1
+	github.com/stretchr/testify v1.8.3
 	github.com/ydb-platform/ydb-go-genproto v0.0.0-20240528144234-5d5a685e41f7
 	github.com/ydb-platform/ydb-go-sdk-auth-environ v0.4.2
 	github.com/ydb-platform/ydb-go-sdk/v3 v3.74.5
 	github.com/ydb-platform/ydb-go-yc v0.12.1
-	golang.org/x/text v0.16.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jonboulle/clockwork v0.3.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/yandex-cloud/go-genproto v0.0.0-20211115083454-9ca41db5ed9e // indirect
 	github.com/ydb-platform/ydb-go-yc-metadata v0.6.1 // indirect
 	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect