Skip to content

Commit 84feb33

Browse files
committed
Fix job file configuration
1 parent 5a1419b commit 84feb33

5 files changed

Lines changed: 20 additions & 9 deletions

File tree

docs/modules/mapreduce.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
**Returns:** <Key, Value\>(`mapper`: [*Mapper*](../interfaces/types.mapper.md)<Key, Value\>, `combiner`: [*Reducer*](../interfaces/types.reducer.md)<Key, Value\> \| *undefined*, `args`: [*MapReduceRuntimeConfig*](../interfaces/types.mapreduceruntimeconfig.md)<Key, Value\>, `options`: DatabaseCopyOptions) => *Promise*<void\>
3030

31-
Defined in: [src/mapreduce.ts:201](https://github.com/wholebuzz/mapreduce/blob/master/src/mapreduce.ts#L201)
31+
Defined in: [src/mapreduce.ts:204](https://github.com/wholebuzz/mapreduce/blob/master/src/mapreduce.ts#L204)
3232

3333
___
3434

@@ -45,7 +45,7 @@ ___
4545

4646
**Returns:** *Promise*<[*InputSplit*](../interfaces/config.inputsplit.md)[]\>
4747

48-
Defined in: [src/mapreduce.ts:346](https://github.com/wholebuzz/mapreduce/blob/master/src/mapreduce.ts#L346)
48+
Defined in: [src/mapreduce.ts:349](https://github.com/wholebuzz/mapreduce/blob/master/src/mapreduce.ts#L349)
4949

5050
___
5151

@@ -98,7 +98,7 @@ ___
9898

9999
**Returns:** *Promise*<void\>
100100

101-
Defined in: [src/mapreduce.ts:278](https://github.com/wholebuzz/mapreduce/blob/master/src/mapreduce.ts#L278)
101+
Defined in: [src/mapreduce.ts:281](https://github.com/wholebuzz/mapreduce/blob/master/src/mapreduce.ts#L281)
102102

103103
___
104104

@@ -124,7 +124,7 @@ ___
124124

125125
**Returns:** *Promise*<void\>
126126

127-
Defined in: [src/mapreduce.ts:238](https://github.com/wholebuzz/mapreduce/blob/master/src/mapreduce.ts#L238)
127+
Defined in: [src/mapreduce.ts:241](https://github.com/wholebuzz/mapreduce/blob/master/src/mapreduce.ts#L241)
128128

129129
___
130130

@@ -149,4 +149,4 @@ ___
149149

150150
**Returns:** *Promise*<void\>
151151

152-
Defined in: [src/mapreduce.ts:212](https://github.com/wholebuzz/mapreduce/blob/master/src/mapreduce.ts#L212)
152+
Defined in: [src/mapreduce.ts:215](https://github.com/wholebuzz/mapreduce/blob/master/src/mapreduce.ts#L215)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@wholebuzz/mapreduce",
3-
"version": "0.0.18",
3+
"version": "0.0.19",
44
"description": "Communication-free MapReduce for the 99%",
55
"keywords": [
66
"mapreduce"

src/cli.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,15 @@ async function main() {
282282
throw new Error('No outputPath')
283283
}
284284
try {
285-
await mapReduce(await prepareRuntime(fileSystem, logger, { ...options, configuration }))
285+
await mapReduce(
286+
await prepareRuntime(fileSystem, logger, {
287+
...options,
288+
configuration: {
289+
...options.configuration,
290+
...configuration,
291+
},
292+
})
293+
)
286294
returnValue = { inputPaths: args.inputPaths, outputPath: args.outputPath }
287295
} catch (err) {
288296
logger.info(err.message)

src/mapreduce.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ export async function mapReduce<Key, Value>(args: MapReduceRuntimeConfig<Key, Va
4747
if (!shuffleDirectory.endsWith('/')) throw new Error('shuffleDirectory should end with slash')
4848
if (args.logger) {
4949
args.logger.info(`mapReduce configuration ${JSON.stringify(args.configuration ?? {})}`)
50+
if ((args.inputShardFilter || args.outputShardFilter) && !args.shuffleDirectory) {
51+
args.logger.info(`WARNING: no shuffleDirectory specified`)
52+
}
5053
}
5154

5255
// Since local files show partial writes they need extra synchronization
@@ -87,7 +90,7 @@ export async function mapReduce<Key, Value>(args: MapReduceRuntimeConfig<Key, Va
8790
},
8891
],
8992
inputShardIndex: inputSplit,
90-
orderBy: args.inputShardBy ? [ args.inputShardBy ] : undefined,
93+
orderBy: args.inputShardBy ? [args.inputShardBy] : undefined,
9194
// dir/shuffle-SSSS-of-NNNN.inputshard-0000-of-0004.jsonl.gz
9295
outputFile:
9396
(args.unpatchReduce ? args.outputPath : shuffleDirectory + `${shuffleFilenameFormat}`) +

src/plugins.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@ export function getSubPropertySetter(path: string): (_: Record<string, any>, val
167167
} else {
168168
return (x, value) => setSubProperty(x, nested, value)
169169
}
170-
}
170+
}

0 commit comments

Comments
 (0)