-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathPIG-961.patch2
2563 lines (2314 loc) · 108 KB
/
PIG-961.patch2
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
Index: src/org/apache/pig/PigServer.java
===================================================================
--- src/org/apache/pig/PigServer.java (revision 815927)
+++ src/org/apache/pig/PigServer.java (working copy)
@@ -770,7 +770,7 @@
PhysicalPlan pp = compilePp(compiledLp);
// execute using appropriate engine
FileLocalizer.clearDeleteOnFail();
- List<ExecJob> execJobs = pigContext.getExecutionEngine().execute(pp, "execute");
+ List<ExecJob> execJobs = pigContext.getExecutionEngine().execute(pp, "job_pigexec_");
for (ExecJob execJob: execJobs) {
if (execJob.getStatus()==ExecJob.JOB_STATUS.FAILED) {
FileLocalizer.triggerDeleteOnFail();
Index: src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SliceWrapper.java
===================================================================
--- src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SliceWrapper.java (revision 815927)
+++ src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SliceWrapper.java (working copy)
@@ -29,16 +29,17 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
-import java.util.List;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.BlockLocation;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapred.InputSplit;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.RecordReader;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.mapreduce.InputSplit;
+import org.apache.hadoop.mapreduce.RecordReader;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.pig.ExecType;
import org.apache.pig.PigException;
import org.apache.pig.Slice;
@@ -47,7 +48,6 @@
import org.apache.pig.backend.executionengine.PigSlice;
import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
import org.apache.pig.backend.hadoop.datastorage.HDataStorage;
-import org.apache.pig.data.TargetedTuple;
import org.apache.pig.data.Tuple;
import org.apache.pig.data.TupleFactory;
import org.apache.pig.impl.PigContext;
@@ -57,13 +57,13 @@
/**
* Wraps a {@link Slice} in an {@link InputSplit} so it's usable by hadoop.
*/
-public class SliceWrapper implements InputSplit {
+public class SliceWrapper extends InputSplit implements Writable {
private int index;
private ExecType execType;
private Slice wrapped;
private transient FileSystem fs;// transient so it isn't serialized
- private transient JobConf lastConf;
+ private transient Configuration lastConf;
private ArrayList<OperatorKey> targetOps;
public SliceWrapper() {
@@ -113,56 +113,69 @@
}
- public JobConf getJobConf() {
+ public Configuration getJobConf() {
return lastConf;
}
- public RecordReader<Text, Tuple> makeReader(JobConf job) throws IOException {
- lastConf = job;
- DataStorage store = new HDataStorage(ConfigurationUtil.toProperties(job));
+ public RecordReader<Text, Tuple> makeReader(Configuration conf) throws IOException {
+ lastConf = conf;
+ DataStorage store = new HDataStorage(ConfigurationUtil.toProperties(conf));
// if the execution is against Mapred DFS, set
// working dir to /user/<userid>
if(execType == ExecType.MAPREDUCE)
- store.setActiveContainer(store.asContainer("/user/" + job.getUser()));
- PigContext.setPackageImportList((ArrayList<String>)ObjectSerializer.deserialize(job.get("udf.import.list")));
+ store.setActiveContainer(store.asContainer("/user/" + conf.get("user.name")));
+ PigContext.setPackageImportList((ArrayList<String>)ObjectSerializer.deserialize(conf.get("udf.import.list")));
wrapped.init(store);
+
+ conf.set("map.target.ops", ObjectSerializer.serialize(targetOps));
- job.set("map.target.ops", ObjectSerializer.serialize(targetOps));
// Mimic org.apache.hadoop.mapred.FileSplit if feasible...
String[] locations = wrapped.getLocations();
if (locations.length > 0) {
- job.set("map.input.file", locations[0]);
- job.setLong("map.input.start", wrapped.getStart());
- job.setLong("map.input.length", wrapped.getLength());
+ conf.set("map.input.file", locations[0]);
+ conf.setLong("map.input.start", wrapped.getStart());
+ conf.setLong("map.input.length", wrapped.getLength());
}
- return new RecordReader<Text, Tuple>() {
+ return new TupleReader();
+ }
+
+ public class TupleReader extends RecordReader<Text, Tuple> {
+ private Tuple current;
- TupleFactory tupFac = TupleFactory.getInstance();
- public void close() throws IOException {
- wrapped.close();
- }
+ TupleFactory tupFac = TupleFactory.getInstance();
+ public void close() throws IOException {
+ wrapped.close();
+ }
- public Text createKey() {
- return null; // we never use the key!
- }
+ public float getProgress() throws IOException {
+ return wrapped.getProgress();
+ }
- public Tuple createValue() {
- return tupFac.newTuple();
- }
+ @Override
+ public Text getCurrentKey() throws IOException, InterruptedException {
+ return null;
+ }
- public long getPos() throws IOException {
- return wrapped.getPos();
- }
+ @Override
+ public Tuple getCurrentValue() throws IOException, InterruptedException {
+ return current;
+ }
- public float getProgress() throws IOException {
- return wrapped.getProgress();
- }
+ @Override
+ public void initialize(InputSplit inputsplit,
+ TaskAttemptContext taskattemptcontext) throws IOException, InterruptedException {
+
+ }
- public boolean next(Text key, Tuple value) throws IOException {
- return wrapped.next(value);
- }
- };
+ @Override
+ public boolean nextKeyValue() throws IOException, InterruptedException {
+ Tuple t = tupFac.newTuple();
+ boolean result = wrapped.next(t);
+ current = t;
+
+ return result;
+ }
}
public void readFields(DataInput is) throws IOException {
Index: src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/DistinctCombiner.java
===================================================================
--- src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/DistinctCombiner.java (revision 815927)
+++ src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/DistinctCombiner.java (working copy)
@@ -23,11 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.MapReduceBase;
-import org.apache.hadoop.mapred.OutputCollector;
-import org.apache.hadoop.mapred.Reducer;
-import org.apache.hadoop.mapred.Reporter;
+import org.apache.hadoop.mapreduce.Reducer;
import org.apache.pig.impl.io.PigNullableWritable;
import org.apache.pig.impl.io.NullableTuple;
@@ -39,8 +35,7 @@
*/
public class DistinctCombiner {
- public static class Combine extends MapReduceBase
- implements
+ public static class Combine extends
Reducer<PigNullableWritable, NullableTuple, PigNullableWritable, Writable> {
private final Log log = LogFactory.getLog(getClass());
@@ -50,25 +45,23 @@
* Configures the reporter
*/
@Override
- public void configure(JobConf jConf) {
- super.configure(jConf);
+ protected void setup(Context context) throws IOException, InterruptedException {
+ super.setup(context);
pigReporter = new ProgressableReporter();
}
/**
* The reduce function which removes values.
*/
- public void reduce(PigNullableWritable key,
- Iterator<NullableTuple> tupIter,
- OutputCollector<PigNullableWritable, Writable> oc,
- Reporter reporter) throws IOException {
+ protected void reduce(PigNullableWritable key, Iterable<NullableTuple> tupIter, Context context) throws IOException, InterruptedException {
- pigReporter.setRep(reporter);
+ pigReporter.setRep(context);
// Take the first value and the key and collect
// just that.
- NullableTuple val = tupIter.next();
- oc.collect(key, val);
+ Iterator<NullableTuple> iter = tupIter.iterator();
+ NullableTuple val = iter.next();
+ context.write(key, val);
}
}
Index: src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java
===================================================================
--- src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java (revision 815927)
+++ src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java (working copy)
@@ -27,26 +27,26 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.FileOutputFormat;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.OutputFormat;
-import org.apache.hadoop.mapred.RecordWriter;
-import org.apache.hadoop.mapred.OutputCollector;
-import org.apache.hadoop.mapred.Reporter;
+import org.apache.hadoop.mapreduce.RecordWriter;
+import org.apache.hadoop.mapreduce.JobContext;
+import org.apache.hadoop.mapreduce.OutputFormat;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.TaskInputOutputContext;
+import org.apache.hadoop.util.Progressable;
+import org.apache.hadoop.util.ReflectionUtils;
import org.apache.pig.StoreConfig;
import org.apache.pig.StoreFunc;
import org.apache.pig.impl.PigContext;
-import org.apache.pig.impl.io.FileLocalizer;
import org.apache.pig.impl.io.FileSpec;
import org.apache.pig.impl.logicalLayer.schema.Schema;
import org.apache.pig.impl.util.ObjectSerializer;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.util.PlanHelper;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POStoreImpl;
-import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.PigOutputFormat;
/**
* This class is used to have a POStore write to DFS via a output
@@ -59,31 +59,29 @@
* reduce function.
*/
public class MapReducePOStoreImpl extends POStoreImpl {
-
- private PigContext pc;
- private StoreFunc storer;
- private FileSpec sFile;
- private Reporter reporter;
+
+ private Progressable reporter;
private RecordWriter writer;
- private JobConf job;
+ private TaskInputOutputContext job;
private final Log log = LogFactory.getLog(getClass());
public static final String PIG_STORE_CONFIG = "pig.store.config";
- public MapReducePOStoreImpl(JobConf job) {
- this.job = job;
+ public MapReducePOStoreImpl(JobContext job) {
+ this.job = (TaskInputOutputContext)job;
}
- public void setReporter(Reporter reporter) {
+ public void setReporter(Progressable reporter) {
this.reporter = reporter;
}
@Override
public StoreFunc createStoreFunc(FileSpec sFile, Schema schema)
throws IOException {
+
+ Configuration outputConf = job.getConfiguration();
- // set up a new job conf
- JobConf outputConf = new JobConf(job);
+ // set up a new job conf
String tmpPath = PlanHelper.makeStoreTmpPath(sFile.getFileName());
// If the StoreFunc associate with the POStore is implements
@@ -102,9 +100,9 @@
sPrepClass = null;
}
if(sPrepClass != null && OutputFormat.class.isAssignableFrom(sPrepClass)) {
- outputConf.setOutputFormat(sPrepClass);
+ outputConf.setClass("mapred.output.format.class", sPrepClass, OutputFormat.class);
} else {
- outputConf.setOutputFormat(PigOutputFormat.class);
+ outputConf.setClass("mapred.output.format.class", OutputFormat.class, null);
}
// PigOuputFormat will look for pig.storeFunc to actually
@@ -132,42 +130,48 @@
String workPath = outputConf.get("mapred.work.output.dir");
outputConf.set("mapred.work.output.dir",
new Path(workPath, tmpPath).toString());
- OutputFormat outputFormat = outputConf.getOutputFormat();
-
- // Generate a unique part name (part-<task_partition_number>).
- String fileName = getPartName(outputConf);
- // create a new record writer
- writer = outputFormat.getRecordWriter(FileSystem.get(outputConf),
- outputConf, fileName, reporter);
+ OutputFormat outputFormat = null;
+ try {
+ Class c = job.getOutputFormatClass();
+ outputFormat = (OutputFormat)ReflectionUtils.newInstance(c, outputConf);
+
+ // create a new record writer
+ writer = outputFormat.getRecordWriter((TaskAttemptContext)job);
+ }catch(Exception e) {
+ throw new IOException(e);
+ }
+
// return an output collector using the writer we just created.
- return new StoreFuncAdaptor(new OutputCollector()
- {
- @SuppressWarnings({"unchecked"})
- public void collect(Object key, Object value) throws IOException {
- writer.write(key,value);
- }
- });
+ return new StoreFuncAdaptor(job);
}
@Override
public void tearDown() throws IOException{
if (writer != null) {
- writer.close(reporter);
- writer = null;
+ try{
+ writer.close(job);
+ writer = null;
+ }catch(Exception e) {
+ //
+ }
}
}
@Override
public void cleanUp() throws IOException{
if (writer != null) {
- writer.close(reporter);
- writer = null;
+ try{
+ writer.close(job);
+ writer = null;
+ }catch(Exception e) {
+
+ }
}
}
- private String getPartName(JobConf conf) {
+ private String getPartName(Configuration conf) {
int partition = conf.getInt("mapred.task.partition", -1);
NumberFormat numberFormat = NumberFormat.getInstance();
@@ -183,26 +187,30 @@
* collector instead of an output stream to write tuples.
*/
private class StoreFuncAdaptor implements StoreFunc {
- private OutputCollector collector;
+ private TaskInputOutputContext collector;
- public StoreFuncAdaptor(OutputCollector collector) {
+ public StoreFuncAdaptor(TaskInputOutputContext collector) {
this.collector = collector;
}
- @Override
+
public void bindTo(OutputStream os) throws IOException {
}
- @Override
+
public void putNext(Tuple f) throws IOException {
- collector.collect(null,f);
+ try{
+ collector.write(null,f);
+ }catch(Exception e) {
+ throw new IOException(e);
+ }
}
- @Override
+
public void finish() throws IOException {
}
- @Override
+
public Class getStorePreparationClass() throws IOException {
return null;
}
Index: src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
===================================================================
--- src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java (revision 815927)
+++ src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java (working copy)
@@ -25,14 +25,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.io.Text;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.MapReduceBase;
-import org.apache.hadoop.mapred.Mapper;
import org.apache.hadoop.mapred.OutputCollector;
-import org.apache.hadoop.mapred.Reducer;
-import org.apache.hadoop.mapred.Reporter;
+import org.apache.hadoop.mapreduce.JobContext;
+import org.apache.hadoop.mapreduce.Reducer;
import org.apache.log4j.PropertyConfigurator;
import org.apache.pig.PigException;
@@ -48,7 +45,6 @@
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POStore;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.util.PlanHelper;
import org.apache.pig.data.DataType;
-import org.apache.pig.data.TargetedTuple;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.io.PigNullableWritable;
@@ -57,7 +53,6 @@
import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.util.ObjectSerializer;
import org.apache.pig.impl.util.SpillableMemoryManager;
-import org.apache.pig.impl.util.WrappedIOException;
import org.apache.pig.data.DataBag;
import org.apache.pig.impl.io.NullablePartitionWritable;
@@ -87,14 +82,14 @@
*/
public class PigMapReduce {
- public static JobConf sJobConf = null;
+ public static JobContext sJobContext = null;
+ public static Configuration sJobConf = null;
private final static Tuple DUMMYTUPLE = null;
- public static class Map extends PigMapBase implements
- Mapper<Text, Tuple, PigNullableWritable, Writable> {
+ public static class Map extends PigMapBase {
@Override
- public void collect(OutputCollector<PigNullableWritable, Writable> oc, Tuple tuple) throws ExecException, IOException {
+ public void collect(Context oc, Tuple tuple) throws ExecException, IOException {
Byte index = (Byte)tuple.get(0);
PigNullableWritable key =
HDataType.getWritableComparableTypes(tuple.get(1), keyType);
@@ -105,7 +100,11 @@
// assign the tuple to its slot in the projection.
key.setIndex(index);
val.setIndex(index);
- oc.collect(key, val);
+ try {
+ oc.write(key, val);
+ }catch(Exception e) {
+ throw new IOException(e);
+ }
}
}
@@ -115,12 +114,10 @@
* to be handed tuples. Hence this map class ensures that the "key" used
* in the order by is wrapped into a tuple (if it isn't already a tuple)
*/
- public static class MapWithComparator extends PigMapBase implements
- Mapper<Text, Tuple, PigNullableWritable, Writable> {
+ public static class MapWithComparator extends PigMapBase {
@Override
- public void collect(OutputCollector<PigNullableWritable, Writable> oc,
- Tuple tuple) throws ExecException, IOException {
+ public void collect(Context oc, Tuple tuple) throws ExecException, IOException {
Object keyTuple = null;
if(keyType != DataType.TUPLE) {
Object k = tuple.get(1);
@@ -140,18 +137,21 @@
// assign the tuple to its slot in the projection.
key.setIndex(index);
val.setIndex(index);
- oc.collect(key, val);
+ try {
+ oc.write(key, val);
+ }catch(Exception e) {
+ throw new IOException(e);
+ }
}
}
/**
* Used by Skewed Join
*/
- public static class MapWithPartitionIndex extends Map implements
- Mapper<Text, Tuple, PigNullableWritable, Writable> {
+ public static class MapWithPartitionIndex extends Map {
@Override
- public void collect(OutputCollector<PigNullableWritable, Writable> oc, Tuple tuple) throws ExecException, IOException {
+ public void collect(Context oc, Tuple tuple) throws ExecException, IOException {
Byte tupleKeyIdx = 2;
Byte tupleValIdx = 3;
@@ -183,8 +183,11 @@
// set the partition
wrappedKey.setPartition(partitionIndex);
val.setIndex(index);
- oc.collect(wrappedKey, val);
- //oc.collect(key, val);
+ try{
+ oc.write(wrappedKey, val);
+ }catch(Exception e) {
+ throw new IOException(e);
+ }
}
@Override
@@ -235,9 +238,7 @@
}
}
- public static class Reduce extends MapReduceBase
- implements
- Reducer<PigNullableWritable, NullableTuple, PigNullableWritable, Writable> {
+ public static class Reduce extends Reducer <PigNullableWritable, NullableTuple, PigNullableWritable, Writable>{
protected final Log log = LogFactory.getLog(getClass());
//The reduce plan
@@ -255,7 +256,7 @@
ProgressableReporter pigReporter;
- protected OutputCollector<PigNullableWritable, Writable> outputCollector;
+ protected Context outputCollector;
protected boolean errorInReduce = false;
@@ -271,10 +272,14 @@
* and the reporter thread
*/
@Override
- public void configure(JobConf jConf) {
- super.configure(jConf);
+
+ protected void setup(Context context) throws IOException, InterruptedException {
+ super.setup(context);
+
+ Configuration jConf = context.getConfiguration();
SpillableMemoryManager.configure(ConfigurationUtil.toProperties(jConf));
- sJobConf = jConf;
+ sJobContext = context;
+ sJobConf = context.getConfiguration();
try {
PigContext.setPackageImportList((ArrayList<String>)ObjectSerializer.deserialize(jConf.get("udf.import.list")));
pigContext = (PigContext)ObjectSerializer.deserialize(jConf.get("pig.pigContext"));
@@ -314,37 +319,34 @@
* into key, Bag<Tuple> after converting Hadoop type key into Pig type.
* The package result is either collected as is, if the reduce plan is
* empty or after passing through the reduce plan.
- */
- public void reduce(PigNullableWritable key,
- Iterator<NullableTuple> tupIter,
- OutputCollector<PigNullableWritable, Writable> oc,
- Reporter reporter) throws IOException {
-
- if (!initialized) {
+ */
+ protected void reduce(PigNullableWritable key, Iterable<NullableTuple> tupIter, Context context) throws IOException, InterruptedException {
+ if (!initialized) {
initialized = true;
// cache the collector for use in runPipeline()
// which could additionally be called from close()
- this.outputCollector = oc;
- pigReporter.setRep(reporter);
+ this.outputCollector = context;
+ pigReporter.setRep(context);
PhysicalOperator.setReporter(pigReporter);
boolean aggregateWarning = "true".equalsIgnoreCase(pigContext.getProperties().getProperty("aggregate.warning"));
PigHadoopLogger pigHadoopLogger = PigHadoopLogger.getInstance();
pigHadoopLogger.setAggregate(aggregateWarning);
- pigHadoopLogger.setReporter(reporter);
+ pigHadoopLogger.setReporter(context);
+
PhysicalOperator.setPigLogger(pigHadoopLogger);
for (POStore store: stores) {
MapReducePOStoreImpl impl
- = new MapReducePOStoreImpl(PigMapReduce.sJobConf);
- impl.setReporter(reporter);
+ = new MapReducePOStoreImpl(PigMapReduce.sJobContext);
+ impl.setReporter(context);
store.setStoreImpl(impl);
store.setUp();
}
}
-
+
// In the case we optimize the join, we combine
// POPackage and POForeach - so we could get many
// tuples out of the getnext() call of POJoinPackage
@@ -352,24 +354,24 @@
// POJoinPacakage.getNext()
if (pack instanceof POJoinPackage)
{
- pack.attachInput(key, tupIter);
+ pack.attachInput(key, tupIter.iterator());
while (true)
{
- if (processOnePackageOutput(oc))
+ if (processOnePackageOutput(context))
break;
}
}
else {
// join is not optimized, so package will
// give only one tuple out for the key
- pack.attachInput(key, tupIter);
- processOnePackageOutput(oc);
- }
+ pack.attachInput(key, tupIter.iterator());
+ processOnePackageOutput(context);
+ }
}
// return: false-more output
// true- end of processing
- public boolean processOnePackageOutput(OutputCollector<PigNullableWritable, Writable> oc) throws IOException
+ public boolean processOnePackageOutput(Context oc) throws IOException
{
try {
Result res = pack.getNext(DUMMYTUPLE);
@@ -377,7 +379,7 @@
Tuple packRes = (Tuple)res.result;
if(rp.isEmpty()){
- oc.collect(null, packRes);
+ oc.write(null, packRes);
return false;
}
for (int i = 0; i < roots.length; i++) {
@@ -402,8 +404,9 @@
}
return false;
- } catch (ExecException e) {
- throw e;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new IOException(e);
}
}
@@ -417,7 +420,11 @@
{
Result redRes = leaf.getNext(DUMMYTUPLE);
if(redRes.returnStatus==POStatus.STATUS_OK){
- outputCollector.collect(null, (Tuple)redRes.result);
+ try{
+ outputCollector.write(null, (Tuple)redRes.result);
+ }catch(Exception e) {
+ throw new IOException(e);
+ }
continue;
}
@@ -454,8 +461,9 @@
* processed. So right place to stop the reporter thread.
*/
@Override
- public void close() throws IOException {
- super.close();
+
+ protected void cleanup(Context context) throws IOException, InterruptedException {
+ super.cleanup(context);
if(errorInReduce) {
// there was an error in reduce - just return
@@ -480,7 +488,7 @@
for (POStore store: stores) {
if (!initialized) {
MapReducePOStoreImpl impl
- = new MapReducePOStoreImpl(PigMapReduce.sJobConf);
+ = new MapReducePOStoreImpl(PigMapReduce.sJobContext);
store.setStoreImpl(impl);
store.setUp();
}
@@ -518,8 +526,8 @@
* and the reporter thread
*/
@Override
- public void configure(JobConf jConf) {
- super.configure(jConf);
+ protected void setup(Context context) throws IOException, InterruptedException {
+ super.setup(context);
keyType = pack.getKeyType();
}
@@ -529,31 +537,30 @@
* The package result is either collected as is, if the reduce plan is
* empty or after passing through the reduce plan.
*/
- public void reduce(PigNullableWritable key,
- Iterator<NullableTuple> tupIter,
- OutputCollector<PigNullableWritable, Writable> oc,
- Reporter reporter) throws IOException {
+ protected void reduce(PigNullableWritable key, Iterable<NullableTuple> tupIter, Context context)
+ throws IOException, InterruptedException {
if (!initialized) {
initialized = true;
// cache the collector for use in runPipeline()
// which could additionally be called from close()
- this.outputCollector = oc;
- pigReporter.setRep(reporter);
+ this.outputCollector = context;
+ pigReporter.setRep(context);
PhysicalOperator.setReporter(pigReporter);
boolean aggregateWarning = "true".equalsIgnoreCase(pigContext.getProperties().getProperty("aggregate.warning"));
PigHadoopLogger pigHadoopLogger = PigHadoopLogger.getInstance();
pigHadoopLogger.setAggregate(aggregateWarning);
- pigHadoopLogger.setReporter(reporter);
+ pigHadoopLogger.setReporter(context);
PhysicalOperator.setPigLogger(pigHadoopLogger);
for (POStore store: stores) {
MapReducePOStoreImpl impl
- = new MapReducePOStoreImpl(PigMapReduce.sJobConf);
- impl.setReporter(reporter);
+ = new MapReducePOStoreImpl(PigMapReduce.sJobContext);
+
+ impl.setReporter(context);
store.setStoreImpl(impl);
store.setUp();
}
@@ -573,7 +580,7 @@
}
}
- pack.attachInput(key, tupIter);
+ pack.attachInput(key, tupIter.iterator());
try {
Result res = pack.getNext(DUMMYTUPLE);
@@ -581,7 +588,7 @@
Tuple packRes = (Tuple)res.result;
if(rp.isEmpty()){
- oc.collect(null, packRes);
+ context.write(null, packRes);
return;
}
@@ -611,5 +618,5 @@
}
}
-
+
}
Index: src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
===================================================================
--- src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java (revision 815927)
+++ src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java (working copy)
@@ -19,17 +19,17 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.MapReduceBase;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
+import org.apache.hadoop.mapreduce.Mapper;
+import org.apache.hadoop.mapreduce.Mapper.Context;
import org.apache.log4j.PropertyConfigurator;
import org.apache.pig.PigException;
import org.apache.pig.backend.executionengine.ExecException;
@@ -50,7 +50,7 @@
import org.apache.pig.impl.util.ObjectSerializer;
import org.apache.pig.impl.util.SpillableMemoryManager;
-public abstract class PigMapBase extends MapReduceBase{
+public abstract class PigMapBase extends Mapper<Text, Tuple, PigNullableWritable, Writable>{
private static final Tuple DUMMYTUPLE = null;
private final Log log = LogFactory.getLog(getClass());
@@ -66,7 +66,7 @@
protected TupleFactory tf = TupleFactory.getInstance();
- OutputCollector<PigNullableWritable, Writable> outputCollector;
+ Context outputCollector;
// Reporter that will be used by operators
// to transmit heartbeat
@@ -86,9 +86,8 @@
* are done. So reporter thread should be closed.
*/
@Override
- public void close() throws IOException {
- super.close();
-
+ public void cleanup(Context context) throws IOException, InterruptedException {
+ super.cleanup(context);
if(errorInMap) {
//error in map - returning
return;
@@ -112,7 +111,7 @@
for (POStore store: stores) {
if (!initialized) {
MapReducePOStoreImpl impl
- = new MapReducePOStoreImpl(PigMapReduce.sJobConf);
+ = new MapReducePOStoreImpl(PigMapReduce.sJobContext);
store.setStoreImpl(impl);
store.setUp();
}
@@ -140,10 +139,13 @@
* reproter thread
*/
@Override
- public void configure(JobConf job) {
- super.configure(job);
+ public void setup(Context context) throws IOException, InterruptedException{
+ super.setup(context);
+
+ Configuration job = context.getConfiguration();
SpillableMemoryManager.configure(ConfigurationUtil.toProperties(job));
- PigMapReduce.sJobConf = job;
+ PigMapReduce.sJobContext = context;
+ PigMapReduce.sJobConf = context.getConfiguration();
try {
PigContext.setPackageImportList((ArrayList<String>)ObjectSerializer.deserialize(job.get("udf.import.list")));
pigContext = (PigContext)ObjectSerializer.deserialize(job.get("pig.pigContext"));
@@ -169,6 +171,7 @@
pigReporter = new ProgressableReporter();
if(!(mp.isEmpty())) {
+
List<OperatorKey> targetOpKeys =
(ArrayList<OperatorKey>)ObjectSerializer.deserialize(job.get("map.target.ops"));
ArrayList<PhysicalOperator> targetOpsAsList = new ArrayList<PhysicalOperator>();
@@ -176,7 +179,7 @@
targetOpsAsList.add(mp.getOperator(targetKey));
}
roots = targetOpsAsList.toArray(new PhysicalOperator[1]);
- leaf = mp.getLeaves().get(0);
+ leaf = mp.getLeaves().get(0);
}
@@ -195,23 +198,20 @@
* map-only or map-reduce job to implement. Map-only collects
* the tuple as-is whereas map-reduce collects it after extracting
* the key and indexed tuple.
- */
- public void map(Text key, Tuple inpTuple,
- OutputCollector<PigNullableWritable, Writable> oc,
- Reporter reporter) throws IOException {
-
- if(!initialized) {
+ */
+ protected void map(Text key, Tuple inpTuple, Context context) throws IOException, InterruptedException {
+ if(!initialized) {
initialized = true;
// cache the collector for use in runPipeline() which
// can be called from close()
- this.outputCollector = oc;
- pigReporter.setRep(reporter);
+ this.outputCollector = context;
+ pigReporter.setRep(context);
PhysicalOperator.setReporter(pigReporter);
for (POStore store: stores) {
MapReducePOStoreImpl impl
- = new MapReducePOStoreImpl(PigMapReduce.sJobConf);
- impl.setReporter(reporter);
+ = new MapReducePOStoreImpl(PigMapReduce.sJobContext);
+ impl.setReporter(context);
store.setStoreImpl(impl);
store.setUp();
}
@@ -220,13 +220,13 @@
PigHadoopLogger pigHadoopLogger = PigHadoopLogger.getInstance();
pigHadoopLogger.setAggregate(aggregateWarning);
- pigHadoopLogger.setReporter(reporter);
+ pigHadoopLogger.setReporter(context);
PhysicalOperator.setPigLogger(pigHadoopLogger);
}
if(mp.isEmpty()){
try{
- collect(oc,inpTuple);
+ collect(context,inpTuple);
} catch (ExecException e) {
throw e;
}
@@ -281,7 +281,7 @@
}
- abstract public void collect(OutputCollector<PigNullableWritable, Writable> oc, Tuple tuple) throws ExecException, IOException;
+ abstract public void collect(Context oc, Tuple tuple) throws ExecException, IOException;
/**
* @return the keyType
Index: src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigHadoopLogger.java
===================================================================
--- src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigHadoopLogger.java (revision 815927)
+++ src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigHadoopLogger.java (working copy)
@@ -19,9 +19,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.mapred.Reporter;
+import org.apache.hadoop.util.Progressable;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.PigLogger;
-import org.apache.pig.backend.hadoop.executionengine.physicalLayer.PigProgressable;
/**
*
@@ -40,7 +39,7 @@
}
private static Log log = LogFactory.getLog(PigHadoopLogger.class);
- private Reporter reporter = null;
+ private Progressable reporter = null;
private boolean aggregate = false;
private PigHadoopLogger() {
@@ -50,7 +49,7 @@
String displayMessage = o.getClass().getName() + ": " + msg;
if(aggregate) {
if(reporter != null) {
- reporter.incrCounter(warningEnum, 1);
+ //reporter.incrCounter(warningEnum, 1);
} else {
//TODO:
//in local mode of execution if the PigHadoopLogger is used initially,
@@ -67,11 +66,11 @@
}
}
- public Reporter getReporter() {
+ public Progressable getReporter() {
return reporter;
}
- public synchronized void setReporter(Reporter rep) {
+ public synchronized void setReporter(Progressable rep) {
this.reporter = rep;
}
Index: src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ProgressableReporter.java
===================================================================
--- src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ProgressableReporter.java (revision 815927)