sliftutils 1.7.90 → 1.7.91

package/storage/remoteStorage/storeConfig.ts

@@ -52,6 +52,8 @@ export class StoreConfig {
 export type StorePolicy = {
     validWindow: [number, number];
     route?: [number, number];
+    public?: boolean;
+    immutable?: boolean;
     fast?: boolean;
     writeDelay?: number;
     noFullSync?: boolean;

package/storage/remoteStorage/storePlan.d.ts

@@ -24,23 +24,3 @@ export type BoundaryHandover = {
  * Pure: config in, plan out. Nothing here reads a store, a clock, or the network.
  */
 export declare function previousWindowOwners(config: RemoteConfig, windowStart: number, selfIndexes: number[]): BoundaryHandover[];
-/** Our role in a bucket's routing config, summarized across ALL currently-valid self entries. Stored instead of a single representative HostedConfig, so nothing can accidentally use one entry's route or flags where the union is required - the standard config has the same URL twice: a routed write-shard entry plus an unrouted read-everything entry. */
-export type SelfSummary = {
-    /** The union of the current entries' routes, with overlapping/adjacent ranges combined - which commonly collapses to a single full range, making matching trivial. */
-    routes: [number, number][];
-    public: boolean;
-    immutable: boolean;
-    noFullSync: boolean;
-    readerDiskLimit?: number;
-};
-/** One store this server runs for a bucket: the name that IS the store, and the entries that name it. What it synchronizes with is NOT decided here - the store reads its own copy of the config and works that out itself (see BlobStore.applyRoutingConfig). */
-export type SelfStore = {
-    name: string;
-    entries: HostedConfig[];
-};
-/** Which stores this server runs for a bucket, by name. Nothing more: a store is found by name, and configures itself. */
-export declare function planSelfStores(account: string, bucketName: string, routing: RemoteConfig): {
-    selfEntries: HostedConfig[];
-    self: SelfSummary | undefined;
-    stores: SelfStore[];
-};

package/storage/remoteStorage/storePlan.ts

@@ -1,9 +1,8 @@
-import { sort } from "socket-function/src/misc";
 import { RemoteConfig, HostedConfig, SourceConfig, FULL_ROUTE } from "../IArchives";
 import { parseHostedUrl, routeContains, routeIntersection } from "./remoteConfig";
 import { isOwnAddress } from "./serverConfig";
 
-// Turns a bucket's routing config into this server's store plan: which of the entries are us, what stores (one per route) we run, and which peers each store synchronizes from.
+// Pure helpers over a bucket's routing config: which entries are this server, which entry applies at a moment, and who owned what before a window boundary. Config in, answer out - nothing here reads a store, a clock, or the network (except selectEntryAt being handed a time).
 
 /** Whether a config entry is THIS server's copy of this bucket - the same account and bucket, at an address this process answers on. */
 export function isSelfSource(source: SourceConfig, account: string, bucketName: string): boolean {
@@ -133,70 +132,3 @@ export function previousWindowOwners(config: RemoteConfig, windowStart: number,
     return [...byRoute.values()].filter(x => x.scanOwnDisk || x.remotes.size);
 }
 
-/** Our role in a bucket's routing config, summarized across ALL currently-valid self entries. Stored instead of a single representative HostedConfig, so nothing can accidentally use one entry's route or flags where the union is required - the standard config has the same URL twice: a routed write-shard entry plus an unrouted read-everything entry. */
-export type SelfSummary = {
-    /** The union of the current entries' routes, with overlapping/adjacent ranges combined - which commonly collapses to a single full range, making matching trivial. */
-    routes: [number, number][];
-    public: boolean;
-    immutable: boolean;
-    noFullSync: boolean;
-    readerDiskLimit?: number;
-};
-
-function mergeRoutes(routes: ([number, number] | undefined)[]): [number, number][] {
-    let list = routes.map(x => x || FULL_ROUTE).map(x => [x[0], x[1]] as [number, number]);
-    sort(list, x => x[0]);
-    let merged: [number, number][] = [];
-    for (let route of list) {
-        let last = merged[merged.length - 1];
-        if (last && route[0] <= last[1]) {
-            last[1] = Math.max(last[1], route[1]);
-            continue;
-        }
-        merged.push(route);
-    }
-    return merged;
-}
-
-function summarizeSelf(selfEntries: HostedConfig[], now: number): SelfSummary | undefined {
-    let current = selfEntries.filter(x => x.validWindow[0] <= now && now < x.validWindow[1]);
-    if (!current.length) {
-        let nearest = selectEntryAt(selfEntries, now);
-        current = nearest && [nearest] || [];
-    }
-    if (!current.length) {
-        return undefined;
-    }
-    return {
-        routes: mergeRoutes(current.map(x => x.route)),
-        public: current.some(x => x.public),
-        immutable: current.some(x => x.immutable),
-        noFullSync: current.some(x => x.noFullSync),
-        readerDiskLimit: current.find(x => x.readerDiskLimit !== undefined)?.readerDiskLimit,
-    };
-}
-
-/** One store this server runs for a bucket: the name that IS the store, and the entries that name it. What it synchronizes with is NOT decided here - the store reads its own copy of the config and works that out itself (see BlobStore.applyRoutingConfig). */
-export type SelfStore = {
-    name: string;
-    entries: HostedConfig[];
-};
-
-/** Which stores this server runs for a bucket, by name. Nothing more: a store is found by name, and configures itself. */
-export function planSelfStores(account: string, bucketName: string, routing: RemoteConfig): { selfEntries: HostedConfig[]; self: SelfSummary | undefined; stores: SelfStore[] } {
-    let selfIndexes = findSelfIndexes(routing, account, bucketName);
-    let selfEntries = selfIndexes.map(i => routing.sources[i] as HostedConfig);
-    let self = summarizeSelf(selfEntries, Date.now());
-    // One store per NAME among ALL our entries - past and future windows included, so a name we no longer write to keeps serving its data and a name we are about to use exists ahead of its window
-    let byName = new Map<string, HostedConfig[]>();
-    for (let entry of selfEntries) {
-        let entries = byName.get(entry.name);
-        if (!entries) {
-            entries = [];
-            byName.set(entry.name, entries);
-        }
-        entries.push(entry);
-    }
-    // Not in the config at all: no name means no store here
-    return { selfEntries, self, stores: [...byName].map(([name, entries]) => ({ name, entries })) };
-}