Revert "Using get bucket name"

2023-06-21 16:47:56 -04:00
1 changed files with 39 additions and 69 deletions
--- a/s3tests_boto3/functional/test_s3select.py
+++ b/s3tests_boto3/functional/test_s3select.py
@ -10,8 +10,7 @@ import uuid
 from . import (
    configfile,
    setup_teardown,
-    get_client,
+    get_client
    get_new_bucket_name
    )
 import logging
@ -88,7 +87,7 @@ def test_generate_where_clause():
    # create small csv file for testing the random expressions
    single_line_csv = create_random_csv_object(1,1)
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    obj_name = get_random_string() #"single_line_csv.csv"
    upload_object(bucket_name,obj_name,single_line_csv)
@ -100,7 +99,7 @@ def test_generate_projection():
    # create small csv file for testing the random expressions
    single_line_csv = create_random_csv_object(1,1)
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    obj_name = get_random_string() #"single_line_csv.csv"
    upload_object(bucket_name,obj_name,single_line_csv)
@ -391,7 +390,7 @@ def create_list_of_int(column_pos,obj,field_split=",",row_split="\n"):
@pytest.mark.s3select
 def test_count_operation():
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    num_of_rows = 1234
    obj_to_load = create_random_csv_object(num_of_rows,10)
    upload_object(bucket_name,csv_obj_name,obj_to_load)
@ -402,8 +401,7 @@ def test_count_operation():
@pytest.mark.s3select
 def test_count_json_operation():
    json_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    num_of_rows = 1
    obj_to_load = create_random_json_object(num_of_rows,10)
    upload_object(bucket_name,json_obj_name,obj_to_load)
@ -425,8 +423,7 @@ def test_json_column_sum_min_max():
    json_obj = csv_to_json(csv_obj);
    json_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,json_obj_name,json_obj)
    json_obj_name_2 = get_random_string()
@ -492,8 +489,7 @@ def test_json_nullif_expressions():
    json_obj = create_random_json_object(10000,10)
    json_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,json_obj_name,json_obj)
    res_s3select_nullif = remove_xml_tags_from_result(  run_s3select_json(bucket_name,json_obj_name,"select count(0) from s3object[*].root where nullif(_1.c1,_1.c2) is null ;")  ).replace("\n","")
@ -532,8 +528,7 @@ def test_column_sum_min_max():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    csv_obj_name_2 = get_random_string()
@ -599,8 +594,7 @@ def test_nullif_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_nullif = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,"select count(0) from s3object where nullif(_1,_2) is null ;")  ).replace("\n","")
@ -655,8 +649,7 @@ def test_nulliftrue_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_nullif = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,"select count(0) from s3object where (nullif(_1,_2) is null) = true ;")  ).replace("\n","")
@ -683,8 +676,7 @@ def test_is_not_null_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_null = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,"select count(*) from s3object where nullif(_1,_2) is not null ;")  ).replace("\n","")
@ -705,8 +697,7 @@ def test_lowerupper_expressions():
    csv_obj = create_random_csv_object(1,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select lower("AB12cd$$") from s3object ;')  ).replace("\n","")
@ -724,8 +715,7 @@ def test_in_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_in = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select int(_1) from s3object where int(_1) in(1);')).replace("\n","")
@ -794,8 +784,7 @@ def test_true_false_in_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_in = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select int(_1) from s3object where (int(_1) in(1)) = true;')).replace("\n","")
@ -840,8 +829,7 @@ def test_like_expressions():
    csv_obj = create_random_csv_object_string(1000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_like = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select count(*) from s3object where _1 like "%aeio%";')).replace("\n","")
@ -928,8 +916,7 @@ def test_truefalselike_expressions():
    csv_obj = create_random_csv_object_string(1000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_like = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select count(*) from s3object where (_1 like "%aeio%") = true;')).replace("\n","")
@ -974,8 +961,7 @@ def test_nullif_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_nullif = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,"select count(0) from stdin where nullif(_1,_2) is null ;")  ).replace("\n","")
@ -1002,8 +988,7 @@ def test_lowerupper_expressions():
    csv_obj = create_random_csv_object(1,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select lower("AB12cd$$") from stdin ;')  ).replace("\n","")
@ -1021,8 +1006,7 @@ def test_in_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_in = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select int(_1) from stdin where int(_1) in(1);')).replace("\n","")
@ -1061,8 +1045,7 @@ def test_like_expressions():
    csv_obj = create_random_csv_object_string(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_in = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select count(*) from stdin where _1 like "%aeio%";')).replace("\n","")
@ -1109,8 +1092,7 @@ def test_complex_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,"select min(int(_1)),max(int(_2)),min(int(_3))+1 from s3object;")).replace("\n","")
@ -1146,8 +1128,7 @@ def test_alias():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_alias = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,"select int(_1) as a1, int(_2) as a2 , (a1+a2) as a3 from s3object where a3>100 and a3<300;")  ).replace(",","")
@ -1166,8 +1147,7 @@ def test_alias_cyclic_refernce():
    csv_obj = create_random_csv_object(number_of_rows,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_alias = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,"select int(_1) as a1,int(_2) as a2, a1+a4 as a3, a5+a1 as a4, int(_3)+a3 as a5 from s3object;")  )
