Skip to content

Commit

Permalink
# ignite-63
Browse files Browse the repository at this point in the history
  • Loading branch information
@sboikov
sboikov committed Jan 23, 2015
1 parent bda1cbf commit cc29424
Show file tree
Hide file tree
Showing 81 changed files with 44 additions and 55 deletions.
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/compute/ComputeBroadcastExample.java
View file
Expand Up @@ -21,7 +21,6 @@
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.gridgain.examples.*;

import java.util.*;

Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/compute/ComputeCallableExample.java
View file
Expand Up @@ -20,7 +20,6 @@
import org.apache.ignite.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.gridgain.examples.*;

import java.util.*;

Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/compute/ComputeClosureExample.java
View file
Expand Up @@ -20,7 +20,6 @@
import org.apache.ignite.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.gridgain.examples.*;

import java.util.*;

Expand Down
1 change: 0 additions & 1 deletion ...ples/src/main/java/org/apache/ignite/examples/compute/ComputeContinuousMapperExample.java
View file
Expand Up @@ -22,7 +22,6 @@
import org.apache.ignite.compute.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.resources.*;
import org.gridgain.examples.*;

import java.util.*;
import java.util.concurrent.*;
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/compute/ComputeExecutorServiceExample.java
View file
Expand Up @@ -20,7 +20,6 @@
import org.apache.ignite.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.gridgain.examples.*;

import java.util.concurrent.*;

Expand Down
1 change: 0 additions & 1 deletion ...src/main/java/org/apache/ignite/examples/compute/ComputeFibonacciContinuationExample.java
View file
Expand Up @@ -23,7 +23,6 @@
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.gridgain.examples.*;
import org.jetbrains.annotations.*;

import java.math.*;
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/compute/ComputeProjectionExample.java
View file
Expand Up @@ -21,7 +21,6 @@
import org.apache.ignite.cluster.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.gridgain.examples.*;

