Merge branch 'master' into fix-hashlib-regression

cloudera · Oct 10, 2024 · 58032db · 58032db
2 parents b1c52d2 + 961f7ea
commit 58032db
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/desktop/core/ext-py3/python-sasl-0.3.1/sasl/saslwrapper.cpython-39-darwin.so b/desktop/core/ext-py3/python-sasl-0.3.1/sasl/saslwrapper.cpython-39-darwin.so
diff --git a/desktop/libs/notebook/src/notebook/connectors/trino.py b/desktop/libs/notebook/src/notebook/connectors/trino.py
@@ -343,6 +343,11 @@ def _get_columns(self, database, table):
       for col in columns
     ]
 
+  def get_log(self, notebook, snippet, startFrom=None, size=None):
+    guid = snippet['result']['handle']['guid'] if snippet.get('result') and snippet['result'].get('handle') and \
+      snippet['result']['handle'].get('guid') else None
+    return f"query_id: {guid}"
+
   @query_error_handler
   def explain(self, notebook, snippet):
     statement = snippet['statement'].rstrip(';')

diff --git a/desktop/libs/notebook/src/notebook/connectors/trino_tests.py b/desktop/libs/notebook/src/notebook/connectors/trino_tests.py
@@ -354,3 +354,19 @@ def test_auth_password_script(self, mock_default_password):
     with patch('notebook.connectors.trino.coerce_password_from_script', return_value='custom_password_script'):
       trino_api = TrinoApi(self.user, interpreter=interpreter)
       assert trino_api.auth_password == 'custom_password_script'
+
+  def test_get_log(self):
+    notebook = {}
+    snippet = {
+      'result': {
+        'handle': {
+          'guid': '1234-abcd-5678-efgh'
+        }
+      }
+    }
+
+    # Expected result
+    expected_log = "query_id: 1234-abcd-5678-efgh"
+    result = self.trino_api.get_log(notebook, snippet)
+
+    assert result == expected_log