Rename logql to query

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
grafana · Mar 2, 2022 · da2d70f · da2d70f
1 parent 1ffb9cf
commit da2d70f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/pkg/storage/stores/shipper/compactor/deletion/request_handler.go b/pkg/storage/stores/shipper/compactor/deletion/request_handler.go
@@ -43,13 +43,13 @@ func (dm *DeleteRequestHandler) AddDeleteRequestHandler(w http.ResponseWriter, r
 	}
 
 	params := r.URL.Query()
-	logQLStatement := params.Get("logql")
-	if len(logQLStatement) == 0 {
-		serverutil.JSONError(w, http.StatusBadRequest, "logql not set")
+	query := params.Get("query")
+	if len(query) == 0 {
+		serverutil.JSONError(w, http.StatusBadRequest, "query not set")
 		return
 	}
 
-	_, err = parseDeletionQuery(logQLStatement)
+	_, err = parseDeletionQuery(query)
 	if err != nil {
 		serverutil.JSONError(w, http.StatusBadRequest, err.Error())
 		return
@@ -86,7 +86,7 @@ func (dm *DeleteRequestHandler) AddDeleteRequestHandler(w http.ResponseWriter, r
 		return
 	}
 
-	if err := dm.deleteRequestsStore.AddDeleteRequest(ctx, userID, model.Time(startTime), model.Time(endTime), logQLStatement); err != nil {
+	if err := dm.deleteRequestsStore.AddDeleteRequest(ctx, userID, model.Time(startTime), model.Time(endTime), query); err != nil {
 		level.Error(util_log.Logger).Log("msg", "error adding delete request to the store", "err", err)
 		serverutil.JSONError(w, http.StatusInternalServerError, err.Error())
 		return

diff --git a/pkg/storage/stores/shipper/compactor/deletion/validation.go b/pkg/storage/stores/shipper/compactor/deletion/validation.go
@@ -9,20 +9,20 @@ import (
 )
 
 var (
-	errInvalidLogQL     = errors.New("invalid LogQL expression")
-	errUnsupportedLogQL = errors.New("unsupported LogQL expression")
+	errInvalidQuery     = errors.New("invalid query expression")
+	errUnsupportedQuery = errors.New("unsupported query expression")
 )
 
 // parseDeletionQuery checks if the given logQL is valid for deletions
-func parseDeletionQuery(logQL string) ([]*labels.Matcher, error) {
-	expr, err := logql.ParseExpr(logQL)
+func parseDeletionQuery(query string) ([]*labels.Matcher, error) {
+	expr, err := logql.ParseExpr(query)
 	if err != nil {
-		return nil, errInvalidLogQL
+		return nil, errInvalidQuery
 	}
 
 	if matchersExpr, ok := expr.(*logql.MatchersExpr); ok {
 		return matchersExpr.Matchers(), nil
 	}
 
-	return nil, errUnsupportedLogQL
+	return nil, errUnsupportedQuery
 }
diff --git a/pkg/storage/stores/shipper/compactor/deletion/validation_test.go b/pkg/storage/stores/shipper/compactor/deletion/validation_test.go
@@ -10,7 +10,7 @@ func TestParseLogQLExpressionForDeletion(t *testing.T) {
 	t.Run("invalid logql", func(t *testing.T) {
 		matchers, err := parseDeletionQuery("gjgjg ggj")
 		require.Nil(t, matchers)
-		require.ErrorIs(t, err, errInvalidLogQL)
+		require.ErrorIs(t, err, errInvalidQuery)
 	})
 
 	t.Run("matcher expression", func(t *testing.T) {
@@ -22,18 +22,18 @@ func TestParseLogQLExpressionForDeletion(t *testing.T) {
 	t.Run("pipeline expression with line filter", func(t *testing.T) {
 		matchers, err := parseDeletionQuery(`{env="dev", secret="true"} |= "social sec number"`)
 		require.Nil(t, matchers)
-		require.ErrorIs(t, err, errUnsupportedLogQL)
+		require.ErrorIs(t, err, errUnsupportedQuery)
 	})
 
 	t.Run("pipeline expression with label filter ", func(t *testing.T) {
 		matchers, err := parseDeletionQuery(`{env="dev", secret="true"} | json bob="top.params[0]"`)
 		require.Nil(t, matchers)
-		require.ErrorIs(t, err, errUnsupportedLogQL)
+		require.ErrorIs(t, err, errUnsupportedQuery)
 	})
 
 	t.Run("metrics query", func(t *testing.T) {
 		matchers, err := parseDeletionQuery(`count_over_time({job="mysql"}[5m])`)
 		require.Nil(t, matchers)
-		require.ErrorIs(t, err, errUnsupportedLogQL)
+		require.ErrorIs(t, err, errUnsupportedQuery)
 	})
 }