Projects >> elephant-bird >>ebaa220c5c7282e567771ee8050e30a67eb69ff8

Chunk
Conflicting content 
  private static final TupleFactory tupleFactory_ = TupleFactory.getInstance();
  protected enum LzoJsonLoaderCounters { LinesRead, LinesJsonDecoded, LinesParseError, LinesParseErrorBadNumber }

<<<<<<< HEAD
  public LzoJsonLoader() {
    LOG.debug("LzoJsonLoader creation");
  }

  public void skipToNextSyncPoint(boolean atFirstRecord) throws IOException {
    // Since we are not block aligned we throw away the first record of each split and count on a different
    // instance to read it.  The only split this doesn't work for is the first.
    if (!atFirstRecord) {
      getNext();
    }
  }
=======
  public LzoJsonLoader() {}
>>>>>>> 513c57a0c0a55f266113b4a47677c9e43f98867f

  /**
   * Return every non-null line as a single-element tuple to Pig.
Solution content 
  private static final TupleFactory tupleFactory_ = TupleFactory.getInstance();
  protected enum LzoJsonLoaderCounters { LinesRead, LinesJsonDecoded, LinesParseError, LinesParseErrorBadNumber }

  public LzoJsonLoader() {
    LOG.debug("LzoJsonLoader creation");
  }

  /**
   * Return every non-null line as a single-element tuple to Pig.
File
LzoJsonLoader.java
Developer's decision
Combination
Kind of conflict
Method declaration
Chunk
Conflicting content 
    }
  }

<<<<<<< HEAD
=======
  @Override
  public void setLocation(String location, Job job)
  throws IOException {
	  FileInputFormat.setInputPaths(job, location);
  }

>>>>>>> 513c57a0c0a55f266113b4a47677c9e43f98867f
  @Override
  public InputFormat getInputFormat() {
      return new LzoJsonInputFormat();
Solution content 
    }
  }

  @Override
  public void setLocation(String location, Job job)
  throws IOException {
    FileInputFormat.setInputPaths(job, location);
  }

  @Override
  public InputFormat getInputFormat() {
      return new LzoJsonInputFormat();
File
LzoJsonLoader.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration