remove excess changes in backend

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

Author: varun-edachali-dbx

src/databricks/sql/backend/thrift_backend.py

@@ -352,6 +352,7 @@ def make_request(self, method, request, retryable=True):
         Will stop retry attempts if total elapsed time + next retry delay would exceed
         _retry_stop_after_attempts_duration.
         """
+
         # basic strategy: build range iterator rep'ing number of available
         # retries. bounds can be computed from there. iterate over it with
         # retries until success or final failure achieved.
@@ -1241,7 +1242,7 @@ def cancel_command(self, command_id: CommandId) -> None:
         if not thrift_handle:
             raise ValueError("Not a valid Thrift command ID")
 
-        logger.debug("Cancelling command {}".format(command_id.guid))
+        logger.debug("Cancelling command {}".format(guid_to_hex_id(command_id.guid)))
         req = ttypes.TCancelOperationReq(thrift_handle)
         self.make_request(self._client.CancelOperation, req)
 

src/databricks/sql/backend/types.py

@@ -85,10 +85,8 @@ def from_thrift_state(
     def from_sea_state(cls, state: str) -> Optional["CommandState"]:
         """
         Map SEA state string to CommandState enum.
-
         Args:
             state: SEA state string
-
         Returns:
             CommandState: The corresponding CommandState enum value
         """
@@ -308,6 +306,28 @@ def __init__(
         self.has_result_set = has_result_set
         self.modified_row_count = modified_row_count
 
+    def __str__(self) -> str:
+        """
+        Return a string representation of the CommandId.
+
+        For SEA backend, returns the guid.
+        For Thrift backend, returns a format like "guid|secret".
+
+        Returns:
+            A string representation of the command ID
+        """
+
+        if self.backend_type == BackendType.SEA:
+            return str(self.guid)
+        elif self.backend_type == BackendType.THRIFT:
+            secret_hex = (
+                guid_to_hex_id(self.secret)
+                if isinstance(self.secret, bytes)
+                else str(self.secret)
+            )
+            return f"{self.to_hex_guid()}|{secret_hex}"
+        return str(self.guid)
+
     @classmethod
     def from_thrift_handle(cls, operation_handle):
         """
@@ -319,6 +339,7 @@ def from_thrift_handle(cls, operation_handle):
         Returns:
             A CommandId instance
         """
+
         if operation_handle is None:
             return None