Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[compute] check correctly for is_compute for session_type #3510

Merged
merged 2 commits into from
Oct 24, 2023
Merged

[compute] check correctly for is_compute for session_type #3510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad854bb
[compute] check correctly for is_compute for session_type
amitsrivastava Oct 24, 2023
b3e56bd
frontend update to send the session_type from the session returned by…
amitsrivastava Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions desktop/core/src/desktop/js/apps/notebook/snippet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,7 +1878,7 @@ class Snippet {
if (!notebook.sessions().length) {
notebook.addSession(
new Session(vm, {
type: self.type(),
type: data.handle.session_type || self.type(),
session_id: data.handle.session_guid,
id: data.handle.session_id,
properties: {}
Expand All @@ -1887,7 +1887,7 @@ class Snippet {
} else {
notebook.sessions()[0].session_id(data.handle.session_guid);
notebook.sessions()[0].id(data.handle.session_id);
notebook.sessions()[0].type(self.type());
notebook.sessions()[0].type(data.handle.session_type || self.type());
}
}
if (vm.editorMode()) {
Expand Down
9 changes: 5 additions & 4 deletions desktop/libs/notebook/src/notebook/connectors/hiveserver2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

from django.urls import reverse

from beeswax.common import is_compute
from desktop.auth.backend import is_admin
from desktop.conf import USE_DEFAULT_CONFIGURATION, has_connectors
from desktop.lib.conf import BoundConfig
Expand Down Expand Up @@ -316,11 +317,11 @@ def execute(self, notebook, snippet):
db = self._get_db(snippet, interpreter=self.interpreter)

statement = self._get_current_statement(notebook, snippet)
session = self._get_session(notebook, snippet['type'])
compute = snippet.get('compute', {})
session_type = compute['name'] if is_compute(snippet) and compute.get('name') else snippet['type']
session = self._get_session(notebook, session_type)

query = self._prepare_hql_query(snippet, statement['statement'], session)
compute = snippet.get('compute')
session_type = compute['name'] if compute else snippet['type']
_session = self._get_session_by_id(notebook, session_type)


Expand Down Expand Up @@ -349,7 +350,7 @@ def execute(self, notebook, snippet):
'log_context': handle.log_context,
'session_guid': handle.session_guid,
'session_id': handle.session_id,
'session_type': snippet['type']
'session_type': session_type
}
response.update(statement)

Expand Down
Loading