@query-farm/vgi 0.22.0 → 0.24.0

package/dist/worker-cf-entry.js

@@ -3381,6 +3381,8 @@ var CatalogAttachResultSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("supports_column_statistics", bool2(), false),
+  field2("global_functions", list2(field2("item", binary2(), true)), false),
+  field2("global_function_prefix", utf82(), false),
   field2("resolved_data_version", utf82(), true),
   field2("resolved_implementation_version", utf82(), true)
 ]);
@@ -5398,8 +5400,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`);
     }
@@ -5411,7 +5418,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;
@@ -5444,7 +5451,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([]));
@@ -5497,7 +5504,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([]));
@@ -5542,7 +5549,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 = [];
@@ -6345,11 +6352,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`);
@@ -6362,7 +6370,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) {
@@ -6477,7 +6485,6 @@ var encodeMacroInfo = (v) => encodeASD(MacroInfoSchema, v);
 var encodeSchemaInfo = (v) => encodeASD(SchemaInfoSchema, v);
 var encodeTableInfo = (v) => encodeASD(TableInfoSchema, v);
 var encodeViewInfo = (v) => encodeASD(ViewInfoSchema, v);
-
 // src/catalog/interface.ts
 var encodeCopyFromFormatInfo = (v) => encodeASD(CopyFromFormatInfoSchema, {
   comment: v.comment ?? null,
@@ -6683,6 +6690,8 @@ function registerCatalogAdminMethods(protocol, getCatalog, signingKey) {
         comment: result.comment ?? null,
         tags: result.tags ?? {},
         supports_column_statistics: result.supports_column_statistics ?? true,
+        global_functions: result.global_functions ?? [],
+        global_function_prefix: result.global_function_prefix ?? "",
         resolved_data_version: result.resolved_data_version ?? null,
         resolved_implementation_version: result.resolved_implementation_version ?? null
       }, CatalogAttachResultSchema);
@@ -8167,6 +8176,8 @@ class ReadOnlyCatalogInterface extends CatalogInterface {
       comment: this._descriptor.comment ?? null,
       tags: this._descriptor.tags ?? {},
       supports_column_statistics: true,
+      global_functions: this._globalFunctionInfos().map(encodeFunctionInfo),
+      global_function_prefix: this._descriptor.globalFunctionPrefix ?? "",
       resolved_data_version: null,
       resolved_implementation_version: null
     };
@@ -8353,56 +8364,76 @@ class ReadOnlyCatalogInterface extends CatalogInterface {
       if (t === "AGGREGATE_FUNCTION")
         return f.kind === "aggregate";
       return true;
-    }).map((f) => {
-      const meta = resolveMetadata(f);
-      const argSchema = argumentSpecsToSchema(f.argumentSpecs);
-      const argBytes = serializeSchema(argSchema);
-      const outputSchemaBytes = serializeSchema(f.defaultOutputSchema ?? schema2([]));
-      const requiredSecrets = (meta.requiredSecrets ?? []).map((secretType) => ({ secret_type: secretType, scope: null, secret_name: null }));
-      const derivedTags = {};
-      const tags = { ...derivedTags, ...meta.tags ?? {} };
-      return {
-        comment: null,
-        tags,
-        name: f.meta.name,
-        schema_name: name,
-        function_type: meta.functionType.toUpperCase(),
-        arguments: argBytes,
-        output_schema: outputSchemaBytes,
-        stability: meta.stability,
-        null_handling: meta.nullHandling,
-        description: meta.description,
-        examples: meta.examples.map((e) => ({
-          sql: e.sql,
-          description: e.description,
-          expected_output: null
-        })),
-        categories: meta.categories,
-        projection_pushdown: meta.projectionPushdown,
-        filter_pushdown: meta.filterPushdown,
-        sampling_pushdown: meta.samplingPushdown,
-        late_materialization: f.kind === "table" && f.meta.lateMaterialization === true ? true : null,
-        supported_expression_filters: meta.supportedExpressionFilters,
-        order_preservation: meta.preservesOrder,
-        max_workers: meta.maxWorkers ?? DEFAULT_MAX_WORKERS,
-        supports_batch_index: f.kind === "table_buffering" && f.meta.requiresInputBatchIndex === true || f.kind === "table" && f.meta.supportsBatchIndex === true,
-        partition_kind: f.kind === "table" && f.meta.partitionKind ? f.meta.partitionKind : "NOT_PARTITIONED",
-        order_dependent: meta.orderDependent,
-        distinct_dependent: meta.distinctDependent,
-        supports_window: false,
-        streaming_partitioned: false,
-        has_finalize: f.kind === "table_in_out" && f.meta.hasFinalize === true || f.kind === "table_buffering",
-        source_order_dependent: f.kind === "table_buffering" && f.meta.sourceOrderDependent === true,
-        sink_order_dependent: f.kind === "table_buffering" && f.meta.sinkOrderDependent === true,
-        requires_input_batch_index: f.kind === "table_buffering" && f.meta.requiresInputBatchIndex === true,
-        input_from_args: f.kind === "table_in_out" && f.meta.inputFromArgs === true,
-        required_settings: meta.requiredSettings,
-        required_secrets: requiredSecrets.map((s) => ({
-          secret_type: s.secret_type,
-          scope: s.scope,
-          secret_name: s.secret_name
-        }))
-      };
+    }).map((f) => this._functionToInfo(f, name));
+  }
+  _functionToInfo(f, name) {
+    const meta = resolveMetadata(f);
+    const argSchema = argumentSpecsToSchema(f.argumentSpecs);
+    const argBytes = serializeSchema(argSchema);
+    const outputSchemaBytes = serializeSchema(f.defaultOutputSchema ?? schema2([]));
+    const requiredSecrets = (meta.requiredSecrets ?? []).map((secretType) => ({ secret_type: secretType, scope: null, secret_name: null }));
+    const derivedTags = {};
+    const tags = { ...derivedTags, ...meta.tags ?? {} };
+    return {
+      comment: null,
+      tags,
+      name: f.meta.name,
+      schema_name: name,
+      function_type: meta.functionType.toUpperCase(),
+      arguments: argBytes,
+      output_schema: outputSchemaBytes,
+      stability: meta.stability,
+      null_handling: meta.nullHandling,
+      description: meta.description,
+      examples: meta.examples.map((e) => ({
+        sql: e.sql,
+        description: e.description,
+        expected_output: null
+      })),
+      categories: meta.categories,
+      projection_pushdown: meta.projectionPushdown,
+      filter_pushdown: meta.filterPushdown,
+      sampling_pushdown: meta.samplingPushdown,
+      late_materialization: f.kind === "table" && f.meta.lateMaterialization === true ? true : null,
+      supported_expression_filters: meta.supportedExpressionFilters,
+      order_preservation: meta.preservesOrder,
+      max_workers: meta.maxWorkers ?? DEFAULT_MAX_WORKERS,
+      supports_batch_index: f.kind === "table_buffering" && f.meta.requiresInputBatchIndex === true || f.kind === "table" && f.meta.supportsBatchIndex === true,
+      partition_kind: f.kind === "table" && f.meta.partitionKind ? f.meta.partitionKind : "NOT_PARTITIONED",
+      order_dependent: meta.orderDependent,
+      distinct_dependent: meta.distinctDependent,
+      supports_window: false,
+      streaming_partitioned: false,
+      has_finalize: f.kind === "table_in_out" && f.meta.hasFinalize === true || f.kind === "table_buffering",
+      source_order_dependent: f.kind === "table_buffering" && f.meta.sourceOrderDependent === true,
+      sink_order_dependent: f.kind === "table_buffering" && f.meta.sinkOrderDependent === true,
+      requires_input_batch_index: f.kind === "table_buffering" && f.meta.requiresInputBatchIndex === true,
+      input_from_args: f.kind === "table_in_out" && f.meta.inputFromArgs === true,
+      required_settings: meta.requiredSettings,
+      required_secrets: requiredSecrets.map((s) => ({
+        secret_type: s.secret_type,
+        scope: s.scope,
+        secret_name: s.secret_name
+      }))
+    };
+  }
+  _globalFunctionInfos() {
+    const globals = this._descriptor.globalFunctions ?? [];
+    if (globals.length === 0)
+      return [];
+    const schemaOf = new Map;
+    for (const sch of this._descriptor.schemas) {
+      for (const fn of sch.functions ?? []) {
+        if (!schemaOf.has(fn))
+          schemaOf.set(fn, sch.name);
+      }
+    }
+    return globals.map((fn) => {
+      const schemaName = schemaOf.get(fn);
+      if (schemaName === undefined) {
+        throw new Error(`Catalog '${this._descriptor.name}': '${fn.meta.name}' is listed in ` + `globalFunctions but is not declared in any schema.`);
+      }
+      return this._functionToInfo(fn, schemaName);
     });
   }
   schemaContentsMacros(attachOpaqueData, name, type, transactionOpaqueData) {
@@ -9681,4 +9712,4 @@ export {
   Arguments
 };
 
-//# debugId=0DAB6D0BDC711A3364756E2164756E21
+//# debugId=27B541E45B6B151B64756E2164756E21