Projects >> h-store >>813c27fbbf853b29fcdaff8d24e480464a0a810a

Chunk
Conflicting content 
    LOCALITY("Locality", "edu.brown.benchmark.locality"),
    MAPREDUCE("MapReduce", "edu.brown.benchmark.mapreduce"),
    WIKIPEDIA("Wikipedia", "edu.brown.benchmark.wikipedia"),
<<<<<<< HEAD
    VOTER("Voter", "edu.brown.benchmark.voter"),
=======
	YCSB("YCSB", "edu.brown.benchmark.ycsb"), 
	VOTER("Voter", "edu.brown.benchmark.voter"),
>>>>>>> 78a15abf1c93fecd2d36a94ae73fca2ffcdb4df7
    EXAMPLE("Example", "edu.brown.benchmark.example"),
    TEST("Test", null),
    ;
Solution content 
    LOCALITY("Locality", "edu.brown.benchmark.locality"),
    MAPREDUCE("MapReduce", "edu.brown.benchmark.mapreduce"),
    WIKIPEDIA("Wikipedia", "edu.brown.benchmark.wikipedia"),
	YCSB("YCSB", "edu.brown.benchmark.ycsb"), 
	VOTER("Voter", "edu.brown.benchmark.voter"),
    EXAMPLE("Example", "edu.brown.benchmark.example"),
    TEST("Test", null),
    ;
File
ProjectType.java
Developer's decision
Version 2
Kind of conflict
Enum value
Chunk
Conflicting content 
    AtomicLong badVoteCountVotes = new AtomicLong(0);
    AtomicLong failedVotes = new AtomicLong(0);
	
<<<<<<< HEAD
    final Callback callback = new Callback();
	
=======
>>>>>>> 78a15abf1c93fecd2d36a94ae73fca2ffcdb4df7
    public static void main(String args[]) {
        BenchmarkComponent.main(VoterClient.class, args, false);
    }
Solution content 
    AtomicLong badVoteCountVotes = new AtomicLong(0);
    AtomicLong failedVotes = new AtomicLong(0);
	
    final Callback callback = new Callback();
	
    public static void main(String args[]) {
        BenchmarkComponent.main(VoterClient.class, args, false);
    }
File
VoterClient.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    public void runLoop() {
        try {
            while (true) {				
<<<<<<< HEAD
                // synchronously call the "Vote" procedure
=======
				
				// Get the next phone call
                PhoneCallGenerator.PhoneCall call = switchboard.receive();
				
>>>>>>> 78a15abf1c93fecd2d36a94ae73fca2ffcdb4df7
                try {
					runOnce(); 
                }
Solution content 
    public void runLoop() {
        try {
            while (true) {				
                // synchronously call the "Vote" procedure
                try {
					runOnce(); 
                }
File
VoterClient.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
		// Get the next phone call
		PhoneCallGenerator.PhoneCall call = switchboard.receive();
		
<<<<<<< HEAD
		try {			
=======
		try 
		{			
			Callback callback = new Callback();
			
			// asynchronously invoke the Vote procedure
>>>>>>> 78a15abf1c93fecd2d36a94ae73fca2ffcdb4df7
			response = client.callProcedure(callback, 
											"Vote",
											call.phoneNumber,
Solution content 
		// Get the next phone call
		PhoneCallGenerator.PhoneCall call = switchboard.receive();
		
		try {			
			response = client.callProcedure(callback, 
											"Vote",
											call.phoneNumber,
File
VoterClient.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Try statement
Variable
Chunk
Conflicting content 
											call.phoneNumber,
											call.contestantNumber,
											VoterConstants.MAX_VOTES);
<<<<<<< HEAD
			if(response == false)
				throw new IOException(); 
			
=======
>>>>>>> 78a15abf1c93fecd2d36a94ae73fca2ffcdb4df7
		}
		catch(IOException e) {
			throw e;
Solution content 
											call.phoneNumber,
											call.contestantNumber,
											VoterConstants.MAX_VOTES);
			if(response == false)
				throw new IOException(); 
			
		}
		catch(IOException e) {
			throw e;
File
VoterClient.java
Developer's decision
Version 1
Kind of conflict
If statement