@ -1185,7 +1165,7 @@ def test_datetime():
    csv_obj = create_csv_object_for_datetime(10000,1)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
@ -1216,7 +1196,7 @@ def test_true_false_datetime():
    csv_obj = create_csv_object_for_datetime(10000,1)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
@ -1249,7 +1229,7 @@ def test_csv_parser():
    csv_obj = r',first,,,second,third="c31,c32,c33",forth="1,2,3,4",fifth=my_string=\"any_value\" \, my_other_string=\"aaaa\,bbb\" ,' + "\n"
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
@ -1290,7 +1270,7 @@ def test_csv_definition():
    csv_obj = create_random_csv_object(number_of_rows,10,"|","\t")
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
@ -1320,7 +1300,7 @@ def test_schema_definition():
    csv_obj = create_random_csv_object(number_of_rows,10,csv_schema="c1,c2,c3,c4,c5,c6,c7,c8,c9,c10")
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
@ -1352,8 +1332,7 @@ def test_when_then_else_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select case when cast(_1 as int)>100 and cast(_1 as int)<200 then "(100-200)" when cast(_1 as int)>200 and cast(_1 as int)<300 then "(200-300)" else "NONE" end from s3object;')  ).replace("\n","")
@ -1382,8 +1361,7 @@ def test_coalesce_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select count(*) from s3object where char_length(_3)>2 and char_length(_4)>2 and cast(substring(_3,1,2) as int) = cast(substring(_4,1,2) as int);')  ).replace("\n","")  
@ -1405,8 +1383,7 @@ def test_cast_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select count(*) from s3object where cast(_3 as int)>999;')  ).replace("\n","")  
@ -1431,7 +1408,7 @@ def test_version():
    csv_obj = create_random_csv_object(number_of_rows,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
@ -1445,8 +1422,7 @@ def test_trim_expressions():
    csv_obj = create_random_csv_object_trim(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_trim = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select count(*) from s3object where trim(_1) = "aeiou";')).replace("\n","")
@ -1485,8 +1461,7 @@ def test_truefalse_trim_expressions():
    csv_obj = create_random_csv_object_trim(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_trim = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select count(*) from s3object where trim(_1) = "aeiou" = true;')).replace("\n","")
@ -1525,8 +1500,7 @@ def test_escape_expressions():
    csv_obj = create_random_csv_object_escape(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_escape = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select count(*) from s3object where _1 like "%_ar" escape "%";')).replace("\n","")
@ -1547,8 +1521,7 @@ def test_case_value_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_case = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select case cast(_1 as int) when cast(_2 as int) then "case_1_1" else "case_2_2" end from s3object;')).replace("\n","")
@ -1563,8 +1536,7 @@ def test_bool_cast_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_cast = remove_xml_tags_from_result(  run_s3select(bucket_name,csv_obj_name,'select count(*) from s3object where cast(int(_1) as bool) = true ;')).replace("\n","")
@ -1579,8 +1551,7 @@ def test_progress_expressions():
    csv_obj = create_random_csv_object(1000000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    obj_size = len(csv_obj.encode('utf-8'))
@ -1613,8 +1584,7 @@ def test_output_serial_expressions():
    csv_obj = create_random_csv_object(10000,10)
    csv_obj_name = get_random_string()
-    bucket_name = get_new_bucket_name()
+    bucket_name = "test"
    upload_object(bucket_name,csv_obj_name,csv_obj)
    res_s3select_1 = remove_xml_tags_from_result(  run_s3select_output(bucket_name,csv_obj_name,"select _1, _2 from s3object where nullif(_1,_2) is null ;", "ALWAYS")  ).replace("\n",",").replace(",","")