Skip to content

Commit 14d937f

Browse files
committed
Prepare streaming mapreduce.
1 parent e7ec79f commit 14d937f

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

lib/protocol-buffers-client.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var ProtocolBuffersClient = function ProtocolBuffersClient(options) {
1111
this._defaults = options || {};
1212
this._connection = riakpbc.createClient(options);
1313
var execute = function(operation, meta) {
14-
this._execute(operation, meta);
14+
return this._execute(operation, meta);
1515
}.bind(this);
1616
this.search = new ProtocolBuffersSearchClient(this._defaults, execute);
1717
this.mapreduce = new ProtocolBuffersMapReduceClient(this._defaults, execute);
@@ -88,9 +88,11 @@ ProtocolBuffersClient.prototype._execute = function(operation, meta, includePara
8888
}
8989

9090
if (includeParameters === false) {
91-
this._connection[operation](callback);
91+
return this._connection[operation](callback);
92+
} else if (meta.chunked) {
93+
return this._connection[operation](meta.requestParameters(), true, callback);
9294
} else {
93-
this._connection[operation](meta.requestParameters(), callback);
95+
return this._connection[operation](meta.requestParameters(), callback);
9496
}
9597
}
9698

lib/protocol-buffers-mapreduce-client.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,16 @@ ProtocolBuffersMapReduceClient.prototype.add = function(inputs) {
1313
ProtocolBuffersMapReduceClient.prototype._run = function(job, options, callback) {
1414
var meta = new ProtocolBuffersMapReduceMeta(this._defaults, options, {callback: callback});
1515
meta.loadData(job.data);
16-
this._execute('mapred', meta);
16+
if (meta.chunked) {
17+
var emitter = this._execute('mapred', meta);
18+
emitter.on('data', function(data) {
19+
emitter.emit('keys', data);
20+
});
21+
emitter.start = function() {};
22+
return emitter;
23+
} else {
24+
this._execute('mapred', meta);
25+
}
1726
}
1827

1928
module.exports = ProtocolBuffersMapReduceClient;

0 commit comments

Comments
 (0)