test: Remove advanced_mode flag (#329)

Author: ptiurin

.github/workflows/integration-tests-v1.yml

@@ -95,7 +95,7 @@ jobs:
           API_ENDPOINT: "api.${{ inputs.environment }}.firebolt.io"
           ACCOUNT_NAME: "firebolt"
         run: |
-          pytest --last-failed -n 6 --dist loadgroup --timeout_method "signal" -o log_cli=true -o log_cli_level=INFO tests/integration -k "not V2"
+          pytest --last-failed -n 6 --dist loadgroup --timeout_method "signal" -o log_cli=true -o log_cli_level=INFO tests/integration -k "not V2" --runslow
 
       - name: Save failed tests
         id: cache-tests-save

.github/workflows/integration-tests-v2.yml

@@ -71,4 +71,4 @@ jobs:
           API_ENDPOINT: "api.${{ inputs.environment }}.firebolt.io"
           ACCOUNT_NAME: "developer"
         run: |
-          pytest -n 6 --dist loadgroup --timeout_method "signal" -o log_cli=true -o log_cli_level=WARNING tests/integration -k "not V1"
+          pytest -n 6 --dist loadgroup --timeout_method "signal" -o log_cli=true -o log_cli_level=WARNING tests/integration -k "not V1" --runslow

src/firebolt/async_db/cursor.py

@@ -182,7 +182,6 @@ async def _do_execute(
                             query,
                             {
                                 "async_execution": 1,
-                                "advanced_mode": 1,
                                 "output_format": JSON_OUTPUT_FORMAT,
                             },
                         )

src/firebolt/db/cursor.py

@@ -171,7 +171,6 @@ def _do_execute(
                         query,
                         {
                             "async_execution": 1,
-                            "advanced_mode": 1,
                             "output_format": JSON_OUTPUT_FORMAT,
                         },
                     )

tests/integration/conftest.py

@@ -1,7 +1,7 @@
 from logging import getLogger
 from os import environ
 
-from pytest import fixture
+from pytest import fixture, mark
 
 from firebolt.client.auth import ClientCredentials
 from firebolt.client.auth.username_password import UsernamePassword
@@ -20,6 +20,29 @@
 ENGINE_URL_ENV = "ENGINE_URL"
 STOPPED_ENGINE_URL_ENV = "STOPPED_ENGINE_URL"
 
+# https://docs.pytest.org/en/latest/example/simple.html#control-skipping-of-tests-according-to-command-line-option
+# Adding slow marker to tests
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--runslow", action="store_true", default=False, help="run slow tests"
+    )
+
+
+def pytest_configure(config):
+    config.addinivalue_line("markers", "slow: mark test as slow to run")
+
+
+def pytest_collection_modifyitems(config, items):
+    if config.getoption("--runslow"):
+        # --runslow given in cli: do not skip slow tests
+        return
+    skip_slow = mark.skip(reason="need --runslow option to run")
+    for item in items:
+        if "slow" in item.keywords:
+            item.add_marker(skip_slow)
+
 
 class Secret:
     """

tests/integration/dbapi/async/V1/test_queries_async.py

@@ -135,9 +135,6 @@ async def test_select(
 ) -> None:
     """Select handles all data types properly."""
     with connection.cursor() as c:
-        assert (
-            await c.execute(f"SET advanced_mode=1") == -1
-        ), "Invalid set statment row count"
         # For timestamptz test
         assert (
             await c.execute(f"SET time_zone={timezone_name}") == -1
@@ -172,21 +169,19 @@ async def test_select(
         )
 
 
-@mark.skip("Don't have a good way to test this anymore. FIR-16038")
-@mark.timeout(timeout=400)
+@mark.skip(reason="V1 query doesn't finish within the timeout")
+@mark.slow
+@mark.timeout(timeout=600)
 async def test_long_query(
     connection: Connection,
 ) -> None:
     """AWS ALB TCP timeout set to 350; make sure we handle the keepalive correctly."""
     with connection.cursor() as c:
         await c.execute(
-            "SET advanced_mode = 1; SET use_standard_sql = 0;"
-            "SELECT sleepEachRow(1) from numbers(360)",
+            "SELECT checksum(*) FROM GENERATE_SERIES(1, 200000000000)",  # approx 6m runtime
         )
-        await c.nextset()
-        await c.nextset()
         data = await c.fetchall()
-        assert len(data) == 360, "Invalid data size returned by fetchall"
+        assert len(data) == 1, "Invalid data size returned by fetchall"
 
 
 async def test_drop_create(connection: Connection) -> None:

tests/integration/dbapi/async/V2/test_queries_async.py

@@ -64,9 +64,6 @@ async def test_select(
 ) -> None:
     """Select handles all data types properly."""
     with connection.cursor() as c:
-        assert (
-            await c.execute(f"SET advanced_mode=1") == -1
-        ), "Invalid set statment row count"
         # For timestamptz test
         assert (
             await c.execute(f"SET time_zone={timezone_name}") == -1
@@ -101,21 +98,18 @@ async def test_select(
         )
 
 
-@mark.skip("Don't have a good way to test this anymore. FIR-16038")
-@mark.timeout(timeout=400)
+@mark.slow
+@mark.timeout(timeout=550)
 async def test_long_query(
     connection: Connection,
 ) -> None:
     """AWS ALB TCP timeout set to 350; make sure we handle the keepalive correctly."""
     with connection.cursor() as c:
         await c.execute(
-            "SET advanced_mode = 1; SET use_standard_sql = 0;"
-            "SELECT sleepEachRow(1) from numbers(360)",
+            "SELECT checksum(*) FROM GENERATE_SERIES(1, 200000000000)",  # approx 6m runtime
         )
-        await c.nextset()
-        await c.nextset()
         data = await c.fetchall()
-        assert len(data) == 360, "Invalid data size returned by fetchall"
+        assert len(data) == 1, "Invalid data size returned by fetchall"
 
 
 async def test_drop_create(connection: Connection) -> None:
@@ -400,17 +394,17 @@ async def test_bytea_roundtrip(
 ) -> None:
     """Inserted and than selected bytea value doesn't get corrupted."""
     with connection.cursor() as c:
