Projects >> voldemort >>d18f0ce071c402ae09eb2b282331977194614e43

Chunk
Conflicting content 
        this.numCleanupPermits = numCleanupPermits;
    }

<<<<<<< HEAD
    public String getFailureDetector() {
        return failureDetector;
    }

    public void setFailureDetector(String failureDetector) {
        this.failureDetector = failureDetector;
    }

=======
    public int getRetentionCleanupFirstStartTimeInHour() {
        return retentionCleanupFirstStartTimeInHour;
    }

    public void setRetentionCleanupFirstStartTimeInHour(int retentionCleanupFirstStartTimeInHour) {
        this.retentionCleanupFirstStartTimeInHour = retentionCleanupFirstStartTimeInHour;
    }

    public int getRetentionCleanupScheduledPeriodInHour() {
        return retentionCleanupScheduledPeriodInHour;
    }

    public void setRetentionCleanupScheduledPeriodInHour(int retentionCleanupScheduledPeriodInHour) {
        this.retentionCleanupScheduledPeriodInHour = retentionCleanupScheduledPeriodInHour;
    }
>>>>>>> b20e97b0c3a3f36151c59ba0423c16d00a5cde48
}
Solution content 
        this.numCleanupPermits = numCleanupPermits;
    }

    public String getFailureDetector() {
        return failureDetector;
    }

    public void setFailureDetector(String failureDetector) {
        this.failureDetector = failureDetector;
    }

    public int getRetentionCleanupFirstStartTimeInHour() {
        return retentionCleanupFirstStartTimeInHour;
    }

    public void setRetentionCleanupFirstStartTimeInHour(int retentionCleanupFirstStartTimeInHour) {
        this.retentionCleanupFirstStartTimeInHour = retentionCleanupFirstStartTimeInHour;
    }

    public int getRetentionCleanupScheduledPeriodInHour() {
        return retentionCleanupScheduledPeriodInHour;
    }

    public void setRetentionCleanupScheduledPeriodInHour(int retentionCleanupScheduledPeriodInHour) {
        this.retentionCleanupScheduledPeriodInHour = retentionCleanupScheduledPeriodInHour;
    }

}
File
VoldemortConfig.java
Developer's decision
Concatenation
Kind of conflict
Method declaration
Chunk
Conflicting content 
                    logger.trace("Attempting get operation on node " + node.getId() + " for key '"
                                 + ByteUtils.toHexString(key.get()) + "'.");
                fetched = innerStores.get(node.getId()).get(key);
<<<<<<< HEAD
                if(repairReads) {
                    for(Versioned f: fetched)
                        nodeValues.add(new NodeValue(node.getId(), key, f));
                }
                failureDetector.recordSuccess(node);
=======
                fillRepairReadsValues(nodeValues, key, node, fetched);
                node.getStatus().setAvailable();
>>>>>>> b20e97b0c3a3f36151c59ba0423c16d00a5cde48
            } catch(UnreachableStoreException e) {
                exception = e;
                failureDetector.recordException(node, e);
Solution content 
                    logger.trace("Attempting get operation on node " + node.getId() + " for key '"
                                 + ByteUtils.toHexString(key.get()) + "'.");
                fetched = innerStores.get(node.getId()).get(key);
                fillRepairReadsValues(nodeValues, key, node, fetched);
                failureDetector.recordSuccess(node);
            } catch(UnreachableStoreException e) {
                exception = e;
                failureDetector.recordException(node, e);
File
RoutedStore.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation