add skip flag for rules

Author: rekby

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

@@ -241,10 +241,6 @@ func checkQueries(rules Rules, stats *QueryStats, pgSchema *internal.PgSchema, d
 					percent := float64(queryIndex) / float64(totalQueries) * 100
 					log.Printf("Checking query %8d/%v (%v)", queryIndex, totalQueries, percent)
 				}
-				//if checked[pgQuery.Text] {
-				//	continue
-				//}
-				//checked[pgQuery.Text] = true
 
 				reason, checkResult := checkQuery(stats, rules, db, pgQuery.Text)
 				if !reasonFilter.MatchString(reason) {
@@ -317,13 +313,15 @@ func checkQuery(stat *QueryStats, rules Rules, db *ydb.Driver, queryText string)
 
 	issues := internal.ExtractIssues(err)
 
-	if reason = rules.FindKnownIssue(queryText, issues); reason != "" {
+	if issueReason, ok := rules.FindKnownIssue(queryText, issues); ok {
 		stat.CountAsKnown(reason, queryText)
-		return reason, checkResultErrKnown
+		return issueReason.Name, checkResultErrKnown
 	}
 
 	reason = fmt.Sprintf("%v (%v): %#v", ydbErr.Name(), ydbErr.Code(), issues)
+	if len(issues) == 0 {
 
+	}
 	stat.CountAsUnknown(issues, queryText)
 	return reason, checkResultErrUnknown
 }

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

@@ -74,16 +74,19 @@ func (r *Rules) WriteToFile(path string) error {
 	return nil
 }
 
-func (r *Rules) FindKnownIssue(queryText string, ydbIssues []internal.YdbIssue) string {
+func (r *Rules) FindKnownIssue(queryText string, ydbIssues []internal.YdbIssue) (_ PgIssueRules, ok bool) {
 	for _, ydbIssue := range ydbIssues {
 		for _, item := range r.Issues {
 			if item.IsMatched(queryText, ydbIssue) {
-				return item.Name
+				if item.Skip {
+					continue
+				}
+				return item, true
 			}
 		}
 	}
 
-	return ""
+	return PgIssueRules{}, false
 }
 
 func (r *Rules) UpdateFromStats(stats QueryStats, sortByCount bool) {
@@ -116,6 +119,7 @@ type PgIssueRules struct {
 	QueryRegexp OneOrSliceString `yaml:"query_regexp,omitempty"`
 	Example     string           `yaml:"example,omitempty"`
 	Comment     string           `yaml:"comment,omitempty"`
+	Skip        bool             `yaml:"skip"` // skip the issue on check query step
 
 	issuesRegexpCompiled []*regexp.Regexp
 	queryRegexpCompiled  []*regexp.Regexp

tools/greenplum-to-pg-tests/issues.yaml

@@ -3,12 +3,10 @@ stat:
   total_ok: 15
   ok_percent: 65.21739130434783
 issues:
-  - name: Skip unknown tables
-    count: 11
-    tag:
-      - skip
+  - name: general parsing errors
     issue_regexp:
-      - Cannot find table
+      - "^Error while parsing query.$"
+    skip: true
   - name: drop external table
     count: 2
     tag:
@@ -39,14 +37,12 @@ issues:
       - 'No such proc: '
   - name: Rollback in query service (OK)
     count: 1
-    tag:
-      - skip
+    skip: true
     issue_regexp:
       - ROLLBACK not supported inside YDB query
   - name: Commit in query service (OK)
     count: 1
-    tag:
-      - skip
+    skip: true
     issue_regexp:
       - COMMIT not supported inside YDB query
   - name: Not supported set greenplum var
@@ -57,8 +53,7 @@ issues:
       - ^SET gp_
   - name: Partial request
     count: 1
-    tag:
-      - skip
+    skip: true
     issue_regexp:
       - 'ERROR:  syntax error at end of input'
   - name: 'YQL: Expected type cast node as is_local arg, but got node with tag'