[41/56] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-188
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java
--
diff --cc
modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java
index 000,1cb9aa6..5b6e059
mode 00,100644..100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java
@@@ -1,0 -1,106 +1,106 @@@
+ /*
+ * 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.util;
+
+ import junit.framework.*;
+ import org.apache.ignite.*;
+ import org.apache.ignite.configuration.*;
+ import org.apache.ignite.internal.util.typedef.*;
+ import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.logger.java.*;
+ import org.apache.ignite.spi.discovery.tcp.*;
+ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+ import org.apache.ignite.testframework.junits.common.*;
+
+ import static org.apache.ignite.IgniteSystemProperties.*;
+ import static org.apache.ignite.internal.util.IgniteUtils.*;
+
+ /**
+ * Checks that node can be started without operations with undefined
IGNITE_HOME.
+ *
+ * Notes:
+ * 1. The test intentionally extends JUnit {@link TestCase} class to make the
test
+ * independent from {@link GridCommonAbstractTest} stuff.
+ * 2. Do not replace native Java asserts with JUnit ones - test won't fall on
TeamCity.
+ */
+ public class GridStartupWithUndefinedIgniteHomeSelfTest extends TestCase {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private static final int GRID_COUNT = 2;
+
+ /** {@inheritDoc} */
+ @Override protected void tearDown() throws Exception {
+ // Next grid in the same VM shouldn't use cached values produced by
these tests.
+ nullifyHomeDirectory();
+
+ U.getIgniteHome();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testStartStopWithUndefinedIgniteHome() throws Exception {
+ IgniteUtils.nullifyHomeDirectory();
+
+ // We can't use U.getIgniteHome() here because
+ // it will initialize cached value which is forbidden to override.
+ String ggHome = IgniteSystemProperties.getString(IGNITE_HOME);
+
+ assert ggHome != null;
+
+ U.setIgniteHome(null);
+
+ String ggHome0 = U.getIgniteHome();
+
+ assert ggHome0 == null;
+
-IgniteLogger log = new IgniteJavaLogger();
++IgniteLogger log = new JavaLogger();
+
+ log.info(">>> Test started: " + getName());
+ log.info("Grid start-stop test count: " + GRID_COUNT);
+
+ for (int i = 0; i < GRID_COUNT; i++) {
+ TcpDiscoverySpi disc = new TcpDiscoverySpi();
+
+ disc.setIpFinder(IP_FINDER);
+
+ IgniteConfiguration cfg = new IgniteConfiguration();
+
+ // We have to explicitly configure path to license config because
of undefined IGNITE_HOME.
+ cfg.setLicenseUrl("file:///" + ggHome + "/" +
Ignition.DFLT_LIC_FILE_NAME);
+
+ // Default console logger is used
+ cfg.setGridLogger(log);
+ cfg.setDiscoverySpi(disc);
+ cfg.setRestEnabled(false);
+
+ try (Ignite g = G.start(cfg)) {
+ assert g != null;
+
+ ggHome0 = U.getIgniteHome();
+
+ assert ggHome0 == null;
+
+ X.println("Stopping grid " + g.cluster().localNode().id());
+ }
+ }
+ }
+ }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/
[31/56] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-111' into sprint-1
Merge remote-tracking branch 'remotes/origin/ignite-111' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b860d362 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b860d362 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b860d362 Branch: refs/heads/ignite-145 Commit: b860d3625dbbb97696c432e53acfee43ce0764c0 Parents: e0b3193 2263710 Author: avinogradov Authored: Fri Feb 6 18:33:10 2015 +0300 Committer: avinogradov Committed: Fri Feb 6 18:33:10 2015 +0300 -- assembly/core-jar.xml | 2 +- assembly/dependencies-fabric.xml| 2 +- assembly/dependencies-hadoop.xml| 2 +- assembly/dependencies-optional-fabric.xml | 2 +- assembly/dependencies-optional-hadoop.xml | 2 +- assembly/dependencies-visor-console.xml | 2 +- assembly/dependencies-visor-trial.xml | 2 +- assembly/release-base-fabric.xml| 2 +- assembly/release-base.xml | 2 +- assembly/release-fabric.xml | 2 +- assembly/release-hadoop.xml | 2 +- assembly/test.xml | 2 +- bin/ignite.bat | 30 bin/ignite.sh | 30 bin/igniterouter.bat| 30 bin/igniterouter.sh | 30 bin/ignitevisorcmd.bat | 30 bin/ignitevisorcmd.sh | 30 bin/include/functions.sh| 26 +++ bin/include/hadoop-classpath.bat| 26 +++ bin/include/hadoop-classpath.sh | 30 bin/include/parseargs.bat | 30 bin/include/parseargs.sh| 30 bin/include/service.sh | 26 +++ bin/include/setenv.bat | 30 bin/include/setenv.sh | 26 +++ bin/include/target-classpath.bat| 26 +++ bin/include/target-classpath.sh | 26 +++ bin/setup-hadoop.bat| 26 +++ bin/setup-hadoop.sh | 30 config/default-config.xml | 2 +- config/fabric/default-config.xml| 2 +- config/hadoop/default-config.xml| 2 +- config/ignite-log4j.xml | 2 +- config/router/default-router.xml| 2 +- docs/core-site.ignite.xml | 3 +- docs/hive-site.ignite.xml | 3 +- docs/mapred-site.ignite.xml | 15 +--- examples/config/example-cache.xml | 2 +- examples/config/example-compute.xml | 2 +- examples/config/example-streamer.xml| 2 +- examples/config/filesystem/core-site.xml| 2 +- examples/config/filesystem/example-ignitefs.xml | 2 +- .../hibernate/example-hibernate-L2-cache.xml| 6 +- examples/config/servlet/WEB-INF/web.xml | 2 +- examples/pom-standalone.xml | 2 +- examples/pom.xml| 2 +- .../examples/compute/failover/package.html | 3 +- .../examples/compute/montecarlo/package.html| 2 +- .../apache/ignite/examples/compute/package.html | 3 +- .../datagrid/datastructures/package.html| 3 +- .../examples/datagrid/hibernate/package.html| 3 +- .../ignite/examples/datagrid/package.html | 3 +- .../examples/datagrid/starschema/package.html | 2 +- .../examples/datagrid/store/dummy/package.html | 2 +- .../datagrid/store/hibernate/Person.hbm.xml | 6 +- .../datagrid/store/hibernate/hibernate.cfg.xml | 2 +- .../datagrid/store/hibernate/package.html | 2 +- .../examples/datagrid/store/jdbc/package.html | 2 +- .../ignite/examples/datagrid/store/package.html | 2 +- .../apache/ignite/examples/events/package.html | 2 +- .../org/apache/ignite/examples/fs/package.html | 3 +- .../ignite/examples/messaging/package.html | 2 +- .../examples/misc/client/memcache/package.html | 3 +- .../ignite/examples/misc/client/package.html| 2 +- .../examples/misc/deployment/package.html | 2 +- .../ignite/examples/misc/lifecycle/package.html | 2 +- .../apache/ignite/examples/misc/package.html| 2 +- .../examples/misc/springbean/package.html | 2 +- .../examples/misc/springbean/spring-bean.xml| 2 +- .../org/apache/ignite/examples/package.html | 2 +- .../ignite/examples/streaming/package.html | 2 +- license/header-customisation.xml| 51 ++ license/header.txt
[02/56] [abbrv] incubator-ignite git commit: sprint-1 - marshaller renaming.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java
index b1a7b18..9780080 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java
@@ -40,7 +40,7 @@ public class GridDeploymentManagerStopSelfTest extends
GridCommonAbstractTest {
GridTestKernalContext ctx = newContext();
-ctx.config().setMarshaller(new IgniteJdkMarshaller());
+ctx.config().setMarshaller(new JdkMarshaller());
ctx.config().setDeploymentSpi(spi);
GridResourceProcessor resProc = new GridResourceProcessor(ctx);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index f0932af..359573f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
@@ -227,7 +227,7 @@ public abstract class GridCacheAbstractSelfTest extends
GridCommonAbstractTest {
cfg.setCacheConfiguration(cacheConfiguration(gridName));
-cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
+cfg.setMarshaller(new OptimizedMarshaller(false));
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
index 248fe74..6da1bce 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
@@ -95,7 +95,7 @@ public class GridCacheAffinityRoutingSelfTest extends
GridCommonAbstractTest {
cfg.setCacheConfiguration();
}
-cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
+cfg.setMarshaller(new OptimizedMarshaller(false));
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index f8f64a4..c8a7283 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -93,7 +93,7 @@ public class GridCacheDeploymentSelfTest extends
GridCommonAbstractTest {
cfg.setRestEnabled(false);
-cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
+cfg.setMarshaller(new OptimizedMarshaller(false));
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
index a1fe573..dae5b51 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEn
[56/56] [abbrv] incubator-ignite git commit: Merge branches 'ignite-145' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-145
Merge branches 'ignite-145' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-145 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/84e7ba82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/84e7ba82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/84e7ba82 Branch: refs/heads/ignite-145 Commit: 84e7ba823737addcece854b00b1d8dc4f2cec50e Parents: 5e57ae9 2cfcca0 Author: AKuznetsov Authored: Sat Feb 7 07:44:54 2015 +0700 Committer: AKuznetsov Committed: Sat Feb 7 07:44:54 2015 +0700 -- assembly/core-jar.xml |2 +- assembly/dependencies-fabric.xml|2 +- assembly/dependencies-hadoop.xml|2 +- assembly/dependencies-optional-fabric.xml |2 +- assembly/dependencies-optional-hadoop.xml |2 +- assembly/dependencies-visor-console.xml |2 +- assembly/dependencies-visor-trial.xml |2 +- assembly/release-base-fabric.xml|2 +- assembly/release-base.xml |2 +- assembly/release-fabric.xml |2 +- assembly/release-hadoop.xml |2 +- assembly/test.xml |2 +- bin/ignite.bat | 30 +- bin/ignite.sh | 30 +- bin/igniterouter.bat| 30 +- bin/igniterouter.sh | 30 +- bin/ignitevisorcmd.bat | 30 +- bin/ignitevisorcmd.sh | 30 +- bin/include/functions.sh| 26 +- bin/include/hadoop-classpath.bat| 26 +- bin/include/hadoop-classpath.sh | 30 +- bin/include/parseargs.bat | 30 +- bin/include/parseargs.sh| 30 +- bin/include/service.sh | 26 +- bin/include/setenv.bat | 30 +- bin/include/setenv.sh | 26 +- bin/include/target-classpath.bat| 26 +- bin/include/target-classpath.sh | 26 +- bin/setup-hadoop.bat| 26 +- bin/setup-hadoop.sh | 30 +- config/default-config.xml |2 +- config/fabric/default-config.xml|8 +- config/hadoop/default-config.xml| 22 +- config/ignite-log4j.xml |2 +- config/java.util.logging.properties | 14 +- config/router/default-router.xml|4 +- docs/core-site.ignite.xml |7 +- docs/hive-site.ignite.xml |3 +- docs/mapred-site.ignite.xml | 15 +- examples/config/example-cache.xml |8 +- examples/config/example-compute.xml |6 +- examples/config/example-streamer.xml|4 +- examples/config/filesystem/core-site.xml|6 +- examples/config/filesystem/example-ignitefs.xml | 12 +- .../hibernate/example-hibernate-L2-cache.xml|6 +- examples/config/servlet/WEB-INF/web.xml |2 +- examples/pom-standalone.xml |2 +- examples/pom.xml|2 +- .../compute/ComputeBroadcastExample.java| 114 - .../compute/ComputeCallableExample.java | 79 - .../examples/compute/ComputeClosureExample.java | 77 - .../compute/ComputeContinuousMapperExample.java | 158 -- .../compute/ComputeExecutorServiceExample.java | 71 - .../ComputeFibonacciContinuationExample.java| 183 -- .../compute/ComputeProjectionExample.java | 93 - .../examples/compute/ComputeReducerExample.java | 89 - .../compute/ComputeRunnableExample.java | 74 - .../compute/ComputeScheduleExample.java | 81 - .../examples/compute/ComputeTaskMapExample.java | 113 - .../compute/ComputeTaskSplitExample.java| 102 - .../failover/ComputeFailoverExample.java| 137 - .../failover/ComputeFailoverNodeStartup.java| 77 - .../examples/compute/failover/package.html | 23 - .../examples/compute/montecarlo/Credit.java | 110 - .../compute/montecarlo/CreditRiskExample.java | 153 -- .../compute/montecarlo/CreditRiskManager.java | 143 -- .../examples/compute/montecarlo/package.html| 24 - .../apache/ignite/examples/compute/package.html | 23 - .../computegrid/ComputeBroadcastExample.java| 114 + .../computegrid/ComputeCallableExample.java | 79 + .../computegrid/ComputeClosureExample.java | 77 + .../ComputeContinuousMapperExample.java | 158 ++ .../ComputeExecutorServiceExample.java
[29/56] [abbrv] incubator-ignite git commit: # ignite-188: Applied renamings to ent project.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
index 998a5ec..54b4ff2 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedJobExecutionTest.java
@@ -31,7 +31,7 @@ public class GridCacheReplicatedJobExecutionTest extends
GridCacheAbstractJobExe
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
-c.getTransactionsConfiguration().setTxSerializableEnabled(true);
+c.getTransactionConfiguration().setTxSerializableEnabled(true);
CacheConfiguration cc = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMetricsSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMetricsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMetricsSelfTest.java
index 56d9856..413bbbd 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMetricsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMetricsSelfTest.java
@@ -32,7 +32,7 @@ public class GridCacheReplicatedMetricsSelfTest extends
GridCacheTransactionalAb
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
-c.getTransactionsConfiguration().setTxSerializableEnabled(true);
+c.getTransactionConfiguration().setTxSerializableEnabled(true);
return c;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
index f08308b..53bca92 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeFailureSelfTest.java
@@ -31,7 +31,7 @@ public class GridCacheReplicatedNodeFailureSelfTest extends
GridCacheNodeFailure
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration c = super.getConfiguration(gridName);
-c.getTransactionsConfiguration().setTxSerializableEnabled(true);
+c.getTransactionConfiguration().setTxSerializableEnabled(true);
CacheConfiguration cc = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
index 9951bee..d0755e5 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
@@ -49,7 +49,7 @@ public class Gri
[05/56] [abbrv] incubator-ignite git commit: sprint-1 - marshaller renaming.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5674cdde/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
deleted file mode 100644
index 690bdd6..000
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
+++ /dev/null
@@ -1,1016 +0,0 @@
-/*
- * 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.marshaller.optimized;
-
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.io.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import static
org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshallerUtils.*;
-
-/**
- * Optimized object input stream.
- */
-class IgniteOptimizedObjectInputStream extends ObjectInputStream {
-/** Unsafe. */
-private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
-/** Dummy object for HashSet. */
-private static final Object DUMMY = new Object();
-
-/** */
-private final HandleTable handles = new HandleTable(10);
-
-/** */
-private ClassLoader clsLdr;
-
-/** */
-private GridDataInput in;
-
-/** */
-private Object curObj;
-
-/** */
-private List> curFields;
-
-/** */
-private List>
curFieldInfoList;
-
-/** */
-private Map>
curFieldInfoMap;
-
-/** */
-private Class curCls;
-
-/**
- * @param in Input.
- * @throws IOException In case of error.
- */
-IgniteOptimizedObjectInputStream(GridDataInput in) throws IOException {
-this.in = in;
-}
-
-/**
- * @throws IOException In case of error.
- */
-IgniteOptimizedObjectInputStream() throws IOException {
-// No-op.
-}
-
-/**
- * @param clsLdr Class loader.
- */
-void classLoader(ClassLoader clsLdr) {
-this.clsLdr = clsLdr;
-}
-
-/**
- * @return Class loader.
- */
-ClassLoader classLoader() {
-return clsLdr;
-}
-
-/**
- * @return Input.
- */
-public GridDataInput in() {
-return in;
-}
-
-/**
- * @param in Input.
- */
-public void in(GridDataInput in) {
-this.in = in;
-}
-
-/** {@inheritDoc} */
-@Override public void close() throws IOException {
-reset();
-}
-
-/** {@inheritDoc} */
-@SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
-@Override public void reset() throws IOException {
-in.reset();
-handles.clear();
-
-curObj = null;
-curFields = null;
-curFieldInfoList = null;
-curFieldInfoMap = null;
-}
-
-/** {@inheritDoc} */
-@Override public Object readObjectOverride() throws
ClassNotFoundException, IOException {
-curObj = null;
-curFields = null;
-curFieldInfoList = null;
-curFieldInfoMap = null;
-
-byte ref = in.readByte();
-
-switch (ref) {
-case NULL:
-return null;
-
-case HANDLE:
-return handles.lookup(readInt());
-
-case OBJECT:
-IgniteOptimizedClassDescriptor desc =
IgniteOptimizedClassResolver.readClass(this, clsLdr);
-
-curCls = desc.describedClass();
-
-return desc.read(this);
-
-default:
-SB msg = new SB("Unexpected error occurred during
unmarshalling");
-
-if (curCls != null)
-msg.a(" of an instance of the class:
").a(curCls.getName());
-
-msg.a(". Check that all nodes are running the same version of
GridGain and that all nodes have " +
-"GridOptimizedMarshaller configured with identical
op
[35/56] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-188
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemAbstractSelfTest.java
--
diff --cc
modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemAbstractSelfTest.java
index 1505b56,000..f9268f0
mode 100644,00..100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemAbstractSelfTest.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemAbstractSelfTest.java
@@@ -1,2365 -1,0 +1,2365 @@@
+/*
+ * 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.ignitefs;
+
+import org.apache.hadoop.conf.*;
+import org.apache.hadoop.fs.*;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.permission.*;
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.ignitefs.hadoop.v1.*;
+import org.apache.ignite.internal.fs.hadoop.*;
+import org.apache.ignite.internal.processors.fs.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.communication.*;
+import org.apache.ignite.spi.communication.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.net.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+
+/**
+ * Test hadoop file system implementation.
+ */
+@SuppressWarnings("all")
+public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends
GridGgfsCommonAbstractTest {
+/** Primary file system authority. */
+private static final String PRIMARY_AUTHORITY = "ggfs:grid0@";
+
+/** Primary file systme URI. */
+private static final String PRIMARY_URI = "ggfs://" + PRIMARY_AUTHORITY +
"/";
+
+/** Secondary file system authority. */
+private static final String SECONDARY_AUTHORITY =
"ggfs_secondary:grid_secondary@127.0.0.1:11500";
+
+/** Secondary file systme URI. */
+private static final String SECONDARY_URI = "ggfs://" +
SECONDARY_AUTHORITY + "/";
+
+/** Secondary file system configuration path. */
+private static final String SECONDARY_CFG_PATH =
"/work/core-site-test.xml";
+
+/** Secondary endpoint configuration. */
+protected static final Map SECONDARY_ENDPOINT_CFG = new
HashMap() {{
+put("type", "tcp");
+put("port", "11500");
+}};
+
+/** Group size. */
+public static final int GRP_SIZE = 128;
+
+/** Path to the default hadoop configuration. */
+public static final String HADOOP_FS_CFG =
"examples/config/filesystem/core-site.xml";
+
+/** Thread count for multithreaded tests. */
+private static final int THREAD_CNT = 8;
+
+/** IP finder. */
+private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
+
+/** Barrier for multithreaded tests. */
+private static CyclicBarrier barrier;
+
+/** File system. */
+private static FileSystem fs;
+
+/** Default GGFS mode. */
+protected final IgniteFsMode mode;
+
+/** Skip embedded mode flag. */
+private final boolean skipEmbed;
+
+/** Skip local shmem flag. */
+private final boolean skipLocShmem;
+
+/** Endpoint. */
+private final String endpoint;
+
+/** Primary file system URI. */
+protected URI
[37/56] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-188
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridFileSystemLoad.java
--
diff --cc
modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridFileSystemLoad.java
index 6798710,000..bce36e4
mode 100644,00..100644
---
a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridFileSystemLoad.java
+++
b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridFileSystemLoad.java
@@@ -1,549 -1,0 +1,549 @@@
+/*
+ * 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.ignitefs;
+
+import org.apache.hadoop.conf.*;
+import org.apache.hadoop.fs.*;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.permission.*;
+import org.apache.ignite.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * Hadoop file system load application.
+ *
+ * Command line arguments:
+ *
+ * -u {url} file system URL
+ * -hadoopCfg {cfg} Hadoop configuration
+ * -f {num} files number
+ * -r {num} reads number
+ * -w {num} writes number
+ * -d {num} deletes number
+ * -delay {delay} delay between operations in milliseconds
+ * -t {num} threads number
+ * -minSize {min size} min file size in bytes
+ * -maxSize {max size} max file size in bytes
+ * -startNode {true|false} if 'true' then starts node before
execution
+ * -nodeCfg {cfg} configuration for started node
+ * -primaryOnly {true|false} if 'true' then creates files only in
directory named 'primary'
+ *
+ * Note: GGFS logging is disabled by default, to enable logging it is
necessary to set flag
+ * 'fs.ggfs..log.enabled' in Hadoop configuration file. By default log
files are created in the
+ * directory 'work/ggfs/log', this path can be changed in Hadoop
configuration file using property
+ * 'fs.ggfs..log.dir'.
+ */
+public class GridFileSystemLoad {
+/** */
+private static final String DFLT_URL = "ggfs:///";
+
+/** */
+private static final int DFLT_MIN_FILE_SIZE = 100 * 1024;
+
+/** */
+private static final int DFLT_MAX_FILE_SIZE = 1024 * 1024;
+
+/** */
+private static final int DFLT_FILES_NUMBER = 1000;
+
+/** */
+private static final int DFLT_READS_NUMBER = 2000;
+
+/** */
+private static final int DFLT_WRITES_NUMBER = 2000;
+
+/** */
+private static final int DFLT_DELETES_NUMBER = 100;
+
+/** */
+private static final int DFLT_THREADS_NUMBER = 2;
+
+/** */
+private static final boolean DFLT_START_NODE = true;
+
+/** */
+private static final boolean DFLT_PRIMARY_ONLY = false;
+
+/** */
+private static final String DFLT_NODE_CFG =
"config/hadoop/default-config.xml";
+
+/** */
+private static final long DFLT_DELAY = 5;
+
+/** */
+private static final String DFLT_HADOOP_CFG =
"examples/config/filesystem/core-site.xml";
+
+/** */
+private static final int CREATE_BUF_SIZE = 100 * 1024;
+
+/** */
+private static final String DIR_PRIMARY_MODE = "primary";
+
+/** */
+private static final String DIR_PROXY_MODE = "proxy";
+
+/** */
+private static final String DIR_DUAL_SYNC_MODE = "dual_sync";
+
+/** */
+private static final String DIR_DUAL_ASYNC_MODE = "dual_async";
+
+/**
+ * Main method.
+ *
+ * @param args Command line arguments.
+ * @throws Exception If error occurs.
+ */
+public static void main(String[] args) throws Exception {
+String url = DFLT_URL;
+
+int filesNum = DFLT_FILES_NUMBER;
+
+int minFileSize = DFLT_MIN_FILE_SIZE;
+
+int maxFileSize = DFLT_MAX_FILE_SIZE;
+
+int readsNum = DFLT_READS_NUMBER;
+
+int writesNum = DFLT_WRITES_NUMBER;
+
+int deletesNum = DFLT_DELETES_NUMBER;
+
+int threadsNum = DFLT_THREADS_NUMBER;
+
+long delay = DFLT_DELAY;
+
+String nodeCfg = DFLT_NODE_CFG;
+
+String
[38/56] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-188
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/GridGgfsHadoopFileSystem.java
--
diff --cc
modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/GridGgfsHadoopFileSystem.java
index f1a7890,000..212476b
mode 100644,00..100644
---
a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/GridGgfsHadoopFileSystem.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/GridGgfsHadoopFileSystem.java
@@@ -1,1253 -1,0 +1,1253 @@@
+/*
+ * 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.ignitefs.hadoop.v1;
+
+import org.apache.hadoop.conf.*;
+import org.apache.hadoop.fs.*;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.permission.*;
+import org.apache.hadoop.hdfs.*;
+import org.apache.hadoop.mapreduce.*;
+import org.apache.hadoop.util.*;
+import org.apache.ignite.*;
+import org.apache.ignite.ignitefs.*;
+import org.apache.ignite.internal.fs.common.*;
+import org.apache.ignite.internal.fs.hadoop.*;
+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.*;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import java.util.concurrent.atomic.*;
+
+import static org.apache.ignite.IgniteFs.*;
+import static org.apache.ignite.configuration.IgniteFsConfiguration.*;
+import static org.apache.ignite.ignitefs.IgniteFsMode.*;
+import static org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopParameters.*;
+import static org.apache.ignite.internal.fs.hadoop.GridGgfsHadoopUtils.*;
+
+/**
+ * {@code GGFS} Hadoop 1.x file system driver over file system API. To use
+ * {@code GGFS} as Hadoop file system, you should configure this class
+ * in Hadoop's {@code core-site.xml} as follows:
+ *
+ *
+ * fs.default.name
+ * ggfs://ipc
+ *
+ *
+ *
+ * fs.ggfs.impl
+ *
org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopFileSystem
+ *
+ *
- * You should also add GridGain JAR and all libraries to Hadoop classpath. To
++ * You should also add Ignite JAR and all libraries to Hadoop classpath. To
+ * do this, add following lines to {@code conf/hadoop-env.sh} script in Hadoop
+ * distribution:
+ *
- * export IGNITE_HOME=/path/to/GridGain/distribution
- * export HADOOP_CLASSPATH=$IGNITE_HOME/gridgain*.jar
++ * export IGNITE_HOME=/path/to/Ignite/distribution
++ * export HADOOP_CLASSPATH=$IGNITE_HOME/ignite*.jar
+ *
+ * for f in $IGNITE_HOME/libs/*.jar; do
+ * export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f;
+ * done
+ *
+ * Data vs Clients Nodes
+ * Hadoop needs to use its FileSystem remotely from client nodes as well as
directly on
+ * data nodes. Client nodes are responsible for basic file system operations
as well as
+ * accessing data nodes remotely. Usually, client nodes are started together
+ * with {@code job-submitter} or {@code job-scheduler} processes, while data
nodes are usually
+ * started together with Hadoop {@code task-tracker} processes.
+ *
+ * For sample client and data node configuration refer to {@code
config/hadoop/default-config-client.xml}
- * and {@code config/hadoop/default-config.xml} configuration files in
GridGain installation.
++ * and {@code config/hadoop/default-config.xml} configuration files in Ignite
installation.
+ */
+public class GridGgfsHadoopFileSystem extends FileSystem {
+/** Internal property to indicate management connection. */
+public static final String GGFS_MANAGEMENT =
"fs.ggfs.management.connection";
+
+/** Empty array of file block locations. */
+private static final BlockLocation[] EMPTY_BLOCK_LOCATIONS = new
BlockLocation[0];
+
+/** Empty array of file statuses. */
+public static final FileStatus[] EMPTY_FILE_STATUS = new FileStatus[0];
+
+/** Ensures that close routine is invoked at most once
[46/56] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-188
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
--
diff --cc modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
index 98ec85a,000..a810c29
mode 100644,00..100644
--- a/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
@@@ -1,236 -1,0 +1,236 @@@
+/*
+ * 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.events;
+
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
+
+import java.util.*;
+
+/**
+ * Grid job event.
+ *
+ * Grid events are used for notification about what happens within the grid.
Note that by
- * design GridGain keeps all events generated on the local node locally and
it provides
++ * design Ignite keeps all events generated on the local node locally and it
provides
+ * APIs for performing a distributed queries across multiple nodes:
+ *
+ *
+ * {@link
org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate,
long, int...)} -
+ * asynchronously querying events occurred on the nodes specified,
including remote nodes.
+ *
+ *
+ * {@link
org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate,
int...)} -
+ * querying only local events stored on this local node.
+ *
+ *
+ * {@link
org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate,
int...)} -
+ * listening to local grid events (events from remote nodes not
included).
+ *
+ *
+ * User can also wait for events using method {@link
org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate,
int...)}.
+ * Events and Performance
- * Note that by default all events in GridGain are enabled and therefore
generated and stored
- * by whatever event storage SPI is configured. GridGain can and often does
generate thousands events per seconds
++ * Note that by default all events in Ignite are enabled and therefore
generated and stored
++ * by whatever event storage SPI is configured. Ignite can and often does
generate thousands events per seconds
+ * under the load and therefore it creates a significant additional load on
the system. If these events are
+ * not needed by the application this load is unnecessary and leads to
significant performance degradation.
+ *
+ * It is highly recommended to enable only those events that your
application logic requires
- * by using {@link
org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()}
method in GridGain configuration. Note that certain
- * events are required for GridGain's internal operations and such events
will still be generated but not stored by
++ * by using {@link
org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()}
method in Ignite configuration. Note that certain
++ * events are required for Ignite's internal operations and such events will
still be generated but not stored by
+ * event storage SPI if they are disabled in GridGain configuration.
+ * @see EventType#EVT_JOB_CANCELLED
+ * @see EventType#EVT_JOB_FAILED
+ * @see EventType#EVT_JOB_FAILED_OVER
+ * @see EventType#EVT_JOB_FINISHED
+ * @see EventType#EVT_JOB_MAPPED
+ * @see EventType#EVT_JOB_QUEUED
+ * @see EventType#EVT_JOB_REJECTED
+ * @see EventType#EVT_JOB_RESULTED
+ * @see EventType#EVT_JOB_STARTED
+ * @see EventType#EVT_JOB_TIMEDOUT
+ * @see EventType#EVTS_JOB_EXECUTION
+ */
+public class JobEvent extends EventAdapter {
+/** */
+private static final long serialVersionUID = 0L;
+
+/** */
+private String taskName;
+
+/** */
+private String taskClsName;
+
+/** */
+private IgniteUuid sesId;
+
+/** */
+private IgniteUuid jobId;
+
+/** */
+private ClusterNode taskNode;
+
+/** */
+private UUID taskSubjId;
+
+/** {@inheritDoc}
[10/56] [abbrv] incubator-ignite git commit: sprint-1 - MXBean renaming.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java
b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java
new file mode 100644
index 000..dfc759c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java
@@ -0,0 +1,34 @@
+/*
+ * 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.mxbean;
+
+import java.lang.annotation.*;
+
+/**
+ * Provides description for MBean classes and methods.
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+public @interface MXBeanDescription {
+/**
+ *
+ * Description for Mbean.
+ */
+@SuppressWarnings({"JavaDoc"}) public String value();
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
new file mode 100644
index 000..1337e07
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
@@ -0,0 +1,34 @@
+/*
+ * 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.mxbean;
+
+import java.lang.annotation.*;
+
+/**
+ * Provides MBean method parameters description.
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface MXBeanParametersDescriptions {
+/**
+ *
+ * Array of descriptions for parameters.
+ */
+@SuppressWarnings({"JavaDoc"}) public String[] value();
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
new file mode 100644
index 000..3fc7885
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
@@ -0,0 +1,34 @@
+/*
+ * 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.mxbean;
+
+import java.lang.annota
[40/56] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-188
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java
--
diff --cc
modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java
index 000,e2c87f9..8145e37
mode 00,100644..100644
---
a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java
@@@ -1,0 -1,2093 +1,2093 @@@
+ /*
+ * 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.marshaller.optimized;
+
+ import org.apache.ignite.*;
+ import org.apache.ignite.internal.util.io.*;
+ import org.apache.ignite.internal.util.typedef.*;
+ import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.marshaller.*;
+ import org.apache.ignite.testframework.*;
+ import org.apache.ignite.testframework.junits.common.*;
+ import org.jetbrains.annotations.*;
+
+ import java.io.*;
+ import java.math.*;
+ import java.net.*;
+ import java.text.*;
+ import java.util.*;
+ import java.util.concurrent.*;
+
+ import static org.junit.Assert.*;
+
+ /**
+ * Test for optimized object streams.
+ */
+ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
+ /**
+ * @throws Exception If failed.
+ */
+ public void testNull() throws Exception {
+ assertNull(marshalUnmarshal(null));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testByte() throws Exception {
+ byte val = 10;
+
+ assertEquals(val, marshalUnmarshal(val));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testShort() throws Exception {
+ short val = 100;
+
+ assertEquals(val, marshalUnmarshal(val));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testInteger() throws Exception {
+ int val = 100;
+
+ assertEquals(val, marshalUnmarshal(val));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testLong() throws Exception {
+ long val = 1000L;
+
+ assertEquals(val, marshalUnmarshal(val));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFloat() throws Exception {
+ float val = 10.0f;
+
+ assertEquals(val, marshalUnmarshal(val));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testDouble() throws Exception {
+ double val = 100.0d;
+
+ assertEquals(val, marshalUnmarshal(val));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testBoolean() throws Exception {
+ boolean val = true;
+
+ assertEquals(val, marshalUnmarshal(val));
+
+ val = false;
+
+ assertEquals(val, marshalUnmarshal(val));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testChar() throws Exception {
+ char val = 10;
+
+ assertEquals(val, marshalUnmarshal(val));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testByteArray() throws Exception {
+ byte[] arr = marshalUnmarshal(new byte[] {1, 2});
+
+ assertArrayEquals(new byte[] {1, 2}, arr);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testShortArray() throws Exception {
+ short[] arr = marshalUnmarshal(new short[] {1, 2});
+
+ assertArrayEquals(new short[] {1, 2}, arr);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testIntArray() throws Exception {
+ int[] arr = marshalUnmarshal(new int[] {1, 2});
+
+ assertArrayEquals(new int[] {1, 2}, arr);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testLongArray() throws Exception {
+ long[] arr = marshalUnmarshal(new long[] {1L, 2L});
+
+ assertArrayEqua
[48/56] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-188
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java
index 4b3b455,000..87068d1
mode 100644,00..100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java
@@@ -1,807 -1,0 +1,807 @@@
+/*
+ * 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.configuration;
+
+import org.apache.ignite.ignitefs.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * {@code GGFS} configuration. More than one file system can be configured
within grid.
+ * {@code GGFS} configuration is provided via {@link
org.apache.ignite.configuration.IgniteConfiguration#getGgfsConfiguration()}
+ * method.
+ *
+ * Refer to {@code config/hadoop/default-config.xml} or {@code
config/hadoop/default-config-client.xml}
- * configuration files under GridGain installation to see sample {@code GGFS}
configuration.
++ * configuration files under Ignite installation to see sample {@code GGFS}
configuration.
+ */
+public class IgniteFsConfiguration {
+/** Default file system user name. */
+public static final String DFLT_USER_NAME =
System.getProperty("user.name", "anonymous");
+
+/** Default IPC port. */
+public static final int DFLT_IPC_PORT = 10500;
+
+/** Default fragmentizer throttling block length. */
+public static final long DFLT_FRAGMENTIZER_THROTTLING_BLOCK_LENGTH = 16 *
1024 * 1024;
+
+/** Default fragmentizer throttling delay. */
+public static final long DFLT_FRAGMENTIZER_THROTTLING_DELAY = 200;
+
+/** Default fragmentizer concurrent files. */
+public static final int DFLT_FRAGMENTIZER_CONCURRENT_FILES = 0;
+
+/** Default fragmentizer local writes ratio. */
+public static final float DFLT_FRAGMENTIZER_LOCAL_WRITES_RATIO = 0.8f;
+
+/** Fragmentizer enabled property. */
+public static final boolean DFLT_FRAGMENTIZER_ENABLED = true;
+
+/** Default batch size for logging. */
+public static final int DFLT_GGFS_LOG_BATCH_SIZE = 100;
+
+/** Default {@code GGFS} log directory. */
+public static final String DFLT_GGFS_LOG_DIR = "work/ggfs/log";
+
+/** Default per node buffer size. */
+public static final int DFLT_PER_NODE_BATCH_SIZE = 100;
+
+/** Default number of per node parallel operations. */
+public static final int DFLT_PER_NODE_PARALLEL_BATCH_CNT = 8;
+
+/** Default GGFS mode. */
+public static final IgniteFsMode DFLT_MODE = IgniteFsMode.DUAL_ASYNC;
+
+/** Default file's data block size (bytes). */
+public static final int DFLT_BLOCK_SIZE = 1 << 16;
+
+/** Default read/write buffers size (bytes). */
+public static final int DFLT_BUF_SIZE = 1 << 16;
+
+/** Default trash directory purge await timeout in case data cache
oversize is detected. */
+public static final long DFLT_TRASH_PURGE_TIMEOUT = 1000;
+
+/** Default management port. */
+public static final int DFLT_MGMT_PORT = 11400;
+
+/** Default IPC endpoint enabled flag. */
+public static final boolean DFLT_IPC_ENDPOINT_ENABLED = true;
+
+/** GGFS instance name. */
+private String name;
+
+/** Cache name to store GGFS meta information. */
+private String metaCacheName;
+
+/** Cache name to store file's data blocks. */
+private String dataCacheName;
+
+/** File's data block size (bytes). */
+private int blockSize = DFLT_BLOCK_SIZE;
+
+/** The number of pre-fetched blocks if specific file's chunk is
requested. */
+private int prefetchBlocks;
+
+/** Amount of sequential block reads before prefetch is triggered. */
+private int seqReadsBeforePrefetch;
+
+/** Read/write buffers size for stream operations (bytes).
[30/56] [abbrv] incubator-ignite git commit: # ignite-188: Applied renamings to ent project.
# ignite-188: Applied renamings to ent project. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/30901e85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/30901e85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/30901e85 Branch: refs/heads/ignite-145 Commit: 30901e85bf8c56548d373715032be99649632a5b Parents: 33834a3 Author: vozerov-gridgain Authored: Fri Feb 6 18:20:30 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 18:20:30 2015 +0300 -- config/hadoop/default-config.xml| 6 +++--- config/java.util.logging.properties | 14 ++--- config/router/default-router.xml| 2 +- .../java/org/apache/ignite/IgniteCache.java | 22 .../main/java/org/apache/ignite/IgniteFs.java | 4 ++-- .../org/apache/ignite/compute/ComputeJob.java | 2 +- .../ignite/compute/ComputeLoadBalancer.java | 2 +- .../org/apache/ignite/compute/ComputeTask.java | 2 +- .../ignite/compute/ComputeTaskAdapter.java | 2 +- .../compute/ComputeTaskContinuousMapper.java| 4 ++-- .../ignite/compute/ComputeTaskSession.java | 6 +++--- .../configuration/IgniteConfiguration.java | 6 +++--- .../configuration/IgniteFsConfiguration.java| 4 ++-- .../IgniteFsGroupDataBlocksKeyMapper.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../processors/cache/GridCacheAdapter.java | 8 +++ .../processors/cache/GridCacheProcessor.java| 10 - .../cache/GridCacheSharedContext.java | 2 +- .../transactions/IgniteTransactionsImpl.java| 8 +++ .../cache/version/GridCacheVersionManager.java | 2 +- .../ignite/resources/CacheNameResource.java | 4 ++-- .../ignite/resources/LoadBalancerResource.java | 4 ++-- .../apache/ignite/resources/LoggerResource.java | 4 ++-- .../apache/ignite/resources/SpringResource.java | 2 +- .../resources/TaskContinuousMapperResource.java | 4 ++-- .../ignite/resources/TaskSessionResource.java | 4 ++-- .../PriorityQueueCollisionSpi.java | 4 ++-- .../spi/loadbalancing/LoadBalancingSpi.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 2 +- .../GridTaskExecutionContextSelfTest.java | 2 +- .../GridCacheAbstractFailoverSelfTest.java | 2 +- .../GridCacheAbstractProjectionSelfTest.java| 2 +- .../cache/GridCacheAbstractTxReadTest.java | 2 +- .../GridCacheConcurrentTxMultiNodeTest.java | 4 ++-- .../GridCacheInterceptorAbstractSelfTest.java | 2 +- .../IgniteTxExceptionAbstractSelfTest.java | 2 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +- .../IgniteCollectionAbstractTest.java | 2 +- ...tractPartitionedByteArrayValuesSelfTest.java | 2 +- .../GridCacheTransformEventSelfTest.java| 2 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...eColocatedOptimisticTransactionSelfTest.java | 2 +- ...dCacheColocatedTxSingleThreadedSelfTest.java | 2 +- ...ePartitionedNearDisabledMetricsSelfTest.java | 2 +- .../near/GridCacheNearJobExecutionSelfTest.java | 2 +- .../near/GridCacheNearMultiGetSelfTest.java | 2 +- .../GridCachePartitionedEvictionSelfTest.java | 2 +- ...titionedExplicitLockNodeFailureSelfTest.java | 2 +- .../GridCachePartitionedFullApiSelfTest.java| 2 +- .../GridCachePartitionedMetricsSelfTest.java| 2 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 2 +- ...GridCachePartitionedNodeFailureSelfTest.java | 2 +- .../GridCachePartitionedNodeRestartTest.java| 2 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 4 ++-- ...CachePartitionedTxMultiThreadedSelfTest.java | 2 +- ...achePartitionedTxSingleThreadedSelfTest.java | 2 +- .../GridCachePartitionedTxTimeoutSelfTest.java | 2 +- ...stractReplicatedByteArrayValuesSelfTest.java | 2 +- .../GridCacheReplicatedFullApiSelfTest.java | 2 +- .../GridCacheReplicatedInvalidateSelfTest.java | 2 +- .../GridCacheReplicatedJobExecutionTest.java| 2 +- .../GridCacheReplicatedMetricsSelfTest.java | 2 +- .../GridCacheReplicatedNodeFailureSelfTest.java | 2 +- ...dCacheReplicatedTxMultiThreadedSelfTest.java | 2 +- ...CacheReplicatedTxSingleThreadedSelfTest.java | 2 +- .../GridCacheReplicatedTxTimeoutSelfTest.java | 4 ++-- ...CacheReplicatedPreloadLifecycleSelfTest.java | 4 ++-- ...heConcurrentEvictionConsistencySelfTest.java | 4 ++-- .../GridCacheConcurrentEvictionsSelfTest.java | 4 ++-- .../GridCacheDistributedEvictionsSelfTest.java | 2 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 2 +- .../GridCacheEvictionTouchSelfTest.java | 2 +- ...iteCacheNoLoadPreviousValueAbstr
[47/56] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-188
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
index aaca9b3,000..cd0ff4c
mode 100644,00..100644
---
a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
+++
b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
@@@ -1,299 -1,0 +1,299 @@@
+/*
+ * 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.events;
+
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+/**
+ * Cache query read event.
+ *
+ * Grid events are used for notification about what happens within the grid.
Note that by
- * design GridGain keeps all events generated on the local node locally and
it provides
++ * design Ignite keeps all events generated on the local node locally and it
provides
+ * APIs for performing a distributed queries across multiple nodes:
+ *
+ *
+ * {@link
org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate,
long, int...)} -
+ * asynchronously querying events occurred on the nodes specified,
including remote nodes.
+ *
+ *
+ * {@link
org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate,
int...)} -
+ * querying only local events stored on this local node.
+ *
+ *
+ * {@link
org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate,
int...)} -
+ * listening to local grid events (events from remote nodes not
included).
+ *
+ *
+ * User can also wait for events using method {@link
org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate,
int...)}.
+ * Events and Performance
- * Note that by default all events in GridGain are enabled and therefore
generated and stored
- * by whatever event storage SPI is configured. GridGain can and often does
generate thousands events per seconds
++ * Note that by default all events in Ignite are enabled and therefore
generated and stored
++ * by whatever event storage SPI is configured. Ignite can and often does
generate thousands events per seconds
+ * under the load and therefore it creates a significant additional load on
the system. If these events are
+ * not needed by the application this load is unnecessary and leads to
significant performance degradation.
+ *
+ * It is highly recommended to enable only those events that your
application logic requires
- * by using {@link
org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()}
method in GridGain configuration. Note that certain
- * events are required for GridGain's internal operations and such events
will still be generated but not stored by
- * event storage SPI if they are disabled in GridGain configuration.
++ * by using {@link
org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()}
method in Ignite configuration. Note that certain
++ * events are required for Ignite's internal operations and such events will
still be generated but not stored by
++ * event storage SPI if they are disabled in Ignite configuration.
+ *
+ * @see EventType#EVT_CACHE_QUERY_OBJECT_READ
+ * @see EventType#EVTS_CACHE_QUERY
+ */
+public class CacheQueryReadEvent extends EventAdapter {
+/** */
+private static final long serialVersionUID = -1984731272984397445L;
+
+/** Query type. */
+private final CacheQueryType qryType;
+
+/** Cache name. */
+private final String cacheName;
+
+/** Class name. */
+private final String clsName;
+
+/** Clause. */
+private final String clause;
+
+/** Scan query filter. */
+@GridToStringInclude
+private final Ignit
[49/56] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-188
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java
--
diff --cc modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java
index 489e8ac,000..437c478
mode 100644,00..100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java
@@@ -1,484 -1,0 +1,484 @@@
+/*
+ * 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;
+
+
+import org.apache.ignite.internal.jdbc.*;
+
+import java.sql.*;
+import java.util.*;
+import java.util.logging.*;
+
+/**
+ * JDBC driver implementation for In-Memory Data Grid.
+ *
- * Driver allows to get distributed data from GridGain cache using standard
++ * Driver allows to get distributed data from Ignite cache using standard
+ * SQL queries and standard JDBC API. It will automatically get only fields
that
+ * you actually need from objects stored in cache.
+ * Limitations
- * Data in GridGain cache is usually distributed across several nodes,
++ * Data in Ignite cache is usually distributed across several nodes,
+ * so some queries may not work as expected since the query will be sent to
each
+ * individual node and results will then be collected and returned as JDBC
result set.
+ * Keep in mind following limitations (not applied if data is queried from
one node only,
+ * or data is fully co-located or fully replicated on multiple nodes):
+ *
+ *
+ * {@code Group by} and {@code sort by} statements are applied
separately
+ * on each node, so result set will likely be incorrectly grouped or
sorted
+ * after results from multiple remote nodes are grouped together.
+ *
+ *
+ * Aggregation functions like {@code sum}, {@code max}, {@code avg},
etc.
+ * are also applied on each node. Therefore you will get several
results
+ * containing aggregated values, one for each node.
+ *
+ *
+ * Joins will work correctly only if joined objects are stored in
+ * collocated mode. Refer to
+ * {@link org.apache.ignite.cache.affinity.CacheAffinityKey}
+ * javadoc for more details.
+ *
+ *
+ * Note that if you are connected to local or replicated cache, all
data will
+ * be queried only on one node, not depending on what caches
participate in
+ * the query (some data from partitioned cache can be lost). And visa
versa,
+ * if you are connected to partitioned cache, data from replicated
caches
+ * will be duplicated.
+ *
+ *
+ * SQL Notice
+ * Driver allows to query data from several caches. Cache that driver is
connected to is
+ * treated as default schema in this case. Other caches can be referenced by
their names.
+ *
+ * Note that cache name is case sensitive and you have to always specify it
in quotes.
+ * Dependencies
- * JDBC driver is located in main GridGain JAR and depends on all libraries
located in
++ * JDBC driver is located in main Ignite JAR and depends on all libraries
located in
+ * {@code IGNITE_HOME/libs} folder. So if you are using JDBC driver in any
external tool,
- * you have to add main GridGain JAR will all dependencies to its classpath.
++ * you have to add main Ignite JAR will all dependencies to its classpath.
+ * Configuration
- * Internally JDBC driver is based on GridGain Java client. Therefore,
all client
++ * Internally JDBC driver is based on Ignite Java client. Therefore,
all client
+ * configuration properties can be applied to JDBC connection.
+ *
+ * JDBC connection URL has the following pattern:
- * {@code jdbc:gridgain://:/?nodeId=}
++ * {@code jdbc:ignite://:/?nodeId=}
+ * Note the following:
+ *
+ * Hostname is required.
- * If port is not defined, {@code 11211} is used (default for
GridGain client).
++ * If port is not defined, {@code 11211} is used (default for Ignite
client).
+ * Leave {@code } empty if you are connecting to default
cache.
+ *
+
[12/56] [abbrv] incubator-ignite git commit: ignite-188 - resources cleanup.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
index 0d4938a..d6d34fa 100644
---
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
@@ -146,7 +146,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest
extends GridCommonAb
@ComputeTaskSessionFullSupport
private static class GridCheckpointTestTask extends
ComputeTaskSplitAdapter {
/** */
-@IgniteTaskSessionResource
+@TaskSessionResource
private ComputeTaskSession ses;
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java
index b2a32bd..e1e9fb8 100644
---
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java
@@ -73,15 +73,15 @@ public class GridSessionCollisionSpiSelfTest extends
GridCommonAbstractTest {
for (int i = 0; i < gridSize; i++) {
jobs.add(new ComputeJobAdapter() {
/** */
-@IgniteTaskSessionResource
+@TaskSessionResource
private ComputeTaskSession taskSes;
/** */
-@IgniteJobContextResource
+@JobContextResource
private ComputeJobContext jobCtx;
/** */
-@IgniteLoggerResource
+@LoggerResource
private IgniteLogger log;
/** {@inheritDoc} */
@@ -116,7 +116,7 @@ public class GridSessionCollisionSpiSelfTest extends
GridCommonAbstractTest {
*/
private static class GridSessionCollisionSpi extends FifoQueueCollisionSpi
{
/** */
-@IgniteLoggerResource
+@LoggerResource
private IgniteLogger log;
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java
index 3936c14..02c9119 100644
---
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitJobAttributeSelfTest.java
@@ -162,11 +162,11 @@ public class GridSessionFutureWaitJobAttributeSelfTest
extends GridCommonAbstrac
@ComputeTaskSessionFullSupport
private static class GridTaskSessionTestTask extends
ComputeTaskSplitAdapter {
/** */
-@IgniteLoggerResource
+@LoggerResource
private IgniteLogger log;
/** */
-@IgniteTaskSessionResource
+@TaskSessionResource
private ComputeTaskSession taskSes;
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java
index e330c2d..7614763 100644
---
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionFutureWaitTaskAttributeSelfTest.java
@@ -159,11 +159,11 @@ public class GridSessionFutureWaitTaskAttributeSelfTest
extends GridCommonAbstra
@ComputeTaskSessionFullSupport
private static class GridTaskSessionTestTask extends
ComputeTaskSplitAdapter {
/** */
-@IgniteLoggerResource
+@LoggerResource
private IgniteLogger
[13/56] [abbrv] incubator-ignite git commit: ignite-188 - resources cleanup.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
index e9a4e8c..d315a8a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
@@ -120,7 +120,7 @@ public class GridCancelUnusedJobSelfTest extends
GridCommonAbstractTest {
*/
private static class GridCancelTestTask extends
ComputeTaskSplitAdapter {
/** */
-@IgniteLoggerResource
+@LoggerResource
private IgniteLogger log;
/** {@inheritDoc} */
@@ -158,11 +158,11 @@ public class GridCancelUnusedJobSelfTest extends
GridCommonAbstractTest {
*/
private static class GridCancelTestJob extends ComputeJobAdapter {
/** */
-@IgniteLoggerResource
+@LoggerResource
private IgniteLogger log;
/** */
-@IgniteTaskSessionResource
+@TaskSessionResource
private ComputeTaskSession ses;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
index 2b0e21f..1538a96 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
@@ -160,7 +160,7 @@ public class GridCancelledJobsMetricsSelfTest extends
GridCommonAbstractTest {
private static class GridCancelCollisionSpi extends IgniteSpiAdapter
implements CollisionSpi {
/** */
-@IgniteLoggerResource
+@LoggerResource
private IgniteLogger log;
/** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java
index 48a5d88..2dd711f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java
@@ -65,7 +65,7 @@ public class GridCollisionJobsContextSelfTest extends
GridCommonAbstractTest {
@IgniteSpiMultipleInstancesSupport(true)
public static class TestCollisionSpi extends IgniteSpiAdapter implements
CollisionSpi {
/** Grid logger. */
-@IgniteLoggerResource
+@LoggerResource
private IgniteLogger log;
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java
index d11bced..8f0aeab 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java
@@ -100,7 +100,7 @@ public class GridContinuousJobAnnotationSelfTest extends
GridCommonAbstractTest
@SuppressWarnings({"PublicInnerClass", "unused"})
public static class TestTask implements ComputeTask {
/** */
-@IgniteTaskContinuousMapperResource
+@TaskContinuousMapperResource
private ComputeTaskContinuousMapper mapper;
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a065d0c/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobSiblingsSelfTest.java
index adbe08d..5e50456 100644
---
a/module
incubator-ignite git commit: sprint-1 - Renaming.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-1 2cfcca0d0 -> a4f0e7d1d
sprint-1 - Renaming.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4f0e7d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4f0e7d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4f0e7d1
Branch: refs/heads/sprint-1
Commit: a4f0e7d1dcfa1f7e91811d1cf4e395373569adaf
Parents: 2cfcca0
Author: Dmitiry Setrakyan
Authored: Fri Feb 6 16:53:55 2015 -0800
Committer: Dmitiry Setrakyan
Committed: Fri Feb 6 16:53:55 2015 -0800
--
.../plugin/IgnitePluginProcessor.java | 2 +-
.../org/apache/ignite/plugin/Extension.java | 25 +++
.../apache/ignite/plugin/ExtensionRegistry.java | 32
.../apache/ignite/plugin/IgniteExtension.java | 25 ---
.../ignite/plugin/IgniteExtensionRegistry.java | 32
.../apache/ignite/plugin/PluginProvider.java| 2 +-
.../communication/MessageCallback.java | 2 +-
.../extensions/discovery/DiscoveryCallback.java | 2 +-
8 files changed, 61 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4f0e7d1/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
index 9c6dc0e..46227c0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
@@ -212,7 +212,7 @@ public class IgnitePluginProcessor extends
GridProcessorAdapter {
/**
*
*/
-private static class ExtensionRegistry implements IgniteExtensionRegistry {
+private static class ExtensionRegistry implements
org.apache.ignite.plugin.ExtensionRegistry {
/** */
private final Map, List> extensionsCollector = new
HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4f0e7d1/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java
b/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java
new file mode 100644
index 000..cd6e479
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/Extension.java
@@ -0,0 +1,25 @@
+/*
+ * 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.plugin;
+
+/**
+ * Marker interface for extensions. Used to help find list of possible
extensions.
+ */
+public interface Extension {
+// No-op.
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4f0e7d1/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java
b/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java
new file mode 100644
index 000..1e9580d
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java
@@ -0,0 +1,32 @@
+/*
+ * 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
incubator-ignite git commit: # sprint-1 cleanup class loader reference
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-1 3294c60f8 -> 522a0a298
# sprint-1 cleanup class loader reference
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/522a0a29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/522a0a29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/522a0a29
Branch: refs/heads/sprint-1
Commit: 522a0a2981546f84007cec900c94a539e6cb0289
Parents: 3294c60
Author: sboikov
Authored: Fri Feb 6 11:00:41 2015 +0300
Committer: sboikov
Committed: Fri Feb 6 11:00:41 2015 +0300
--
.../marshaller/optimized/IgniteOptimizedObjectInputStream.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/522a0a29/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
index 690bdd6..d596af3 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
@@ -110,6 +110,8 @@ class IgniteOptimizedObjectInputStream extends
ObjectInputStream {
/** {@inheritDoc} */
@Override public void close() throws IOException {
reset();
+
+clsLdr = null;
}
/** {@inheritDoc} */
[1/2] incubator-ignite git commit: # sprint-1 Fixed db usage in schema load tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-1 522a0a298 -> 53760d146
# sprint-1 Fixed db usage in schema load tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/effc5e03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/effc5e03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/effc5e03
Branch: refs/heads/sprint-1
Commit: effc5e03e94037b680ce796dc7b43398672f6fd3
Parents: f55d198
Author: AKuznetsov
Authored: Fri Feb 6 15:06:32 2015 +0700
Committer: AKuznetsov
Committed: Fri Feb 6 15:06:32 2015 +0700
--
.../org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/effc5e03/modules/schema-load/src/test/java/org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java
--
diff --git
a/modules/schema-load/src/test/java/org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java
b/modules/schema-load/src/test/java/org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java
index 1822b0e..f8a3719 100644
---
a/modules/schema-load/src/test/java/org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java
+++
b/modules/schema-load/src/test/java/org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java
@@ -57,7 +57,7 @@ public abstract class AbstractSchemaLoaderTest extends
TestCase {
Statement stmt = conn.createStatement();
-stmt.executeUpdate("CREATE TABLE PRIMITIVES (pk INTEGER PRIMARY KEY, "
+
+stmt.executeUpdate("CREATE TABLE IF NOT EXISTS PRIMITIVES (pk INTEGER
PRIMARY KEY, " +
" boolCol BOOLEAN NOT NULL," +
" byteCol TINYINT NOT NULL," +
" shortCol SMALLINT NOT NULL," +
@@ -73,7 +73,7 @@ public abstract class AbstractSchemaLoaderTest extends
TestCase {
" tsCol TIMESTAMP, " +
" arrCol BINARY(10))");
-stmt.executeUpdate("CREATE TABLE OBJECTS (pk INTEGER PRIMARY KEY, " +
+stmt.executeUpdate("CREATE TABLE IF NOT EXISTS OBJECTS (pk INTEGER
PRIMARY KEY, " +
" boolCol BOOLEAN," +
" byteCol TINYINT," +
" shortCol SMALLINT," +
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Merge remote-tracking branch 'origin/sprint-1' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/53760d14 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/53760d14 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/53760d14 Branch: refs/heads/sprint-1 Commit: 53760d1469aaf320955d5aa7851df8090126bb94 Parents: effc5e0 522a0a2 Author: AKuznetsov Authored: Fri Feb 6 15:07:45 2015 +0700 Committer: AKuznetsov Committed: Fri Feb 6 15:07:45 2015 +0700 -- .../MessagingPingPongListenActorExample.java| 4 ++-- .../java/org/apache/ignite/IgniteCache.java | 22 .../java/org/apache/ignite/IgniteQueue.java | 4 ++-- .../main/java/org/apache/ignite/IgniteSet.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 6 -- .../IgniteOptimizedObjectInputStream.java | 2 ++ .../ignite/messaging/MessagingListenActor.java | 18 .../internal/GridListenActorSelfTest.java | 11 -- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 7 ++- 9 files changed, 26 insertions(+), 50 deletions(-) --
[1/6] incubator-ignite git commit: # ignite-149: WIP.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-149 [created] 6efa3e20f
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/winservice/IgniteService/IgniteService.csproj
--
diff --git a/modules/winservice/IgniteService/IgniteService.csproj
b/modules/winservice/IgniteService/IgniteService.csproj
new file mode 100644
index 000..c533782
--- /dev/null
+++ b/modules/winservice/IgniteService/IgniteService.csproj
@@ -0,0 +1,90 @@
+
+http://schemas.microsoft.com/developer/msbuild/2003";>
+
+Debug
+x86
+8.0.30703
+2.0
+{86BE9E54-4293-482A-8956-BDCF20BA53A8}
+Exe
+Properties
+Ignite
+IgniteService
+v4.0
+Client
+512
+false
+publish\
+true
+Disk
+false
+Foreground
+7
+Days
+false
+false
+true
+0
+1.0.0.%2a
+false
+true
+
+
+x86
+true
+full
+false
+bin\Debug\
+DEBUG;TRACE
+prompt
+4
+
+
+x86
+pdbonly
+true
+bin\Release\
+TRACE
+prompt
+4
+
+
+
+ Component
+
+
+
+
+
+
+
+
+ False
+ Microsoft .NET Framework 4 Client Profile %28x86 and
x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
+ False
+ Windows Installer 3.1
+ true
+
+
+
+
+
\ No newline at end of file
[5/6] incubator-ignite git commit: # ignite-149: Minor.
# ignite-149: Minor. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9afb9120 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9afb9120 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9afb9120 Branch: refs/heads/ignite-149 Commit: 9afb91200c63b4ef9b824c9a6f584baf56f4a49c Parents: dee928b Author: vozerov-gridgain Authored: Fri Feb 6 11:12:12 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 11:12:12 2015 +0300 -- bin/include/IgniteService.exe | Bin 6144 -> 0 bytes bin/include/IgniteService1.exe | Bin 0 -> 6144 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9afb9120/bin/include/IgniteService.exe -- diff --git a/bin/include/IgniteService.exe b/bin/include/IgniteService.exe deleted file mode 100644 index 66deb9c..000 Binary files a/bin/include/IgniteService.exe and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9afb9120/bin/include/IgniteService1.exe -- diff --git a/bin/include/IgniteService1.exe b/bin/include/IgniteService1.exe new file mode 100644 index 000..66deb9c Binary files /dev/null and b/bin/include/IgniteService1.exe differ
[3/6] incubator-ignite git commit: # ignite-149: WIP.
# ignite-149: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67376020
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67376020
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67376020
Branch: refs/heads/ignite-149
Commit: 673760208f800118608cf372ff3052fcd9ecb14b
Parents: bb8b07d
Author: vozerov-gridgain
Authored: Thu Feb 5 17:49:45 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Feb 5 17:49:45 2015 +0300
--
bin/include/IgniteService.exe | Bin 0 -> 6144 bytes
bin/include/ggservice.exe | Bin 5632 -> 0 bytes
.../java/org/apache/ignite/IgniteCluster.java |6 +-
.../apache/ignite/internal/IgniteKernal.java| 16 +-
.../ignite/internal/util/IgniteUtils.java |2 +-
.../util/nodestart/GridNodeCallable.java| 29 -
.../util/nodestart/GridNodeStartUtils.java | 390 ---
.../nodestart/GridRemoteStartSpecification.java | 279 -
.../util/nodestart/IgniteNodeCallable.java | 30 +
.../util/nodestart/IgniteNodeStartUtils.java| 391 +++
.../IgniteRemoteStartSpecification.java | 279 +
.../util/nodestart/IgniteSshProcessor.java |2 +-
.../core/src/test/bin/start-nodes-custom.bat|2 +-
modules/core/src/test/config/start-nodes.ini|6 +-
.../util/nodestart/GridNodeCallableImpl.java| 344 --
.../util/nodestart/IgniteNodeCallableImpl.java | 344 ++
.../util/nodestart/IgniteSshProcessorImpl.java |4 +-
.../internal/GridNodeStartUtilsSelfTest.java| 89 --
.../GridProjectionStartStopRestartSelfTest.java | 1032 --
.../internal/IgniteNodeStartUtilsSelfTest.java | 88 ++
...gniteProjectionStartStopRestartSelfTest.java | 1032 ++
.../IgniteStartStopRestartTestSuite.java|4 +-
.../commands/start/VisorStartCommand.scala |4 +-
modules/winservice/.gitignore |2 +
modules/winservice/IgniteService.sln| 22 +
.../winservice/IgniteService/IgniteService.cs | 170 +++
.../IgniteService/IgniteService.csproj | 90 ++
27 files changed, 2471 insertions(+), 2186 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/bin/include/IgniteService.exe
--
diff --git a/bin/include/IgniteService.exe b/bin/include/IgniteService.exe
new file mode 100644
index 000..66deb9c
Binary files /dev/null and b/bin/include/IgniteService.exe differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/bin/include/ggservice.exe
--
diff --git a/bin/include/ggservice.exe b/bin/include/ggservice.exe
deleted file mode 100644
index 7d3783b..000
Binary files a/bin/include/ggservice.exe and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index d8f16ed..0350487 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -232,7 +232,7 @@ public interface IgniteCluster extends ClusterGroup,
IgniteAsyncSupport {
*
*
*
- * ggHome
+ * igniteHome
* String
*
* Path to GridGain installation folder. If not defined,
IGNITE_HOME
@@ -242,13 +242,13 @@ public interface IgniteCluster extends ClusterGroup,
IgniteAsyncSupport {
*
* cfg
* String
- * Path to configuration file (relative to {@code
ggHome}).
+ * Path to configuration file (relative to {@code
igniteHome}).
*
*
* script
* String
*
- * Custom startup script file name and path (relative to
{@code ggHome}).
+ * Custom startup script file name and path (relative to
{@code igniteHome}).
* You can also specify a space-separated list of
parameters in the same
* string (for example: {@code "bin/my-custom-script.sh
-v"}).
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
---
[2/6] incubator-ignite git commit: # ignite-149: WIP.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
--
diff --git
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
b/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
deleted file mode 100644
index 992954d..000
---
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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;
-
-import org.apache.ignite.internal.util.nodestart.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.util.nodestart.GridNodeStartUtils.*;
-
-/**
- * Tests for {@link GridNodeStartUtils}.
- */
-public class GridNodeStartUtilsSelfTest extends GridCommonAbstractTest {
-/**
- * @throws Exception If failed.
- */
-public void testParseFile() throws Exception {
-File file =
U.resolveGridGainPath("modules/core/src/test/config/start-nodes.ini");
-
-IgniteBiTuple>, Map> t
= parseFile(file);
-
-assert t != null;
-
-Collection> hosts = t.get1();
-
-assert hosts != null;
-assert hosts.size() == 2;
-
-for (Map host : hosts) {
-assert host != null;
-
-assert "192.168.1.1".equals(host.get(HOST)) ||
"192.168.1.2".equals(host.get(HOST));
-
-if ("192.168.1.1".equals(host.get(HOST))) {
-assert (Integer)host.get(PORT) == 1;
-assert "uname1".equals(host.get(UNAME));
-assert "passwd1".equals(host.get(PASSWD));
-assert new File("key1").equals(host.get(KEY));
-assert (Integer)host.get(NODES) == 1;
-assert "ggHome1".equals(host.get(IGNITE_HOME));
-assert "cfg1".equals(host.get(CFG));
-assert "script1".equals(host.get(SCRIPT));
-}
-else if ("192.168.1.2".equals(host.get(HOST))) {
-assert (Integer)host.get(PORT) == 2;
-assert "uname2".equals(host.get(UNAME));
-assert "passwd2".equals(host.get(PASSWD));
-assert new File("key2").equals(host.get(KEY));
-assert (Integer)host.get(NODES) == 2;
-assert "ggHome2".equals(host.get(IGNITE_HOME));
-assert "cfg2".equals(host.get(CFG));
-assert "script2".equals(host.get(SCRIPT));
-}
-}
-
-Map dflts = t.get2();
-
-assert dflts != null;
-
-assert (Integer)dflts.get(PORT) == 3;
-assert "uname3".equals(dflts.get(UNAME));
-assert "passwd3".equals(dflts.get(PASSWD));
-assert new File("key3").equals(dflts.get(KEY));
-assert (Integer)dflts.get(NODES) == 3;
-assert "ggHome3".equals(dflts.get(IGNITE_HOME));
-assert "cfg3".equals(dflts.get(CFG));
-assert "script3".equals(dflts.get(SCRIPT));
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
--
diff --git
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
b/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
deleted file mode 100644
index 20c52d5..000
---
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
+++ /dev/null
@@ -1,1032 +0,0 @@
-/*
- * 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
[4/6] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-149
Merge branch 'sprint-1' into ignite-149 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dee928bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dee928bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dee928bd Branch: refs/heads/ignite-149 Commit: dee928bdc3a1a4fceddc75059e8ee10ad0eb7e3b Parents: 6737602 53760d1 Author: vozerov-gridgain Authored: Fri Feb 6 11:10:55 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 11:10:55 2015 +0300 -- .../MessagingPingPongListenActorExample.java|4 +- .../java/org/apache/ignite/IgniteCache.java | 22 - .../java/org/apache/ignite/IgniteQueue.java |4 +- .../main/java/org/apache/ignite/IgniteSet.java |2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 1560 ++ .../cache/store/jdbc/CacheJdbcPojoStore.java| 205 +++ .../ignite/cache/store/jdbc/JdbcCacheStore.java | 1560 -- .../cache/store/jdbc/JdbcPojoCacheStore.java| 205 --- .../processors/cache/IgniteCacheProxy.java |6 - .../processors/rest/GridRestProcessor.java |2 + .../IgniteOptimizedObjectInputStream.java |2 + .../ignite/messaging/MessagingListenActor.java | 18 +- ...ractJdbcCacheStoreMultithreadedSelfTest.java | 196 --- .../CacheJdbcPojoStoreMultitreadedSelfTest.java | 35 + .../store/jdbc/CacheJdbcPojoStoreTest.java | 702 ...eJdbcStoreAbstractMultithreadedSelfTest.java | 197 +++ .../PojoJdbcCacheStoreMultitreadedSelfTest.java | 34 - .../store/jdbc/PojoJdbcCacheStoreTest.java | 702 .../internal/GridListenActorSelfTest.java | 11 +- .../schema/load/AbstractSchemaLoaderTest.java |4 +- .../commands/open/VisorOpenCommandSpec.scala|6 +- .../yardstick/config/benchmark-store.properties | 35 +- .../yardstick/config/ignite-store-config.xml| 11 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 89 +- .../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 10 +- .../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 47 + .../store/jdbc/IgniteJdbcStorePutBenchmark.java |5 + .../jdbc/IgniteJdbcStorePutGetBenchmark.java|5 + .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 52 + .../jdbc/IgniteJdbcStorePutTxBenchmark.java | 47 + 30 files changed, 2992 insertions(+), 2786 deletions(-) --
[6/6] incubator-ignite git commit: # ignite-149: Minor.
# ignite-149: Minor. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6efa3e20 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6efa3e20 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6efa3e20 Branch: refs/heads/ignite-149 Commit: 6efa3e20f0aa39869042ebbb18999563479d2b17 Parents: 9afb912 Author: vozerov-gridgain Authored: Fri Feb 6 11:12:29 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 11:12:29 2015 +0300 -- bin/include/IgniteService1.exe | Bin 6144 -> 0 bytes bin/include/igniteservice.exe | Bin 0 -> 6144 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6efa3e20/bin/include/IgniteService1.exe -- diff --git a/bin/include/IgniteService1.exe b/bin/include/IgniteService1.exe deleted file mode 100644 index 66deb9c..000 Binary files a/bin/include/IgniteService1.exe and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6efa3e20/bin/include/igniteservice.exe -- diff --git a/bin/include/igniteservice.exe b/bin/include/igniteservice.exe new file mode 100644 index 000..66deb9c Binary files /dev/null and b/bin/include/igniteservice.exe differ
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Merge remote-tracking branch 'origin/sprint-1' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c789b6b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c789b6b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c789b6b6 Branch: refs/heads/sprint-1 Commit: c789b6b6e3833d8d2a0e97edf2149470ea77d517 Parents: 1b14568 53760d1 Author: Yakov Zhdanov Authored: Fri Feb 6 11:20:46 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Feb 6 11:20:46 2015 +0300 -- .../MessagingPingPongListenActorExample.java|4 +- .../java/org/apache/ignite/IgniteCache.java | 22 - .../java/org/apache/ignite/IgniteQueue.java |4 +- .../main/java/org/apache/ignite/IgniteSet.java |2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 1560 ++ .../cache/store/jdbc/CacheJdbcPojoStore.java| 205 +++ .../ignite/cache/store/jdbc/JdbcCacheStore.java | 1560 -- .../cache/store/jdbc/JdbcPojoCacheStore.java| 205 --- .../processors/cache/IgniteCacheProxy.java |6 - .../IgniteOptimizedObjectInputStream.java |2 + .../ignite/messaging/MessagingListenActor.java | 18 +- ...ractJdbcCacheStoreMultithreadedSelfTest.java | 196 --- .../CacheJdbcPojoStoreMultitreadedSelfTest.java | 35 + .../store/jdbc/CacheJdbcPojoStoreTest.java | 702 ...eJdbcStoreAbstractMultithreadedSelfTest.java | 197 +++ .../PojoJdbcCacheStoreMultitreadedSelfTest.java | 34 - .../store/jdbc/PojoJdbcCacheStoreTest.java | 702 .../internal/GridListenActorSelfTest.java | 11 +- .../schema/load/AbstractSchemaLoaderTest.java |4 +- .../commands/open/VisorOpenCommandSpec.scala|6 +- .../yardstick/config/benchmark-store.properties | 35 +- .../yardstick/config/ignite-store-config.xml| 11 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 89 +- .../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 10 +- .../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 47 + .../store/jdbc/IgniteJdbcStorePutBenchmark.java |5 + .../jdbc/IgniteJdbcStorePutGetBenchmark.java|5 + .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 52 + .../jdbc/IgniteJdbcStorePutTxBenchmark.java | 47 + 29 files changed, 2990 insertions(+), 2786 deletions(-) --
[1/2] incubator-ignite git commit: sprint-1 minor
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-1 53760d146 -> c789b6b6e
sprint-1 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b145686
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b145686
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b145686
Branch: refs/heads/sprint-1
Commit: 1b1456867586c0a0798a7e07049716c0b4ea9fab
Parents: ce0c304
Author: Yakov Zhdanov
Authored: Fri Feb 6 11:20:03 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Feb 6 11:20:03 2015 +0300
--
.../main/java/org/apache/ignite/cache/eviction/EvictableEntry.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b145686/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
index 5c940b3..2379179 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
@@ -27,7 +27,7 @@ import javax.cache.*;
* @author @java.author
* @version @java.version
*/
-public interface EvictableEntry extends Cache.Entry {
+public interface EvictableEntry extends Cache.Entry {
/**
* Attaches metadata to the entry.
*
incubator-ignite git commit: IGNITE-190 Changed query examples.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-190 [created] 3ae3ed10e
IGNITE-190 Changed query examples.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3ae3ed10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3ae3ed10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3ae3ed10
Branch: refs/heads/ignite-190
Commit: 3ae3ed10e5199a9c755ed5b7c46387ceccfce127
Parents: 97a9adc
Author: nikolay_tikhonov
Authored: Fri Feb 6 11:08:33 2015 +0300
Committer: nikolay_tikhonov
Committed: Fri Feb 6 11:22:59 2015 +0300
--
examples/config/example-cache.xml | 2 +-
.../examples/datagrid/CacheQueryExample.java| 180 ++-
.../starschema/CacheStarSchemaExample.java | 43 +++--
3 files changed, 76 insertions(+), 149 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ae3ed10/examples/config/example-cache.xml
--
diff --git a/examples/config/example-cache.xml
b/examples/config/example-cache.xml
index 38ea60d..54f926a 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -141,7 +141,7 @@
-
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ae3ed10/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index fe5bf7f..72a20ff 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -18,12 +18,11 @@
package org.apache.ignite.examples.datagrid;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.*;
import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.lang.*;
+import javax.cache.*;
import java.io.*;
import java.util.*;
@@ -81,7 +80,7 @@ public class CacheQueryExample {
System.out.println(">>> Cache query example started.");
// Clean up caches on all nodes before run.
-ignite.jcache(CACHE_NAME).clear();
+ignite.jcache(CACHE_NAME).removeAll();
// Populate cache.
initialize();
@@ -95,13 +94,8 @@ public class CacheQueryExample {
// Example for TEXT-based querying for a given string in peoples
resumes.
textQuery();
-// Example for SQL-based querying with custom remote and local
reducers
-// to calculate average salary among all employees within a
company.
-sqlQueryWithReducers();
-
-// Example for SQL-based querying with custom remote transformer
to make sure
-// that only required data without any overhead is returned to
caller.
-sqlQueryWithTransformer();
+// Example for SQL-based querying to calculate average salary
among all employees within a company.
+sqlQueryWithAggregation();
// Example for SQL-based fields queries that return only required
// fields instead of whole key-value pairs.
@@ -120,18 +114,20 @@ public class CacheQueryExample {
* @throws IgniteCheckedException In case of error.
*/
private static void sqlQuery() throws IgniteCheckedException {
-GridCache, Person> cache =
Ignition.ignite().cache(CACHE_NAME);
+IgniteCache, Person> cache =
Ignition.ignite().jcache(CACHE_NAME);
-// Create query which selects salaries based on range.
-CacheQuery, Person>> qry =
-cache.queries().createSqlQuery(Person.class, "salary > ? and
salary <= ?");
+// SQL clause which selects salaries based on range.
+String sql = "salary > ? and salary <= ?";
// Execute queries for salary ranges.
-print("People with salaries between 0 and 1000: ", qry.execute(0,
1000).get());
+print("People with salaries between 0 and 1000: ",
+cache.query(new QuerySqlPredicate(Person.class, sql, 0,
1000)).getAll());
-print("People with salaries between 1000 and 2000: ",
qry.execute(1000, 2000).get());
+print("People with salaries between 1000 and 2000: ",
+cache.query(new QuerySqlPredicate(Person.class, sql, 1000,
2000)).getAll()
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Merge remote-tracking branch 'origin/sprint-1' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/22921fc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/22921fc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/22921fc1 Branch: refs/heads/sprint-1 Commit: 22921fc1650c1e1ac5fb2916e5bbadb291d83af1 Parents: 68dad5b c789b6b Author: anovikov Authored: Fri Feb 6 15:33:51 2015 +0700 Committer: anovikov Committed: Fri Feb 6 15:33:51 2015 +0700 -- .../java/org/apache/ignite/cache/eviction/EvictableEntry.java| 2 +- .../marshaller/optimized/IgniteOptimizedObjectInputStream.java | 2 ++ .../org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) --
[1/2] incubator-ignite git commit: # ignite-32 Add store tests to suite.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-1 c789b6b6e -> 22921fc16
# ignite-32 Add store tests to suite.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/68dad5b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/68dad5b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/68dad5b7
Branch: refs/heads/sprint-1
Commit: 68dad5b772c28b3c216f3ddb14716741e4b3636d
Parents: 3294c60
Author: anovikov
Authored: Fri Feb 6 15:32:50 2015 +0700
Committer: anovikov
Committed: Fri Feb 6 15:32:50 2015 +0700
--
.../store/jdbc/CacheAbstractJdbcStore.java | 11 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 50 +++
.../store/jdbc/CacheJdbcPojoStoreTest.java | 73 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 98 +++--
.../store/jdbc/model/PersonComplexKey.java | 146 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
6 files changed, 360 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68dad5b7/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
index 8e550f2..3d60a74 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
@@ -1448,9 +1448,16 @@ public abstract class CacheAbstractJdbcStore
extends CacheStore impl
ResultSet rs = stmt.executeQuery();
+ResultSetMetaData meta = rs.getMetaData();
+
+Map colIdxs =
U.newHashMap(meta.getColumnCount());
+
+for (int i = 1; i <= meta.getColumnCount(); i++)
+colIdxs.put(meta.getColumnLabel(i), i);
+
while (rs.next()) {
-K1 key = buildObject(em.keyType(), em.keyColumns(),
em.loadColIdxs, rs);
-V1 val = buildObject(em.valueType(), em.valueColumns(),
em.loadColIdxs, rs);
+K1 key = buildObject(em.keyType(), em.keyColumns(),
colIdxs, rs);
+V1 val = buildObject(em.valueType(), em.valueColumns(),
colIdxs, rs);
clo.apply(key, val);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68dad5b7/modules/core/src/test/config/store/jdbc/Ignite.xml
--
diff --git a/modules/core/src/test/config/store/jdbc/Ignite.xml
b/modules/core/src/test/config/store/jdbc/Ignite.xml
index a1fc231..bb4502a 100644
--- a/modules/core/src/test/config/store/jdbc/Ignite.xml
+++ b/modules/core/src/test/config/store/jdbc/Ignite.xml
@@ -98,4 +98,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68dad5b7/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
index 20805d1..0edc6f6 100644
---
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
@@ -90,16 +90,15 @@ public class CacheJdbcPojoStoreTest extends
GridCommonAbstractTest {
//PGPoolingDataSource ds = new PGPoolingDataSource();
//ds.se
incubator-ignite git commit: IGNITE-54-55 Bug fix: don't forget to check obsoleteOrDeleted() when iterate over entries.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-54-55 052b43626 -> 05697b4a0
IGNITE-54-55 Bug fix: don't forget to check obsoleteOrDeleted() when iterate
over entries.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/05697b4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/05697b4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/05697b4a
Branch: refs/heads/ignite-54-55
Commit: 05697b4a0d5e348f61a96302c05e9fecb72c832d
Parents: 052b436
Author: sevdokimov
Authored: Fri Feb 6 11:36:21 2015 +0300
Committer: sevdokimov
Committed: Fri Feb 6 11:36:21 2015 +0300
--
.../cache/distributed/GridDistributedCacheAdapter.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05697b4a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 937438c..5365ec3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -229,8 +229,10 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
try (IgniteDataLoader dataLdr =
ignite.dataLoader(cacheName)) {
for (GridDhtLocalPartition locPart :
dht.topology().currentLocalPartitions()) {
if (!locPart.isEmpty() && locPart.primary(topVer)) {
-for (GridDhtCacheEntry o : locPart.entries())
-dataLdr.removeData(o.key());
+for (GridDhtCacheEntry o :
locPart.entries()) {
+if (!o.obsoleteOrDeleted())
+dataLdr.removeData(o.key());
+}
}
}
}
[5/6] incubator-ignite git commit: IGNITE-54-55 Bug fix: don't forget to check obsoleteOrDeleted() when iterate over entries.
IGNITE-54-55 Bug fix: don't forget to check obsoleteOrDeleted() when iterate
over entries.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/05697b4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/05697b4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/05697b4a
Branch: refs/heads/sprint-1
Commit: 05697b4a0d5e348f61a96302c05e9fecb72c832d
Parents: 052b436
Author: sevdokimov
Authored: Fri Feb 6 11:36:21 2015 +0300
Committer: sevdokimov
Committed: Fri Feb 6 11:36:21 2015 +0300
--
.../cache/distributed/GridDistributedCacheAdapter.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05697b4a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 937438c..5365ec3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -229,8 +229,10 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
try (IgniteDataLoader dataLdr =
ignite.dataLoader(cacheName)) {
for (GridDhtLocalPartition locPart :
dht.topology().currentLocalPartitions()) {
if (!locPart.isEmpty() && locPart.primary(topVer)) {
-for (GridDhtCacheEntry o : locPart.entries())
-dataLdr.removeData(o.key());
+for (GridDhtCacheEntry o :
locPart.entries()) {
+if (!o.obsoleteOrDeleted())
+dataLdr.removeData(o.key());
+}
}
}
}
[1/6] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-54-55
Repository: incubator-ignite Updated Branches: refs/heads/sprint-1 22921fc16 -> 1244764bc Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-54-55 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/572c3721 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/572c3721 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/572c3721 Branch: refs/heads/sprint-1 Commit: 572c372144f7a95281098f7bd54eebcaac88e9ad Parents: ec1a01f 46160c9 Author: sevdokimov Authored: Thu Feb 5 16:51:30 2015 +0300 Committer: sevdokimov Committed: Thu Feb 5 16:51:30 2015 +0300 -- config/hadoop/default-config.xml|2 +- .../datastructures/CacheAtomicLongExample.java | 78 - .../CacheAtomicReferenceExample.java| 126 -- .../CacheAtomicSequenceExample.java | 112 -- .../CacheAtomicStampedExample.java | 132 -- .../CacheCountDownLatchExample.java | 112 -- .../datastructures/CacheQueueExample.java | 214 --- .../datastructures/CacheSetExample.java | 193 -- .../datastructures/IgniteAtomicLongExample.java | 74 + .../IgniteAtomicReferenceExample.java | 110 ++ .../IgniteAtomicSequenceExample.java| 96 + .../IgniteAtomicStampedExample.java | 117 ++ .../IgniteCountDownLatchExample.java| 96 + .../datastructures/IgniteQueueExample.java | 206 +++ .../datastructures/IgniteSetExample.java| 186 ++ .../client/memcache/MemcacheRestExample.java|3 +- .../ignite/examples/CacheExamplesSelfTest.java | 14 +- .../ClientTcpUnreachableMultiNodeSelfTest.java | 12 - .../rest/ClientMemcachedProtocolSelfTest.java |8 +- .../JettyRestProcessorAbstractSelfTest.java | 21 +- .../rest/RestMemcacheProtocolSelfTest.java | 60 +- .../processors/rest/TestMemcacheClient.java | 11 +- .../src/main/java/org/apache/ignite/Ignite.java | 101 ++ .../org/apache/ignite/IgniteAtomicLong.java | 163 ++ .../apache/ignite/IgniteAtomicReference.java| 99 ++ .../org/apache/ignite/IgniteAtomicSequence.java | 136 ++ .../org/apache/ignite/IgniteAtomicStamped.java | 128 ++ .../java/org/apache/ignite/IgniteCache.java | 16 +- .../org/apache/ignite/IgniteCountDownLatch.java | 232 +++ .../java/org/apache/ignite/IgniteQueue.java | 185 ++ .../main/java/org/apache/ignite/IgniteSet.java | 107 ++ .../apache/ignite/cache/CacheConfiguration.java | 95 - .../org/apache/ignite/cache/CacheEntry.java |1 + .../apache/ignite/cache/CacheEntryEvent.java| 75 - .../org/apache/ignite/cache/CachePeekMode.java | 12 +- .../apache/ignite/cache/CacheProjection.java|7 + .../java/org/apache/ignite/cache/GridCache.java | 14 - .../apache/ignite/cache/GridCachePeekMode.java | 85 - .../cache/datastructures/CacheAtomicLong.java | 157 -- .../datastructures/CacheAtomicReference.java| 93 - .../datastructures/CacheAtomicSequence.java | 130 -- .../datastructures/CacheAtomicStamped.java | 121 -- .../datastructures/CacheCountDownLatch.java | 226 --- .../CacheDataStructureInvalidException.java | 66 - ...cheDataStructureInvalidRuntimeException.java | 66 - .../CacheDataStructureRemovedException.java | 61 - ...cheDataStructureRemovedRuntimeException.java | 61 - .../datastructures/CacheDataStructures.java | 220 --- .../ignite/cache/datastructures/CacheQueue.java | 182 -- .../ignite/cache/datastructures/CacheSet.java | 61 - .../ignite/cache/datastructures/package.html| 24 - .../eviction/fifo/CacheFifoEvictionPolicy.java |1 + .../random/CacheRandomEvictionPolicy.java |1 + .../cache/query/CacheContinuousQuery.java | 61 +- .../cache/query/CacheQueryGroupIndex.java |9 - .../ignite/cache/query/CacheQuerySqlField.java | 10 - .../query/annotations/QueryGroupIndex.java |9 - .../cache/query/annotations/QuerySqlField.java | 10 - .../ignite/cache/store/CacheLocalStore.java | 31 - .../cache/store/CacheStoreBalancingWrapper.java | 296 .../cache/store/jdbc/dialect/package.html |2 +- .../apache/ignite/client/GridClientNode.java| 24 - .../ignite/client/GridClientProtocol.java |4 - .../ignite/client/impl/GridClientNodeImpl.java | 15 - .../IgniteAtomicConfiguration.java | 105 ++ .../IgniteCollectionConfiguration.java | 67 + .../configuration/IgniteConfiguration.java | 18 + .../DataStructureRemovedException.java | 61 + .../apache/ignite/events/IgniteEventType.java | 120 -- .../apache/ignite/internal/GridComponent.java | 19 + .../ignite/internal/GridJobExecuteRequest.java | 95 +- .../ignite/internal/GridKernalContext.java |8 + .../ig
[3/6] incubator-ignite git commit: # IGNITE-54-55 Remove unused variable.
# IGNITE-54-55 Remove unused variable.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c0571b89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c0571b89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c0571b89
Branch: refs/heads/sprint-1
Commit: c0571b899651f53edb54866d6f0944e0fedcaecc
Parents: e5b41cc
Author: sevdokimov
Authored: Thu Feb 5 17:06:33 2015 +0300
Committer: sevdokimov
Committed: Thu Feb 5 17:06:33 2015 +0300
--
.../cache/distributed/GridDistributedCacheAdapter.java | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0571b89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 785d455..71e7157 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -207,11 +207,7 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
* {@inheritDoc}
*/
@Override public Object call() throws Exception {
-final IgniteKernal grid = (IgniteKernal)ignite;
-
-final GridCache cache = grid.cachex(cacheName);
-
-GridCacheAdapter cacheAdapter =
grid.context().cache().internalCache(cacheName);
+GridCacheAdapter cacheAdapter =
((IgniteKernal)ignite).context().cache().internalCache(cacheName);
final GridCacheContext ctx = cacheAdapter.context();
@@ -223,7 +219,7 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
GridDhtCacheAdapter dht = (GridDhtCacheAdapter)cacheAdapter;
-IgniteDataLoader dataLdr = grid.dataLoader(cacheName);
+IgniteDataLoader dataLdr = ignite.dataLoader(cacheName);
for (GridDhtLocalPartition locPart :
dht.topology().currentLocalPartitions()) {
if (!locPart.isEmpty() && locPart.primary(topVer)) {
[6/6] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-54-55' into sprint-1
Merge remote-tracking branch 'remotes/origin/ignite-54-55' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1244764b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1244764b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1244764b Branch: refs/heads/sprint-1 Commit: 1244764bc2fb5bcd1fabf6f0e779547d2c7d4888 Parents: 22921fc 05697b4 Author: sevdokimov Authored: Fri Feb 6 11:37:31 2015 +0300 Committer: sevdokimov Committed: Fri Feb 6 11:37:31 2015 +0300 -- .../GridDistributedCacheAdapter.java| 46 +--- 1 file changed, 21 insertions(+), 25 deletions(-) --
[4/6] incubator-ignite git commit: # IGNITE-54-55 Bug fixes.
# IGNITE-54-55 Bug fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/052b4362
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/052b4362
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/052b4362
Branch: refs/heads/sprint-1
Commit: 052b4362663fc189a07e602f7aaec3e0a9809f0e
Parents: c0571b8
Author: sevdokimov
Authored: Thu Feb 5 17:51:55 2015 +0300
Committer: sevdokimov
Committed: Thu Feb 5 17:51:55 2015 +0300
--
.../GridDistributedCacheAdapter.java| 33 +---
1 file changed, 21 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/052b4362/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 71e7157..937438c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -211,24 +211,33 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
final GridCacheContext ctx = cacheAdapter.context();
-if (ctx.affinity().affinityTopologyVersion() != topVer)
-return null; // Ignore this remove request because remove
request will be sent again.
+ctx.affinity().affinityReadyFuture(topVer).get();
-if (cacheAdapter instanceof GridNearCacheAdapter)
-cacheAdapter = ((GridNearCacheAdapter)cacheAdapter).dht();
+ctx.gate().enter();
-GridDhtCacheAdapter dht = (GridDhtCacheAdapter)cacheAdapter;
+try {
+if (ctx.affinity().affinityTopologyVersion() != topVer)
+return null; // Ignore this remove request because remove
request will be sent again.
-IgniteDataLoader dataLdr = ignite.dataLoader(cacheName);
+GridDhtCacheAdapter dht;
-for (GridDhtLocalPartition locPart :
dht.topology().currentLocalPartitions()) {
-if (!locPart.isEmpty() && locPart.primary(topVer)) {
-for (GridDhtCacheEntry o : locPart.entries())
-dataLdr.removeData(o.key());
+if (cacheAdapter instanceof GridNearCacheAdapter)
+dht = ((GridNearCacheAdapter)cacheAdapter).dht();
+else
+dht = (GridDhtCacheAdapter)cacheAdapter;
+
+try (IgniteDataLoader dataLdr =
ignite.dataLoader(cacheName)) {
+for (GridDhtLocalPartition locPart :
dht.topology().currentLocalPartitions()) {
+if (!locPart.isEmpty() && locPart.primary(topVer)) {
+for (GridDhtCacheEntry o : locPart.entries())
+dataLdr.removeData(o.key());
+}
+}
}
}
-
-dataLdr.close();
+finally {
+ctx.gate().leave();
+}
return null;
}
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-160 [deleted] 965dc67db
[2/6] incubator-ignite git commit: # IGNITE-54-55 Use DataLoader to remove keys.
# IGNITE-54-55 Use DataLoader to remove keys.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e5b41cc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e5b41cc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e5b41cc8
Branch: refs/heads/sprint-1
Commit: e5b41cc82b0b058ef2254a2471d814b16e4196ec
Parents: 572c372
Author: sevdokimov
Authored: Thu Feb 5 17:04:17 2015 +0300
Committer: sevdokimov
Committed: Thu Feb 5 17:04:17 2015 +0300
--
.../distributed/GridDistributedCacheAdapter.java | 19 ---
1 file changed, 4 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e5b41cc8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 277d8cc..785d455 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -175,9 +175,6 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
@GridInternal
private static class GlobalRemoveAllCallable implements
Callable, Externalizable {
/** */
-private static final long REMOVE_ALL_BATCH_SIZE = 100L;
-
-/** */
private static final long serialVersionUID = 0L;
/** Cache name. */
@@ -226,24 +223,16 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
GridDhtCacheAdapter dht = (GridDhtCacheAdapter)cacheAdapter;
-Collection keys = new ArrayList<>();
+IgniteDataLoader dataLdr = grid.dataLoader(cacheName);
for (GridDhtLocalPartition locPart :
dht.topology().currentLocalPartitions()) {
if (!locPart.isEmpty() && locPart.primary(topVer)) {
-for (GridDhtCacheEntry o : locPart.entries()) {
-keys.add(o.key());
-
-if (keys.size() >= REMOVE_ALL_BATCH_SIZE) {
-cache.removeAll(keys);
-
-keys.clear();
-}
-}
+for (GridDhtCacheEntry o : locPart.entries())
+dataLdr.removeData(o.key());
}
}
-if (!keys.isEmpty())
-cache.removeAll(keys);
+dataLdr.close();
return null;
}
[02/24] incubator-ignite git commit: # IGNITE-54-55 Use DataLoader to remove keys.
# IGNITE-54-55 Use DataLoader to remove keys.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e5b41cc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e5b41cc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e5b41cc8
Branch: refs/heads/ignite-56
Commit: e5b41cc82b0b058ef2254a2471d814b16e4196ec
Parents: 572c372
Author: sevdokimov
Authored: Thu Feb 5 17:04:17 2015 +0300
Committer: sevdokimov
Committed: Thu Feb 5 17:04:17 2015 +0300
--
.../distributed/GridDistributedCacheAdapter.java | 19 ---
1 file changed, 4 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e5b41cc8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 277d8cc..785d455 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -175,9 +175,6 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
@GridInternal
private static class GlobalRemoveAllCallable implements
Callable, Externalizable {
/** */
-private static final long REMOVE_ALL_BATCH_SIZE = 100L;
-
-/** */
private static final long serialVersionUID = 0L;
/** Cache name. */
@@ -226,24 +223,16 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
GridDhtCacheAdapter dht = (GridDhtCacheAdapter)cacheAdapter;
-Collection keys = new ArrayList<>();
+IgniteDataLoader dataLdr = grid.dataLoader(cacheName);
for (GridDhtLocalPartition locPart :
dht.topology().currentLocalPartitions()) {
if (!locPart.isEmpty() && locPart.primary(topVer)) {
-for (GridDhtCacheEntry o : locPart.entries()) {
-keys.add(o.key());
-
-if (keys.size() >= REMOVE_ALL_BATCH_SIZE) {
-cache.removeAll(keys);
-
-keys.clear();
-}
-}
+for (GridDhtCacheEntry o : locPart.entries())
+dataLdr.removeData(o.key());
}
}
-if (!keys.isEmpty())
-cache.removeAll(keys);
+dataLdr.close();
return null;
}
[04/24] incubator-ignite git commit: # IGNITE-54-55 Bug fixes.
# IGNITE-54-55 Bug fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/052b4362
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/052b4362
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/052b4362
Branch: refs/heads/ignite-56
Commit: 052b4362663fc189a07e602f7aaec3e0a9809f0e
Parents: c0571b8
Author: sevdokimov
Authored: Thu Feb 5 17:51:55 2015 +0300
Committer: sevdokimov
Committed: Thu Feb 5 17:51:55 2015 +0300
--
.../GridDistributedCacheAdapter.java| 33 +---
1 file changed, 21 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/052b4362/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 71e7157..937438c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -211,24 +211,33 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
final GridCacheContext ctx = cacheAdapter.context();
-if (ctx.affinity().affinityTopologyVersion() != topVer)
-return null; // Ignore this remove request because remove
request will be sent again.
+ctx.affinity().affinityReadyFuture(topVer).get();
-if (cacheAdapter instanceof GridNearCacheAdapter)
-cacheAdapter = ((GridNearCacheAdapter)cacheAdapter).dht();
+ctx.gate().enter();
-GridDhtCacheAdapter dht = (GridDhtCacheAdapter)cacheAdapter;
+try {
+if (ctx.affinity().affinityTopologyVersion() != topVer)
+return null; // Ignore this remove request because remove
request will be sent again.
-IgniteDataLoader dataLdr = ignite.dataLoader(cacheName);
+GridDhtCacheAdapter dht;
-for (GridDhtLocalPartition locPart :
dht.topology().currentLocalPartitions()) {
-if (!locPart.isEmpty() && locPart.primary(topVer)) {
-for (GridDhtCacheEntry o : locPart.entries())
-dataLdr.removeData(o.key());
+if (cacheAdapter instanceof GridNearCacheAdapter)
+dht = ((GridNearCacheAdapter)cacheAdapter).dht();
+else
+dht = (GridDhtCacheAdapter)cacheAdapter;
+
+try (IgniteDataLoader dataLdr =
ignite.dataLoader(cacheName)) {
+for (GridDhtLocalPartition locPart :
dht.topology().currentLocalPartitions()) {
+if (!locPart.isEmpty() && locPart.primary(topVer)) {
+for (GridDhtCacheEntry o : locPart.entries())
+dataLdr.removeData(o.key());
+}
+}
}
}
-
-dataLdr.close();
+finally {
+ctx.gate().leave();
+}
return null;
}
[12/24] incubator-ignite git commit: # sprint-1 api cleanup
# sprint-1 api cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c211c237
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c211c237
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c211c237
Branch: refs/heads/ignite-56
Commit: c211c237b2a33a510e3103576e52f76fbfd2900f
Parents: f55d198
Author: sboikov
Authored: Fri Feb 6 09:42:35 2015 +0300
Committer: sboikov
Committed: Fri Feb 6 09:42:35 2015 +0300
--
.../MessagingPingPongListenActorExample.java| 4 ++--
.../java/org/apache/ignite/IgniteCache.java | 22
.../processors/cache/IgniteCacheProxy.java | 6 --
.../ignite/messaging/MessagingListenActor.java | 18
.../internal/GridListenActorSelfTest.java | 11 --
5 files changed, 15 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c211c237/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
index 6a77efe..b498609 100644
---
a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
@@ -64,7 +64,7 @@ public class MessagingPingPongListenActorExample {
// Set up remote player.
ignite.message(nodeB).remoteListen(null, new
MessagingListenActor() {
-@Override public void receive(UUID nodeId, String rcvMsg)
throws IgniteCheckedException {
+@Override public void receive(UUID nodeId, String rcvMsg) {
System.out.println(rcvMsg);
if ("PING".equals(rcvMsg))
@@ -80,7 +80,7 @@ public class MessagingPingPongListenActorExample {
// Set up local player.
ignite.message().localListen(null, new
MessagingListenActor() {
-@Override protected void receive(UUID nodeId, String rcvMsg)
throws IgniteCheckedException {
+@Override protected void receive(UUID nodeId, String rcvMsg)
throws IgniteException {
System.out.println(rcvMsg);
if (cnt.getCount() == 1)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c211c237/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index bea85dc..73cb87a 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -258,28 +258,6 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
public void localPromote(Set keys) throws CacheException;
/**
- * Clears an entry from this cache and swap storage only if the entry
- * is not currently locked, and is not participating in a transaction.
- *
- * If {@link CacheConfiguration#isSwapEnabled()} is set to {@code true} and
- * {@link org.apache.ignite.internal.processors.cache.CacheFlag#SKIP_SWAP}
is not enabled, the evicted entries will
- * also be cleared from swap.
- *
- * Note that this operation is local as it merely clears
- * an entry from local cache. It does not remove entries from
- * remote caches or from underlying persistent storage.
- * Cache Flags
- * This method is not available if any of the following flags are set on
projection:
- * {@link org.apache.ignite.internal.processors.cache.CacheFlag#READ}.
- *
- * @param keys Keys to clear.
- * @return {@code True} if entry was successfully cleared from cache,
{@code false}
- * if entry was in use at the time of this method invocation and
could not be
- * cleared.
- */
-public boolean clear(Collection keys);
-
-/**
* Gets the number of all entries cached across all nodes.
*
* NOTE: this operation is distributed and will query all participating
nodes for their cache sizes.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c211c237/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/intern
[22/24] incubator-ignite git commit: IGNITE-54-55 Bug fix: don't forget to check obsoleteOrDeleted() when iterate over entries.
IGNITE-54-55 Bug fix: don't forget to check obsoleteOrDeleted() when iterate
over entries.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/05697b4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/05697b4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/05697b4a
Branch: refs/heads/ignite-56
Commit: 05697b4a0d5e348f61a96302c05e9fecb72c832d
Parents: 052b436
Author: sevdokimov
Authored: Fri Feb 6 11:36:21 2015 +0300
Committer: sevdokimov
Committed: Fri Feb 6 11:36:21 2015 +0300
--
.../cache/distributed/GridDistributedCacheAdapter.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05697b4a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 937438c..5365ec3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -229,8 +229,10 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
try (IgniteDataLoader dataLdr =
ignite.dataLoader(cacheName)) {
for (GridDhtLocalPartition locPart :
dht.topology().currentLocalPartitions()) {
if (!locPart.isEmpty() && locPart.primary(topVer)) {
-for (GridDhtCacheEntry o : locPart.entries())
-dataLdr.removeData(o.key());
+for (GridDhtCacheEntry o :
locPart.entries()) {
+if (!o.obsoleteOrDeleted())
+dataLdr.removeData(o.key());
+}
}
}
}
[18/24] incubator-ignite git commit: sprint-1 minor
sprint-1 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b145686
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b145686
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b145686
Branch: refs/heads/ignite-56
Commit: 1b1456867586c0a0798a7e07049716c0b4ea9fab
Parents: ce0c304
Author: Yakov Zhdanov
Authored: Fri Feb 6 11:20:03 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Feb 6 11:20:03 2015 +0300
--
.../main/java/org/apache/ignite/cache/eviction/EvictableEntry.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b145686/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
index 5c940b3..2379179 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
@@ -27,7 +27,7 @@ import javax.cache.*;
* @author @java.author
* @version @java.version
*/
-public interface EvictableEntry extends Cache.Entry {
+public interface EvictableEntry extends Cache.Entry {
/**
* Attaches metadata to the entry.
*
[17/24] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Merge remote-tracking branch 'origin/sprint-1' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/53760d14 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/53760d14 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/53760d14 Branch: refs/heads/ignite-56 Commit: 53760d1469aaf320955d5aa7851df8090126bb94 Parents: effc5e0 522a0a2 Author: AKuznetsov Authored: Fri Feb 6 15:07:45 2015 +0700 Committer: AKuznetsov Committed: Fri Feb 6 15:07:45 2015 +0700 -- .../MessagingPingPongListenActorExample.java| 4 ++-- .../java/org/apache/ignite/IgniteCache.java | 22 .../java/org/apache/ignite/IgniteQueue.java | 4 ++-- .../main/java/org/apache/ignite/IgniteSet.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 6 -- .../IgniteOptimizedObjectInputStream.java | 2 ++ .../ignite/messaging/MessagingListenActor.java | 18 .../internal/GridListenActorSelfTest.java | 11 -- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 7 ++- 9 files changed, 26 insertions(+), 50 deletions(-) --
[15/24] incubator-ignite git commit: # sprint-1 cleanup class loader reference
# sprint-1 cleanup class loader reference
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/522a0a29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/522a0a29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/522a0a29
Branch: refs/heads/ignite-56
Commit: 522a0a2981546f84007cec900c94a539e6cb0289
Parents: 3294c60
Author: sboikov
Authored: Fri Feb 6 11:00:41 2015 +0300
Committer: sboikov
Committed: Fri Feb 6 11:00:41 2015 +0300
--
.../marshaller/optimized/IgniteOptimizedObjectInputStream.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/522a0a29/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
index 690bdd6..d596af3 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
@@ -110,6 +110,8 @@ class IgniteOptimizedObjectInputStream extends
ObjectInputStream {
/** {@inheritDoc} */
@Override public void close() throws IOException {
reset();
+
+clsLdr = null;
}
/** {@inheritDoc} */
[05/24] incubator-ignite git commit: # sprint-1 ignore incr/decr commands for security check
# sprint-1 ignore incr/decr commands for security check
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce0c3047
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce0c3047
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce0c3047
Branch: refs/heads/ignite-56
Commit: ce0c3047557768221ea0623878e9f62513e561d0
Parents: bb8b07d
Author: sboikov
Authored: Thu Feb 5 20:45:28 2015 +0300
Committer: sboikov
Committed: Thu Feb 5 20:45:28 2015 +0300
--
.../apache/ignite/internal/processors/rest/GridRestProcessor.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce0c3047/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index f1f92d0..44b07c0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -597,6 +597,8 @@ public class GridRestProcessor extends GridProcessorAdapter
{
case QUIT:
case GET_PORTABLE_METADATA:
case PUT_PORTABLE_METADATA:
+case ATOMIC_INCREMENT:
+case ATOMIC_DECREMENT:
break;
default:
[16/24] incubator-ignite git commit: # sprint-1 Fixed db usage in schema load tests.
# sprint-1 Fixed db usage in schema load tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/effc5e03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/effc5e03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/effc5e03
Branch: refs/heads/ignite-56
Commit: effc5e03e94037b680ce796dc7b43398672f6fd3
Parents: f55d198
Author: AKuznetsov
Authored: Fri Feb 6 15:06:32 2015 +0700
Committer: AKuznetsov
Committed: Fri Feb 6 15:06:32 2015 +0700
--
.../org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/effc5e03/modules/schema-load/src/test/java/org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java
--
diff --git
a/modules/schema-load/src/test/java/org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java
b/modules/schema-load/src/test/java/org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java
index 1822b0e..f8a3719 100644
---
a/modules/schema-load/src/test/java/org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java
+++
b/modules/schema-load/src/test/java/org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java
@@ -57,7 +57,7 @@ public abstract class AbstractSchemaLoaderTest extends
TestCase {
Statement stmt = conn.createStatement();
-stmt.executeUpdate("CREATE TABLE PRIMITIVES (pk INTEGER PRIMARY KEY, "
+
+stmt.executeUpdate("CREATE TABLE IF NOT EXISTS PRIMITIVES (pk INTEGER
PRIMARY KEY, " +
" boolCol BOOLEAN NOT NULL," +
" byteCol TINYINT NOT NULL," +
" shortCol SMALLINT NOT NULL," +
@@ -73,7 +73,7 @@ public abstract class AbstractSchemaLoaderTest extends
TestCase {
" tsCol TIMESTAMP, " +
" arrCol BINARY(10))");
-stmt.executeUpdate("CREATE TABLE OBJECTS (pk INTEGER PRIMARY KEY, " +
+stmt.executeUpdate("CREATE TABLE IF NOT EXISTS OBJECTS (pk INTEGER
PRIMARY KEY, " +
" boolCol BOOLEAN," +
" byteCol TINYINT," +
" shortCol SMALLINT," +
[10/24] incubator-ignite git commit: # IGNITE-32: Renaming JDBC store class.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f55d1983/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java
deleted file mode 100644
index a4392f1..000
---
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java
+++ /dev/null
@@ -1,1560 +0,0 @@
-/*
- * 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.cache.store.jdbc;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.cache.store.jdbc.dialect.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.integration.*;
-import javax.sql.*;
-import java.sql.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-import static java.sql.Statement.*;
-
-/**
- * Base {@link CacheStore} implementation backed by JDBC. This implementation
stores objects in underlying database
- * using mapping description.
- *
- * Configuration
- * Sections below describe mandatory and optional configuration settings as
well
- * as providing example using Java and Spring XML.
- * Mandatory
- * There are no mandatory configuration parameters.
- * Optional
- *
- * Data source (see {@link #setDataSource(DataSource)}
- * Maximum batch size for writeAll and deleteAll operations. (see
{@link #setBatchSize(int)})
- * Max workers thread count. These threads are responsible for load
cache. (see {@link #setMaxPoolSize(int)})
- * Parallel load cache minimum threshold. (see {@link
#setParallelLoadCacheMinimumThreshold(int)})
- *
- * Java Example
- *
- * ...
- * JdbcPojoCacheStore store = new JdbcPojoCacheStore();
- * ...
- *
- *
- * Spring Example
- *
- * ...
- *
- *
- * ...
- *
- *
- * For information about Spring framework visit http://www.springframework.org/";>www.springframework.org
- */
-public abstract class JdbcCacheStore extends CacheStore implements
LifecycleAware {
-/** Max attempt write count. */
-protected static final int MAX_ATTEMPT_WRITE_COUNT = 2;
-
-/** Default batch size for put and remove operations. */
-protected static final int DFLT_BATCH_SIZE = 512;
-
-/** Default batch size for put and remove operations. */
-protected static final int DFLT_PARALLEL_LOAD_CACHE_MINIMUM_THRESHOLD =
512;
-
-/** Connection attribute property name. */
-protected static final String ATTR_CONN_PROP = "JDBC_STORE_CONNECTION";
-
-/** Empty column value. */
-protected static final Object[] EMPTY_COLUMN_VALUE = new Object[] { null };
-
-/** Auto-injected logger instance. */
-@IgniteLoggerResource
-protected IgniteLogger log;
-
-/** Lock for metadata cache. */
-@GridToStringExclude
-private final Lock cacheMappingsLock = new ReentrantLock();
-
-/** Data source. */
-protected DataSource dataSrc;
-
-/** Cache with entry mapping description. (cache name, (key id, mapping
description)). */
-protected volatile Map> cacheMappings =
Collections.emptyMap();
-
-/** Database dialect. */
-protected JdbcDialect dialect;
-
-/** Max workers thread count. These threads are responsible for load
cache. */
-private int maxPoolSz = Runtime.getRuntime().availableProcessors();
-
-/** Maximum batch size for writeAll and deleteAll operations. */
-private int batchSz = DFLT_BATCH_SIZE;
-
-/** Parallel load cache minimum thresh
[01/24] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-54-55
Repository: incubator-ignite Updated Branches: refs/heads/ignite-56 d2382f46c -> 186c621b1 Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-54-55 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/572c3721 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/572c3721 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/572c3721 Branch: refs/heads/ignite-56 Commit: 572c372144f7a95281098f7bd54eebcaac88e9ad Parents: ec1a01f 46160c9 Author: sevdokimov Authored: Thu Feb 5 16:51:30 2015 +0300 Committer: sevdokimov Committed: Thu Feb 5 16:51:30 2015 +0300 -- config/hadoop/default-config.xml|2 +- .../datastructures/CacheAtomicLongExample.java | 78 - .../CacheAtomicReferenceExample.java| 126 -- .../CacheAtomicSequenceExample.java | 112 -- .../CacheAtomicStampedExample.java | 132 -- .../CacheCountDownLatchExample.java | 112 -- .../datastructures/CacheQueueExample.java | 214 --- .../datastructures/CacheSetExample.java | 193 -- .../datastructures/IgniteAtomicLongExample.java | 74 + .../IgniteAtomicReferenceExample.java | 110 ++ .../IgniteAtomicSequenceExample.java| 96 + .../IgniteAtomicStampedExample.java | 117 ++ .../IgniteCountDownLatchExample.java| 96 + .../datastructures/IgniteQueueExample.java | 206 +++ .../datastructures/IgniteSetExample.java| 186 ++ .../client/memcache/MemcacheRestExample.java|3 +- .../ignite/examples/CacheExamplesSelfTest.java | 14 +- .../ClientTcpUnreachableMultiNodeSelfTest.java | 12 - .../rest/ClientMemcachedProtocolSelfTest.java |8 +- .../JettyRestProcessorAbstractSelfTest.java | 21 +- .../rest/RestMemcacheProtocolSelfTest.java | 60 +- .../processors/rest/TestMemcacheClient.java | 11 +- .../src/main/java/org/apache/ignite/Ignite.java | 101 ++ .../org/apache/ignite/IgniteAtomicLong.java | 163 ++ .../apache/ignite/IgniteAtomicReference.java| 99 ++ .../org/apache/ignite/IgniteAtomicSequence.java | 136 ++ .../org/apache/ignite/IgniteAtomicStamped.java | 128 ++ .../java/org/apache/ignite/IgniteCache.java | 16 +- .../org/apache/ignite/IgniteCountDownLatch.java | 232 +++ .../java/org/apache/ignite/IgniteQueue.java | 185 ++ .../main/java/org/apache/ignite/IgniteSet.java | 107 ++ .../apache/ignite/cache/CacheConfiguration.java | 95 - .../org/apache/ignite/cache/CacheEntry.java |1 + .../apache/ignite/cache/CacheEntryEvent.java| 75 - .../org/apache/ignite/cache/CachePeekMode.java | 12 +- .../apache/ignite/cache/CacheProjection.java|7 + .../java/org/apache/ignite/cache/GridCache.java | 14 - .../apache/ignite/cache/GridCachePeekMode.java | 85 - .../cache/datastructures/CacheAtomicLong.java | 157 -- .../datastructures/CacheAtomicReference.java| 93 - .../datastructures/CacheAtomicSequence.java | 130 -- .../datastructures/CacheAtomicStamped.java | 121 -- .../datastructures/CacheCountDownLatch.java | 226 --- .../CacheDataStructureInvalidException.java | 66 - ...cheDataStructureInvalidRuntimeException.java | 66 - .../CacheDataStructureRemovedException.java | 61 - ...cheDataStructureRemovedRuntimeException.java | 61 - .../datastructures/CacheDataStructures.java | 220 --- .../ignite/cache/datastructures/CacheQueue.java | 182 -- .../ignite/cache/datastructures/CacheSet.java | 61 - .../ignite/cache/datastructures/package.html| 24 - .../eviction/fifo/CacheFifoEvictionPolicy.java |1 + .../random/CacheRandomEvictionPolicy.java |1 + .../cache/query/CacheContinuousQuery.java | 61 +- .../cache/query/CacheQueryGroupIndex.java |9 - .../ignite/cache/query/CacheQuerySqlField.java | 10 - .../query/annotations/QueryGroupIndex.java |9 - .../cache/query/annotations/QuerySqlField.java | 10 - .../ignite/cache/store/CacheLocalStore.java | 31 - .../cache/store/CacheStoreBalancingWrapper.java | 296 .../cache/store/jdbc/dialect/package.html |2 +- .../apache/ignite/client/GridClientNode.java| 24 - .../ignite/client/GridClientProtocol.java |4 - .../ignite/client/impl/GridClientNodeImpl.java | 15 - .../IgniteAtomicConfiguration.java | 105 ++ .../IgniteCollectionConfiguration.java | 67 + .../configuration/IgniteConfiguration.java | 18 + .../DataStructureRemovedException.java | 61 + .../apache/ignite/events/IgniteEventType.java | 120 -- .../apache/ignite/internal/GridComponent.java | 19 + .../ignite/internal/GridJobExecuteRequest.java | 95 +- .../ignite/internal/GridKernalContext.java |8 + .../
[14/24] incubator-ignite git commit: # ignite-32 Minor fix in benchmark for store.
# ignite-32 Minor fix in benchmark for store.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3294c60f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3294c60f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3294c60f
Branch: refs/heads/ignite-56
Commit: 3294c60f8dcc136245675a3ecfbbb845af3d5245
Parents: edf2061
Author: anovikov
Authored: Fri Feb 6 14:05:34 2015 +0700
Committer: anovikov
Committed: Fri Feb 6 14:05:34 2015 +0700
--
.../cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java| 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3294c60f/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
index 261302b..a521afb 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
@@ -69,7 +69,12 @@ public abstract class IgniteJdbcStoreAbstractBenchmark
extends IgniteAbstractBen
// No-op.
}
-stmt.executeUpdate("CREATE TABLE IF NOT EXISTS SAMPLE (id integer
not null, value integer, PRIMARY KEY(id))");
+try {
+stmt.executeUpdate("CREATE TABLE SAMPLE (id integer not null,
value integer, PRIMARY KEY(id))");
+}
+catch (SQLException ignore) {
+// No-op.
+}
conn.commit();
[07/24] incubator-ignite git commit: # IGNITE-173 Fixed visorcmd test.
# IGNITE-173 Fixed visorcmd test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26e252f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26e252f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26e252f6
Branch: refs/heads/ignite-56
Commit: 26e252f6adc489c3f13c3c87cc609f898a297a99
Parents: 1cac518
Author: anovikov
Authored: Fri Feb 6 09:28:47 2015 +0700
Committer: anovikov
Committed: Fri Feb 6 09:28:47 2015 +0700
--
.../apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26e252f6/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
--
diff --git
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
index 173e884..786d04e 100644
---
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
+++
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
@@ -17,7 +17,7 @@
package org.apache.ignite.visor.commands.open
-import org.apache.ignite.IgniteCheckedException
+import org.apache.ignite.IgniteException
import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor}
/**
@@ -31,7 +31,7 @@ class VisorOpenCommandSpec extends VisorRuntimeBaseSpec(3) {
}
it should "print error message when already connected" in {
-intercept[IgniteCheckedException] {
+intercept[IgniteException] {
openVisor()
}
}
[21/24] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Merge remote-tracking branch 'origin/sprint-1' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/22921fc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/22921fc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/22921fc1 Branch: refs/heads/ignite-56 Commit: 22921fc1650c1e1ac5fb2916e5bbadb291d83af1 Parents: 68dad5b c789b6b Author: anovikov Authored: Fri Feb 6 15:33:51 2015 +0700 Committer: anovikov Committed: Fri Feb 6 15:33:51 2015 +0700 -- .../java/org/apache/ignite/cache/eviction/EvictableEntry.java| 2 +- .../marshaller/optimized/IgniteOptimizedObjectInputStream.java | 2 ++ .../org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) --
[20/24] incubator-ignite git commit: # ignite-32 Add store tests to suite.
# ignite-32 Add store tests to suite.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/68dad5b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/68dad5b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/68dad5b7
Branch: refs/heads/ignite-56
Commit: 68dad5b772c28b3c216f3ddb14716741e4b3636d
Parents: 3294c60
Author: anovikov
Authored: Fri Feb 6 15:32:50 2015 +0700
Committer: anovikov
Committed: Fri Feb 6 15:32:50 2015 +0700
--
.../store/jdbc/CacheAbstractJdbcStore.java | 11 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 50 +++
.../store/jdbc/CacheJdbcPojoStoreTest.java | 73 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 98 +++--
.../store/jdbc/model/PersonComplexKey.java | 146 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
6 files changed, 360 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68dad5b7/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
index 8e550f2..3d60a74 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
@@ -1448,9 +1448,16 @@ public abstract class CacheAbstractJdbcStore
extends CacheStore impl
ResultSet rs = stmt.executeQuery();
+ResultSetMetaData meta = rs.getMetaData();
+
+Map colIdxs =
U.newHashMap(meta.getColumnCount());
+
+for (int i = 1; i <= meta.getColumnCount(); i++)
+colIdxs.put(meta.getColumnLabel(i), i);
+
while (rs.next()) {
-K1 key = buildObject(em.keyType(), em.keyColumns(),
em.loadColIdxs, rs);
-V1 val = buildObject(em.valueType(), em.valueColumns(),
em.loadColIdxs, rs);
+K1 key = buildObject(em.keyType(), em.keyColumns(),
colIdxs, rs);
+V1 val = buildObject(em.valueType(), em.valueColumns(),
colIdxs, rs);
clo.apply(key, val);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68dad5b7/modules/core/src/test/config/store/jdbc/Ignite.xml
--
diff --git a/modules/core/src/test/config/store/jdbc/Ignite.xml
b/modules/core/src/test/config/store/jdbc/Ignite.xml
index a1fc231..bb4502a 100644
--- a/modules/core/src/test/config/store/jdbc/Ignite.xml
+++ b/modules/core/src/test/config/store/jdbc/Ignite.xml
@@ -98,4 +98,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68dad5b7/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
index 20805d1..0edc6f6 100644
---
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
@@ -90,16 +90,15 @@ public class CacheJdbcPojoStoreTest extends
GridCommonAbstractTest {
//PGPoolingDataSource ds = new PGPoolingDataSource();
//ds.setUser("postgres");
-//ds.setPassword("1");
-//ds.setServerName("192.168.1.47"
[13/24] incubator-ignite git commit: # sprint-1 minor
# sprint-1 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/edf20614
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/edf20614
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/edf20614
Branch: refs/heads/ignite-56
Commit: edf206146472d189971699484f1463bbdd36fd41
Parents: c211c23
Author: sboikov
Authored: Fri Feb 6 09:47:38 2015 +0300
Committer: sboikov
Committed: Fri Feb 6 09:47:38 2015 +0300
--
modules/core/src/main/java/org/apache/ignite/IgniteQueue.java | 4 ++--
modules/core/src/main/java/org/apache/ignite/IgniteSet.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edf20614/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
b/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
index ea7a2e9..26fedf7 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
@@ -67,9 +67,9 @@ import java.util.concurrent.*;
* Instances of distributed cache queues can be created by calling the
following method
* on {@link Ignite} API:
*
- * {@link Ignite#queue(String, IgniteCollectionConfiguration, int,
boolean)}
+ * {@link Ignite#queue(String, int,
IgniteCollectionConfiguration)}
*
- * @see Ignite#queue(String, IgniteCollectionConfiguration, int, boolean)
+ * @see Ignite#queue(String, int, IgniteCollectionConfiguration)
*/
public interface IgniteQueue extends BlockingQueue, Closeable {
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edf20614/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
b/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
index 096bae8..1228958 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSet.java
@@ -34,7 +34,7 @@ import java.util.*;
* (governed by {@code collocated} parameter). {@code Non-collocated} mode is
provided only
* for partitioned caches. If {@code collocated} parameter is {@code true},
then all set items
* will be collocated on one node, otherwise items will be distributed through
all grid nodes.
- * @see Ignite#set(String, IgniteCollectionConfiguration, boolean)
+ * @see Ignite#set(String, IgniteCollectionConfiguration)
*/
public interface IgniteSet extends Set, Closeable {
/** {@inheritDoc} */
[03/24] incubator-ignite git commit: # IGNITE-54-55 Remove unused variable.
# IGNITE-54-55 Remove unused variable.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c0571b89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c0571b89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c0571b89
Branch: refs/heads/ignite-56
Commit: c0571b899651f53edb54866d6f0944e0fedcaecc
Parents: e5b41cc
Author: sevdokimov
Authored: Thu Feb 5 17:06:33 2015 +0300
Committer: sevdokimov
Committed: Thu Feb 5 17:06:33 2015 +0300
--
.../cache/distributed/GridDistributedCacheAdapter.java | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0571b89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 785d455..71e7157 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -207,11 +207,7 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
* {@inheritDoc}
*/
@Override public Object call() throws Exception {
-final IgniteKernal grid = (IgniteKernal)ignite;
-
-final GridCache cache = grid.cachex(cacheName);
-
-GridCacheAdapter cacheAdapter =
grid.context().cache().internalCache(cacheName);
+GridCacheAdapter cacheAdapter =
((IgniteKernal)ignite).context().cache().internalCache(cacheName);
final GridCacheContext ctx = cacheAdapter.context();
@@ -223,7 +219,7 @@ public abstract class GridDistributedCacheAdapter
extends GridCacheAdapter
GridDhtCacheAdapter dht = (GridDhtCacheAdapter)cacheAdapter;
-IgniteDataLoader dataLdr = grid.dataLoader(cacheName);
+IgniteDataLoader dataLdr = ignite.dataLoader(cacheName);
for (GridDhtLocalPartition locPart :
dht.topology().currentLocalPartitions()) {
if (!locPart.isEmpty() && locPart.primary(topVer)) {
[23/24] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-54-55' into sprint-1
Merge remote-tracking branch 'remotes/origin/ignite-54-55' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1244764b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1244764b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1244764b Branch: refs/heads/ignite-56 Commit: 1244764bc2fb5bcd1fabf6f0e779547d2c7d4888 Parents: 22921fc 05697b4 Author: sevdokimov Authored: Fri Feb 6 11:37:31 2015 +0300 Committer: sevdokimov Committed: Fri Feb 6 11:37:31 2015 +0300 -- .../GridDistributedCacheAdapter.java| 46 +--- 1 file changed, 21 insertions(+), 25 deletions(-) --
[06/24] incubator-ignite git commit: # IGNITE-173 Fixed visorcmd test.
# IGNITE-173 Fixed visorcmd test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1cac5184
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1cac5184
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1cac5184
Branch: refs/heads/ignite-56
Commit: 1cac51840582b16fc6fc2a6f86cf946fd26a4f76
Parents: ce0c304
Author: anovikov
Authored: Fri Feb 6 09:22:22 2015 +0700
Committer: anovikov
Committed: Fri Feb 6 09:22:22 2015 +0700
--
.../apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cac5184/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
--
diff --git
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
index ada6341..173e884 100644
---
a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
+++
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
@@ -31,10 +31,8 @@ class VisorOpenCommandSpec extends VisorRuntimeBaseSpec(3) {
}
it should "print error message when already connected" in {
-try
+intercept[IgniteCheckedException] {
openVisor()
-catch {
-case ignored: IgniteCheckedException =>
}
}
}
[19/24] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Merge remote-tracking branch 'origin/sprint-1' into sprint-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c789b6b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c789b6b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c789b6b6 Branch: refs/heads/ignite-56 Commit: c789b6b6e3833d8d2a0e97edf2149470ea77d517 Parents: 1b14568 53760d1 Author: Yakov Zhdanov Authored: Fri Feb 6 11:20:46 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Feb 6 11:20:46 2015 +0300 -- .../MessagingPingPongListenActorExample.java|4 +- .../java/org/apache/ignite/IgniteCache.java | 22 - .../java/org/apache/ignite/IgniteQueue.java |4 +- .../main/java/org/apache/ignite/IgniteSet.java |2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 1560 ++ .../cache/store/jdbc/CacheJdbcPojoStore.java| 205 +++ .../ignite/cache/store/jdbc/JdbcCacheStore.java | 1560 -- .../cache/store/jdbc/JdbcPojoCacheStore.java| 205 --- .../processors/cache/IgniteCacheProxy.java |6 - .../IgniteOptimizedObjectInputStream.java |2 + .../ignite/messaging/MessagingListenActor.java | 18 +- ...ractJdbcCacheStoreMultithreadedSelfTest.java | 196 --- .../CacheJdbcPojoStoreMultitreadedSelfTest.java | 35 + .../store/jdbc/CacheJdbcPojoStoreTest.java | 702 ...eJdbcStoreAbstractMultithreadedSelfTest.java | 197 +++ .../PojoJdbcCacheStoreMultitreadedSelfTest.java | 34 - .../store/jdbc/PojoJdbcCacheStoreTest.java | 702 .../internal/GridListenActorSelfTest.java | 11 +- .../schema/load/AbstractSchemaLoaderTest.java |4 +- .../commands/open/VisorOpenCommandSpec.scala|6 +- .../yardstick/config/benchmark-store.properties | 35 +- .../yardstick/config/ignite-store-config.xml| 11 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 89 +- .../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 10 +- .../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 47 + .../store/jdbc/IgniteJdbcStorePutBenchmark.java |5 + .../jdbc/IgniteJdbcStorePutGetBenchmark.java|5 + .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 52 + .../jdbc/IgniteJdbcStorePutTxBenchmark.java | 47 + 29 files changed, 2990 insertions(+), 2786 deletions(-) --
[24/24] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-56
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-56 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/186c621b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/186c621b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/186c621b Branch: refs/heads/ignite-56 Commit: 186c621b1c3b25d41496863539cbd7a94750b369 Parents: d2382f4 1244764 Author: sevdokimov Authored: Fri Feb 6 12:48:17 2015 +0300 Committer: sevdokimov Committed: Fri Feb 6 12:48:17 2015 +0300 -- .../MessagingPingPongListenActorExample.java|4 +- .../java/org/apache/ignite/IgniteCache.java | 22 - .../java/org/apache/ignite/IgniteQueue.java |4 +- .../main/java/org/apache/ignite/IgniteSet.java |2 +- .../ignite/cache/eviction/EvictableEntry.java |2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 1567 ++ .../cache/store/jdbc/CacheJdbcPojoStore.java| 205 +++ .../ignite/cache/store/jdbc/JdbcCacheStore.java | 1560 - .../cache/store/jdbc/JdbcPojoCacheStore.java| 205 --- .../processors/cache/IgniteCacheProxy.java |6 - .../GridDistributedCacheAdapter.java| 46 +- .../processors/rest/GridRestProcessor.java |2 + .../IgniteOptimizedObjectInputStream.java |2 + .../ignite/messaging/MessagingListenActor.java | 18 +- .../core/src/test/config/store/jdbc/Ignite.xml | 50 + ...ractJdbcCacheStoreMultithreadedSelfTest.java | 196 --- .../CacheJdbcPojoStoreMultitreadedSelfTest.java | 35 + .../store/jdbc/CacheJdbcPojoStoreTest.java | 759 + ...eJdbcStoreAbstractMultithreadedSelfTest.java | 275 +++ .../PojoJdbcCacheStoreMultitreadedSelfTest.java | 34 - .../store/jdbc/PojoJdbcCacheStoreTest.java | 702 .../store/jdbc/model/PersonComplexKey.java | 146 ++ .../internal/GridListenActorSelfTest.java | 11 +- .../ignite/testsuites/IgniteCacheTestSuite.java |2 + .../schema/load/AbstractSchemaLoaderTest.java |4 +- .../commands/open/VisorOpenCommandSpec.scala|6 +- .../yardstick/config/benchmark-store.properties | 35 +- .../yardstick/config/ignite-store-config.xml| 11 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 89 +- .../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 10 +- .../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 47 + .../store/jdbc/IgniteJdbcStorePutBenchmark.java |5 + .../jdbc/IgniteJdbcStorePutGetBenchmark.java|5 + .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 52 + .../jdbc/IgniteJdbcStorePutTxBenchmark.java | 47 + 35 files changed, 3354 insertions(+), 2812 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/186c621b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java -- diff --cc modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java index 000,d1424c4..6f58679 mode 00,100644..100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java @@@ -1,0 -1,275 +1,275 @@@ + /* + * 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.cache.store.jdbc; + + import org.apache.ignite.*; + import org.apache.ignite.cache.*; + import org.apache.ignite.cache.store.jdbc.model.*; + import org.apache.ignite.configuration.*; + import org.apache.ignite.internal.*; + import org.apache.ignite.internal.util.typedef.*; + import org.apache.ignite.internal.util.typedef.internal.*; + import org.apache.ignite.spi.discovery.tcp.*; + import org.apache.ignite.spi.discovery.tcp.ipfinder.*; + import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; + import org.apache.ignite.testfr
[11/24] incubator-ignite git commit: # IGNITE-32: Renaming JDBC store class.
# IGNITE-32: Renaming JDBC store class.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f55d1983
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f55d1983
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f55d1983
Branch: refs/heads/ignite-56
Commit: f55d198335e7aadab46603c42865d393b0e4f347
Parents: fe7c2af
Author: AKuznetsov
Authored: Fri Feb 6 10:14:55 2015 +0700
Committer: AKuznetsov
Committed: Fri Feb 6 10:14:55 2015 +0700
--
.../store/jdbc/CacheAbstractJdbcStore.java | 1560 ++
.../cache/store/jdbc/CacheJdbcPojoStore.java| 205 +++
.../ignite/cache/store/jdbc/JdbcCacheStore.java | 1560 --
.../cache/store/jdbc/JdbcPojoCacheStore.java| 205 ---
...ractJdbcCacheStoreMultithreadedSelfTest.java | 196 ---
.../CacheJdbcPojoStoreMultitreadedSelfTest.java | 35 +
.../store/jdbc/CacheJdbcPojoStoreTest.java | 702
...eJdbcStoreAbstractMultithreadedSelfTest.java | 197 +++
.../PojoJdbcCacheStoreMultitreadedSelfTest.java | 34 -
.../store/jdbc/PojoJdbcCacheStoreTest.java | 702
.../yardstick/config/ignite-store-config.xml|4 +-
.../jdbc/IgniteJdbcStoreAbstractBenchmark.java |4 +-
12 files changed, 2703 insertions(+), 2701 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f55d1983/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
new file mode 100644
index 000..8e550f2
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
@@ -0,0 +1,1560 @@
+/*
+ * 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.cache.store.jdbc;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.store.*;
+import org.apache.ignite.cache.store.jdbc.dialect.*;
+import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.transactions.*;
+import org.jetbrains.annotations.*;
+
+import javax.cache.*;
+import javax.cache.integration.*;
+import javax.sql.*;
+import java.sql.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.locks.*;
+
+import static java.sql.Statement.*;
+
+/**
+ * Base {@link CacheStore} implementation backed by JDBC. This implementation
stores objects in underlying database
+ * using mapping description.
+ *
+ * Configuration
+ * Sections below describe mandatory and optional configuration settings as
well
+ * as providing example using Java and Spring XML.
+ * Mandatory
+ * There are no mandatory configuration parameters.
+ * Optional
+ *
+ * Data source (see {@link #setDataSource(DataSource)}
+ * Maximum batch size for writeAll and deleteAll operations. (see
{@link #setBatchSize(int)})
+ * Max workers thread count. These threads are responsible for load
cache. (see {@link #setMaxPoolSize(int)})
+ * Parallel load cache minimum threshold. (see {@link
#setParallelLoadCacheMinimumThreshold(int)})
+ *
+ * Java Example
+ *
+ * ...
+ * JdbcPojoCacheStore store = new JdbcPojoCacheStore();
+ * ...
+ *
+ *
+ * Spring Example
+ *
+ * ...
+ *
+ *
+ * ...
+ *
+ *
+ * For information about Spring framework visit http://www.springframework.org/";>www.springframework.org
+ *
[08/24] incubator-ignite git commit: # ignite-32 Add tx benchmark for store.
# ignite-32 Add tx benchmark for store.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fe7c2afc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fe7c2afc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fe7c2afc
Branch: refs/heads/ignite-56
Commit: fe7c2afc0872d19e54f6a0e08a764b5cc7f3de0c
Parents: 26e252f
Author: anovikov
Authored: Fri Feb 6 09:49:06 2015 +0700
Committer: anovikov
Committed: Fri Feb 6 09:49:06 2015 +0700
--
.../yardstick/config/benchmark-store.properties | 35
.../yardstick/config/ignite-store-config.xml| 7 +-
.../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 84 ++--
.../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 10 +--
.../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 47 +++
.../store/jdbc/IgniteJdbcStorePutBenchmark.java | 5 ++
.../jdbc/IgniteJdbcStorePutGetBenchmark.java| 5 ++
.../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 52
.../jdbc/IgniteJdbcStorePutTxBenchmark.java | 47 +++
9 files changed, 260 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe7c2afc/modules/yardstick/config/benchmark-store.properties
--
diff --git a/modules/yardstick/config/benchmark-store.properties
b/modules/yardstick/config/benchmark-store.properties
index fcf3eb7..4a88724 100644
--- a/modules/yardstick/config/benchmark-store.properties
+++ b/modules/yardstick/config/benchmark-store.properties
@@ -19,32 +19,36 @@
# Contains all benchmarks for:
# - ATOMIC cache
# - TRANSACTIONAL cache
-# - SQL queries
#
# JVM options.
JVM_OPTS=${JVM_OPTS}" -DGRIDGAIN_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long
GC pauses.
-# JVM_OPTS=${JVM_OPTS}" \
-# -XX:+UseParNewGC \
-# -XX:+UseConcMarkSweepGC \
-# -XX:+UseTLAB \
-# -XX:NewSize=128m \
-# -XX:MaxNewSize=128m \
-# -XX:MaxTenuringThreshold=0 \
-# -XX:SurvivorRatio=1024 \
-# -XX:+UseCMSInitiatingOccupancyOnly \
-# -XX:CMSInitiatingOccupancyFraction=60 \
-#"
+JVM_OPTS=${JVM_OPTS}" \
+ -Xloggc:./gc.log \
+ -XX:+PrintGCDetails \
+ -verbose:gc \
+ -XX:+UseParNewGC \
+ -XX:+UseConcMarkSweepGC \
+ -XX:+UseTLAB \
+ -XX:NewSize=128m \
+ -XX:MaxNewSize=128m \
+ -XX:MaxTenuringThreshold=0 \
+ -XX:SurvivorRatio=1024 \
+ -XX:+UseCMSInitiatingOccupancyOnly \
+ -XX:CMSInitiatingOccupancyFraction=60 \
+"
# List of default probes.
# Add DStatProbe or VmStatProbe if your OS supports it (e.g. if running on
Linux).
-BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
+BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe,DStatProbe
# Packages where the specified benchmark is searched by reflection mechanism.
BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
+RESTART_SERVERS=true
+
# Probe point writer class name.
# BENCHMARK_WRITER=
@@ -64,6 +68,9 @@ nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` +
`echo ${DRIVER_HOSTS}
# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up
set to 60 seconds (1 minute).
CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-store-config.xml -nn ${nodesNum} -b 1 -w
60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteJdbcStoreGetBenchmark -sn IgniteNode
-ds atomic-get,\
+-cfg ${SCRIPT_DIR}/../config/ignite-store-config.xml -nn ${nodesNum} -b 1 -w
60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteJdbcStoreGetTxBenchmark -sn
IgniteNode -ds tx-get,\
-cfg ${SCRIPT_DIR}/../config/ignite-store-config.xml -nn ${nodesNum} -b 1 -w
60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteJdbcStorePutBenchmark -sn IgniteNode
-ds atomic-put,\
--cfg ${SCRIPT_DIR}/../config/ignite-store-config.xml -nn ${nodesNum} -b 1 -w
60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteJdbcStorePutGetBenchmark -sn
IgniteNode -ds atomic-put-get\
+-cfg ${SCRIPT_DIR}/../config/ignite-store-config.xml -nn ${nodesNum} -b 1 -w
60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteJdbcStorePutTxBenchmark -sn
IgniteNode -ds tx-put,\
+-cfg ${SCRIPT_DIR}/../config/ignite-store-config.xml -nn ${nodesNum} -b 1 -w
60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteJdbcStorePutGetBenchmark -sn
IgniteNode -ds atomic-put-get,\
+-cfg ${SCRIPT_DIR}/../config/ignite-store-config.xml -nn ${nodesNum} -b 1 -w
60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteJdbcStorePutGetTxBenchmark -sn
IgniteNode -ds tx-put-get\
"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe7c2afc/modules/yardstick/config/ignite-store-config.xml
--
diff --git a/modules/yardstick/config/ignite-store-config.xml
b/modules/yardstick/config/ignite-store-config.xml
index ee6515a..6570
[09/24] incubator-ignite git commit: # IGNITE-32: Renaming JDBC store class.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f55d1983/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
new file mode 100644
index 000..20805d1
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
@@ -0,0 +1,702 @@
+/*
+ * 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.cache.store.jdbc;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.store.*;
+import org.apache.ignite.cache.store.jdbc.dialect.*;
+import org.apache.ignite.cache.store.jdbc.model.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.cache.*;
+import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.transactions.*;
+import org.h2.jdbcx.*;
+import org.jetbrains.annotations.*;
+import org.springframework.beans.*;
+import org.springframework.beans.factory.xml.*;
+import org.springframework.context.support.*;
+import org.springframework.core.io.*;
+
+import javax.cache.*;
+import javax.cache.integration.*;
+import java.io.*;
+import java.net.*;
+import java.sql.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+import static
org.apache.ignite.testframework.junits.cache.GridAbstractCacheStoreSelfTest.*;
+
+/**
+ * Class for {@code PojoCacheStore} tests.
+ */
+public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
+/** Default connection URL (value is
jdbc:h2:mem:jdbcCacheStore;DB_CLOSE_DELAY=-1). */
+protected static final String DFLT_CONN_URL =
"jdbc:h2:mem:autoCacheStore;DB_CLOSE_DELAY=-1";
+
+/** Default config with mapping. */
+protected static final String DFLT_MAPPING_CONFIG =
"modules/core/src/test/config/store/jdbc/Ignite.xml";
+
+/** Organization count. */
+protected static final int ORGANIZATION_CNT = 1000;
+
+/** Person count. */
+protected static final int PERSON_CNT = 10;
+
+/** */
+protected TestThreadLocalCacheSession ses = new
TestThreadLocalCacheSession();
+
+/** */
+protected final CacheJdbcPojoStore store;
+
+/**
+ * @throws Exception If failed.
+ */
+@SuppressWarnings({"AbstractMethodCallInConstructor",
"OverriddenMethodCallDuringObjectConstruction"})
+public CacheJdbcPojoStoreTest() throws Exception {
+super(false);
+
+store = store();
+
+inject(store);
+}
+
+/**
+ * @return Store.
+ */
+protected CacheJdbcPojoStore store() throws IgniteCheckedException {
+CacheJdbcPojoStore store = new CacheJdbcPojoStore();
+
+//PGPoolingDataSource ds = new PGPoolingDataSource();
+//ds.setUser("postgres");
+//ds.setPassword("1");
+//ds.setServerName("192.168.1.47");
+//ds.setDatabaseName("postgres");
+//store.setDataSource(ds);
+
+//MysqlDataSource ds = new MysqlDataSource();
+//ds.setURL("jdbc:mysql://192.168.1.12:3306/test");
+//ds.setUser("test");
+//ds.setPassword("1");
+//store.setDataSource(ds);
+
+store.setDataSource(JdbcConnectionPool.create(DFLT_CONN_URL, "sa",
""));
+
+return store;
+}
+
+/**
+ * @param store Store.
+ * @throws Exception If failed.
+ */
+protected void inject(CacheAbstractJdbcStore store) throws Exception {
+getTestResources().inject(store);
+
+GridTestUtils.setFieldValue(store, CacheStore.class, "ses", ses);
+
+UrlResource metaUrl;
+
+try {
+metaUrl = new UrlResource(new
File(DFLT_MAPPING_CONFIG).toURI().toURL());
+}
+catch (MalformedURLException e) {
+throw new Ign
[4/8] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-149
Merge branch 'sprint-1' into ignite-149 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dee928bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dee928bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dee928bd Branch: refs/heads/sprint-1 Commit: dee928bdc3a1a4fceddc75059e8ee10ad0eb7e3b Parents: 6737602 53760d1 Author: vozerov-gridgain Authored: Fri Feb 6 11:10:55 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 11:10:55 2015 +0300 -- .../MessagingPingPongListenActorExample.java|4 +- .../java/org/apache/ignite/IgniteCache.java | 22 - .../java/org/apache/ignite/IgniteQueue.java |4 +- .../main/java/org/apache/ignite/IgniteSet.java |2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 1560 ++ .../cache/store/jdbc/CacheJdbcPojoStore.java| 205 +++ .../ignite/cache/store/jdbc/JdbcCacheStore.java | 1560 -- .../cache/store/jdbc/JdbcPojoCacheStore.java| 205 --- .../processors/cache/IgniteCacheProxy.java |6 - .../processors/rest/GridRestProcessor.java |2 + .../IgniteOptimizedObjectInputStream.java |2 + .../ignite/messaging/MessagingListenActor.java | 18 +- ...ractJdbcCacheStoreMultithreadedSelfTest.java | 196 --- .../CacheJdbcPojoStoreMultitreadedSelfTest.java | 35 + .../store/jdbc/CacheJdbcPojoStoreTest.java | 702 ...eJdbcStoreAbstractMultithreadedSelfTest.java | 197 +++ .../PojoJdbcCacheStoreMultitreadedSelfTest.java | 34 - .../store/jdbc/PojoJdbcCacheStoreTest.java | 702 .../internal/GridListenActorSelfTest.java | 11 +- .../schema/load/AbstractSchemaLoaderTest.java |4 +- .../commands/open/VisorOpenCommandSpec.scala|6 +- .../yardstick/config/benchmark-store.properties | 35 +- .../yardstick/config/ignite-store-config.xml| 11 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 89 +- .../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 10 +- .../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 47 + .../store/jdbc/IgniteJdbcStorePutBenchmark.java |5 + .../jdbc/IgniteJdbcStorePutGetBenchmark.java|5 + .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 52 + .../jdbc/IgniteJdbcStorePutTxBenchmark.java | 47 + 30 files changed, 2992 insertions(+), 2786 deletions(-) --
[5/8] incubator-ignite git commit: # ignite-149: Minor.
# ignite-149: Minor. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9afb9120 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9afb9120 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9afb9120 Branch: refs/heads/sprint-1 Commit: 9afb91200c63b4ef9b824c9a6f584baf56f4a49c Parents: dee928b Author: vozerov-gridgain Authored: Fri Feb 6 11:12:12 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 11:12:12 2015 +0300 -- bin/include/IgniteService.exe | Bin 6144 -> 0 bytes bin/include/IgniteService1.exe | Bin 0 -> 6144 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9afb9120/bin/include/IgniteService.exe -- diff --git a/bin/include/IgniteService.exe b/bin/include/IgniteService.exe deleted file mode 100644 index 66deb9c..000 Binary files a/bin/include/IgniteService.exe and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9afb9120/bin/include/IgniteService1.exe -- diff --git a/bin/include/IgniteService1.exe b/bin/include/IgniteService1.exe new file mode 100644 index 000..66deb9c Binary files /dev/null and b/bin/include/IgniteService1.exe differ
[3/8] incubator-ignite git commit: # ignite-149: WIP.
# ignite-149: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67376020
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67376020
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67376020
Branch: refs/heads/sprint-1
Commit: 673760208f800118608cf372ff3052fcd9ecb14b
Parents: bb8b07d
Author: vozerov-gridgain
Authored: Thu Feb 5 17:49:45 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Feb 5 17:49:45 2015 +0300
--
bin/include/IgniteService.exe | Bin 0 -> 6144 bytes
bin/include/ggservice.exe | Bin 5632 -> 0 bytes
.../java/org/apache/ignite/IgniteCluster.java |6 +-
.../apache/ignite/internal/IgniteKernal.java| 16 +-
.../ignite/internal/util/IgniteUtils.java |2 +-
.../util/nodestart/GridNodeCallable.java| 29 -
.../util/nodestart/GridNodeStartUtils.java | 390 ---
.../nodestart/GridRemoteStartSpecification.java | 279 -
.../util/nodestart/IgniteNodeCallable.java | 30 +
.../util/nodestart/IgniteNodeStartUtils.java| 391 +++
.../IgniteRemoteStartSpecification.java | 279 +
.../util/nodestart/IgniteSshProcessor.java |2 +-
.../core/src/test/bin/start-nodes-custom.bat|2 +-
modules/core/src/test/config/start-nodes.ini|6 +-
.../util/nodestart/GridNodeCallableImpl.java| 344 --
.../util/nodestart/IgniteNodeCallableImpl.java | 344 ++
.../util/nodestart/IgniteSshProcessorImpl.java |4 +-
.../internal/GridNodeStartUtilsSelfTest.java| 89 --
.../GridProjectionStartStopRestartSelfTest.java | 1032 --
.../internal/IgniteNodeStartUtilsSelfTest.java | 88 ++
...gniteProjectionStartStopRestartSelfTest.java | 1032 ++
.../IgniteStartStopRestartTestSuite.java|4 +-
.../commands/start/VisorStartCommand.scala |4 +-
modules/winservice/.gitignore |2 +
modules/winservice/IgniteService.sln| 22 +
.../winservice/IgniteService/IgniteService.cs | 170 +++
.../IgniteService/IgniteService.csproj | 90 ++
27 files changed, 2471 insertions(+), 2186 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/bin/include/IgniteService.exe
--
diff --git a/bin/include/IgniteService.exe b/bin/include/IgniteService.exe
new file mode 100644
index 000..66deb9c
Binary files /dev/null and b/bin/include/IgniteService.exe differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/bin/include/ggservice.exe
--
diff --git a/bin/include/ggservice.exe b/bin/include/ggservice.exe
deleted file mode 100644
index 7d3783b..000
Binary files a/bin/include/ggservice.exe and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index d8f16ed..0350487 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -232,7 +232,7 @@ public interface IgniteCluster extends ClusterGroup,
IgniteAsyncSupport {
*
*
*
- * ggHome
+ * igniteHome
* String
*
* Path to GridGain installation folder. If not defined,
IGNITE_HOME
@@ -242,13 +242,13 @@ public interface IgniteCluster extends ClusterGroup,
IgniteAsyncSupport {
*
* cfg
* String
- * Path to configuration file (relative to {@code
ggHome}).
+ * Path to configuration file (relative to {@code
igniteHome}).
*
*
* script
* String
*
- * Custom startup script file name and path (relative to
{@code ggHome}).
+ * Custom startup script file name and path (relative to
{@code igniteHome}).
* You can also specify a space-separated list of
parameters in the same
* string (for example: {@code "bin/my-custom-script.sh
-v"}).
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
-
[1/8] incubator-ignite git commit: # ignite-149: WIP.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-1 1244764bc -> 6d6fd8c59
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/winservice/IgniteService/IgniteService.csproj
--
diff --git a/modules/winservice/IgniteService/IgniteService.csproj
b/modules/winservice/IgniteService/IgniteService.csproj
new file mode 100644
index 000..c533782
--- /dev/null
+++ b/modules/winservice/IgniteService/IgniteService.csproj
@@ -0,0 +1,90 @@
+
+http://schemas.microsoft.com/developer/msbuild/2003";>
+
+Debug
+x86
+8.0.30703
+2.0
+{86BE9E54-4293-482A-8956-BDCF20BA53A8}
+Exe
+Properties
+Ignite
+IgniteService
+v4.0
+Client
+512
+false
+publish\
+true
+Disk
+false
+Foreground
+7
+Days
+false
+false
+true
+0
+1.0.0.%2a
+false
+true
+
+
+x86
+true
+full
+false
+bin\Debug\
+DEBUG;TRACE
+prompt
+4
+
+
+x86
+pdbonly
+true
+bin\Release\
+TRACE
+prompt
+4
+
+
+
+ Component
+
+
+
+
+
+
+
+
+ False
+ Microsoft .NET Framework 4 Client Profile %28x86 and
x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
+ False
+ Windows Installer 3.1
+ true
+
+
+
+
+
\ No newline at end of file
[7/8] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-149
Merge branch 'sprint-1' into ignite-149 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ac98ac5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ac98ac5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ac98ac5 Branch: refs/heads/sprint-1 Commit: 5ac98ac532cce7b543fbec6c73de691918bf26e6 Parents: 6efa3e2 1244764 Author: vozerov-gridgain Authored: Fri Feb 6 13:12:49 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 13:12:49 2015 +0300 -- .../ignite/cache/eviction/EvictableEntry.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 11 +- .../GridDistributedCacheAdapter.java| 46 +++--- .../core/src/test/config/store/jdbc/Ignite.xml | 50 +++ .../store/jdbc/CacheJdbcPojoStoreTest.java | 73 +- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 98 +++-- .../store/jdbc/model/PersonComplexKey.java | 146 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + 8 files changed, 382 insertions(+), 46 deletions(-) --
[2/8] incubator-ignite git commit: # ignite-149: WIP.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
--
diff --git
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
b/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
deleted file mode 100644
index 992954d..000
---
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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;
-
-import org.apache.ignite.internal.util.nodestart.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.util.nodestart.GridNodeStartUtils.*;
-
-/**
- * Tests for {@link GridNodeStartUtils}.
- */
-public class GridNodeStartUtilsSelfTest extends GridCommonAbstractTest {
-/**
- * @throws Exception If failed.
- */
-public void testParseFile() throws Exception {
-File file =
U.resolveGridGainPath("modules/core/src/test/config/start-nodes.ini");
-
-IgniteBiTuple>, Map> t
= parseFile(file);
-
-assert t != null;
-
-Collection> hosts = t.get1();
-
-assert hosts != null;
-assert hosts.size() == 2;
-
-for (Map host : hosts) {
-assert host != null;
-
-assert "192.168.1.1".equals(host.get(HOST)) ||
"192.168.1.2".equals(host.get(HOST));
-
-if ("192.168.1.1".equals(host.get(HOST))) {
-assert (Integer)host.get(PORT) == 1;
-assert "uname1".equals(host.get(UNAME));
-assert "passwd1".equals(host.get(PASSWD));
-assert new File("key1").equals(host.get(KEY));
-assert (Integer)host.get(NODES) == 1;
-assert "ggHome1".equals(host.get(IGNITE_HOME));
-assert "cfg1".equals(host.get(CFG));
-assert "script1".equals(host.get(SCRIPT));
-}
-else if ("192.168.1.2".equals(host.get(HOST))) {
-assert (Integer)host.get(PORT) == 2;
-assert "uname2".equals(host.get(UNAME));
-assert "passwd2".equals(host.get(PASSWD));
-assert new File("key2").equals(host.get(KEY));
-assert (Integer)host.get(NODES) == 2;
-assert "ggHome2".equals(host.get(IGNITE_HOME));
-assert "cfg2".equals(host.get(CFG));
-assert "script2".equals(host.get(SCRIPT));
-}
-}
-
-Map dflts = t.get2();
-
-assert dflts != null;
-
-assert (Integer)dflts.get(PORT) == 3;
-assert "uname3".equals(dflts.get(UNAME));
-assert "passwd3".equals(dflts.get(PASSWD));
-assert new File("key3").equals(dflts.get(KEY));
-assert (Integer)dflts.get(NODES) == 3;
-assert "ggHome3".equals(dflts.get(IGNITE_HOME));
-assert "cfg3".equals(dflts.get(CFG));
-assert "script3".equals(dflts.get(SCRIPT));
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
--
diff --git
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
b/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
deleted file mode 100644
index 20c52d5..000
---
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
+++ /dev/null
@@ -1,1032 +0,0 @@
-/*
- * 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
[8/8] incubator-ignite git commit: # ignite-149: Minors.
# ignite-149: Minors. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6d6fd8c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6d6fd8c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6d6fd8c5 Branch: refs/heads/sprint-1 Commit: 6d6fd8c59453180810d99107fdd33ebadedb4a89 Parents: 5ac98ac Author: vozerov-gridgain Authored: Fri Feb 6 13:17:31 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 13:17:31 2015 +0300 -- modules/winservice/.gitignore | 2 -- modules/winservice/README.md | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d6fd8c5/modules/winservice/.gitignore -- diff --git a/modules/winservice/.gitignore b/modules/winservice/.gitignore deleted file mode 100644 index 2dadad2..000 --- a/modules/winservice/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*/bin/ -/*/obj/ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d6fd8c5/modules/winservice/README.md -- diff --git a/modules/winservice/README.md b/modules/winservice/README.md new file mode 100644 index 000..a4c676a --- /dev/null +++ b/modules/winservice/README.md @@ -0,0 +1,3 @@ +# Windows service project. +.Net project with Windows service. This service is used by "startNode" functionality when remote node is started from Ignite API through SSH. +If you make any changes to .Net source code if this project, please make sure to rebuild it in Release mode and copy resulting binary to /bin/include folder.
[6/8] incubator-ignite git commit: # ignite-149: Minor.
# ignite-149: Minor. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6efa3e20 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6efa3e20 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6efa3e20 Branch: refs/heads/sprint-1 Commit: 6efa3e20f0aa39869042ebbb18999563479d2b17 Parents: 9afb912 Author: vozerov-gridgain Authored: Fri Feb 6 11:12:29 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 11:12:29 2015 +0300 -- bin/include/IgniteService1.exe | Bin 6144 -> 0 bytes bin/include/igniteservice.exe | Bin 0 -> 6144 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6efa3e20/bin/include/IgniteService1.exe -- diff --git a/bin/include/IgniteService1.exe b/bin/include/IgniteService1.exe deleted file mode 100644 index 66deb9c..000 Binary files a/bin/include/IgniteService1.exe and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6efa3e20/bin/include/igniteservice.exe -- diff --git a/bin/include/igniteservice.exe b/bin/include/igniteservice.exe new file mode 100644 index 000..66deb9c Binary files /dev/null and b/bin/include/igniteservice.exe differ
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-149 [deleted] 6efa3e20f
incubator-ignite git commit: # ignite-32 Fix prepare store benchmark.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-1 6d6fd8c59 -> 92ae28d46
# ignite-32 Fix prepare store benchmark.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92ae28d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92ae28d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92ae28d4
Branch: refs/heads/sprint-1
Commit: 92ae28d4650812520d970c5e6fe6c94918eaef4c
Parents: 6d6fd8c
Author: anovikov
Authored: Fri Feb 6 17:25:55 2015 +0700
Committer: anovikov
Committed: Fri Feb 6 17:25:55 2015 +0700
--
.../store/jdbc/IgniteJdbcStoreAbstractBenchmark.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92ae28d4/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
index a521afb..0d5fe76 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
@@ -82,14 +82,20 @@ public abstract class IgniteJdbcStoreAbstractBenchmark
extends IgniteAbstractBen
PreparedStatement orgStmt = conn.prepareStatement("INSERT INTO
SAMPLE(id, value) VALUES (?, ?)");
-for (int i = 0; i < fillRange(); i++) {
+int i;
+
+for (i = 1; i <= fillRange(); i++) {
orgStmt.setInt(1, i);
orgStmt.setInt(2, i);
orgStmt.addBatch();
+
+if (i % 1000 == 0)
+orgStmt.executeBatch();
}
-orgStmt.executeBatch();
+if (i % 1000 != 0)
+orgStmt.executeBatch();
conn.commit();
[08/11] incubator-ignite git commit: # ignite-149: Minors.
# ignite-149: Minors. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6d6fd8c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6d6fd8c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6d6fd8c5 Branch: refs/heads/ignite-56 Commit: 6d6fd8c59453180810d99107fdd33ebadedb4a89 Parents: 5ac98ac Author: vozerov-gridgain Authored: Fri Feb 6 13:17:31 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 13:17:31 2015 +0300 -- modules/winservice/.gitignore | 2 -- modules/winservice/README.md | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d6fd8c5/modules/winservice/.gitignore -- diff --git a/modules/winservice/.gitignore b/modules/winservice/.gitignore deleted file mode 100644 index 2dadad2..000 --- a/modules/winservice/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*/bin/ -/*/obj/ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d6fd8c5/modules/winservice/README.md -- diff --git a/modules/winservice/README.md b/modules/winservice/README.md new file mode 100644 index 000..a4c676a --- /dev/null +++ b/modules/winservice/README.md @@ -0,0 +1,3 @@ +# Windows service project. +.Net project with Windows service. This service is used by "startNode" functionality when remote node is started from Ignite API through SSH. +If you make any changes to .Net source code if this project, please make sure to rebuild it in Release mode and copy resulting binary to /bin/include folder.
[06/11] incubator-ignite git commit: # ignite-149: Minor.
# ignite-149: Minor. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6efa3e20 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6efa3e20 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6efa3e20 Branch: refs/heads/ignite-56 Commit: 6efa3e20f0aa39869042ebbb18999563479d2b17 Parents: 9afb912 Author: vozerov-gridgain Authored: Fri Feb 6 11:12:29 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 11:12:29 2015 +0300 -- bin/include/IgniteService1.exe | Bin 6144 -> 0 bytes bin/include/igniteservice.exe | Bin 0 -> 6144 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6efa3e20/bin/include/IgniteService1.exe -- diff --git a/bin/include/IgniteService1.exe b/bin/include/IgniteService1.exe deleted file mode 100644 index 66deb9c..000 Binary files a/bin/include/IgniteService1.exe and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6efa3e20/bin/include/igniteservice.exe -- diff --git a/bin/include/igniteservice.exe b/bin/include/igniteservice.exe new file mode 100644 index 000..66deb9c Binary files /dev/null and b/bin/include/igniteservice.exe differ
[04/11] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-149
Merge branch 'sprint-1' into ignite-149 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dee928bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dee928bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dee928bd Branch: refs/heads/ignite-56 Commit: dee928bdc3a1a4fceddc75059e8ee10ad0eb7e3b Parents: 6737602 53760d1 Author: vozerov-gridgain Authored: Fri Feb 6 11:10:55 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 11:10:55 2015 +0300 -- .../MessagingPingPongListenActorExample.java|4 +- .../java/org/apache/ignite/IgniteCache.java | 22 - .../java/org/apache/ignite/IgniteQueue.java |4 +- .../main/java/org/apache/ignite/IgniteSet.java |2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 1560 ++ .../cache/store/jdbc/CacheJdbcPojoStore.java| 205 +++ .../ignite/cache/store/jdbc/JdbcCacheStore.java | 1560 -- .../cache/store/jdbc/JdbcPojoCacheStore.java| 205 --- .../processors/cache/IgniteCacheProxy.java |6 - .../processors/rest/GridRestProcessor.java |2 + .../IgniteOptimizedObjectInputStream.java |2 + .../ignite/messaging/MessagingListenActor.java | 18 +- ...ractJdbcCacheStoreMultithreadedSelfTest.java | 196 --- .../CacheJdbcPojoStoreMultitreadedSelfTest.java | 35 + .../store/jdbc/CacheJdbcPojoStoreTest.java | 702 ...eJdbcStoreAbstractMultithreadedSelfTest.java | 197 +++ .../PojoJdbcCacheStoreMultitreadedSelfTest.java | 34 - .../store/jdbc/PojoJdbcCacheStoreTest.java | 702 .../internal/GridListenActorSelfTest.java | 11 +- .../schema/load/AbstractSchemaLoaderTest.java |4 +- .../commands/open/VisorOpenCommandSpec.scala|6 +- .../yardstick/config/benchmark-store.properties | 35 +- .../yardstick/config/ignite-store-config.xml| 11 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 89 +- .../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 10 +- .../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 47 + .../store/jdbc/IgniteJdbcStorePutBenchmark.java |5 + .../jdbc/IgniteJdbcStorePutGetBenchmark.java|5 + .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 52 + .../jdbc/IgniteJdbcStorePutTxBenchmark.java | 47 + 30 files changed, 2992 insertions(+), 2786 deletions(-) --
[05/11] incubator-ignite git commit: # ignite-149: Minor.
# ignite-149: Minor. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9afb9120 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9afb9120 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9afb9120 Branch: refs/heads/ignite-56 Commit: 9afb91200c63b4ef9b824c9a6f584baf56f4a49c Parents: dee928b Author: vozerov-gridgain Authored: Fri Feb 6 11:12:12 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 11:12:12 2015 +0300 -- bin/include/IgniteService.exe | Bin 6144 -> 0 bytes bin/include/IgniteService1.exe | Bin 0 -> 6144 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9afb9120/bin/include/IgniteService.exe -- diff --git a/bin/include/IgniteService.exe b/bin/include/IgniteService.exe deleted file mode 100644 index 66deb9c..000 Binary files a/bin/include/IgniteService.exe and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9afb9120/bin/include/IgniteService1.exe -- diff --git a/bin/include/IgniteService1.exe b/bin/include/IgniteService1.exe new file mode 100644 index 000..66deb9c Binary files /dev/null and b/bin/include/IgniteService1.exe differ
[10/11] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-56
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-56 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cc7ef8eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cc7ef8eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cc7ef8eb Branch: refs/heads/ignite-56 Commit: cc7ef8eb656cf0673cd8037108cb58ca8260a08e Parents: 186c621 92ae28d Author: sevdokimov Authored: Fri Feb 6 13:34:59 2015 +0300 Committer: sevdokimov Committed: Fri Feb 6 13:34:59 2015 +0300 -- bin/include/ggservice.exe | Bin 5632 -> 0 bytes bin/include/igniteservice.exe | Bin 0 -> 6144 bytes .../java/org/apache/ignite/IgniteCluster.java |6 +- .../apache/ignite/internal/IgniteKernal.java| 16 +- .../ignite/internal/util/IgniteUtils.java |2 +- .../util/nodestart/GridNodeCallable.java| 29 - .../util/nodestart/GridNodeStartUtils.java | 390 --- .../nodestart/GridRemoteStartSpecification.java | 279 - .../util/nodestart/IgniteNodeCallable.java | 30 + .../util/nodestart/IgniteNodeStartUtils.java| 391 +++ .../IgniteRemoteStartSpecification.java | 279 + .../util/nodestart/IgniteSshProcessor.java |2 +- .../core/src/test/bin/start-nodes-custom.bat|2 +- modules/core/src/test/config/start-nodes.ini|6 +- .../util/nodestart/GridNodeCallableImpl.java| 344 -- .../util/nodestart/IgniteNodeCallableImpl.java | 344 ++ .../util/nodestart/IgniteSshProcessorImpl.java |4 +- .../internal/GridNodeStartUtilsSelfTest.java| 89 -- .../GridProjectionStartStopRestartSelfTest.java | 1032 -- .../internal/IgniteNodeStartUtilsSelfTest.java | 88 ++ ...gniteProjectionStartStopRestartSelfTest.java | 1032 ++ .../IgniteStartStopRestartTestSuite.java|4 +- .../commands/start/VisorStartCommand.scala |4 +- modules/winservice/IgniteService.sln| 22 + .../winservice/IgniteService/IgniteService.cs | 170 +++ .../IgniteService/IgniteService.csproj | 90 ++ modules/winservice/README.md|3 + .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 10 +- 28 files changed, 2480 insertions(+), 2188 deletions(-) --
[01/11] incubator-ignite git commit: # ignite-149: WIP.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-56 186c621b1 -> b44c9017a
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/winservice/IgniteService/IgniteService.csproj
--
diff --git a/modules/winservice/IgniteService/IgniteService.csproj
b/modules/winservice/IgniteService/IgniteService.csproj
new file mode 100644
index 000..c533782
--- /dev/null
+++ b/modules/winservice/IgniteService/IgniteService.csproj
@@ -0,0 +1,90 @@
+
+http://schemas.microsoft.com/developer/msbuild/2003";>
+
+Debug
+x86
+8.0.30703
+2.0
+{86BE9E54-4293-482A-8956-BDCF20BA53A8}
+Exe
+Properties
+Ignite
+IgniteService
+v4.0
+Client
+512
+false
+publish\
+true
+Disk
+false
+Foreground
+7
+Days
+false
+false
+true
+0
+1.0.0.%2a
+false
+true
+
+
+x86
+true
+full
+false
+bin\Debug\
+DEBUG;TRACE
+prompt
+4
+
+
+x86
+pdbonly
+true
+bin\Release\
+TRACE
+prompt
+4
+
+
+
+ Component
+
+
+
+
+
+
+
+
+ False
+ Microsoft .NET Framework 4 Client Profile %28x86 and
x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
+ False
+ Windows Installer 3.1
+ true
+
+
+
+
+
\ No newline at end of file
[07/11] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-149
Merge branch 'sprint-1' into ignite-149 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ac98ac5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ac98ac5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ac98ac5 Branch: refs/heads/ignite-56 Commit: 5ac98ac532cce7b543fbec6c73de691918bf26e6 Parents: 6efa3e2 1244764 Author: vozerov-gridgain Authored: Fri Feb 6 13:12:49 2015 +0300 Committer: vozerov-gridgain Committed: Fri Feb 6 13:12:49 2015 +0300 -- .../ignite/cache/eviction/EvictableEntry.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 11 +- .../GridDistributedCacheAdapter.java| 46 +++--- .../core/src/test/config/store/jdbc/Ignite.xml | 50 +++ .../store/jdbc/CacheJdbcPojoStoreTest.java | 73 +- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 98 +++-- .../store/jdbc/model/PersonComplexKey.java | 146 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + 8 files changed, 382 insertions(+), 46 deletions(-) --
[02/11] incubator-ignite git commit: # ignite-149: WIP.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
--
diff --git
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
b/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
deleted file mode 100644
index 992954d..000
---
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridNodeStartUtilsSelfTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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;
-
-import org.apache.ignite.internal.util.nodestart.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.util.nodestart.GridNodeStartUtils.*;
-
-/**
- * Tests for {@link GridNodeStartUtils}.
- */
-public class GridNodeStartUtilsSelfTest extends GridCommonAbstractTest {
-/**
- * @throws Exception If failed.
- */
-public void testParseFile() throws Exception {
-File file =
U.resolveGridGainPath("modules/core/src/test/config/start-nodes.ini");
-
-IgniteBiTuple>, Map> t
= parseFile(file);
-
-assert t != null;
-
-Collection> hosts = t.get1();
-
-assert hosts != null;
-assert hosts.size() == 2;
-
-for (Map host : hosts) {
-assert host != null;
-
-assert "192.168.1.1".equals(host.get(HOST)) ||
"192.168.1.2".equals(host.get(HOST));
-
-if ("192.168.1.1".equals(host.get(HOST))) {
-assert (Integer)host.get(PORT) == 1;
-assert "uname1".equals(host.get(UNAME));
-assert "passwd1".equals(host.get(PASSWD));
-assert new File("key1").equals(host.get(KEY));
-assert (Integer)host.get(NODES) == 1;
-assert "ggHome1".equals(host.get(IGNITE_HOME));
-assert "cfg1".equals(host.get(CFG));
-assert "script1".equals(host.get(SCRIPT));
-}
-else if ("192.168.1.2".equals(host.get(HOST))) {
-assert (Integer)host.get(PORT) == 2;
-assert "uname2".equals(host.get(UNAME));
-assert "passwd2".equals(host.get(PASSWD));
-assert new File("key2").equals(host.get(KEY));
-assert (Integer)host.get(NODES) == 2;
-assert "ggHome2".equals(host.get(IGNITE_HOME));
-assert "cfg2".equals(host.get(CFG));
-assert "script2".equals(host.get(SCRIPT));
-}
-}
-
-Map dflts = t.get2();
-
-assert dflts != null;
-
-assert (Integer)dflts.get(PORT) == 3;
-assert "uname3".equals(dflts.get(UNAME));
-assert "passwd3".equals(dflts.get(PASSWD));
-assert new File("key3").equals(dflts.get(KEY));
-assert (Integer)dflts.get(NODES) == 3;
-assert "ggHome3".equals(dflts.get(IGNITE_HOME));
-assert "cfg3".equals(dflts.get(CFG));
-assert "script3".equals(dflts.get(SCRIPT));
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
--
diff --git
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
b/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
deleted file mode 100644
index 20c52d5..000
---
a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
+++ /dev/null
@@ -1,1032 +0,0 @@
-/*
- * 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
[11/11] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-1' into ignite-56
Merge remote-tracking branch 'remotes/origin/ignite-sprint-1' into ignite-56
Conflicts:
modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePortableStoreAbstractSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b44c9017
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b44c9017
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b44c9017
Branch: refs/heads/ignite-56
Commit: b44c9017aba6f290e2bde866c04772877965c040
Parents: cc7ef8e
Author: sevdokimov
Authored: Fri Feb 6 13:35:52 2015 +0300
Committer: sevdokimov
Committed: Fri Feb 6 13:35:52 2015 +0300
--
modules/core/src/main/java/org/apache/ignite/IgniteCache.java| 2 ++
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 4
.../processors/cache/GridCacheAbstractFullApiSelfTest.java | 3 +--
3 files changed, 7 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b44c9017/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 73cb87a..ce0f4b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -390,6 +390,8 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
@IgniteAsyncSupported
@Override public void clear();
+public boolean clear(Collection keys);
+
/** {@inheritDoc} */
@IgniteAsyncSupported
@Override public T invoke(K key, EntryProcessor
entryProcessor, Object... arguments);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b44c9017/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index b358f77..3bdbcd0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -740,6 +740,10 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter keys) {
+throw new UnsupportedOperationException();
+}
+
/** {@inheritDoc} */
@Override public T invoke(K key, EntryProcessor
entryProcessor, Object... args)
throws EntryProcessorException {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b44c9017/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 179fb60..2f08f3d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -1698,8 +1698,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
assertFalse(cacheAsync.future().get());
-cache.localEvict(Collections.singleton("key2"));
-cache.clear(Collections.singleton("key3"));
+cache.localEvict(Arrays.asList("key2"));
// Same checks inside tx.
IgniteTx tx = inTx ? grid(0).transactions().txStart() : null;
[09/11] incubator-ignite git commit: # ignite-32 Fix prepare store benchmark.
# ignite-32 Fix prepare store benchmark.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92ae28d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92ae28d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92ae28d4
Branch: refs/heads/ignite-56
Commit: 92ae28d4650812520d970c5e6fe6c94918eaef4c
Parents: 6d6fd8c
Author: anovikov
Authored: Fri Feb 6 17:25:55 2015 +0700
Committer: anovikov
Committed: Fri Feb 6 17:25:55 2015 +0700
--
.../store/jdbc/IgniteJdbcStoreAbstractBenchmark.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92ae28d4/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
index a521afb..0d5fe76 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java
@@ -82,14 +82,20 @@ public abstract class IgniteJdbcStoreAbstractBenchmark
extends IgniteAbstractBen
PreparedStatement orgStmt = conn.prepareStatement("INSERT INTO
SAMPLE(id, value) VALUES (?, ?)");
-for (int i = 0; i < fillRange(); i++) {
+int i;
+
+for (i = 1; i <= fillRange(); i++) {
orgStmt.setInt(1, i);
orgStmt.setInt(2, i);
orgStmt.addBatch();
+
+if (i % 1000 == 0)
+orgStmt.executeBatch();
}
-orgStmt.executeBatch();
+if (i % 1000 != 0)
+orgStmt.executeBatch();
conn.commit();
[03/11] incubator-ignite git commit: # ignite-149: WIP.
# ignite-149: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67376020
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67376020
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67376020
Branch: refs/heads/ignite-56
Commit: 673760208f800118608cf372ff3052fcd9ecb14b
Parents: bb8b07d
Author: vozerov-gridgain
Authored: Thu Feb 5 17:49:45 2015 +0300
Committer: vozerov-gridgain
Committed: Thu Feb 5 17:49:45 2015 +0300
--
bin/include/IgniteService.exe | Bin 0 -> 6144 bytes
bin/include/ggservice.exe | Bin 5632 -> 0 bytes
.../java/org/apache/ignite/IgniteCluster.java |6 +-
.../apache/ignite/internal/IgniteKernal.java| 16 +-
.../ignite/internal/util/IgniteUtils.java |2 +-
.../util/nodestart/GridNodeCallable.java| 29 -
.../util/nodestart/GridNodeStartUtils.java | 390 ---
.../nodestart/GridRemoteStartSpecification.java | 279 -
.../util/nodestart/IgniteNodeCallable.java | 30 +
.../util/nodestart/IgniteNodeStartUtils.java| 391 +++
.../IgniteRemoteStartSpecification.java | 279 +
.../util/nodestart/IgniteSshProcessor.java |2 +-
.../core/src/test/bin/start-nodes-custom.bat|2 +-
modules/core/src/test/config/start-nodes.ini|6 +-
.../util/nodestart/GridNodeCallableImpl.java| 344 --
.../util/nodestart/IgniteNodeCallableImpl.java | 344 ++
.../util/nodestart/IgniteSshProcessorImpl.java |4 +-
.../internal/GridNodeStartUtilsSelfTest.java| 89 --
.../GridProjectionStartStopRestartSelfTest.java | 1032 --
.../internal/IgniteNodeStartUtilsSelfTest.java | 88 ++
...gniteProjectionStartStopRestartSelfTest.java | 1032 ++
.../IgniteStartStopRestartTestSuite.java|4 +-
.../commands/start/VisorStartCommand.scala |4 +-
modules/winservice/.gitignore |2 +
modules/winservice/IgniteService.sln| 22 +
.../winservice/IgniteService/IgniteService.cs | 170 +++
.../IgniteService/IgniteService.csproj | 90 ++
27 files changed, 2471 insertions(+), 2186 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/bin/include/IgniteService.exe
--
diff --git a/bin/include/IgniteService.exe b/bin/include/IgniteService.exe
new file mode 100644
index 000..66deb9c
Binary files /dev/null and b/bin/include/IgniteService.exe differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/bin/include/ggservice.exe
--
diff --git a/bin/include/ggservice.exe b/bin/include/ggservice.exe
deleted file mode 100644
index 7d3783b..000
Binary files a/bin/include/ggservice.exe and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index d8f16ed..0350487 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -232,7 +232,7 @@ public interface IgniteCluster extends ClusterGroup,
IgniteAsyncSupport {
*
*
*
- * ggHome
+ * igniteHome
* String
*
* Path to GridGain installation folder. If not defined,
IGNITE_HOME
@@ -242,13 +242,13 @@ public interface IgniteCluster extends ClusterGroup,
IgniteAsyncSupport {
*
* cfg
* String
- * Path to configuration file (relative to {@code
ggHome}).
+ * Path to configuration file (relative to {@code
igniteHome}).
*
*
* script
* String
*
- * Custom startup script file name and path (relative to
{@code ggHome}).
+ * Custom startup script file name and path (relative to
{@code igniteHome}).
* You can also specify a space-separated list of
parameters in the same
* string (for example: {@code "bin/my-custom-script.sh
-v"}).
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67376020/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
[1/2] incubator-ignite git commit: # ignite-164 : gridgain->ignite GGFS path renaming at [core]
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-164v2 9ef202aeb -> 9ee52f916
# ignite-164 : gridgain->ignite GGFS path renaming at [core]
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cc9e8cc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cc9e8cc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cc9e8cc2
Branch: refs/heads/ignite-164v2
Commit: cc9e8cc2205113a6b2927ff3d439c20e6db3ee14
Parents: 35e2c41
Author: Artem Shutak
Authored: Fri Feb 6 14:02:12 2015 +0300
Committer: Artem Shutak
Committed: Fri Feb 6 14:04:04 2015 +0300
--
.../internal/processors/fs/GridGgfsImpl.java| 8 +-
.../processors/fs/GridGgfsModesSelfTest.java| 136 +--
2 files changed, 72 insertions(+), 72 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc9e8cc2/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
index 59c7595..0d68645 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
@@ -151,12 +151,12 @@ public final class GridGgfsImpl implements GridGgfsEx {
Map cfgModes = new LinkedHashMap<>();
Map dfltModes = new LinkedHashMap<>(4, 1.0f);
-dfltModes.put("/gridgain/primary", PRIMARY);
+dfltModes.put("/ignite/primary", PRIMARY);
if (secondaryFs != null) {
-dfltModes.put("/gridgain/proxy", PROXY);
-dfltModes.put("/gridgain/sync", DUAL_SYNC);
-dfltModes.put("/gridgain/async", DUAL_ASYNC);
+dfltModes.put("/ignite/proxy", PROXY);
+dfltModes.put("/ignite/sync", DUAL_SYNC);
+dfltModes.put("/ignite/async", DUAL_ASYNC);
}
cfgModes.putAll(dfltModes);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc9e8cc2/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java
index 503f1f2..46c449c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java
@@ -220,14 +220,14 @@ public class GridGgfsModesSelfTest extends
GridGgfsCommonAbstractTest {
startUp();
-checkMode("/gridgain/primary", PRIMARY);
-checkMode("/gridgain/primary/", PRIMARY);
-checkMode("/gridgain/primary/subfolder", PRIMARY);
-checkMode("/gridgain/primary/folder/file.txt", PRIMARY);
-checkMode("/gridgain/primaryx", DUAL_ASYNC);
-checkMode("/gridgain/primaryx/", DUAL_ASYNC);
-checkMode("/gridgain/primaryx/subfolder", DUAL_ASYNC);
-checkMode("/gridgain/primaryx/folder/file.txt", DUAL_ASYNC);
+checkMode("/ignite/primary", PRIMARY);
+checkMode("/ignite/primary/", PRIMARY);
+checkMode("/ignite/primary/subfolder", PRIMARY);
+checkMode("/ignite/primary/folder/file.txt", PRIMARY);
+checkMode("/ignite/primaryx", DUAL_ASYNC);
+checkMode("/ignite/primaryx/", DUAL_ASYNC);
+checkMode("/ignite/primaryx/subfolder", DUAL_ASYNC);
+checkMode("/ignite/primaryx/folder/file.txt", DUAL_ASYNC);
}
/**
@@ -242,47 +242,47 @@ public class GridGgfsModesSelfTest extends
GridGgfsCommonAbstractTest {
startUp();
-checkMode("/gridgain/proxy", PROXY);
-checkMode("/gridgain/proxy/", PROXY);
-checkMode("/gridgain/proxy/subfolder", PROXY);
-checkMode("/gridgain/proxy/folder/file.txt", PROXY);
-checkMode("/gridgain/proxyx", PRIMARY);
-checkMode("/gridgain/proxyx/", PRIMARY);
-checkMode("/gridgain/proxyx/subfolder", PRIMARY);
-checkMode("/gridgain/proxyx/folder/file.txt", PRIMARY);
-
-checkMode("/userdir/gridgain/proxy", PRIMARY);
-checkMode("/userdir/gridgain/proxy/", PRIMARY);
-checkMode("/userdir/gridgain/proxy/subfolder", PRIMARY);
-checkMode("/userdir/gridgain/proxy/folder/file.txt", PRIMARY);
-
-checkMode("/gridgain/sync", DUAL_SYNC);
-checkMode("/gridgain/sync/", D
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-164v2' into ignite-164v2
Merge remote-tracking branch 'origin/ignite-164v2' into ignite-164v2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9ee52f91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9ee52f91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9ee52f91 Branch: refs/heads/ignite-164v2 Commit: 9ee52f9167e6c308c6751e26d227b146a46b1b2b Parents: cc9e8cc 9ef202a Author: Artem Shutak Authored: Fri Feb 6 14:04:20 2015 +0300 Committer: Artem Shutak Committed: Fri Feb 6 14:04:20 2015 +0300 -- .../processors/rest/JettyRestProcessorAbstractSelfTest.java | 2 +- .../ignite/internal/processors/rest/GridRestProcessor.java | 4 +++- .../processors/schedule/IgniteNoopScheduleProcessor.java | 2 +- .../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +- .../src/main/java/org/apache/ignite/internal/util/typedef/X.java | 2 +- .../src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java | 2 +- .../java/org/apache/ignite/spi/IgniteSpiManagementMBean.java | 2 +- .../src/main/java/org/apache/ignite/spi/IgniteSpiThread.java | 2 +- .../main/java/org/apache/ignite/startup/BasicWarmupClosure.java | 2 +- .../src/main/java/org/apache/ignite/thread/IgniteThread.java | 2 +- .../org/apache/ignite/testframework/junits/GridAbstractTest.java | 2 +- 11 files changed, 13 insertions(+), 11 deletions(-) --
[01/25] incubator-ignite git commit: # ignite-164 : DGRIDGAIN_QUIET -> DIGNITE_QUIET renaming
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-164v2stable 8446c4b7e -> 9ef202aeb
# ignite-164 : DGRIDGAIN_QUIET -> DIGNITE_QUIET renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4af4a163
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4af4a163
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4af4a163
Branch: refs/heads/ignite-164v2stable
Commit: 4af4a163c08ccdf6ff2366ae8c96679026d4b7b3
Parents: 758ff46
Author: Artem Shutak
Authored: Thu Feb 5 16:01:59 2015 +0300
Committer: Artem Shutak
Committed: Thu Feb 5 16:01:59 2015 +0300
--
modules/yardstick/config/benchmark-atomic-win.properties | 2 +-
modules/yardstick/config/benchmark-atomic.properties | 2 +-
modules/yardstick/config/benchmark-compute-win.properties | 2 +-
modules/yardstick/config/benchmark-compute.properties | 2 +-
modules/yardstick/config/benchmark-query-win.properties | 2 +-
modules/yardstick/config/benchmark-query.properties | 4 ++--
modules/yardstick/config/benchmark-tx-win.properties | 2 +-
modules/yardstick/config/benchmark-tx.properties | 2 +-
modules/yardstick/config/benchmark-win.properties | 2 +-
modules/yardstick/config/benchmark.properties | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4af4a163/modules/yardstick/config/benchmark-atomic-win.properties
--
diff --git a/modules/yardstick/config/benchmark-atomic-win.properties
b/modules/yardstick/config/benchmark-atomic-win.properties
index e0636ee..356e9c8 100644
--- a/modules/yardstick/config/benchmark-atomic-win.properties
+++ b/modules/yardstick/config/benchmark-atomic-win.properties
@@ -3,7 +3,7 @@
::
:: JVM options.
-set JVM_OPTS=%JVM_OPTS% -DGRIDGAIN_QUIET=false
+set JVM_OPTS=%JVM_OPTS% -DIGNITE_QUIET=false
:: Uncomment to enable concurrent garbage collection (GC) if you encounter
long GC pauses.
:: set JVM_OPTS=%JVM_OPTS%^
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4af4a163/modules/yardstick/config/benchmark-atomic.properties
--
diff --git a/modules/yardstick/config/benchmark-atomic.properties
b/modules/yardstick/config/benchmark-atomic.properties
index aac6a6e..40e2ab5 100644
--- a/modules/yardstick/config/benchmark-atomic.properties
+++ b/modules/yardstick/config/benchmark-atomic.properties
@@ -3,7 +3,7 @@
#
# JVM options.
-JVM_OPTS=${JVM_OPTS}" -DGRIDGAIN_QUIET=false"
+JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long
GC pauses.
# JVM_OPTS=${JVM_OPTS}" \
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4af4a163/modules/yardstick/config/benchmark-compute-win.properties
--
diff --git a/modules/yardstick/config/benchmark-compute-win.properties
b/modules/yardstick/config/benchmark-compute-win.properties
index 5c41110..e30f696 100644
--- a/modules/yardstick/config/benchmark-compute-win.properties
+++ b/modules/yardstick/config/benchmark-compute-win.properties
@@ -3,7 +3,7 @@
::
:: JVM options.
-set JVM_OPTS=%JVM_OPTS% -DGRIDGAIN_QUIET=false
+set JVM_OPTS=%JVM_OPTS% -DIGNITE_QUIET=false
:: Uncomment to enable concurrent garbage collection (GC) if you encounter
long GC pauses.
:: set JVM_OPTS=%JVM_OPTS%^
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4af4a163/modules/yardstick/config/benchmark-compute.properties
--
diff --git a/modules/yardstick/config/benchmark-compute.properties
b/modules/yardstick/config/benchmark-compute.properties
index 45aadcb..4b7d068 100644
--- a/modules/yardstick/config/benchmark-compute.properties
+++ b/modules/yardstick/config/benchmark-compute.properties
@@ -3,7 +3,7 @@
#
# JVM options.
-JVM_OPTS=${JVM_OPTS}" -DGRIDGAIN_QUIET=false"
+JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long
GC pauses.
# JVM_OPTS=${JVM_OPTS}" \
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4af4a163/modules/yardstick/config/benchmark-query-win.properties
--
diff --git a/modules/yardstick/config/benchmark-query-win.properties
b/modules/yardstick/config/benchmark-query-win.properties
index 234a29d..e78b46b 100644
--- a/modules/yardstick/config/benchmark-query-win.properties
+++ b/modules/yardstick/config/benchmark-query-win.properties
@@ -3,7 +3,7 @@
::
:: JVM options.
[21/25] incubator-ignite git commit: # sprint-1 ignore incr/decr commands for security check
# sprint-1 ignore incr/decr commands for security check
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce0c3047
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce0c3047
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce0c3047
Branch: refs/heads/ignite-164v2stable
Commit: ce0c3047557768221ea0623878e9f62513e561d0
Parents: bb8b07d
Author: sboikov
Authored: Thu Feb 5 20:45:28 2015 +0300
Committer: sboikov
Committed: Thu Feb 5 20:45:28 2015 +0300
--
.../apache/ignite/internal/processors/rest/GridRestProcessor.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce0c3047/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index f1f92d0..44b07c0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -597,6 +597,8 @@ public class GridRestProcessor extends GridProcessorAdapter
{
case QUIT:
case GET_PORTABLE_METADATA:
case PUT_PORTABLE_METADATA:
+case ATOMIC_INCREMENT:
+case ATOMIC_DECREMENT:
break;
default:
[17/25] incubator-ignite git commit: # ignite-164 : rest of gridgain renaming in [aws] module
# ignite-164 : rest of gridgain renaming in [aws] module
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9c53ad40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9c53ad40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9c53ad40
Branch: refs/heads/ignite-164v2stable
Commit: 9c53ad40d73e7b08038d19c657236df0e1b089dc
Parents: b03f008
Author: Artem Shutak
Authored: Thu Feb 5 17:58:43 2015 +0300
Committer: Artem Shutak
Committed: Thu Feb 5 18:02:41 2015 +0300
--
.../java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c53ad40/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
--
diff --git
a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
index 89d0183..0b8b369 100644
---
a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
+++
b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
@@ -74,7 +74,7 @@ import java.util.*;
* Spring Example
* {@link S3CheckpointSpi} can be configured from Spring XML configuration
file:
*
- *
+ *
* ...
*
*
[12/25] incubator-ignite git commit: #ignite-164: remove gridgain from code.
#ignite-164: remove gridgain from code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01708f92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01708f92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01708f92
Branch: refs/heads/ignite-164v2stable
Commit: 01708f926000c54e8f6631697af514b2b07cb574
Parents: 0333414
Author: ivasilinets
Authored: Thu Feb 5 17:35:03 2015 +0300
Committer: ivasilinets
Committed: Thu Feb 5 17:35:03 2015 +0300
--
modules/scalar/pom.xml | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01708f92/modules/scalar/pom.xml
--
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 3db5132..7b8c665 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -104,8 +104,8 @@
doc
-GridGain Scalar
-GridGain Scalar
+Ignite Scalar
+Ignite Scalar
@@ -165,13 +165,13 @@
src="package.html"
-
src=org/gridgain/scalar/scalar$.html
+
src=org/apache/ignite/scalar/scalar$.html
location.replace("package.html")
-
location.replace("org/gridgain/scalar/scalar$.html")
+
location.replace("org/apache/ignite/scalar/scalar$.html")
[06/25] incubator-ignite git commit: #ignite-164: remove gridgain from code.
#ignite-164: remove gridgain from code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08213dfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08213dfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08213dfb
Branch: refs/heads/ignite-164v2stable
Commit: 08213dfbd7cd605f7a319ab88c30179fc909108e
Parents: a72e031
Author: ivasilinets
Authored: Thu Feb 5 16:46:16 2015 +0300
Committer: ivasilinets
Committed: Thu Feb 5 16:46:16 2015 +0300
--
modules/extdata/p2p/META-INF/ignite.xml | 2 +-
.../uri/tasks/GridUriDeploymentDependency1.java | 2 +-
.../uri/tasks/GridUriDeploymentDependency2.java | 2 +-
.../uri/tasks/GridUriDeploymentTestTask2.java | 2 +-
.../apache/ignite/client/hadoop/package.html| 2 +-
.../org/apache/ignite/fs/hadoop/v1/package.html | 2 +-
.../org/apache/ignite/fs/hadoop/v2/package.html | 2 +-
.../apache/ignite/hadoop/GridHadoopSetup.java | 32 ++--
.../apache/ignite/cache/hibernate/package.html | 4 +--
.../CacheHibernateBlobStoreEntry.hbm.xml| 2 +-
.../rest/protocols/http/jetty/rest.html | 12
.../scala/org/apache/ignite/scalar/scalar.scala | 2 +-
.../util/nodestart/GridNodeCallableImpl.java| 6 ++--
modules/visor-console/pom.xml | 4 +--
.../org/apache/ignite/yardstick/IgniteNode.java | 2 +-
15 files changed, 39 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/extdata/p2p/META-INF/ignite.xml
--
diff --git a/modules/extdata/p2p/META-INF/ignite.xml
b/modules/extdata/p2p/META-INF/ignite.xml
index 27f0809..70a61cd 100644
--- a/modules/extdata/p2p/META-INF/ignite.xml
+++ b/modules/extdata/p2p/META-INF/ignite.xml
@@ -26,7 +26,7 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd";>
-Gridgain Spring configuration file in gar-file.
+Ignite Spring configuration file in gar-file.
-GridGain Hadoop client protocol.
+Ignite Hadoop client protocol.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/package.html
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/package.html
b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/package.html
index 9fad27c..daeff2d 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/package.html
+++ b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/package.html
@@ -18,6 +18,6 @@
-Contains Hadoop 1.x FileSystem wrapper for GridGain file
system.
+Contains Hadoop 1.x FileSystem wrapper for Ignite file system.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/package.html
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/package.html
b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/package.html
index 1fe07be..1c60c34 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/package.html
+++ b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/package.html
@@ -18,6 +18,6 @@
-Contains Hadoop 2.x FileSystem wrapper for GridGain file
system.
+Contains Hadoop 2.x FileSystem wrapper for Ignite file system.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08213dfb/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
--
diff --git
a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
index 01ea86d..2ed9b4f 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
@@ -73,11 +73,11 @@ public class GridHadoopSetup {
*
*/
private static void configureHadoop() {
-String gridgainHome = U.getIgniteHome();
+String igniteHome = U.getIgniteHome();
-println("IGNITE_HOME is set to '" + gridgainHome + "'.");
+println("IGNITE_HOME is set to '" + igniteHome + "'.");
-checkGridGainHome(gridgainHome);
+checkGridGainHome(igniteHome
[07/25] incubator-ignite git commit: Merge branch 'ignite-164v2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-164v2
Merge branch 'ignite-164v2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-164v2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/03334142 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/03334142 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/03334142 Branch: refs/heads/ignite-164v2stable Commit: 033341421d2679b459a39de73e2d5bc5fb1311be Parents: 08213df 09fae94 Author: ivasilinets Authored: Thu Feb 5 17:01:09 2015 +0300 Committer: ivasilinets Committed: Thu Feb 5 17:01:09 2015 +0300 -- bin/ignite.sh | 2 +- bin/igniterouter.sh | 2 +- bin/ignitevisorcmd.sh | 2 +- bin/include/functions.sh | 2 +- bin/setup-hadoop.sh | 2 +- modules/yardstick/config/benchmark-atomic-win.properties | 2 +- modules/yardstick/config/benchmark-atomic.properties | 2 +- modules/yardstick/config/benchmark-compute-win.properties | 2 +- modules/yardstick/config/benchmark-compute.properties | 2 +- modules/yardstick/config/benchmark-query-win.properties | 2 +- modules/yardstick/config/benchmark-query.properties | 4 ++-- modules/yardstick/config/benchmark-tx-win.properties | 2 +- modules/yardstick/config/benchmark-tx.properties | 2 +- modules/yardstick/config/benchmark-win.properties | 2 +- modules/yardstick/config/benchmark.properties | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) --
[14/25] incubator-ignite git commit: # ignite-164 : jboss-gridgain-aop.xml was deleted as unused
# ignite-164 : jboss-gridgain-aop.xml was deleted as unused Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3920801b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3920801b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3920801b Branch: refs/heads/ignite-164v2stable Commit: 3920801b55ce12b1233c326acf72503ad3ae192e Parents: 5ec80fd Author: Artem Shutak Authored: Thu Feb 5 17:49:09 2015 +0300 Committer: Artem Shutak Committed: Thu Feb 5 17:49:09 2015 +0300 -- .../config/aop/jboss/jboss-gridgain-aop.xml | 38 1 file changed, 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3920801b/modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml -- diff --git a/modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml b/modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml deleted file mode 100644 index f0ff304..000 --- a/modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd";> - - - - - - - - - - - - -
[24/25] incubator-ignite git commit: #ignite-164: remove gridgain from code.
#ignite-164: remove gridgain from code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1fbba7e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1fbba7e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1fbba7e6
Branch: refs/heads/ignite-164v2stable
Commit: 1fbba7e65ca2293c7de858f40127b7be621d3793
Parents: bcec7d9
Author: ivasilinets
Authored: Thu Feb 5 21:44:52 2015 +0300
Committer: ivasilinets
Committed: Thu Feb 5 21:44:52 2015 +0300
--
.../apache/ignite/internal/processors/rest/GridRestProcessor.java | 2 +-
.../internal/processors/schedule/IgniteNoopScheduleProcessor.java | 2 +-
.../src/main/java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +-
.../src/main/java/org/apache/ignite/internal/util/typedef/X.java | 2 +-
.../main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java | 2 +-
.../core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java | 2 +-
.../main/java/org/apache/ignite/startup/BasicWarmupClosure.java| 2 +-
.../core/src/main/java/org/apache/ignite/thread/IgniteThread.java | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index f1f92d0..bc5d1e6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -656,7 +656,7 @@ public class GridRestProcessor extends GridProcessorAdapter
{
startProtocol(proto);
}
catch (ClassNotFoundException ignored) {
-U.quietAndWarn(log, "Failed to initialize HTTP REST protocol
(consider adding gridgain-rest-http " +
+U.quietAndWarn(log, "Failed to initialize HTTP REST protocol
(consider adding ignite-rest-http " +
"module to classpath).");
}
catch (NoSuchMethodException | InvocationTargetException |
InstantiationException | IllegalAccessException e) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java
index 56fd2f3..4d90be8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java
@@ -49,6 +49,6 @@ public class IgniteNoopScheduleProcessor extends
IgniteScheduleProcessorAdapter
*/
private IgniteException processorException() {
return new IgniteException("Current Ignite configuration does not
support schedule functionality " +
-"(consider adding gridgain-schedule module to classpath).");
+"(consider adding ignite-schedule module to classpath).");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index c1ff3b7..3a36fbd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -2167,7 +2167,7 @@ public abstract class IgniteUtils {
}
}
}
-}, "gridgain-clock");
+}, "ignite-clock");
timer.setDaemon(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/type
[09/25] incubator-ignite git commit: # ignite-164 : GridGain->Ignite inside bin/ comments and strings
# ignite-164 : GridGain->Ignite inside bin/ comments and strings
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/180388fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/180388fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/180388fd
Branch: refs/heads/ignite-164v2stable
Commit: 180388fd959114e1b89373dd294a39cb6e41a44b
Parents: 9a10c4c
Author: Artem Shutak
Authored: Thu Feb 5 17:25:40 2015 +0300
Committer: Artem Shutak
Committed: Thu Feb 5 17:25:40 2015 +0300
--
bin/ignite.bat| 4 ++--
bin/ignite.sh | 2 +-
bin/ignitevisorcmd.bat| 6 +++---
bin/ignitevisorcmd.sh | 2 +-
bin/include/functions.sh | 4 ++--
bin/include/parseargs.bat | 2 +-
bin/include/setenv.bat| 8
bin/include/setenv.sh | 4 ++--
bin/setup-hadoop.bat | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/180388fd/bin/ignite.bat
--
diff --git a/bin/ignite.bat b/bin/ignite.bat
index 6f43c4f..d99f52d 100644
--- a/bin/ignite.bat
+++ b/bin/ignite.bat
@@ -69,9 +69,9 @@ goto checkIgniteHome2
:checkIgniteHome3
if exist "%IGNITE_HOME%\config" goto checkIgniteHome4
-echo %0, ERROR: GridGain installation folder is not found or IGNITE_HOME
environment variable is not valid.
+echo %0, ERROR: Ignite installation folder is not found or IGNITE_HOME
environment variable is not valid.
echo Please create IGNITE_HOME environment variable pointing to location of
-echo GridGain installation folder.
+echo Ignite installation folder.
goto error_finish
:checkIgniteHome4
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/180388fd/bin/ignite.sh
--
diff --git a/bin/ignite.sh b/bin/ignite.sh
index bb60ace..986edd2 100755
--- a/bin/ignite.sh
+++ b/bin/ignite.sh
@@ -75,7 +75,7 @@ findAvailableJmxPort
osname=`uname`
if [ "${DOCK_OPTS}" == "" ]; then
-DOCK_OPTS="-Xdock:name=GridGain Node"
+DOCK_OPTS="-Xdock:name=Ignite Node"
fi
#
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/180388fd/bin/ignitevisorcmd.bat
--
diff --git a/bin/ignitevisorcmd.bat b/bin/ignitevisorcmd.bat
index bf05adc..a6b0317 100644
--- a/bin/ignitevisorcmd.bat
+++ b/bin/ignitevisorcmd.bat
@@ -14,7 +14,7 @@
:: limitations under the License.
::
-:: Starts GridGain Visor Console.
+:: Starts Ignite Visor Console.
::
@echo off
@@ -65,9 +65,9 @@ goto checkIgniteHome2
:checkIgniteHome3
if exist "%IGNITE_HOME%\config" goto checkIgniteHome4
-echo %0, ERROR: GridGain installation folder is not found or IGNITE_HOME
environment variable is not valid.
+echo %0, ERROR: Ignite installation folder is not found or IGNITE_HOME
environment variable is not valid.
echo Please create IGNITE_HOME environment variable pointing to location of
-echo GridGain installation folder.
+echo Ignite installation folder.
goto error_finish
:checkIgniteHome4
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/180388fd/bin/ignitevisorcmd.sh
--
diff --git a/bin/ignitevisorcmd.sh b/bin/ignitevisorcmd.sh
index 41ed014..f033daf 100755
--- a/bin/ignitevisorcmd.sh
+++ b/bin/ignitevisorcmd.sh
@@ -62,7 +62,7 @@ JVM_OPTS="-Xms1g -Xmx1g -XX:MaxPermSize=128M -server
${JVM_OPTS}"
osname=`uname`
if [ "${DOCK_OPTS}" == "" ]; then
-DOCK_OPTS="-Xdock:name=Visor - GridGain Shell Console"
+DOCK_OPTS="-Xdock:name=Visor - Ignite Shell Console"
fi
#
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/180388fd/bin/include/functions.sh
--
diff --git a/bin/include/functions.sh b/bin/include/functions.sh
index 96dcd82..fbc85b1 100755
--- a/bin/include/functions.sh
+++ b/bin/include/functions.sh
@@ -91,8 +91,8 @@ setIgniteHome() {
#
if [ ! -d "${IGNITE_HOME}/config" ]; then
echo $0", ERROR:"
-echo "GridGain installation folder is not found or IGNITE_HOME
environment variable is not valid."
-echo "Please create IGNITE_HOME environment variable pointing to
location of GridGain installation folder."
+echo "Ignite installation folder is not found or IGNITE_HOME
environment variable is not valid."
+echo "Please create IGNITE_HOME environment variable pointing to
location of Ignite installation folder."
exit 1
fi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/180388fd/bin/include/parseargs.bat
--
[05/25] incubator-ignite git commit: # ignite-164 : setGridGainHome -> setIgniteHome renaming at bin-s
# ignite-164 : setGridGainHome -> setIgniteHome renaming at bin-s
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/09fae941
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/09fae941
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/09fae941
Branch: refs/heads/ignite-164v2stable
Commit: 09fae941cd4adab0373e4fc2c1b7db04f5c23dc4
Parents: ba232f8
Author: Artem Shutak
Authored: Thu Feb 5 16:36:37 2015 +0300
Committer: Artem Shutak
Committed: Thu Feb 5 16:36:37 2015 +0300
--
bin/ignite.sh| 2 +-
bin/igniterouter.sh | 2 +-
bin/ignitevisorcmd.sh| 2 +-
bin/include/functions.sh | 2 +-
bin/setup-hadoop.sh | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09fae941/bin/ignite.sh
--
diff --git a/bin/ignite.sh b/bin/ignite.sh
index 4e2f37c..bb60ace 100755
--- a/bin/ignite.sh
+++ b/bin/ignite.sh
@@ -41,7 +41,7 @@ checkJava
#
# Discover IGNITE_HOME environment variable.
#
-setGridGainHome
+setIgniteHome
if [ "${DEFAULT_CONFIG}" == "" ]; then
DEFAULT_CONFIG=config/default-config.xml
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09fae941/bin/igniterouter.sh
--
diff --git a/bin/igniterouter.sh b/bin/igniterouter.sh
index 58fa971..8f18108 100755
--- a/bin/igniterouter.sh
+++ b/bin/igniterouter.sh
@@ -36,7 +36,7 @@ source "${SCRIPTS_HOME}"/include/functions.sh
#
# Discover IGNITE_HOME environment variable.
#
-setGridGainHome
+setIgniteHome
#
# Set router service environment.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09fae941/bin/ignitevisorcmd.sh
--
diff --git a/bin/ignitevisorcmd.sh b/bin/ignitevisorcmd.sh
index 319d282..41ed014 100755
--- a/bin/ignitevisorcmd.sh
+++ b/bin/ignitevisorcmd.sh
@@ -37,7 +37,7 @@ checkJava
#
# Discover IGNITE_HOME environment variable.
#
-setGridGainHome
+setIgniteHome
#
# Parse command line parameters.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09fae941/bin/include/functions.sh
--
diff --git a/bin/include/functions.sh b/bin/include/functions.sh
index 5abb2f5..96dcd82 100755
--- a/bin/include/functions.sh
+++ b/bin/include/functions.sh
@@ -78,7 +78,7 @@ checkJava() {
# The function expects IGNITE_HOME_TMP variable is set and points to the
directory where the callee script resides.
# The function exports IGNITE_HOME variable with path to Ignite home directory.
#
-setGridGainHome() {
+setIgniteHome() {
#
# Set IGNITE_HOME, if needed.
#
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09fae941/bin/setup-hadoop.sh
--
diff --git a/bin/setup-hadoop.sh b/bin/setup-hadoop.sh
index c2c492c..e82ffa1 100755
--- a/bin/setup-hadoop.sh
+++ b/bin/setup-hadoop.sh
@@ -47,7 +47,7 @@ source "${SCRIPTS_HOME}"/include/functions.sh
#
# Discover IGNITE_HOME environment variable.
#
-setGridGainHome
+setIgniteHome
#
# Set utility environment.
[25/25] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-164v2
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-164v2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9ef202ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9ef202ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9ef202ae Branch: refs/heads/ignite-164v2stable Commit: 9ef202aebed6b9ca72c29db386c8cd3dc029cbed Parents: 1fbba7e ce0c304 Author: ivasilinets Authored: Thu Feb 5 22:27:17 2015 +0300 Committer: ivasilinets Committed: Thu Feb 5 22:27:17 2015 +0300 -- .../apache/ignite/internal/processors/rest/GridRestProcessor.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ef202ae/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java --
[13/25] incubator-ignite git commit: Merge branch 'ignite-164v2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-164v2
Merge branch 'ignite-164v2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-164v2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/701baf1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/701baf1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/701baf1a Branch: refs/heads/ignite-164v2stable Commit: 701baf1a4b52ccad020af1a0dfdd64251f4385e7 Parents: 01708f9 5ec80fd Author: ivasilinets Authored: Thu Feb 5 17:35:31 2015 +0300 Committer: ivasilinets Committed: Thu Feb 5 17:35:31 2015 +0300 -- bin/ignite.bat | 22 - bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 26 ++-- bin/ignitevisorcmd.sh | 2 +- bin/include/functions.sh| 4 +-- bin/include/parseargs.bat | 2 +- bin/include/service.sh | 2 +- bin/include/setenv.bat | 10 bin/include/setenv.sh | 6 ++--- bin/setup-hadoop.bat| 2 +- config/hadoop/default-config.xml| 4 +-- .../apache/ignite/hadoop/GridHadoopSetup.java | 4 +-- 12 files changed, 43 insertions(+), 43 deletions(-) --
