Projects >> pangool >>d0fbd293af4a5139d076d8337c9da08036385516

Chunk
Conflicting content 
	 * previously serialized and saved in the Distributed Cache like in
	 * {@link DCUtils#serializeToDC(Object, String, Configuration)}.
	 * 
<<<<<<< HEAD
	 * @param 
	 *          The object type.
	 * @param conf
	 *          The Hadoop Configuration.
	 * @param objClass
	 *          The object type class.
	 * @param fileName
	 *          The file name to locate in DC
	 * @param setConf
	 *          If true, will call setConf() if deserialized object is Configurable
	 * @return
=======
	 * @param   The object type.
	 * @param conf The Hadoop Configuration.
	 * @param objClass The object type class.
	 * @param fileName The file name to locate in DC
	 * @param callSetConf If true, will call setConf() if deserialized object is Configurable
>>>>>>> b47f0cde9f4341d59cfdc70ac5122fbf7fa297a8
	 * @throws IOException
	 */
	public static  T loadSerializedObjectInDC(Configuration conf, Class objClass, String fileName,
Solution content 
	 * previously serialized and saved in the Distributed Cache like in
	 * {@link DCUtils#serializeToDC(Object, String, Configuration)}.
	 * 
	 * @param   The object type.
	 * @param conf The Hadoop Configuration.
	 * @param objClass The object type class.
	 * @param fileName The file name to locate in DC
	 * @param callSetConf If true, will call setConf() if deserialized object is Configurable
	 * @throws IOException
	 */
	public static  T loadSerializedObjectInDC(Configuration conf, Class objClass, String fileName,
File
DCUtils.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
		urlMapFields.add(Field.create("url",Type.STRING));
		urlMapFields.add(Field.create("canonicalUrl",Type.STRING));

<<<<<<< HEAD
		TupleMRBuilder grouper = new TupleMRBuilder(conf,"Pangool Url Resolution");
		grouper.addIntermediateSchema(new Schema("urlMap", urlMapFields));
		grouper.addIntermediateSchema(new Schema("urlRegister", urlRegisterFields));
		grouper.setGroupByFields("url");
		grouper.setTupleReducer(new Handler());
		grouper.setOutput(new Path(output), new HadoopOutputFormat(TextOutputFormat.class), Text.class, NullWritable.class);
		grouper.addInput(new Path(input1), new HadoopInputFormat(TextInputFormat.class), new UrlMapProcessor());
		grouper.addInput(new Path(input2), new HadoopInputFormat(TextInputFormat.class), new UrlProcessor());
		grouper.createJob().waitForCompletion(true);
=======
		TupleMRBuilder builder = new TupleMRBuilder(conf,"Pangool Url Resolution");
		builder.addIntermediateSchema(new Schema("urlMap", urlMapFields));
		builder.addIntermediateSchema(new Schema("urlRegister", urlRegisterFields));
		builder.setGroupByFields("url");
		builder.setTupleReducer(new Handler());
		builder.setOutput(new Path(output), new HadoopOutputFormat(TextOutputFormat.class), Text.class, NullWritable.class);
		builder.addInput(new Path(input1), new HadoopInputFormat(TextInputFormat.class), new UrlMapProcessor());
		builder.addInput(new Path(input2), new HadoopInputFormat(TextInputFormat.class), new UrlProcessor());
		return builder.createJob();
	}
>>>>>>> b47f0cde9f4341d59cfdc70ac5122fbf7fa297a8

		return 1;
	}
Solution content 
		urlMapFields.add(Field.create("url",Type.STRING));
		urlMapFields.add(Field.create("canonicalUrl",Type.STRING));

		TupleMRBuilder mr = new TupleMRBuilder(conf,"Pangool Url Resolution");
		mr.addIntermediateSchema(new Schema("urlMap", urlMapFields));
		mr.addIntermediateSchema(new Schema("urlRegister", urlRegisterFields));
		mr.setGroupByFields("url");
		mr.setTupleReducer(new Handler());
		mr.setOutput(new Path(output), new HadoopOutputFormat(TextOutputFormat.class), Text.class, NullWritable.class);
		mr.addInput(new Path(input1), new HadoopInputFormat(TextInputFormat.class), new UrlMapProcessor());
		mr.addInput(new Path(input2), new HadoopInputFormat(TextInputFormat.class), new UrlProcessor());
		mr.createJob().waitForCompletion(true);

		return 1;
	}
File
UrlResolution.java
Developer's decision
Manual
Kind of conflict
Method invocation
Return statement
Variable