Projects information

Chunk

Conflicting content
// Otherwise, we need to generate WorkFragments and then send the messages out // to our remote partitions using the HStoreCoordinator else { <<<<<<< HEAD if (d) LOG.debug(ts + " - Using PartitionExecutor.dispatchWorkFragments() to execute distributed queries"); this.partitionFragments.clear(); plan.getWorkFragments(ts.getTransactionId(), this.partitionFragments); if (t) LOG.trace(ts + " - Got back a set of tasks for " + this.partitionFragments.size() + " partitions"); ======= this.tmp_partitionFragments.clear(); plan.getWorkFragments(ts.getTransactionId(), this.tmp_partitionFragments); if (t) LOG.trace("Got back a set of tasks for " + this.tmp_partitionFragments.size() + " partitions for " + ts); >>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483 // Block until we get all of our responses. results = this.dispatchWorkFragments(ts, batchSize, this.tmp_partitionFragments, batchParams);

Conflicting content

        // Otherwise, we need to generate WorkFragments and then send the messages out 
        // to our remote partitions using the HStoreCoordinator
        else {
<<<<<<< HEAD
            if (d) LOG.debug(ts + " - Using PartitionExecutor.dispatchWorkFragments() to execute distributed queries");
            this.partitionFragments.clear();
            plan.getWorkFragments(ts.getTransactionId(), this.partitionFragments);
            if (t) LOG.trace(ts + " - Got back a set of tasks for " + this.partitionFragments.size() + " partitions");
=======
            this.tmp_partitionFragments.clear();
            plan.getWorkFragments(ts.getTransactionId(), this.tmp_partitionFragments);
            if (t) LOG.trace("Got back a set of tasks for " + this.tmp_partitionFragments.size() + " partitions for " + ts);
>>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483

            // Block until we get all of our responses.
            results = this.dispatchWorkFragments(ts, batchSize, this.tmp_partitionFragments, batchParams);

Solution content
// Otherwise, we need to generate WorkFragments and then send the messages out // to our remote partitions using the HStoreCoordinator else { if (d) LOG.debug(ts + " - Using PartitionExecutor.dispatchWorkFragments() to execute distributed queries"); this.tmp_partitionFragments.clear(); plan.getWorkFragments(ts.getTransactionId(), this.tmp_partitionFragments); if (t) LOG.trace("Got back a set of tasks for " + this.tmp_partitionFragments.size() + " partitions for " + ts); // Block until we get all of our responses. results = this.dispatchWorkFragments(ts, batchSize, this.tmp_partitionFragments, batchParams);

Solution content

        // Otherwise, we need to generate WorkFragments and then send the messages out 
        // to our remote partitions using the HStoreCoordinator
        else {
            if (d) LOG.debug(ts + " - Using PartitionExecutor.dispatchWorkFragments() to execute distributed queries");
            this.tmp_partitionFragments.clear();
            plan.getWorkFragments(ts.getTransactionId(), this.tmp_partitionFragments);
            if (t) LOG.trace("Got back a set of tasks for " + this.tmp_partitionFragments.size() + " partitions for " + ts);

            // Block until we get all of our responses.
            results = this.dispatchWorkFragments(ts, batchSize, this.tmp_partitionFragments, batchParams);

File
PartitionExecutor.java

Developer's decision
Combination

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
} m_depsById.put(e.getKey(), deque); } else { deque.clear(); <<<<<<< HEAD } deque.addAll(e.getValue()); ======= } for (VoltTable vt : e.getValue()) { if (vt != null) deque.add(vt); } // FOR >>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483 } if (d) LOG.debug("Current InputDepencies:\n" + StringUtil.formatMaps(m_depsById));

Conflicting content

        }
                m_depsById.put(e.getKey(), deque);
                } else {
                    deque.clear();
<<<<<<< HEAD
            }
                deque.addAll(e.getValue());
=======
                }
                for (VoltTable vt : e.getValue()) {
                    if (vt != null) deque.add(vt);
                } // FOR
>>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483
            }
            if (d) LOG.debug("Current InputDepencies:\n" + StringUtil.formatMaps(m_depsById));

Solution content
m_depsById.put(e.getKey(), deque); } else { deque.clear(); } for (VoltTable vt : e.getValue()) { if (vt != null) deque.add(vt); } // FOR } if (d) LOG.debug("Current InputDepencies:\n" + StringUtil.formatMaps(m_depsById)); }

Solution content

                m_depsById.put(e.getKey(), deque);
                } else {
                    deque.clear();
                }
                for (VoltTable vt : e.getValue()) {
                    if (vt != null) deque.add(vt);
                } // FOR
            }
            if (d) LOG.debug("Current InputDepencies:\n" + StringUtil.formatMaps(m_depsById));
        }

File
ExecutionEngine.java

Developer's decision
Version 2

Kind of conflict
Comment
For statement
Method invocation

