From 74c0fb04f33b0bf49606906bad92ad95da32b738 Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@gmail.com>
Date: Sat, 29 Jun 2019 03:13:02 +0300
Subject: [PATCH] app/vmselect/promql: consistency renaming: candlestick ->
 rollup_candlestick

---
 app/vmselect/promql/eval.go      | 2 +-
 app/vmselect/promql/exec_test.go | 4 ++--
 app/vmselect/promql/rollup.go    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/vmselect/promql/eval.go b/app/vmselect/promql/eval.go
index c7d49bb24..686fb8ebb 100644
--- a/app/vmselect/promql/eval.go
+++ b/app/vmselect/promql/eval.go
@@ -619,7 +619,7 @@ func getRollupConfigs(name string, rf rollupFunc, start, end, step, window int64
 			deltaValues(values)
 		}
 		rcs = appendRollupConfigs(rcs)
-	case "candlestick":
+	case "rollup_candlestick":
 		rcs = append(rcs, newRollupConfig(rollupFirst, "open"))
 		rcs = append(rcs, newRollupConfig(rollupLast, "close"))
 		rcs = append(rcs, newRollupConfig(rollupMin, "low"))
diff --git a/app/vmselect/promql/exec_test.go b/app/vmselect/promql/exec_test.go
index 40e63ca31..345df5369 100644
--- a/app/vmselect/promql/exec_test.go
+++ b/app/vmselect/promql/exec_test.go
@@ -3203,9 +3203,9 @@ func TestExecSuccess(t *testing.T) {
 		resultExpected := []netstorage.Result{r}
 		f(q, resultExpected)
 	})
-	t.Run(`candlestick()`, func(t *testing.T) {
+	t.Run(`rollup_candlestick()`, func(t *testing.T) {
 		t.Parallel()
-		q := `sort(candlestick(round(rand(0),0.01)[:10s]))`
+		q := `sort(rollup_candlestick(round(rand(0),0.01)[:10s]))`
 		r1 := netstorage.Result{
 			MetricName: metricNameExpected,
 			Values:     []float64{0.02, 0.02, 0.03, 0, 0.03, 0.02},
diff --git a/app/vmselect/promql/rollup.go b/app/vmselect/promql/rollup.go
index f0d707bd5..f7bda8e73 100644
--- a/app/vmselect/promql/rollup.go
+++ b/app/vmselect/promql/rollup.go
@@ -50,7 +50,7 @@ var rollupFuncs = map[string]newRollupFunc{
 	"rollup_deriv":       newRollupFuncOneArg(rollupFake),
 	"rollup_delta":       newRollupFuncOneArg(rollupFake),
 	"rollup_increase":    newRollupFuncOneArg(rollupFake), // + rollupFuncsRemoveCounterResets
-	"candlestick":        newRollupFuncOneArg(rollupFake),
+	"rollup_candlestick": newRollupFuncOneArg(rollupFake),
 }
 
 var rollupFuncsMayAdjustWindow = map[string]bool{