-        await c.execute("DROP TABLE IF EXISTS test_bytea_roundtrip")
+        await c.execute("DROP TABLE IF EXISTS test_bytea_roundtrip_2")
         await c.execute(
-            "CREATE FACT TABLE test_bytea_roundtrip(id int, b bytea) primary index id"
+            "CREATE FACT TABLE test_bytea_roundtrip_2(id int, b bytea) primary index id"
         )
 
         data = "bytea_123\n\tヽ༼ຈل͜ຈ༽ﾉ"
 
         await c.execute(
-            "INSERT INTO test_bytea_roundtrip VALUES (1, ?)", (Binary(data),)
+            "INSERT INTO test_bytea_roundtrip_2 VALUES (1, ?)", (Binary(data),)
         )
-        await c.execute("SELECT b FROM test_bytea_roundtrip")
+        await c.execute("SELECT b FROM test_bytea_roundtrip_2")
 
         bytes_data = (await c.fetchone())[0]
 

tests/integration/dbapi/sync/V1/test_queries.py

@@ -88,7 +88,6 @@ def test_select(
 ) -> None:
     """Select handles all data types properly."""
     with connection.cursor() as c:
-        assert c.execute(f"SET advanced_mode=1") == -1, "Invalid set statment row count"
         # For timestamptz test
         assert (
             c.execute(f"SET time_zone={timezone_name}") == -1
@@ -121,22 +120,19 @@ def test_select(
         )
 
 
-@mark.skip("Don't have a good way to test this anymore. FIR-16038")
-@mark.timeout(timeout=400)
+@mark.skip(reason="V1 query doesn't finish within the timeout")
+@mark.slow
+@mark.timeout(timeout=600)
 def test_long_query(
     connection: Connection,
 ) -> None:
     """AWS ALB TCP timeout set to 350, make sure we handle the keepalive correctly."""
     with connection.cursor() as c:
         c.execute(
-            "SET advanced_mode=1;"
-            "SET use_standard_sql=0;"
-            "SELECT sleepEachRow(1) FROM numbers(360)",
+            "SELECT checksum(*) FROM GENERATE_SERIES(1, 200000000000)",  # approx 6m runtime
         )
-        c.nextset()
-        c.nextset()
         data = c.fetchall()
-        assert len(data) == 360, "Invalid data size returned by fetchall"
+        assert len(data) == 1, "Invalid data size returned by fetchall"
 
 
 def test_drop_create(connection: Connection) -> None:
@@ -451,6 +447,7 @@ async def test_server_side_async_execution_get_status(
     # ), "get_status() did not return a QueryStatus object."
 
 
+@mark.xdist_group("multi_thread_connection_sharing")
 def test_multi_thread_connection_sharing(
     engine_url: str,
     database_name: str,

tests/integration/dbapi/sync/V2/test_queries.py

@@ -72,7 +72,6 @@ def test_select(
 ) -> None:
     """Select handles all data types properly."""
     with connection.cursor() as c:
-        assert c.execute(f"SET advanced_mode=1") == -1, "Invalid set statment row count"
         # For timestamptz test
         assert (
             c.execute(f"SET time_zone={timezone_name}") == -1
@@ -105,22 +104,18 @@ def test_select(
         )
 
 
-@mark.skip("Don't have a good way to test this anymore. FIR-16038")
-@mark.timeout(timeout=400)
+@mark.slow
+@mark.timeout(timeout=550)
 def test_long_query(
     connection: Connection,
 ) -> None:
     """AWS ALB TCP timeout set to 350, make sure we handle the keepalive correctly."""
     with connection.cursor() as c:
         c.execute(
-            "SET advanced_mode=1;"
-            "SET use_standard_sql=0;"
-            "SELECT sleepEachRow(1) FROM numbers(360)",
+            "SELECT checksum(*) FROM GENERATE_SERIES(1, 200000000000)",  # approx 6m runtime
         )
-        c.nextset()
-        c.nextset()
         data = c.fetchall()
-        assert len(data) == 360, "Invalid data size returned by fetchall"
+        assert len(data) == 1, "Invalid data size returned by fetchall"
 
 
 def test_drop_create(connection: Connection) -> None:
@@ -434,6 +429,7 @@ async def test_server_side_async_execution_get_status(
     # ), "get_status() did not return a QueryStatus object."
 
 
+@mark.xdist_group("multi_thread_connection_sharing")
 def test_multi_thread_connection_sharing(
     engine_name: str,
     database_name: str,