http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/core/src/main/java/org/apache/ignite/Ignite.java ----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 415b6cb,1db0e11..295bf61 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@@ -19,22 -19,21 +19,27 @@@ package org.apache.ignite.configuration import org.apache.ignite.*; import org.apache.ignite.cache.*; + import org.apache.ignite.client.ssl.*; import org.apache.ignite.events.*; import org.apache.ignite.fs.*; -import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.processors.hadoop.*; + import org.apache.ignite.internal.managers.eventstorage.*; + import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.managed.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.plugin.*; +import org.apache.ignite.portables.*; +import org.apache.ignite.spi.authentication.*; +import org.apache.ignite.spi.indexing.*; +import org.apache.ignite.streamer.*; +import org.apache.ignite.client.ssl.*; +import org.apache.ignite.internal.managers.eventstorage.*; import org.apache.ignite.plugin.security.*; import org.apache.ignite.plugin.segmentation.*; + import org.apache.ignite.portables.*; + import org.apache.ignite.spi.authentication.*; import org.apache.ignite.spi.checkpoint.*; import org.apache.ignite.spi.collision.*; import org.apache.ignite.spi.communication.*; @@@ -45,7 -45,7 +51,8 @@@ import org.apache.ignite.spi.indexing.* import org.apache.ignite.spi.loadbalancing.*; import org.apache.ignite.spi.securesession.*; import org.apache.ignite.spi.swapspace.*; +import org.apache.ignite.internal.util.typedef.internal.*; + import org.apache.ignite.streamer.*; import javax.management.*; import java.lang.management.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 5c07dc8,fabc45b..0f65904 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@@ -22,21 -22,7 +22,22 @@@ import org.apache.ignite.cache.* import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.*; +import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.hadoop.*; +import org.apache.ignite.internal.processors.portable.*; +import org.apache.ignite.internal.util.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.lifecycle.*; +import org.apache.ignite.marshaller.*; +import org.apache.ignite.marshaller.optimized.*; +import org.apache.ignite.mxbean.*; +import org.apache.ignite.plugin.*; +import org.apache.ignite.internal.product.*; +import org.apache.ignite.spi.*; +import org.apache.ignite.spi.authentication.*; +import org.apache.ignite.spi.authentication.noop.*; + import org.apache.ignite.hadoop.*; import org.apache.ignite.internal.managers.*; import org.apache.ignite.internal.managers.checkpoint.*; import org.apache.ignite.internal.managers.collision.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTask.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTask.java index 2c00811,0000000..be34f81 mode 100644,000000..100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTask.java @@@ -1,72 -1,0 +1,72 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.hadoop; + +import org.apache.ignite.*; + +import java.io.*; + +/** + * Hadoop task. + */ +public abstract class GridHadoopTask { + /** */ + private GridHadoopTaskInfo taskInfo; + + /** + * Creates task. + * + * @param taskInfo Task info. + */ + protected GridHadoopTask(GridHadoopTaskInfo taskInfo) { + assert taskInfo != null; + + this.taskInfo = taskInfo; + } + + /** + * For {@link Externalizable}. + */ + @SuppressWarnings("ConstructorNotProtectedInAbstractClass") + public GridHadoopTask() { + // No-op. + } + + /** + * Gets task info. + * + * @return Task info. + */ + public GridHadoopTaskInfo info() { + return taskInfo; + } + + /** + * Runs task. + * + * @param taskCtx Context. - * @throws org.apache.ignite.IgniteInterruptedException If interrupted. ++ * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If interrupted. + * @throws IgniteCheckedException If failed. + */ + public abstract void run(GridHadoopTaskContext taskCtx) throws IgniteCheckedException; + + /** + * Interrupts task execution. + */ + public abstract void cancel(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java index 0000000,83c96ae..5c27a5d mode 000000,100644..100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java @@@ -1,0 -1,230 +1,224 @@@ + /* @java.file.header */ + + /* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + + package org.apache.ignite.testframework.junits; + + import org.apache.ignite.*; + import org.apache.ignite.cache.*; + import org.apache.ignite.cache.affinity.*; + import org.apache.ignite.cluster.*; + import org.apache.ignite.configuration.*; -import org.apache.ignite.hadoop.*; ++import org.apache.ignite.marshaller.IgniteMarshaller; + import org.apache.ignite.internal.product.*; -import org.apache.ignite.marshaller.*; + import org.apache.ignite.plugin.*; + import org.apache.ignite.plugin.security.*; + import org.jetbrains.annotations.*; + + import javax.management.*; + import java.util.*; + import java.util.concurrent.*; + + /** + * Ignite mock. + */ + public class IgniteMock implements Ignite { + /** Ignite name */ + private final String name; + + /** Local host. */ + private final String locHost; + + /** */ + private final UUID nodeId; + + /** */ + private IgniteMarshaller marshaller; + + /** */ + private final MBeanServer jmx; + + /** */ + private final String home; + + /** + * Mock values + * + * @param name Name. + * @param locHost Local host. + * @param nodeId Node ID. + * @param marshaller Marshaller. + * @param jmx Jmx Bean Server. + * @param home Ignite home. + */ + public IgniteMock( + String name, String locHost, UUID nodeId, IgniteMarshaller marshaller, MBeanServer jmx, String home) { + this.locHost = locHost; + this.nodeId = nodeId; + this.marshaller = marshaller; + this.jmx = jmx; + this.home = home; + this.name = name; + } + + /** {@inheritDoc} */ + @Override public String name() { + return name; + } + + /** {@inheritDoc} */ + @Override public IgniteLogger log() { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteConfiguration configuration() { + IgniteConfiguration cfg = new IgniteConfiguration(); + + cfg.setMarshaller(marshaller); + cfg.setNodeId(nodeId); + cfg.setMBeanServer(jmx); + cfg.setGridGainHome(home); + cfg.setLocalHost(locHost); + + return cfg; + } + + /** {@inheritDoc} */ + @Override public IgniteCluster cluster() { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteCompute compute() { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteCompute compute(ClusterGroup prj) { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteMessaging message() { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteMessaging message(ClusterGroup prj) { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteEvents events() { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteEvents events(ClusterGroup prj) { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteManaged managed() { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteManaged managed(ClusterGroup prj) { + return null; + } + + /** {@inheritDoc} */ + @Override public ExecutorService executorService() { + return null; + } + + /** {@inheritDoc} */ + @Override public ExecutorService executorService(ClusterGroup prj) { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteProduct product() { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteScheduler scheduler() { + return null; + } + + /** {@inheritDoc} */ + @Override public GridSecurity security() { + return null; + } + + /** {@inheritDoc} */ + @Override public IgnitePortables portables() { + return null; + } + + /** {@inheritDoc} */ + @Override public <K, V> GridCache<K, V> cache(@Nullable String name) { + return null; + } + + /** {@inheritDoc} */ + @Override public Collection<GridCache<?, ?>> caches() { + return null; + } + + /** {@inheritDoc} */ + @Override public <K, V> IgniteCache<K, V> jcache(@Nullable String name) { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteTransactions transactions() { + return null; + } + + /** {@inheritDoc} */ + @Override public <K, V> IgniteDataLoader<K, V> dataLoader(@Nullable String cacheName) { + return null; + } + + /** {@inheritDoc} */ + @Override public IgniteFs fileSystem(String name) { + return null; + } + + /** {@inheritDoc} */ + @Override public Collection<IgniteFs> fileSystems() { + return null; + } + + /** {@inheritDoc} */ - @Override public GridHadoop hadoop() { - return null; - } - - /** {@inheritDoc} */ + @Override public IgniteStreamer streamer(@Nullable String name) { + return null; + } + + /** {@inheritDoc} */ + @Override public Collection<IgniteStreamer> streamers() { + return null; + } + + /** {@inheritDoc} */ + @Override public <T extends IgnitePlugin> T plugin(String name) throws PluginNotFoundException { + return null; + } + + /** {@inheritDoc} */ + @Override public void close() {} + + /** {@inheritDoc} */ + @Override public <K> CacheAffinity<K> affinity(String cacheName) { + return null; + } + } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolNextTaskIdTask.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolNextTaskIdTask.java index a1968b4,ca7e1c3..f76f3b6 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolNextTaskIdTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolNextTaskIdTask.java @@@ -17,9 -17,8 +17,8 @@@ package org.apache.ignite.internal.processors.hadoop.proto; - import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.processors.hadoop.*; /** * Task to get the next job ID. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java index 081a679,46e53ce..81b97f0 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java @@@ -20,9 -20,9 +20,10 @@@ package org.apache.ignite.internal.proc import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; -import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.util.typedef.*; + import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.resources.*; import org.jetbrains.annotations.*; @@@ -87,8 -88,13 +89,13 @@@ public abstract class GridHadoopProtoco } /** {@inheritDoc} */ - @Nullable @Override public Object execute() throws IgniteCheckedException { - return run(jobCtx, ((IgniteEx)ignite).hadoop(), args); + @Nullable @Override public Object execute() { + try { - return run(jobCtx, ignite.hadoop(), args); ++ return run(jobCtx, ((IgniteEx)ignite).hadoop(), args); + } + catch (IgniteCheckedException e) { + throw U.convertException(e); + } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/GridHadoopShuffleJob.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java index 5e918c3,a2c041d..b26eec5 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java @@@ -19,7 -19,8 +19,8 @@@ package org.apache.ignite.internal.proc import org.apache.ignite.*; -import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.processors.hadoop.*; + import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.worker.*; import org.apache.ignite.thread.*; import org.jdk8.backport.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2CleanupTask.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2CleanupTask.java index 5818526,f1edbed..38be3da --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2CleanupTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2CleanupTask.java @@@ -22,7 -22,8 +22,8 @@@ import org.apache.hadoop.mapreduce.JobS import org.apache.hadoop.mapreduce.OutputCommitter; import org.apache.hadoop.mapreduce.OutputFormat; import org.apache.ignite.*; -import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.processors.hadoop.*; + import org.apache.ignite.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2MapTask.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2MapTask.java index 0f7357a,85d23cb..be0bea2 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2MapTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2MapTask.java @@@ -28,7 -28,8 +28,8 @@@ import org.apache.hadoop.mapreduce.lib. import org.apache.hadoop.mapreduce.lib.map.*; import org.apache.hadoop.util.*; import org.apache.ignite.*; -import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.processors.hadoop.*; + import org.apache.ignite.internal.*; /** * Hadoop map task implementation for v2 API. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2ReduceTask.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2ReduceTask.java index 2a0db5c,f0058b3..146e05c --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2ReduceTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2ReduceTask.java @@@ -23,7 -23,8 +23,8 @@@ import org.apache.hadoop.mapreduce.Redu import org.apache.hadoop.mapreduce.lib.reduce.*; import org.apache.hadoop.util.*; import org.apache.ignite.*; -import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.processors.hadoop.*; + import org.apache.ignite.internal.*; /** * Hadoop reduce task implementation for v2 API. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2SetupTask.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2SetupTask.java index 3bbee35,ce635f1..54eda25 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2SetupTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2SetupTask.java @@@ -21,7 -21,8 +21,8 @@@ import org.apache.hadoop.mapred.* import org.apache.hadoop.mapreduce.OutputCommitter; import org.apache.hadoop.mapreduce.OutputFormat; import org.apache.ignite.*; -import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.processors.hadoop.*; + import org.apache.ignite.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2Splitter.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2Splitter.java index 9926f37,1911488..e8ce70b --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2Splitter.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2Splitter.java @@@ -21,6 -21,8 +21,7 @@@ import org.apache.hadoop.mapreduce.* import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.util.*; import org.apache.ignite.*; -import org.apache.ignite.hadoop.*; + import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.hadoop.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java index 63b9e6e,9882229..5a7c31f --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java @@@ -27,7 -27,8 +27,8 @@@ import org.apache.hadoop.mapreduce.lib. import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.fs.hadoop.v1.*; -import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.*; + import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce789c97/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java ----------------------------------------------------------------------