/**
* Demonstrates new functional APIs.
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/compute/ComputeReducerExample.java
View file
Expand Up @@ -20,7 +20,6 @@
import org.apache.ignite.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.gridgain.examples.*;

import java.util.*;
import java.util.concurrent.atomic.*;
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/compute/ComputeRunnableExample.java
View file
Expand Up @@ -20,7 +20,6 @@
import org.apache.ignite.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.gridgain.examples.*;

import java.util.*;

Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/compute/ComputeScheduleExample.java
View file
Expand Up @@ -21,7 +21,6 @@
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.scheduler.*;
import org.gridgain.examples.*;

import java.util.concurrent.*;

Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java
View file
Expand Up @@ -21,7 +21,6 @@
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.examples.*;
import org.gridgain.examples.*;
import org.jetbrains.annotations.*;

import java.util.*;
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskSplitExample.java
View file
Expand Up @@ -20,7 +20,6 @@
import org.apache.ignite.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.examples.*;
import org.gridgain.examples.*;
import org.jetbrains.annotations.*;

import java.util.*;
Expand Down
1 change: 0 additions & 1 deletion ...les/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java
View file
Expand Up @@ -22,7 +22,6 @@
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.gridgain.examples.*;
import org.apache.ignite.internal.util.lang.*;

import java.util.*;
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskExample.java
View file
Expand Up @@ -20,7 +20,6 @@
import org.apache.ignite.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.gridgain.examples.*;

import java.util.*;

Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
View file
Expand Up @@ -19,7 +19,6 @@

import org.apache.ignite.*;
import org.apache.ignite.examples.*;
import org.gridgain.examples.*;

/**
* Demonstrates how cache can be populated with data utilizing {@link org.apache.ignite.IgniteDataLoader} API.
Expand Down
1 change: 0 additions & 1 deletion .../src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
View file
Expand Up @@ -19,7 +19,6 @@

import org.apache.ignite.*;
import org.apache.ignite.examples.*;
import org.gridgain.examples.*;
import org.hibernate.*;
import org.hibernate.cache.spi.access.AccessType;
import org.hibernate.cfg.*;
Expand Down
1 change: 0 additions & 1 deletion ...es/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
View file
Expand Up @@ -21,7 +21,6 @@
import org.apache.ignite.cache.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.gridgain.examples.*;

/**
* Loads data from persistent store at cache startup by calling
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java
View file
Expand Up @@ -23,7 +23,6 @@
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.gridgain.examples.*;

import java.util.*;

Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
View file
Expand Up @@ -22,7 +22,6 @@
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.gridgain.examples.*;

import java.util.*;
import java.util.concurrent.*;
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
View file
Expand Up @@ -22,7 +22,6 @@
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.gridgain.examples.*;
import org.apache.ignite.internal.util.lang.*;

import java.util.*;
Expand Down
1 change: 0 additions & 1 deletion ...c/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
View file
Expand Up @@ -21,7 +21,6 @@
import org.apache.ignite.cluster.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.messaging.*;
import org.gridgain.examples.*;

import java.util.*;
import java.util.concurrent.*;
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
View file
Expand Up @@ -20,7 +20,6 @@
import org.apache.ignite.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.examples.*;
import org.gridgain.examples.*;
import org.jetbrains.annotations.*;

import java.io.*;
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
View file
Expand Up @@ -19,7 +19,6 @@

import org.apache.ignite.*;
import org.apache.ignite.examples.*;
import org.gridgain.examples.*;
import org.springframework.context.support.*;

import java.util.concurrent.*;
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/services/ServicesExample.java
View file
Expand Up @@ -22,7 +22,6 @@
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.gridgain.examples.*;

import java.util.*;

Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
View file
Expand Up @@ -22,7 +22,6 @@
import org.apache.ignite.lang.*;
import org.apache.ignite.streamer.*;
import org.apache.ignite.streamer.index.*;
import org.gridgain.examples.*;
import org.jetbrains.annotations.*;

import java.util.*;
Expand Down
1 change: 0 additions & 1 deletion ...es/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
View file
Expand Up @@ -22,7 +22,6 @@
import org.apache.ignite.lang.*;
import org.apache.ignite.streamer.*;
import org.apache.ignite.streamer.index.*;
import org.gridgain.examples.*;
import org.jetbrains.annotations.*;

import java.util.*;
Expand Down
1 change: 0 additions & 1 deletion examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
View file
Expand Up @@ -22,7 +22,6 @@
import org.apache.ignite.lang.*;
import org.apache.ignite.streamer.*;
import org.apache.ignite.streamer.router.*;
import org.gridgain.examples.*;
import org.jetbrains.annotations.*;

import java.util.*;
Expand Down
3 changes: 1 addition & 2 deletions examples/src/test/java/org/apache/ignite/testsuites/GridExamplesSelfTestSuite.java
View file
Expand Up @@ -19,7 +19,6 @@

import junit.framework.*;
import org.apache.ignite.examples.*;
import org.gridgain.examples.*;
import org.apache.ignite.testframework.*;

import static org.apache.ignite.IgniteSystemProperties.*;
Expand All @@ -38,7 +37,7 @@ public static TestSuite suite() throws Exception {
System.setProperty(GG_OVERRIDE_MCAST_GRP,
GridTestUtils.getNextMulticastGroup(GridExamplesSelfTestSuite.class));

TestSuite suite = new TestSuite("GridGain Examples Test Suite");
TestSuite suite = new TestSuite("Ignite Examples Test Suite");

suite.addTest(new TestSuite(GridCacheExamplesSelfTest.class));
suite.addTest(new TestSuite(GridBasicExamplesSelfTest.class));
Expand Down
6 changes: 3 additions & 3 deletions ...aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringEnhancer.java
View file
Expand Up @@ -70,11 +70,11 @@ public static <T> T enhance(T obj) {
proxyFac.removeAdvisor(0);

proxyFac.addAdvisor(new DefaultPointcutAdvisor(
new GridifySpringPointcut(GridifySpringPointcutType.DFLT), dfltAsp));
new GridifySpringPointcut(GridifySpringPointcut.GridifySpringPointcutType.DFLT), dfltAsp));
proxyFac.addAdvisor(new DefaultPointcutAdvisor(
new GridifySpringPointcut(GridifySpringPointcutType.SET_TO_VALUE), setToValAsp));
new GridifySpringPointcut(GridifySpringPointcut.GridifySpringPointcutType.SET_TO_VALUE), setToValAsp));
proxyFac.addAdvisor(new DefaultPointcutAdvisor(
new GridifySpringPointcut(GridifySpringPointcutType.SET_TO_SET), setToSetAsp));
new GridifySpringPointcut(GridifySpringPointcut.GridifySpringPointcutType.SET_TO_SET), setToSetAsp));

return (T)proxyFac.getProxy();
}
Expand Down
1 change: 1 addition & 0 deletions ...c/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java
View file
Expand Up @@ -24,6 +24,7 @@
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.distributed.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.spi.*;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
View file
Expand Up @@ -1965,7 +1965,7 @@ else if (drRmvMap != null) {
// Should read through if filter is specified.
old = entry.innerGet(this,
/*swap*/false,
/*read-through*/cacheCtx.loadPreviousValue(),
/*read-through*/readThrough && cacheCtx.loadPreviousValue(),
/*fail-fast*/false,
/*unmarshal*/retval,
/*metrics*/retval,
Expand Down
3 changes: 2 additions & 1 deletion ...internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java
View file
Expand Up @@ -22,6 +22,7 @@
import org.apache.ignite.internal.util.ipc.loopback.*;
import org.apache.ignite.internal.util.ipc.shmem.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.testframework.*;

import java.util.concurrent.*;

