Projects >> h-store >>d61e22897347e99ea2d065a533a629e3bd99ddcd

Chunk
Conflicting content 
        }
        this.rand_gen = new Random(); 
        this.randScan = new ZipfianGenerator(YCSBConstants.MAX_SCAN);
<<<<<<< HEAD
	/*          
        // initialize distribution generators 
        // We must know where to start inserting
        this.insertRecord = new CustomSkewGenerator(this.rand_gen, this.init_record_count, 
                                            YCSBConstants.HOT_DATA_WORKLOAD_SKEW, YCSBConstants.HOT_DATA_SIZE, 
                                            YCSBConstants.WARM_DATA_WORKLOAD_SKEW, YCSBConstants.WARM_DATA_SIZE);

        this.readRecord = new CustomSkewGenerator(this.rand_gen, this.init_record_count, 
                                            YCSBConstants.HOT_DATA_WORKLOAD_SKEW, YCSBConstants.HOT_DATA_SIZE, 
                                            YCSBConstants.WARM_DATA_WORKLOAD_SKEW, YCSBConstants.WARM_DATA_SIZE);
	*/

	this.insertRecord = new ZipfianGenerator(YCSBConstants.NUM_RECORDS, YCSBConstants.ZIPFIAN_CONSTANT);
	this.readRecord = new ZipfianGenerator(YCSBConstants.NUM_RECORDS, YCSBConstants.ZIPFIAN_CONSTANT);
=======
                
//        // initialize distribution generators 
//        // We must know where to start inserting
//        this.insertRecord = new CustomSkewGenerator(this.rand_gen, this.init_record_count, 
//                                            YCSBConstants.HOT_DATA_WORKLOAD_SKEW, YCSBConstants.HOT_DATA_SIZE, 
//                                            YCSBConstants.WARM_DATA_WORKLOAD_SKEW, YCSBConstants.WARM_DATA_SIZE);
//
//        this.readRecord = new CustomSkewGenerator(this.rand_gen, this.init_record_count, 
//                                            YCSBConstants.HOT_DATA_WORKLOAD_SKEW, YCSBConstants.HOT_DATA_SIZE, 
//                                            YCSBConstants.WARM_DATA_WORKLOAD_SKEW, YCSBConstants.WARM_DATA_SIZE);
        
        this.insertRecord = new ZipfianGenerator(this.init_record_count, this.skewFactor);
        this.readRecord = new ZipfianGenerator(this.init_record_count, this.skewFactor);
>>>>>>> 556a771ef1296955740247aa0d46ec3daa3773aa
        
        // Initialize the sampling table
        Histogram txns = new ObjectHistogram();
Solution content 
        }
        this.rand_gen = new Random(); 
        this.randScan = new ZipfianGenerator(YCSBConstants.MAX_SCAN);
                
//        // initialize distribution generators 
//        // We must know where to start inserting
//        this.insertRecord = new CustomSkewGenerator(this.rand_gen, this.init_record_count, 
//                                            YCSBConstants.HOT_DATA_WORKLOAD_SKEW, YCSBConstants.HOT_DATA_SIZE, 
//                                            YCSBConstants.WARM_DATA_WORKLOAD_SKEW, YCSBConstants.WARM_DATA_SIZE);
//
//        this.readRecord = new CustomSkewGenerator(this.rand_gen, this.init_record_count, 
//                                            YCSBConstants.HOT_DATA_WORKLOAD_SKEW, YCSBConstants.HOT_DATA_SIZE, 
//                                            YCSBConstants.WARM_DATA_WORKLOAD_SKEW, YCSBConstants.WARM_DATA_SIZE);
        
        this.insertRecord = new ZipfianGenerator(this.init_record_count, this.skewFactor);
        this.readRecord = new ZipfianGenerator(this.init_record_count, this.skewFactor);
        
        // Initialize the sampling table
        Histogram txns = new ObjectHistogram();
File
YCSBClient.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
public abstract class YCSBConstants {

<<<<<<< HEAD
    public static final int NUM_RECORDS = 1000000;  // Note: this should match value in YCSB.properties    
=======
    public static final int NUM_RECORDS = 10000;  // Note: this should match value in YCSB.properties
    
>>>>>>> 556a771ef1296955740247aa0d46ec3daa3773aa
    public static final double ZIPFIAN_CONSTANT = .5;

    public static final int HOT_DATA_WORKLOAD_SKEW = 50;
Solution content 
public abstract class YCSBConstants {

<<<<<<< HEAD
    public static final int NUM_RECORDS = 1000000;  // Note: this should match value in YCSB.properties    
=======
    public static final int NUM_RECORDS = 10000;  // Note: this should match value in YCSB.properties
    
>>>>>>> joy-master
    public static final double ZIPFIAN_CONSTANT = .5;

    public static final int HOT_DATA_WORKLOAD_SKEW = 50;
File
YCSBConstants.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment