Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc1c0e7d

Browse files
Merge branch 'sea-migration' into max-rows-sea
2 parents2058907 +e380654 commitc1c0e7d

File tree

14 files changed

+821
-215
lines changed

14 files changed

+821
-215
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#Release History
22

3+
#4.0.5 (2025-06-24)
4+
- Fix: Reverted change in cursor close handling which led to errors impacting users (databricks/databricks-sql-python#613 by@madhav-db)
5+
36
#4.0.4 (2025-06-16)
47

58
- Update thrift client library after cleaning up unused fields and structs (databricks/databricks-sql-python#553 by@vikrantpuppala)

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name ="databricks-sql-connector"
3-
version ="4.0.4"
3+
version ="4.0.5"
44
description ="Databricks SQL Connector for Python"
55
authors = ["Databricks <databricks-sql-connector-maintainers@databricks.com>"]
66
license ="Apache-2.0"

‎src/databricks/sql/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def __repr__(self):
6868
DATE=DBAPITypeObject("date")
6969
ROWID=DBAPITypeObject()
7070

71-
__version__="4.0.4"
71+
__version__="4.0.5"
7272
USER_AGENT_NAME="PyDatabricksSqlConnector"
7373

7474
# These two functions are pyhive legacy

‎src/databricks/sql/backend/sea/backend.py‎

Lines changed: 130 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__importannotations
2+
13
importlogging
24
importtime
35
importre
@@ -10,11 +12,12 @@
1012
ResultDisposition,
1113
ResultCompression,
1214
WaitTimeout,
15+
MetadataCommands,
1316
)
1417

1518
ifTYPE_CHECKING:
1619
fromdatabricks.sql.clientimportCursor
17-
fromdatabricks.sql.result_setimportResultSet
20+
fromdatabricks.sql.result_setimportSeaResultSet
1821

1922
fromdatabricks.sql.backend.databricks_clientimportDatabricksClient
2023
fromdatabricks.sql.backend.typesimport (
@@ -24,7 +27,7 @@
2427
BackendType,
2528
ExecuteResponse,
2629
)
27-
fromdatabricks.sql.excimportDatabaseError,ServerOperationError
30+
fromdatabricks.sql.excimportDatabaseError,ProgrammingError,ServerOperationError
2831
fromdatabricks.sql.backend.sea.utils.http_clientimportSeaHttpClient
2932
fromdatabricks.sql.typesimportSSLOptions
3033

@@ -169,7 +172,7 @@ def _extract_warehouse_id(self, http_path: str) -> str:
169172
f"Note: SEA only works for warehouses."
170173
)
171174
logger.error(error_message)
172-
raiseValueError(error_message)
175+
raiseProgrammingError(error_message)
173176

174177
@property
175178
defmax_download_threads(self)->int:
@@ -241,14 +244,14 @@ def close_session(self, session_id: SessionId) -> None:
241244
session_id: The session identifier returned by open_session()
242245
243246
Raises:
244-
ValueError: If the session ID is invalid
247+
ProgrammingError: If the session ID is invalid
245248
OperationalError: If there's an error closing the session
246249
"""
247250

248251
logger.debug("SeaDatabricksClient.close_session(session_id=%s)",session_id)
249252

250253
ifsession_id.backend_type!=BackendType.SEA:
251-
raiseValueError("Not a valid SEA session ID")
254+
raiseProgrammingError("Not a valid SEA session ID")
252255
sea_session_id=session_id.to_sea_session_id()
253256

254257
request_data=DeleteSessionRequest(
@@ -400,13 +403,13 @@ def execute_command(
400403
max_rows:int,
401404
max_bytes:int,
402405
lz4_compression:bool,
403-
cursor:"Cursor",
406+
cursor:Cursor,
404407
use_cloud_fetch:bool,
405408
parameters:List[Dict[str,Any]],
406409
async_op:bool,
407410
enforce_embedded_schema_correctness:bool,
408411
row_limit:Optional[int]=None,
409-
)->Union["ResultSet",None]:
412+
)->Union[SeaResultSet,None]:
410413
"""
411414
Execute a SQL command using the SEA backend.
412415
@@ -427,7 +430,7 @@ def execute_command(
427430
"""
428431

429432
ifsession_id.backend_type!=BackendType.SEA:
430-
raiseValueError("Not a valid SEA session ID")
433+
raiseProgrammingError("Not a valid SEA session ID")
431434

432435
sea_session_id=session_id.to_sea_session_id()
433436

@@ -502,11 +505,11 @@ def cancel_command(self, command_id: CommandId) -> None:
502505
command_id: Command identifier to cancel
503506
504507
Raises:
505-
ValueError: If the command ID is invalid
508+
ProgrammingError: If the command ID is invalid
506509
"""
507510

508511
ifcommand_id.backend_type!=BackendType.SEA:
509-
raiseValueError("Not a valid SEA command ID")
512+
raiseProgrammingError("Not a valid SEA command ID")
510513

511514
sea_statement_id=command_id.to_sea_statement_id()
512515

@@ -525,11 +528,11 @@ def close_command(self, command_id: CommandId) -> None:
525528
command_id: Command identifier to close
526529
527530
Raises:
528-
ValueError: If the command ID is invalid
531+
ProgrammingError: If the command ID is invalid
529532
"""
530533

531534
ifcommand_id.backend_type!=BackendType.SEA:
532-
raiseValueError("Not a valid SEA command ID")
535+
raiseProgrammingError("Not a valid SEA command ID")
533536

534537
sea_statement_id=command_id.to_sea_statement_id()
535538

@@ -551,7 +554,7 @@ def get_query_state(self, command_id: CommandId) -> CommandState:
551554
CommandState: The current state of the command
552555
553556
Raises:
554-
ValueError: If the command ID is invalid
557+
ProgrammingError: If the command ID is invalid
555558
"""
556559

557560
ifcommand_id.backend_type!=BackendType.SEA:
@@ -573,8 +576,8 @@ def get_query_state(self, command_id: CommandId) -> CommandState:
573576
defget_execution_result(
574577
self,
575578
command_id:CommandId,
576-
cursor:"Cursor",
577-
)->"ResultSet":
579+
cursor:Cursor,
580+
)->SeaResultSet:
578581
"""
579582
Get the result of a command execution.
580583
@@ -583,14 +586,14 @@ def get_execution_result(
583586
cursor: Cursor executing the command
584587
585588
Returns:
586-
ResultSet: A SeaResultSet instance with the execution results
589+
SeaResultSet: A SeaResultSet instance with the execution results
587590
588591
Raises:
589592
ValueError: If the command ID is invalid
590593
"""
591594

