Projects >> voldemort >>68146711094a1da5717857f181784926c1e6b9a6

Chunk
Conflicting content 
    private long bdbCheckpointMs;
    private boolean bdbOneEnvPerStore;
    private int bdbCleanerMinFileUtilization;
<<<<<<< HEAD
=======
    private int bdbCleanerMinUtilization;
>>>>>>> 48f275c71ec589e5e2186be8c015023e0343d8fc

    private String mysqlUsername;
    private String mysqlPassword;
Solution content 
    private long bdbCheckpointMs;
    private boolean bdbOneEnvPerStore;
    private int bdbCleanerMinFileUtilization;
    private int bdbCleanerMinUtilization;

    private String mysqlUsername;
    private String mysqlPassword;
File
VoldemortConfig.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
        this.bdbCheckpointMs = props.getLong("bdb.checkpoint.interval.ms", 30 * Time.MS_PER_SECOND);
        this.bdbSortedDuplicates = props.getBoolean("bdb.enable.sorted.duplicates", true);
        this.bdbOneEnvPerStore = props.getBoolean("bdb.one.env.per.store", false);
<<<<<<< HEAD
        this.bdbCleanerMinFileUtilization = props.getInt("bdb.cleaner.min.file.utilization", 5);
=======
        setBdbCleanerMinFileUtilization(props.getInt("bdb.cleaner.minFileUtilization", 5));
        setBdbCleanerMinUtilization(props.getInt("bdb.cleaner.minUtilization", 50));
>>>>>>> 48f275c71ec589e5e2186be8c015023e0343d8fc
        this.readOnlyFileWaitTimeoutMs = props.getLong("readonly.file.wait.timeout.ms", 4000L);
        this.readOnlyBackups = props.getInt("readonly.backups", 1);
Solution content 
        this.bdbCheckpointMs = props.getLong("bdb.checkpoint.interval.ms", 30 * Time.MS_PER_SECOND);
        this.bdbSortedDuplicates = props.getBoolean("bdb.enable.sorted.duplicates", true);
        this.bdbOneEnvPerStore = props.getBoolean("bdb.one.env.per.store", false);
        this.bdbCleanerMinFileUtilization = props.getInt("bdb.cleaner.min.file.utilization", 5);
        this.bdbCleanerMinFileUtilization = props.getInt("bdb.cleaner.minFileUtilization", 5);
        this.bdbCleanerMinUtilization = props.getInt("bdb.cleaner.minUtilization", 50);

        this.readOnlyFileWaitTimeoutMs = props.getLong("readonly.file.wait.timeout.ms", 4000L);
        this.readOnlyBackups = props.getInt("readonly.backups", 1);
File
VoldemortConfig.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
     * value, irrespective of total utilization.
     * 
     * 
    
<<<<<<< HEAD
     * 
  •  property: "bdb.cleaner.minFileUtilization"
    • 
     * 
  •  default: 5
    • 
     * 
  •  minimum: 0
    • 
     * 
  •  maximum: 50
    • 
=======
     * 
  • 
     * property: "bdb.cleaner.minFileUtilization"
    • 
     * 
  • 
     * default: 5
    • 
     * 
  • 
     * minimum: 0
    • 
     * 
  • 
     * maximum: 50
    • 
>>>>>>> 48f275c71ec589e5e2186be8c015023e0343d8fc
     * 

     */
    public int getBdbCleanerMinFileUtilization() {
Solution content 
     * value, irrespective of total utilization.
     * 
     * 
     <<<<<<< HEAD:src/java/voldemort/server/VoldemortConfig.java
     * 
  •  property: "bdb.cleaner.minFileUtilization"
    • 
     * 
  •  default: 5
    • 
     * 
  •  minimum: 0
    • 
     * 
  •  maximum: 50
    • 
     * =======
     * 
  •  property: "bdb.cleaner.minFileUtilization"
    • 
     * 
  •  default: 5
    • 
     * 
  •  minimum: 0
    • 
     * 
  •  maximum: 50
    • 
     * >>>>>>> alex/rebalancing:src/java/voldemort/server/VoldemortConfig.java
     * 

     */
    public int getBdbCleanerMinFileUtilization() {
File
VoldemortConfig.java
Developer's decision
Manual
Kind of conflict
Comment
Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
=======
     * The cleaner will keep the total disk space utilization percentage above
     * this value.
     * 
     * 
    
     * 
  • 
     * property: "bdb.cleaner.minUtilization"
    • 
     * 
  • 
     * default: 50
    • 
     * 
  • 
     * minimum: 0
    • 
     * 
  • 
     * maximum: 90
    • 
     * 

     */
    public int getBdbCleanerMinUtilization() {
        return bdbCleanerMinUtilization;
    }

    public final void setBdbCleanerMinUtilization(int minUtilization) {
        if(minUtilization < 0 || minUtilization > 90)
            throw new IllegalArgumentException("minUtilization should be between 0 and 90 (both inclusive)");
        this.bdbCleanerMinUtilization = minUtilization;
    }

    /**
>>>>>>> 48f275c71ec589e5e2186be8c015023e0343d8fc
     * The btree node fanout. Given by "bdb.btree.fanout". default: 512
     */
    public int getBdbBtreeFanout() {
Solution content 
    }

    /**
     * <<<<<<< HEAD:src/java/voldemort/server/VoldemortConfig.java =======
     * The cleaner will keep the total disk space utilization percentage above
     * this value.
     * 
     * 
    
     * 
  •  property: "bdb.cleaner.minUtilization"
    • 
     * 
  •  default: 50
    • 
     * 
  •  minimum: 0
    • 
     * 
  •  maximum: 90
    • 
     * 

     */
    public int getBdbCleanerMinUtilization() {
        return bdbCleanerMinUtilization;
    }

    public final void setBdbCleanerMinUtilization(int minUtilization) {
        if(minUtilization < 0 || minUtilization > 90)
            throw new IllegalArgumentException("minUtilization should be between 0 and 90 (both inclusive)");
        this.bdbCleanerMinUtilization = minUtilization;
    }

    /**
     * >>>>>>> alex/rebalancing:src/java/voldemort/server/VoldemortConfig.java
     * The btree node fanout. Given by "bdb.btree.fanout". default: 512
     */
    public int getBdbBtreeFanout() {
File
VoldemortConfig.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration