@query-farm/vgi 0.28.0 → 0.29.1

package/src/protocol/handlers/catalog/table.ts

@@ -6,9 +6,25 @@ import { type VgiSchema, schema, type VgiField, field, type VgiDataType, binary,
 import { Protocol } from "@query-farm/vgi-rpc";
 import { encodeTableInfo } from "../../../generated/vgi-client.js";
 import {
+  CatalogTableColumnAddParamsSchema,
+  CatalogTableColumnDefaultDropParamsSchema,
+  CatalogTableColumnDefaultSetParamsSchema,
+  CatalogTableColumnDropParamsSchema,
+  CatalogTableColumnRenameParamsSchema,
+  CatalogTableColumnStatisticsGetParamsSchema,
+  CatalogTableColumnTypeChangeParamsSchema,
+  CatalogTableCommentSetParamsSchema,
+  CatalogTableCreateParamsSchema,
+  CatalogTableDropParamsSchema,
+  CatalogTableGetParamsSchema,
   CatalogTableGetResultSchema,
-  ScanFunctionResultSchema,
+  CatalogTableNotNullDropParamsSchema,
+  CatalogTableNotNullSetParamsSchema,
+  CatalogTableRenameParamsSchema,
+  CatalogTableScanBranchesGetParamsSchema,
+  CatalogTableScanFunctionGetParamsSchema,
   ScanBranchesResultSchema,
+  ScanFunctionResultSchema,
 } from "../../../generated/vgi-protocol-schemas.js";
 import { toUint8Array } from "../../../util/bytes.js";
 import {
@@ -19,30 +35,19 @@ import {
 import {
   type GetCatalog,
   emptyResultSchema,
-  schemaNameIgnoreNotFoundTxnParams,
-  schemaNameCommentParams,
-  schemaNameRenameParams,
-  columnOpParams,
   catalogUnary,
 } from "./shared.js";
 
 export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetCatalog, signingKey?: Uint8Array): void {
   // catalog_table_get
   catalogUnary(protocol, signingKey, "catalog_table_get", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("at_unit", utf8(), true),
-      field("at_value", utf8(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableGetParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
       const info = await cat.tableGet(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.at_unit,
         params.at_value,
@@ -56,23 +61,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_create
   catalogUnary(protocol, signingKey, "catalog_table_create", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("columns", binary(), false),
-      field("on_conflict", utf8(), false),
-      field("not_null_constraints", list(field("item", int32(), false)), true),
-      field("unique_constraints", list(field("item", list(field("item", int32(), false)), false)), true),
-      field("check_constraints", list(field("item", utf8(), false)), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableCreateParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableCreate(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         toUint8Array(params.columns),
         params.on_conflict,
@@ -87,19 +82,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_drop
   catalogUnary(protocol, signingKey, "catalog_table_drop", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("ignore_not_found", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableDrop(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.ignore_not_found,
         params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined
@@ -110,18 +99,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_statistics_get
   catalogUnary(protocol, signingKey, "catalog_table_column_statistics_get", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableColumnStatisticsGetParamsSchema,
     result: RESULT_BINARY_NULLABLE_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
       const stats = await cat.tableColumnStatisticsGet(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined,
       );
@@ -131,20 +115,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_scan_function_get
   catalogUnary(protocol, signingKey, "catalog_table_scan_function_get", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("at_unit", utf8(), true),
-      field("at_value", utf8(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableScanFunctionGetParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
       const scanResult = await cat.tableScanFunctionGet(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.at_unit,
         params.at_value,
@@ -158,20 +135,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
   // scan_function_get. The branches-aware C++ extension calls this for every
   // table scan; single-source catalogs synthesise a one-branch result.
   catalogUnary(protocol, signingKey, "catalog_table_scan_branches_get", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("at_unit", utf8(), true),
-      field("at_value", utf8(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableScanBranchesGetParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
       const branchesResult = await cat.tableScanBranchesGet(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.at_unit,
         params.at_value,
@@ -183,13 +153,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_comment_set
   catalogUnary(protocol, signingKey, "catalog_table_comment_set", {
-    params: schemaNameCommentParams,
+    params: CatalogTableCommentSetParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableCommentSet(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.comment,
         params.ignore_not_found,
@@ -201,13 +171,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_rename
   catalogUnary(protocol, signingKey, "catalog_table_rename", {
-    params: schemaNameRenameParams,
+    params: CatalogTableRenameParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableRename(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.new_name,
         params.ignore_not_found,
@@ -219,22 +189,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_add
   catalogUnary(protocol, signingKey, "catalog_table_column_add", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("column_name", utf8(), false),
-      field("column_type", utf8(), false),
-      field("default_value", utf8(), true),
-      field("ignore_not_found", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableColumnAddParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableColumnAdd(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.column_name,
         params.column_type,
@@ -248,13 +209,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_drop
   catalogUnary(protocol, signingKey, "catalog_table_column_drop", {
-    params: columnOpParams,
+    params: CatalogTableColumnDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableColumnDrop(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.column_name,
         params.ignore_not_found,
@@ -266,21 +227,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_rename
   catalogUnary(protocol, signingKey, "catalog_table_column_rename", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("column_name", utf8(), false),
-      field("new_name", utf8(), false),
-      field("ignore_not_found", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableColumnRenameParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableColumnRename(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.column_name,
         params.new_name,
@@ -293,21 +246,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_default_set
   catalogUnary(protocol, signingKey, "catalog_table_column_default_set", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("column_name", utf8(), false),
-      field("default_value", utf8(), false),
-      field("ignore_not_found", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableColumnDefaultSetParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableColumnDefaultSet(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.column_name,
         params.default_value,
@@ -320,13 +265,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_default_drop
   catalogUnary(protocol, signingKey, "catalog_table_column_default_drop", {
-    params: columnOpParams,
+    params: CatalogTableColumnDefaultDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableColumnDefaultDrop(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.column_name,
         params.ignore_not_found,
@@ -338,21 +283,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_type_change
   catalogUnary(protocol, signingKey, "catalog_table_column_type_change", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("column_name", utf8(), false),
-      field("new_type", utf8(), false),
-      field("ignore_not_found", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableColumnTypeChangeParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableColumnTypeChange(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.column_name,
         params.new_type,
@@ -365,13 +302,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_not_null_set
   catalogUnary(protocol, signingKey, "catalog_table_not_null_set", {
-    params: columnOpParams,
+    params: CatalogTableNotNullSetParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableNotNullSet(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.column_name,
         params.ignore_not_found,
@@ -383,13 +320,13 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_not_null_drop
   catalogUnary(protocol, signingKey, "catalog_table_not_null_drop", {
-    params: columnOpParams,
+    params: CatalogTableNotNullDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.tableNotNullDrop(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.column_name,
         params.ignore_not_found,

package/src/protocol/handlers/catalog/view.ts

@@ -4,7 +4,14 @@
 import { type VgiSchema, schema, type VgiField, field, type VgiDataType, binary, utf8 } from "../../../arrow/index.js";
 import { Protocol } from "@query-farm/vgi-rpc";
 import { encodeViewInfo } from "../../../generated/vgi-client.js";
-import { CatalogViewGetResultSchema } from "../../../generated/vgi-protocol-schemas.js";
+import {
+  CatalogViewCommentSetParamsSchema,
+  CatalogViewCreateParamsSchema,
+  CatalogViewDropParamsSchema,
+  CatalogViewGetParamsSchema,
+  CatalogViewGetResultSchema,
+  CatalogViewRenameParamsSchema,
+} from "../../../generated/vgi-protocol-schemas.js";
 import { toUint8Array } from "../../../util/bytes.js";
 import {
   RESULT_BINARY_SCHEMA,
@@ -13,23 +20,19 @@ import {
 import {
   type GetCatalog,
   emptyResultSchema,
-  attachOpaqueDataSchemaNameTxnParams,
-  schemaNameIgnoreNotFoundTxnParams,
-  schemaNameRenameParams,
-  schemaNameCommentParams,
   catalogUnary,
 } from "./shared.js";
 
 export function registerCatalogViewMethods(protocol: Protocol, getCatalog: GetCatalog, signingKey?: Uint8Array): void {
   // catalog_view_get
   catalogUnary(protocol, signingKey, "catalog_view_get", {
-    params: attachOpaqueDataSchemaNameTxnParams,
+    params: CatalogViewGetParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
       const info = await cat.viewGet(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined
       );
@@ -41,20 +44,13 @@ export function registerCatalogViewMethods(protocol: Protocol, getCatalog: GetCa
 
   // catalog_view_create
   catalogUnary(protocol, signingKey, "catalog_view_create", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("definition", utf8(), false),
-      field("on_conflict", utf8(), false),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogViewCreateParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.viewCreate(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.definition,
         params.on_conflict,
@@ -66,13 +62,13 @@ export function registerCatalogViewMethods(protocol: Protocol, getCatalog: GetCa
 
   // catalog_view_drop
   catalogUnary(protocol, signingKey, "catalog_view_drop", {
-    params: schemaNameIgnoreNotFoundTxnParams,
+    params: CatalogViewDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.viewDrop(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.ignore_not_found,
         params.transaction_opaque_data ? toUint8Array(params.transaction_opaque_data) : undefined
@@ -83,13 +79,13 @@ export function registerCatalogViewMethods(protocol: Protocol, getCatalog: GetCa
 
   // catalog_view_rename
   catalogUnary(protocol, signingKey, "catalog_view_rename", {
-    params: schemaNameRenameParams,
+    params: CatalogViewRenameParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.viewRename(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.new_name,
         params.ignore_not_found,
@@ -101,13 +97,13 @@ export function registerCatalogViewMethods(protocol: Protocol, getCatalog: GetCa
 
   // catalog_view_comment_set
   catalogUnary(protocol, signingKey, "catalog_view_comment_set", {
-    params: schemaNameCommentParams,
+    params: CatalogViewCommentSetParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
       await cat.viewCommentSet(
         toUint8Array(params.attach_opaque_data),
-        params.schema_name,
+        params.schema_path,
         params.name,
         params.comment,
         params.ignore_not_found,