add more select API e2e tests #163
Conversation
pull from aliyun master
oss2/api.py
Outdated
| :return: file-like object | ||
|
|
||
| :raises: 如果文件不存在，则抛出 :class:`NoSuchKey <oss2.exceptions.NoSuchKey>` ；还可能抛出其他异常 | ||
| """ | ||
| headers = http.CaseInsensitiveDict() | ||
| rangeSelect = False | ||
| if (headers is None): |
There was a problem hiding this comment.
之前的代码中 if 条件判断 没有 括号，这里建议保持风格一致
oss2/api.py
Outdated
| if("Range" in headers): | ||
| rangeSelect = True | ||
|
|
||
| if (rangeSelect == True and (select_params is None or ('AllowQuotedRecordDelimiter' not in select_params or select_params['AllowQuotedRecordDelimiter'] != False))): |
There was a problem hiding this comment.
这里的条件判断是否能通过换行等方式更清晰的展示
另，'AllowQuotedRecordDelimiter' 这个 key 是大小写敏感吗？(从代码里看，是大小写敏感的)
There was a problem hiding this comment.
大小写敏感的，这里的参数会用在Body的XML里，XML是大小写敏感的。为了让用户用起来更舒服，我打算加一个常量类，预定义这些参数名称。
unittests/test_select_object.py
Outdated
| @@ -405,5 +406,32 @@ def test_create_json_meta_with_params2(self, do_request): | |||
| except SelectOperationClientError: | |||
| print("expected error") | |||
|
|
|||
| @patch('oss2.Session.do_request') | |||
| def test_range_select(self, do_request): | |||
| headers = {'Range':[0,9]} | |||
There was a problem hiding this comment.
这里range的表示 和 上面的 bytes0-1 这种是 兼容的吧？
There was a problem hiding this comment.
我把select_object接口改成和get_object一样了，不用header表示range
oss2/api.py
Outdated
| headers = http.CaseInsensitiveDict() | ||
| else: | ||
| if("Range" in headers): | ||
| rangeSelect = True |
There was a problem hiding this comment.
这里是否需要再次 调用 http.CaseInsensitiveDict 以保持统一
| @@ -320,7 +323,27 @@ def test_select_csv_object_none_range(self): | |||
| content += chunk | |||
|
|
|||
| self.assertTrue(len(content) > 0) | |||
|
|
|||
|
|
|||
| def test_create_csv_object_meta_invalid_request(self): | |||
There was a problem hiding this comment.
这个在test_select_json_object.py里有的。test_create_json_meta_with_invalid_parameter, test_create_json_meta_with_invalid_parameter2
| @@ -355,11 +376,24 @@ def test_select_csv_object_with_skip_partial_data(self): | |||
| try: | |||
| for chunk in result: | |||
| content += chunk | |||
| self.assertFalse("expected error did not occur") | |||
There was a problem hiding this comment.
这里的try 是不是 应该 把 select_object 的调用 包括进来？
另，select_params 的 SkipPartialDataRecord key是 bool 还是 string？或者说 这个用例就是用来测试 string类型的参数的？
There was a problem hiding this comment.
这里bool和string都是支持的，因为转成XML后都一样了，客户端代码里没有去做判断。
There was a problem hiding this comment.
这里select_object和put_object一样是不期待有异常抛出的，所以没有放在try里。
tests/test_select_csv_object.py
Outdated
| content = "test\nabc\n" | ||
| self.bucket.put_object(key, content.encode('utf-8')) | ||
| select_params = {'AllowQuotedRecordDelimiter':False} | ||
| headers = {'Range':'bytes=0-1'} |
There was a problem hiding this comment.
之前 GetObject 接口header中的range是个 数组，表示 start end，现在的select_object接口是否仍然这么做？
| headers = {'Range':'bytes=0-1'} | ||
| try: | ||
| self.bucket.select_object(key, "select * from ossobject", None, None, headers) | ||
| self.assertFalse() |
tests/test_select_json_object.py
Outdated
| @@ -50,7 +54,7 @@ def test_select_json_object(self, testCase, sql, input_format): | |||
| testCase.assertEqual(result.status, 206, result.request_id) | |||
| testCase.assertTrue(len(content) > 0) | |||
|
|
|||
| if 'SplitRange' not in input_format and 'LineRange' not in input_format: | |||
| if 'SplitRange' not in input_format and 'LineRange' not in input_format and not key.endswith('.gz'): | |||
There was a problem hiding this comment.
这里判断 CompressionType是不是好一点？
| @@ -639,7 +643,8 @@ def get_object(self, key, | |||
|
|
|||
| def select_object(self, key, sql, | |||
| progress_callback=None, | |||
| select_params=None | |||
| select_params=None, | |||
| byte_range=None | |||
There was a problem hiding this comment.
这里是不是考虑再加个header参数，方便后面功能或者头信息的扩展
No description provided.