Projects >> Priam >>b0c67b9adcf127ccf0d4c5f34a4d4a2fe9a0606b

Chunk
Conflicting content 
     */
    public boolean doesCassandraStartManually();

<<<<<<< HEAD
    /**
     * @return possible values: all, dc, none
     */
    public String getInternodeCompression();
=======
    public boolean isBackingUpCommitLogs();

    public String getCommitLogBackupArchiveCmd();

    public String getCommitLogBackupRestoreCmd();

    public String getCommitLogBackupRestoreFromDirs();

    public String getCommitLogBackupRestorePointInTime();
>>>>>>> 4581a362e6587da5e6854d82cfac352608c9c906
}
Solution content 
     */
    public boolean doesCassandraStartManually();

    /**
     * @return possible values: all, dc, none
     */
    public String getInternodeCompression();

    public boolean isBackingUpCommitLogs();

    public String getCommitLogBackupArchiveCmd();

    public String getCommitLogBackupRestoreCmd();

    public String getCommitLogBackupRestoreFromDirs();

    public String getCommitLogBackupRestorePointInTime();
}
File
IConfiguration.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

<<<<<<< HEAD
import java.util.List;

=======
>>>>>>> 4581a362e6587da5e6854d82cfac352608c9c906
@Singleton
public class PriamConfiguration implements IConfiguration
{
Solution content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.List;

@Singleton
public class PriamConfiguration implements IConfiguration
{
File
PriamConfiguration.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    private static final String CONFIG_KEYCACHE_COUNT= PRIAM_PRE + ".keyCache.count";
    private static final String CONFIG_ROWCACHE_SIZE = PRIAM_PRE + ".rowCache.size";
    private static final String CONFIG_ROWCACHE_COUNT= PRIAM_PRE + ".rowCache.count";
<<<<<<< HEAD
    private static final String CONFIG_MAX_HINT_THREADS = PRIAM_PRE + ".hints.maxThreads";
    private static final String CONFIG_HINTS_THROTTLE_KB = PRIAM_PRE + ".hints.throttleKb";
    private static final String CONFIG_INTERNODE_COMPRESSION = PRIAM_PRE + ".internodeCompression";
=======

    private static final String CONFIG_COMMITLOG_BKUP_ENABLED = PRIAM_PRE + ".clbackup.enabled";
    private static final String CONFIG_COMMITLOG_ARCHIVE_CMD = PRIAM_PRE + ".clbackup.archiveCmd";
    private static final String CONFIG_COMMITLOG_RESTORE_CMD = PRIAM_PRE + ".clbackup.restoreCmd";
    private static final String CONFIG_COMMITLOG_RESTORE_DIRS = PRIAM_PRE + ".clbackup.restoreDirs";
    private static final String CONFIG_COMMITLOG_RESTORE_POINT_IN_TIME = PRIAM_PRE + ".clbackup.restoreTime";
>>>>>>> 4581a362e6587da5e6854d82cfac352608c9c906

    // Amazon specific
    private static final String CONFIG_ASG_NAME = PRIAM_PRE + ".az.asgname";
Solution content 
    private static final String CONFIG_KEYCACHE_COUNT= PRIAM_PRE + ".keyCache.count";
    private static final String CONFIG_ROWCACHE_SIZE = PRIAM_PRE + ".rowCache.size";
    private static final String CONFIG_ROWCACHE_COUNT= PRIAM_PRE + ".rowCache.count";

    private static final String CONFIG_MAX_HINT_THREADS = PRIAM_PRE + ".hints.maxThreads";
    private static final String CONFIG_HINTS_THROTTLE_KB = PRIAM_PRE + ".hints.throttleKb";
    private static final String CONFIG_INTERNODE_COMPRESSION = PRIAM_PRE + ".internodeCompression";

    private static final String CONFIG_COMMITLOG_BKUP_ENABLED = PRIAM_PRE + ".clbackup.enabled";
    private static final String CONFIG_COMMITLOG_ARCHIVE_CMD = PRIAM_PRE + ".clbackup.archiveCmd";
    private static final String CONFIG_COMMITLOG_RESTORE_CMD = PRIAM_PRE + ".clbackup.restoreCmd";
    private static final String CONFIG_COMMITLOG_RESTORE_DIRS = PRIAM_PRE + ".clbackup.restoreDirs";
    private static final String CONFIG_COMMITLOG_RESTORE_POINT_IN_TIME = PRIAM_PRE + ".clbackup.restoreTime";

    // Amazon specific
    private static final String CONFIG_ASG_NAME = PRIAM_PRE + ".az.asgname";
File
PriamConfiguration.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
		return config.get(CONFIG_TARGET_COLUMN_FAMILY_NAME);
	}

<<<<<<< HEAD
	@Override
	public boolean doesCassandraStartManually() {
		return config.get(CONFIG_CASS_MANUAL_START_ENABLE, false);
	}

    public String getInternodeCompression()
    {
        return config.get(CONFIG_INTERNODE_COMPRESSION, DEFAULT_INTERNODE_COMPRESSION);
=======
    @Override
    public boolean doesCassandraStartManually() {
	    return config.getBoolean(CONFIG_CASS_MANUAL_START_ENABLE, false);
>>>>>>> 4581a362e6587da5e6854d82cfac352608c9c906
    }

    @Override
Solution content 
		return config.get(CONFIG_TARGET_COLUMN_FAMILY_NAME);
	}

	@Override
	public boolean doesCassandraStartManually() {
		return config.get(CONFIG_CASS_MANUAL_START_ENABLE, false);
	}

    public String getInternodeCompression()
    {
        return config.get(CONFIG_INTERNODE_COMPRESSION, DEFAULT_INTERNODE_COMPRESSION);
    }

    @Override
File
PriamConfiguration.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
	public String getTargetCFName() {
		return null;
	}
<<<<<<< HEAD

	@Override
	public boolean doesCassandraStartManually() {
		return false;
	}

    public String getInternodeCompression()
    {
        return "all";
=======
    
    @Override
    public boolean doesCassandraStartManually() {
    	return false;
    }

    @Override
    public boolean isBackingUpCommitLogs()
    {
        return false;
    }

    @Override
    public String getCommitLogBackupArchiveCmd()
    {
        return null;
    }

    @Override
    public String getCommitLogBackupRestoreCmd()
    {
        return null;
    }

    @Override
    public String getCommitLogBackupRestoreFromDirs()
    {
        return null;
    }

    @Override
    public String getCommitLogBackupRestorePointInTime()
    {
        return null;
>>>>>>> 4581a362e6587da5e6854d82cfac352608c9c906
    }
}
Solution content 
	public String getTargetCFName() {
		return null;
	}

	@Override
	public boolean doesCassandraStartManually() {
		return false;
	}

    public String getInternodeCompression()
    {
        return "all";
    }

    @Override
    public boolean isBackingUpCommitLogs()
    {
        return false;
    }

    @Override
    public String getCommitLogBackupArchiveCmd()
    {
        return null;
    }

    @Override
    public String getCommitLogBackupRestoreCmd()
    {
        return null;
    }

    @Override
    public String getCommitLogBackupRestoreFromDirs()
    {
        return null;
    }

    @Override
    public String getCommitLogBackupRestorePointInTime()
    {
        return null;
    }
File
FakeConfiguration.java
Developer's decision
Combination
Kind of conflict
Annotation
Method declaration
Method signature
Return statement