Projects >> h-store >>24aafae28ebc445ae05e4cbd0e57e8041d96050d

Chunk
Conflicting content 
        // ----------------------------------------------------------------------------
        // PartitionExecutor Initialization
        // ----------------------------------------------------------------------------
<<<<<<< HEAD
        for (int local_partition : singleton.getLocalPartitionIdArray()) {
=======
        boolean first = true;
        for (Partition catalog_part : catalog_site.getPartitions()) {
            int local_partition = catalog_part.getId();
>>>>>>> 5dca526a187d2deb491532e214cbd87d12c90b6a
            MarkovGraphsContainer local_markovs = null;
            if (markovs != null) {
                if (markovs.containsKey(MarkovUtil.GLOBAL_MARKOV_CONTAINER_ID)) {
Solution content 
        // ----------------------------------------------------------------------------
        // PartitionExecutor Initialization
        // ----------------------------------------------------------------------------
        boolean first = true;
        for (int local_partition : singleton.getLocalPartitionIdArray()) {
            MarkovGraphsContainer local_markovs = null;
            if (markovs != null) {
                if (markovs.containsKey(MarkovUtil.GLOBAL_MARKOV_CONTAINER_ID)) {
File
HStore.java
Developer's decision
Combination
Kind of conflict
For statement
Method invocation
Variable
Chunk
Conflicting content 
import java.util.ArrayList;
import java.util.HashMap;
<<<<<<< HEAD
import java.util.List;
=======
import java.util.LinkedHashMap;
>>>>>>> 5dca526a187d2deb491532e214cbd87d12c90b6a
import java.util.Map;

import org.voltdb.catalog.Statement;
Solution content 
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.LinkedHashMap;
import java.util.Map;

import org.voltdb.catalog.Statement;
File
EstimatorState.java
Developer's decision
Concatenation
Kind of conflict
Import