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

Commit809b39e

Browse files
address more merge conflicts
Signed-off-by: varun-edachali-dbx <varun.edachali@databricks.com>
1 parentafdb035 commit809b39e

File tree

5 files changed

+5
-568
lines changed

5 files changed

+5
-568
lines changed

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

Lines changed: 0 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -969,13 +969,7 @@ def execute_command(
969969
parameters=[],
970970
async_op=False,
971971
enforce_embedded_schema_correctness=False,
972-
<<<<<<<HEAD
973972
row_limit:Optional[int]=None,
974-
|||||||576eafc
975-
):
976-
assertsession_handleisnotNone
977-
=======
978-
>>>>>>>main
979973
)->Union["ResultSet",None]:
980974
thrift_handle=session_id.to_thrift_handle()
981975
ifnotthrift_handle:
@@ -1024,17 +1018,10 @@ def execute_command(
10241018
self._handle_execute_response_async(resp,cursor)
10251019
returnNone
10261020
else:
1027-
<<<<<<<HEAD
10281021
execute_response,is_direct_results=self._handle_execute_response(
10291022
resp,cursor
10301023
)
1031-
|||||||576eafc
1032-
returnself._handle_execute_response(resp,cursor)
1033-
=======
1034-
execute_response=self._handle_execute_response(resp,cursor)
1035-
>>>>>>>main
10361024

1037-
<<<<<<<HEAD
10381025
t_row_set=None
10391026
ifresp.directResultsandresp.directResults.resultSet:
10401027
t_row_set=resp.directResults.resultSet.results
@@ -1058,26 +1045,6 @@ def get_catalogs(
10581045
max_rows:int,
10591046
max_bytes:int,
10601047
cursor:"Cursor",
1061-
|||||||576eafc
1062-
defget_catalogs(self,session_handle,max_rows,max_bytes,cursor):
1063-
assertsession_handleisnotNone
1064-
=======
1065-
returnThriftResultSet(
1066-
connection=cursor.connection,
1067-
execute_response=execute_response,
1068-
thrift_client=self,
1069-
buffer_size_bytes=max_bytes,
1070-
arraysize=max_rows,
1071-
use_cloud_fetch=use_cloud_fetch,
1072-
)
1073-
1074-
defget_catalogs(
1075-
self,
1076-
session_id:SessionId,
1077-
max_rows:int,
1078-
max_bytes:int,
1079-
cursor:Cursor,
1080-
>>>>>>>main
10811048
)->"ResultSet":
10821049
thrift_handle=session_id.to_thrift_handle()
10831050
ifnotthrift_handle:
@@ -1091,7 +1058,6 @@ def get_catalogs(
10911058
)
10921059
resp=self.make_request(self._client.GetCatalogs,req)
10931060

1094-
<<<<<<<HEAD
10951061
execute_response,is_direct_results=self._handle_execute_response(
10961062
resp,cursor
10971063
)
@@ -1111,19 +1077,6 @@ def get_catalogs(
11111077
max_download_threads=self.max_download_threads,
11121078
ssl_options=self._ssl_options,
11131079
is_direct_results=is_direct_results,
1114-
|||||||576eafc
1115-
returnself._handle_execute_response(resp,cursor)
1116-
=======
1117-
execute_response=self._handle_execute_response(resp,cursor)
1118-
1119-
returnThriftResultSet(
1120-
connection=cursor.connection,
1121-
execute_response=execute_response,
1122-
thrift_client=self,
1123-
buffer_size_bytes=max_bytes,
1124-
arraysize=max_rows,
1125-
use_cloud_fetch=cursor.connection.use_cloud_fetch,
1126-
>>>>>>>main
11271080
)
11281081

11291082
defget_schemas(
@@ -1135,14 +1088,8 @@ def get_schemas(
11351088
catalog_name=None,
11361089
schema_name=None,
11371090
)->"ResultSet":
1138-
<<<<<<<HEAD
11391091
fromdatabricks.sql.result_setimportThriftResultSet
11401092

1141-
|||||||576eafc
1142-
):
1143-
assertsession_handleisnotNone
1144-
=======
1145-
>>>>>>>main
11461093
thrift_handle=session_id.to_thrift_handle()
11471094
ifnotthrift_handle:
11481095
raiseValueError("Not a valid Thrift session ID")
@@ -1157,7 +1104,6 @@ def get_schemas(
11571104
)
11581105
resp=self.make_request(self._client.GetSchemas,req)
11591106

1160-
<<<<<<<HEAD
11611107
execute_response,is_direct_results=self._handle_execute_response(
11621108
resp,cursor
11631109
)
@@ -1177,19 +1123,6 @@ def get_schemas(
11771123
max_download_threads=self.max_download_threads,
11781124
ssl_options=self._ssl_options,
11791125
is_direct_results=is_direct_results,
1180-
|||||||576eafc
1181-
returnself._handle_execute_response(resp,cursor)
1182-
=======
1183-
execute_response=self._handle_execute_response(resp,cursor)
1184-
1185-
returnThriftResultSet(
1186-
connection=cursor.connection,
1187-
execute_response=execute_response,
1188-
thrift_client=self,
1189-
buffer_size_bytes=max_bytes,
1190-
arraysize=max_rows,
1191-
use_cloud_fetch=cursor.connection.use_cloud_fetch,
1192-
>>>>>>>main
11931126
)
11941127

11951128
defget_tables(
@@ -1203,14 +1136,8 @@ def get_tables(
12031136
table_name=None,
12041137
table_types=None,
12051138
)->"ResultSet":
1206-
<<<<<<<HEAD
12071139
fromdatabricks.sql.result_setimportThriftResultSet
12081140

1209-
|||||||576eafc
1210-
):
1211-
assertsession_handleisnotNone
1212-
=======
1213-
>>>>>>>main
12141141
thrift_handle=session_id.to_thrift_handle()
12151142
ifnotthrift_handle:
12161143
raiseValueError("Not a valid Thrift session ID")
@@ -1227,7 +1154,6 @@ def get_tables(
12271154
)
12281155
resp=self.make_request(self._client.GetTables,req)
12291156

1230-
<<<<<<<HEAD
12311157
execute_response,is_direct_results=self._handle_execute_response(
12321158
resp,cursor
12331159
)
@@ -1247,19 +1173,6 @@ def get_tables(
12471173
max_download_threads=self.max_download_threads,
12481174
ssl_options=self._ssl_options,
12491175
is_direct_results=is_direct_results,
1250-
|||||||576eafc
1251-
returnself._handle_execute_response(resp,cursor)
1252-
=======
1253-
execute_response=self._handle_execute_response(resp,cursor)
1254-
1255-
returnThriftResultSet(
1256-
connection=cursor.connection,
1257-
execute_response=execute_response,
1258-
thrift_client=self,
1259-
buffer_size_bytes=max_bytes,
1260-
arraysize=max_rows,
1261-
use_cloud_fetch=cursor.connection.use_cloud_fetch,
1262-
>>>>>>>main
12631176
)
12641177

12651178
defget_columns(
@@ -1273,14 +1186,8 @@ def get_columns(
12731186
table_name=None,
12741187
column_name=None,
12751188
)->"ResultSet":
1276-
<<<<<<<HEAD
12771189
fromdatabricks.sql.result_setimportThriftResultSet
12781190

1279-
|||||||576eafc
1280-
):
1281-
assertsession_handleisnotNone
1282-
=======
1283-
>>>>>>>main
12841191
thrift_handle=session_id.to_thrift_handle()
12851192
ifnotthrift_handle:
12861193
raiseValueError("Not a valid Thrift session ID")
@@ -1297,7 +1204,6 @@ def get_columns(
12971204
)
12981205
resp=self.make_request(self._client.GetColumns,req)
12991206

1300-
<<<<<<<HEAD
13011207
execute_response,is_direct_results=self._handle_execute_response(
13021208
resp,cursor
13031209
)
@@ -1317,19 +1223,6 @@ def get_columns(
13171223
max_download_threads=self.max_download_threads,
13181224
ssl_options=self._ssl_options,
13191225
is_direct_results=is_direct_results,
1320-
|||||||576eafc
1321-
returnself._handle_execute_response(resp,cursor)
1322-
=======
1323-
execute_response=self._handle_execute_response(resp,cursor)
1324-
1325-
returnThriftResultSet(
1326-
connection=cursor.connection,
1327-
execute_response=execute_response,
1328-
thrift_client=self,
1329-
buffer_size_bytes=max_bytes,
1330-
arraysize=max_rows,
1331-
use_cloud_fetch=cursor.connection.use_cloud_fetch,
1332-
>>>>>>>main
13331226
)
13341227

13351228
def_handle_execute_response(self,resp,cursor):

0 commit comments

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