Expand All @@ -35,7 +36,7 @@ public class GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest
* @throws Exception If failed.
*/
public void testShmemEndpointsRegistration() throws Exception {
Throwable e = assertThrows(log, new Callable<Object>() {
Throwable e = GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
IgniteConfiguration cfg = gridConfiguration();

Expand Down
1 change: 1 addition & 0 deletions modules/core/src/test/java/org/apache/ignite/testsuites/GridCacheMetricsSelfTestSuite.java
View file
Expand Up @@ -19,6 +19,7 @@

import junit.framework.*;
import org.apache.ignite.internal.processors.cache.distributed.near.*;
import org.apache.ignite.internal.processors.cache.distributed.replicated.*;
import org.apache.ignite.internal.processors.cache.local.*;

/**
Expand Down
1 change: 1 addition & 0 deletions modules/core/src/test/java/org/apache/ignite/testsuites/GridStreamerSelfTestSuite.java
View file
Expand Up @@ -18,6 +18,7 @@
package org.apache.ignite.testsuites;

import junit.framework.*;
import org.apache.ignite.internal.processors.streamer.*;
import org.apache.ignite.streamer.index.*;
import org.apache.ignite.streamer.window.*;

Expand Down
1 change: 1 addition & 0 deletions modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerSelfTest.java
View file
Expand Up @@ -21,6 +21,7 @@
import org.apache.ignite.cache.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.fs.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.testframework.*;
Expand Down
1 change: 1 addition & 0 deletions ...src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java
View file
Expand Up @@ -22,6 +22,7 @@
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.distributed.*;
import org.apache.ignite.marshaller.jdk.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
Expand Down
3 changes: 2 additions & 1 deletion ...g/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
View file
Expand Up @@ -21,6 +21,7 @@
import org.apache.ignite.cluster.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.fs.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.hadoop.*;
import org.gridgain.grid.kernal.ggfs.hadoop.*;
Expand Down Expand Up @@ -157,7 +158,7 @@ private UUID nodeForSplit(GridHadoopInputSplit split, Collection<UUID> topIds, M
GridGgfsEx ggfs = null;

if (F.eq(ignite.name(), endpoint.grid()))
ggfs = (GridGgfsEx) ((GridEx) ignite).ggfsx(endpoint.ggfs());
ggfs = (GridGgfsEx)((GridEx)ignite).ggfsx(endpoint.ggfs());

if (ggfs != null && !ggfs.isProxy(split0.file())) {
Collection<IgniteFsBlockLocation> blocks = ggfs.affinity(new IgniteFsPath(split0.file()),
Expand Down
1 change: 1 addition & 0 deletions modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java
View file
Expand Up @@ -27,6 +27,7 @@
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.internal.fs.common.*;
import org.apache.ignite.internal.processors.fs.*;
import org.gridgain.grid.kernal.ggfs.hadoop.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
Expand Down
1 change: 1 addition & 0 deletions modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java
View file
Expand Up @@ -27,6 +27,7 @@
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.internal.fs.common.*;
import org.apache.ignite.internal.processors.fs.*;
import org.gridgain.grid.kernal.ggfs.hadoop.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
Expand Down
1 change: 1 addition & 0 deletions modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java
View file
Expand Up @@ -19,6 +19,7 @@

import org.apache.ignite.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.internal.processors.fs.*;
import org.jetbrains.annotations.*;

import java.io.*;
Expand Down
1 change: 1 addition & 0 deletions ...p/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
View file
Expand Up @@ -28,6 +28,7 @@
import java.net.*;
import java.util.*;

import org.apache.ignite.internal.processors.fs.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
Expand Down
1 change: 1 addition & 0 deletions modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java
View file
Expand Up @@ -20,6 +20,7 @@
import org.apache.commons.logging.*;
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.internal.processors.fs.*;
import org.apache.ignite.internal.util.lang.*;
import org.jetbrains.annotations.*;

Expand Down
1 change: 1 addition & 0 deletions modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java
View file
Expand Up @@ -21,6 +21,7 @@
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.internal.fs.common.*;
import org.apache.ignite.internal.processors.fs.*;
import org.apache.ignite.internal.util.lang.*;
import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
Expand Down
1 change: 1 addition & 0 deletions modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java
View file
Expand Up @@ -21,6 +21,7 @@
import org.apache.hadoop.fs.*;
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.internal.processors.fs.*;
import org.jetbrains.annotations.*;

import java.io.*;
Expand Down
1 change: 1 addition & 0 deletions modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java
View file
Expand Up @@ -21,6 +21,7 @@
import org.apache.hadoop.conf.*;
import org.apache.ignite.*;
import org.apache.ignite.fs.*;
import org.apache.ignite.internal.processors.fs.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
Expand Down

0 comments on commit cc29424

Please sign in to comment.