MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-21 18:26:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: s3select tests with new minio-py SDK (#10995)

Browse Source
This commit is contained in:
Harshavardhana
2020-11-29 13:05:37 -08:00
committed by GitHub
parent bdd094bc39
commit ae4ded7fd1
4 changed files with 64 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
mint/run/core/s3select/csv.py
View File

@@ -19,9 +19,13 @@ import io
import os
from minio import Minio
from minio.select.options import (CSVInput, CSVOutput, InputSerialization,
JSONOutput, OutputSerialization,
RequestProgress, SelectObjectOptions)
from minio.selectrequest import (COMPRESSION_TYPE_NONE, FILE_HEADER_INFO_NONE,
JSON_TYPE_DOCUMENT, QUOTE_FIELDS_ALWAYS,
QUOTE_FIELDS_ASNEEDED, CSVInputSerialization,
CSVOutputSerialization,
JSONInputSerialization,
JSONOutputSerialization, SelectRequest)
from utils import *
@@ -93,26 +97,22 @@ def test_csv_input_custom_quote_char(client, log_output):
try:
for idx, (quote_char, escape_char, data, expected_output) in enumerate(tests):
sql_opts = SelectObjectOptions(
expression="select * from s3object",
input_serialization=InputSerialization(
compression_type="NONE",
csv=CSVInput(file_header_info="NONE",
record_delimiter="\n",
field_delimiter=",",
quote_character=quote_char,
quote_escape_character=escape_char,
comments="#",
allow_quoted_record_delimiter="FALSE",),
sql_opts = SelectRequest(
"select * from s3object",
CSVInputSerialization(
compression_type=COMPRESSION_TYPE_NONE,
file_header_info=FILE_HEADER_INFO_NONE,
record_delimiter="\n",
field_delimiter=",",
quote_character=quote_char,
quote_escape_character=escape_char,
comments="#",
allow_quoted_record_delimiter="FALSE",
),
output_serialization=OutputSerialization(
json=JSONOutput(
record_delimiter="\n",
)
JSONOutputSerialization(
record_delimiter="\n",
),
request_progress=RequestProgress(
enabled="False"
)
request_progress=False,
)
test_sql_api(f'test_{idx}', client, bucket_name,
@@ -150,30 +150,26 @@ def test_csv_output_custom_quote_char(client, log_output):
try:
for idx, (quote_char, escape_char, input_data, expected_output) in enumerate(tests):
sql_opts = SelectObjectOptions(
expression="select * from s3object",
input_serialization=InputSerialization(
compression_type="NONE",
csv=CSVInput(file_header_info="NONE",
record_delimiter="\n",
field_delimiter=",",
quote_character='"',
quote_escape_character='"',
comments="#",
allow_quoted_record_delimiter="FALSE",
),
sql_opts = SelectRequest(
"select * from s3object",
CSVInputSerialization(
compression_type=COMPRESSION_TYPE_NONE,
file_header_info=FILE_HEADER_INFO_NONE,
record_delimiter="\n",
field_delimiter=",",
quote_character='"',
quote_escape_character='"',
comments="#",
allow_quoted_record_delimiter="FALSE",
),
output_serialization=OutputSerialization(
csv=CSVOutput(quote_fields="ALWAYS",
record_delimiter="\n",
field_delimiter=",",
quote_character=quote_char,
quote_escape_character=escape_char,
)
CSVOutputSerialization(
quote_fields=QUOTE_FIELDS_ALWAYS,
record_delimiter="\n",
field_delimiter=",",
quote_character=quote_char,
quote_escape_character=escape_char,
),
request_progress=RequestProgress(
enabled="False"
)
request_progress=False,
)
test_sql_api(f'test_{idx}', client, bucket_name,