Commit Graph
22224 Commits
Author SHA1 Message Date
Yorick Peterse ee2739e606 Added an index on namespaces.public 2015-11-18 17:24:51 +01:00
Douwe Maan f3cfd20952 DRY up code 2015-11-18 17:17:38 +01:00
Drew Blessing cab6efa53f Deploy page should be shown for all pages not just root 2015-11-18 09:53:08 -06:00
Dmitriy Zaporozhets 61867abeec Merge branch 'fix-diff-stats-ui' into 'master'
Fix huge line height for diff files list

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1826
2015-11-18 15:02:42 +00:00
Douwe Maan c7fde6a0d8 Merge branch 'ce-mirror-backport' into 'master'
Backport relevant changes from gitlab-org/gitlab-ee!51

To do:

- [x] Update gitlab-shell

See merge request !1822
2015-11-18 14:56:29 +00:00
Douwe Maan da7d4f849c Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit 2015-11-18 15:54:51 +01:00
Dmitriy Zaporozhets e6c6c2234b Fix huge line height for diff files list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-18 15:15:47 +01:00
Yorick Peterse f486b06c4d Return internal projects in PersonalProjectsFinder
When getting the projects of a user we should get the public _and_
internal projects, not just the public ones.
2015-11-18 15:08:28 +01:00
Dmitriy Zaporozhets a5a5745231 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-18 14:01:55 +01:00
Yorick Peterse 9eefae6917 Fix UNION syntax for MySQL
Apparently MySQL doesn't support this syntax:

    (...) UNION (...)

instead it only supports:

    ...
    UNION
    ...
2015-11-18 13:31:18 +01:00
Yorick Peterse cc11c44ba9 Align hash literals to keep Rubocop happy 2015-11-18 13:27:03 +01:00
Marin Jankovski d9c4625c6d Specs that failed before the fix. 2015-11-18 13:16:07 +01:00
Yorick Peterse 26482bddb0 Don't pluck project IDs in User#owned_projects
This won't work efficiently if you happen to have a lot of projects.
2015-11-18 13:12:44 +01:00
Yorick Peterse 73f302edf9 Apply CI scope changes to the User model
These changes are based on those from commit
03f5ff750b, except they use a UNION
instead of plucking IDs into memory.
2015-11-18 13:05:45 +01:00
Yorick Peterse fbdf376749 Refactor UsersController to not kill the database
Previously this controller would in multiple places load tons (read:
around 65000) project and/or group IDs into memory. These changes in
combination with the previous commits significantly cut down loading
times of user profile pages and the Atom feeds of users.
2015-11-18 13:05:45 +01:00
Yorick Peterse e116a356b8 Refactor User#authorized_groups/projects
These methods no longer include public groups/projects (that don't
belong to the actual user) as this is handled by the various finder
classes now. This also removes the need for passing extra arguments.

