mirror of https://github.com/grpc/grpc.git
Merge pull request #13672 from nathanielmanistaatgoogle/12531
Streamline metadata in gRPC Python.pull/13667/head
commit
5cff6d3c2d
22 changed files with 291 additions and 318 deletions
@ -0,0 +1,26 @@ |
||||
# Copyright 2017 gRPC authors. |
||||
# |
||||
# Licensed under the Apache License, Version 2.0 (the "License"); |
||||
# you may not use this file except in compliance with the License. |
||||
# You may obtain a copy of the License at |
||||
# |
||||
# http://www.apache.org/licenses/LICENSE-2.0 |
||||
# |
||||
# Unless required by applicable law or agreed to in writing, software |
||||
# distributed under the License is distributed on an "AS IS" BASIS, |
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
# See the License for the specific language governing permissions and |
||||
# limitations under the License. |
||||
|
||||
|
||||
cdef void _store_c_metadata( |
||||
metadata, grpc_metadata **c_metadata, size_t *c_count) |
||||
|
||||
|
||||
cdef void _release_c_metadata(grpc_metadata *c_metadata, int count) |
||||
|
||||
|
||||
cdef tuple _metadatum(grpc_slice key_slice, grpc_slice value_slice) |
||||
|
||||
|
||||
cdef tuple _metadata(grpc_metadata_array *c_metadata_array) |
@ -0,0 +1,62 @@ |
||||
# Copyright 2017 gRPC authors. |
||||
# |
||||
# Licensed under the Apache License, Version 2.0 (the "License"); |
||||
# you may not use this file except in compliance with the License. |
||||
# You may obtain a copy of the License at |
||||
# |
||||
# http://www.apache.org/licenses/LICENSE-2.0 |
||||
# |
||||
# Unless required by applicable law or agreed to in writing, software |
||||
# distributed under the License is distributed on an "AS IS" BASIS, |
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
# See the License for the specific language governing permissions and |
||||
# limitations under the License. |
||||
|
||||
import collections |
||||
|
||||
|
||||
_Metadatum = collections.namedtuple('_Metadatum', ('key', 'value',)) |
||||
|
||||
|
||||
cdef void _store_c_metadata( |
||||
metadata, grpc_metadata **c_metadata, size_t *c_count): |
||||
if metadata is None: |
||||
c_count[0] = 0 |
||||
c_metadata[0] = NULL |
||||
else: |
||||
metadatum_count = len(metadata) |
||||
if metadatum_count == 0: |
||||
c_count[0] = 0 |
||||
c_metadata[0] = NULL |
||||
else: |
||||
c_count[0] = metadatum_count |
||||
c_metadata[0] = <grpc_metadata *>gpr_malloc( |
||||
metadatum_count * sizeof(grpc_metadata)) |
||||
for index, (key, value) in enumerate(metadata): |
||||
encoded_key = _encode(key) |
||||
encoded_value = value if encoded_key[-4:] == b'-bin' else _encode(value) |
||||
c_metadata[0][index].key = _slice_from_bytes(encoded_key) |
||||
c_metadata[0][index].value = _slice_from_bytes(encoded_value) |
||||
|
||||
|
||||
cdef void _release_c_metadata(grpc_metadata *c_metadata, int count): |
||||
if 0 < count: |
||||
for index in range(count): |
||||
grpc_slice_unref(c_metadata[index].key) |
||||
grpc_slice_unref(c_metadata[index].value) |
||||
gpr_free(c_metadata) |
||||
|
||||
|
||||
cdef tuple _metadatum(grpc_slice key_slice, grpc_slice value_slice): |
||||
cdef bytes key = _slice_bytes(key_slice) |
||||
cdef bytes value = _slice_bytes(value_slice) |
||||
return <tuple>_Metadatum( |
||||
_decode(key), value if key[-4:] == b'-bin' else _decode(value)) |
||||
|
||||
|
||||
cdef tuple _metadata(grpc_metadata_array *c_metadata_array): |
||||
return tuple( |
||||
_metadatum( |
||||
c_metadata_array.metadata[index].key, |
||||
c_metadata_array.metadata[index].value) |
||||
for index in range(c_metadata_array.count)) |
@ -0,0 +1,49 @@ |
||||
# Copyright 2017 gRPC authors. |
||||
# |
||||
# Licensed under the Apache License, Version 2.0 (the "License"); |
||||
# you may not use this file except in compliance with the License. |
||||
# You may obtain a copy of the License at |
||||
# |
||||
# http://www.apache.org/licenses/LICENSE-2.0 |
||||
# |
||||
# Unless required by applicable law or agreed to in writing, software |
||||
# distributed under the License is distributed on an "AS IS" BASIS, |
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
# See the License for the specific language governing permissions and |
||||
# limitations under the License. |
||||
"""API metadata conversion utilities.""" |
||||
|
||||
import collections |
||||
|
||||
_Metadatum = collections.namedtuple('_Metadatum', ('key', 'value',)) |
||||
|
||||
|
||||
def _beta_metadatum(key, value): |
||||
beta_key = key if isinstance(key, (bytes,)) else key.encode('ascii') |
||||
beta_value = value if isinstance(value, (bytes,)) else value.encode('ascii') |
||||
return _Metadatum(beta_key, beta_value) |
||||
|
||||
|
||||
def _metadatum(beta_key, beta_value): |
||||
key = beta_key if isinstance(beta_key, (str,)) else beta_key.decode('utf8') |
||||
if isinstance(beta_value, (str,)) or key[-4:] == '-bin': |
||||
value = beta_value |
||||
else: |
||||
value = beta_value.decode('utf8') |
||||
return _Metadatum(key, value) |
||||
|
||||
|
||||
def beta(metadata): |
||||
if metadata is None: |
||||
return () |
||||
else: |
||||
return tuple(_beta_metadatum(key, value) for key, value in metadata) |
||||
|
||||
|
||||
def unbeta(beta_metadata): |
||||
if beta_metadata is None: |
||||
return () |
||||
else: |
||||
return tuple( |
||||
_metadatum(beta_key, beta_value) |
||||
for beta_key, beta_value in beta_metadata) |
Loading…
Reference in new issue