Projects >> pig >>78934c33a830c989c2eecb042e6e06ed4df37d2e

Chunk
Conflicting content
        markPredeployedJarsFromProperties();

        PigStats.start(pigContext.getExecutionEngine().instantiatePigStats());
<<<<<<< HEAD
        // ScriptState may have been initialized in Main. In that case, we
        // should not overwrite it.
=======

>>>>>>> 98fb4d9d0f43b887b7ddfff68df8bc17f80c6808
        if (ScriptState.get() == null) {
            // If Pig was started via command line, ScriptState should have been
            // already initialized in Main. If so, we should not overwrite it.
Solution content
        markPredeployedJarsFromProperties();

        PigStats.start(pigContext.getExecutionEngine().instantiatePigStats());

        if (ScriptState.get() == null) {
            // If Pig was started via command line, ScriptState should have been
            // already initialized in Main. If so, we should not overwrite it.
File
PigServer.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.PigContext;
<<<<<<< HEAD
import org.apache.pig.impl.io.FileLocalizer;
=======
import org.apache.pig.impl.PigImplConstants;
>>>>>>> 98fb4d9d0f43b887b7ddfff68df8bc17f80c6808
import org.apache.pig.impl.io.InterStorage;
import org.apache.pig.impl.io.ReadToEndLoader;
import org.apache.pig.impl.io.SequenceFileInterStorage;
Solution content
import org.apache.pig.data.DataType;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.io.FileLocalizer;
import org.apache.pig.impl.PigImplConstants;
import org.apache.pig.impl.io.InterStorage;
import org.apache.pig.impl.io.ReadToEndLoader;
import org.apache.pig.impl.io.SequenceFileInterStorage;
File
Utils.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content
                          + "describe b;"
                          + "store b into '/tmp/output1';\n";

<<<<<<< HEAD
            GruntParser parser = new GruntParser(new StringReader(script));
=======
            GruntParser parser = new GruntParser(new StringReader(script), myPig);
>>>>>>> 98fb4d9d0f43b887b7ddfff68df8bc17f80c6808
            parser.setInteractive(false);
            parser.parseStopOnError();
Solution content
                          + "describe b;"
                          + "store b into '/tmp/output1';\n";

            GruntParser parser = new GruntParser(new StringReader(script), myPig);
            parser.setInteractive(false);
            parser.parseStopOnError();
File
TestMultiQueryCompiler.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content
                          + "illustrate b;"
                          + "store b into '/tmp/output1';\n";

<<<<<<< HEAD
            GruntParser parser = new GruntParser(new StringReader(script));
=======
            GruntParser parser = new GruntParser(new StringReader(script), myPig);
>>>>>>> 98fb4d9d0f43b887b7ddfff68df8bc17f80c6808
            parser.setInteractive(false);
            parser.parseStopOnError();
Solution content
                          + "illustrate b;"
                          + "store b into '/tmp/output1';\n";

            GruntParser parser = new GruntParser(new StringReader(script), myPig);
            parser.setInteractive(false);
            parser.parseStopOnError();
File
TestMultiQueryCompiler.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content
                          + "explain b;"
                          + "store b into '/tmp/output1';\n";

<<<<<<< HEAD
            GruntParser parser = new GruntParser(new StringReader(script));
=======
            GruntParser parser = new GruntParser(new StringReader(script), myPig);
>>>>>>> 98fb4d9d0f43b887b7ddfff68df8bc17f80c6808
            parser.setInteractive(false);
            parser.parseStopOnError();
Solution content
                          + "explain b;"
                          + "store b into '/tmp/output1';\n";

            GruntParser parser = new GruntParser(new StringReader(script), myPig);
            parser.setInteractive(false);
            parser.parseStopOnError();
File
TestMultiQueryCompiler.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content
                          + "dump b;"
                          + "store b into '/tmp/output1';\n";

<<<<<<< HEAD
            GruntParser parser = new GruntParser(new StringReader(script));
=======
            GruntParser parser = new GruntParser(new StringReader(script), myPig);
>>>>>>> 98fb4d9d0f43b887b7ddfff68df8bc17f80c6808
            parser.setInteractive(false);
            parser.parseStopOnError();
Solution content
                          + "dump b;"
                          + "store b into '/tmp/output1';\n";

            GruntParser parser = new GruntParser(new StringReader(script), myPig);
            parser.setInteractive(false);
            parser.parseStopOnError();
File
TestMultiQueryCompiler.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content
                          + "explain b;"
                          + "store b into '" + TMP_DIR + "/Pig-TestMultiQueryLocal1';\n";

<<<<<<< HEAD
            GruntParser parser = new GruntParser(new StringReader(script));
=======
            GruntParser parser = new GruntParser(new StringReader(script), myPig);
>>>>>>> 98fb4d9d0f43b887b7ddfff68df8bc17f80c6808
            parser.setInteractive(false);
            parser.parseStopOnError();
Solution content
                          + "explain b;"
                          + "store b into '" + TMP_DIR + "/Pig-TestMultiQueryLocal1';\n";

            GruntParser parser = new GruntParser(new StringReader(script), myPig);
            parser.setInteractive(false);
            parser.parseStopOnError();
File
TestMultiQueryLocal.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content
                          + "dump b;"
                          + "store b into '" + TMP_DIR + "/Pig-TestMultiQueryLocal1';\n";

<<<<<<< HEAD
            GruntParser parser = new GruntParser(new StringReader(script));
=======
            GruntParser parser = new GruntParser(new StringReader(script), myPig);
>>>>>>> 98fb4d9d0f43b887b7ddfff68df8bc17f80c6808
            parser.setInteractive(false);
            parser.parseStopOnError();
Solution content
                          + "dump b;"
                          + "store b into '" + TMP_DIR + "/Pig-TestMultiQueryLocal1';\n";

            GruntParser parser = new GruntParser(new StringReader(script), myPig);
            parser.setInteractive(false);
            parser.parseStopOnError();
File
TestMultiQueryLocal.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content
                          + "describe b;"
                          + "store b into '" + TMP_DIR + "/Pig-TestMultiQueryLocal1';\n";

<<<<<<< HEAD
            GruntParser parser = new GruntParser(new StringReader(script));
=======
            GruntParser parser = new GruntParser(new StringReader(script), myPig);
>>>>>>> 98fb4d9d0f43b887b7ddfff68df8bc17f80c6808
            parser.setInteractive(false);
            parser.parseStopOnError();
Solution content
                          + "describe b;"
                          + "store b into '" + TMP_DIR + "/Pig-TestMultiQueryLocal1';\n";

            GruntParser parser = new GruntParser(new StringReader(script), myPig);
            parser.setInteractive(false);
            parser.parseStopOnError();
File
TestMultiQueryLocal.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content
                          + "illustrate b;"
                          + "store b into '" + TMP_DIR + "/Pig-TestMultiQueryLocal1';\n";

<<<<<<< HEAD
            GruntParser parser = new GruntParser(new StringReader(script));
=======
            GruntParser parser = new GruntParser(new StringReader(script), myPig);
>>>>>>> 98fb4d9d0f43b887b7ddfff68df8bc17f80c6808
            parser.setInteractive(false);
            myPig.getPigContext().getProperties().setProperty("pig.usenewlogicalplan", "true");
            parser.parseStopOnError();
Solution content
            myPig.getPigContext().getProperties().setProperty("pig.usenewlogicalplan", "true");
            parser.parseStopOnError();
                          + "illustrate b;"
                          + "store b into '" + TMP_DIR + "/Pig-TestMultiQueryLocal1';\n";

            GruntParser parser = new GruntParser(new StringReader(script), myPig);
            parser.setInteractive(false);
File
TestMultiQueryLocal.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content
    }

    /**
<<<<<<< HEAD
     * Returns a PathFilter that filters out filenames that start with _.
     * @return PathFilter
     */
    public static PathFilter getSuccessMarkerPathFilter() {
        return new PathFilter() {
            @Override
            public boolean accept(Path p) {
                return !p.getName().startsWith("_");
            }
        };
=======
     * 
     * @param expected
     *            Exception class that is expected to be thrown
     * @param found
     *            Exception that occurred in the test
     * @param message
     *            expected String to verify against
     */
    public static void assertExceptionAndMessage(Class expected,
            Exception found, String message) {
        assertEquals(expected, found.getClass());
        assertEquals(found.getMessage(), message);
>>>>>>> 98fb4d9d0f43b887b7ddfff68df8bc17f80c6808
    }
}
Solution content
     * @param expected
     * @param found
     * @param message
     *            Exception that occurred in the test
    }

    /**
     * Returns a PathFilter that filters out filenames that start with _.
     * @return PathFilter
     */
    public static PathFilter getSuccessMarkerPathFilter() {
        return new PathFilter() {
            @Override
            public boolean accept(Path p) {
                return !p.getName().startsWith("_");
            }
        };
    }

    /**
     *            Exception class that is expected to be thrown
     * 
     *            expected String to verify against
     */
    public static void assertExceptionAndMessage(Class expected,
            Exception found, String message) {
        assertEquals(expected, found.getClass());
        assertEquals(found.getMessage(), message);
    }
}
File
Util.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method invocation
Method signature
Return statement