592595
ifcommand_id.backend_type!=BackendType.SEA:
593-
raiseValueError("Not a valid SEA command ID")
596+
raiseProgrammingError("Not a valid SEA command ID")
594597

595598
sea_statement_id=command_id.to_sea_statement_id()
596599

@@ -627,47 +630,141 @@ def get_catalogs(
627630
session_id:SessionId,
628631
max_rows:int,
629632
max_bytes:int,
630-
cursor:"Cursor",
631-
):
632-
"""Not implemented yet."""
633-
raiseNotImplementedError("get_catalogs is not yet implemented for SEA backend")
633+
cursor:Cursor,
634+
)->SeaResultSet:
635+
"""Get available catalogs by executing 'SHOW CATALOGS'."""
636+
result=self.execute_command(
637+
operation=MetadataCommands.SHOW_CATALOGS.value,
638+
session_id=session_id,
639+
max_rows=max_rows,
640+
max_bytes=max_bytes,
641+
lz4_compression=False,
642+
cursor=cursor,
643+
use_cloud_fetch=False,
644+
parameters=[],
645+
async_op=False,
646+
enforce_embedded_schema_correctness=False,
647+
)
648+
assertresultisnotNone,"execute_command returned None in synchronous mode"
649+
returnresult
634650

635651
defget_schemas(
636652
self,
637653
session_id:SessionId,
638654
max_rows:int,
639655
max_bytes:int,
640-
cursor:"Cursor",
656+
cursor:Cursor,
641657
catalog_name:Optional[str]=None,
642658
schema_name:Optional[str]=None,
643-
):
644-
"""Not implemented yet."""
645-
raiseNotImplementedError("get_schemas is not yet implemented for SEA backend")
659+
)->SeaResultSet:
660+
"""Get schemas by executing 'SHOW SCHEMAS IN catalog [LIKE pattern]'."""
661+
ifnotcatalog_name:
662+
raiseDatabaseError("Catalog name is required for get_schemas")
663+
664+
operation=MetadataCommands.SHOW_SCHEMAS.value.format(catalog_name)
665+
666+
ifschema_name:
667+
operation+=MetadataCommands.LIKE_PATTERN.value.format(schema_name)
668+
669+
result=self.execute_command(
670+
operation=operation,
671+
session_id=session_id,
672+
max_rows=max_rows,
673+
max_bytes=max_bytes,
674+
lz4_compression=False,
675+
cursor=cursor,
676+
use_cloud_fetch=False,
677+
parameters=[],
678+
async_op=False,
679+
enforce_embedded_schema_correctness=False,
680+
)
681+
assertresultisnotNone,"execute_command returned None in synchronous mode"
682+
returnresult
646683

