From 61141e87ee1106128c20e48efe4882b75effe21c Mon Sep 17 00:00:00 2001 From: Brendan Clement Date: Wed, 3 Jun 2026 09:25:33 -0700 Subject: [PATCH] fix(python): skip server-side query pushdown on branch handles --- python/python/lancedb/table.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/python/python/lancedb/table.py b/python/python/lancedb/table.py index 92ba37abc..468ac240a 100644 --- a/python/python/lancedb/table.py +++ b/python/python/lancedb/table.py @@ -3484,8 +3484,14 @@ class LanceTable(Table): batch_size: Optional[int] = None, timeout: Optional[timedelta] = None, ) -> pa.RecordBatchReader: - if _should_push_down_query_table( - self._namespace_client, self._pushdown_operations + # Branch queries run locally: the server-side query protocol can't + # carry a branch yet. + # TODO: push down server-side once it can (with remote table support). + if ( + _should_push_down_query_table( + self._namespace_client, self._pushdown_operations + ) + and self.current_branch() is None ): from lancedb.namespace import _execute_server_side_query