facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity

mononoke: prepare to remove repo_id from blobstore_sync_queue, remove writes

Browse Source 
Summary: Stop inserting to the repo_id column in preparation for its removal.  Remove column from sqlite tests.

Reviewed By: HarveyHunt

Differential Revision: D16731404

fbshipit-source-id: cb7b7d796a705455bb239bbd158cf87071f7b17c
This commit is contained in:
Alex Hornby 2019-08-12 05:15:55 -07:00 committed by Facebook Github Bot
parent 533ca41d85
commit f2811838bb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
blobstore_sync_queue/schemas/sqlite-blobstore-sync-queue.sql
View File

@ -1,6 +1,5 @@
CREATE TABLE `blobstore_sync_queue` (
`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
`repo_id` INT UNSIGNED NOT NULL,
`blobstore_key` varchar NOT NULL,
`blobstore_id` INTEGER NOT NULL,
`add_timestamp` BIGINT NOT NULL

9
blobstore_sync_queue/src/lib.rs
View File

@ -13,7 +13,7 @@ use futures::sync::{mpsc, oneshot};
use futures::{future, Future, IntoFuture, Stream};
use futures_ext::{try_boxfuture, BoxFuture, FutureExt, StreamExt};
use metaconfig_types::BlobstoreId;
use mononoke_types::{DateTime, RepositoryId, Timestamp};
use mononoke_types::{DateTime, Timestamp};
use sql::{queries, Connection};
pub use sql_ext::SqlConstructors;
use stats::{define_stats, Timeseries};
@ -117,14 +117,13 @@ pub struct SqlBlobstoreSyncQueue {
queries! {
write InsertEntry(values: (
repo_id: RepositoryId,
blobstore_key: String,
blobstore_id: BlobstoreId,
timestamp: Timestamp,
)) {
insert_or_ignore,
"{insert_or_ignore}
INTO blobstore_sync_queue (repo_id, blobstore_key, blobstore_id, add_timestamp)
INTO blobstore_sync_queue (blobstore_key, blobstore_id, add_timestamp)
VALUES {values}"
}
@ -265,13 +264,13 @@ fn insert_entries(
..
} = entry;
let t: Timestamp = timestamp.into();
(RepositoryId::new(0), blobstore_key, blobstore_id, t)
(blobstore_key, blobstore_id, t)
})
.collect();
let entries_ref: Vec<_> = entries
.iter()
.map(|(a, b, c, d)| (a, b, c, d)) // &(a, b, ...) into (&a, &b, ...)
.map(|(b, c, d)| (b, c, d)) // &(a, b, ...) into (&a, &b, ...)
.collect();
InsertEntry::query(&write_connection, entries_ref.as_ref())