647684
defget_tables(
648685
self,
649686
session_id:SessionId,
650687
max_rows:int,
651688
max_bytes:int,
652-
cursor:"Cursor",
689+
cursor:Cursor,
653690
catalog_name:Optional[str]=None,
654691
schema_name:Optional[str]=None,
655692
table_name:Optional[str]=None,
656693
table_types:Optional[List[str]]=None,
657-
):
658-
"""Not implemented yet."""
659-
raiseNotImplementedError("get_tables is not yet implemented for SEA backend")
694+
)->SeaResultSet:
695+
"""Get tables by executing 'SHOW TABLES IN catalog [SCHEMA LIKE pattern] [LIKE pattern]'."""
696+
operation= (
697+
MetadataCommands.SHOW_TABLES_ALL_CATALOGS.value
698+
ifcatalog_namein [None,"*","%"]
699+
elseMetadataCommands.SHOW_TABLES.value.format(
700+
MetadataCommands.CATALOG_SPECIFIC.value.format(catalog_name)
701+
)
702+
)
703+
704+
ifschema_name:
705+
operation+=MetadataCommands.SCHEMA_LIKE_PATTERN.value.format(schema_name)
706+
707+
iftable_name:
708+
operation+=MetadataCommands.LIKE_PATTERN.value.format(table_name)
709+
710+
result=self.execute_command(
711+
operation=operation,
712+
session_id=session_id,
713+
max_rows=max_rows,
714+
max_bytes=max_bytes,
715+
lz4_compression=False,
716+
cursor=cursor,
717+
use_cloud_fetch=False,
718+
parameters=[],
719+
async_op=False,
720+
enforce_embedded_schema_correctness=False,
721+
)
722+
assertresultisnotNone,"execute_command returned None in synchronous mode"
723+
724+
# Apply client-side filtering by table_types
725+
fromdatabricks.sql.backend.sea.utils.filtersimportResultSetFilter
726+
727+
result=ResultSetFilter.filter_tables_by_type(result,table_types)
728+
729+
returnresult
660730

661731
defget_columns(
662732
self,
663733
session_id:SessionId,
664734
max_rows:int,
665735
max_bytes:int,
666-
cursor:"Cursor",
736+
cursor:Cursor,
667737
catalog_name:Optional[str]=None,
668738
schema_name:Optional[str]=None,
669739
table_name:Optional[str]=None,
670740
column_name:Optional[str]=None,
671-
):
672-
"""Not implemented yet."""
673-
raiseNotImplementedError("get_columns is not yet implemented for SEA backend")
741+
)->SeaResultSet:
742+
"""Get columns by executing 'SHOW COLUMNS IN CATALOG catalog [SCHEMA LIKE pattern] [TABLE LIKE pattern] [LIKE pattern]'."""
743+
ifnotcatalog_name:
744+
raiseDatabaseError("Catalog name is required for get_columns")
745+
746+
operation=MetadataCommands.SHOW_COLUMNS.value.format(catalog_name)
747+
748+
ifschema_name:
749+
operation+=MetadataCommands.SCHEMA_LIKE_PATTERN.value.format(schema_name)
750+
751+
iftable_name:
752+
operation+=MetadataCommands.TABLE_LIKE_PATTERN.value.format(table_name)
753+
754+
ifcolumn_name:
755+
operation+=MetadataCommands.LIKE_PATTERN.value.format(column_name)
756+
757+
result=self.execute_command(
758+
operation=operation,
759+
session_id=session_id,
760+
max_rows=max_rows,
761+
max_bytes=max_bytes,
762+
lz4_compression=False,
763+
cursor=cursor,
764+
use_cloud_fetch=False,
765+
parameters=[],
766+
async_op=False,
767+
enforce_embedded_schema_correctness=False,
768+
)
769+
assertresultisnotNone,"execute_command returned None in synchronous mode"
770+
returnresult

‎src/databricks/sql/backend/sea/utils/constants.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,23 @@ class WaitTimeout(Enum):
4545

4646
ASYNC="0s"
4747
SYNC="10s"
48+
49+
50+
classMetadataCommands(Enum):
51+
"""SQL commands used in the SEA backend.
52+
53+
These constants are used for metadata operations and other SQL queries
54+
to ensure consistency and avoid string literal duplication.
55+
"""
56+
57+
SHOW_CATALOGS="SHOW CATALOGS"
58+
SHOW_SCHEMAS="SHOW SCHEMAS IN {}"
59+
SHOW_TABLES="SHOW TABLES IN {}"
60+
SHOW_TABLES_ALL_CATALOGS="SHOW TABLES IN ALL CATALOGS"
61+
SHOW_COLUMNS="SHOW COLUMNS IN CATALOG {}"
62+
63+
LIKE_PATTERN=" LIKE '{}'"
64+
SCHEMA_LIKE_PATTERN=" SCHEMA"+LIKE_PATTERN
65+
TABLE_LIKE_PATTERN=" TABLE"+LIKE_PATTERN
66+
67+
CATALOG_SPECIFIC="CATALOG {}"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp