Projects >> MyCassandra >>5118c919a98ef2f9268695aaec2d74c6c40c843d

Chunk
Conflicting content 
            cf_def.setColumnfamily_size(CFMetaData.DEFAULT_COLUMNFAMILY_SIZE);
        if (!cf_def.isSetColumnfamily_type())
            cf_def.setColumnfamily_type(CFMetaData.DEFAULT_COLUMNFAMILY_TYPE);
<<<<<<< HEAD
        if (!cf_def.isSetStorage_engine())
            cf_def.setStorage_engine(CFMetaData.DEFAULT_MYSQL_ENGINE);
=======
        if (!cf_def.isSetMysql_engine())
            cf_def.setMysql_engine(CFMetaData.DEFAULT_MYSQL_ENGINE);
>>>>>>> 398973cc908d7bb9eb283723337a6775f34357bf
    }
    
    // merges some final fields from this CFM with modifiable fields from CfDef into a new CFMetaData.
Solution content 
            cf_def.setColumnfamily_size(CFMetaData.DEFAULT_COLUMNFAMILY_SIZE);
        if (!cf_def.isSetColumnfamily_type())
            cf_def.setColumnfamily_type(CFMetaData.DEFAULT_COLUMNFAMILY_TYPE);
<<<<<<< HEAD
        if (!cf_def.isSetStorage_engine())
            cf_def.setStorage_engine(CFMetaData.DEFAULT_MYSQL_ENGINE);
=======
        if (!cf_def.isSetMysql_engine())
            cf_def.setMysql_engine(CFMetaData.DEFAULT_MYSQL_ENGINE);
>>>>>>> 398973cc908d7bb9eb283723337a6775f34357bf
    }
    
    // merges some final fields from this CFM with modifiable fields from CfDef into a new CFMetaData.
File
CFMetaData.java
Developer's decision
Manual
Kind of conflict
If statement
Chunk
Conflicting content 
        def.setRowkey_size(cfm.rowkeySize);
        def.setColumnfamily_size(cfm.columnfamilySize);
        def.setColumnfamily_type(cfm.columnfamilyType);
<<<<<<< HEAD
        def.setStorage_engine(cfm.mysqlEngine);
=======
        def.setMysql_engine(cfm.mysqlEngine);
>>>>>>> 398973cc908d7bb9eb283723337a6775f34357bf
        List column_meta = new ArrayList< org.apache.cassandra.thrift.ColumnDef>(cfm.column_metadata.size());
        for (ColumnDefinition cd : cfm.column_metadata.values())
        {
Solution content 
        def.setRowkey_size(cfm.rowkeySize);
        def.setColumnfamily_size(cfm.columnfamilySize);
        def.setColumnfamily_type(cfm.columnfamilyType);
        def.setMysql_engine(cfm.mysqlEngine);

        List column_meta = new ArrayList< org.apache.cassandra.thrift.ColumnDef>(cfm.column_metadata.size());
        for (ColumnDefinition cd : cfm.column_metadata.values())
        {
File
CFMetaData.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        newDef.rowkey_size = def.getRowkey_size();
        newDef.columnfamily_size = def.getColumnfamily_size();
        newDef.columnfamily_type = def.getColumnfamily_type();
<<<<<<< HEAD
        newDef.mysql_engine = def.getMySQL_engine();
=======
        newDef.mysql_engine = def.getMysql_engine();
>>>>>>> 398973cc908d7bb9eb283723337a6775f34357bf
        newDef.min_compaction_threshold = def.getMin_compaction_threshold();
        newDef.read_repair_chance = def.getRead_repair_chance();
        newDef.row_cache_save_period_in_seconds = def.getRow_cache_save_period_in_seconds();
Solution content 
        newDef.rowkey_size = def.getRowkey_size();
        newDef.columnfamily_size = def.getColumnfamily_size();
        newDef.columnfamily_type = def.getColumnfamily_type();
<<<<<<< HEAD
        newDef.mysql_engine = def.getMySQL_engine();
=======
        newDef.mysql_engine = def.getMysql_engine();
>>>>>>> 398973cc908d7bb9eb283723337a6775f34357bf
        newDef.min_compaction_threshold = def.getMin_compaction_threshold();
        newDef.read_repair_chance = def.getRead_repair_chance();
        newDef.row_cache_save_period_in_seconds = def.getRow_cache_save_period_in_seconds();
File
CFMetaData.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    private int rowkeySize = EngineMeta.defaultRowKeySize;
    private int columnfamilySize = EngineMeta.defaultColumnFamilySize;
    private String columnfamilyType = EngineMeta.defaultColumnFamilyType;
<<<<<<< HEAD
    private String mysqlEngine = EngineMeta.defaultMySQLEngine;
=======
    private String storageEngine = EngineMeta.defaultMySQLEngine;
>>>>>>> 398973cc908d7bb9eb283723337a6775f34357bf

    public void reload()
    {
Solution content 
    private int rowkeySize = EngineMeta.defaultRowKeySize;
    private int columnfamilySize = EngineMeta.defaultColumnFamilySize;
    private String columnfamilyType = EngineMeta.defaultColumnFamilyType;
<<<<<<< HEAD
    private String mysqlEngine = EngineMeta.defaultMySQLEngine;
=======
    private String storageEngine = EngineMeta.defaultMySQLEngine;
>>>>>>> 398973cc908d7bb9eb283723337a6775f34357bf

    public void reload()
    {
File
ColumnFamilyStore.java
Developer's decision
Manual
Kind of conflict
Attribute
Chunk
Conflicting content 
        this.rowkeySize = metadata.getRowkeySize();
        this.columnfamilySize = metadata.getColumnfamilySize();
        this.columnfamilyType = metadata.getColumnfamilyType();
<<<<<<< HEAD
        this.mysqlEngine = metadata.getMySQLEngine();
=======
        this.storageEngine = metadata.getMySQLEngine();
>>>>>>> 398973cc908d7bb9eb283723337a6775f34357bf
        fileIndexGenerator.set(generation);
        memtable = new Memtable(this);
        binaryMemtable = new AtomicReference(new BinaryMemtable(this));
Solution content 
        this.rowkeySize = metadata.getRowkeySize();
        this.columnfamilySize = metadata.getColumnfamilySize();
        this.columnfamilyType = metadata.getColumnfamilyType();
        this.mysqlEngine = metadata.getMySQLEngine();
        fileIndexGenerator.set(generation);
        memtable = new Memtable(this);
        binaryMemtable = new AtomicReference(new BinaryMemtable(this));
File
ColumnFamilyStore.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    public static final int defaultColumnFamilySize = 30 * 1024;
    public static final String defaultColumnFamilyType = BINARY;
    public static final String defaultMySQLEngine = "InnoDB";
<<<<<<< HEAD
    public static final String SYSTEM_STORAGE_ENGINE = "MyISAM";
=======
    public static final String SYSTEM_MYSQL_ENGINE = "MyISAM";
>>>>>>> 398973cc908d7bb9eb283723337a6775f34357bf

    // default se type (SystemTable and not specified Keyspace)
    private int defaultStorageType;
Solution content 
    public static final int defaultColumnFamilySize = 30 * 1024;
    public static final String defaultColumnFamilyType = BINARY;
    public static final String defaultMySQLEngine = "InnoDB";
    public static final String SYSTEM_MYSQL_ENGINE = "MyISAM";

    // default se type (SystemTable and not specified Keyspace)
    private int defaultStorageType;
File
EngineMeta.java
Developer's decision
Version 2
Kind of conflict
Attribute