Skip to content

remove table with _ne suffix creation #13002

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

Merged
merged 1 commit into from
Dec 25, 2024
Merged

remove table with _ne suffix creation #13002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 5 additions & 9 deletions ydb/tests/functional/suite_tests/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def is_statement_definition(line):
return line.startswith("statement")


def format_yql_statement(lines_or_statement, table_path_prefix):
def patch_yql_statement(lines_or_statement, table_path_prefix):
if not isinstance(lines_or_statement, list):
lines_or_statement = [lines_or_statement]
statement = "\n".join(
Expand Down Expand Up @@ -255,7 +255,6 @@ def setup_class(cls):
)
cls.cluster.start()
cls.table_path_prefix = None
cls.table_path_prefix_ne = None
cls.driver = ydb.Driver(ydb.DriverConfig(
database="/Root",
endpoint="%s:%s" % (cls.cluster.nodes[1].host, cls.cluster.nodes[1].port)))
Expand All @@ -279,7 +278,6 @@ def run_sql_suite(self, kind, *path_pieces):
self.plan = (kind == 'plan')
self.query_id = itertools.count(start=1)
self.table_path_prefix = "/Root/%s" % '_'.join(list(path_pieces) + [kind])
self.table_path_prefix_ne = self.table_path_prefix + "_ne"
for parsed_statement in get_statements(get_source_path(*path_pieces), os.path.join(*path_pieces)):
self.assert_statement(parsed_statement)
return self.files
Expand Down Expand Up @@ -418,7 +416,7 @@ def assert_statement_stream_query(self, statement):
if self.plan:
return

yql_text = format_yql_statement(statement.text, self.table_path_prefix)
yql_text = patch_yql_statement(statement.text, self.table_path_prefix)
yql_text = "--!syntax_v1\n" + yql_text + "\n\n"
result = self.execute_scan_query(yql_text)
file_name = statement.suite_name.split('/')[1] + '.out'
Expand All @@ -445,7 +443,7 @@ def execute_ydb_ok(self, statement_text):
self.execute_query(statement_text)

def explain(self, query):
yql_text = format_yql_statement(query, self.table_path_prefix)
yql_text = patch_yql_statement(query, self.table_path_prefix)
# seems explain not working with query service ?
"""
result_sets = self.pool.execute_with_retries(yql_text, exec_mode=ydb.query.base.QueryExecMode.EXPLAIN)
Expand All @@ -458,14 +456,12 @@ def explain(self, query):
return self.legacy_pool.retry_operation_sync(lambda s: s.explain(yql_text)).query_plan

def execute_scheme(self, statement_text):
yql_text = format_yql_statement(statement_text, self.table_path_prefix)
self.pool.execute_with_retries(yql_text)
yql_text = format_yql_statement(statement_text, self.table_path_prefix_ne)
Copy link
Collaborator Author

@zverevgeny zverevgeny Dec 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gridnevvvit я не смог понять, зачем это тут. Может ты помнишь?

yql_text = patch_yql_statement(statement_text, self.table_path_prefix)
self.pool.execute_with_retries(yql_text)
return None

def execute_query(self, statement_text):
yql_text = format_yql_statement(statement_text, self.table_path_prefix)
yql_text = patch_yql_statement(statement_text, self.table_path_prefix)
result = self.pool.execute_with_retries(yql_text)

if len(result) == 1:
Expand Down
Loading