From 0c7a5ce3c771a82b135ce1873600f4f5ec750fac Mon Sep 17 00:00:00 2001 From: Ankit Anand Date: Mon, 7 Jun 2021 16:59:13 +0530 Subject: [PATCH 1/3] added limit to serviceMapDependencies query to druid --- pkg/query-service/druidQuery/mysql-query.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/query-service/druidQuery/mysql-query.go b/pkg/query-service/druidQuery/mysql-query.go index 07fd7ed251..c262f39002 100644 --- a/pkg/query-service/druidQuery/mysql-query.go +++ b/pkg/query-service/druidQuery/mysql-query.go @@ -517,7 +517,7 @@ func GetServices(client *SqlClient, query *model.GetServicesParams) (*[]model.Se func GetServiceMapDependencies(client *SqlClient, query *model.GetServicesParams) (*[]model.ServiceMapDependencyResponseItem, error) { - sqlQuery := fmt.Sprintf(`SELECT SpanId, ParentSpanId, ServiceName FROM %s WHERE "__time" >= '%s' AND "__time" <= '%s' ORDER BY __time DESC`, constants.DruidDatasource, query.StartTime, query.EndTime) + sqlQuery := fmt.Sprintf(`SELECT SpanId, ParentSpanId, ServiceName FROM %s WHERE "__time" >= '%s' AND "__time" <= '%s' ORDER BY __time DESC LIMIT 100000`, constants.DruidDatasource, query.StartTime, query.EndTime) // zap.S().Debug(sqlQuery) From dbd0701779bec300cb48af4aeb4ea35e375f550e Mon Sep 17 00:00:00 2001 From: Ankit Anand Date: Mon, 7 Jun 2021 16:59:40 +0530 Subject: [PATCH 2/3] delete test folder for interface implementation --- .../test/clickhouse/clickhouse.go | 20 -------------- pkg/query-service/test/druid/druid.go | 20 -------------- pkg/query-service/test/test.go | 27 ------------------- 3 files changed, 67 deletions(-) delete mode 100644 pkg/query-service/test/clickhouse/clickhouse.go delete mode 100644 pkg/query-service/test/druid/druid.go delete mode 100644 pkg/query-service/test/test.go diff --git a/pkg/query-service/test/clickhouse/clickhouse.go b/pkg/query-service/test/clickhouse/clickhouse.go deleted file mode 100644 index 6dff517a86..0000000000 --- a/pkg/query-service/test/clickhouse/clickhouse.go +++ /dev/null @@ -1,20 +0,0 @@ -package clickhouse - -type ClickHouseReader struct { - ClickHouseClientUrl string -} - -func connect() string { - return "Connected to ClickHouse" -} - -func NewSpanReader() *ClickHouseReader { - connect() - return &ClickHouseReader{ - ClickHouseClientUrl: "http://localhost:9000", - } -} - -func (chReader *ClickHouseReader) GetServices() string { - return "Hello from ClickHouse" -} diff --git a/pkg/query-service/test/druid/druid.go b/pkg/query-service/test/druid/druid.go deleted file mode 100644 index 252966944a..0000000000 --- a/pkg/query-service/test/druid/druid.go +++ /dev/null @@ -1,20 +0,0 @@ -package druid - -type DruidReader struct { - DruidClientUrl string -} - -func connect() string { - return "Connected to Druid" -} - -func NewSpanReader() *DruidReader { - connect() - return &DruidReader{ - DruidClientUrl: "http://localhost:8888", - } -} - -func (druidReader *DruidReader) GetServices() string { - return "Hello from Druid" -} diff --git a/pkg/query-service/test/test.go b/pkg/query-service/test/test.go deleted file mode 100644 index 755851a374..0000000000 --- a/pkg/query-service/test/test.go +++ /dev/null @@ -1,27 +0,0 @@ -package main - -import ( - "fmt" - "os" - - "go.signoz.io/query-service/test/clickhouse" - "go.signoz.io/query-service/test/druid" -) - -type StorageReader interface { - GetServices() string -} - -func main() { - storage := os.Getenv("STORAGE") - var client StorageReader - - if storage == "druid" { - client = druid.NewSpanReader() - } else if storage == "clickhouse" { - client = clickhouse.NewSpanReader() - } - - services := client.GetServices() - fmt.Println(services) -} From 286577d13d88e7621953474dc771649ae3891d64 Mon Sep 17 00:00:00 2001 From: Ankit Anand Date: Mon, 7 Jun 2021 17:23:34 +0530 Subject: [PATCH 3/3] added new druid image to fix docker permission issue --- deploy/kubernetes/platform/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy/kubernetes/platform/values.yaml b/deploy/kubernetes/platform/values.yaml index a747ab7f8f..12ec40d040 100644 --- a/deploy/kubernetes/platform/values.yaml +++ b/deploy/kubernetes/platform/values.yaml @@ -10,6 +10,9 @@ kafka: zookeeperConnectionTimeoutMs: 6000 druid: + image: + tag: 0.21.1-rc2 + configVars: # To store data on local disks attached