Skip to content

Quick Query Error Fix #11997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiafu-msft merged 1 commit into from
Jun 12, 2020
Merged

Quick Query Error Fix #11997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-blob/azure/storage/blob/_quick_query_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def readinto(self, stream):
def _parse_quick_query_result(self, raw_response_body, stream, progress_callback=None):
parsed_results = DataFileReader(QuickQueryStreamer(raw_response_body), DatumReader())
for parsed_result in parsed_results:
if parsed_result.get('data'):
if 'data' in parsed_result:
stream.write(parsed_result.get('data'))
continue

Expand All @@ -84,7 +84,7 @@ def _parse_quick_query_result(self, raw_response_body, stream, progress_callback
fatal = QuickQueryError(parsed_result['name'],
parsed_result['fatal'],
parsed_result['description'],
parsed_result['position']) if parsed_result.get('fatal') else None
parsed_result['position']) if 'fatal' in parsed_result else None
if progress_callback:
progress_callback(fatal, self.bytes_processed, self.total_bytes)

Expand Down
168 changes: 100 additions & 68 deletions sdk/storage/azure-storage-blob/tests/recordings/test_quick_query.test_quick_query.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,34 @@ interactions:
User-Agent:
- azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0)
x-ms-date:
- Wed, 27 May 2020 21:08:40 GMT
- Fri, 12 Jun 2020 00:56:14 GMT
x-ms-version:
- '2019-12-12'
method: PUT
uri: https://storagename.blob.core.windows.net/utqqcontainerea8e0dd1?restype=container
response:
body:
string: ''
string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerAlreadyExists</Code><Message>The
specified container already exists.\nRequestId:38099a6a-901e-002b-1c54-40cd6c000000\nTime:2020-06-12T00:56:14.6755047Z</Message></Error>"
headers:
content-length:
- '0'
- '230'
content-type:
- application/xml
date:
- Wed, 27 May 2020 21:08:39 GMT
etag:
- '"0x8D80282219CBACC"'
last-modified:
- Wed, 27 May 2020 21:08:40 GMT
- Fri, 12 Jun 2020 00:56:14 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-error-code:
- ContainerAlreadyExists
x-ms-version:
- '2019-12-12'
status:
code: 201
message: Created
code: 409
message: The specified container already exists.
- request:
body: "Service,Package,Version,RepoPath,MissingDocs\r\nApp Configuration,azure-data-appconfiguration,1.0.1,appconfiguration,FALSE\r\nEvent
Hubs,azure-messaging-eventhubs,5.0.1,eventhubs,FALSE\r\nEvent Hubs - Azure Storage
CheckpointStore,azure-messaging-eventhubs-checkpointstore-blob,1.0.1,eventhubs,FALSE\r\nIdentity,azure-identity,1.1.0-beta.1,identity,FALSE\r\nKey
body: "Service,Package,Version,RepoPath,MissingDocs\r\nApp Configuration,azure-data-appconfiguration,1,appconfiguration,FALSE\r\nEvent
Hubs\r\nEvent Hubs - Azure Storage CheckpointStore,azure-messaging-eventhubs-checkpointstore-blob,1.0.1,eventhubs,FALSE\r\nIdentity,azure-identity,1.1.0-beta.1,identity,FALSE\r\nKey
Vault - Certificates,azure-security-keyvault-certificates,4.0.0,keyvault,FALSE\r\nKey
Vault - Keys,azure-security-keyvault-keys,4.2.0-beta.1,keyvault,FALSE\r\nKey
Vault - Secrets,azure-security-keyvault-secrets,4.1.0,keyvault,FALSE\r\nStorage
Expand Down Expand Up @@ -68,17 +68,15 @@ interactions:
Connection:
- keep-alive
Content-Length:
- '2306'
- '2254'
Content-Type:
- application/octet-stream
If-None-Match:
- '*'
User-Agent:
- azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0)
x-ms-blob-type:
- BlockBlob
x-ms-date:
- Wed, 27 May 2020 21:08:40 GMT
- Fri, 12 Jun 2020 00:56:14 GMT
x-ms-version:
- '2019-12-12'
method: PUT
Expand All @@ -90,17 +88,17 @@ interactions:
content-length:
- '0'
content-md5:
- 6qNUJItG1aexpFSF0g7WyA==
- 1pD2vzAWr383Ra8EGUfLvQ==
date:
- Wed, 27 May 2020 21:08:40 GMT
- Fri, 12 Jun 2020 00:56:14 GMT
etag:
- '"0x8D8028221B0EF22"'
- '"0x8D80E6B68609436"'
last-modified:
- Wed, 27 May 2020 21:08:40 GMT
- Fri, 12 Jun 2020 00:56:14 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-content-crc64:
- Egm6/9FcUeU=
- 2OE6jL7EoQ0=
x-ms-request-server-encrypted:
- 'true'
x-ms-version:
Expand All @@ -126,7 +124,7 @@ interactions:
User-Agent:
- azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0)
x-ms-date:
- Wed, 27 May 2020 21:08:40 GMT
- Fri, 12 Jun 2020 00:56:14 GMT
x-ms-version:
- '2019-12-12'
method: POST
Expand Down Expand Up @@ -168,67 +166,67 @@ interactions:
aGF0IGFsbCByZXN1bHRzIGhhdmUgYmVlbiBzZW50LiIsCiAgICAiZmllbGRzIjogWwogICAgICB7
CiAgICAgICAgIm5hbWUiOiAidG90YWxCeXRlcyIsCiAgICAgICAgInR5cGUiOiAibG9uZyIsCiAg
ICAgICAgImRvYyI6ICJUaGUgdG90YWwgbnVtYmVyIG9mIGJ5dGVzIHRvIGJlIHNjYW5uZWQgaW4g
dGhpcyBxdWVyeSIKICAgICAgfQogICAgXQogIH0KXQoA/Ph5PAAL/kiSdydZxH53yALMIwDGI1Nl
dGhpcyBxdWVyeSIKICAgICAgfQogICAgXQogIH0KXQoAhYezjHzUq0y3TkcsyDXihQLkIgDeIlNl
cnZpY2UsUGFja2FnZSxWZXJzaW9uLFJlcG9QYXRoLE1pc3NpbmdEb2NzCkFwcCBDb25maWd1cmF0
aW9uLGF6dXJlLWRhdGEtYXBwY29uZmlndXJhdGlvbiwxLjAuMSxhcHBjb25maWd1cmF0aW9uLEZB
TFNFCkV2ZW50IEh1YnMsYXp1cmUtbWVzc2FnaW5nLWV2ZW50aHVicyw1LjAuMSxldmVudGh1YnMs
RkFMU0UKRXZlbnQgSHVicyAtIEF6dXJlIFN0b3JhZ2UgQ2hlY2twb2ludFN0b3JlLGF6dXJlLW1l
c3NhZ2luZy1ldmVudGh1YnMtY2hlY2twb2ludHN0b3JlLWJsb2IsMS4wLjEsZXZlbnRodWJzLEZB
TFNFCklkZW50aXR5LGF6dXJlLWlkZW50aXR5LDEuMS4wLWJldGEuMSxpZGVudGl0eSxGQUxTRQpL
ZXkgVmF1bHQgLSBDZXJ0aWZpY2F0ZXMsYXp1cmUtc2VjdXJpdHkta2V5dmF1bHQtY2VydGlmaWNh
dGVzLDQuMC4wLGtleXZhdWx0LEZBTFNFCktleSBWYXVsdCAtIEtleXMsYXp1cmUtc2VjdXJpdHkt
a2V5dmF1bHQta2V5cyw0LjIuMC1iZXRhLjEsa2V5dmF1bHQsRkFMU0UKS2V5IFZhdWx0IC0gU2Vj
cmV0cyxhenVyZS1zZWN1cml0eS1rZXl2YXVsdC1zZWNyZXRzLDQuMS4wLGtleXZhdWx0LEZBTFNF
ClN0b3JhZ2UgLSBCbG9icyxhenVyZS1zdG9yYWdlLWJsb2IsMTIuNC4wLHN0b3JhZ2UsRkFMU0UK
U3RvcmFnZSAtIEJsb2JzIEJhdGNoLGF6dXJlLXN0b3JhZ2UtYmxvYi1iYXRjaCwxMi40LjAtYmV0
YS4xLHN0b3JhZ2UsRkFMU0UKU3RvcmFnZSAtIEJsb2JzIENyeXB0b2dyYXBoeSxhenVyZS1zdG9y
YWdlLWJsb2ItY3J5cHRvZ3JhcGh5LDEyLjQuMCxzdG9yYWdlLEZBTFNFClN0b3JhZ2UgLSBGaWxl
IFNoYXJlcyxhenVyZS1zdG9yYWdlLWZpbGUtc2hhcmUsMTIuMi4wLHN0b3JhZ2UsRkFMU0UKU3Rv
cmFnZSAtIFF1ZXVlcyxhenVyZS1zdG9yYWdlLXF1ZXVlLDEyLjMuMCxzdG9yYWdlLEZBTFNFClRl
eHQgQW5hbHl0aWNzLGF6dXJlLWFpLXRleHRhbmFseXRpY3MsMS4wLjAtYmV0YS4yLHRleHRhbmFs
eXRpY3MsRkFMU0UKVHJhY2luZyxhenVyZS1jb3JlLXRyYWNpbmctb3BlbnRlbGVtZXRyeSwxLjAu
MC1iZXRhLjIsY29yZSxGQUxTRQpTZXJ2aWNlLFBhY2thZ2UsVmVyc2lvbixSZXBvUGF0aCxNaXNz
aW5nRG9jcwpBcHAgQ29uZmlndXJhdGlvbixhenVyZS1kYXRhLWFwcGNvbmZpZ3VyYXRpb24sMS4w
LjEsYXBwY29uZmlndXJhdGlvbixGQUxTRQpFdmVudCBIdWJzLGF6dXJlLW1lc3NhZ2luZy1ldmVu
dGh1YnMsNS4wLjEsZXZlbnRodWJzLEZBTFNFCkV2ZW50IEh1YnMgLSBBenVyZSBTdG9yYWdlIENo
ZWNrcG9pbnRTdG9yZSxhenVyZS1tZXNzYWdpbmctZXZlbnRodWJzLWNoZWNrcG9pbnRzdG9yZS1i
bG9iLDEuMC4xLGV2ZW50aHVicyxGQUxTRQpJZGVudGl0eSxhenVyZS1pZGVudGl0eSwxLjEuMC1i
ZXRhLjEsaWRlbnRpdHksRkFMU0UKS2V5IFZhdWx0IC0gQ2VydGlmaWNhdGVzLGF6dXJlLXNlY3Vy
aXR5LWtleXZhdWx0LWNlcnRpZmljYXRlcyw0LjAuMCxrZXl2YXVsdCxGQUxTRQpLZXkgVmF1bHQg
LSBLZXlzLGF6dXJlLXNlY3VyaXR5LWtleXZhdWx0LWtleXMsNC4yLjAtYmV0YS4xLGtleXZhdWx0
LEZBTFNFCktleSBWYXVsdCAtIFNlY3JldHMsYXp1cmUtc2VjdXJpdHkta2V5dmF1bHQtc2VjcmV0
cyw0LjEuMCxrZXl2YXVsdCxGQUxTRQpTdG9yYWdlIC0gQmxvYnMsYXp1cmUtc3RvcmFnZS1ibG9i
LDEyLjQuMCxzdG9yYWdlLEZBTFNFClN0b3JhZ2UgLSBCbG9icyBCYXRjaCxhenVyZS1zdG9yYWdl
LWJsb2ItYmF0Y2gsMTIuNC4wLWJldGEuMSxzdG9yYWdlLEZBTFNFClN0b3JhZ2UgLSBCbG9icyBD
cnlwdG9ncmFwaHksYXp1cmUtc3RvcmFnZS1ibG9iLWNyeXB0b2dyYXBoeSwxMi40LjAsc3RvcmFn
ZSxGQUxTRQpTdG9yYWdlIC0gRmlsZSBTaGFyZXMsYXp1cmUtc3RvcmFnZS1maWxlLXNoYXJlLDEy
LjIuMCxzdG9yYWdlLEZBTFNFClN0b3JhZ2UgLSBRdWV1ZXMsYXp1cmUtc3RvcmFnZS1xdWV1ZSwx
Mi4zLjAsc3RvcmFnZSxGQUxTRQpUZXh0IEFuYWx5dGljcyxhenVyZS1haS10ZXh0YW5hbHl0aWNz
LDEuMC4wLWJldGEuMix0ZXh0YW5hbHl0aWNzLEZBTFNFClRyYWNpbmcsYXp1cmUtY29yZS10cmFj
aW5nLW9wZW50ZWxlbWV0cnksMS4wLjAtYmV0YS4yLGNvcmUsRkFMU0UKU2VydmljZSxQYWNrYWdl
LFZlcnNpb24sUmVwb1BhdGgsTWlzc2luZ0RvY3MKQXBwIENvbmZpZ3VyYXRpb24sYXp1cmUtZGF0
YS1hcHBjb25maWd1cmF0aW9uLDEuMC4xLGFwcGNvbmZpZ3VyYXRpb24sRkFMU0UKRXZlbnQgSHVi
cyxhenVyZS1tZXNzYWdpbmctZXZlbnRodWJzLDUuMC4xLGV2ZW50aHVicyxGQUxTRQr8+Hk8AAv+
SJJ3J1nEfnfIAgoEhCSEJPz4eTwAC/5IkncnWcR+d8gCBgaEJPz4eTwAC/5IkncnWcR+d8g=
aW9uLGF6dXJlLWRhdGEtYXBwY29uZmlndXJhdGlvbiwxLGFwcGNvbmZpZ3VyYXRpb24sRkFMU0UK
RXZlbnQgSHVicwpFdmVudCBIdWJzIC0gQXp1cmUgU3RvcmFnZSBDaGVja3BvaW50U3RvcmUsYXp1
cmUtbWVzc2FnaW5nLWV2ZW50aHVicy1jaGVja3BvaW50c3RvcmUtYmxvYiwxLjAuMSxldmVudGh1
YnMsRkFMU0UKSWRlbnRpdHksYXp1cmUtaWRlbnRpdHksMS4xLjAtYmV0YS4xLGlkZW50aXR5LEZB
TFNFCktleSBWYXVsdCAtIENlcnRpZmljYXRlcyxhenVyZS1zZWN1cml0eS1rZXl2YXVsdC1jZXJ0
aWZpY2F0ZXMsNC4wLjAsa2V5dmF1bHQsRkFMU0UKS2V5IFZhdWx0IC0gS2V5cyxhenVyZS1zZWN1
cml0eS1rZXl2YXVsdC1rZXlzLDQuMi4wLWJldGEuMSxrZXl2YXVsdCxGQUxTRQpLZXkgVmF1bHQg
LSBTZWNyZXRzLGF6dXJlLXNlY3VyaXR5LWtleXZhdWx0LXNlY3JldHMsNC4xLjAsa2V5dmF1bHQs
RkFMU0UKU3RvcmFnZSAtIEJsb2JzLGF6dXJlLXN0b3JhZ2UtYmxvYiwxMi40LjAsc3RvcmFnZSxG
QUxTRQpTdG9yYWdlIC0gQmxvYnMgQmF0Y2gsYXp1cmUtc3RvcmFnZS1ibG9iLWJhdGNoLDEyLjQu
MC1iZXRhLjEsc3RvcmFnZSxGQUxTRQpTdG9yYWdlIC0gQmxvYnMgQ3J5cHRvZ3JhcGh5LGF6dXJl
LXN0b3JhZ2UtYmxvYi1jcnlwdG9ncmFwaHksMTIuNC4wLHN0b3JhZ2UsRkFMU0UKU3RvcmFnZSAt
IEZpbGUgU2hhcmVzLGF6dXJlLXN0b3JhZ2UtZmlsZS1zaGFyZSwxMi4yLjAsc3RvcmFnZSxGQUxT
RQpTdG9yYWdlIC0gUXVldWVzLGF6dXJlLXN0b3JhZ2UtcXVldWUsMTIuMy4wLHN0b3JhZ2UsRkFM
U0UKVGV4dCBBbmFseXRpY3MsYXp1cmUtYWktdGV4dGFuYWx5dGljcywxLjAuMC1iZXRhLjIsdGV4
dGFuYWx5dGljcyxGQUxTRQpUcmFjaW5nLGF6dXJlLWNvcmUtdHJhY2luZy1vcGVudGVsZW1ldHJ5
LDEuMC4wLWJldGEuMixjb3JlLEZBTFNFClNlcnZpY2UsUGFja2FnZSxWZXJzaW9uLFJlcG9QYXRo
LE1pc3NpbmdEb2NzCkFwcCBDb25maWd1cmF0aW9uLGF6dXJlLWRhdGEtYXBwY29uZmlndXJhdGlv
biwxLjAuMSxhcHBjb25maWd1cmF0aW9uLEZBTFNFCkV2ZW50IEh1YnMsYXp1cmUtbWVzc2FnaW5n
LWV2ZW50aHVicyw1LjAuMSxldmVudGh1YnMsRkFMU0UKRXZlbnQgSHVicyAtIEF6dXJlIFN0b3Jh
Z2UgQ2hlY2twb2ludFN0b3JlLGF6dXJlLW1lc3NhZ2luZy1ldmVudGh1YnMtY2hlY2twb2ludHN0
b3JlLWJsb2IsMS4wLjEsZXZlbnRodWJzLEZBTFNFCklkZW50aXR5LGF6dXJlLWlkZW50aXR5LDEu
MS4wLWJldGEuMSxpZGVudGl0eSxGQUxTRQpLZXkgVmF1bHQgLSBDZXJ0aWZpY2F0ZXMsYXp1cmUt
c2VjdXJpdHkta2V5dmF1bHQtY2VydGlmaWNhdGVzLDQuMC4wLGtleXZhdWx0LEZBTFNFCktleSBW
YXVsdCAtIEtleXMsYXp1cmUtc2VjdXJpdHkta2V5dmF1bHQta2V5cyw0LjIuMC1iZXRhLjEsa2V5
dmF1bHQsRkFMU0UKS2V5IFZhdWx0IC0gU2VjcmV0cyxhenVyZS1zZWN1cml0eS1rZXl2YXVsdC1z
ZWNyZXRzLDQuMS4wLGtleXZhdWx0LEZBTFNFClN0b3JhZ2UgLSBCbG9icyxhenVyZS1zdG9yYWdl
LWJsb2IsMTIuNC4wLHN0b3JhZ2UsRkFMU0UKU3RvcmFnZSAtIEJsb2JzIEJhdGNoLGF6dXJlLXN0
b3JhZ2UtYmxvYi1iYXRjaCwxMi40LjAtYmV0YS4xLHN0b3JhZ2UsRkFMU0UKU3RvcmFnZSAtIEJs
b2JzIENyeXB0b2dyYXBoeSxhenVyZS1zdG9yYWdlLWJsb2ItY3J5cHRvZ3JhcGh5LDEyLjQuMCxz
dG9yYWdlLEZBTFNFClN0b3JhZ2UgLSBGaWxlIFNoYXJlcyxhenVyZS1zdG9yYWdlLWZpbGUtc2hh
cmUsMTIuMi4wLHN0b3JhZ2UsRkFMU0UKU3RvcmFnZSAtIFF1ZXVlcyxhenVyZS1zdG9yYWdlLXF1
ZXVlLDEyLjMuMCxzdG9yYWdlLEZBTFNFClRleHQgQW5hbHl0aWNzLGF6dXJlLWFpLXRleHRhbmFs
eXRpY3MsMS4wLjAtYmV0YS4yLHRleHRhbmFseXRpY3MsRkFMU0UKVHJhY2luZyxhenVyZS1jb3Jl
LXRyYWNpbmctb3BlbnRlbGVtZXRyeSwxLjAuMC1iZXRhLjIsY29yZSxGQUxTRQpTZXJ2aWNlLFBh
Y2thZ2UsVmVyc2lvbixSZXBvUGF0aCxNaXNzaW5nRG9jcwpBcHAgQ29uZmlndXJhdGlvbixhenVy
ZS1kYXRhLWFwcGNvbmZpZ3VyYXRpb24sMS4wLjEsYXBwY29uZmlndXJhdGlvbixGQUxTRQpFdmVu
dCBIdWJzLGF6dXJlLW1lc3NhZ2luZy1ldmVudGh1YnMsNS4wLjEsZXZlbnRodWJzLEZBTFNFCoWH
s4x81KtMt05HLMg14oUCCgScI5wjhYezjHzUq0y3TkcsyDXihQIGBpwjhYezjHzUq0y3TkcsyDXi
hQ==
headers:
accept-ranges:
- bytes
content-type:
- avro/binary
date:
- Wed, 27 May 2020 21:08:40 GMT
- Fri, 12 Jun 2020 00:56:14 GMT
etag:
- '"0x8D8028221B0EF22"'
- '"0x8D80E6B68609436"'
last-modified:
- Wed, 27 May 2020 21:08:40 GMT
- Fri, 12 Jun 2020 00:56:14 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
transfer-encoding:
- chunked
x-ms-blob-type:
- BlockBlob
x-ms-creation-time:
- Wed, 27 May 2020 21:08:40 GMT
- Tue, 09 Jun 2020 21:07:15 GMT
x-ms-lease-state:
- available
x-ms-lease-status:
Expand All @@ -238,4 +236,38 @@ interactions:
status:
code: 200
message: OK
- request:
body: null
headers:
Accept:
- '*/*'
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '0'
User-Agent:
- azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0)
x-ms-date:
- Fri, 12 Jun 2020 00:56:15 GMT
x-ms-version:
- '2019-12-12'
method: DELETE
uri: https://storagename.blob.core.windows.net/utqqcontainerea8e0dd1?restype=container
response:
body:
string: ''
headers:
content-length:
- '0'
date:
- Fri, 12 Jun 2020 00:56:14 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-version:
- '2019-12-12'
status:
code: 202
message: Accepted
version: 1
Loading