Skip to content

Commit 597f116

Browse files
Revert "Merge branch 'sea-res-set' into fetch-json-inline"
This reverts commit 40f79b5, reversing changes made to 170f339.
1 parent c0bf461 commit 597f116

File tree

1 file changed

+8
-27
lines changed

1 file changed

+8
-27
lines changed

src/databricks/sql/result_set.py

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,10 @@ def __init__(
4848
command_id: CommandId,
4949
status: CommandState,
5050
has_been_closed_server_side: bool = False,
51+
has_more_rows: bool = False,
5152
results_queue=None,
5253
description=None,
5354
is_staging_operation: bool = False,
54-
lz4_compressed: bool = False,
55-
arrow_schema_bytes: bytes = b"",
5655
):
5756
"""
5857
A ResultSet manages the results of a single command.
@@ -80,10 +79,9 @@ def __init__(
8079
self.command_id = command_id
8180
self.status = status
8281
self.has_been_closed_server_side = has_been_closed_server_side
82+
self.has_more_rows = has_more_rows
8383
self.results = results_queue
8484
self._is_staging_operation = is_staging_operation
85-
self.lz4_compressed = lz4_compressed
86-
self._arrow_schema_bytes = arrow_schema_bytes
8785

8886
def __iter__(self):
8987
while True:
@@ -187,24 +185,9 @@ def __init__(
187185
has_more_rows: Whether there are more rows to fetch
188186
"""
189187
# Initialize ThriftResultSet-specific attributes
188+
self._arrow_schema_bytes = execute_response.arrow_schema_bytes
190189
self._use_cloud_fetch = use_cloud_fetch
191-
self.has_more_rows = has_more_rows
192-
193-
# Build the results queue if t_row_set is provided
194-
results_queue = None
195-
if t_row_set and execute_response.result_format is not None:
196-
from databricks.sql.utils import ThriftResultSetQueueFactory
197-
198-
# Create the results queue using the provided format
199-
results_queue = ThriftResultSetQueueFactory.build_queue(
200-
row_set_type=execute_response.result_format,
201-
t_row_set=t_row_set,
202-
arrow_schema_bytes=execute_response.arrow_schema_bytes or b"",
203-
max_download_threads=max_download_threads,
204-
lz4_compressed=execute_response.lz4_compressed,
205-
description=execute_response.description,
206-
ssl_options=ssl_options,
207-
)
190+
self.lz4_compressed = execute_response.lz4_compressed
208191

209192
# Call parent constructor with common attributes
210193
super().__init__(
@@ -215,6 +198,7 @@ def __init__(
215198
command_id=execute_response.command_id,
216199
status=execute_response.status,
217200
has_been_closed_server_side=execute_response.has_been_closed_server_side,
201+
has_more_rows=has_more_rows,
218202
results_queue=results_queue,
219203
description=execute_response.description,
220204
is_staging_operation=execute_response.is_staging_operation,
@@ -450,7 +434,7 @@ def map_col_type(type_):
450434

451435

452436
class SeaResultSet(ResultSet):
453-
"""ResultSet implementation for SEA backend."""
437+
"""ResultSet implementation for the SEA backend."""
454438

455439
def __init__(
456440
self,
@@ -467,12 +451,11 @@ def __init__(
467451
468452
Args:
469453
connection: The parent connection
470-
execute_response: Response from the execute command
471454
sea_client: The SeaDatabricksClient instance for direct access
472455
buffer_size_bytes: Buffer size for fetching results
473456
arraysize: Default number of rows to fetch
474-
result_data: Result data from SEA response (optional)
475-
manifest: Manifest from SEA response (optional)
457+
execute_response: Response from the execute command (new style)
458+
sea_response: Direct SEA response (legacy style)
476459
"""
477460

478461
if result_data:
@@ -498,8 +481,6 @@ def __init__(
498481
results_queue=queue,
499482
description=execute_response.description,
500483
is_staging_operation=execute_response.is_staging_operation,
501-
lz4_compressed=execute_response.lz4_compressed,
502-
arrow_schema_bytes=execute_response.arrow_schema_bytes,
503484
)
504485

505486
def _convert_to_row_objects(self, rows):

0 commit comments

Comments
 (0)