Skip to content

G
gitlab-ce
Commit 6caeeef5 authored by Alessio Caiazza's avatar Alessio Caiazza
Browse files
Options

Merge branch 'graphql-inttype-to-bigint' into 'master' 

Update graphql statistics  holders to GraphQL::FLOAT_TYPE

See merge request gitlab-org/gitlab!23131
parents 8780c5c0 485073f7
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 56 deletions
app/graphql/types/project_statistics_type.rb
View file @ 6caeeef5
......@@ -6,20 +6,20 @@ module Types
authorize :read_statistics
field :commit_count, GraphQL::INT_TYPE, null: false,
field :commit_count, GraphQL::FLOAT_TYPE, null: false,
description: 'Commit count of the project'
field :storage_size, GraphQL::INT_TYPE, null: false,
field :storage_size, GraphQL::FLOAT_TYPE, null: false,
description: 'Storage size of the project'
field :repository_size, GraphQL::INT_TYPE, null: false,
field :repository_size, GraphQL::FLOAT_TYPE, null: false,
description: 'Repository size of the project'
field :lfs_objects_size, GraphQL::INT_TYPE, null: false,
field :lfs_objects_size, GraphQL::FLOAT_TYPE, null: false,
description: 'Large File Storage (LFS) object size of the project'
field :build_artifacts_size, GraphQL::INT_TYPE, null: false,
field :build_artifacts_size, GraphQL::FLOAT_TYPE, null: false,
description: 'Build artifacts size of the project'
field :packages_size, GraphQL::INT_TYPE, null: false,
field :packages_size, GraphQL::FLOAT_TYPE, null: false,
description: 'Packages size of the project'
field :wiki_size, GraphQL::INT_TYPE, null: true,
field :wiki_size, GraphQL::FLOAT_TYPE, null: true,
description: 'Wiki size of the project'
end
end
app/graphql/types/root_storage_statistics_type.rb
View file @ 6caeeef5
......@@ -6,11 +6,11 @@ module Types
authorize :read_statistics
field :storage_size, GraphQL::INT_TYPE, null: false, description: 'The total storage in bytes'
field :repository_size, GraphQL::INT_TYPE, null: false, description: 'The Git repository size in bytes'
field :lfs_objects_size, GraphQL::INT_TYPE, null: false, description: 'The LFS objects size in bytes'
field :build_artifacts_size, GraphQL::INT_TYPE, null: false, description: 'The CI artifacts size in bytes'
field :packages_size, GraphQL::INT_TYPE, null: false, description: 'The packages size in bytes'
field :wiki_size, GraphQL::INT_TYPE, null: false, description: 'The wiki size in bytes'
field :storage_size, GraphQL::FLOAT_TYPE, null: false, description: 'The total storage in bytes'
field :repository_size, GraphQL::FLOAT_TYPE, null: false, description: 'The Git repository size in bytes'
field :lfs_objects_size, GraphQL::FLOAT_TYPE, null: false, description: 'The LFS objects size in bytes'
field :build_artifacts_size, GraphQL::FLOAT_TYPE, null: false, description: 'The CI artifacts size in bytes'
field :packages_size, GraphQL::FLOAT_TYPE, null: false, description: 'The packages size in bytes'
field :wiki_size, GraphQL::FLOAT_TYPE, null: false, description: 'The wiki size in bytes'
end
end
changelogs/unreleased/23131-upgrade-statistics-endpoints.yml 0 → 100644
View file @ 6caeeef5
---
title: >
#42671: Project and group storage statistics now support values up to 8 PiB (up from 4GiB)
merge_request: 23131
author: Matthias van de Meent
type: fixed
doc/api/graphql/reference/gitlab_schema.graphql
View file @ 6caeeef5
......@@ -6695,37 +6695,37 @@ type ProjectStatistics {
"""
Build artifacts size of the project
"""
buildArtifactsSize: Int!
buildArtifactsSize: Float!
"""
Commit count of the project
"""
commitCount: Int!
commitCount: Float!
"""
Large File Storage (LFS) object size of the project
"""
lfsObjectsSize: Int!
lfsObjectsSize: Float!
"""
Packages size of the project
"""
packagesSize: Int!
packagesSize: Float!
"""
Repository size of the project
"""
repositorySize: Int!
repositorySize: Float!
"""
Storage size of the project
"""
storageSize: Int!
storageSize: Float!
"""
Wiki size of the project
"""
wikiSize: Int
wikiSize: Float
}
type Query {
......@@ -7059,32 +7059,32 @@ type RootStorageStatistics {
"""
The CI artifacts size in bytes
"""
buildArtifactsSize: Int!
buildArtifactsSize: Float!
"""
The LFS objects size in bytes
"""
lfsObjectsSize: Int!
lfsObjectsSize: Float!
"""
The packages size in bytes
"""
packagesSize: Int!
packagesSize: Float!
"""
The Git repository size in bytes
"""
repositorySize: Int!
repositorySize: Float!
"""
The total storage in bytes
"""
storageSize: Int!
storageSize: Float!
"""
The wiki size in bytes
"""
wikiSize: Int!
wikiSize: Float!
}
"""
......
doc/api/graphql/reference/gitlab_schema.json
View file @ 6caeeef5
......@@ -20104,7 +20104,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......@@ -20122,7 +20122,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......@@ -20140,7 +20140,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......@@ -20158,7 +20158,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......@@ -20176,7 +20176,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......@@ -20194,7 +20194,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......@@ -20209,7 +20209,7 @@
],
"type": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
},
"isDeprecated": false,
......@@ -21203,7 +21203,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......@@ -21221,7 +21221,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......@@ -21239,7 +21239,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......@@ -21257,7 +21257,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......@@ -21275,7 +21275,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......@@ -21293,7 +21293,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Int",
"name": "Float",
"ofType": null
}
},
......
doc/api/graphql/reference/index.md
View file @ 6caeeef5
......@@ -979,13 +979,13 @@ Information about pagination in a connection.
| Name | Type | Description |
| --- | ---- | ---------- |
| `buildArtifactsSize` | Int! | Build artifacts size of the project |
| `commitCount` | Int! | Commit count of the project |
| `lfsObjectsSize` | Int! | Large File Storage (LFS) object size of the project |
| `packagesSize` | Int! | Packages size of the project |
| `repositorySize` | Int! | Repository size of the project |
| `storageSize` | Int! | Storage size of the project |
| `wikiSize` | Int | Wiki size of the project |
| `buildArtifactsSize` | Float! | Build artifacts size of the project |
| `commitCount` | Float! | Commit count of the project |
| `lfsObjectsSize` | Float! | Large File Storage (LFS) object size of the project |
| `packagesSize` | Float! | Packages size of the project |
| `repositorySize` | Float! | Repository size of the project |
| `storageSize` | Float! | Storage size of the project |
| `wikiSize` | Float | Wiki size of the project |
## RemoveAwardEmojiPayload
......@@ -1047,12 +1047,12 @@ Counts of requirements by their state.
| Name | Type | Description |
| --- | ---- | ---------- |
| `buildArtifactsSize` | Int! | The CI artifacts size in bytes |
| `lfsObjectsSize` | Int! | The LFS objects size in bytes |
| `packagesSize` | Int! | The packages size in bytes |
| `repositorySize` | Int! | The Git repository size in bytes |
| `storageSize` | Int! | The total storage in bytes |
| `wikiSize` | Int! | The wiki size in bytes |
| `buildArtifactsSize` | Float! | The CI artifacts size in bytes |
| `lfsObjectsSize` | Float! | The LFS objects size in bytes |
| `packagesSize` | Float! | The packages size in bytes |
| `repositorySize` | Float! | The Git repository size in bytes |
| `storageSize` | Float! | The total storage in bytes |
| `wikiSize` | Float! | The wiki size in bytes |
## SentryDetailedError
......
spec/requests/api/graphql/namespace/root_storage_statistics_spec.rb
View file @ 6caeeef5
......@@ -6,7 +6,7 @@ describe 'rendering namespace statistics' do
include GraphqlHelpers
let(:namespace) { user.namespace }
let!(:statistics) { create(:namespace_root_storage_statistics, namespace: namespace, packages_size: 5.megabytes) }
let!(:statistics) { create(:namespace_root_storage_statistics, namespace: namespace, packages_size: 5.gigabytes) }
let(:user) { create(:user) }
let(:query) do
......@@ -26,7 +26,7 @@ describe 'rendering namespace statistics' do
post_graphql(query, current_user: user)
expect(graphql_data['namespace']['rootStorageStatistics']).not_to be_blank
expect(graphql_data['namespace']['rootStorageStatistics']['packagesSize']).to eq(5.megabytes)
expect(graphql_data['namespace']['rootStorageStatistics']['packagesSize']).to eq(5.gigabytes)
end
end
......
spec/requests/api/graphql/project/project_statistics_spec.rb
View file @ 6caeeef5
......@@ -6,7 +6,7 @@ describe 'rendering project statistics' do
include GraphqlHelpers
let(:project) { create(:project) }
let!(:project_statistics) { create(:project_statistics, project: project, packages_size: 5.megabytes) }
let!(:project_statistics) { create(:project_statistics, project: project, packages_size: 5.gigabytes) }
let(:user) { create(:user) }
let(:query) do
......@@ -28,7 +28,7 @@ describe 'rendering project statistics' do
it "includes the packages size if the user can read the statistics" do
post_graphql(query, current_user: user)
expect(graphql_data['project']['statistics']['packagesSize']).to eq(5.megabytes)
expect(graphql_data['project']['statistics']['packagesSize']).to eq(5.gigabytes)
end
context 'when the project is public' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7