Projects >> h-store >>2d2a1299a658eabd65ed7758822fecc352546225

Chunk
Conflicting content 
import edu.brown.hstore.conf.HStoreConf;
import edu.brown.hstore.estimators.EstimatorState;
import edu.brown.hstore.estimators.markov.MarkovEstimatorState;
<<<<<<< HEAD:tests/frontend/edu/brown/hstore/util/TestPrefetchQueryPlanner.java
import edu.brown.hstore.txns.DependencyTracker;
=======
import edu.brown.hstore.specexec.PrefetchQueryPlanner;
>>>>>>> be75fd3f684f1276b7139866ab592f6972890641:tests/frontend/edu/brown/hstore/specexec/TestPrefetchQueryPlanner.java
import edu.brown.hstore.txns.LocalTransaction;
import edu.brown.utils.PartitionSet;
import edu.brown.utils.ProjectType;
Solution content 
import edu.brown.hstore.conf.HStoreConf;
import edu.brown.hstore.estimators.EstimatorState;
import edu.brown.hstore.estimators.markov.MarkovEstimatorState;
import edu.brown.hstore.txns.DependencyTracker;
import edu.brown.hstore.specexec.PrefetchQueryPlanner;
import edu.brown.hstore.txns.LocalTransaction;
import edu.brown.utils.PartitionSet;
import edu.brown.utils.ProjectType;
File
TestPrefetchQueryPlanner.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
    public TestSmallBankSuite(String name) {
        super(name);
    }
<<<<<<< HEAD

=======
    
>>>>>>> be75fd3f684f1276b7139866ab592f6972890641
    /**
     * testSendPayment
     */
Solution content 
    public TestSmallBankSuite(String name) {
        super(name);
    }

    /**
     * testSendPayment
     */
File
TestSmallBankSuite.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        };
        loader.load();
    }
<<<<<<< HEAD
    
    
=======
>>>>>>> be75fd3f684f1276b7139866ab592f6972890641
    public static void checkBalance(Client client, long acctId, double expected) throws Exception {
        // Make sure that we set it correctly
        String query = String.format("SELECT * FROM %s WHERE custid = %d",
Solution content 
        };
        loader.load();
    }

    public static void checkBalance(Client client, long acctId, double expected) throws Exception {
        // Make sure that we set it correctly
        String query = String.format("SELECT * FROM %s WHERE custid = %d",
File
TestSmallBankSuite.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
    public static void updateBalance(Client client, long acctId, double balance) throws Exception {
        // Prime the customer's balance
        String query = String.format("UPDATE %s SET bal = %f WHERE custid = %d",
<<<<<<< HEAD
                                     SmallBankConstants.TABLENAME_CHECKING,
                                     balance, acctId);
        String procName = VoltSystemProcedure.procCallName(AdHoc.class);
        ClientResponse cresponse = client.callProcedure(procName, query);
=======
                              SmallBankConstants.TABLENAME_CHECKING,
                              balance, acctId);
        ClientResponse cresponse = client.callProcedure("@AdHoc", query);
>>>>>>> be75fd3f684f1276b7139866ab592f6972890641
        assertEquals(Status.OK, cresponse.getStatus());
        VoltTable results[] = cresponse.getResults();
        assertEquals(1, results.length);
Solution content 
    public static void updateBalance(Client client, long acctId, double balance) throws Exception {
        // Prime the customer's balance
        String query = String.format("UPDATE %s SET bal = %f WHERE custid = %d",
                                     SmallBankConstants.TABLENAME_CHECKING,
                                     balance, acctId);
        String procName = VoltSystemProcedure.procCallName(AdHoc.class);
        ClientResponse cresponse = client.callProcedure(procName, query);
        assertEquals(Status.OK, cresponse.getStatus());
        VoltTable results[] = cresponse.getResults();
        assertEquals(1, results.length);
File
TestSmallBankSuite.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable