From 4ac6cef01f602aeeafcc07d935c8a6de555d09c6 Mon Sep 17 00:00:00 2001
From: Aditya Ujeniya <adityauj@gmail.com>
Date: Tue, 17 Sep 2024 10:49:32 +0200
Subject: [PATCH] Update

---
 .gitignore                   | 2 ++
 api/swagger.json             | 8 +++++++-
 api/swagger.yaml             | 6 +++++-
 internal/api/api.go          | 2 +-
 internal/api/docs.go         | 8 +++++++-
 internal/api/lineprotocol.go | 5 +++--
 pkg/resampler/resampler.go   | 3 +--
 7 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index c5d48a2..e1cd189 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,8 @@
 /var
 /configs
 
+sample.txt
 
 migrateTimestamps.pl
 test_ccms_api.sh
+test_ccms_free_api.sh
diff --git a/api/swagger.json b/api/swagger.json
index 402fd11..08522ca 100644
--- a/api/swagger.json
+++ b/api/swagger.json
@@ -75,7 +75,7 @@
             }
         },
         "/free/": {
-            "get": {
+            "post": {
                 "security": [
                     {
                         "ApiKeyAuth": []
@@ -273,6 +273,9 @@
                 "min": {
                     "type": "number"
                 },
+                "resolution": {
+                    "type": "integer"
+                },
                 "to": {
                     "type": "integer"
                 }
@@ -290,6 +293,9 @@
                 "metric": {
                     "type": "string"
                 },
+                "resolution": {
+                    "type": "integer"
+                },
                 "scale-by": {
                     "type": "number"
                 },
diff --git a/api/swagger.yaml b/api/swagger.yaml
index 51c7322..b14ba8a 100644
--- a/api/swagger.yaml
+++ b/api/swagger.yaml
@@ -16,6 +16,8 @@ definitions:
         type: number
       min:
         type: number
+      resolution:
+        type: integer
       to:
         type: integer
     type: object
@@ -27,6 +29,8 @@ definitions:
         type: string
       metric:
         type: string
+      resolution:
+        type: integer
       scale-by:
         type: number
       subtype:
@@ -137,7 +141,7 @@ paths:
       tags:
       - debug
   /free/:
-    get:
+    post:
       parameters:
       - description: up to timestamp
         in: query
diff --git a/internal/api/api.go b/internal/api/api.go
index 197cee9..cb711cd 100644
--- a/internal/api/api.go
+++ b/internal/api/api.go
@@ -136,7 +136,7 @@ func (data *ApiMetricData) PadDataWithNull(ms *memorystore.MemoryStore, from, to
 // @failure     403            {object} api.ErrorResponse       "Forbidden"
 // @failure     500            {object} api.ErrorResponse       "Internal Server Error"
 // @security    ApiKeyAuth
-// @router      /free/ [get]
+// @router      /free/ [post]
 func handleFree(rw http.ResponseWriter, r *http.Request) {
 	rawTo := r.URL.Query().Get("to")
 	if rawTo == "" {
diff --git a/internal/api/docs.go b/internal/api/docs.go
index 9d49c13..84cec70 100644
--- a/internal/api/docs.go
+++ b/internal/api/docs.go
@@ -81,7 +81,7 @@ const docTemplate = `{
             }
         },
         "/free/": {
-            "get": {
+            "post": {
                 "security": [
                     {
                         "ApiKeyAuth": []
@@ -279,6 +279,9 @@ const docTemplate = `{
                 "min": {
                     "type": "number"
                 },
+                "resolution": {
+                    "type": "integer"
+                },
                 "to": {
                     "type": "integer"
                 }
@@ -296,6 +299,9 @@ const docTemplate = `{
                 "metric": {
                     "type": "string"
                 },
+                "resolution": {
+                    "type": "integer"
+                },
                 "scale-by": {
                     "type": "number"
                 },
diff --git a/internal/api/lineprotocol.go b/internal/api/lineprotocol.go
index 9081638..f675a3a 100644
--- a/internal/api/lineprotocol.go
+++ b/internal/api/lineprotocol.go
@@ -255,7 +255,8 @@ func decodeLine(dec *lineprotocol.Decoder,
 				if len(subTypeBuf) == 0 {
 					subTypeBuf = append(subTypeBuf, val...)
 				} else {
-					subTypeBuf = reorder(typeBuf, val)
+					subTypeBuf = reorder(subTypeBuf, val)
+					// subTypeBuf = reorder(typeBuf, val)
 				}
 			case "stype-id":
 				subTypeBuf = append(subTypeBuf, val...)
@@ -308,7 +309,7 @@ func decodeLine(dec *lineprotocol.Decoder,
 		}
 
 		if t, err = dec.Time(lineprotocol.Second, t); err != nil {
-			return err
+			return fmt.Errorf("timestamp : %#v with error : %#v", lineprotocol.Second, err.Error())
 		}
 
 		if err := ms.WriteToLevel(lvl, selector, t.Unix(), []memorystore.Metric{metric}); err != nil {
diff --git a/pkg/resampler/resampler.go b/pkg/resampler/resampler.go
index fa90f02..59288c5 100644
--- a/pkg/resampler/resampler.go
+++ b/pkg/resampler/resampler.go
@@ -42,7 +42,7 @@ func LargestTriangleThreeBucket(data []util.Float, old_frequency int64, new_freq
 	}
 
 	if new_frequency%old_frequency != 0 {
-		return nil, 0, errors.New(fmt.Sprintf("new sampling frequency : %d should be multiple of the old frequency : %d", new_frequency, old_frequency))
+		return nil, 0, fmt.Errorf("new sampling frequency : %d should be multiple of the old frequency : %d", new_frequency, old_frequency)
 	}
 
 	var step int = int(new_frequency / old_frequency)
@@ -100,7 +100,6 @@ func LargestTriangleThreeBucket(data []util.Float, old_frequency int64, new_freq
 			}
 			if math.IsNaN(float64(avgPointY)) {
 				flag_ = 1
-
 			}
 		}