Skip to content

Commit c53f0e5

Browse files
detjdetj
authored
chore(backend): use clickhouse read pool in api service (#3270)
- perform all clickhouse read operations using read pool in api service fixes #3269 Signed-off-by: detj <detj@users.noreply.github.com>
1 parent ec73cab commit c53f0e5

File tree

4 files changed

+36
-36
lines changed

4 files changed

+36
-36
lines changed

‎backend/api/filter/appfilter.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ func (af AppFilter) getAppVersions(ctx context.Context) (versions, versionCodes
873873
stmt.Where("anr=true")
874874
}
875875

876-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
876+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
877877
if err != nil {
878878
return
879879
}
@@ -947,7 +947,7 @@ func (af AppFilter) getOSVersions(ctx context.Context) (osNames, osVersions []st
947947
stmt.Where("anr=true")
948948
}
949949

950-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
950+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
951951
if err != nil {
952952
return
953953
}
@@ -1001,7 +1001,7 @@ func (af AppFilter) getCountries(ctx context.Context) (countries []string, err e
10011001
stmt.Where("anr=true")
10021002
}
10031003

1004-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
1004+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
10051005
if err != nil {
10061006
return
10071007
}
@@ -1053,7 +1053,7 @@ func (af AppFilter) getNetworkProviders(ctx context.Context) (networkProviders [
10531053
stmt.Where("anr=true")
10541054
}
10551055

1056-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
1056+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
10571057
if err != nil {
10581058
return
10591059
}
@@ -1105,7 +1105,7 @@ func (af AppFilter) getNetworkTypes(ctx context.Context) (networkTypes []string,
11051105
stmt.Where("anr=true")
11061106
}
11071107

1108-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
1108+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
11091109
if err != nil {
11101110
return
11111111
}
@@ -1157,7 +1157,7 @@ func (af AppFilter) getNetworkGenerations(ctx context.Context) (networkGeneratio
11571157
stmt.Where("anr=true")
11581158
}
11591159

1160-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
1160+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
11611161
if err != nil {
11621162
return
11631163
}
@@ -1212,7 +1212,7 @@ func (af AppFilter) getDeviceLocales(ctx context.Context) (deviceLocales []strin
12121212
stmt.Where("anr=true")
12131213
}
12141214

1215-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
1215+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
12161216
if err != nil {
12171217
return
12181218
}
@@ -1264,7 +1264,7 @@ func (af AppFilter) getDeviceManufacturers(ctx context.Context) (deviceManufactu
12641264
stmt.Where("anr=true")
12651265
}
12661266

1267-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
1267+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
12681268
if err != nil {
12691269
return
12701270
}
@@ -1316,7 +1316,7 @@ func (af AppFilter) getDeviceNames(ctx context.Context) (deviceNames []string, e
13161316
stmt.Where("anr=true")
13171317
}
13181318

1319-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
1319+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
13201320
if err != nil {
13211321
return
13221322
}
@@ -1364,7 +1364,7 @@ func (af AppFilter) getUDAttrKeys(ctx context.Context) (keytypes []udattr.UDKeyT
13641364

13651365
defer stmt.Close()
13661366

1367-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
1367+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
13681368
if err != nil {
13691369
return
13701370
}

‎backend/api/measure/app.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ func (a App) GetExceptionGroupPlotInstances(ctx context.Context, fingerprint str
259259

260260
defer stmt.Close()
261261

262-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
262+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
263263
if err != nil {
264264
return
265265
}
@@ -403,7 +403,7 @@ func (a App) GetExceptionGroupsWithFilter(ctx context.Context, af *filter.AppFil
403403

404404
defer stmt.Close()
405405

406-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
406+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
407407
if err != nil {
408408
return
409409
}
@@ -520,7 +520,7 @@ func (a App) GetExceptionPlotInstances(ctx context.Context, af *filter.AppFilter
520520
stmt.GroupBy("app_version, datetime_bucket").
521521
OrderBy("app_version, datetime_bucket")
522522

523-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
523+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
524524
if err != nil {
525525
return
526526
}
@@ -609,7 +609,7 @@ func (a App) GetExceptionAttributesDistribution(ctx context.Context, fingerprint
609609

610610
defer stmt.Close()
611611

612-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
612+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
613613
if err != nil {
614614
return
615615
}
@@ -725,7 +725,7 @@ func (a App) GetExceptionsWithFilter(ctx context.Context, fingerprint string, af
725725

726726
defer stmt.Close()
727727

728-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
728+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
729729
if err != nil {
730730
return
731731
}
@@ -854,7 +854,7 @@ func (a App) GetANRGroupPlotInstances(ctx context.Context, fingerprint string, a
854854

855855
defer stmt.Close()
856856

857-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
857+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
858858
if err != nil {
859859
return
860860
}
@@ -945,7 +945,7 @@ func (a App) GetANRPlotInstances(ctx context.Context, af *filter.AppFilter) (iss
945945
stmt.GroupBy("app_version, datetime_bucket").
946946
OrderBy("app_version, datetime_bucket")
947947

948-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
948+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
949949
if err != nil {
950950
return
951951
}
@@ -1033,7 +1033,7 @@ func (a App) GetANRAttributesDistribution(ctx context.Context, fingerprint strin
10331033

10341034
defer stmt.Close()
10351035

1036-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
1036+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
10371037
if err != nil {
10381038
return
10391039
}
@@ -1198,7 +1198,7 @@ func (a App) GetANRGroupsWithFilter(ctx context.Context, af *filter.AppFilter) (
11981198

11991199
defer stmt.Close()
12001200

1201-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
1201+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
12021202
if err != nil {
12031203
return
12041204
}
@@ -1312,7 +1312,7 @@ func (a App) GetANRsWithFilter(ctx context.Context, fingerprint string, af *filt
13121312

13131313
defer stmt.Close()
13141314

1315-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
1315+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
13161316
if err != nil {
13171317
return
13181318
}
@@ -1512,7 +1512,7 @@ func (a App) GetIssueFreeMetrics(
15121512
dest = append(dest, &anrSelected, &anrUnselected, &perceivedANRSelected, &perceivedANRUnselected)
15131513
}
15141514

1515-
if err = server.Server.ChPool.QueryRow(ctx, stmt.String(), stmt.Args()...).Scan(dest...); err != nil {
1515+
if err = server.Server.RchPool.QueryRow(ctx, stmt.String(), stmt.Args()...).Scan(dest...); err != nil {
15161516
return
15171517
}
15181518

@@ -1643,7 +1643,7 @@ func (a App) GetAdoptionMetrics(ctx context.Context, af *filter.AppFilter) (adop
16431643

16441644
defer stmt.Close()
16451645

1646-
if err = server.Server.ChPool.QueryRow(ctx, stmt.String(), stmt.Args()...).Scan(&adoption.SelectedVersion, &adoption.AllVersions, &adoption.Adoption); err != nil {
1646+
if err = server.Server.RchPool.QueryRow(ctx, stmt.String(), stmt.Args()...).Scan(&adoption.SelectedVersion, &adoption.AllVersions, &adoption.Adoption); err != nil {
16471647
return
16481648
}
16491649

@@ -1684,7 +1684,7 @@ func (a App) GetLaunchMetrics(ctx context.Context, af *filter.AppFilter) (launch
16841684

16851685
defer stmt.Close()
16861686

1687-
if err = server.Server.ChPool.QueryRow(ctx, stmt.String(), stmt.Args()...).Scan(
1687+
if err = server.Server.RchPool.QueryRow(ctx, stmt.String(), stmt.Args()...).Scan(
16881688
&launch.ColdLaunchP95,
16891689
&launch.WarmLaunchP95,
16901690
&launch.HotLaunchP95,
@@ -2346,7 +2346,7 @@ func (a App) FetchRootSpanNames(ctx context.Context) (traceNames []string, err e
23462346

23472347
defer stmt.Close()
23482348

2349-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
2349+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
23502350
if err != nil {
23512351
return
23522352
}
@@ -2390,7 +2390,7 @@ func (a App) FetchTracesForSessionId(ctx context.Context, sessionID uuid.UUID) (
23902390

23912391
defer stmt.Close()
23922392

2393-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
2393+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
23942394
if err != nil {
23952395
return
23962396
}
@@ -2536,7 +2536,7 @@ func (a App) GetSpansForSpanNameWithFilter(ctx context.Context, spanName string,
25362536

25372537
defer stmt.Close()
25382538

2539-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
2539+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
25402540
if err != nil {
25412541
return
25422542
}
@@ -2688,7 +2688,7 @@ func (a App) GetMetricsPlotForSpanNameWithFilter(ctx context.Context, spanName s
26882688

26892689
defer stmt.Close()
26902690

2691-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
2691+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
26922692
if err != nil {
26932693
return
26942694
}
@@ -2744,7 +2744,7 @@ func (a App) GetTrace(ctx context.Context, traceId string) (trace span.TraceDisp
27442744

27452745
defer stmt.Close()
27462746

2747-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
2747+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
27482748
if err != nil {
27492749
return
27502750
}
@@ -2973,7 +2973,7 @@ func (a App) GetBugReportsWithFilter(ctx context.Context, af *filter.AppFilter)
29732973
stmt.Where(stmtMatch.String(), stmtMatch.Args()...)
29742974
}
29752975

2976-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
2976+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
29772977
if err != nil {
29782978
return
29792979
}
@@ -3165,7 +3165,7 @@ func (a App) GetBugReportInstancesPlot(ctx context.Context, af *filter.AppFilter
31653165

31663166
defer stmt.Close()
31673167

3168-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
3168+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
31693169
if err != nil {
31703170
return
31713171
}
@@ -3218,7 +3218,7 @@ func (a App) GetBugReportById(ctx context.Context, bugReportId string) (bugRepor
32183218

32193219
defer stmt.Close()
32203220

3221-
row := server.Server.ChPool.QueryRow(ctx, stmt.String(), stmt.Args()...)
3221+
row := server.Server.RchPool.QueryRow(ctx, stmt.String(), stmt.Args()...)
32223222

32233223
if row.Err() != nil {
32243224
err = row.Err()
@@ -3450,7 +3450,7 @@ func (a App) getJourneyEvents(ctx context.Context, af *filter.AppFilter, opts fi
34503450

34513451
defer stmt.Close()
34523452

3453-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
3453+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
34543454
if err != nil {
34553455
return
34563456
}
@@ -3961,7 +3961,7 @@ func (a *App) GetSessionEvents(ctx context.Context, sessionId uuid.UUID) (*Sessi
39613961
stmt.Where("session_id = toUUID(?)", sessionId)
39623962
stmt.OrderBy("timestamp")
39633963

3964-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
3964+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
39653965

39663966
if err != nil {
39673967
return nil, err

‎backend/api/measure/issue_common_path.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ func GetIssueGroupCommonPath(ctx context.Context, teamID, appID uuid.UUID, group
234234
defer countStmt.Close()
235235

236236
var sessionsAnalyzed uint64
237-
if err = server.Server.ChPool.QueryRow(ctx, countStmt.String(), countStmt.Args()...).Scan(&sessionsAnalyzed); err != nil {
237+
if err = server.Server.RchPool.QueryRow(ctx, countStmt.String(), countStmt.Args()...).Scan(&sessionsAnalyzed); err != nil {
238238
return nil, fmt.Errorf("failed to get session count: %v", err)
239239
}
240240

@@ -419,7 +419,7 @@ func GetIssueGroupCommonPath(ctx context.Context, teamID, appID uuid.UUID, group
419419

420420
ctx = logcomment.WithSettingsPut(ctx, settings, lc, logcomment.Name, "common_path")
421421

422-
rows, err := server.Server.ChPool.Query(ctx, stmt.String(), stmt.Args()...)
422+
rows, err := server.Server.RchPool.Query(ctx, stmt.String(), stmt.Args()...)
423423
if err != nil {
424424
return nil, fmt.Errorf("failed to execute reproduction steps query: %v", err)
425425
}

‎backend/api/measure/usage.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func GetUsage(c *gin.Context) {
101101

102102
defer metricsStmt.Close()
103103

104-
metricsRows, err := server.Server.ChPool.Query(ctx, metricsStmt.String(), metricsStmt.Args()...)
104+
metricsRows, err := server.Server.RchPool.Query(ctx, metricsStmt.String(), metricsStmt.Args()...)
105105
if err != nil {
106106
msg := fmt.Sprintf("error occurred while querying usage metrics for team: %s", teamId)
107107
fmt.Println(msg, err)

0 commit comments

Comments
 (0)