Projects >> h-store >>5ca2cea6233223448a2c51de5555d0d58a2411b6

Chunk
Conflicting content 
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
<<<<<<< HEAD
import java.text.*;
import java.util.Date;
=======
import java.util.concurrent.atomic.AtomicLong;
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b

import org.apache.commons.collections15.buffer.CircularFifoBuffer;
import org.apache.log4j.Logger;
Solution content 
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;

import org.apache.commons.collections15.buffer.CircularFifoBuffer;
import org.apache.log4j.Logger;
File
HStoreSite.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
import org.voltdb.SysProcSelector;
import org.voltdb.ProcedureStatsCollector;
import org.voltdb.TransactionIdManager;
<<<<<<< HEAD
import org.voltdb.TriggerStatsCollector;
import org.voltdb.StreamStatsCollector;
import org.voltdb.VoltTable;
import org.voltdb.catalog.CatalogMap;
import org.voltdb.catalog.Host;
import org.voltdb.catalog.PlanFragment;
=======
import org.voltdb.VoltSystemProcedure;
import org.voltdb.VoltTable;
import org.voltdb.catalog.CatalogMap;
import org.voltdb.catalog.Database;
import org.voltdb.catalog.Host;
import org.voltdb.catalog.Partition;
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
import org.voltdb.catalog.Procedure;
import org.voltdb.catalog.ProcedureRef;
import org.voltdb.catalog.Site;
Solution content 
import org.voltdb.SysProcSelector;
import org.voltdb.TransactionIdManager;
import org.voltdb.VoltSystemProcedure;
import org.voltdb.VoltTable;
import org.voltdb.catalog.CatalogMap;
import org.voltdb.catalog.Host;
import org.voltdb.catalog.Partition;
import org.voltdb.catalog.PlanFragment;
import org.voltdb.catalog.Procedure;
import org.voltdb.catalog.ProcedureRef;
import org.voltdb.catalog.Site;
File
HStoreSite.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.voltdb.catalog.Site;
import org.voltdb.catalog.Statement;
import org.voltdb.catalog.Table;
<<<<<<< HEAD
import org.voltdb.catalog.Trigger;
=======
import org.voltdb.client.Client;
import org.voltdb.client.ClientFactory;
import org.voltdb.client.ClientResponse;
import org.voltdb.client.NoConnectionsException;
import org.voltdb.client.ProcCallException;
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
import org.voltdb.compiler.AdHocPlannedStmt;
import org.voltdb.compiler.AsyncCompilerResult;
import org.voltdb.compiler.AsyncCompilerWorkThread;
Solution content 
import org.voltdb.catalog.Site;
import org.voltdb.catalog.Statement;
import org.voltdb.catalog.Table;
import org.voltdb.compiler.AdHocPlannedStmt;
import org.voltdb.compiler.AsyncCompilerResult;
import org.voltdb.compiler.AsyncCompilerWorkThread;
File
HStoreSite.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
import org.voltdb.messaging.FastSerializer;
import org.voltdb.network.Connection;
import org.voltdb.network.VoltNetwork;
<<<<<<< HEAD
import org.voltdb.plannodes.AbstractPlanNode;
import org.voltdb.plannodes.InsertPlanNode;
import org.voltdb.types.QueryType;
=======
import org.voltdb.sysprocs.SnapshotSave;
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
import org.voltdb.utils.DBBPool;
import org.voltdb.utils.EstTime;
import org.voltdb.utils.EstTimeUpdater;
Solution content 
import org.voltdb.messaging.FastSerializer;
import org.voltdb.network.Connection;
import org.voltdb.network.VoltNetwork;
import org.voltdb.plannodes.AbstractPlanNode;
import org.voltdb.plannodes.InsertPlanNode;
import org.voltdb.sysprocs.SnapshotSave;
import org.voltdb.types.QueryType;
import org.voltdb.utils.DBBPool;
import org.voltdb.utils.EstTime;
import org.voltdb.utils.EstTimeUpdater;
File
HStoreSite.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.voltdb.ProcedureStatsCollector;
import org.voltdb.SQLStmt;
import org.voltdb.SnapshotSiteProcessor;
<<<<<<< HEAD
import org.voltdb.StreamStatsCollector;
import org.voltdb.TriggerStatsCollector;
=======
import org.voltdb.StoredProcedureInvocation;
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
import org.voltdb.SnapshotSiteProcessor.SnapshotTableTask;
import org.voltdb.SysProcSelector;
import org.voltdb.VoltProcedure;
Solution content 
import org.voltdb.ProcedureStatsCollector;
import org.voltdb.SQLStmt;
import org.voltdb.SnapshotSiteProcessor;
import org.voltdb.StreamStatsCollector;
import org.voltdb.TriggerStatsCollector;
import org.voltdb.StoredProcedureInvocation;
import org.voltdb.SnapshotSiteProcessor.SnapshotTableTask;
import org.voltdb.SysProcSelector;
import org.voltdb.VoltProcedure;
File
PartitionExecutor.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import org.voltdb.logging.VoltLogger;
import org.voltdb.messaging.FastDeserializer;
import org.voltdb.messaging.FastSerializer;
<<<<<<< HEAD
import org.voltdb.plannodes.AbstractPlanNode;
import org.voltdb.plannodes.InsertPlanNode;
import org.voltdb.types.QueryType;
=======
import org.voltdb.sysprocs.SnapshotSave;
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
import org.voltdb.types.SpecExecSchedulerPolicyType;
import org.voltdb.types.SpeculationConflictCheckerType;
import org.voltdb.types.SpeculationType;
Solution content 
import org.voltdb.logging.VoltLogger;
import org.voltdb.messaging.FastDeserializer;
import org.voltdb.messaging.FastSerializer;
import org.voltdb.plannodes.AbstractPlanNode;
import org.voltdb.plannodes.InsertPlanNode;
import org.voltdb.types.QueryType;
import org.voltdb.sysprocs.SnapshotSave;
import org.voltdb.types.SpecExecSchedulerPolicyType;
import org.voltdb.types.SpeculationConflictCheckerType;
import org.voltdb.types.SpeculationType;
File
PartitionExecutor.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
                    WriterLogEntry entry = buffer.buffer[(start + j) % buffer.buffer.length];
                    if (entry.isInitialized()) {
                        if (this.usePostProcessor) {
<<<<<<< HEAD
                            hstore_site.responseQueue(entry.cresponse,            // FIXME, also need to add batchId as parameter
                                                      entry.clientCallback,
                                                      entry.initiateTime,
                                                      entry.restartCounter,
                                                      entry.getBatchId()
                                                      );
                        }
                        else {
                            hstore_site.responseSend(entry.cresponse,
                                                     entry.clientCallback,
                                                     entry.getBatchId(),
                                                     entry.initiateTime,
                                                     entry.restartCounter
                                                     );
=======
                            hstore_site.responseQueue(entry.cresponse, entry.clientCallback, entry.initiateTime, entry.restartCounter);
                        } else {
                            hstore_site.responseSend(entry.cresponse, entry.clientCallback, entry.initiateTime, entry.restartCounter);
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
                        }
                    } else {
                        LOG.warn("Unexpected unintialized " + entry.getClass().getSimpleName());
Solution content 
                    WriterLogEntry entry = buffer.buffer[(start + j) % buffer.buffer.length];
                    if (entry.isInitialized()) {
                        if (this.usePostProcessor) {
                            hstore_site.responseQueue(entry.cresponse,            // FIXME, also need to add batchId as parameter
                                                      entry.clientCallback,
                                                      entry.initiateTime,
                                                      entry.restartCounter,
                                                      entry.getBatchId()
                                                      );
                        }
                        else {
                            hstore_site.responseSend(entry.cresponse,
                                                     entry.clientCallback,
                                                     entry.getBatchId(),
                                                     entry.initiateTime,
                                                     entry.restartCounter
                                                     );
                        }
                    } else {
                        LOG.warn("Unexpected unintialized " + entry.getClass().getSimpleName());
File
CommandLogWriter.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
     * @param ts
     * @return
     */
<<<<<<< HEAD
    public LogEntry init(LocalTransaction ts) {
        this.batchId = ts.getBatchId();
=======
    public LogEntry init(AbstractTransaction ts) {
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
        this.txnId = ts.getTransactionId();
        this.procId = ts.getProcedure().getId();
        this.procParams = ts.getProcedureParameters();
Solution content 
     * @param ts
     * @return
     */

    public LogEntry init(AbstractTransaction ts) {
        this.batchId = ts.getBatchId();
        this.txnId = ts.getTransactionId();
        this.procId = ts.getProcedure().getId();
        this.procParams = ts.getProcedureParameters();
File
LogEntry.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Method signature
Chunk
Conflicting content 
    @Override
    public void writeExternal(FastSerializer out) throws IOException {
        assert(this.isInitialized()) : 
<<<<<<< HEAD
            "Unexpected uninitialized " + this.getClass().getSimpleName();
        out.writeInt(this.batchId);
=======
            "Unexpected uninitialized " + this.getClass().getSimpleName();               
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
        out.writeLong(this.txnId.longValue());
        out.writeLong(EstTime.currentTimeMillis());
        out.writeInt(this.procId);
Solution content 
    @Override
    public void writeExternal(FastSerializer out) throws IOException {
        assert(this.isInitialized()) : 
        "Unexpected uninitialized " + this.getClass().getSimpleName();
        out.writeInt(this.batchId);
        out.writeLong(this.txnId.longValue());
        out.writeLong(EstTime.currentTimeMillis());
        out.writeInt(this.procId);
File
LogEntry.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
     */
    private byte m_statusCode = Byte.MIN_VALUE;
    private String m_statusString = null;
<<<<<<< HEAD

=======
    private BackendTarget m_backendTarget;
    
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
    /**
     * End users should not instantiate VoltProcedure instances.
     * Constructor does nothing. All actual initialization is done in the
Solution content 
     */
    private byte m_statusCode = Byte.MIN_VALUE;
    private String m_statusString = null;
    private BackendTarget m_backendTarget;
    
    /**
     * End users should not instantiate VoltProcedure instances.
     * Constructor does nothing. All actual initialization is done in the
File
VoltProcedure.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
        if (this.observable != null) this.observable.notifyObservers(response);
        if (trace.val) LOG.trace(response);
        
<<<<<<< HEAD
        // added by hawk, 2013/11/5
        //response.addFollowingProcedures(this.localTxnState.getFollowingProcedures());
        response.setInitiateTime(this.localTxnState.getInitiateTime());
        // added by hawk
        response.setBatchId(this.localTxnState.getBatchId());
        // ended by hawk
=======
        // ARIES
        /*
         *  Since call returns a ClientResponseImpl you can add a field for the log data
         *  that isn't serialized during messaging that is the log data for the txn
         */
        if (hstore_conf.site.aries && this.hstore_conf.site.aries_forward_only == false) {
            if (this.status == status.OK && this.error == null) {
                if (bufferLength > 0) {
                    response.setAriesLogData(arieslogData);
                }
            }
        }    
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
        
        return (response);
    }
Solution content 
        if (this.observable != null) this.observable.notifyObservers(response);
        if (trace.val) LOG.trace(response);
        
        // added by hawk, 2013/11/5
        //response.addFollowingProcedures(this.localTxnState.getFollowingProcedures());
        response.setInitiateTime(this.localTxnState.getInitiateTime());
        // added by hawk
        response.setBatchId(this.localTxnState.getBatchId());
        // ended by hawk
        // ARIES
        /*
         *  Since call returns a ClientResponseImpl you can add a field for the log data
         *  that isn't serialized during messaging that is the log data for the txn
         */
        if (hstore_conf.site.aries && this.hstore_conf.site.aries_forward_only == false) {
            if (this.status == status.OK && this.error == null) {
                if (bufferLength > 0) {
                    response.setAriesLogData(arieslogData);
                }
            }
        }    
        
        return (response);
    }
File
VoltProcedure.java
Developer's decision
Concatenation
Kind of conflict
Comment
If statement
Method invocation
Chunk
Conflicting content 
    public void addStmtProcedure(String name, String sql, String partitionInfo) {
        addProcedures(new ProcedureInfo(new String[0], new String[0], name, sql, partitionInfo));
    }
<<<<<<< HEAD

    public void addProcedure(final Class procedure) {
=======
    
    public void addProcedure(final Class procedure) {
>>>>>>> 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
        final ArrayList procArray = new ArrayList();
        procArray.add(new ProcedureInfo(new String[0], new String[0], procedure));
        addProcedures(procArray);
Solution content 
    public void addStmtProcedure(String name, String sql, String partitionInfo) {
        addProcedures(new ProcedureInfo(new String[0], new String[0], name, sql, partitionInfo));
    }

    public void addProcedure(final Class procedure) {
        final ArrayList procArray = new ArrayList();
        procArray.add(new ProcedureInfo(new String[0], new String[0], procedure));
        addProcedures(procArray);
File
VoltProjectBuilder.java
Developer's decision
Version 2
Kind of conflict
Method signature