Projects information

Chunk

Conflicting content
======= private static final Logger LOG = Logger.getLogger(HBaseSink.class); private static final int DEFAULT_POOL_SIZE = Runtime.getRuntime().availableProcessors(); <<<<<<< HEAD private static final int DEFAULT_HBASE_RETRIES = 5; private static final int DEFAULT_HBASE_RETRY_SLEEP_SECONDS = 30; protected long sleepTime = 1000L; >>>>>>> 6d85351a5bc0b2642245cc4f6f384801138944d3 protected HTablePool hbasePool;

Conflicting content

=======
    private static final Logger LOG = Logger.getLogger(HBaseSink.class);

    private static final int DEFAULT_POOL_SIZE = Runtime.getRuntime().availableProcessors();
<<<<<<< HEAD
    private static final int DEFAULT_HBASE_RETRIES = 5;
    private static final int DEFAULT_HBASE_RETRY_SLEEP_SECONDS = 30;

    protected long sleepTime = 1000L;
>>>>>>> 6d85351a5bc0b2642245cc4f6f384801138944d3

    protected HTablePool hbasePool;

Solution content
private static final Logger LOG = Logger.getLogger(HBaseSink.class); private static final int DEFAULT_POOL_SIZE = Runtime.getRuntime().availableProcessors(); private static final int DEFAULT_HBASE_RETRIES = 5; private static final int DEFAULT_HBASE_RETRY_SLEEP_SECONDS = 30; protected HTablePool hbasePool;

Solution content

    private static final Logger LOG = Logger.getLogger(HBaseSink.class);

    private static final int DEFAULT_POOL_SIZE = Runtime.getRuntime().availableProcessors();
    private static final int DEFAULT_HBASE_RETRIES = 5;
    private static final int DEFAULT_HBASE_RETRY_SLEEP_SECONDS = 30;

    protected HTablePool hbasePool;

File
HBaseSink.java

Developer's decision
Version 1

Kind of conflict
Attribute

Chunk

Conflicting content
protected boolean prefixDate = true; protected int batchSize = 100; <<<<<<< HEAD ======= protected long maxKeyValueSize; >>>>>>> 6d85351a5bc0b2642245cc4f6f384801138944d3 protected AtomicInteger putsQueueSize = new AtomicInteger(); protected ConcurrentLinkedQueue putsQueue = new ConcurrentLinkedQueue();

Conflicting content

    protected boolean prefixDate = true;
    protected int batchSize = 100;
<<<<<<< HEAD
=======
    protected long maxKeyValueSize;
>>>>>>> 6d85351a5bc0b2642245cc4f6f384801138944d3

    protected AtomicInteger putsQueueSize = new AtomicInteger();
    protected ConcurrentLinkedQueue putsQueue = new ConcurrentLinkedQueue();

Solution content
protected boolean prefixDate = true; protected int batchSize = 100; protected long maxKeyValueSize; protected AtomicInteger putsQueueSize = new AtomicInteger(); protected ConcurrentLinkedQueue putsQueue = new ConcurrentLinkedQueue();

Solution content

    protected boolean prefixDate = true;
    protected int batchSize = 100;
    protected long maxKeyValueSize;

    protected AtomicInteger putsQueueSize = new AtomicInteger();
    protected ConcurrentLinkedQueue putsQueue = new ConcurrentLinkedQueue();

File
HBaseSink.java

Developer's decision
Version 2

Kind of conflict
Attribute

Projects >> bagheera >>ecdb92e0ec3db9927bede331824a4ba7b9eae4a5