remove has_more_rows from ExecuteResponse

Signed-off-by: varun-edachali-dbx <varun.edachali@databricks.com>

Author: varun-edachali-dbx

src/databricks/sql/backend/thrift_backend.py

@@ -787,7 +787,6 @@ def _results_message_to_execute_response(self, resp, operation_state):
             command_id=command_id,
             status=status,
             description=description,
-            has_more_rows=has_more_rows,
             has_been_closed_server_side=has_been_closed_server_side,
             lz4_compressed=lz4_compressed,
             is_staging_operation=t_result_set_metadata_resp.isStagingOperation,
@@ -843,7 +842,6 @@ def get_execution_result(
             command_id=command_id,
             status=status,
             description=description,
-            has_more_rows=has_more_rows,
             has_been_closed_server_side=False,
             lz4_compressed=lz4_compressed,
             is_staging_operation=is_staging_operation,

src/databricks/sql/backend/types.py

@@ -424,7 +424,6 @@ class ExecuteResponse:
     command_id: CommandId
     status: CommandState
     description: Optional[List[Tuple]] = None
-    has_more_rows: bool = False
     has_been_closed_server_side: bool = False
     lz4_compressed: bool = True
     is_staging_operation: bool = False

src/databricks/sql/result_set.py

@@ -205,7 +205,7 @@ def __init__(
             command_id=execute_response.command_id,
             status=execute_response.status,
             has_been_closed_server_side=execute_response.has_been_closed_server_side,
-            has_more_rows=execute_response.has_more_rows,
+            has_more_rows=False,
             results_queue=results_queue,
             description=execute_response.description,
             is_staging_operation=execute_response.is_staging_operation,

tests/unit/test_fetches.py

@@ -57,7 +57,6 @@ def make_dummy_result_set_from_initial_results(initial_results):
                 command_id=None,
                 status=None,
                 has_been_closed_server_side=True,
-                has_more_rows=False,
                 description=description,
                 lz4_compressed=True,
                 is_staging_operation=False,
@@ -105,7 +104,6 @@ def fetch_results(
                 command_id=None,
                 status=None,
                 has_been_closed_server_side=False,
-                has_more_rows=True,
                 description=description,
                 lz4_compressed=True,
                 is_staging_operation=False,

tests/unit/test_thrift_backend.py

@@ -1009,13 +1009,12 @@ def test_fall_back_to_hive_schema_if_no_arrow_schema(self, tcli_service_class):
         "databricks.sql.utils.ResultSetQueueFactory.build_queue", return_value=Mock()
     )
     @patch("databricks.sql.backend.thrift_backend.TCLIService.Client", autospec=True)
-    def test_handle_execute_response_reads_has_more_rows_in_direct_results(
+    def test_handle_execute_response_creates_execute_response(
         self, tcli_service_class, build_queue
     ):
-        for has_more_rows, resp_type in itertools.product(
-            [True, False], self.execute_response_types
-        ):
-            with self.subTest(has_more_rows=has_more_rows, resp_type=resp_type):
+        """Test that _handle_execute_response creates an ExecuteResponse object correctly."""
+        for resp_type in self.execute_response_types:
+            with self.subTest(resp_type=resp_type):
                 tcli_service_instance = tcli_service_class.return_value
                 results_mock = Mock()
                 results_mock.startRowOffset = 0
@@ -1027,7 +1026,7 @@ def test_handle_execute_response_reads_has_more_rows_in_direct_results(
                     resultSetMetadata=self.metadata_resp,
                     resultSet=ttypes.TFetchResultsResp(
                         status=self.okay_status,
-                        hasMoreRows=has_more_rows,
+                        hasMoreRows=True,
                         results=results_mock,
                     ),
                     closeOperation=Mock(),
@@ -1047,7 +1046,8 @@ def test_handle_execute_response_reads_has_more_rows_in_direct_results(
                     execute_resp, Mock()
                 )
 
-                self.assertEqual(has_more_rows, execute_response.has_more_rows)
+                self.assertIsNotNone(execute_response)
+                self.assertIsInstance(execute_response, ExecuteResponse)
 
     @patch(
         "databricks.sql.utils.ResultSetQueueFactory.build_queue", return_value=Mock()