conflict_resolution
stringlengths
27
16k
<<<<<<< // Hee_Q1707.run(); Hee_Q1766.run(); ======= // Hee_Q2331.run(); // Hee_Q11724.run(); // Hee_Q1922.run(); // Hee_Q1707.run(); // Hee_Q11725.run(); // Hee_Q1167.run(); // Hee_Q1967.run(); // Hee_Q2805.run(); // Hee_Q2110.run(); // ...
<<<<<<< import hee.*; ======= import doy.math1_2.Doy_Q1676; import doy.math1_2.Doy_Q1929; import doy.math1_2.Doy_Q6588; import hee.math1_2.Hee_Q6588; >>>>>>> import doy.math1_2.*; import hee.math1_2.*; <<<<<<< // Doy_Q11653.run(); Hee_Q1676.run(); ======= // Doy_Q1929.run(); // Hee_Q1...
<<<<<<< // Hee_Q1707.run(); Hee_Q2178.run(); ======= // Hee_Q2331.run(); // Hee_Q11724.run(); // Hee_Q1922.run(); // Hee_Q1707.run(); // Hee_Q11725.run(); // Hee_Q1167.run(); // Hee_Q1967.run(); // Hee_Q2805.run(); // Hee_Q2110.run(); // ...
<<<<<<< // Hee_Q1707.run(); Hee_Q2146.run(); ======= // Hee_Q2331.run(); // Hee_Q11724.run(); // Hee_Q1922.run(); // Hee_Q1707.run(); // Hee_Q11725.run(); // Hee_Q1167.run(); // Hee_Q1967.run(); // Hee_Q2805.run(); // Hee_Q2110.run(); // ...
<<<<<<< // Doy_Q1991.run(); Hee_Q1654.run(); ======= // Doy_Q1991.run(); Hee_Q1991.run(); >>>>>>> // Doy_Q1991.run(); // Hee_Q1991.run(); Hee_Q1654.run();
<<<<<<< import hee.datastructure1.*; ======= import hee.datastructure1.*; import hee.datastructure2.*; >>>>>>> import hee.datastructure1.*; import hee.datastructure2.*; <<<<<<< // Hee_Q10828.run(); Hee_Q10808.run(); ======= Hee_Q10820.run(); Hee_Q10809.run(); Hee_Q274...
<<<<<<< import hee.datastructure2.Hee_Q1927; ======= import hee.datastructure2.*; >>>>>>> import hee.datastructure2.*; <<<<<<< Hee_Q1927.run(); ======= Hee_Q7785.run(); Hee_Q1764.run(); >>>>>>> Hee_Q1927.run(); Hee_Q7785.run(); Hee_Q1764.run();
<<<<<<< // Hee_Q2751.run(); Doy_Q10814.run(); ======= // Doy_Q2751.run(); // Hee_Q2751.run(); Doy_Q11650.run(); >>>>>>> // Doy_Q2751.run(); // Hee_Q2751.run(); // Doy_Q11650.run(); Doy_Q10814.run();
<<<<<<< // Hee_Q15686.run(); Doy_Q15686.run(); ======= // Hee_Q15686.run(); Hee_Q15685.run(); >>>>>>> // Hee_Q15686.run(); Doy_Q15686.run(); // Hee_Q15685.run();
<<<<<<< import hee.datastructure1.*; ======= import hee.datastructure1.*; import hee.datastructure2.*; >>>>>>> import hee.datastructure1.*; import hee.datastructure2.*; <<<<<<< // Hee_Q10972.run(); Hee_Q11655.run(); ======= // Hee_Q10972.run(); Hee_Q10824.run(); Hee_Q11656....
<<<<<<< // Hee_Q11005.run(); Doy_Q2745.run(); ======= // Hee_Q11005.run(); Hee_Q2745.run(); >>>>>>> // Hee_Q11005.run(); Doy_Q2745.run(); // Hee_Q2745.run();
<<<<<<< Hee_Q2609.run(); ======= Doy_Q2609.run(); // Hee_Q2609.run(); Doy_Q1934.run(); >>>>>>> // Doy_Q2609.run(); Hee_Q2609.run(); // Doy_Q1934.run();
<<<<<<< int saveCount = Math.min(SurespotConfiguration.SAVE_MESSAGE_MINIMUM, messages.size()); ======= >>>>>>> <<<<<<< if (currentScrollPosition > -1) { int saveSize = messagesSize - currentScrollPosition; int saveSizePlusBuffer...
<<<<<<< public static String getRealPathFromURI(Context context, Uri contentUri) { if (Build.VERSION.SDK_INT >= 19) { return getRealPathFromURI_API19(context, contentUri); } else { return getRealPathFromURI_API11to18(context, contentUri); } } ======= ...
<<<<<<< double ratio = includeReferenceCharts() ? TABLE_RATIO : 1.0; RecordSheetOptions subOptions = new RecordSheetOptions(options); subOptions.setReferenceCharts(false); PrintRecordSheet sheet = new PrintTank(tank1, getFirstPage(), subOptions); sheet.createDocument(startPage, p...
<<<<<<< import pneumaticCraft.common.thirdparty.ModInteractionUtils; ======= import pneumaticCraft.common.network.DescSynced; import pneumaticCraft.common.network.GuiSynced; >>>>>>> import pneumaticCraft.common.thirdparty.ModInteractionUtils; <<<<<<< private final TileEntityPneumaticBase vacuumHandler = new Til...
<<<<<<< @Override public String toString() { return "OrVnfmScalingMessage{" + "component=" + component + ", vnfcInstance=" + vnfcInstance + ", virtualNetworkFunctionRecord=" + virtualNetworkFunctionRecord + ", dependency=" + dependency + ...
<<<<<<< import org.openbaton.catalogue.mano.descriptor.*; import org.openbaton.catalogue.mano.record.NetworkServiceRecord; import org.openbaton.catalogue.mano.record.Status; import org.openbaton.catalogue.mano.record.VNFCInstance; import org.openbaton.catalogue.mano.record.VNFRecordDependency; import org.openbaton.cata...
<<<<<<< ======= import java.io.IOException; import java.io.Serializable; import java.util.concurrent.TimeoutException; import javax.annotation.PostConstruct; >>>>>>> import java.io.IOException; import java.io.Serializable; import java.util.concurrent.TimeoutException; import javax.annotation.PostConstruct; <<<<<<< ...
<<<<<<< protected int hb_version = 0; /** * extId of the network to attach */ protected String extId; ======= protected int version = 0; >>>>>>> protected int hb_version = 0; /** * extId of the network to attach */ protected String extId; <<<<<<< protected String conne...
<<<<<<< for (Network net : vimInstance.getNetworks()) if (vnfdConnectionPoint.getVirtual_link_reference().equals(net.getName())) networks.add(net.getExtId()); ======= for (InternalVirtualLink internalVirtualLink : vnfr.getVirtual_link()) { l...
<<<<<<< import org.springframework.boot.autoconfigure.domain.EntityScan; ======= import org.springframework.boot.autoconfigure.web.DispatcherServletAutoConfiguration; import org.springframework.boot.orm.jpa.EntityScan; >>>>>>> import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframewor...
<<<<<<< import org.project.openbaton.catalogue.nfvo.messages.OrVnfmGenericMessage; import org.project.openbaton.nfvo.common.exceptions.NotFoundException; ======= import org.project.openbaton.exceptions.*; >>>>>>> import org.project.openbaton.exceptions.*; import org.project.openbaton.catalogue.nfvo.messages.OrVnfmGe...
<<<<<<< public static final ResourceLocation MODEL_PLASTIC_MIXER = new ResourceLocation(MODEL_LOCATION + "plasticMixer.png"); ======= public static final ResourceLocation MODEL_PNEUMATIC_DYNAMO_ON = new ResourceLocation(MODEL_LOCATION + "pneumaticDynamoOn.png"); public static final ResourceLocation MODEL_...
<<<<<<< import org.openbaton.catalogue.nfvo.networks.BaseNetwork; import org.openbaton.catalogue.nfvo.networks.DockerNetwork; import org.openbaton.catalogue.nfvo.networks.Network; import org.openbaton.catalogue.nfvo.networks.Subnet; ======= >>>>>>> import org.openbaton.catalogue.nfvo.networks.BaseNetwork; import org...
<<<<<<< import org.project.openbaton.catalogue.nfvo.Configuration; import org.project.openbaton.catalogue.nfvo.ConfigurationParameter; ======= >>>>>>> import org.project.openbaton.catalogue.nfvo.Configuration; import org.project.openbaton.catalogue.nfvo.ConfigurationParameter;
<<<<<<< NetworkServiceRecord createRecord( @RequestBody @Valid NetworkServiceDescriptor networkServiceDescriptor) { return networkServiceRecordManagement.onboard(networkServiceDescriptor); ======= NetworkServiceRecord createRecord(@RequestBody @Valid NetworkServiceDescriptor networkServiceDescriptor) { try {...
<<<<<<< /** * Control the max length for request and response content that will be retained. * The transaction will still be recorded but the content itself will not be if it * goes over the max length set. * * @param max the max length for request/response content. * @return The {@lin...
<<<<<<< ======= import static org.mockito.Mockito.mock; import javax.sound.midi.Receiver; >>>>>>> import static org.mockito.Mockito.mock; <<<<<<< import javax.sound.midi.Receiver; import static org.mockito.Mockito.mock; ======= >>>>>>> import javax.sound.midi.Receiver;
<<<<<<< //in viewpager if (mTranslateY == 0 && mTranslateX != 0) { mScale = 1; return super.dispatchTouchEvent(event); } ======= >>>>>>> //in viewpager if (mTranslate...
<<<<<<< FtcDashboard.start(); ======= // check to see if there is a preferred Wi-Fi to use. checkPreferredChannel(); >>>>>>> // check to see if there is a preferred Wi-Fi to use. checkPreferredChannel(); FtcDashboard.start();
<<<<<<< ======= import com.tweetlanes.android.core.AppSettings; import org.tweetalib.android.TwitterFetchResult; import org.tweetalib.android.TwitterFetchUser; import org.tweetalib.android.TwitterManager; import org.tweetalib.android.model.TwitterUser; >>>>>>> import com.tweetlanes.android.core.AppSettings;
<<<<<<< AccountDescriptor account = new AccountDescriptor(user, oAuthToken, oAuthSecret, oSocialNetType); ======= AccountDescriptor account = new AccountDescriptor(this, user, oAuthToken, oAuthSecret); >>>>>>> AccountDesc...
<<<<<<< // do refresh in a separate thread since building indexes depends on the repository being up and running // which might not be the case. Doing a refresh in another thread will give the repository a chance to // start up. We do this by calling the listener this.listener.process(n...
<<<<<<< import org.codehaus.jackson.JsonEncoding; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonToken; import org.codehaus.jackson.util.ByteArrayBuilder; import org.lilyproject.repository.api.IdGenerator; import org.lilyproject.repository.api.SchemaId...
<<<<<<< import org.lilyproject.indexer.engine.DerefMap; import org.lilyproject.indexer.engine.DerefMapHbaseImpl; import org.lilyproject.indexer.engine.IndexLocker; import org.lilyproject.indexer.engine.Indexer; import org.lilyproject.indexer.engine.IndexerMetrics; import org.lilyproject.indexer.engine.SolrClientConfig;...
<<<<<<< enf = new EnfProc(this); n = g.getEnvelopGraph().getNbNodes(); } //*********************************************************************************** // METHODS //*********************************************************************************** @Override public void propagate(int evtmask) throws ...
<<<<<<< import solver.variables.VF; ======= import solver.variables.VF; import solver.variables.VariableFactory; import util.tools.StringUtils; >>>>>>> import solver.variables.VF; import util.tools.StringUtils; <<<<<<< Constraint cstr = null; if (as.length == 1) { if (as[0] == 1) { ...
<<<<<<< import solver.variables.setDataStructures.ISet; ======= import solver.variables.graph.IActiveNodes; import solver.variables.graph.INeighbors; >>>>>>> import solver.variables.setDataStructures.ISet; <<<<<<< int min = efficientSearch(); k.updateLowerBound(min, this); if(min == k.getUB()){ filter();...
<<<<<<< import org.slf4j.LoggerFactory; ======= import common.ESat; >>>>>>> import org.slf4j.LoggerFactory; import common.ESat; <<<<<<< import solver.exception.SolverException; import solver.explanations.RecorderExplanationEngine; ======= >>>>>>> import solver.exception.SolverException; import solver.explanation...
<<<<<<< this.n = g.getEnvelopGraph().getNbNodes(); valRemoved = new ValRem(this); arcEnforced = new EnfArc(this); if(intVars[0].hasEnumeratedDomain()){ arcRemoved = new RemArcAC(this); }else{ arcRemoved = new RemArcBC(this); } } //*****************************************************************...
<<<<<<< ======= import solver.search.strategy.assignments.DecisionOperator; >>>>>>> import solver.search.strategy.assignments.DecisionOperator; <<<<<<< ======= @Override @Deprecated public void set(GraphVar var, int value, DecisionOperator<GraphVar> graphVarAssignment) { throw new Unsupported...
<<<<<<< import solver.objective.MinObjectiveManager; import solver.search.strategy.assignments.Assignment; ======= import solver.search.strategy.assignments.DecisionOperator; >>>>>>> import solver.objective.MinObjectiveManager; import solver.search.strategy.assignments.DecisionOperator; <<<<<<< private IntVar obj;...
<<<<<<< ======= IntVar[] diffs = solver.intVarArray("d", (m * m - m) / 2, 0, (m < 31) ? (1 << (m + 1)) - 1 : 9999, false); solver.addHook("diffs", diffs); IntVar[][] m_diffs = new IntVar[m][m]; >>>>>>>
<<<<<<< import org.chocosolver.solver.variables.VF; import org.chocosolver.util.ProblemMaker; ======= >>>>>>> import org.chocosolver.solver.variables.VF; import org.chocosolver.util.ProblemMaker; <<<<<<< ======= public void queen(Solver solver, int n) { IntVar[] q = solver.intVarArray("Q", n, 1, n, fa...
<<<<<<< ======= import solver.propagation.PropagationEngine; import solver.propagation.generator.PArc; import solver.propagation.generator.Sort; >>>>>>> <<<<<<< private static void run() { Solver solver = new Solver(); // variables int max = 100 * optimum; IntVar totalCost = Vari...
<<<<<<< ======= import org.chocosolver.solver.search.limits.ICounter; import org.chocosolver.solver.search.loop.monitors.IMonitorSolution; >>>>>>>
<<<<<<< public void explain(Deduction d, Explanation e) { // return super.explain(d); ======= public Explanation explain(Deduction d) { >>>>>>> public void explain(Deduction d, Explanation e) {
<<<<<<< private IntProcedure enfNode; private PairProcedure remArc; private ISet concernedNodes; ======= private IntProcedure enfNode; private PairProcedure remArc; private INeighbors concernedNodes; >>>>>>> private IntProcedure enfNode; private PairProcedure remArc; private ISet concernedNodes; <...
<<<<<<< public abstract class IntView extends AbstractVariable<IntDelta, IIntDeltaMonitor, IntVar> implements IView<IntDelta, IIntDeltaMonitor>, IntVar { ======= public abstract class IntView<IV extends IntVar> extends AbstractVariable<IntDelta, IIntDeltaMonitor, IntView, IntView<IV>> implements IView...
<<<<<<< import solver.constraints.Constraint; import solver.constraints.ConstraintFactory; import solver.constraints.nary.AllDifferent; import solver.propagation.generator.*; import solver.propagation.generator.sorter.evaluator.EvtRecEvaluators; ======= import solver.constraints.nary.alldifferent.AllDifferent; import...
<<<<<<< JavaApiAnalyzer apiAnalyzer = new JavaApiAnalyzer(Collections.emptyList()); Revapi r = new Revapi(PipelineConfiguration.builder().withAnalyzers(JavaApiAnalyzer.class) .withFilters(ConfigurableElementFilter.class).withMatchers(JavaElementMatcher.class).build()); =====...
<<<<<<< import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; ======= import static java.util.Comparator.comparingInt; >>>>>>> import static java.util.Comparator.comparingInt; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSe...
<<<<<<< * Copyright 2014-2019 Lukas Krejci ======= * Copyright 2014-2020 Lukas Krejci >>>>>>> * Copyright 2014-2020 Lukas Krejci <<<<<<< public abstract class AbstractDifferenceReferringTransform<Recipe extends DifferenceMatchRecipe> ======= public abstract class AbstractDifferenceReferringTransform >>>>>>> p...
<<<<<<< ======= import static java.util.Collections.emptyList; import java.io.IOException; import java.io.InputStream; >>>>>>> import static java.util.Collections.emptyList; <<<<<<< null), Executors.newSingleThreadExecutor(), null, false ); ======= null), emptyList(), Exe...
<<<<<<< import org.revapi.java.checks.fields.SerialVersionUidUnchanged; import org.revapi.java.spi.JavaTypeElement; ======= import org.revapi.java.checks.common.SerializationChecker; >>>>>>> import org.revapi.java.checks.common.SerializationChecker; import org.revapi.java.spi.JavaTypeElement;
<<<<<<< ======= import org.revapi.java.model.AbstractJavaElement; >>>>>>> import org.revapi.java.model.AbstractJavaElement; <<<<<<< private final ArchiveAnalyzer.Filter filter; ======= private final InclusionFilter inclusionFilter; private final boolean defaultInclusionCase; private final TypeElem...
<<<<<<< public boolean mTEMachineRecipes = false; ======= public double mMagneticraftBonusOutputPercent = 100.0d; private final String aTextThermalExpansion = "ThermalExpansion"; private final String aTextRailcraft = "Railcraft"; private final String aTextTwilightForest = "TwilightForest"; pri...
<<<<<<< import java.util.ArrayList; import java.util.HashMap; import java.util.List; ======= import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; >>>>>>> import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; <<<<<<< ...
<<<<<<< ======= import ic2.core.item.ItemIC2FluidContainer; >>>>>>> import ic2.core.item.ItemIC2FluidContainer; <<<<<<< ======= import net.minecraft.block.state.IBlockState; >>>>>>> import net.minecraft.block.state.IBlockState; <<<<<<< for (Dyes tDye : Dyes.VALUES) { ...
<<<<<<< gregtechproxy.mNerfedCombs = tMainConfig.get("general", "NerfCombs", true).getBoolean(true); gregtechproxy.mHideUnusedOres = tMainConfig.get("general", "HideUnusedOres", true).getBoolean(true); gregtechproxy.mHideRecyclingRecipes = tMainConfig.get("general", "HideRecyclingRecipes", true)...
<<<<<<< call.getPlayer().sendMessage( plugin.messenger.playerError( "Please specify a report. Use /prism ? for help." ) ); ======= call.getSender().sendMessage( plugin.playerError( "Please specify a report. Use /prism ? for help." ) ); >>>>>>> call.getSender().sendMessage( plugin.messenger.playerError( "Ple...
<<<<<<< gearSmall("Small Gears", M, null, MaterialIconType.gearGtSmall, ENABLE_UNIFICATION, hasFlag(GENERATE_SMALL_GEAR)), gear("Gears", M * 4, null, MaterialIconType.gearGt, ENABLE_UNIFICATION, hasFlag(GENERATE_GEAR)), // Introduced by me because BuildCraft has ruined the gear Prefix... ======= gearGtSma...
<<<<<<< private final ByteArrayOutputStream readBuffer = new ByteArrayOutputStream(); private final Inflater inflater = new Inflater(); ======= private final Buffer readBuffer = Buffer.buffer(); private Buffer decompressBuffer = Buffer.buffer(); >>>>>>> private final ByteArrayOutputStream readBuf...
<<<<<<< client.newWebSocketBuilder().buildAsync(URI.create(url), this).thenAcceptAsync(ws -> { socket = ws; socketOpen = true; catnip.eventBus().publish(Raw.CONNECTED, shardInfo()); }).exceptionally(t -> { socket = null; socketOpen = false; ...
<<<<<<< private final Buffer readBuffer = Buffer.buffer(); @Getter private final Buffer decompressBuffer = Buffer.buffer(); @Getter ======= private final AtomicBoolean socketOpen = new AtomicBoolean(false); @Getter >>>>>>> private final Buffer readBuffer = Buff...
<<<<<<< ======= // Initialize temporary data structures for (Site catalog_site : CatalogUtil.getAllSites(this.catalog)) { if (catalog_site.getId() != this.siteId) { tmp_transactionRequestBuildersParameters.put(catalog_site.getId(), new HashSet<Integer>()); ...
<<<<<<< import org.voltdb.messaging.FastSerializer; ======= >>>>>>> import org.voltdb.messaging.FastSerializer; <<<<<<< import edu.brown.hstore.*; import edu.brown.hstore.Hstore.HStoreService; import edu.brown.hstore.Hstore.SendDataRequest; import edu.brown.hstore.Hstore.SendDataResponse; import edu.brown.hstore.Hs...
<<<<<<< ======= >>>>>>> <<<<<<< 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", SmallBankConstan...
<<<<<<< ======= // TODO: These should be moved into HStoreConf //public static final long DEFAULT_EVICTED_BLOCK_SIZE = 1048576; // 1024 kB public static final long DEFAULT_EVICTED_BLOCK_SIZE = 524288; // 512 kB //public static final long DEFAULT_EVICTED_BLOCK_SIZE = 262144; // 256 kB //p...
<<<<<<< import org.voltdb.VoltTable; import org.voltdb.VoltTableRow; ======= import org.voltdb.ParameterSet; import org.voltdb.VoltTable; >>>>>>> import org.voltdb.VoltTable; import org.voltdb.VoltTableRow; import org.voltdb.ParameterSet; <<<<<<< // IMPLEMENTING CLASS METHODS // ----------------------------...
<<<<<<< /*if (ts instanceof LocalTransaction) { WriteAheadLogger.writeCombined((LocalTransaction)ts, status); }*/ ======= ts.setStatus(status); >>>>>>> /*if (ts instanceof LocalTransaction) { ...
<<<<<<< ======= >>>>>>> <<<<<<< int id = NEXT_FRAGMENT_ID.getAndIncrement(); String planFragmentName = Integer.toString(id); ======= // HACK: We're using the node_tree's hashCode() as it's name. It would be really // nice if...
<<<<<<< ======= // required int32 exit_status = 2; public static final int EXIT_STATUS_FIELD_NUMBER = 2; private boolean hasExitStatus; private int exitStatus_ = 0; public boolean hasExitStatus() { return hasExitStatus; } public int getExitStatus() { return exitStatus_; } >>>>>>> <<<<<<...
<<<<<<< import java.util.List; ======= import java.util.LinkedHashMap; >>>>>>> import java.util.List; import java.util.LinkedHashMap;
<<<<<<< public abstract class AbstractTreeWalker<E> implements Poolable { protected static final Logger LOG = Logger.getLogger(AbstractTreeWalker.class); ======= public abstract class AbstractTreeWalker<E> { private static final Logger LOG = Logger.getLogger(AbstractTreeWalker.class); >>>>>>> public abstract...
<<<<<<< this.force_singlePartition = forceSinglePartition; ======= this.enable_unique_ids = hstore_conf.site.planner_unique_dependency_ids; >>>>>>> this.force_singlePartition = forceSinglePartition; this.enable_unique_ids = hstore_conf.site.planner_unique_dependency_ids;
<<<<<<< if (this.hstore_conf.site.mr_map_blocking) { hstore_site.getTransactionQueueManager().finished(txn_id, Status.OK, this.partitionId); } ======= hstore_site.getTransactionQueueManager().lockFinished(txn_id, Status.OK, this.partitionId); >>>>>>> ...
<<<<<<< if (DeviceImpl.checkReachability(RCClient.getContext()) == DeviceImpl.ReachabilityState.REACHABILITY_NONE) { Log.e(TAG, "connect(): No reachability"); // Phone state Intents to capture connection failed event String username = ""; if (parameters != null &&...
<<<<<<< // Phone state Intents to capture incoming call event private void sendIncomingConnectionIntent (String user, RCConnection connection) { Intent intent = new Intent ("org.mobicents.restcomm.android.CALL_STATE"); intent.putExtra("STATE", "ringing"); intent.putExtra("INCOMING",...
<<<<<<< ======= import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.ArrayList; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; import java.util.Observable; import java.util.Observer; import java.util.concurrent.CountDownLatch; import java.util.concur...
<<<<<<< ======= import org.apache.http.impl.client.trunk.BasicCookieStore; >>>>>>> import org.apache.http.impl.client.trunk.BasicCookieStore; <<<<<<< import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.concurrent.ScheduledExecutorService; ======= import android.net.Uri;...
<<<<<<< public RemoteMultipartDownloaderRequest(HttpClientFactory clientFactory, String method, URL url, Object body, Database db, ...
<<<<<<< ======= private static final String LSM_LOCAL_METAGRAPH = "lsm-light.server.localMetaGraph"; private static final String LSM_LOCAL_DATAGRAPH = "lsm-light.server.localDataGraph"; <<<<<<< /mnt/batch/tasks/workitems/adfv2-General_1/job-1/e01309fd-1428-47ea-a6e6-4f5b0907aa5f/wd/.temp/athenacommon/27a37284-2dbd-4f...
<<<<<<< import static com.stratio.deep.commons.extractor.server.ExtractorServer.initExtractorServer; import static com.stratio.deep.commons.extractor.server.ExtractorServer.stopExtractorServer; ======= import com.mongodb.QueryBuilder; import com.stratio.deep.commons.config.ExtractorConfig; import com.stratio.deep.com...
<<<<<<< ======= import com.datastax.driver.core.Session; import com.stratio.deep.commons.config.IDeepJobConfig; import com.stratio.deep.commons.entity.Cell; import com.stratio.deep.commons.filter.Filter; >>>>>>> import com.datastax.driver.core.Session; import com.stratio.deep.commons.config.IDeepJobConfig; import c...
<<<<<<< import java.text.SimpleDateFormat; import java.util.Map.Entry; ======= >>>>>>> import java.util.Map.Entry;
<<<<<<< import com.stratio.deep.commons.querybuilder.UpdateQueryBuilder; ======= import java.util.List; >>>>>>> import com.stratio.deep.commons.querybuilder.UpdateQueryBuilder; import java.util.List; <<<<<<< void initSave(S config, T first, UpdateQueryBuilder queryBuilder); ======= /** * Init save....
<<<<<<< import com.stratio.deep.entity.CassandraCell; ======= import java.io.Serializable; import java.lang.reflect.Field; import java.math.BigInteger; import java.util.*; >>>>>>> import java.io.Serializable; import java.lang.reflect.Field; import java.math.BigInteger; import java.util.*; import com.stratio.deep.e...
<<<<<<< // //Call async the Extractor netty Server ExtractorServer.initExtractorServer(); ======= >>>>>>>
<<<<<<< ======= /** * Builds the partition key in {@link ByteBuffer} format for the given values. * * @param equalsList * List of equals field and value pairs. * @param inValue * Value for the operator in. * * @return {@link ByteBuffer} with the par...
<<<<<<< ======= import java.io.Serializable; import java.util.ArrayList; import java.util.Map; import org.apache.log4j.Logger; import org.apache.spark.SparkContext; import org.apache.spark.api.java.JavaRDD; import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.rdd.RDD; >>>>>>> import java.io...
<<<<<<< ======= import com.stratio.deep.commons.config.ExtractorConfig; import com.stratio.deep.commons.entity.Cell; import com.stratio.deep.core.context.DeepSparkContext; import com.stratio.deep.commons.entity.Cells; import com.stratio.deep.extractor.ESCellExtractor; import com.stratio.deep.commons.extractor.server....
<<<<<<< ======= import java.io.Serializable; import java.util.HashMap; import java.util.Map; import com.stratio.deep.commons.entity.Cells; import com.stratio.deep.commons.utils.Pair; >>>>>>> <<<<<<< public class ExtractorConfig<T> implements Serializable, Cloneable { private static final long serialVersionUI...
<<<<<<< ======= import com.stratio.deep.commons.config.ExtractorConfig; import com.stratio.deep.core.context.DeepSparkContext; import com.stratio.deep.core.entity.BookEntity; import com.stratio.deep.core.entity.CantoEntity; import com.stratio.deep.core.entity.WordCount; import com.stratio.deep.extractor.ESEntityExtra...
<<<<<<< import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; ======= import java.util.List; >>>>>>> import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; i...
<<<<<<< import java.util.List; import javax.net.ssl.SSLException; import org.apache.spark.Partition; import com.stratio.deep.commons.config.ExtractorConfig; import com.stratio.deep.commons.config.IDeepJobConfig; import com.stratio.deep.commons.exception.DeepExtractorinitializationException; import com.stratio.deep.c...
<<<<<<< for (Cell cell : localCells) { Cell otherCell = o.getCellByName(entry.getKey(), cell.getCellName()); if (otherCell == null) { return false; } ======= if (otherCell == null || !otherCell.equals(cell)) { return false; } } } >>>>>>> ...
<<<<<<< initExtractorServer(); ======= >>>>>>>
<<<<<<< import java.util.Timer; import java.util.TimerTask; ======= >>>>>>> import java.util.Timer; import java.util.TimerTask; <<<<<<< protected float mFrameTime; private boolean mIsProcessing; private GVRWorldTask gvrWorldTask; private static final long DEFAULT_INTERVAL = 15; ======= pro...