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

Commitbdb8381

Browse files
Revert "Merge remote-tracking branch 'upstream/sea-migration' into decouple-session"
This reverts commitdbb2ec5, reversingchanges made to7192f11.Signed-off-by: varun-edachali-dbx <varun.edachali@databricks.com>
1 parentdbb2ec5 commitbdb8381

File tree

5 files changed

+7
-265
lines changed

5 files changed

+7
-265
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# the repo. Unless a later match takes precedence, these
33
# users will be requested for review when someone opens a
44
# pull request.
5-
*@deeksha-db@samikshya-db@jprakash-db@jackyhu-db@madhav-db@gopalldb@jayantsing-db@vikrantpuppala@shivam2680
5+
*@deeksha-db@samikshya-db@jprakash-db@yunbodeng-db@jackyhu-db@benc-db

‎src/databricks/sql/client.py‎

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,6 @@ def read(self) -> Optional[OAuthToken]:
215215
# use_cloud_fetch
216216
# Enable use of cloud fetch to extract large query results in parallel via cloud storage
217217

218-
logger.debug(
219-
"Connection.__init__(server_hostname=%s, http_path=%s)",
220-
server_hostname,
221-
http_path,
222-
)
223-
224218
ifaccess_token:
225219
access_token_kv= {"access_token":access_token}
226220
kwargs= {**kwargs,**access_token_kv}
@@ -283,13 +277,7 @@ def __enter__(self) -> "Connection":
283277
returnself
284278

285279
def__exit__(self,exc_type,exc_value,traceback):
286-
try:
287-
self.close()
288-
exceptBaseExceptionase:
289-
logger.warning(f"Exception during connection close in __exit__:{e}")
290-
ifexc_typeisNone:
291-
raise
292-
returnFalse
280+
self.close()
293281

294282
def__del__(self):
295283
ifself.open:
@@ -412,14 +400,7 @@ def __enter__(self) -> "Cursor":
412400
returnself
413401

414402
def__exit__(self,exc_type,exc_value,traceback):
415-
try:
416-
logger.debug("Cursor context manager exiting, calling close()")
417-
self.close()
418-
exceptBaseExceptionase:
419-
logger.warning(f"Exception during cursor close in __exit__:{e}")
420-
ifexc_typeisNone:
421-
raise
422-
returnFalse
403+
self.close()
423404

