tests: replace update_lag with now()+X in 02530_dictionaries_update_field

azat · azat · commit 753347c74343 · 2025-06-05T12:03:59.000+02:00
diff --git a/tests/queries/0_stateless/02530_dictionaries_update_field.lib b/tests/queries/0_stateless/02530_dictionaries_update_field.lib
@@ -8,15 +8,27 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 function run_test_with_layout()
 {
     local layout=$1
+
+    # NOTE: dictionaries will be updated according to server TZ, not session, so prohibit it's randomization
+    $CLICKHOUSE_CLIENT --session_timezone '' -q "
+        CREATE TABLE table_for_update_field_dictionary
+        (
+            key UInt64,
+            value String,
+            last_insert_time DateTime
+        )
+        ENGINE = TinyLog
+    "
+
     for custom_query in "" "custom"; do
         if [[ $custom_query == custom ]]; then
             dictionary_name="dict_${layout}_custom"
-            dictionary_source="query \$doc\$SELECT key, value, last_insert_time FROM $CLICKHOUSE_DATABASE.table_for_update_field_dictionary WHERE {condition};\$doc\$ update_field 'last_insert_time' update_lag 30"
+            dictionary_source="query \$doc\$SELECT key, value, last_insert_time FROM $CLICKHOUSE_DATABASE.table_for_update_field_dictionary WHERE {condition};\$doc\$ update_field 'last_insert_time' update_lag 0"
 
             echo "$layout/custom"
         else
             dictionary_name="dict_${layout}"
-            dictionary_source="table 'table_for_update_field_dictionary' update_field 'last_insert_time' update_lag 30"
+            dictionary_source="table 'table_for_update_field_dictionary' update_field 'last_insert_time' update_lag 0"
 
             echo "$layout"
         fi
@@ -43,15 +55,15 @@ function run_test_with_layout()
             sleep .1;
         done
 
-        $CLICKHOUSE_CLIENT --query "INSERT INTO table_for_update_field_dictionary VALUES (2, 'Second', now());"
+        $CLICKHOUSE_CLIENT --query "INSERT INTO table_for_update_field_dictionary VALUES (2, 'Second', now()+5);"
 
         while true
         do
             $CLICKHOUSE_CLIENT --query "SELECT key, value FROM $dictionary_name ORDER BY key ASC" | grep -A10 -B10 'Second' && break;
             sleep .1;
         done
 
-        $CLICKHOUSE_CLIENT --query "INSERT INTO table_for_update_field_dictionary VALUES (2, 'SecondUpdated', now()), (3, 'Third', now())"
+        $CLICKHOUSE_CLIENT --query "INSERT INTO table_for_update_field_dictionary VALUES (2, 'SecondUpdated', now()+10), (3, 'Third', now()+10)"
 
         while true
         do
diff --git a/tests/queries/0_stateless/02530_dictionaries_update_field_complex_key_hashed.sh b/tests/queries/0_stateless/02530_dictionaries_update_field_complex_key_hashed.sh
@@ -8,16 +8,4 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=./02530_dictionaries_update_field.lib
 . "$CUR_DIR"/02530_dictionaries_update_field.lib
 
-# NOTE: dictionaries will be updated according to server TZ, not session, so prohibit it's randomization
-$CLICKHOUSE_CLIENT --session_timezone '' -q "
-    CREATE TABLE table_for_update_field_dictionary
-    (
-        key UInt64,
-        value String,
-        last_insert_time DateTime
-    )
-    ENGINE = MergeTree()
-    ORDER BY tuple()
-"
-
 run_test_with_layout "complex_key_hashed"
diff --git a/tests/queries/0_stateless/02530_dictionaries_update_field_flat.sh b/tests/queries/0_stateless/02530_dictionaries_update_field_flat.sh
@@ -8,15 +8,4 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=./02530_dictionaries_update_field.lib
 . "$CUR_DIR"/02530_dictionaries_update_field.lib
 
-# NOTE: dictionaries will be updated according to server TZ, not session, so prohibit it's randomization
-$CLICKHOUSE_CLIENT --session_timezone '' -q "
-    CREATE TABLE table_for_update_field_dictionary
-    (
-        key UInt64,
-        value String,
-        last_insert_time DateTime
-    )
-    ENGINE = TinyLog
-"
-
 run_test_with_layout "flat"
diff --git a/tests/queries/0_stateless/02530_dictionaries_update_field_hashed.sh b/tests/queries/0_stateless/02530_dictionaries_update_field_hashed.sh
@@ -8,16 +8,4 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=./02530_dictionaries_update_field.lib
 . "$CUR_DIR"/02530_dictionaries_update_field.lib
 
-# NOTE: dictionaries will be updated according to server TZ, not session, so prohibit it's randomization
-$CLICKHOUSE_CLIENT --session_timezone '' -q "
-    CREATE TABLE table_for_update_field_dictionary
-    (
-        key UInt64,
-        value String,
-        last_insert_time DateTime
-    )
-    ENGINE = MergeTree()
-    ORDER BY tuple()
-"
-
 run_test_with_layout "hashed"
