Skip to content

date64 test skip for 24-4 #21609

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 4 commits into from
Jul 28, 2025
Merged

date64 test skip for 24-4 #21609

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
812de8c
date64 test skip for 24-4
XJIE6 Jul 24, 2025
9f4d5bd
fix
XJIE6 Jul 27, 2025
062b387
space
XJIE6 Jul 27, 2025
8bdd066
remove is
XJIE6 Jul 27, 2025
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
16 changes: 9 additions & 7 deletions ydb/tests/compatibility/test_compatibility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,15 @@ def create_table(self, store_type):
upsert_and_check_sum(self, iteration_count=2, start_index=100)
assert self.execute_scan_query('select count(*) as row_count from `sample_table`')[0]['row_count'] == 500, 'Expected 500 rows: update 100-200 rows and added 300 rows'

@pytest.mark.parametrize("store_type, date_args", [
pytest.param("row", ["--datetime-types=dt32"], id="row"),
pytest.param("column", ["--datetime-types=dt32"], id="column"),
pytest.param("column", ["--datetime-types=dt64"], id="column-date64")
@pytest.mark.parametrize("store_type, date_args, is_date64", [
pytest.param("row", ["--datetime-types=dt32"], False, id="row"),
pytest.param("column", ["--datetime-types=dt32"], False, id="column"),
pytest.param("column", ["--datetime-types=dt64"], True, id="column-date64")
Copy link
Preview

Copilot AI Jul 24, 2025

Choose a reason for hiding this comment

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

[nitpick] Inconsistent spacing in the True parameter. Should use single space like other parameters for consistency.

Suggested change
pytest.param("column", ["--datetime-types=dt64"], True, id="column-date64")
pytest.param("column", ["--datetime-types=dt64"], True, id="column-date64")

Copilot uses AI. Check for mistakes.

])
def test_tpch1(self, store_type, date_args):
def test_tpch1(self, store_type, date_args, is_date64):
if is_date64 and min(self.versions) < (25, 1):
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ну как-то избыточно получается. Давай date_args тогда удалим из параметров теста и будем крафтить эту переменную в тесте на основе is_date64

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Поправил

pytest.skip("date64 is not supported in 24-4")

result_json_path = os.path.join(yatest.common.test_output_path(), "result.json")
query_output_path = os.path.join(yatest.common.test_output_path(), "query_output.json")
init_command = [
Expand All @@ -109,8 +112,7 @@ def test_tpch1(self, store_type, date_args):
"init",
"--store={}".format(store_type),
"--partition-size=25",
] + date_args # use 32 bit dates instead of 64 (not supported in 24-4)]

] + date_args
import_command = [
yatest.common.binary_path(os.getenv("YDB_CLI_BINARY")),
"--verbose",
Expand Down
30 changes: 18 additions & 12 deletions ydb/tests/compatibility/test_stress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,15 @@ def test_kv(self, store_type):
yatest.common.execute(init_command, wait=True, stdout=self.output_f, stderr=self.output_f)
yatest.common.execute(run_command, wait=True, stdout=self.output_f, stderr=self.output_f)

@pytest.mark.parametrize("store_type, date_args", [
pytest.param("row", ["--datetime-types=dt32"], id="row"),
pytest.param("column", ["--datetime-types=dt32"], id="column"),
pytest.param("column", ["--datetime-types=dt64"], id="column-date64")
@pytest.mark.parametrize("store_type, date_args, is_date64", [
pytest.param("row", ["--datetime-types=dt32"], False, id="row"),
pytest.param("column", ["--datetime-types=dt32"], False, id="column"),
pytest.param("column", ["--datetime-types=dt64"], True, id="column-date64")
])
def test_tpch1(self, store_type, date_args):
def test_tpch1(self, store_type, date_args, is_date64):
if is_date64 and min(self.versions) < (25, 1):
pytest.skip("date64 is not supported in 24-4")

init_command = [
yatest.common.binary_path(os.getenv("YDB_CLI_BINARY")),
"--verbose",
Expand All @@ -198,7 +201,7 @@ def test_tpch1(self, store_type, date_args):
"init",
"--store={}".format(store_type),
"--partition-size=25",
] + date_args # use 32 bit dates instead of 64 (not supported in 24-4)]
] + date_args
import_command = [
yatest.common.binary_path(os.getenv("YDB_CLI_BINARY")),
"--verbose",
Expand Down Expand Up @@ -235,12 +238,15 @@ def test_tpch1(self, store_type, date_args):
yatest.common.execute(run_command, wait=True, stdout=self.output_f, stderr=self.output_f)

@pytest.mark.skip(reason="Not stabilized yet")
@pytest.mark.parametrize("store_type, date_args", [
pytest.param("row", ["--datetime-types=dt32"], id="row"),
pytest.param("column", ["--datetime-types=dt32"], id="column"),
pytest.param("column", ["--datetime-types=dt64"], id="column-date64")
@pytest.mark.parametrize("store_type, date_args, is_date64", [
pytest.param("row", ["--datetime-types=dt32"], False, id="row"),
pytest.param("column", ["--datetime-types=dt32"], False, id="column"),
pytest.param("column", ["--datetime-types=dt64"], True, id="column-date64")
])
def test_tpcds1(self, store_type, date_args):
def test_tpcds1(self, store_type, date_args, is_date64):
if is_date64 and min(self.versions) < (25, 1):
pytest.skip("date64 is not supported in 24-4")

init_command = [
yatest.common.binary_path(os.getenv("YDB_CLI_BINARY")),
"--verbose",
Expand All @@ -254,7 +260,7 @@ def test_tpcds1(self, store_type, date_args):
"init",
"--store={}".format(store_type),
"--partition-size=25",
] + date_args # use 32 bit dates instead of 64 (not supported in 24-4)]
] + date_args
import_command = [
yatest.common.binary_path(os.getenv("YDB_CLI_BINARY")),
"--verbose",
Expand Down