Skip to content

Commit 83fa1c2

Browse files
authored
[Cleanup]move to existing misc instead of fortesting db table (#6829)
Cleanup to sync everything in misc instead of fortesitng tables --------- Signed-off-by: Yang Wang <[email protected]>
1 parent 605d7e4 commit 83fa1c2

File tree

7 files changed

+8
-13
lines changed

7 files changed

+8
-13
lines changed

aws/lambda/oss_ci_job_queue_time/lambda_function.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ def get_clickhouse_client(
3535
host: str, user: str, password: str
3636
) -> clickhouse_connect.driver.client.Client:
3737
# for local testing only, disable SSL verification
38-
# return clickhouse_connect.get_client(host=host, user=user, password=password,
39-
# secure=True, verify=False)
38+
# return clickhouse_connect.get_client(host=host, user=user, password=password,secure=True, verify=False)
4039

4140
return clickhouse_connect.get_client(
4241
host=host, user=user, password=password, secure=True
@@ -513,9 +512,7 @@ def process(
513512
def _write_to_db_table(
514513
self, cc: clickhouse_connect.driver.client.Client, records: List[Dict[str, Any]]
515514
):
516-
# TODO(elainewy): Change to misc.oss_ci_queue_time_histogram after testing
517-
# is completed
518-
db_name = "fortesting"
515+
db_name = "misc"
519516
db_table_name = "oss_ci_queue_time_histogram"
520517
logger.info(f" Insert data to db table: {db_name}.{db_table_name}")
521518
if len(records) == 0:
@@ -1283,10 +1280,10 @@ def get_latest_queue_time_histogram_table(
12831280
cc: clickhouse_connect.driver.client.Client,
12841281
) -> str:
12851282
query = """
1286-
SELECT toUnixTimestamp(MAX(time)) as latest FROM fortesting.oss_ci_queue_time_histogram
1283+
SELECT toUnixTimestamp(MAX(time)) as latest FROM misc.oss_ci_queue_time_histogram
12871284
"""
12881285
logger.info(
1289-
" Getting lastest timestamp from fortesting.oss_ci_queue_time_histogram...."
1286+
" Getting lastest timestamp from misc.oss_ci_queue_time_histogram...."
12901287
)
12911288
res = cc.query(query, {})
12921289

aws/lambda/tests/test_lambda_oss_ci_job_queue_time.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def get_response_for_query(
172172
) -> Tuple[Tuple[str, ...], List[Tuple]]:
173173
column_names = ()
174174
rows = []
175-
if "latest FROM fortesting.oss_ci_queue_time_histogram" in query:
175+
if "latest FROM misc.oss_ci_queue_time_histogram" in query:
176176
column_names = ("latest",)
177177
rows = self.rows_max_historagram
178178
elif "latest from default.workflow_job" in query:

torchci/clickhouse_queries/oss_ci_util/oss_ci_list_utilization_reports/query.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ SELECT
5151
min(time) AS earliest_ts,
5252
max(time) AS latest_ts
5353

54-
FROM fortesting.oss_ci_utilization_summary_report_v1
54+
FROM misc.oss_ci_utilization_summary_report_v1
5555
WHERE
5656
time >= toDate({start_time:String})
5757
AND time <= toDate({end_time:String})

torchci/clickhouse_queries/oss_ci_util/oss_ci_util_metadata/query.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
--- This query is used by utilization dashboard
2-
-- TODO(): change to misc. once the pipeline is ready, currently fetch data from fortesting for development
32
SELECT
43
usage_collect_interval AS collect_interval,
54
data_model_version AS model_version,

torchci/clickhouse_queries/oss_ci_util/oss_ci_util_ts/query.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
--- This query is used by utilization dashboard
2-
-- TODO(): change to misc. once the pipeline is ready, currently fetch data from fortesting for development
32
SELECT
43
time_stamp AS ts,
54
tags,

torchci/clickhouse_queries/queue_time_analysis/queue_time_query/query.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ WITH selected_data AS (
2020
sum(avg_queue_time * total_count) AS weighted_sum,
2121
sum(total_count) AS total_count_sum,
2222
groupArray(histogram) AS al
23-
FROM fortesting.oss_ci_queue_time_histogram
23+
FROM misc.oss_ci_queue_time_histogram
2424
WHERE time > {startTime: DateTime64}
2525
AND time <= {endTime: DateTime64}
2626
AND repo IN ({repos: Array(String)})

torchci/clickhouse_queries/queue_time_analysis/queue_time_search_items/query.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ SELECT
44
arrayDistinct(groupArray(job_name)) AS job_names,
55
arrayDistinct(groupArray(machine_type)) AS machine_types,
66
arrayDistinct(arrayFlatten(groupArray(runner_labels))) AS runner_labels
7-
FROM fortesting.oss_ci_queue_time_histogram
7+
FROM misc.oss_ci_queue_time_histogram
88
WHERE time >= {startTime: DateTime64} AND time < {endTime: DateTime64}

0 commit comments

Comments
 (0)