Chunk

Conflicting content
throw new EEException(ERRORCODE_WRONG_SERIALIZED_BYTES); } } <<<<<<< HEAD ======= // @Override // public DependencySet executeQueryPlanFragmentsAndGetDependencySet( // long[] planFragmentIds, // int numFragmentIds, // int[] input_depIds, // int[] output_depIds, // ByteString[] parameterSets, // int numParameterSets, // long txnId, long lastCommittedTxnId, long undoToken) throws EEException { // // assert(parameterSets != null) : "Null ParameterSets for txn #" + txnId; // assert (planFragmentIds.length == parameterSets.length); // // // serialize the param sets // fsForParameterSet.clear(); // for (int i = 0; i < numParameterSets; ++i) { // fsForParameterSet.getBBContainer().b.put(parameterSets[i].asReadOnlyByteBuffer()); // if (t) LOG.trace("Batch Executing planfragment:" + planFragmentIds[i] + ", params=" + parameterSets[i].toString()); // } // // return _executeQueryPlanFragmentsAndGetDependencySet(planFragmentIds, numFragmentIds, input_depIds, output_depIds, txnId, lastCommittedTxnId, undoToken); // } >>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483 /** * @param undoToken Token identifying undo quantum for generated undo info

Conflicting content

            throw new EEException(ERRORCODE_WRONG_SERIALIZED_BYTES);
        }
    }
<<<<<<< HEAD
=======
    
//    @Override
//    public DependencySet executeQueryPlanFragmentsAndGetDependencySet(
//            long[] planFragmentIds,
//            int numFragmentIds,
//            int[] input_depIds,
//            int[] output_depIds,
//            ByteString[] parameterSets,
//            int numParameterSets,
//            long txnId, long lastCommittedTxnId, long undoToken) throws EEException {
//        
//        assert(parameterSets != null) : "Null ParameterSets for txn #" + txnId;
//        assert (planFragmentIds.length == parameterSets.length);
//        
//        // serialize the param sets
//        fsForParameterSet.clear();
//        for (int i = 0; i < numParameterSets; ++i) {
//            fsForParameterSet.getBBContainer().b.put(parameterSets[i].asReadOnlyByteBuffer());
//            if (t) LOG.trace("Batch Executing planfragment:" + planFragmentIds[i] + ", params=" + parameterSets[i].toString());
//        }
//        
//        return _executeQueryPlanFragmentsAndGetDependencySet(planFragmentIds, numFragmentIds, input_depIds, output_depIds, txnId, lastCommittedTxnId, undoToken);
//    }
    
