@@ -179,12 +179,20 @@ def test_kv(self, store_type):
179
179
yatest .common .execute (init_command , wait = True , stdout = self .output_f , stderr = self .output_f )
180
180
yatest .common .execute (run_command , wait = True , stdout = self .output_f , stderr = self .output_f )
181
181
182
- @pytest .mark .parametrize ("store_type, date_args " , [
183
- pytest .param ("row" , [ "--datetime-types=dt32" ] , id = "row" ),
184
- pytest .param ("column" , [ "--datetime-types=dt32" ] , id = "column" ),
185
- pytest .param ("column" , [ "--datetime-types=dt64" ], id = "column-date64" )
182
+ @pytest .mark .parametrize ("store_type, date64 " , [
183
+ pytest .param ("row" , False , id = "row" ),
184
+ pytest .param ("column" , False , id = "column" ),
185
+ pytest .param ("column" , True , id = "column-date64" )
186
186
])
187
- def test_tpch1 (self , store_type , date_args ):
187
+ def test_tpch1 (self , store_type , date64 ):
188
+ if date64 and min (self .versions ) < (25 , 1 ):
189
+ pytest .skip ("date64 is not supported in 24-4" )
190
+
191
+ if date64 :
192
+ date_args = ["--datetime-types=dt64" ]
193
+ else :
194
+ date_args = ["--datetime-types=dt32" ]
195
+
188
196
init_command = [
189
197
yatest .common .binary_path (os .getenv ("YDB_CLI_BINARY" )),
190
198
"--verbose" ,
@@ -198,7 +206,7 @@ def test_tpch1(self, store_type, date_args):
198
206
"init" ,
199
207
"--store={}" .format (store_type ),
200
208
"--partition-size=25" ,
201
- ] + date_args # use 32 bit dates instead of 64 (not supported in 24-4)]
209
+ ] + date_args
202
210
import_command = [
203
211
yatest .common .binary_path (os .getenv ("YDB_CLI_BINARY" )),
204
212
"--verbose" ,
@@ -235,12 +243,20 @@ def test_tpch1(self, store_type, date_args):
235
243
yatest .common .execute (run_command , wait = True , stdout = self .output_f , stderr = self .output_f )
236
244
237
245
@pytest .mark .skip (reason = "Not stabilized yet" )
238
- @pytest .mark .parametrize ("store_type, date_args " , [
239
- pytest .param ("row" , [ "--datetime-types=dt32" ] , id = "row" ),
240
- pytest .param ("column" , [ "--datetime-types=dt32" ] , id = "column" ),
241
- pytest .param ("column" , [ "--datetime-types=dt64" ], id = "column-date64" )
246
+ @pytest .mark .parametrize ("store_type, date64 " , [
247
+ pytest .param ("row" , False , id = "row" ),
248
+ pytest .param ("column" , False , id = "column" ),
249
+ pytest .param ("column" , True , id = "column-date64" )
242
250
])
243
- def test_tpcds1 (self , store_type , date_args ):
251
+ def test_tpcds1 (self , store_type , date64 ):
252
+ if date64 and min (self .versions ) < (25 , 1 ):
253
+ pytest .skip ("date64 is not supported in 24-4" )
254
+
255
+ if date64 :
256
+ date_args = ["--datetime-types=dt64" ]
257
+ else :
258
+ date_args = ["--datetime-types=dt32" ]
259
+
244
260
init_command = [
245
261
yatest .common .binary_path (os .getenv ("YDB_CLI_BINARY" )),
246
262
"--verbose" ,
@@ -254,7 +270,7 @@ def test_tpcds1(self, store_type, date_args):
254
270
"init" ,
255
271
"--store={}" .format (store_type ),
256
272
"--partition-size=25" ,
257
- ] + date_args # use 32 bit dates instead of 64 (not supported in 24-4)]
273
+ ] + date_args
258
274
import_command = [
259
275
yatest .common .binary_path (os .getenv ("YDB_CLI_BINARY" )),
260
276
"--verbose" ,
0 commit comments