grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into flatmap

This commit is contained in:
Justin Beckwith 2018-11-15 15:13:35 -08:00 committed by GitHub
parent cc1d1f4913 fd082c642d
commit 2d046cda97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-native-core/src/client.js
View File

@ -950,7 +950,7 @@ exports.makeClientConstructor = function(methods, serviceName,
} }
ServiceClient.prototype.$method_names[attrs.path] = name; ServiceClient.prototype.$method_names[attrs.path] = name;
// Associate all provided attributes with the method // Associate all provided attributes with the method
_.assign(ServiceClient.prototype[name], attrs); Object.assign(ServiceClient.prototype[name], attrs);
if (attrs.originalName) { if (attrs.originalName) {
ServiceClient.prototype[attrs.originalName] = ServiceClient.prototype[attrs.originalName] =
ServiceClient.prototype[name]; ServiceClient.prototype[name];

2
packages/grpc-native-core/src/client_interceptors.js
View File

@ -751,7 +751,7 @@ function _startBatchIfReady(call, batch, batch_state, callback) {
// Dependencies are met, start the batch and any deferred batches whose // Dependencies are met, start the batch and any deferred batches whose
// dependencies are met as a result. // dependencies are met as a result.
call.startBatch(batch, callback); call.startBatch(batch, callback);
completed_ops = _.union(completed_ops, batch_ops); completed_ops = Array.from(new Set(completed_ops.concat(batch_ops)));
deferred_batches = common.flatMap(deferred_batches, function(deferred_batch) { deferred_batches = common.flatMap(deferred_batches, function(deferred_batch) {
var deferred_batch_ops = Object.keys(deferred_batch).map(Number); var deferred_batch_ops = Object.keys(deferred_batch).map(Number);
if (_areBatchRequirementsMet(deferred_batch_ops, completed_ops)) { if (_areBatchRequirementsMet(deferred_batch_ops, completed_ops)) {