fix error wrapping

uber · Feb 15, 2024 · 353c5f4 · 353c5f4
1 parent bf87dbd
commit 353c5f4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/common/persistence/pinot/pinotVisibilityStore.go b/common/persistence/pinot/pinotVisibilityStore.go
@@ -783,7 +783,7 @@ func (v *pinotVisibilityStore) getListWorkflowExecutionsByQueryQuery(tableName s
 
  token, err := pnt.GetNextPageToken(request.NextPageToken)
  if err != nil {
- return "", err
+ return "", fmt.Errorf("next page token: %w", err)
  }
 
  query := NewPinotQuery(tableName)
@@ -810,8 +810,7 @@ func (v *pinotVisibilityStore) getListWorkflowExecutionsByQueryQuery(tableName s
  comparExpr, orderBy := parseOrderBy(requestQuery)
  comparExpr, err = v.pinotQueryValidator.ValidateQuery(comparExpr)
  if err != nil {
- v.logger.Error(fmt.Sprintf("pinot query validator error: %s, query: %s", err, request.Query))
- return "", err
+ return "", fmt.Errorf(fmt.Sprintf("pinot query validator error: %w, query: %s", err, request.Query))
  }
 
  comparExpr = filterPrefix(comparExpr)
@@ -942,7 +941,7 @@ func getListWorkflowExecutionsQuery(tableName string, request *p.InternalListWor
 
  token, err := pnt.GetNextPageToken(request.NextPageToken)
  if err != nil {
- return "", err
+ return "", fmt.Errorf("next page token: %w", err)
  }
 
  from := token.From
@@ -996,7 +995,7 @@ func getListWorkflowExecutionsByTypeQuery(tableName string, request *p.InternalL
 
  token, err := pnt.GetNextPageToken(request.NextPageToken)
  if err != nil {
- return "", err
+ return "", fmt.Errorf("next page token: %w", err)
  }
 
  from := token.From
@@ -1032,7 +1031,7 @@ func getListWorkflowExecutionsByWorkflowIDQuery(tableName string, request *p.Int
 
  token, err := pnt.GetNextPageToken(request.NextPageToken)
  if err != nil {
- return "", err
+ return "", fmt.Errorf("next page token: %w", err)
  }
 
  from := token.From
@@ -1075,7 +1074,7 @@ func getListWorkflowExecutionsByStatusQuery(tableName string, request *p.Interna
 
  token, err := pnt.GetNextPageToken(request.NextPageToken)
  if err != nil {
- return "", err
+ return "", fmt.Errorf("next page token: %w", err)
  }
 
  from := token.From

diff --git a/common/pinot/pinotQueryValidator.go b/common/pinot/pinotQueryValidator.go
@@ -133,14 +133,14 @@ func (qv *VisibilityQueryValidator) validateRangeExpr(expr sqlparser.Expr) (stri
  if lowerBound, ok := rangeCond.From.(*sqlparser.SQLVal); ok {
  trimmed, err := trimTimeFieldValueFromNanoToMilliSeconds(lowerBound)
  if err != nil {
- return "", err
+ return "", fmt.Errorf("trim time feild %s got error: %w", colNameStr, err)
  }
  rangeCond.From = trimmed
  }
  if upperBound, ok := rangeCond.To.(*sqlparser.SQLVal); ok {
  trimmed, err := trimTimeFieldValueFromNanoToMilliSeconds(upperBound)
  if err != nil {
- return "", err
+ return "", fmt.Errorf("trim time feild %s got error: %w", colNameStr, err)
  }
  rangeCond.To = trimmed
  }
@@ -237,19 +237,19 @@ func (qv *VisibilityQueryValidator) processSystemKey(expr sqlparser.Expr) (strin
 
  colName, ok := comparisonExpr.Left.(*sqlparser.ColName)
  if !ok {
- return "", errors.New("invalid comparison expression, left")
+ return "", fmt.Errorf("left comparison is invalid: %v", comparisonExpr.Left)
  }
  colNameStr := colName.Name.String()
 
  if comparisonExpr.Operator != sqlparser.EqualStr && comparisonExpr.Operator != sqlparser.NotEqualStr {
  if _, ok := timeSystemKeys[colNameStr]; ok {
  sqlVal, ok := comparisonExpr.Right.(*sqlparser.SQLVal)
  if !ok {
- return "", fmt.Errorf("error: Failed to convert val")
+ return "", fmt.Errorf("right comparison is invalid: %v", comparisonExpr.Right)
  }
  trimmed, err := trimTimeFieldValueFromNanoToMilliSeconds(sqlVal)
  if err != nil {
- return "", err
+ return "", fmt.Errorf("trim time feild %s got error: %w", colNameStr, err)
  }
  comparisonExpr.Right = trimmed
  }
@@ -265,13 +265,13 @@ func (qv *VisibilityQueryValidator) processSystemKey(expr sqlparser.Expr) (strin
  if !ok { // this means, the value is a string, and not surrounded by single qoute, which means, val = missing
  colVal, ok := comparisonExpr.Right.(*sqlparser.ColName)
  if !ok {
- return "", fmt.Errorf("error: Failed to convert val")
+ return "", fmt.Errorf("right comparison is invalid: %v", comparisonExpr.Right)
  }
  colValStr := colVal.Name.String()
 
  // double check if val is not missing
  if colValStr != "missing" {
- return "", fmt.Errorf("error: failed to convert val")
+ return "", fmt.Errorf("right comparison is invalid string value: %s", colValStr)
  }
 
  var newColVal string
@@ -288,11 +288,11 @@ func (qv *VisibilityQueryValidator) processSystemKey(expr sqlparser.Expr) (strin
  if _, ok := timeSystemKeys[colNameStr]; ok {
  sqlVal, ok := comparisonExpr.Right.(*sqlparser.SQLVal)
  if !ok {
- return "", fmt.Errorf("error: Failed to convert val %s", colNameStr)
+ return "", fmt.Errorf("right comparison is invalid/missing. key %s, right expr %v", colNameStr, comparisonExpr.Right)
  }
  trimmed, err := trimTimeFieldValueFromNanoToMilliSeconds(sqlVal)
  if err != nil {
- return "", err
+ return "", fmt.Errorf("trim time feild %s got error: %w", colNameStr, err)
  }
  comparisonExpr.Right = trimmed
  }