Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Folders: Switch order of the columns in folder table indexes so that org_id becomes first #82454

Merged
merged 6 commits into from
Feb 16, 2024
Merged

Folders: Switch order of the columns in folder table indexes so that org_id becomes first #82454

merged 6 commits into from
Feb 16, 2024

Conversation

papagian
Copy link
Contributor

@papagian papagian commented Feb 14, 2024 •
edited
Loading

What is this feature?

Currently the first column in the indexes is not org_id but we need to optimise querying per tenant

I have went through that folder usage to make sure that no queries are affected by this change (searching with the leading (leftmost) columns of the concatenated indexes: eg no queries searching only for uid)

benchmark performance compared with branch not containing this change do not indicate any degradation in the performance because of the switched order of the indexes:

benchstat output 



'postgres' -> 14
goos: linux
goarch: amd64
pkg: github.com/grafana/grafana/pkg/api
cpu: Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz
                                                                                                            │ logs_grafana_grafana_161283_1_14.log │ logs_grafana_grafana_161295_1_14.log │
                                                                                                            │                sec/op                │    sec/op      vs base               │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                              11.60m ± 1892%     11.53m ± 3%        ~ (p=0.442 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                1.897m ±    6%     1.836m ± 2%   -3.19% (p=0.038 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                  1.346 ±    3%      1.191 ± 2%  -11.49% (p=0.000 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                          1.853 ±    3%      1.596 ± 2%  -13.89% (p=0.000 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                           1101.3m ±    4%     862.6m ± 1%  -21.68% (p=0.000 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                    236.9m ±    3%     232.1m ± 2%   -2.03% (p=0.028 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                1070.5m ±    1%     873.8m ± 2%  -18.38% (p=0.000 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                         241.9m ±    3%     237.2m ± 3%        ~ (p=0.065 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                             6.872m ±    1%     7.052m ± 5%        ~ (p=0.195 n=8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                          395.4m ±    1%     397.8m ± 1%        ~ (p=0.105 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                   1.202 ±    1%      1.190 ± 1%   -1.05% (p=0.050 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                    374.4m ±    0%     375.8m ± 0%   +0.37% (p=0.010 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                            156.2m ±    2%     156.5m ± 2%        ~ (p=0.279 n=8)
geomean                                                                                                                             197.8m             186.4m        -5.75%

                                                                                                            │ logs_grafana_grafana_161283_1_14.log │ logs_grafana_grafana_161295_1_14.log │
                                                                                                            │                 B/op                 │      B/op       vs base              │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                               2.330Mi ±  0%    2.329Mi ±  0%       ~ (p=1.000 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                 255.9Ki ±  2%    255.6Ki ±  2%       ~ (p=0.900 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                  23.92Mi ± 17%    23.92Mi ± 17%       ~ (p=0.382 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                          23.92Mi ± 17%    23.92Mi ± 17%       ~ (p=0.878 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                             347.3Ki ± 19%    313.6Ki ± 11%       ~ (p=0.083 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                     294.9Ki ±  7%    277.3Ki ± 13%       ~ (p=0.878 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                  83.94Ki ±  4%    81.38Ki ±  2%  -3.06% (p=0.016 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                          74.72Ki ±  1%    75.47Ki ±  1%       ~ (p=0.130 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                             1000.6Ki ±  0%   1000.1Ki ±  0%       ~ (p=0.505 n=8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                           22.65Mi ±  9%    21.97Mi ±  6%       ~ (p=0.505 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                   23.31Mi ± 17%    23.31Mi ± 17%       ~ (p=0.246 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                     77.89Ki ±  2%    77.76Ki ±  2%       ~ (p=0.878 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                             74.16Ki ±  1%    74.28Ki ±  1%       ~ (p=0.367 n=8)
geomean                                                                                                                              978.4Ki          962.2Ki        -1.66%

                                                                                                            │ logs_grafana_grafana_161283_1_14.log │ logs_grafana_grafana_161295_1_14.log │
                                                                                                            │              allocs/op               │   allocs/op     vs base              │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                                 60.94k ± 0%      60.94k ± 0%       ~ (p=0.559 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                   6.787k ± 0%      6.787k ± 0%       ~ (p=1.000 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                    430.9k ± 0%      430.9k ± 0%       ~ (p=0.161 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                            430.9k ± 0%      430.9k ± 0%       ~ (p=0.161 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                               5.514k ± 0%      5.497k ± 0%  -0.32% (p=0.002 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                       5.456k ± 0%      5.456k ± 0%       ~ (p=0.740 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                     774.0 ± 5%       763.5 ± 2%       ~ (p=0.138 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                             697.5 ± 1%       700.5 ± 1%       ~ (p=0.512 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                                19.94k ± 0%      19.94k ± 0%       ~ (p=1.000 n=8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                             415.9k ± 0%      415.9k ± 0%       ~ (p=0.940 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                     416.0k ± 0%      416.0k ± 0%       ~ (p=0.168 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                        727.5 ± 2%       725.0 ± 2%       ~ (p=0.780 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                                687.5 ± 1%       688.0 ± 1%       ~ (p=0.975 n=8)
geomean                                                                                                                                15.12k           15.10k       -0.12%


'sqlite' -> 13
goos: linux
goarch: amd64
pkg: github.com/grafana/grafana/pkg/api
cpu: Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz
                                                                                                            │ logs_grafana_grafana_161283_1_13.log │ logs_grafana_grafana_161295_1_13.log │
                                                                                                            │                sec/op                │     sec/op      vs base              │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                                 78.50m ± 4%      78.42m ± 5%       ~ (p=0.959 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                   51.53m ± 2%      51.12m ± 2%       ~ (p=0.234 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                    915.5m ± 2%      898.4m ± 2%       ~ (p=0.065 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                             1.938 ± 3%       1.891 ± 2%       ~ (p=0.065 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                               784.7m ± 1%      778.3m ± 1%       ~ (p=0.505 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                       491.0m ± 2%      490.8m ± 1%       ~ (p=0.645 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                    776.7m ± 1%      773.8m ± 0%       ~ (p=0.065 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                            488.2m ± 0%      489.9m ± 1%       ~ (p=0.195 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                                6.260m ± 5%      6.242m ± 3%       ~ (p=0.328 n=8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                             443.9m ± 2%      438.9m ± 2%       ~ (p=0.065 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                      1.389 ± 2%       1.384 ± 1%       ~ (p=0.721 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                       313.6m ± 0%      311.4m ± 1%  -0.69% (p=0.000 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                               265.2m ± 0%      264.4m ± 0%       ~ (p=0.130 n=8)
geomean                                                                                                                                317.7m           315.6m       -0.68%

                                                                                                            │ logs_grafana_grafana_161283_1_13.log │ logs_grafana_grafana_161295_1_13.log │
                                                                                                            │                 B/op                 │      B/op       vs base              │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                               2.469Mi ±  0%    2.464Mi ±  0%       ~ (p=0.721 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                 267.8Ki ±  1%    267.5Ki ±  0%       ~ (p=0.645 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                  24.05Mi ±  4%    23.05Mi ±  9%       ~ (p=0.574 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                          25.06Mi ±  0%    25.06Mi ± 16%       ~ (p=0.645 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                             310.3Ki ± 10%    327.5Ki ±  5%  +5.53% (p=0.010 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                     308.1Ki ± 11%    288.7Ki ± 11%       ~ (p=0.798 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                  66.21Ki ±  3%    66.48Ki ±  2%       ~ (p=0.574 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                          63.22Ki ±  2%    65.27Ki ±  1%  +3.23% (p=0.007 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                              1.019Mi ±  1%    1.019Mi ±  0%       ~ (p=0.878 n=8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                           23.10Mi ±  6%    23.11Mi ±  6%       ~ (p=0.328 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                   22.44Mi ±  9%    22.44Mi ±  9%       ~ (p=0.878 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                     62.85Ki ±  2%    62.83Ki ±  2%       ~ (p=0.442 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                             63.50Ki ±  3%    63.05Ki ±  2%       ~ (p=0.743 n=8)
geomean                                                                                                                              929.7Ki          927.7Ki        -0.21%

                                                                                                            │ logs_grafana_grafana_161283_1_13.log │ logs_grafana_grafana_161295_1_13.log │
                                                                                                            │              allocs/op               │   allocs/op     vs base              │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                                 81.31k ± 0%      81.31k ± 0%       ~ (p=1.000 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                   9.116k ± 0%      9.116k ± 0%       ~ (p=0.329 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                    580.7k ± 0%      580.7k ± 0%       ~ (p=0.505 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                            580.7k ± 0%      580.7k ± 0%       ~ (p=0.704 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                               6.960k ± 0%      6.966k ± 0%       ~ (p=0.423 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                       6.947k ± 0%      6.947k ± 0%       ~ (p=0.820 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                     572.5 ± 1%       571.5 ± 1%       ~ (p=0.702 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                             548.0 ± 1%       556.5 ± 2%  +1.55% (p=0.012 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                                26.45k ± 0%      26.45k ± 0%       ~ (p=1.000 n=8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                             565.7k ± 0%      565.7k ± 0%       ~ (p=0.314 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                     565.8k ± 0%      565.8k ± 0%       ~ (p=0.982 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                        532.0 ± 1%       533.0 ± 1%       ~ (p=0.860 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                                534.5 ± 1%       532.0 ± 1%       ~ (p=0.252 n=8)
geomean                                                                                                                                16.89k           16.91k       +0.09%


'mysql5.7' -> 15
goos: linux
goarch: amd64
pkg: github.com/grafana/grafana/pkg/api
cpu: Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz
                                                                                                            │ logs_grafana_grafana_161283_1_15.log │ logs_grafana_grafana_161295_1_15.log │
                                                                                                            │                sec/op                │   sec/op     vs base                 │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                                 15.14m ± 2%   16.67m ± 2%  +10.13% (p=0.000 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                   2.000m ± 4%   1.951m ± 4%        ~ (p=0.083 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                     5.138 ± 2%    5.091 ± 2%        ~ (p=0.161 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                             3.854 ± 4%    3.745 ± 2%   -2.81% (p=0.007 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                                3.503 ± 2%    3.515 ± 3%        ~ (p=0.721 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                        1.563 ± 4%    1.651 ± 8%        ~ (p=0.442 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                     3.396 ± 4%    3.464 ± 3%        ~ (p=0.234 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                             1.483 ± 3%    1.498 ± 4%        ~ (p=0.442 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                                8.221m ± 9%   8.385m ± 2%        ~ (p=0.815 n=9+8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                              3.413 ± 1%    3.377 ± 1%   -1.08% (p=0.021 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                      14.81 ± 0%    14.76 ± 0%   -0.35% (p=0.050 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                        2.933 ± 1%    2.886 ± 1%   -1.61% (p=0.001 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                                1.431 ± 1%    1.426 ± 1%        ~ (p=0.645 n=8)
geomean                                                                                                                                761.3m        767.7m        +0.83%

                                                                                                            │ logs_grafana_grafana_161283_1_15.log │ logs_grafana_grafana_161295_1_15.log  │
                                                                                                            │                 B/op                 │     B/op       vs base                │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                               2.184Mi ±  0%   2.188Mi ±  0%       ~ (p=0.234 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                 245.8Ki ±  2%   245.5Ki ±  2%       ~ (p=0.574 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                  27.24Mi ± 15%   27.25Mi ±  0%  +0.04% (p=0.007 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                          27.24Mi ± 15%   25.25Mi ±  8%       ~ (p=0.721 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                             504.9Ki ± 13%   510.0Ki ± 12%  +1.02% (p=0.005 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                     507.9Ki ± 14%   496.8Ki ± 13%       ~ (p=0.161 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                  205.5Ki ±  1%   210.7Ki ±  5%  +2.51% (p=0.010 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                          207.4Ki ±  4%   195.5Ki ±  4%  -5.76% (p=0.000 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                              1.043Mi ±  0%   1.043Mi ±  0%       ~ (p=0.673 n=9+8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                           24.40Mi ±  8%   24.37Mi ±  8%       ~ (p=0.382 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                   26.46Mi ± 15%   26.47Mi ± 15%       ~ (p=0.878 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                     84.02Ki ±  2%   83.82Ki ±  2%       ~ (p=0.959 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                             74.18Ki ±  2%   74.43Ki ±  2%       ~ (p=0.721 n=8)
geomean                                                                                                                              1.235Mi         1.223Mi        -0.93%

                                                                                                            │ logs_grafana_grafana_161283_1_15.log │ logs_grafana_grafana_161295_1_15.log │
                                                                                                            │              allocs/op               │  allocs/op    vs base                │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                                 62.00k ± 0%    62.00k ± 0%  +0.00% (p=0.043 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                   7.124k ± 0%    7.124k ± 0%       ~ (p=1.000 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                    615.7k ± 0%    615.8k ± 0%       ~ (p=0.053 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                            615.7k ± 0%    615.7k ± 0%       ~ (p=0.459 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                               7.425k ± 0%    7.439k ± 0%  +0.20% (p=0.019 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                       7.301k ± 0%    7.324k ± 0%  +0.32% (p=0.038 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                     662.0 ± 2%     678.0 ± 3%  +2.42% (p=0.030 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                             512.5 ± 2%     532.0 ± 4%  +3.80% (p=0.026 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                                24.25k ± 0%    24.25k ± 0%       ~ (p=0.757 n=9+8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                             590.8k ± 0%    590.8k ± 0%       ~ (p=0.625 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                     592.0k ± 0%    592.0k ± 0%       ~ (p=0.780 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                        648.5 ± 3%     653.0 ± 3%       ~ (p=0.458 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                                492.0 ± 3%     492.0 ± 5%       ~ (p=0.981 n=8)
geomean                                                                                                                                16.78k         16.87k       +0.57%


'mysql8' -> 16
goos: linux
goarch: amd64
pkg: github.com/grafana/grafana/pkg/api
cpu: Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz
                                                                                                            │ logs_grafana_grafana_161283_1_16.log │ logs_grafana_grafana_161295_1_16.log │
                                                                                                            │                sec/op                │    sec/op     vs base                │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                                 13.59m ± 2%    13.08m ± 4%  -3.73% (p=0.007 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                   1.962m ± 3%    1.954m ± 3%       ~ (p=0.798 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                     15.92 ± 1%     16.24 ± 1%  +2.01% (p=0.000 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                             4.229 ± 1%     4.169 ± 4%       ~ (p=0.105 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                                13.73 ± 1%     14.16 ± 3%  +3.11% (p=0.000 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                        1.860 ± 2%     1.875 ± 2%       ~ (p=0.130 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                     13.61 ± 0%     14.04 ± 0%  +3.16% (p=0.000 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                             1.842 ± 2%     1.869 ± 1%  +1.47% (p=0.050 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                                8.112m ± 6%    8.347m ± 2%       ~ (p=0.130 n=8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                              2.328 ± 2%     2.299 ± 1%       ~ (p=0.105 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                      3.828 ± 1%     3.771 ± 0%  -1.49% (p=0.000 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                        1.826 ± 1%     1.838 ± 1%       ~ (p=0.442 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                                1.555 ± 1%     1.550 ± 1%       ~ (p=1.000 n=9+8)
geomean                                                                                                                                894.8m         898.4m       +0.40%

                                                                                                            │ logs_grafana_grafana_161283_1_16.log │ logs_grafana_grafana_161295_1_16.log  │
                                                                                                            │                 B/op                 │     B/op       vs base                │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                               2.186Mi ±  0%   2.187Mi ±  0%       ~ (p=0.574 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                 248.7Ki ±  3%   247.2Ki ±  2%       ~ (p=0.574 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                  23.14Mi ± 17%   27.14Mi ± 15%       ~ (p=0.195 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                          25.12Mi ±  8%   25.12Mi ±  8%       ~ (p=0.798 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                             408.6Ki ± 16%   407.2Ki ± 16%       ~ (p=0.382 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                     340.4Ki ± 10%   371.2Ki ± 18%       ~ (p=0.645 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                  116.5Ki ±  3%   118.2Ki ±  2%       ~ (p=0.105 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                          72.71Ki ±  2%   72.99Ki ±  2%       ~ (p=0.442 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                              1.043Mi ±  0%   1.043Mi ±  0%       ~ (p=0.505 n=8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                           26.39Mi ± 15%   26.39Mi ± 15%       ~ (p=0.442 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                   26.40Mi ± 15%   26.40Mi ± 15%       ~ (p=0.645 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                     75.88Ki ±  3%   75.29Ki ±  2%       ~ (p=0.663 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                             75.75Ki ±  2%   74.63Ki ±  3%       ~ (p=0.587 n=9+8)
geomean                                                                                                                              1.021Mi         1.040Mi        +1.81%

                                                                                                            │ logs_grafana_grafana_161283_1_16.log │ logs_grafana_grafana_161295_1_16.log │
                                                                                                            │              allocs/op               │  allocs/op    vs base                │
FolderListAndSearch/impl=default_nested_folders=on_get_root_folders-32                                                                 62.00k ± 0%    62.00k ± 0%  +0.00% (p=0.022 n=8)
FolderListAndSearch/impl=default_nested_folders=on_get_subfolders-32                                                                   7.124k ± 0%    7.124k ± 0%       ~ (p=0.569 n=8)
FolderListAndSearch/impl=default_nested_folders=on_list_all_inherited_dashboards-32                                                    616.1k ± 0%    616.1k ± 0%       ~ (p=0.574 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_list_all_inherited_dashboards-32                            615.6k ± 0%    615.6k ± 0%       ~ (p=0.222 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_pattern-32                                                               7.863k ± 0%    7.870k ± 0%       ~ (p=0.781 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_pattern-32                                       7.255k ± 0%    7.258k ± 0%       ~ (p=0.739 n=8)
FolderListAndSearch/impl=default_nested_folders=on_search_for_specific_dashboard-32                                                    1.218k ± 4%    1.236k ± 3%       ~ (p=0.428 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=on_search_for_specific_dashboard-32                             474.0 ± 3%     476.0 ± 5%       ~ (p=0.902 n=8)
FolderListAndSearch/impl=default_nested_folders=off_get_root_folders-32                                                                24.25k ± 0%    24.25k ± 0%       ~ (p=0.254 n=8)
FolderListAndSearch/impl=default_nested_folders=off_list_all_dashboards-32                                                             590.7k ± 0%    590.7k ± 0%       ~ (p=0.703 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_list_all_dashboards-32                                     590.9k ± 0%    590.8k ± 0%       ~ (p=0.169 n=8)
FolderListAndSearch/impl=default_nested_folders=off_search_specific_dashboard-32                                                        514.0 ± 2%     517.5 ± 4%       ~ (p=0.959 n=8)
FolderListAndSearch/impl=permissionsFilterRemoveSubquery_nested_folders=off_search_specific_dashboard-32                                511.0 ± 5%     501.5 ± 4%       ~ (p=0.382 n=9+8)
geomean                                                                                                                                17.28k         17.29k       +0.06%

Why do we need this feature?

[Add a description of the problem the feature is trying to solve.]

Who is this feature for?

[Add information on what kind of user the feature is for.]

Which issue(s) does this PR fix?:

Fixes #

Special notes for your reviewer:

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

@papagian
Copy link
Contributor Author

/deploy-to-hg

@ephemeral-instances-bot
Copy link

  • Preparing your instance. A comment containing your instance's url will be added to this PR when the instance is ready.
  • Your instance will be ready in ~10 minutes.
  • Check the GitHub actions tab to follow the workflow progress
  • Slack channel: #proj-ephemeral-hg-instances
  • Building instance with papagian/switch-index-cols oss branch and main enterprise branch. How to choose a branch

@papagian papagian changed the title Folders: Switch order of the columns in folder table so that org_id b… Folders: Switch order of the columns in folder table indexes so that org_id becomes first Feb 15, 2024
@ephemeral-instances-bot
Copy link

@papagian papagian marked this pull request as ready for review February 15, 2024 17:56
@papagian papagian requested review from a team as code owners February 15, 2024 17:56
@papagian papagian requested review from diegommm, undef1nd and suntala and removed request for a team February 15, 2024 17:56
@papagian papagian added add to changelog no-backport Skip backport of PR labels Feb 15, 2024
@papagian papagian merged commit 38e8c62 into main Feb 16, 2024
11 of 12 checks passed
@papagian papagian deleted the papagian/switch-index-cols branch February 16, 2024 19:10
@grafana-delivery-bot grafana-delivery-bot bot added this to the 10.4.x milestone Feb 16, 2024
@aangelisc aangelisc modified the milestones: 10.4.x, 10.4.0 Mar 6, 2024
@BrewTestBot BrewTestBot mentioned this pull request Mar 6, 2024
Closed
@BrewTestBot BrewTestBot mentioned this pull request Mar 14, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@undef1nd undef1nd undef1nd approved these changes

@diegommm diegommm Awaiting requested review from diegommm diegommm was automatically assigned from grafana/backend-platform

@suntala suntala Awaiting requested review from suntala suntala was automatically assigned from grafana/backend-platform

Assignees
No one assigned
Labels
add to changelog area/backend/db/migration area/backend no-backport Skip backport of PR
Projects
None yet
Milestone
10.4.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@papagian @undef1nd @aangelisc