Override min/max for usage data queries in EE module
What does this MR do?
Related to #326968 (closed)
Queries before
[1] pry(main)> queries = Gitlab::UsageDataQueries.uncached_data
(0.5ms) SELECT MAX("historical_data"."active_user_count") FROM "historical_data" WHERE "historical_data"."recorded_at" BETWEEN '2019-12-24 00:00:00' AND '2021-04-13 23:59:59.999999' /*application:console,line:/ee/app/models/historical_data.rb:20:in `max_historical_user_count'*/
User Load (2.3ms) SELECT "users".* FROM "users" WHERE "users"."user_type" = 2 ORDER BY "users"."id" ASC LIMIT 1 /*application:console,line:/app/models/concerns/has_unique_internal_users.rb:10:in `unique_internal'*/
User Load (0.6ms) SELECT "users".* FROM "users" WHERE "users"."user_type" = 2 ORDER BY "users"."id" ASC LIMIT 1 /*application:console,line:/app/models/concerns/has_unique_internal_users.rb:10:in `unique_internal'*/
JiraService Load (1.0ms) SELECT "services".* FROM "services" WHERE "services"."type" = 'JiraService' AND "services"."active" = TRUE ORDER BY "services"."id" ASC LIMIT 100 /*application:console,line:/lib/gitlab/usage_data.rb:439:in `jira_usage'*/
(0.5ms) SELECT MIN("jira_tracker_data"."service_id") FROM "jira_tracker_data" WHERE "jira_tracker_data"."issues_enabled" = TRUE /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:600:in `projects_jira_issuelist_active'*/
(0.3ms) SELECT MAX("jira_tracker_data"."service_id") FROM "jira_tracker_data" WHERE "jira_tracker_data"."issues_enabled" = TRUE /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:601:in `projects_jira_issuelist_active'*/
User Load (0.7ms) SELECT "users".* FROM "users" WHERE "users"."user_type" = 1 ORDER BY "users"."id" ASC LIMIT 1 /*application:console,line:/app/models/concerns/has_unique_internal_users.rb:10:in `unique_internal'*/
(0.8ms) SELECT MAX("geo_event_log"."id") FROM "geo_event_log" /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:199:in `block (2 levels) in system_usage_data'*/
(1.5ms) SELECT MIN("merge_requests"."id") FROM "merge_requests" /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:544:in `block in merge_request_minimum_id'*/
(0.5ms) SELECT MAX("merge_requests"."id") FROM "merge_requests" /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:550:in `block in merge_request_maximum_id'*/
(2.3ms) WITH RECURSIVE "base_and_descendants" AS ((SELECT 1 AS depth, ARRAY[epics.id] AS tree_path, false AS tree_cycle, "epics".* FROM "epics" WHERE "epics"."parent_id" IS NULL)
UNION
(SELECT ("base_and_descendants"."depth" + 1), tree_path || "epics".id, "epics".id = ANY(tree_path), "epics".* FROM "epics", "base_and_descendants" WHERE "epics"."parent_id" = "base_and_descendants"."id" AND "base_and_descendants"."tree_cycle" = FALSE)) SELECT MAX(depth) FROM "base_and_descendants" AS "epics" /*application:console,line:/lib/gitlab/object_hierarchy.rb:36:in `max_descendants_depth'*/
Project Load (2.6ms) SELECT "projects".* FROM "projects" WHERE "projects"."id" = 19 LIMIT 1 /*application:console,line:/lib/gitlab/current_settings.rb:28:in `method_missing'*/
(0.4ms) SELECT system_identifier FROM pg_control_system() /*application:console,line:/lib/gitlab/database.rb:254:in `system_id'*/
(0.7ms) SELECT MIN("approval_merge_request_rules"."merge_request_id") FROM "approval_merge_request_rules" /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:532:in `block in approval_merge_request_rule_minimum_id'*/
(0.3ms) SELECT MAX("approval_merge_request_rules"."merge_request_id") FROM "approval_merge_request_rules" /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:538:in `block in approval_merge_request_rule_maximum_id'*/
(0.6ms) SELECT MIN("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
(0.3ms) SELECT MAX("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
(0.3ms) SELECT MIN("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
(0.3ms) SELECT MAX("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
(0.3ms) SELECT MIN("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
(0.3ms) SELECT MAX("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
SQL (0.9ms) WITH "count_cte" AS MATERIALIZED (SELECT COUNT(*) AS count_grouped FROM "alert_management_http_integrations" WHERE "alert_management_http_integrations"."active" = TRUE GROUP BY "alert_management_http_integrations"."project_id") SELECT WIDTH_BUCKET("count_cte"."count_grouped", 1, 100, 99) AS buckets, "count_cte"."count" FROM "count_cte" GROUP BY buckets ORDER BY buckets /*application:console,line:/lib/gitlab/utils/usage_data.rb:141:in `histogram'*/
User Load (0.7ms) SELECT "users".* FROM "users" WHERE "users"."user_type" = 1 ORDER BY "users"."id" ASC LIMIT 1 /*application:console,line:/app/models/concerns/has_unique_internal_users.rb:10:in `unique_internal'*/
(0.5ms) SELECT MIN("security_scans"."build_id") FROM "security_scans" /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:429:in `count_secure_scans'*/
(0.3ms) SELECT MAX("security_scans"."build_id") FROM "security_scans" /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:430:in `count_secure_scans'*/
(0.5ms) SELECT MIN("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
(0.4ms) SELECT MAX("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
(0.5ms) SELECT MIN("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
(0.3ms) SELECT MAX("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
(0.3ms) SELECT MIN("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
(0.3ms) SELECT MAX("approval_project_rules"."id") FROM "approval_project_rules" WHERE "approval_project_rules"."rule_type" = 0 /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:140:in `count_approval_rules_with_users'*/
User Load (0.6ms) SELECT "users".* FROM "users" WHERE "users"."user_type" = 1 ORDER BY "users"."id" ASC LIMIT 1 /*application:console,line:/app/models/concerns/has_unique_internal_users.rb:10:in `unique_internal'*/
(1.0ms) SELECT MIN("ci_pipelines"."id") FROM "ci_pipelines" /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:482:in `count_secure_pipelines'*/
(0.4ms) SELECT MAX("ci_pipelines"."id") FROM "ci_pipelines" /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:483:in `count_secure_pipelines'*/
(0.4ms) SELECT MIN("security_scans"."build_id") FROM "security_scans" /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:429:in `count_secure_scans'*/
(0.4ms) SELECT MAX("security_scans"."build_id") FROM "security_scans" /*application:console,line:/ee/lib/ee/gitlab/usage_data.rb:430:in `count_secure_scans'*/
=> {:recorded_at=>Tue, 13 Apr 2021 15:32:50 UTC +00:00,
Queries after
[1] pry(main)> Gitlab::UsageDataQueries.uncached_data
License Load (0.5ms) SELECT "licenses".* FROM "licenses" ORDER BY "licenses"."id" DESC LIMIT 100 /*application:console,line:/ee/app/models/license.rb:297:in `load_license'*/
User Load (3.0ms) SELECT "users".* FROM "users" WHERE "users"."user_type" = 2 ORDER BY "users"."id" ASC LIMIT 1 /*application:console,line:/app/models/concerns/has_unique_internal_users.rb:10:in `unique_internal'*/
User Load (0.5ms) SELECT "users".* FROM "users" WHERE "users"."user_type" = 2 ORDER BY "users"."id" ASC LIMIT 1 /*application:console,line:/app/models/concerns/has_unique_internal_users.rb:10:in `unique_internal'*/
JiraService Load (0.9ms) SELECT "services".* FROM "services" WHERE "services"."type" = 'JiraService' AND "services"."active" = TRUE ORDER BY "services"."id" ASC LIMIT 100 /*application:console,line:/lib/gitlab/usage_data.rb:439:in `jira_usage'*/
User Load (0.5ms) SELECT "users".* FROM "users" WHERE "users"."user_type" = 1 ORDER BY "users"."id" ASC LIMIT 1 /*application:console,line:/app/models/concerns/has_unique_internal_users.rb:10:in `unique_internal'*/
License Load (0.3ms) SELECT "licenses".* FROM "licenses" ORDER BY "licenses"."id" DESC LIMIT 100 /*application:console,line:/ee/app/models/license.rb:297:in `load_license'*/
License Load (0.2ms) SELECT "licenses".* FROM "licenses" ORDER BY "licenses"."id" DESC LIMIT 100 /*application:console,line:/ee/app/models/license.rb:297:in `load_license'*/
(2.8ms) WITH RECURSIVE "base_and_descendants" AS ((SELECT 1 AS depth, ARRAY[epics.id] AS tree_path, false AS tree_cycle, "epics".* FROM "epics" WHERE "epics"."parent_id" IS NULL)
UNION
(SELECT ("base_and_descendants"."depth" + 1), tree_path || "epics".id, "epics".id = ANY(tree_path), "epics".* FROM "epics", "base_and_descendants" WHERE "epics"."parent_id" = "base_and_descendants"."id" AND "base_and_descendants"."tree_cycle" = FALSE)) SELECT MAX(depth) FROM "base_and_descendants" AS "epics" /*application:console,line:/lib/gitlab/object_hierarchy.rb:36:in `max_descendants_depth'*/
Project Load (3.7ms) SELECT "projects".* FROM "projects" WHERE "projects"."id" = 19 LIMIT 1 /*application:console,line:/lib/gitlab/current_settings.rb:28:in `method_missing'*/
License Load (0.2ms) SELECT "licenses".* FROM "licenses" ORDER BY "licenses"."id" DESC LIMIT 100 /*application:console,line:/ee/app/models/license.rb:297:in `load_license'*/
(0.4ms) SELECT system_identifier FROM pg_control_system() /*application:console,line:/lib/gitlab/database.rb:254:in `system_id'*/
SQL (0.9ms) WITH "count_cte" AS (SELECT COUNT(*) AS count_grouped FROM "alert_management_http_integrations" WHERE "alert_management_http_integrations"."active" = TRUE GROUP BY "alert_management_http_integrations"."project_id") SELECT WIDTH_BUCKET("count_cte"."count_grouped", 1, 100, 99) AS buckets, "count_cte"."count" FROM "count_cte" GROUP BY buckets ORDER BY buckets /*application:console,line:/lib/gitlab/utils/usage_data.rb:141:in `histogram'*/
User Load (0.6ms) SELECT "users".* FROM "users" WHERE "users"."user_type" = 1 ORDER BY "users"."id" ASC LIMIT 1 /*application:console,line:/app/models/concerns/has_unique_internal_users.rb:10:in `unique_internal'*/
User Load (0.6ms) SELECT "users".* FROM "users" WHERE "users"."user_type" = 1 ORDER BY "users"."id" ASC LIMIT 1 /*application:console,line:/app/models/concerns/has_unique_internal_users.rb:10:in `unique_internal'*/
=> {:recorded_at=>Wed, 14 Apr 2021 09:23:50 UTC +00:00,
Screenshots (strongly suggested)
Does this MR meet the acceptance criteria?
Conformity
-
📋 Does this MR need a changelog?-
I have included a changelog entry. -
I have not included a changelog entry because this is a developer facing change.
-
-
Documentation (if required) -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Availability and Testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers -
Informed Infrastructure department of a default or new setting change, if applicable per definition of done
Security
If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:
-
Label as security and @ mention @gitlab-com/gl-security/appsec
-
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Edited by Alper Akgun