update quicktemplate, parse disable_compression, add sorting

Author: dmitryk-dk

app/vlselect/internalselect/internalselect.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"math"
 	"net/http"
+	"sort"
 	"strconv"
 	"sync"
 	"time"
@@ -262,17 +263,33 @@ func processTenantIDsRequest(ctx context.Context, w http.ResponseWriter, r *http
 		end = math.MaxInt64
 	}
 
+	var disableCompression bool
+	s := r.FormValue("disable_compression")
+	if s != "" {
+		disableCompression, err = strconv.ParseBool(s)
+		if err != nil {
+			return fmt.Errorf("cannot parse disable_compression=%q: %w", s, err)
+		}
+	}
+
 	tenantIDs, err := vlstorage.GetTenantIDs(ctx, start, end)
 	if err != nil {
 		return fmt.Errorf("cannot obtain tenant IDs: %w", err)
 	}
 
+	sort.Slice(tenantIDs, func(i, j int) bool {
+		if tenantIDs[i].AccountID != tenantIDs[j].AccountID {
+			return tenantIDs[i].AccountID < tenantIDs[j].AccountID
+		}
+		return tenantIDs[i].ProjectID < tenantIDs[j].ProjectID
+	})
+
 	tids, err := json.Marshal(tenantIDs)
 	if err != nil {
 		return fmt.Errorf("cannot marshal tenant IDs: %w", err)
 	}
 
-	return writeTenantIDs(w, tids, false)
+	return writeTenantIDs(w, tids, disableCompression)
 }
 
 type commonParams struct {

app/vlselect/logsql/tenants_response.qtpl

@@ -10,7 +10,7 @@ TenantsResponse generates response for /admin/tenants .
 	"status":"success",
 	"data":[
 		{% for i, tenant := range tenants %}
-			{%d int(tenant.AccountID) %}:{%d int(tenant.ProjectID) %}
+			"{%d int(tenant.AccountID) %}:{%d int(tenant.ProjectID) %}"
 			{% if i+1 < len(tenants) %},{% endif %}
 		{% endfor %}
 	]

app/vlselect/logsql/tenants_response.qtpl.go

@@ -450,13 +450,13 @@ func (s *Storage) getTenantIDs(ctx context.Context, start, end int64) ([]logstor
 
 	unique := make(map[logstorage.TenantID]struct{}, len(results))
 	for i := range results {
-		var tenats []logstorage.TenantID
-		if err := json.Unmarshal(results[i], &tenats); err != nil {
+		var tenants []logstorage.TenantID
+		if err := json.Unmarshal(results[i], &tenants); err != nil {
 			return nil, fmt.Errorf("cannot unmarshal tenantIDs from storage node %d: %w", i, err)
 		}
 		// Deduplicate tenantIDs
-		for _, tenat := range tenats {
-			unique[tenat] = struct{}{}
+		for _, tenant := range tenants {
+			unique[tenant] = struct{}{}
 		}
 	}
 

app/vlstorage/netselect/netselect.go

@@ -254,7 +254,7 @@ func TestStorageSearchStreamIDs(t *testing.T) {
 	closeTestStorage(s)
 }
 
-func TestGetTenantsIds(t *testing.T) {
+func TestGetTenantsIDs(t *testing.T) {
 	t.Parallel()
 
 	path := t.Name()