>>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483

    /**
     * @param undoToken Token identifying undo quantum for generated undo info

Solution content
throw new EEException(ERRORCODE_WRONG_SERIALIZED_BYTES); } } /** * @param undoToken Token identifying undo quantum for generated undo info

File
ExecutionEngineJNI.java

Developer's decision
Version 1

Kind of conflict
Comment

Chunk

Conflicting content
@Override public DependencySet executeQueryPlanFragmentsAndGetDependencySet( long[] planFragmentIds, <<<<<<< HEAD int batchSize, ======= int numFragmentIds, >>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483 int[] input_depIds, int[] output_depIds, ParameterSet[] parameterSets,

Conflicting content

    @Override
    public DependencySet executeQueryPlanFragmentsAndGetDependencySet(
            long[] planFragmentIds,
<<<<<<< HEAD
            int batchSize,
=======
            int numFragmentIds,
>>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483
            int[] input_depIds,
            int[] output_depIds,
            ParameterSet[] parameterSets,

Solution content
@Override public DependencySet executeQueryPlanFragmentsAndGetDependencySet( long[] planFragmentIds, int batchSize, int[] input_depIds, int[] output_depIds, ParameterSet[] parameterSets,

File
ExecutionEngineJNI.java

Developer's decision
Version 1

Kind of conflict
Variable

Chunk

Conflicting content
ParameterSet[] parameterSets, int numParameterSets, long txnId, long lastCommittedTxnId, long undoToken) throws EEException { <<<<<<< HEAD assert(parameterSets != null) : "Null ParameterSets for txn #" + txnId; assert (planFragmentIds.length == parameterSets.length); if (batchSize == 0) { LOG.warn("No fragments to execute. Returning empty DependencySet"); return (new DependencySet(new int[0], HStoreConstants.EMPTY_RESULT)); } // serialize the param sets fsForParameterSet.clear(); try { for (int i = 0; i < batchSize; ++i) { ======= assert(parameterSets != null) : "Null ParameterSets for txn #" + txnId; assert(planFragmentIds.length == parameterSets.length); if (numFragmentIds == 0) { LOG.warn("No fragments to execute. Returning empty DependencySet"); return (new DependencySet(new int[0], new VoltTable[0])); } // serialize the param sets fsForParameterSet.clear(); try { for (int i = 0; i < numFragmentIds; ++i) { >>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483 parameterSets[i].writeExternal(fsForParameterSet); if (t) LOG.trace("Batch Executing planfragment:" + planFragmentIds[i] + ", params=" + parameterSets[i].toString()); }

Conflicting content

            ParameterSet[] parameterSets,
            int numParameterSets,
            long txnId, long lastCommittedTxnId, long undoToken) throws EEException {
<<<<<<< HEAD

        assert(parameterSets != null) : "Null ParameterSets for txn #" + txnId;
        assert (planFragmentIds.length == parameterSets.length);
        
        if (batchSize == 0) {
            LOG.warn("No fragments to execute. Returning empty DependencySet");
            return (new DependencySet(new int[0], HStoreConstants.EMPTY_RESULT));
        }

        // serialize the param sets
        fsForParameterSet.clear();
        try {
            for (int i = 0; i < batchSize; ++i) {
=======
        
        assert(parameterSets != null) : "Null ParameterSets for txn #" + txnId;
        assert(planFragmentIds.length == parameterSets.length);
        
        if (numFragmentIds == 0) {
            LOG.warn("No fragments to execute. Returning empty DependencySet");
            return (new DependencySet(new int[0], new VoltTable[0]));
        }
        
        // serialize the param sets
        fsForParameterSet.clear();
        try {
            for (int i = 0; i < numFragmentIds; ++i) {
>>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483
                parameterSets[i].writeExternal(fsForParameterSet);
                if (t) LOG.trace("Batch Executing planfragment:" + planFragmentIds[i] + ", params=" + parameterSets[i].toString());
            }

Solution content
ParameterSet[] parameterSets, int numParameterSets, long txnId, long lastCommittedTxnId, long undoToken) throws EEException { assert(parameterSets != null) : "Null ParameterSets for txn #" + txnId; assert (planFragmentIds.length == parameterSets.length); if (batchSize == 0) { LOG.warn("No fragments to execute. Returning empty DependencySet"); return (new DependencySet(new int[0], HStoreConstants.EMPTY_RESULT)); } // serialize the param sets fsForParameterSet.clear(); try { for (int i = 0; i < batchSize; ++i) { parameterSets[i].writeExternal(fsForParameterSet); if (t) LOG.trace("Batch Executing planfragment:" + planFragmentIds[i] + ", params=" + parameterSets[i].toString()); }

Solution content

            ParameterSet[] parameterSets,
            int numParameterSets,
            long txnId, long lastCommittedTxnId, long undoToken) throws EEException {

        assert(parameterSets != null) : "Null ParameterSets for txn #" + txnId;
        assert (planFragmentIds.length == parameterSets.length);
        
        if (batchSize == 0) {
            LOG.warn("No fragments to execute. Returning empty DependencySet");
            return (new DependencySet(new int[0], HStoreConstants.EMPTY_RESULT));
        }

        // serialize the param sets
        fsForParameterSet.clear();
        try {
            for (int i = 0; i < batchSize; ++i) {
                parameterSets[i].writeExternal(fsForParameterSet);
                if (t) LOG.trace("Batch Executing planfragment:" + planFragmentIds[i] + ", params=" + parameterSets[i].toString());
            }

File
ExecutionEngineJNI.java

Developer's decision
Version 1

Kind of conflict
Assert statement
Comment
For statement
If statement
Method invocation
Try statement

Chunk

Conflicting content
} catch (final IOException exception) { throw new RuntimeException(exception); // can't happen } <<<<<<< HEAD ======= >>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483 // Execute the plan, passing a raw pointer to the byte buffers for input and output deserializer.clear(); final int errorCode = nativeExecuteQueryPlanFragmentsAndGetResults(pointer,

Conflicting content

        } catch (final IOException exception) {
            throw new RuntimeException(exception); // can't happen
        }
<<<<<<< HEAD
        
=======

>>>>>>> 3fb648dec389a8a0c12da621dc860962b1656483
        // Execute the plan, passing a raw pointer to the byte buffers for input and output
        deserializer.clear();
        final int errorCode = nativeExecuteQueryPlanFragmentsAndGetResults(pointer,

Solution content
} catch (final IOException exception) { throw new RuntimeException(exception); // can't happen } // Execute the plan, passing a raw pointer to the byte buffers for input and output deserializer.clear(); final int errorCode = nativeExecuteQueryPlanFragmentsAndGetResults(pointer,

Solution content

        } catch (final IOException exception) {
            throw new RuntimeException(exception); // can't happen
        }

        // Execute the plan, passing a raw pointer to the byte buffers for input and output
        deserializer.clear();
        final int errorCode = nativeExecuteQueryPlanFragmentsAndGetResults(pointer,

File
ExecutionEngineJNI.java

Developer's decision
Version 1

Kind of conflict
Blank

Projects >> h-store >>d97d9ce5f363636488d281bf3562544347a71014