Note that memoizing was removed _explicitly_. For whatever reason doing
so messes up the users controller to a point where it claims a certain
user does _not_ have access to certain groups/projects when it does have
access. Existing code shouldn't be affected as these methods are only
called in ways that they'd run queries anyway (e.g. a combination of
"any?" and "each" which would run 2 queries regardless of memoizing).
2015-11-18 13:05:45 +01:00
Yorick Peterse a4fc8112df Added Project.visible_to_user
This method can be used to filter projects to those visible to a given
user.
2015-11-18 13:05:45 +01:00
Yorick Peterse a74d6d2043 Group methods for filtering public/visible groups
These methods will be used to get a list of groups, optionally
restricted to only those visible to a given user.
2015-11-18 13:05:45 +01:00
Yorick Peterse 01620dd7e7 Added Event.limit_recent
This will be used to move some querying logic from the users controller
to the Event model (where it belongs).
2015-11-18 13:05:45 +01:00
Yorick Peterse fbcf3bd3fc Refactor ProjectsFinder to not pluck IDs
This class now uses a UNION (when needed) instead of plucking tens of
thousands of project IDs into memory. The tests have also been
re-written to ensure all different use cases are tested properly
(assuming I didn't forget any cases).

The finder has also been broken up into 3 different finder classes:

* ContributedProjectsFinder: class for getting the projects a user
  contributed to.
* PersonalProjectsFinder: class for getting the personal projects of a
  user.
* ProjectsFinder: class for getting generic projects visible to a given
  user.

Previously a lot of the logic of these finders was handled directly in
the users controller.
2015-11-18 13:05:45 +01:00
Yorick Peterse 2110247f83 Refactoed GroupsFinder into two separate classes
In the previous setup the GroupsFinder class had two distinct tasks:

1. Finding the projects user A could see
2. Finding the projects of user A that user B could see

Task two was actually handled outside of the GroupsFinder (in the
UsersController) by restricting the returned list of groups to those the
viewed user was a member of. Moving all this logic into a single finder
proved to be far too complex and confusing, hence there are now two
finders:

* GroupsFinder: for finding groups a user can see
* JoinedGroupsFinder: for finding groups that user A is a member of,
  restricted to either public groups or groups user B can also see.
2015-11-18 13:05:45 +01:00
Yorick Peterse b4646391ee Renamed GroupsFinder spec file so the name matches 2015-11-18 13:05:45 +01:00
Yorick Peterse 5fcd9986b8 Refactor getting user groups/projects/contributions
This new setup no longer loads any IDs into memory using "pluck",
instead using SQL UNIONs to merge the various datasets together. This
results in greatly improved query performance as well as a reduction of
memory usage.

The old setup was in particular problematic when requesting the
authorized projects _including_ public/internal projects as this would
result in roughly 65000 project IDs being loaded into memory. These IDs
would in turn be passed to other queries.
2015-11-18 13:05:45 +01:00
Yorick Peterse bfd9855a2b Prefix table names for User UNIONs 2015-11-18 13:05:45 +01:00
Yorick Peterse 189c40c33d Use SQL::Union for User#authorized_groups
This removes the need for plucking any IDs into Ruby.
2015-11-18 13:05:45 +01:00
Yorick Peterse 656d9ff69b Make it easier to re-apply default sort orders
By moving the default sort order into a separate scope (and calling this
from the default scope) we can more easily re-apply a default order
without having to specify the exact column/ordering all over the place.
2015-11-18 13:05:45 +01:00
Yorick Peterse 028bd227fb Use SQL::Union for User#authorized_projects
This allows retrieving of the list of authorized projects using a single
query, without having to load any IDs into Ruby. This in turn also means
we can remove the method User#authorized_projects_id.
2015-11-18 13:05:45 +01:00
Yorick Peterse d769596aec Added Gitlab::SQL::Union class
This class can be used to join multiple AcitveRecord::Relation objects
together using a SQL UNION statement. ActiveRecord < 5.0 sadly doesn't
support UNION and existing Gems out there don't handle prepared
statements (e.g. they never incremented the variable bindings).
2015-11-18 13:02:43 +01:00
Yorick Peterse 054f2f98ed Faster way of obtaining latest event update time
Instead of using MAX(events.updated_at) we can simply sort the events in
descending order by the "id" column and grab the first row. In other
words, instead of this:

    SELECT max(events.updated_at) AS max_id
    FROM events
    LEFT OUTER JOIN projects   ON projects.id   = events.project_id
    LEFT OUTER JOIN namespaces ON namespaces.id = projects.namespace_id
    WHERE events.author_id IS NOT NULL
    AND events.project_id IN (13083);

we can use this:

    SELECT events.updated_at AS max_id
    FROM events
    LEFT OUTER JOIN projects   ON projects.id   = events.project_id
    LEFT OUTER JOIN namespaces ON namespaces.id = projects.namespace_id
    WHERE events.author_id IS NOT NULL
    AND events.project_id IN (13083)
    ORDER BY events.id DESC
    LIMIT 1;

This has the benefit that on PostgreSQL a backwards index scan can be
used, which due to the "LIMIT 1" will at most process only a single row.
This in turn greatly speeds up the process of grabbing the latest update
time. This can be confirmed by looking at the query plans. The first
query produces the following plan:

    Aggregate  (cost=43779.84..43779.85 rows=1 width=12) (actual time=2142.462..2142.462 rows=1 loops=1)
      ->  Index Scan using index_events_on_project_id on events  (cost=0.43..43704.69 rows=30060 width=12) (actual time=0.033..2138.086 rows=32769 loops=1)
            Index Cond: (project_id = 13083)
            Filter: (author_id IS NOT NULL)
    Planning time: 1.248 ms
    Execution time: 2142.548 ms

The second query in turn produces the following plan:

    Limit  (cost=0.43..41.65 rows=1 width=16) (actual time=1.394..1.394 rows=1 loops=1)
      ->  Index Scan Backward using events_pkey on events  (cost=0.43..1238907.96 rows=30060 width=16) (actual time=1.394..1.394 rows=1 loops=1)
            Filter: ((author_id IS NOT NULL) AND (project_id = 13083))
            Rows Removed by Filter: 2104
    Planning time: 0.166 ms
    Execution time: 1.408 ms

According to the above plans the 2nd query is around 1500 times faster.
However, re-running the first query produces timings of around 80 ms,
making the 2nd query "only" around 55 times faster.
2015-11-18 13:02:43 +01:00
Marin Jankovski f5e3d93c28 Check which folders and archives should be packed before passing to tar command. 2015-11-18 13:01:35 +01:00
Douwe Maan fe8bb1f196 Merge pull request #9838 from evindor/master
Fix github importer to handle empty issues
2015-11-18 12:14:55 +01:00
Douwe Maan 7763e61ae5 Use gitlab-shell 2.6.7 2015-11-18 12:09:33 +01:00
Arseny Zarechnev e809669383 Fix github importer to handle empty issues 2015-11-18 11:02:25 +00:00
Douwe Maan 8937c5ff7a Load raw repository lazily to recover from failed read 2015-11-18 12:02:09 +01:00
Douwe Maan d0ec28827d Fix specs 2015-11-18 12:02:09 +01:00
Douwe Maan 5e8ddd3c2d Remove unused variable in repository import 2015-11-18 12:02:09 +01:00
Douwe Maan 5036d8d5d5 Fix styling of import error. 2015-11-18 12:02:09 +01:00
Douwe Maan 91fdbdcde7 Add tooltips to home panel buttons. 2015-11-18 12:02:09 +01:00
Douwe Maan b1f4d14f7d Clean up Repository cache code. 2015-11-18 12:02:08 +01:00
Douwe Maan 153085a93b Add Repository#is_ancestor? convenience method. 2015-11-18 12:02:08 +01:00
Douwe Maan a0519818cb Tweak code formatting. 2015-11-18 12:02:05 +01:00
Douwe Maan 7b405d3064 Fix redirect after import fails. 2015-11-18 12:00:57 +01:00
Douwe Maan 01d2b1943f Move import form to partial. 2015-11-18 12:00:56 +01:00
Douwe Maan 40470975e8 Add Project#safe_import_url helper. 2015-11-18 12:00:56 +01:00
Douwe Maan 841a7c6897 Store and show reason why import failed. 2015-11-18 12:00:56 +01:00
Douwe Maan 531177757e Add import_error to project. 2015-11-18 12:00:48 +01:00
Zeger-Jan van de Weg 53b285c9a8 Merge branch 'master' into merge-if-green 2015-11-18 11:58:01 +01:00
Zeger-Jan van de Weg 2f048df4a4 API support, incorporated feedback 2015-11-18 11:17:41 +01:00
Douwe Maan e86d53b27f Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit 2015-11-18 11:17:20 +01:00
Douwe Maan b6251af40f Fix feature spec. 2015-11-18 11:15:49 +01:00