Merged in feature/splitqueryrunning (pull request #57)
Split Query Running + Debugging Full Flow * completedquerysyncrunner * spliitinglogic * synccomplete * informdependents * only push same collector * deps * livetesting * foundissue * some issues resolved * activeupdate * collectorupdatefixes * fix dbquesries * tests * tests * pollingdebug
This commit is contained in:
+17
-14
@@ -4,35 +4,38 @@ import (
|
||||
"context"
|
||||
"log/slog"
|
||||
"os"
|
||||
controllers "queryorchestration/api/queryRunner"
|
||||
"queryorchestration/internal/document"
|
||||
"queryorchestration/internal/job/collector"
|
||||
queryrunner "queryorchestration/api/queryRunner"
|
||||
"queryorchestration/internal/query"
|
||||
"queryorchestration/internal/query/result"
|
||||
resultset "queryorchestration/internal/query/result/set"
|
||||
"queryorchestration/internal/server/runner"
|
||||
queryc "queryorchestration/internal/serviceconfig/queue/query"
|
||||
|
||||
_ "github.com/lib/pq"
|
||||
)
|
||||
|
||||
type QueryConfig struct {
|
||||
runner.BaseConfig
|
||||
queryc.QueryConfig
|
||||
}
|
||||
|
||||
func main() {
|
||||
ctx := context.Background()
|
||||
|
||||
cfg := &runner.BaseConfig{}
|
||||
cfg := &QueryConfig{}
|
||||
|
||||
cfg.ControllerFunc = func() runner.Controller {
|
||||
doc := document.New(cfg)
|
||||
col := collector.New(cfg, &collector.Services{
|
||||
Document: doc,
|
||||
que := query.New(cfg)
|
||||
res := result.New(cfg, &result.Services{
|
||||
Query: que,
|
||||
})
|
||||
res := result.New(cfg)
|
||||
svc := query.New(cfg, &query.Services{
|
||||
Result: res,
|
||||
Collector: col,
|
||||
Document: doc,
|
||||
resset := resultset.New(cfg, &resultset.Services{
|
||||
Result: res,
|
||||
Query: que,
|
||||
})
|
||||
|
||||
c := controllers.New(cfg.GetValidator(), &controllers.Services{
|
||||
Query: svc,
|
||||
c := queryrunner.New(cfg.GetValidator(), &queryrunner.Services{
|
||||
ResultSet: resset,
|
||||
})
|
||||
|
||||
return &c
|
||||
|
||||
@@ -13,6 +13,7 @@ import (
|
||||
"queryorchestration/internal/job/collector"
|
||||
"queryorchestration/internal/query"
|
||||
"queryorchestration/internal/query/result"
|
||||
querytest "queryorchestration/internal/query/test"
|
||||
service "queryorchestration/internal/server/service"
|
||||
|
||||
"github.com/getkin/kin-openapi/openapi3"
|
||||
@@ -26,14 +27,17 @@ func main() {
|
||||
|
||||
cfg.RegisterHandlersFunc = func() (*openapi3.T, error) {
|
||||
exp := export.New()
|
||||
res := result.New(cfg)
|
||||
que := query.New(cfg)
|
||||
res := result.New(cfg, &result.Services{
|
||||
Query: que,
|
||||
})
|
||||
doc := document.New(cfg)
|
||||
col := collector.New(cfg, &collector.Services{
|
||||
Document: doc,
|
||||
})
|
||||
que := query.New(cfg, &query.Services{
|
||||
Result: res,
|
||||
quetest := querytest.New(cfg, &querytest.Services{
|
||||
Collector: col,
|
||||
Result: res,
|
||||
Document: doc,
|
||||
})
|
||||
cli := client.New(cfg)
|
||||
@@ -48,6 +52,7 @@ func main() {
|
||||
Query: que,
|
||||
Client: cli,
|
||||
Job: jbb,
|
||||
QueryTest: quetest,
|
||||
}
|
||||
|
||||
cons := queryservice.NewControllers(cfg.GetValidator(), services)
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log/slog"
|
||||
"os"
|
||||
querysyncrunner "queryorchestration/api/querySyncRunner"
|
||||
"queryorchestration/internal/query"
|
||||
"queryorchestration/internal/query/result"
|
||||
resultset "queryorchestration/internal/query/result/set"
|
||||
querysync "queryorchestration/internal/query/sync"
|
||||
"queryorchestration/internal/server/runner"
|
||||
queryc "queryorchestration/internal/serviceconfig/queue/query"
|
||||
|
||||
_ "github.com/lib/pq"
|
||||
)
|
||||
|
||||
type QuerySyncConfig struct {
|
||||
runner.BaseConfig
|
||||
queryc.QueryConfig
|
||||
}
|
||||
|
||||
func main() {
|
||||
ctx := context.Background()
|
||||
|
||||
cfg := &QuerySyncConfig{}
|
||||
|
||||
cfg.ControllerFunc = func() runner.Controller {
|
||||
que := query.New(cfg)
|
||||
res := result.New(cfg, &result.Services{
|
||||
Query: que,
|
||||
})
|
||||
resset := resultset.New(cfg, &resultset.Services{
|
||||
Query: que,
|
||||
Result: res,
|
||||
})
|
||||
svc := querysync.New(cfg, &querysync.Services{
|
||||
ResultSet: resset,
|
||||
})
|
||||
|
||||
c := querysyncrunner.New(cfg.GetValidator(), &querysyncrunner.Services{
|
||||
QuerySync: svc,
|
||||
})
|
||||
|
||||
return &c
|
||||
}
|
||||
|
||||
server, err := runner.New(ctx, cfg)
|
||||
if err != nil {
|
||||
slog.Error(err.Error())
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
server.Listen(ctx)
|
||||
}
|
||||
Reference in New Issue
Block a user