diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-23 15:07:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-23 15:07:23 +0300 |
| commit | 84b507d17bad7636a02ae2e9f59e8eb219ad7e15 (patch) | |
| tree | fb544e6ae2990ec9b7ccd21c7add91a89623f4de /db | |
| parent | 5831f05b4ce3e5af23c98a8c9495419509df6d62 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/docs/terraform_states.yml | 10 | ||||
| -rw-r--r-- | db/migrate/20240118103048_add_object_count_fields_to_bulk_import_trackers.rb | 11 | ||||
| -rw-r--r-- | db/schema_migrations/20240118103048 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 3 |
4 files changed, 24 insertions, 1 deletions
diff --git a/db/docs/terraform_states.yml b/db/docs/terraform_states.yml index eca77b164a8..e22f2dd97b1 100644 --- a/db/docs/terraform_states.yml +++ b/db/docs/terraform_states.yml @@ -7,4 +7,12 @@ feature_categories: description: Represents a Terraform state backend introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26619 milestone: '13.0' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_cell +allow_cross_joins: +- gitlab_main_clusterwide +allow_cross_transactions: +- gitlab_main_clusterwide +allow_cross_foreign_keys: +- gitlab_main_clusterwide +sharding_key: + project_id: projects diff --git a/db/migrate/20240118103048_add_object_count_fields_to_bulk_import_trackers.rb b/db/migrate/20240118103048_add_object_count_fields_to_bulk_import_trackers.rb new file mode 100644 index 00000000000..8f499f4a086 --- /dev/null +++ b/db/migrate/20240118103048_add_object_count_fields_to_bulk_import_trackers.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AddObjectCountFieldsToBulkImportTrackers < Gitlab::Database::Migration[2.2] + milestone '16.8' + + def change + add_column :bulk_import_trackers, :source_objects_count, :bigint, null: false, default: 0 + add_column :bulk_import_trackers, :fetched_objects_count, :bigint, null: false, default: 0 + add_column :bulk_import_trackers, :imported_objects_count, :bigint, null: false, default: 0 + end +end diff --git a/db/schema_migrations/20240118103048 b/db/schema_migrations/20240118103048 new file mode 100644 index 00000000000..35703b254cc --- /dev/null +++ b/db/schema_migrations/20240118103048 @@ -0,0 +1 @@ +01a7d610bdf3c5d8e5f98f2c479a7cf83b7591e791b6f8e18f836b6bf6f52833
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 803b0482055..bca40bba677 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -13953,6 +13953,9 @@ CREATE TABLE bulk_import_trackers ( created_at timestamp with time zone, updated_at timestamp with time zone, batched boolean DEFAULT false, + source_objects_count bigint DEFAULT 0 NOT NULL, + fetched_objects_count bigint DEFAULT 0 NOT NULL, + imported_objects_count bigint DEFAULT 0 NOT NULL, CONSTRAINT check_2d45cae629 CHECK ((char_length(relation) <= 255)), CONSTRAINT check_40aeaa600b CHECK ((char_length(next_page) <= 255)), CONSTRAINT check_603f91cb06 CHECK ((char_length(jid) <= 255)), |