424405
def__iter__(self):
425406
ifself.active_result_set:
@@ -750,9 +731,6 @@ def execute(
750731
751732
:returns self
752733
"""
753-
logger.debug(
754-
"Cursor.execute(operation=%s, parameters=%s)",operation,parameters
755-
)
756734

757735
param_approach=self._determine_parameter_approach(parameters)
758736
ifparam_approach==ParameterApproach.NONE:
@@ -1129,21 +1107,7 @@ def cancel(self) -> None:
11291107
defclose(self)->None:
11301108
"""Close cursor"""
11311109
self.open=False
1132-
1133-
# Close active operation handle if it exists
1134-
ifself.active_op_handle:
1135-
try:
1136-
self.thrift_backend.close_command(self.active_op_handle)
1137-
exceptRequestErrorase:
1138-
ifisinstance(e.args[1],CursorAlreadyClosedError):
1139-
logger.info("Operation was canceled by a prior request")
1140-
else:
1141-
logging.warning(f"Error closing operation handle:{e}")
1142-
exceptExceptionase:
1143-
logging.warning(f"Error closing operation handle:{e}")
1144-
finally:
1145-
self.active_op_handle=None
1146-
1110+
self.active_op_handle=None
11471111
ifself.active_result_set:
11481112
self._close_and_clear_active_result_set()
11491113

‎src/databricks/sql/thrift_backend.py‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,6 @@ def __init__(
131131
# max_download_threads
132132
# Number of threads for handling cloud fetch downloads. Defaults to 10
133133

134-
logger.debug(
135-
"ThriftBackend.__init__(server_hostname=%s, port=%s, http_path=%s)",
136-
server_hostname,
137-
port,
138-
http_path,
139-
)
140-
141134
port=portor443
142135
ifkwargs.get("_connection_uri"):
143136
uri=kwargs.get("_connection_uri")
@@ -397,8 +390,6 @@ def attempt_request(attempt):
397390

398391
# TODO: don't use exception handling for GOS polling...
399392

400-
logger.error("ThriftBackend.attempt_request: HTTPError: %s",err)
401-
402393
gos_name=TCLIServiceClient.GetOperationStatus.__name__
403394
ifmethod.__name__==gos_name:
404395
delay_default= (
@@ -443,7 +434,6 @@ def attempt_request(attempt):
443434
else:
444435
logger.warning(log_string)
445436
exceptExceptionaserr:
446-
logger.error("ThriftBackend.attempt_request: Exception: %s",err)
447437
error=err
448438
retry_delay=extract_retry_delay(attempt)
449439
error_message=ThriftBackend._extract_error_message_from_headers(
@@ -898,12 +888,6 @@ def execute_command(
898888
):
899889
assertsession_handleisnotNone
900890

901-
logger.debug(
902-
"ThriftBackend.execute_command(operation=%s, session_handle=%s)",
903-
operation,
904-
session_handle,
905-
)
906-
907891
spark_arrow_types=ttypes.TSparkArrowTypes(
908892
timestampAsArrow=self._use_arrow_native_timestamps,
909893
decimalAsArrow=self._use_arrow_native_decimals,
@@ -1090,7 +1074,6 @@ def fetch_results(
10901074
returnqueue,resp.hasMoreRows
10911075

10921076
defclose_command(self,op_handle):
1093-
logger.debug("ThriftBackend.close_command(op_handle=%s)",op_handle)
10941077
req=ttypes.TCloseOperationReq(operationHandle=op_handle)
10951078
resp=self.make_request(self._client.CloseOperation,req)
10961079
returnresp.status

‎tests/e2e/test_driver.py‎

Lines changed: 3 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
fromtests.e2e.common.uc_volume_testsimportPySQLUCVolumeTestSuiteMixin
5252

53-
fromdatabricks.sql.excimportSessionAlreadyClosedError,CursorAlreadyClosedError
53+
fromdatabricks.sql.excimportSessionAlreadyClosedError
5454

5555
log=logging.getLogger(__name__)
5656

@@ -820,6 +820,7 @@ def test_close_connection_closes_cursors(self):
820820
ars=cursor.active_result_set
821821

822822
# We must manually run this check because thrift_backend always forces `has_been_closed_server_side` to True
823+
823824
# Cursor op state should be open before connection is closed
824825
status_request=ttypes.TGetOperationStatusReq(
825826
operationHandle=ars.command_id,getProgressUpdate=False
@@ -846,103 +847,8 @@ def test_closing_a_closed_connection_doesnt_fail(self, caplog):
846847
withself.connection()asconn:
847848
# First .close() call is explicit here
848849
conn.close()
849-
assert"Session appears to have been closed already"incaplog.text
850-
851-
conn=None
852-
try:
853-
withpytest.raises(KeyboardInterrupt):
854-
withself.connection()asc:
855-
conn=c
856-
raiseKeyboardInterrupt("Simulated interrupt")
857-
finally:
858-
ifconnisnotNone:
859-
assertnotconn.open,"Connection should be closed after KeyboardInterrupt"
860-
861-
deftest_cursor_close_properly_closes_operation(self):
862-
"""Test that Cursor.close() properly closes the active operation handle on the server."""
863-
withself.connection()asconn:
864-
cursor=conn.cursor()
865-
try:
866-
cursor.execute("SELECT 1 AS test")
867-
assertcursor.active_op_handleisnotNone
868-
cursor.close()
869-
assertcursor.active_op_handleisNone
870-
assertnotcursor.open
871-
finally:
872-
ifcursor.open:
873-
cursor.close()
874-
875-
conn=None
876-
cursor=None
877-
try:
878-
withself.connection()asc:
879-
conn=c
880-
withpytest.raises(KeyboardInterrupt):
881-
withconn.cursor()ascur:
882-
cursor=cur
883-
raiseKeyboardInterrupt("Simulated interrupt")
884-
finally:
885-
ifcursorisnotNone:
886-
assertnotcursor.open,"Cursor should be closed after KeyboardInterrupt"
887-
888-
deftest_nested_cursor_context_managers(self):
889-
"""Test that nested cursor context managers properly close operations on the server."""
890-
withself.connection()asconn:
891-
withconn.cursor()ascursor1:
892-
cursor1.execute("SELECT 1 AS test1")
893-
assertcursor1.active_op_handleisnotNone
894-
895-
withconn.cursor()ascursor2:
896-
cursor2.execute("SELECT 2 AS test2")
897-
assertcursor2.active_op_handleisnotNone
898-
899-
# After inner context manager exit, cursor2 should be not open
900-
assertnotcursor2.open
901-
assertcursor2.active_op_handleisNone
902850

903-
# After outer context manager exit, cursor1 should be not open
904-
assertnotcursor1.open
905-
assertcursor1.active_op_handleisNone
906-
907-
deftest_cursor_error_handling(self):
908-
"""Test that cursor close handles errors properly to prevent orphaned operations."""
909-
withself.connection()asconn:
910-
cursor=conn.cursor()
911-
912-
cursor.execute("SELECT 1 AS test")
913-
914-
op_handle=cursor.active_op_handle
915-
916-
assertop_handleisnotNone
917-
918-
# Manually close the operation to simulate server-side closure
919-
conn.thrift_backend.close_command(op_handle)
920-
921-
cursor.close()
922-
923-
assertnotcursor.open
924-
925-
deftest_result_set_close(self):
926-
"""Test that ResultSet.close() properly closes operations on the server and handles state correctly."""
927-
withself.connection()asconn:
928-
cursor=conn.cursor()
929-
try:
930-
cursor.execute("SELECT * FROM RANGE(10)")
931-
932-
result_set=cursor.active_result_set
933-
assertresult_setisnotNone
934-
935-
initial_op_state=result_set.op_state
936-
937-
result_set.close()
938-
939-
assertresult_set.op_state==result_set.thrift_backend.CLOSED_OP_STATE
940-
assertresult_set.op_state!=initial_op_state
941-
942-
# Closing the result set again should be a no-op and not raise exceptions
943-
result_set.close()
944-
finally:
945-
cursor.close()
851+
assert"Session appears to have been closed already"incaplog.text
946852

947853

948854
# use a RetrySuite to encapsulate these tests which we'll typically want to run together; however keep

‎tests/unit/test_client.py‎

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
importdatabricks.sql
2121
importdatabricks.sql.clientasclient
2222
fromdatabricks.sqlimportInterfaceError,DatabaseError,Error,NotSupportedError
23-
fromdatabricks.sql.excimportRequestError,CursorAlreadyClosedError
2423
fromdatabricks.sql.typesimportRow
2524

2625
fromtests.unit.test_fetchesimportFetchTests
@@ -523,116 +522,6 @@ def test_access_current_query_id(self):
523522
cursor.close()
524523
self.assertIsNone(cursor.query_id)
525524

526-
deftest_cursor_close_handles_exception(self):
527-
"""Test that Cursor.close() handles exceptions from close_command properly."""
528-
mock_backend=Mock()
529-
mock_connection=Mock()
530-
mock_op_handle=Mock()
531-
532-
mock_backend.close_command.side_effect=Exception("Test error")
533-
534-
cursor=client.Cursor(mock_connection,mock_backend)
535-
cursor.active_op_handle=mock_op_handle
536-
537-
cursor.close()
538-
539-
mock_backend.close_command.assert_called_once_with(mock_op_handle)
540-
541-
self.assertIsNone(cursor.active_op_handle)
542-
543-
self.assertFalse(cursor.open)
544-
545-
deftest_cursor_context_manager_handles_exit_exception(self):
546-
"""Test that cursor's context manager handles exceptions during __exit__."""
547-
mock_backend=Mock()
548-
mock_connection=Mock()
549-
550-
cursor=client.Cursor(mock_connection,mock_backend)
551-
original_close=cursor.close
552-
cursor.close=Mock(side_effect=Exception("Test error during close"))
553-
554-
try:
555-
withcursor:
556-
raiseValueError("Test error inside context")
557-
exceptValueError:
558-
pass
559-
560-
cursor.close.assert_called_once()
561-
562-
deftest_connection_close_handles_cursor_close_exception(self):
563-
"""Test that _close handles exceptions from cursor.close() properly."""
564-
cursors_closed= []
565-
566-
defmock_close_with_exception():
567-
cursors_closed.append(1)
568-
raiseException("Test error during close")
569-
570-
cursor1=Mock()
571-
cursor1.close=mock_close_with_exception
572-
573-
defmock_close_normal():
574-
cursors_closed.append(2)
575-
576-
cursor2=Mock()
577-
cursor2.close=mock_close_normal
578-
579-
mock_backend=Mock()
580-
mock_session_handle=Mock()
581-
582-
try:
583-
forcursorin [cursor1,cursor2]:
584-
try:
585-
cursor.close()
586-
exceptException:
587-
pass
588-
589-
mock_backend.close_session(mock_session_handle)
590-
exceptExceptionase:
591-
self.fail(f"Connection close should handle exceptions:{e}")
592-
593-
self.assertEqual(cursors_closed, [1,2],"Both cursors should have close called")
594-
595-
deftest_resultset_close_handles_cursor_already_closed_error(self):
596-
"""Test that ResultSet.close() handles CursorAlreadyClosedError properly."""
597-
result_set=client.ResultSet.__new__(client.ResultSet)
598-
result_set.thrift_backend=Mock()
599-
result_set.thrift_backend.CLOSED_OP_STATE='CLOSED'
600-
result_set.connection=Mock()
601-
result_set.connection.open=True
602-
result_set.op_state='RUNNING'
603-
result_set.has_been_closed_server_side=False
604-
result_set.command_id=Mock()
605-
606-
classMockRequestError(Exception):
607-
def__init__(self):
608-
self.args= ["Error message",CursorAlreadyClosedError()]
609-
610-
result_set.thrift_backend.close_command.side_effect=MockRequestError()
611-
612-
original_close=client.ResultSet.close
613-
try:
614-
try:
615-
if (
616-
result_set.op_state!=result_set.thrift_backend.CLOSED_OP_STATE
617-
andnotresult_set.has_been_closed_server_side
618-
andresult_set.connection.open
619-
):
620-
result_set.thrift_backend.close_command(result_set.command_id)
621-
exceptMockRequestErrorase:
622-
ifisinstance(e.args[1],CursorAlreadyClosedError):
623-
pass
624-
finally:
625-
result_set.has_been_closed_server_side=True
626-
result_set.op_state=result_set.thrift_backend.CLOSED_OP_STATE
627-
628-
result_set.thrift_backend.close_command.assert_called_once_with(result_set.command_id)
629-
630-
assertresult_set.has_been_closed_server_sideisTrue
631-
632-
assertresult_set.op_state==result_set.thrift_backend.CLOSED_OP_STATE
633-
finally:
634-
pass
635-
636525

637526
if__name__=="__main__":
638527
suite=unittest.TestLoader().loadTestsFromModule(sys.modules[__name__])

0 commit comments

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