@query-farm/vgi 0.21.0 → 0.23.0

package/dist/worker-cf-entry.js

@@ -2935,7 +2935,8 @@ var BIND_REQUEST_SCHEMA = schema2([
   field2("transaction_opaque_data", binary2(), true),
   field2("resolved_secrets_provided", bool2(), false),
   field2("at_unit", utf82(), true),
-  field2("at_value", utf82(), true)
+  field2("at_value", utf82(), true),
+  field2("schema_name", utf82(), true)
 ]);
 var COPY_FROM_STRUCT_TYPE = struct2([
   field2("format", utf82(), false),
@@ -3003,6 +3004,7 @@ function deserializeBindRequest(params) {
     resolved_secrets_provided: params.resolved_secrets_provided ?? false,
     at_unit: params.at_unit ? String(params.at_unit) : null,
     at_value: params.at_value ? String(params.at_value) : null,
+    schema_name: params.schema_name ? String(params.schema_name) : null,
     copy_from: parseCopyFromContext(params.copy_from),
     copy_to: parseCopyToContext(params.copy_to)
   };
@@ -3833,11 +3835,21 @@ function wrapResult(values, innerSchema) {
   const batch = batchFromColumns(Object.fromEntries(a.fields.map((f) => [f.name, [values[f.name] ?? null]])), a);
   return { result: serializeBatch(batch) };
 }
-function overloadContext(req) {
+function overloadContext(req, catalogInterface) {
+  let catalogName = null;
+  if (catalogInterface && req.attach_opaque_data) {
+    try {
+      catalogName = catalogInterface.catalogNameForAttach(req.attach_opaque_data);
+    } catch {
+      catalogName = null;
+    }
+  }
   return {
     arguments: req.arguments,
     inputSchema: req.input_schema,
-    isScalar: String(req.function_type).toLowerCase() === "scalar"
+    isScalar: String(req.function_type).toLowerCase() === "scalar",
+    schemaName: req.schema_name ?? null,
+    catalogName
   };
 }
 function recoverFinalizeState(request, recoverExchangeState) {
@@ -4852,7 +4864,7 @@ var columnOpParams = schema2([
 
 // src/protocol/handlers/function.ts
 function registerFunctionMethods(protocol, config) {
-  const { registry, signingKey } = config;
+  const { registry, signingKey, catalogInterface } = config;
   async function stripAttach(attach, ctx) {
     if (attach == null)
       return null;
@@ -4861,6 +4873,15 @@ function registerFunctionMethods(protocol, config) {
       return env;
     return openAttach(env, ctx?.auth, signingKey);
   }
+  async function strippedContext(bindCall, ctx) {
+    let attach = null;
+    try {
+      attach = await stripAttach(bindCall.attach_opaque_data, ctx);
+    } catch {
+      attach = null;
+    }
+    return overloadContext({ ...bindCall, attach_opaque_data: attach }, catalogInterface);
+  }
   const initHeaderSchema = schema2([
     field2("execution_id", binary2(), false),
     field2("opaque_data", binary2(), true),
@@ -4877,7 +4898,7 @@ function registerFunctionMethods(protocol, config) {
       const innerParams = unwrapRequest(params.request);
       const request = deserializeBindRequest(innerParams);
       request.attach_opaque_data = await stripAttach(request.attach_opaque_data, ctx);
-      const func = registry.get(request.function_name, overloadContext(request));
+      const func = registry.get(request.function_name, overloadContext(request, catalogInterface));
       const response = await func.bind(request);
       const serialized = serializeBindResponse(response);
       return wrapResult(serialized, BindResultSchema);
@@ -4892,7 +4913,7 @@ function registerFunctionMethods(protocol, config) {
       const innerParams = unwrapRequest(params.request);
       const request = deserializeInitRequest(innerParams);
       request.bind_call.attach_opaque_data = await stripAttach(request.bind_call.attach_opaque_data, undefined);
-      const func = registry.get(request.bind_call.function_name, overloadContext(request.bind_call));
+      const func = registry.get(request.bind_call.function_name, overloadContext(request.bind_call, catalogInterface));
       const initResponse = await func.globalInit(request);
       const accumulatedState = recoverFinalizeState(request, config.recoverExchangeState);
       const handlers = func.createStreamHandlers(request, initResponse, accumulatedState);
@@ -4932,7 +4953,7 @@ function registerFunctionMethods(protocol, config) {
         const initRequestBatch = deserializeBatch(state.initRequestIpc);
         const initRequestDict = batchToScalarDict(initRequestBatch);
         const request = deserializeInitRequest(initRequestDict);
-        const func = registry.get(state.functionName, overloadContext(request.bind_call));
+        const func = registry.get(state.functionName, await strippedContext(request.bind_call));
         const executionId = state.executionId;
         const opaqueData = state.opaqueData ?? null;
         const initResponse = {
@@ -4980,7 +5001,7 @@ function registerFunctionMethods(protocol, config) {
     handler: async (params) => {
       const innerParams = unwrapRequest(params.request);
       const request = deserializeCardinalityRequest(innerParams);
-      const func = registry.get(request.bind_call.function_name, overloadContext(request.bind_call));
+      const func = registry.get(request.bind_call.function_name, await strippedContext(request.bind_call));
       let cardResult;
       if (func.cardinality) {
         cardResult = serializeTableCardinality(await func.cardinality(request));
@@ -4993,10 +5014,10 @@ function registerFunctionMethods(protocol, config) {
   protocol.unary("table_function_statistics", {
     params: REQUEST_PARAMS_SCHEMA,
     result: RESULT_BINARY_NULLABLE_SCHEMA,
-    handler: (params) => {
+    handler: async (params) => {
       const innerParams = unwrapRequest(params.request);
       const request = deserializeCardinalityRequest(innerParams);
-      const func = registry.get(request.bind_call.function_name, overloadContext(request.bind_call));
+      const func = registry.get(request.bind_call.function_name, await strippedContext(request.bind_call));
       if (!func.statistics)
         return { result: null };
       const stats = func.statistics(request);
@@ -5016,7 +5037,7 @@ function registerFunctionMethods(protocol, config) {
       const bindCall = deserializeBindRequest(bindParams);
       const globalExecutionId = toUint8Array(innerParams.global_execution_id);
       const bindOpaqueData = innerParams.bind_opaque_data ? toUint8Array(innerParams.bind_opaque_data) : null;
-      const func = registry.get(bindCall.function_name, overloadContext(bindCall));
+      const func = registry.get(bindCall.function_name, await strippedContext(bindCall));
       const map3 = func.dynamicToString ? await func.dynamicToString({ bindCall, bindOpaqueData, globalExecutionId }) : {};
       const keys = Object.keys(map3);
       const values = keys.map((k) => map3[k] ?? "");
@@ -5377,8 +5398,13 @@ function defineAggregate(config) {
 
 // src/protocol/handlers/aggregate.ts
 function registerAggregateMethods(protocol, registry) {
-  function resolveAggregate(name) {
-    const func = registry.get(name, { arguments: new Arguments, inputSchema: null, isScalar: false });
+  function resolveAggregate(name, schemaName) {
+    const func = registry.get(name, {
+      arguments: new Arguments,
+      inputSchema: null,
+      isScalar: false,
+      schemaName: schemaName ?? null
+    });
     if (!func || func.kind !== "aggregate") {
       throw new Error(`Function '${name}' is not an aggregate function`);
     }
@@ -5390,7 +5416,7 @@ function registerAggregateMethods(protocol, registry) {
     handler: async (params) => {
       const innerParams = unwrapRequest(params.request);
       const functionName = innerParams.function_name;
-      const cfg = resolveAggregate(functionName);
+      const cfg = resolveAggregate(functionName, innerParams.schema_name ?? null);
       const argBytes = toUint8Array(innerParams.arguments);
       const args = deserializeArguments(argBytes);
       const inputSchema = innerParams.input_schema ? deserializeSchema(toUint8Array(innerParams.input_schema)) : null;
@@ -5423,7 +5449,7 @@ function registerAggregateMethods(protocol, registry) {
       const innerParams = unwrapRequest(params.request);
       const functionName = innerParams.function_name;
       const executionId = toUint8Array(innerParams.execution_id);
-      const cfg = resolveAggregate(functionName);
+      const cfg = resolveAggregate(functionName, innerParams.schema_name ?? null);
       const batch = readSingleBatch(toUint8Array(innerParams.input_batch));
       if (!batch || batch.numRows === 0)
         return wrapResult({}, schema2([]));
@@ -5476,7 +5502,7 @@ function registerAggregateMethods(protocol, registry) {
       const innerParams = unwrapRequest(params.request);
       const functionName = innerParams.function_name;
       const executionId = toUint8Array(innerParams.execution_id);
-      const cfg = resolveAggregate(functionName);
+      const cfg = resolveAggregate(functionName, innerParams.schema_name ?? null);
       const batch = readSingleBatch(toUint8Array(innerParams.merge_batch));
       if (!batch || batch.numRows === 0)
         return wrapResult({}, schema2([]));
@@ -5521,7 +5547,7 @@ function registerAggregateMethods(protocol, registry) {
       const innerParams = unwrapRequest(params.request);
       const functionName = innerParams.function_name;
       const executionId = toUint8Array(innerParams.execution_id);
-      const cfg = resolveAggregate(functionName);
+      const cfg = resolveAggregate(functionName, innerParams.schema_name ?? null);
       const outputSchema = deserializeSchema(toUint8Array(innerParams.output_schema));
       const gidBatch = readSingleBatch(toUint8Array(innerParams.group_ids_batch));
       const groupIds = [];
@@ -6324,11 +6350,12 @@ function splitLenPrefixed(buf, count) {
 
 // src/protocol/handlers/table-buffering.ts
 function registerTableBufferingMethods(protocol, registry, signingKey) {
-  function resolveBuffering(name) {
+  function resolveBuffering(name, schemaName) {
     const func = registry.get(name, {
       arguments: new Arguments,
       inputSchema: null,
-      isScalar: false
+      isScalar: false,
+      schemaName: schemaName ?? null
     });
     if (!func || func.kind !== "table_buffering") {
       throw new Error(`Function '${name}' is not a table_buffering function`);
@@ -6341,7 +6368,7 @@ function registerTableBufferingMethods(protocol, registry, signingKey) {
     const rawAttach = inner.attach_opaque_data ? toUint8Array(inner.attach_opaque_data) : null;
     const attach = rawAttach && rawAttach.length > 0 ? await openAttach(rawAttach, ctx?.auth, signingKey) : rawAttach;
     const transactionId = inner.transaction_id ? toUint8Array(inner.transaction_id) : null;
-    const func = resolveBuffering(functionName);
+    const func = resolveBuffering(functionName, inner.schema_name ?? null);
     const bound = new BoundStorage(storage, executionId);
     const payload = await bound.stateGet(FrameworkNS.BUFFERING_INIT, BoundStorage.packIntKey(-1));
     if (payload == null) {
@@ -6497,6 +6524,10 @@ function isPromise(v) {
 }
 
 class CatalogInterface {
+  catalogNameForAttach(_attachOpaqueData) {
+    const names = this.catalogs();
+    return names.length === 1 ? names[0] : null;
+  }
   create(name, onConflict, options) {
     throw new CatalogReadOnlyError("create");
   }
@@ -7231,7 +7262,8 @@ function buildVgiProtocol(config) {
   registerFunctionMethods(protocol, {
     registry: config.registry,
     recoverExchangeState: config.recoverExchangeState,
-    signingKey: config.signingKey
+    signingKey: config.signingKey,
+    catalogInterface: config.catalogInterface
   });
   registerAggregateMethods(protocol, config.registry);
   registerTableBufferingMethods(protocol, config.registry, config.signingKey);
@@ -7280,6 +7312,7 @@ var CACHE_STALE_WHILE_REVALIDATE_KEY = "vgi.cache.stale_while_revalidate";
 var CACHE_STALE_IF_ERROR_KEY = "vgi.cache.stale_if_error";
 var CACHE_NOT_MODIFIED_KEY = "vgi.cache.not_modified";
 var CACHE_PARTITION_SCOPE_KEY = "vgi.cache.partition_scope";
+var CACHE_PER_VALUE_KEY = "vgi.cache.per_value";
 var CACHE_IF_NONE_MATCH_KEY = "vgi.cache.if_none_match";
 var CACHE_IF_MODIFIED_SINCE_KEY = "vgi.cache.if_modified_since";
 var CACHE_SCOPE_CATALOG = "catalog";
@@ -7318,6 +7351,8 @@ function cacheControlMetadata(cc, extra) {
     md.set(CACHE_NOT_MODIFIED_KEY, "1");
   if (cc.partitionScope)
     md.set(CACHE_PARTITION_SCOPE_KEY, "1");
+  if (cc.perValue)
+    md.set(CACHE_PER_VALUE_KEY, "1");
   return md;
 }
 
@@ -8088,6 +8123,17 @@ class ReadOnlyCatalogInterface extends CatalogInterface {
     super();
     this._descriptor = descriptor;
     this._registry = registry;
+    for (const sch of descriptor.schemas ?? []) {
+      for (const fn of sch.functions ?? [])
+        registry.registerInSchema(fn, sch.name, descriptor.name);
+      for (const tbl of sch.tables ?? []) {
+        for (const key of ["function", "insertFunction", "updateFunction", "deleteFunction"]) {
+          const fn = tbl[key];
+          if (fn)
+            registry.registerInSchema(fn, sch.name, descriptor.name);
+        }
+      }
+    }
   }
   catalogs() {
     return [this._descriptor.name];
@@ -8710,6 +8756,13 @@ class CompositeCatalogInterface extends CatalogInterface {
     }
     return route;
   }
+  catalogNameForAttach(attachOpaqueData) {
+    try {
+      return this._route(attachOpaqueData).catalogNameForAttach(attachOpaqueData);
+    } catch {
+      return null;
+    }
+  }
   catalogs() {
     const all = [];
     for (const b of this._backends)
@@ -8938,9 +8991,17 @@ function filterByArgumentTypes(candidates, args, inputSchema, isScalar) {
   const maxScore = Math.max(...scored.map((s) => s.score));
   return scored.filter((s) => s.score === maxScore).map((s) => s.func);
 }
+function schemaKey(schemaName, functionName) {
+  return `${schemaName.toLowerCase()}\x00${functionName}`;
+}
+function catalogKey(catalogName, schemaName, functionName) {
+  return `${catalogName.toLowerCase()}\x00${schemaKey(schemaName, functionName)}`;
+}
 
 class FunctionRegistry {
   _functions = new Map;
+  _bySchema = new Map;
+  _byCatalog = new Map;
   register(func) {
     const name = func.meta.name;
     if (!this._functions.has(name)) {
@@ -8948,11 +9009,57 @@ class FunctionRegistry {
     }
     this._functions.get(name).push(func);
   }
+  registerInSchema(func, schemaName, catalogName) {
+    const add = (map3, key) => {
+      const bucket = map3.get(key);
+      if (!bucket) {
+        map3.set(key, [func]);
+        return;
+      }
+      if (!bucket.includes(func))
+        bucket.push(func);
+    };
+    add(this._bySchema, schemaKey(schemaName, func.meta.name));
+    if (catalogName) {
+      add(this._byCatalog, catalogKey(catalogName, schemaName, func.meta.name));
+    }
+  }
+  schemasFor(functionName) {
+    const out = [];
+    for (const key of this._bySchema.keys()) {
+      const [schema3, name] = key.split("\x00");
+      if (name === functionName)
+        out.push(schema3);
+    }
+    return out.sort();
+  }
   get(name, context) {
-    const candidates = this._functions.get(name);
+    let candidates = this._functions.get(name);
+    const catalogName = context?.catalogName;
+    const schemaName = context?.schemaName;
+    if (catalogName && schemaName) {
+      const scoped = this._byCatalog.get(catalogKey(catalogName, schemaName, name));
+      if (scoped && scoped.length > 0) {
+        return this._disambiguate(name, scoped, context);
+      }
+    }
+    if (schemaName) {
+      const scoped = this._bySchema.get(schemaKey(schemaName, name));
+      if (scoped && scoped.length > 0) {
+        candidates = scoped;
+      } else if (candidates && candidates.length > 0) {
+        const schemas = this.schemasFor(name);
+        if (schemas.length > 0) {
+          throw new Error(`Function '${name}' is not registered in schema '${schemaName}'. ` + `It is available in: [${schemas.join(", ")}]`);
+        }
+      }
+    }
     if (!candidates || candidates.length === 0) {
       throw new FunctionNotFoundError(name, this.names());
     }
+    return this._disambiguate(name, candidates, context);
+  }
+  _disambiguate(name, candidates, context) {
     if (candidates.length === 1) {
       return candidates[0];
     }
@@ -9580,4 +9687,4 @@ export {
   Arguments
 };
 
-//# debugId=702D54392090E98D64756E2164756E21
+//# debugId=938A6404CE5CDC7964756E2164756E21