| Chunk |
|---|
| Conflicting content |
|---|
// initialize distribution generators
//readRecord = new ZipfianGenerator(init_record_count, SIGMA);// pool for read keys
<<<<<<< HEAD
readRecord = new CustomSkewGenerator(init_record_count, 95, 5);
=======
readRecord = new CustomSkewGenerator(init_record_count, 80, 20);
>>>>>>> 5f12d43fbeb5b09d129d22525a0837a5e7335fc1
randScan = new ZipfianGenerator(YCSBConstants.MAX_SCAN);
|
| Solution content |
|---|
// initialize distribution generators
//readRecord = new ZipfianGenerator(init_record_count, SIGMA);// pool for read keys
readRecord = new CustomSkewGenerator(init_record_count, 95, 5);
randScan = new ZipfianGenerator(YCSBConstants.MAX_SCAN);
|
| File |
|---|
| YCSBClient.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
//public static final int NUM_RECORDS = 2684354; // 128 MB //public static final int NUM_RECORDS = 5368709; // 256 MB <<<<<<< HEAD //public static final int NUM_RECORDS = 41943; // 2 MB public static final int NUM_RECORDS = 21474836; // 1 GB ======= public static final int NUM_RECORDS = 41943; // 2 MB >>>>>>> 5f12d43fbeb5b09d129d22525a0837a5e7335fc1 public static final String TABLE_NAME = "USERTABLE"; |
| Solution content |
|---|
//public static final int NUM_RECORDS = 2684354; // 128 MB //public static final int NUM_RECORDS = 5368709; // 256 MB public static final int NUM_RECORDS = 41943; // 2 MB //public static final int NUM_RECORDS = 21474836; // 1 GB public static final String TABLE_NAME = "USERTABLE"; |
| File |
|---|
| YCSBConstants.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
//public static final long DEFAULT_MEMORY_THRESHOLD_MB = 128;
public static final long DEFAULT_EVICTED_BLOCK_SIZE = 51200; // 50 kb
<<<<<<< HEAD
public static final long DEFAULT_MEMORY_THRESHOLD_MB = 2048;
=======
public static final long DEFAULT_MEMORY_THRESHOLD_MB = 1;
>>>>>>> 5f12d43fbeb5b09d129d22525a0837a5e7335fc1
private boolean evicting; |
| Solution content |
|---|
//public static final long DEFAULT_MEMORY_THRESHOLD_MB = 128;
public static final long DEFAULT_EVICTED_BLOCK_SIZE = 51200; // 50 kb
public static final long DEFAULT_MEMORY_THRESHOLD_MB = 512;
private boolean evicting; |
| File |
|---|
| AntiCacheManager.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |