@lancedb/lancedb 0.32.0-beta.2 → 0.32.0-beta.3

package/dist/index.d.ts

@@ -9,9 +9,9 @@ export { AddColumnsSql, ConnectionOptions, ConnectNamespaceOptions, IndexStatist
 export { makeArrowTable, MakeArrowTableOptions, Data, VectorColumnOptions, } from "./arrow";
 export { Connection, CreateTableOptions, TableNamesOptions, OpenTableOptions, ListNamespacesOptions, CreateNamespaceOptions, DropNamespaceOptions, ListNamespacesResponse, CreateNamespaceResponse, DropNamespaceResponse, DescribeNamespaceResponse, RenameTableOptions, } from "./connection";
 export { Session } from "./native.js";
-export { ExecutableQuery, Query, QueryBase, VectorQuery, TakeQuery, QueryExecutionOptions, ColumnOrdering, FullTextSearchOptions, RecordBatchIterator, FullTextQuery, MatchQuery, PhraseQuery, BoostQuery, MultiMatchQuery, BooleanQuery, FullTextQueryType, Operator, Occur, } from "./query";
+export { ExecutableQuery, Query, QueryBase, VectorQuery, TakeQuery, AnalyzePlanDistributedMetrics, QueryExecutionOptions, ColumnOrdering, FullTextSearchOptions, RecordBatchIterator, FullTextQuery, MatchQuery, PhraseQuery, BoostQuery, MultiMatchQuery, BooleanQuery, FullTextQueryType, Operator, Occur, } from "./query";
 export { Index, IndexOptions, IvfPqOptions, IvfRqOptions, IvfFlatOptions, HnswPqOptions, HnswSqOptions, FtsOptions, BaseTokenizer, } from "./indices";
-export { Table, Branches, AddDataOptions, UpdateOptions, OptimizeOptions, Version, WriteProgress, FtsToken, TokenizeTableOptions, LsmWriteSpec, ColumnAlteration, FieldMetadataUpdate, } from "./table";
+export { Table, Branches, BranchColumnSummary, BranchColumnChange, BranchIndexSummary, BranchRowCountSummary, MergeBlocker, BranchDiff, MergePreview, MergeBranchResult, AddDataOptions, UpdateOptions, OptimizeOptions, Version, WriteProgress, FtsToken, TokenizeTableOptions, LsmWriteSpec, ColumnAlteration, FieldMetadataUpdate, } from "./table";
 export { HeaderProvider, StaticHeaderProvider, OAuthHeaderProvider, TokenResponse, } from "./header";
 export { OAuthConfig, OAuthFlowType } from "./oauth";
 export { MergeInsertBuilder, WriteExecutionOptions } from "./merge";

package/dist/indices.d.ts

@@ -520,6 +520,13 @@ export interface FtsOptions {
      * whether to only index the prefix of the token for ngram tokenizer
      */
     prefixOnly?: boolean;
+    /**
+     * Number of documents per compressed posting block.
+     *
+     * The default is 128. Supported values are 128 and 256. A value of 256 uses
+     * the experimental FTS V3 format and may introduce breaking changes.
+     */
+    blockSize?: 128 | 256;
 }
 export declare class Index {
     private readonly inner;

package/dist/indices.js

@@ -136,7 +136,7 @@ class Index {
      * You can combine filters with full text search.
      */
     static fts(options) {
-        return new Index(native_1.Index.fts(options?.withPosition, options?.baseTokenizer, options?.language, options?.maxTokenLength, options?.lowercase, options?.stem, options?.removeStopWords, options?.asciiFolding, options?.ngramMinLength, options?.ngramMaxLength, options?.prefixOnly));
+        return new Index(native_1.Index.fts(options?.withPosition, options?.baseTokenizer, options?.language, options?.maxTokenLength, options?.lowercase, options?.stem, options?.removeStopWords, options?.asciiFolding, options?.ngramMinLength, options?.ngramMaxLength, options?.prefixOnly, options?.blockSize));
     }
     /**
      *

package/dist/native.d.ts

@@ -11,6 +11,8 @@ export declare class Branches {
   create(name: string, fromRef?: string | undefined | null, fromVersion?: number | undefined | null): Promise<Table>
   checkout(name: string, version?: number | undefined | null): Promise<Table>
   delete(name: string): Promise<void>
+  diff(fromBranch: string): Promise<Record<string, unknown>>
+  merge(fromBranch: string, dryRun?: boolean | undefined | null): Promise<Record<string, unknown>>
 }
 
 export declare class Connection {
@@ -61,7 +63,7 @@ export declare class Index {
   static bitmap(): Index
   static labelList(): Index
   static fm(): Index
-  static fts(withPosition?: boolean | undefined | null, baseTokenizer?: string | undefined | null, language?: string | undefined | null, maxTokenLength?: number | undefined | null, lowerCase?: boolean | undefined | null, stem?: boolean | undefined | null, removeStopWords?: boolean | undefined | null, asciiFolding?: boolean | undefined | null, ngramMinLength?: number | undefined | null, ngramMaxLength?: number | undefined | null, prefixOnly?: boolean | undefined | null): Index
+  static fts(withPosition?: boolean | undefined | null, baseTokenizer?: string | undefined | null, language?: string | undefined | null, maxTokenLength?: number | undefined | null, lowerCase?: boolean | undefined | null, stem?: boolean | undefined | null, removeStopWords?: boolean | undefined | null, asciiFolding?: boolean | undefined | null, ngramMinLength?: number | undefined | null, ngramMaxLength?: number | undefined | null, prefixOnly?: boolean | undefined | null, blockSize?: number | undefined | null): Index
   static hnswPq(distanceType?: string | undefined | null, numPartitions?: number | undefined | null, numSubVectors?: number | undefined | null, maxIterations?: number | undefined | null, sampleRate?: number | undefined | null, m?: number | undefined | null, efConstruction?: number | undefined | null): Index
   static hnswSq(distanceType?: string | undefined | null, numPartitions?: number | undefined | null, maxIterations?: number | undefined | null, sampleRate?: number | undefined | null, m?: number | undefined | null, efConstruction?: number | undefined | null): Index
 }
@@ -154,7 +156,7 @@ export declare class Query {
   outputSchema(): Promise<Buffer>
   execute(maxBatchLength?: number | undefined | null, timeoutMs?: number | undefined | null): Promise<RecordBatchIterator>
   explainPlan(verbose: boolean): Promise<string>
-  analyzePlan(): Promise<string>
+  analyzePlan(distributedMetrics?: string | undefined | null): Promise<string>
 }
 
 /** Typescript-style Async Iterator over RecordBatches  */
@@ -276,7 +278,7 @@ export declare class TakeQuery {
   outputSchema(): Promise<Buffer>
   execute(maxBatchLength?: number | undefined | null, timeoutMs?: number | undefined | null): Promise<RecordBatchIterator>
   explainPlan(verbose: boolean): Promise<string>
-  analyzePlan(): Promise<string>
+  analyzePlan(distributedMetrics?: string | undefined | null): Promise<string>
 }
 
 export declare class VectorQuery {
@@ -305,7 +307,7 @@ export declare class VectorQuery {
   outputSchema(): Promise<Buffer>
   execute(maxBatchLength?: number | undefined | null, timeoutMs?: number | undefined | null): Promise<RecordBatchIterator>
   explainPlan(verbose: boolean): Promise<string>
-  analyzePlan(): Promise<string>
+  analyzePlan(distributedMetrics?: string | undefined | null): Promise<string>
 }
 
 export interface AddColumnsResult {

package/dist/native.js

@@ -76,8 +76,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-android-arm64');
                 const bindingPackageVersion = require('@lancedb/lancedb-android-arm64/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -95,8 +95,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-android-arm-eabi');
                 const bindingPackageVersion = require('@lancedb/lancedb-android-arm-eabi/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -120,8 +120,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-win32-x64-gnu');
                     const bindingPackageVersion = require('@lancedb/lancedb-win32-x64-gnu/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -139,8 +139,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-win32-x64-msvc');
                     const bindingPackageVersion = require('@lancedb/lancedb-win32-x64-msvc/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -159,8 +159,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-win32-ia32-msvc');
                 const bindingPackageVersion = require('@lancedb/lancedb-win32-ia32-msvc/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -178,8 +178,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-win32-arm64-msvc');
                 const bindingPackageVersion = require('@lancedb/lancedb-win32-arm64-msvc/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -201,8 +201,8 @@ function requireNative() {
         try {
             const binding = require('@lancedb/lancedb-darwin-universal');
             const bindingPackageVersion = require('@lancedb/lancedb-darwin-universal/package.json').version;
-            if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+            if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
             }
             return binding;
         }
@@ -219,8 +219,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-darwin-x64');
                 const bindingPackageVersion = require('@lancedb/lancedb-darwin-x64/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -238,8 +238,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-darwin-arm64');
                 const bindingPackageVersion = require('@lancedb/lancedb-darwin-arm64/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -262,8 +262,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-freebsd-x64');
                 const bindingPackageVersion = require('@lancedb/lancedb-freebsd-x64/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -281,8 +281,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-freebsd-arm64');
                 const bindingPackageVersion = require('@lancedb/lancedb-freebsd-arm64/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -306,8 +306,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-linux-x64-musl');
                     const bindingPackageVersion = require('@lancedb/lancedb-linux-x64-musl/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -325,8 +325,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-linux-x64-gnu');
                     const bindingPackageVersion = require('@lancedb/lancedb-linux-x64-gnu/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -346,8 +346,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-linux-arm64-musl');
                     const bindingPackageVersion = require('@lancedb/lancedb-linux-arm64-musl/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -365,8 +365,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-linux-arm64-gnu');
                     const bindingPackageVersion = require('@lancedb/lancedb-linux-arm64-gnu/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -386,8 +386,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-linux-arm-musleabihf');
                     const bindingPackageVersion = require('@lancedb/lancedb-linux-arm-musleabihf/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -405,8 +405,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-linux-arm-gnueabihf');
                     const bindingPackageVersion = require('@lancedb/lancedb-linux-arm-gnueabihf/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -426,8 +426,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-linux-loong64-musl');
                     const bindingPackageVersion = require('@lancedb/lancedb-linux-loong64-musl/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -445,8 +445,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-linux-loong64-gnu');
                     const bindingPackageVersion = require('@lancedb/lancedb-linux-loong64-gnu/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -466,8 +466,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-linux-riscv64-musl');
                     const bindingPackageVersion = require('@lancedb/lancedb-linux-riscv64-musl/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -485,8 +485,8 @@ function requireNative() {
                 try {
                     const binding = require('@lancedb/lancedb-linux-riscv64-gnu');
                     const bindingPackageVersion = require('@lancedb/lancedb-linux-riscv64-gnu/package.json').version;
-                    if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                    if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                        throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                     }
                     return binding;
                 }
@@ -505,8 +505,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-linux-ppc64-gnu');
                 const bindingPackageVersion = require('@lancedb/lancedb-linux-ppc64-gnu/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -524,8 +524,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-linux-s390x-gnu');
                 const bindingPackageVersion = require('@lancedb/lancedb-linux-s390x-gnu/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -548,8 +548,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-openharmony-arm64');
                 const bindingPackageVersion = require('@lancedb/lancedb-openharmony-arm64/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -567,8 +567,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-openharmony-x64');
                 const bindingPackageVersion = require('@lancedb/lancedb-openharmony-x64/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }
@@ -586,8 +586,8 @@ function requireNative() {
             try {
                 const binding = require('@lancedb/lancedb-openharmony-arm');
                 const bindingPackageVersion = require('@lancedb/lancedb-openharmony-arm/package.json').version;
-                if (bindingPackageVersion !== '0.32.0-beta.2' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.2 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
+                if (bindingPackageVersion !== '0.32.0-beta.3' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+                    throw new Error(`Native binding package version mismatch, expected 0.32.0-beta.3 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`);
                 }
                 return binding;
             }

package/dist/query.d.ts

@@ -19,6 +19,7 @@ export interface QueryExecutionOptions {
      */
     timeoutMs?: number;
 }
+export type AnalyzePlanDistributedMetrics = "aggregate" | "per_worker" | "full";
 export interface ColumnOrdering {
     columnName: string;
     ascending?: boolean;
@@ -158,9 +159,11 @@ export declare class QueryBase<NativeQueryType extends NativeQuery | NativeVecto
      *        KNNVectorDistance: metric=l2, metrics=[output_rows=1, elapsed_compute=114.333µs, output_batches=1]
      *         LanceScan: uri=/path/to/data, projection=[vector], row_id=true, row_addr=false, ordered=false, metrics=[output_rows=1, elapsed_compute=103.626µs, bytes_read=549, iops=2, requests=2]
      *
+     * @param distributedMetrics - How distributed worker metrics are displayed for remote query plans.
+     * Defaults to `"aggregate"`.
      * @returns A query execution plan with runtime metrics for each step.
      */
-    analyzePlan(): Promise<string>;
+    analyzePlan(distributedMetrics?: AnalyzePlanDistributedMetrics): Promise<string>;
     /**
      * Returns the schema of the output that will be returned by this query.
      *

package/dist/query.js

@@ -231,14 +231,17 @@ class QueryBase {
      *        KNNVectorDistance: metric=l2, metrics=[output_rows=1, elapsed_compute=114.333µs, output_batches=1]
      *         LanceScan: uri=/path/to/data, projection=[vector], row_id=true, row_addr=false, ordered=false, metrics=[output_rows=1, elapsed_compute=103.626µs, bytes_read=549, iops=2, requests=2]
      *
+     * @param distributedMetrics - How distributed worker metrics are displayed for remote query plans.
+     * Defaults to `"aggregate"`.
      * @returns A query execution plan with runtime metrics for each step.
      */
-    async analyzePlan() {
+    async analyzePlan(distributedMetrics) {
+        const distributedMetricsMode = distributedMetrics ?? "aggregate";
         if (this.inner instanceof Promise) {
-            return this.inner.then((inner) => inner.analyzePlan());
+            return this.inner.then((inner) => inner.analyzePlan(distributedMetricsMode));
         }
         else {
-            return this.inner.analyzePlan();
+            return this.inner.analyzePlan(distributedMetricsMode);
         }
     }
     /**

package/dist/sanitize.js

@@ -178,9 +178,10 @@ function sanitizeMap(typeLike) {
     if (!("keysSorted" in typeLike) || typeof typeLike.keysSorted !== "boolean") {
         throw Error("Expected a Map type to have a `keysSorted` property");
     }
-    return new arrow_1.Map_(
-    // biome-ignore lint/suspicious/noExplicitAny: skip
-    typeLike.children.map((field) => sanitizeField(field)), typeLike.keysSorted);
+    if (typeLike.children.length !== 1) {
+        throw Error("Expected a Map type to have exactly one child");
+    }
+    return new arrow_1.Map_(sanitizeField(typeLike.children[0]), typeLike.keysSorted);
 }
 function sanitizeDuration(typeLike) {
     if (!("unit" in typeLike) || typeof typeLike.unit !== "number") {

package/dist/table.d.ts

@@ -808,6 +808,68 @@ export interface FieldMetadataUpdate {
     /** If true, replace the field's entire metadata map instead of merging. */
     replace?: boolean;
 }
+/** Summary of a column in a branch diff. */
+export interface BranchColumnSummary {
+    name: string;
+    dataType: string;
+    nullable: boolean;
+}
+/** A column whose definition differs between main and the branch. */
+export interface BranchColumnChange {
+    name: string;
+    main: BranchColumnSummary;
+    branch: BranchColumnSummary;
+}
+/** Summary of an index in a branch diff. */
+export interface BranchIndexSummary {
+    indexName: string;
+    columns: string[];
+    indexType?: string;
+    status: string;
+}
+/** Row-level comparison between main and the branch. */
+export interface BranchRowCountSummary {
+    unchanged: number;
+    newOnBase: number;
+    newOnBranch: number;
+    staleRecompute: number;
+    inputsChanged: number;
+    deltaAvailable: boolean;
+}
+/** A reason why a branch cannot currently be merged. */
+export interface MergeBlocker {
+    code: string;
+    message: string;
+}
+/** Read-only comparison of a branch against main. */
+export interface BranchDiff {
+    fromBranch: string;
+    parentVersion: number;
+    mainVersion: number;
+    branchVersion: number;
+    baseMoved: boolean;
+    rowCountMain: number;
+    rowCountBranch: number;
+    rowSummary: BranchRowCountSummary;
+    addedColumns: BranchColumnSummary[];
+    removedColumns: BranchColumnSummary[];
+    changedColumns: BranchColumnChange[];
+    addedIndexes: BranchIndexSummary[];
+    removedIndexes: BranchIndexSummary[];
+    mergeable: boolean;
+    mergeBlockers: MergeBlocker[];
+}
+/** Changes that would be, or were, promoted by a branch merge. */
+export interface MergePreview {
+    promotedColumns: string[];
+}
+/** Result of previewing or attempting a branch merge. */
+export interface MergeBranchResult {
+    status: "ready" | "rejected" | "notImplemented" | "merged" | "unknown";
+    diff: BranchDiff;
+    preview: MergePreview;
+    mainVersionAfter?: number;
+}
 /**
  * Branch manager for a {@link Table}.
  *
@@ -841,4 +903,16 @@ export declare class Branches {
     checkout(name: string, version?: number): Promise<Table>;
     /** Delete a branch. */
     delete(name: string): Promise<void>;
+    /** Compare a branch against main without modifying either branch. */
+    diff(fromBranch: string): Promise<BranchDiff>;
+    /**
+     * Merge a branch into main.
+     *
+     * Set `dryRun` to `true` to preview the merge. A rejected merge resolves
+     * with `status: "rejected"` instead of throwing.
+     *
+     * @param fromBranch Branch to merge from.
+     * @param dryRun When true, only preview the merge. Defaults to false.
+     */
+    merge(fromBranch: string, dryRun?: boolean): Promise<MergeBranchResult>;
 }

package/dist/table.js

@@ -433,5 +433,21 @@ class Branches {
     async delete(name) {
         return await this.#inner.delete(name);
     }
+    /** Compare a branch against main without modifying either branch. */
+    async diff(fromBranch) {
+        return (await this.#inner.diff(fromBranch));
+    }
+    /**
+     * Merge a branch into main.
+     *
+     * Set `dryRun` to `true` to preview the merge. A rejected merge resolves
+     * with `status: "rejected"` instead of throwing.
+     *
+     * @param fromBranch Branch to merge from.
+     * @param dryRun When true, only preview the merge. Defaults to false.
+     */
+    async merge(fromBranch, dryRun = false) {
+        return (await this.#inner.merge(fromBranch, dryRun));
+    }
 }
 exports.Branches = Branches;

package/package.json

@@ -11,7 +11,7 @@
     "ann"
   ],
   "private": false,
-  "version": "0.32.0-beta.2",
+  "version": "0.32.0-beta.3",
   "main": "dist/index.js",
   "exports": {
     ".": "./dist/index.js",
@@ -106,13 +106,13 @@
   "optionalDependencies": {
     "@huggingface/transformers": "3.0.2",
     "openai": "4.29.2",
-    "@lancedb/lancedb-darwin-arm64": "0.32.0-beta.2",
-    "@lancedb/lancedb-linux-x64-gnu": "0.32.0-beta.2",
-    "@lancedb/lancedb-linux-arm64-gnu": "0.32.0-beta.2",
-    "@lancedb/lancedb-linux-x64-musl": "0.32.0-beta.2",
-    "@lancedb/lancedb-linux-arm64-musl": "0.32.0-beta.2",
-    "@lancedb/lancedb-win32-x64-msvc": "0.32.0-beta.2",
-    "@lancedb/lancedb-win32-arm64-msvc": "0.32.0-beta.2"
+    "@lancedb/lancedb-darwin-arm64": "0.32.0-beta.3",
+    "@lancedb/lancedb-linux-x64-gnu": "0.32.0-beta.3",
+    "@lancedb/lancedb-linux-arm64-gnu": "0.32.0-beta.3",
+    "@lancedb/lancedb-linux-x64-musl": "0.32.0-beta.3",
+    "@lancedb/lancedb-linux-arm64-musl": "0.32.0-beta.3",
+    "@lancedb/lancedb-win32-x64-msvc": "0.32.0-beta.3",
+    "@lancedb/lancedb-win32-arm64-msvc": "0.32.0-beta.3"
   },
   "peerDependencies": {
     "apache-arrow": ">=15.0.0 <=18.1.0"