You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/04/06 20:40:58 UTC
[01/50] incubator-ignite git commit: # ignite-sprint-3 minor
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471 9020b0c88 -> 5290845f4
# ignite-sprint-3 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/a28bc74c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a28bc74c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a28bc74c
Branch: refs/heads/ignite-471
Commit: a28bc74ce45c50730f0ccb1511f120ceaa34b74f
Parents: 3061522
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 17:19:18 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 17:19:18 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a28bc74c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 01c6135..5924129 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -3993,14 +3993,14 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx {
assert cctx.deferredDelete();
if (deleted) {
- assert !deletedUnlocked();
+ assert !deletedUnlocked() : this;
flags |= IS_DELETED_MASK;
cctx.decrementPublicSize(this);
}
else {
- assert deletedUnlocked();
+ assert deletedUnlocked() : this;
flags &= ~IS_DELETED_MASK;
[10/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-668
Posted by vk...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-668
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.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/223a9cd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/223a9cd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/223a9cd1
Branch: refs/heads/ignite-471
Commit: 223a9cd172a2e4d0bc1349b2d06955b614b9ccf0
Parents: 093489e 580f051
Author: sboikov <se...@inria.fr>
Authored: Sun Apr 5 19:30:09 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sun Apr 5 19:30:09 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
examples/schema-import/bin/db-init.sql | 17 ++
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 62 ++++---
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../processors/plugin/CachePluginManager.java | 51 ++++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 7 -
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +-
parent/pom.xml | 1 -
scripts/git-apply-patch.sh | 94 ++++++++++
scripts/git-format-patch.sh | 87 ++++++++++
scripts/git-patch-functions.sh | 171 +++++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
27 files changed, 547 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/223a9cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 0455ff0,f21eabc..482d816
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@@ -670,7 -682,11 +691,11 @@@ public class GridCacheProcessor extend
if (filter.apply(locNode)) {
CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(null, ccfg.getName(), ccfg);
- GridCacheContext ctx = createCache(ccfg, desc.cacheType(), cacheObjCtx);
+ CachePluginManager pluginMgr = cache2PluginMgr.get(ccfg.getName());
+
+ assert pluginMgr != null : " Map=" + cache2PluginMgr;
+
- GridCacheContext ctx = createCache(ccfg, pluginMgr, cacheObjCtx);
++ GridCacheContext ctx = createCache(ccfg, pluginMgr, desc.cacheType(), cacheObjCtx);
ctx.dynamicDeploymentId(desc.deploymentId());
@@@ -984,22 -1000,24 +1009,29 @@@
/**
* @param cfg Cache configuration to use to create cache.
+ * @param pluginMgr Cache plugin manager.
+ * @param cacheType Cache type.
+ * @param cacheObjCtx Cache object context.
* @return Cache context.
* @throws IgniteCheckedException If failed to create cache.
*/
- @SuppressWarnings({"unchecked"})
- private GridCacheContext createCache(CacheConfiguration<?, ?> cfg, @Nullable CachePluginManager pluginMgr,
- CacheObjectContext cacheObjCtx) throws IgniteCheckedException {
+ private GridCacheContext createCache(CacheConfiguration<?, ?> cfg,
++ @Nullable CachePluginManager pluginMgr,
+ CacheType cacheType,
+ CacheObjectContext cacheObjCtx)
+ throws IgniteCheckedException
+ {
assert cfg != null;
CacheStore cfgStore = cfg.getCacheStoreFactory() != null ? cfg.getCacheStoreFactory().create() : null;
- validate(ctx.config(), cfg, cfgStore);
+ validate(ctx.config(), cfg, cacheType, cfgStore);
+ if (pluginMgr == null)
+ pluginMgr = new CachePluginManager(ctx, cfg);
+
+ pluginMgr.validate();
+
CacheJtaManagerAdapter jta = JTA.create(cfg.getTransactionManagerLookupClassName() == null);
jta.createTmLookup(cfg);
@@@ -1382,7 -1384,7 +1408,7 @@@
CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(null, ccfg.getName(), ccfg);
- GridCacheContext cacheCtx = createCache(ccfg, cacheType, cacheObjCtx);
- GridCacheContext cacheCtx = createCache(ccfg, null, cacheObjCtx);
++ GridCacheContext cacheCtx = createCache(ccfg, null, cacheType, cacheObjCtx);
cacheCtx.startTopologyVersion(topVer);
[41/50] incubator-ignite git commit: merging ignite-479
Posted by vk...@apache.org.
merging ignite-479
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1aaa0b09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1aaa0b09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1aaa0b09
Branch: refs/heads/ignite-471
Commit: 1aaa0b09698d24380160e200fa03ab36feea1f34
Parents: 7e6d193
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Apr 6 18:53:18 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Apr 6 18:53:18 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/util/IgniteUtils.java | 41 +++++++++++++++++++-
.../hadoop/HadoopCommandLineTest.java | 3 +-
2 files changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1aaa0b09/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 8aebac2..8a982bc 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
@@ -964,6 +964,14 @@ public abstract class IgniteUtils {
public static void dumpThreads(@Nullable IgniteLogger log) {
ThreadMXBean mxBean = ManagementFactory.getThreadMXBean();
+ final Set<Long> deadlockedThreadsIds = getDeadlockedThreadIds(mxBean);
+
+ if (deadlockedThreadsIds.size() == 0)
+ warn(log, "No deadlocked threads detected.");
+ else
+ warn(log, "Deadlocked threads detected (see thread dump below) " +
+ "[deadlockedThreadsCnt=" + deadlockedThreadsIds.size() + ']');
+
ThreadInfo[] threadInfos =
mxBean.dumpAllThreads(mxBean.isObjectMonitorUsageSupported(), mxBean.isSynchronizerUsageSupported());
@@ -971,7 +979,7 @@ public abstract class IgniteUtils {
.a(new SimpleDateFormat("yyyy/MM/dd HH:mm:ss z").format(new Date(U.currentTimeMillis()))).a(NL);
for (ThreadInfo info : threadInfos) {
- printThreadInfo(info, sb);
+ printThreadInfo(info, sb, deadlockedThreadsIds);
sb.a(NL);
@@ -988,12 +996,41 @@ public abstract class IgniteUtils {
}
/**
+ * Get deadlocks from the thread bean.
+ * @param mxBean the bean
+ * @return the set of deadlocked threads (may be empty Set, but never null).
+ */
+ private static Set<Long> getDeadlockedThreadIds(ThreadMXBean mxBean) {
+ final long[] deadlockedIds = mxBean.findDeadlockedThreads();
+
+ final Set<Long> deadlockedThreadsIds;
+
+ if (!F.isEmpty(deadlockedIds)) {
+ Set<Long> set = new HashSet<>();
+
+ for (long id : deadlockedIds)
+ set.add(id);
+
+ deadlockedThreadsIds = Collections.unmodifiableSet(set);
+ }
+ else
+ deadlockedThreadsIds = Collections.emptySet();
+
+ return deadlockedThreadsIds;
+ }
+
+ /**
* Prints single thread info to a buffer.
*
* @param threadInfo Thread info.
* @param sb Buffer.
*/
- private static void printThreadInfo(ThreadInfo threadInfo, GridStringBuilder sb) {
+ private static void printThreadInfo(ThreadInfo threadInfo, GridStringBuilder sb, Set<Long> deadlockedIdSet) {
+ final long id = threadInfo.getThreadId();
+
+ if (deadlockedIdSet.contains(id))
+ sb.a("##### DEADLOCKED ");
+
sb.a("Thread [name=\"").a(threadInfo.getThreadName())
.a("\", id=").a(threadInfo.getThreadId())
.a(", state=").a(threadInfo.getThreadState())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1aaa0b09/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopCommandLineTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopCommandLineTest.java
index d10ee5c..f6f7a01 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopCommandLineTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopCommandLineTest.java
@@ -200,7 +200,8 @@ public class HadoopCommandLineTest extends GridCommonAbstractTest {
@Override protected void afterTestsStopped() throws Exception {
super.afterTestsStopped();
- U.delete(testWorkDir);
+ if (testWorkDir != null)
+ U.delete(testWorkDir);
}
/** {@inheritDoc} */
[29/50] incubator-ignite git commit: ignite-667
Posted by vk...@apache.org.
ignite-667
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aae951e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aae951e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aae951e7
Branch: refs/heads/ignite-471
Commit: aae951e7703a559685fc1d1f26d841b40eacb29c
Parents: 5c575f6
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 14:52:31 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 14:52:31 2015 +0300
----------------------------------------------------------------------
parent/pom.xml | 49 +++++++++++++++++++------------------------------
1 file changed, 19 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aae951e7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8affeef..5ba2437 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -535,6 +535,25 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>module-javadoc</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <phase>install</phase>
+ <configuration>
+ <stylesheetfile>
+ ${project.basedir}/${project.parent.relativePath}/../assembly/docfiles/javadoc.css
+ </stylesheetfile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -644,36 +663,6 @@
</profile>
<profile>
- <id>release</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>module-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <stylesheetfile>
- ${project.basedir}/${project.parent.relativePath}/../assembly/docfiles/javadoc.css
- </stylesheetfile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>surefire-fork-count-1</id>
<activation>
<property>
[36/50] incubator-ignite git commit: ignite-678 fix
Posted by vk...@apache.org.
ignite-678 fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5e84cda6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5e84cda6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5e84cda6
Branch: refs/heads/ignite-471
Commit: 5e84cda6cdc82c0471e991a2e2154d947341ba0e
Parents: af5c9d3
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 17:26:15 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 17:26:15 2015 +0300
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e84cda6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cd2d723..bc58e04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -494,6 +494,7 @@
</execution>
</executions>
<configuration>
+ <failOnError>false</failOnError>
<fileSets>
<fileSet>
<directory>target</directory>
@@ -522,6 +523,7 @@
</goals>
<phase>deploy</phase>
<configuration>
+ <failOnError>false</failOnError>
<target>
<zip destfile="${basedir}/target/sources-pack-${project.version}.zip" encoding="UTF-8">
<zipfileset dir="${basedir}/target" prefix="sources-pack-${project.version}">
[13/50] incubator-ignite git commit: # sprint-3 - comment update
Posted by vk...@apache.org.
# sprint-3 - comment update
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/20d3ff80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/20d3ff80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/20d3ff80
Branch: refs/heads/ignite-471
Commit: 20d3ff80f97c57fd4f79c226c741a895f4e9cc5e
Parents: 580f051
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sun Apr 5 14:18:26 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sun Apr 5 14:18:26 2015 -0700
----------------------------------------------------------------------
.../ignite/examples/streaming/numbers/StreamRandomNumbers.java | 2 +-
.../examples/java8/streaming/numbers/StreamRandomNumbers.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20d3ff80/examples/src/main/java/org/apache/ignite/examples/streaming/numbers/StreamRandomNumbers.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/numbers/StreamRandomNumbers.java b/examples/src/main/java/org/apache/ignite/examples/streaming/numbers/StreamRandomNumbers.java
index f1e55d2..02030fb 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/numbers/StreamRandomNumbers.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/numbers/StreamRandomNumbers.java
@@ -57,7 +57,7 @@ public class StreamRandomNumbers {
// Allow data updates.
stmr.allowOverwrite(true);
- // Configure data transformation to count instances of the same word.
+ // Configure data transformation to count instances of the same number.
stmr.receiver(new StreamTransformer<Integer, Long>() {
@Override public Object process(MutableEntry<Integer, Long> e, Object... objects)
throws EntryProcessorException {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20d3ff80/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
index 630f4e3..e52b674 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/streaming/numbers/StreamRandomNumbers.java
@@ -56,7 +56,7 @@ public class StreamRandomNumbers {
// Allow data updates.
stmr.allowOverwrite(true);
- // Configure data transformation to count instances of the same word.
+ // Configure data transformation to count instances of the same number.
stmr.receiver(StreamTransformer.from((e, arg) -> {
Long val = e.getValue();
[09/50] incubator-ignite git commit: ignite-666: Exclude **/*.sql
pattern from RAT exclude list
Posted by vk...@apache.org.
ignite-666: Exclude **/*.sql pattern from RAT exclude list
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/580f0511
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/580f0511
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/580f0511
Branch: refs/heads/ignite-471
Commit: 580f0511771c414fc8e12937701f73946623b265
Parents: 5cc2d36
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 19:52:57 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 19:52:57 2015 +0300
----------------------------------------------------------------------
examples/schema-import/bin/db-init.sql | 17 +++++++++++++++++
parent/pom.xml | 1 -
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580f0511/examples/schema-import/bin/db-init.sql
----------------------------------------------------------------------
diff --git a/examples/schema-import/bin/db-init.sql b/examples/schema-import/bin/db-init.sql
index 4568959..f02236a 100644
--- a/examples/schema-import/bin/db-init.sql
+++ b/examples/schema-import/bin/db-init.sql
@@ -1,3 +1,20 @@
+--
+-- 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.
+--
+
-- Script of database initialization for Schema Import Demo.
drop table PERSON;
create table PERSON(id integer not null, first_name varchar(50), last_name varchar(50), salary double not null, PRIMARY KEY(id));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580f0511/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f475b85..8affeef 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -598,7 +598,6 @@
<exclude>**/keystore/*.jks</exclude><!--bin-files-->
<exclude>**/keystore/*.pem</exclude><!--auto generated files-->
<exclude>**/keystore/*.pfx</exclude><!--bin-files-->
- <exclude>**/*.sql</exclude><!--sql files -->
<!--special excludes-->
<exclude>DEVNOTES.txt</exclude>
<exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--BSD license-->
[28/50] incubator-ignite git commit: # IGNITE-540 Remove temporary
code.
Posted by vk...@apache.org.
# IGNITE-540 Remove temporary 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/39ee7171
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39ee7171
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39ee7171
Branch: refs/heads/ignite-471
Commit: 39ee71715228a2fe1557617adc4dee5289b0c221
Parents: 8a5180c
Author: sevdokimov <se...@gridgain.com>
Authored: Mon Apr 6 14:43:08 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon Apr 6 14:43:08 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/twostep/GridReduceQueryExecutor.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39ee7171/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 7941f12..acdc1bf 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -463,9 +463,6 @@ public class GridReduceQueryExecutor implements GridMessageListener {
if (scale > precision)
precision = scale;
}
- else {
- System.out.println("1");
- }
Column col = new Column(name, type, precision, scale, displaySize);
cols.add(col);
@@ -492,7 +489,7 @@ public class GridReduceQueryExecutor implements GridMessageListener {
Query prepare = (Query)ses.prepare(qry.query(), false);
- ArrayList<Parameter> parsedParams = prepare.getParameters();
+ List<Parameter> parsedParams = prepare.getParameters();
for (int i = Math.min(parsedParams.size(), qry.parameters().length); --i >= 0; ) {
Object val = qry.parameters()[i];
[43/50] incubator-ignite git commit: minor
Posted by vk...@apache.org.
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/369a36d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/369a36d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/369a36d7
Branch: refs/heads/ignite-471
Commit: 369a36d70f27571cd084b3b1b4990440cd4a510c
Parents: 15cebfc
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Apr 6 18:57:34 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Apr 6 18:57:34 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 5 +++--
.../internal/processors/hadoop/HadoopCommandLineTest.java | 3 +--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/369a36d7/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 8a982bc..1aac985 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
@@ -3012,8 +3012,9 @@ public abstract class IgniteUtils {
* @return {@code true} if and only if the file or directory is successfully deleted,
* {@code false} otherwise
*/
- public static boolean delete(File file) {
- assert file != null;
+ public static boolean delete(@Nullable File file) {
+ if (file == null)
+ return false;
boolean res = true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/369a36d7/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopCommandLineTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopCommandLineTest.java
index f6f7a01..d10ee5c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopCommandLineTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopCommandLineTest.java
@@ -200,8 +200,7 @@ public class HadoopCommandLineTest extends GridCommonAbstractTest {
@Override protected void afterTestsStopped() throws Exception {
super.afterTestsStopped();
- if (testWorkDir != null)
- U.delete(testWorkDir);
+ U.delete(testWorkDir);
}
/** {@inheritDoc} */
[26/50] incubator-ignite git commit: ignite-678
Posted by vk...@apache.org.
ignite-678
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5c575f6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5c575f6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5c575f6f
Branch: refs/heads/ignite-471
Commit: 5c575f6fdfeae91e075c9b7f74d46850bbf1b8b5
Parents: ec153ea
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 14:02:27 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 14:02:27 2015 +0300
----------------------------------------------------------------------
pom.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c575f6f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5390fe5..cd2d723 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,9 @@
<profile>
<id>dev-libs</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
<plugins>
<plugin>
[27/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-571' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-571' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e9a5c97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e9a5c97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e9a5c97
Branch: refs/heads/ignite-471
Commit: 9e9a5c972bf78bccc8f486a3a9709bf8bd605621
Parents: e061985 6924f0f
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Apr 6 14:39:11 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Apr 6 14:39:11 2015 +0300
----------------------------------------------------------------------
modules/clients/readme.md | 2 -
.../processors/cache/CacheDistributionMode.java | 67 --------------------
.../IgniteCollectionAbstractTest.java | 23 -------
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +--
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
modules/yardstick/README.md | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 +++++--
.../org/apache/ignite/yardstick/IgniteNode.java | 11 ++--
14 files changed, 44 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
[25/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ec153eae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec153eae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec153eae
Branch: refs/heads/ignite-471
Commit: ec153eae19050e309cafe7cc894311abd0d51d17
Parents: 9a3373f 9e9a5c9
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 13:55:32 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 13:55:32 2015 +0300
----------------------------------------------------------------------
modules/clients/readme.md | 2 -
.../processors/cache/CacheDistributionMode.java | 67 --------------------
.../IgniteCollectionAbstractTest.java | 23 -------
...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +--
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
modules/yardstick/README.md | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 +++++--
.../org/apache/ignite/yardstick/IgniteNode.java | 11 ++--
14 files changed, 44 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
[04/50] incubator-ignite git commit: #ignite-gg-9966: review.
Posted by vk...@apache.org.
#ignite-gg-9966: review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4c99d6cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4c99d6cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4c99d6cd
Branch: refs/heads/ignite-471
Commit: 4c99d6cd179b2c805c0a1732c170e1a492463e0f
Parents: dfc3a01
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Apr 3 18:08:37 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Apr 3 18:08:37 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 4 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 10 ++-
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 6 +-
.../DiscoveryNodeValidationProcessor.java | 27 +++++++
.../OsDiscoveryNodeValidationProcessor.java | 74 ++++++++++++++++++
.../spi/NodeVersionValidatorProcessor.java | 27 -------
.../spi/OsNodeVersionValidatorProcessor.java | 80 --------------------
.../ignite/spi/IgniteNodeValidationResult.java | 66 ++++++++++++++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 ----------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../testframework/GridSpiTestContext.java | 2 +-
17 files changed, 189 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
index 47923e0..9f08d6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridComponent.java
@@ -106,7 +106,7 @@ public interface GridComponent {
* @param node Joining node.
* @return Validation result or {@code null} in case of success.
*/
- @Nullable public IgniteSpiNodeValidationResult validateNode(ClusterNode node);
+ @Nullable public IgniteNodeValidationResult validateNode(ClusterNode node);
/**
* Gets unique component type to distinguish components providing discovery data. Must return non-null value
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index e999a49..1ff483e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -53,7 +53,7 @@ import org.apache.ignite.internal.processors.security.*;
import org.apache.ignite.internal.processors.segmentation.*;
import org.apache.ignite.internal.processors.service.*;
import org.apache.ignite.internal.processors.session.*;
-import org.apache.ignite.internal.processors.spi.*;
+import org.apache.ignite.internal.processors.nodevalidation.*;
import org.apache.ignite.internal.processors.task.*;
import org.apache.ignite.internal.processors.timeout.*;
import org.apache.ignite.internal.util.*;
@@ -476,7 +476,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
dataStructuresProc = (DataStructuresProcessor)comp;
else if (comp instanceof ClusterProcessor)
cluster = (ClusterProcessor)comp;
- else if (!(comp instanceof NodeVersionValidatorProcessor))
+ else if (!(comp instanceof DiscoveryNodeValidationProcessor))
assert (comp instanceof GridPluginComponent) : "Unknown manager class: " + comp.getClass();
if (addToList)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
index dca2e91..305a7e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java
@@ -83,14 +83,14 @@ public class GridPluginComponent implements GridComponent {
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
try {
plugin.validateNewNode(node);
return null;
}
catch (PluginValidationException e) {
- return new IgniteSpiNodeValidationResult(e.nodeId(), e.getMessage(), e.remoteMessage());
+ return new IgniteNodeValidationResult(e.nodeId(), e.getMessage(), e.remoteMessage());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 48109931..e8fd1ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -56,7 +56,7 @@ import org.apache.ignite.internal.processors.security.*;
import org.apache.ignite.internal.processors.segmentation.*;
import org.apache.ignite.internal.processors.service.*;
import org.apache.ignite.internal.processors.session.*;
-import org.apache.ignite.internal.processors.spi.*;
+import org.apache.ignite.internal.processors.nodevalidation.*;
import org.apache.ignite.internal.processors.task.*;
import org.apache.ignite.internal.processors.timeout.*;
import org.apache.ignite.internal.util.*;
@@ -735,7 +735,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Start processors before discovery manager, so they will
// be able to start receiving messages once discovery completes.
- startProcessor(createComponent(NodeVersionValidatorProcessor.class, ctx));
+ startProcessor(createComponent(DiscoveryNodeValidationProcessor.class, ctx));
startProcessor(new GridClockSyncProcessor(ctx));
startProcessor(new GridAffinityProcessor(ctx));
startProcessor(createComponent(GridSegmentationProcessor.class, ctx));
@@ -1157,6 +1157,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Stick in some system level attributes
add(ATTR_JIT_NAME, U.getCompilerMx() == null ? "" : U.getCompilerMx().getName());
+ add(ATTR_BUILD_VER, VER_STR);
+ add(ATTR_BUILD_DATE, BUILD_TSTAMP_STR);
add(ATTR_MARSHALLER, cfg.getMarshaller().getClass().getName());
add(ATTR_USER_NAME, System.getProperty("user.name"));
add(ATTR_GRID_NAME, gridName);
@@ -2726,8 +2728,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
if (cls.equals(IgniteCacheObjectProcessor.class))
return (T)new IgniteCacheObjectProcessorImpl(ctx);
- if (cls.equals(NodeVersionValidatorProcessor.class))
- return (T)new OsNodeVersionValidatorProcessor(ctx);
+ if (cls.equals(DiscoveryNodeValidationProcessor.class))
+ return (T)new OsDiscoveryNodeValidationProcessor(ctx);
Class<T> implCls = null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 982ca86..665f205 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -469,9 +469,9 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
}
}
- @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
for (GridComponent comp : ctx) {
- IgniteSpiNodeValidationResult err = comp.validateNode(node);
+ IgniteNodeValidationResult err = comp.validateNode(node);
if (err != null)
return err;
@@ -612,7 +612,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
index f00aac3..39ccd7a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/GridProcessorAdapter.java
@@ -113,7 +113,7 @@ public abstract class GridProcessorAdapter implements GridProcessor {
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index c366520..ec708b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1871,7 +1871,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
return validateHashIdResolvers(node);
}
@@ -1879,7 +1879,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* @param node Joining node.
* @return Validation result or {@code null} in case of success.
*/
- @Nullable private IgniteSpiNodeValidationResult validateHashIdResolvers(ClusterNode node) {
+ @Nullable private IgniteNodeValidationResult validateHashIdResolvers(ClusterNode node) {
for (DynamicCacheDescriptor desc : registeredCaches.values()) {
CacheConfiguration cfg = desc.cacheConfiguration();
@@ -1906,7 +1906,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
", hashIdResolverClass=" + hashIdRslvr.getClass().getName() + ", existingNodeId=" +
topNode.id() + ']';
- return new IgniteSpiNodeValidationResult(topNode.id(), errMsg, sndMsg);
+ return new IgniteNodeValidationResult(topNode.id(), errMsg, sndMsg);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
new file mode 100644
index 0000000..d0f4624
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.nodevalidation;
+
+import org.apache.ignite.internal.processors.*;
+
+/**
+ * Node Version Validation.
+ */
+public interface DiscoveryNodeValidationProcessor extends GridProcessor {
+ //No-op.
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
new file mode 100644
index 0000000..628d7c9
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.nodevalidation;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.spi.*;
+import org.jetbrains.annotations.*;
+
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteVersionUtils.*;
+
+/**
+ * Node validation.
+ */
+public class OsDiscoveryNodeValidationProcessor extends GridProcessorAdapter implements DiscoveryNodeValidationProcessor {
+ /**
+ * @param ctx Kernal context.
+ */
+ public OsDiscoveryNodeValidationProcessor(GridKernalContext ctx) {
+ super(ctx);
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
+ ClusterNode locNode = ctx.discovery().localNode();
+
+ // Check version.
+ String locBuildVer = locNode.attribute(ATTR_BUILD_VER);
+ String rmtBuildVer = node.attribute(ATTR_BUILD_VER);
+
+ if (!F.eq(rmtBuildVer, locBuildVer)) {
+ // OS nodes don't support rolling updates.
+ if (!locBuildVer.equals(rmtBuildVer)) {
+ String errMsg = "Local node and remote node have different version numbers " +
+ "(node will not join, Ignite does not support rolling updates, " +
+ "so versions must be exactly the same) " +
+ "[locBuildVer=" + locBuildVer + ", rmtBuildVer=" + rmtBuildVer +
+ ", locNodeAddrs=" + U.addressesAsString(locNode) +
+ ", rmtNodeAddrs=" + U.addressesAsString(node) +
+ ", locNodeId=" + locNode.id() + ", rmtNodeId=" + node.id() + ']';
+
+ LT.warn(log, null, errMsg);
+
+ // Always output in debug.
+ if (log.isDebugEnabled())
+ log.debug(errMsg);
+
+ return new IgniteNodeValidationResult(node.id(), errMsg, errMsg);
+ }
+ }
+
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/NodeVersionValidatorProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/NodeVersionValidatorProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/NodeVersionValidatorProcessor.java
deleted file mode 100644
index 5ac1af0..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/NodeVersionValidatorProcessor.java
+++ /dev/null
@@ -1,27 +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.processors.spi;
-
-import org.apache.ignite.internal.processors.*;
-
-/**
- * Node Version Validator.
- */
-public interface NodeVersionValidatorProcessor extends GridProcessor {
- //No-op.
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeVersionValidatorProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeVersionValidatorProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeVersionValidatorProcessor.java
deleted file mode 100644
index 3d151f3..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeVersionValidatorProcessor.java
+++ /dev/null
@@ -1,80 +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.processors.spi;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
-
-/**
- * Node validator.
- */
-public class OsNodeVersionValidatorProcessor extends GridProcessorAdapter implements NodeVersionValidatorProcessor {
- /**
- * @param ctx Kernal context.
- */
- public OsNodeVersionValidatorProcessor(GridKernalContext ctx) {
- super(ctx);
- }
-
- /** {@inheritDoc} */
- @Override public void start() throws IgniteCheckedException {
- ctx.addNodeAttribute(ATTR_BUILD_VER, VER_STR);
- ctx.addNodeAttribute(ATTR_BUILD_DATE, BUILD_TSTAMP_STR);
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
- ClusterNode locNode = ctx.discovery().localNode();
-
- // Check version.
- String locBuildVer = locNode.attribute(ATTR_BUILD_VER);
- String rmtBuildVer = node.attribute(ATTR_BUILD_VER);
-
- if (!F.eq(rmtBuildVer, locBuildVer)) {
- // OS nodes don't support rolling updates.
- if (!locBuildVer.equals(rmtBuildVer)) {
- String errMsg = "Local node and remote node have different version numbers " +
- "(node will not join, Ignite does not support rolling updates, " +
- "so versions must be exactly the same) " +
- "[locBuildVer=" + locBuildVer + ", rmtBuildVer=" + rmtBuildVer +
- ", locNodeAddrs=" + U.addressesAsString(locNode) +
- ", rmtNodeAddrs=" + U.addressesAsString(node) +
- ", locNodeId=" + locNode.id() + ", rmtNodeId=" + node.id() + ']';
-
- LT.warn(log, null, errMsg);
-
- // Always output in debug.
- if (log.isDebugEnabled())
- log.debug(errMsg);
-
- return new IgniteSpiNodeValidationResult(node.id(), errMsg, errMsg);
- }
- }
-
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
new file mode 100644
index 0000000..0c3746c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteNodeValidationResult.java
@@ -0,0 +1,66 @@
+/*
+ * 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.spi;
+
+import java.util.*;
+
+/**
+ * Result of joining node validation.
+ */
+public class IgniteNodeValidationResult {
+ /** Offending node ID. */
+ private final UUID nodeId;
+
+ /** Error message to be logged locally. */
+ private final String msg;
+
+ /** Error message to be sent to joining node. */
+ private final String sndMsg;
+
+ /**
+ * @param nodeId Offending node ID.
+ * @param msg Message logged locally.
+ * @param sndMsg Message sent to joining node.
+ */
+ public IgniteNodeValidationResult(UUID nodeId, String msg, String sndMsg) {
+ this.nodeId = nodeId;
+ this.msg = msg;
+ this.sndMsg = sndMsg;
+ }
+
+ /**
+ * @return Offending node ID.
+ */
+ public UUID nodeId() {
+ return nodeId;
+ }
+
+ /**
+ * @return Message to be logged locally.
+ */
+ public String message() {
+ return msg;
+ }
+
+ /**
+ * @return Message to be sent to joining node.
+ */
+ public String sendMessage() {
+ return sndMsg;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index bb66872..1c9b4db 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -664,7 +664,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
index 75b637d..5eef37a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
@@ -302,7 +302,7 @@ public interface IgniteSpiContext {
* @param node Joining node.
* @return Validation result or {@code null} in case of success.
*/
- @Nullable public IgniteSpiNodeValidationResult validateNode(ClusterNode node);
+ @Nullable public IgniteNodeValidationResult validateNode(ClusterNode node);
/**
* Gets collection of authenticated subjects together with their permissions.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNodeValidationResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNodeValidationResult.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNodeValidationResult.java
deleted file mode 100644
index 2c60bc7..0000000
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiNodeValidationResult.java
+++ /dev/null
@@ -1,66 +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.spi;
-
-import java.util.*;
-
-/**
- * Result of joining node validation.
- */
-public class IgniteSpiNodeValidationResult {
- /** Offending node ID. */
- private final UUID nodeId;
-
- /** Error message to be logged locally. */
- private final String msg;
-
- /** Error message to be sent to joining node. */
- private final String sndMsg;
-
- /**
- * @param nodeId Offending node ID.
- * @param msg Message logged locally.
- * @param sndMsg Message sent to joining node.
- */
- public IgniteSpiNodeValidationResult(UUID nodeId, String msg, String sndMsg) {
- this.nodeId = nodeId;
- this.msg = msg;
- this.sndMsg = sndMsg;
- }
-
- /**
- * @return Offending node ID.
- */
- public UUID nodeId() {
- return nodeId;
- }
-
- /**
- * @return Message to be logged locally.
- */
- public String message() {
- return msg;
- }
-
- /**
- * @return Message to be sent to joining node.
- */
- public String sendMessage() {
- return sndMsg;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index d17f9b3..a4cb816 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -3216,7 +3216,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
}
}
- IgniteSpiNodeValidationResult err = getSpiContext().validateNode(node);
+ IgniteNodeValidationResult err = getSpiContext().validateNode(node);
if (err != null) {
boolean ping = node.id().equals(err.nodeId()) ? pingNode(node) : pingNode(err.nodeId());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c99d6cd/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
index a754910..a4e011a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
@@ -469,7 +469,7 @@ public class GridSpiTestContext implements IgniteSpiContext {
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) {
+ @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
return null;
}
[32/50] incubator-ignite git commit: ignite-sprint-3 - portable class
fix
Posted by vk...@apache.org.
ignite-sprint-3 - portable class fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a7ba0bea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7ba0bea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7ba0bea
Branch: refs/heads/ignite-471
Commit: a7ba0bea463648031bb7b2afb626a63ef2215f96
Parents: 5421701
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Apr 6 15:55:21 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Apr 6 15:55:21 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/query/GridQueryProcessor.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7ba0bea/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index ba8479f..0ea0b99 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -402,7 +402,9 @@ public class GridQueryProcessor extends GridProcessorAdapter {
TypeId id;
- if (ctx.cacheObjects().isPortableObject(val)) {
+ boolean portableVal = ctx.cacheObjects().isPortableObject(val);
+
+ if (portableVal) {
int typeId = ctx.cacheObjects().typeId(val);
id = new TypeId(space, typeId);
@@ -415,12 +417,12 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (desc == null || !desc.registered())
return;
- if (!desc.valueClass().isAssignableFrom(valCls))
+ if (!portableVal && !desc.valueClass().isAssignableFrom(valCls))
throw new IgniteCheckedException("Failed to update index due to class name conflict" +
"(multiple classes with same simple name are stored in the same cache) " +
"[expCls=" + desc.valueClass().getName() + ", actualCls=" + valCls.getName() + ']');
- if (!desc.keyClass().isAssignableFrom(key.getClass()))
+ if (!ctx.cacheObjects().isPortableObject(key) && !desc.keyClass().isAssignableFrom(key.getClass()))
throw new IgniteCheckedException("Failed to update index, incorrect key class [expCls=" +
desc.keyClass().getName() + ", actualCls=" + key.getClass().getName() + "]");
[34/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-gg-9966' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-gg-9966' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60aaaaa0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60aaaaa0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60aaaaa0
Branch: refs/heads/ignite-471
Commit: 60aaaaa08b1b6b7a15de11e533081dc444b5226e
Parents: 5421701 2f1ecc5
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Apr 6 16:31:26 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Apr 6 16:31:26 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../org/apache/ignite/internal/IgniteEx.java | 7 --
.../apache/ignite/internal/IgniteKernal.java | 25 +----
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 6 +-
.../DiscoveryNodeValidationProcessor.java | 27 +++++
.../OsDiscoveryNodeValidationProcessor.java | 72 +++++++++++++
.../ignite/spi/IgniteNodeValidationResult.java | 66 ++++++++++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 ------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 106 +------------------
.../testframework/GridSpiTestContext.java | 2 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 5 -
18 files changed, 186 insertions(+), 220 deletions(-)
----------------------------------------------------------------------
[03/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-gg-9966
Posted by vk...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-gg-9966
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dfc3a01b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dfc3a01b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dfc3a01b
Branch: refs/heads/ignite-471
Commit: dfc3a01ba170025e91c4782e8b4636316e39587e
Parents: 6dc40be 09a3a82
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Apr 3 17:41:27 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Apr 3 17:41:27 2015 +0300
----------------------------------------------------------------------
modules/core/pom.xml | 38 +--
.../cache/CacheEvictableEntryImpl.java | 11 +-
.../processors/cache/CacheProjection.java | 36 ---
.../processors/cache/GridCacheAdapter.java | 257 +------------------
.../cache/GridCacheDeploymentManager.java | 7 +-
.../processors/cache/GridCacheEntryEx.java | 55 +---
.../processors/cache/GridCacheMapEntry.java | 232 +----------------
.../processors/cache/GridCachePeekMode.java | 81 ------
.../cache/GridCacheProjectionImpl.java | 11 -
.../processors/cache/GridCacheProxyImpl.java | 24 --
.../processors/cache/GridCacheUtils.java | 11 -
.../distributed/dht/GridDhtCacheAdapter.java | 9 +-
.../dht/atomic/GridDhtAtomicCache.java | 29 +--
.../dht/colocated/GridDhtColocatedCache.java | 30 +--
.../distributed/near/GridNearCacheAdapter.java | 72 +-----
.../distributed/near/GridNearTxRemote.java | 11 +-
.../processors/task/GridTaskProcessor.java | 9 +-
.../resources/META-INF/classnames.properties | 1 -
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../processors/cache/GridCacheTestEntryEx.java | 40 +--
...GridCacheDhtEvictionNearReadersSelfTest.java | 14 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 24 +-
.../dht/GridCacheDhtMappingSelfTest.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 103 +++-----
.../near/GridCacheNearOneNodeSelfTest.java | 33 +--
.../near/GridCacheNearReadersSelfTest.java | 154 +++++------
.../GridCacheReplicatedPreloadSelfTest.java | 11 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 3 +-
.../processors/igfs/IgfsSizeSelfTest.java | 46 +---
.../junits/common/GridCommonAbstractTest.java | 42 +++
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 3 +
.../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +-
32 files changed, 314 insertions(+), 1091 deletions(-)
----------------------------------------------------------------------
[15/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-668' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-668' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cad2ab38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cad2ab38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cad2ab38
Branch: refs/heads/ignite-471
Commit: cad2ab38051171499023a8f716f670a6f2144bf3
Parents: 5b806d8 223a9cd
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 09:11:26 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 09:11:26 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/CacheType.java | 77 +++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 133 +++++++++++-----
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 ++-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++---
.../cache/IgniteInternalCacheTypesTest.java | 159 +++++++++++++++++++
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 --------------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
23 files changed, 592 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
[22/50] incubator-ignite git commit: # ignite-571
Posted by vk...@apache.org.
# ignite-571
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6924f0fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6924f0fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6924f0fa
Branch: refs/heads/ignite-471
Commit: 6924f0fa92f8c812182f3b9977b7dba1d16ac8ea
Parents: 4138890
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 12:01:22 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 12:01:22 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java | 2 +-
.../cache/distributed/near/GridCacheNearEvictionSelfTest.java | 2 +-
.../near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java | 4 ++--
.../src/main/java/org/apache/ignite/yardstick/IgniteNode.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index 99b95ce..442f598 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@ -83,7 +83,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
nearCfg.setNearEvictionPolicy(new FifoEvictionPolicy(10));
- cfg.setNearCacheConfiguration(nearCfg);
+ cacheCfg.setNearConfiguration(nearCfg);
cfg.setCacheConfiguration(cacheCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index 4b1c933..ec3a3e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@ -62,7 +62,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
NearCacheConfiguration nearCfg = new NearCacheConfiguration();
- c.setNearCacheConfiguration(nearCfg);
+ cc.setNearConfiguration(nearCfg);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
index 0b86d52..05eab37 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
@@ -106,9 +106,9 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
cc.setWriteThrough(true);
cc.setLoadPreviousValue(true);
- c.setCacheConfiguration(cc);
+ cc.setNearConfiguration(nearCacheConfiguration());
- c.setNearCacheConfiguration(nearCacheConfiguration());
+ c.setCacheConfiguration(cc);
return c;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
index ad6cffa..8638623 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -79,7 +79,7 @@ public class IgniteNode implements BenchmarkServer {
c.setClientMode(true);
if (args.isNearCache())
- c.setNearCacheConfiguration(new NearCacheConfiguration());
+ cc.setNearConfiguration(new NearCacheConfiguration());
cc.setWriteSynchronizationMode(args.syncMode());
[24/50] incubator-ignite git commit: ignite-678
Posted by vk...@apache.org.
ignite-678
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a3373f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a3373f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a3373f2
Branch: refs/heads/ignite-471
Commit: 9a3373f2e64fcc86b9921eb2fd7a1aac14933429
Parents: e061985
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 13:54:57 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 13:54:57 2015 +0300
----------------------------------------------------------------------
assembly/release-fabric.xml | 5 ---
pom.xml | 95 +++++++++++++++++++++++++++++++++++++---
2 files changed, 89 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a3373f2/assembly/release-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index c3e6d35..3bd0997 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -86,11 +86,6 @@
</fileSet>
<fileSet>
- <directory>libs</directory>
- <outputDirectory>/libs</outputDirectory>
- </fileSet>
-
- <fileSet>
<directory>examples</directory>
<outputDirectory>/examples</outputDirectory>
<includes>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a3373f2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 32da7eb..5390fe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,10 +99,7 @@
</profile>
<profile>
- <id>clean-libs</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
+ <id>dev-libs</id>
<build>
<plugins>
<plugin>
@@ -128,6 +125,29 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>dev-libs</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <copy todir="${basedir}/libs">
+ <fileset dir="${basedir}/target/release-package/libs"/>
+ </copy>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -323,7 +343,7 @@
<descriptors>
<descriptor>${basedir}/assembly/dependencies-${ignite.edition}.xml</descriptor>
</descriptors>
- <outputDirectory>${basedir}</outputDirectory>
+ <outputDirectory>${basedir}/target/release-package</outputDirectory>
<finalName>libs</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
@@ -340,7 +360,7 @@
<descriptor>${basedir}/assembly/dependencies-optional-${ignite.edition}.xml
</descriptor>
</descriptors>
- <outputDirectory>${basedir}/libs</outputDirectory>
+ <outputDirectory>${basedir}/target/release-package/libs</outputDirectory>
<finalName>optional</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
@@ -453,5 +473,68 @@
<module>examples</module>
</modules>
</profile>
+
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>net.ju-n.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>files</goal>
+ </goals>
+ <phase>install</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <includes>
+ <include>ignite-${project.version}-source-release.zip</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <algorithms>
+ <algorithm>MD5</algorithm>
+ <algorithm>SHA-1</algorithm>
+ </algorithms>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>apache-sources-pack</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>deploy</phase>
+ <configuration>
+ <target>
+ <zip destfile="${basedir}/target/sources-pack-${project.version}.zip" encoding="UTF-8">
+ <zipfileset dir="${basedir}/target" prefix="sources-pack-${project.version}">
+ <include name="ignite-${project.version}-source-release.zip" />
+ <include name="ignite-${project.version}-source-release.zip.asc" />
+ <include name="ignite-${project.version}-source-release.zip.md5" />
+ <include name="ignite-${project.version}-source-release.zip.sha1" />
+ </zipfileset>
+ </zip>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
[11/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-675
Posted by vk...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-675
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dac23c45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dac23c45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dac23c45
Branch: refs/heads/ignite-471
Commit: dac23c45e1e317daee1ca6e31d60e3c742ad8c25
Parents: 3502ff0 580f051
Author: sboikov <se...@inria.fr>
Authored: Sun Apr 5 20:08:05 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sun Apr 5 20:08:05 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
examples/schema-import/bin/db-init.sql | 17 ++
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 64 ++++---
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../processors/plugin/CachePluginManager.java | 51 ++++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 7 -
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +-
parent/pom.xml | 1 -
scripts/git-apply-patch.sh | 94 ++++++++++
scripts/git-format-patch.sh | 87 ++++++++++
scripts/git-patch-functions.sh | 171 +++++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
27 files changed, 548 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
[17/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-gg-9966
Posted by vk...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-gg-9966
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c3a03442
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3a03442
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3a03442
Branch: refs/heads/ignite-471
Commit: c3a03442f4b0fa81076a452671284d36181f9213
Parents: 4c99d6c dd944bf
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 10:34:52 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 10:34:52 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
examples/schema-import/bin/db-init.sql | 17 ++
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../internal/processors/cache/CacheType.java | 77 ++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 189 +++++++++++++------
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../processors/plugin/CachePluginManager.java | 51 +++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../processors/task/GridTaskProcessor.java | 24 ++-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 7 -
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++--
.../cache/IgniteInternalCacheTypesTest.java | 159 ++++++++++++++++
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
.../near/GridCacheNearReadersSelfTest.java | 2 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 -----------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/messaging/GridMessagingSelfTest.java | 50 +++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +-
parent/pom.xml | 1 -
scripts/git-apply-patch.sh | 94 +++++++++
scripts/git-format-patch.sh | 87 +++++++++
scripts/git-patch-functions.sh | 171 +++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
56 files changed, 1214 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a03442/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
[49/50] incubator-ignite git commit: IGNITE-471 - Marshalling
refactoring
Posted by vk...@apache.org.
IGNITE-471 - Marshalling refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19a14bb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19a14bb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19a14bb0
Branch: refs/heads/ignite-471
Commit: 19a14bb035d543abfd149fb028c7afae95944aa4
Parents: 42e5759
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Mon Apr 6 11:29:49 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Mon Apr 6 11:29:49 2015 -0700
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheAdapter.java | 2 +-
.../apache/ignite/internal/util/IgniteUtils.java | 3 +++
modules/indexing/pom.xml | 16 ++++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a14bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 82a5f9c..ecf48e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -5492,7 +5492,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal(in);
- keys = (Set<K>) in.readObject();
+ keys = (Set<K>)in.readObject();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a14bb0/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 f4f2d65..3aa71f7 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
@@ -7854,6 +7854,9 @@ public abstract class IgniteUtils {
if (cls != null)
return cls;
+ if (ldr == null)
+ ldr = gridClassLoader;
+
ConcurrentMap<String, Class> ldrMap = classCache.get(ldr);
if (ldrMap == null) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a14bb0/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 5851e66..ca9eb21 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -93,4 +93,20 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
[21/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-571' into ignite-571
Posted by vk...@apache.org.
Merge remote-tracking branch 'origin/ignite-571' into ignite-571
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41388900
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41388900
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41388900
Branch: refs/heads/ignite-471
Commit: 413889005e6ab9b193f19cc3b2bf4c5538cbfabd
Parents: 426f023 70d539c
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 11:48:06 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 11:48:06 2015 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[38/50] incubator-ignite git commit: ignite-sprint-3 - map query sort
limit fix (IGNITE-682)
Posted by vk...@apache.org.
ignite-sprint-3 - map query sort limit fix (IGNITE-682)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f34c46a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f34c46a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f34c46a
Branch: refs/heads/ignite-471
Commit: 2f34c46a695ed93f39cbc9f32b790f443fe0596b
Parents: 88268bf
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Apr 6 17:41:17 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Apr 6 17:41:17 2015 +0300
----------------------------------------------------------------------
.../query/h2/sql/GridSqlQuerySplitter.java | 22 ++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f34c46a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 77e0cc8..b3deea3 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -77,8 +77,10 @@ public class GridSqlQuerySplitter {
Set<String> colNames = new HashSet<>();
+ boolean aggregateFound = false;
+
for (int i = 0, len = mapExps.size(); i < len; i++) // Remember len because mapExps list can grow.
- splitSelectExpression(mapExps, rdcExps, colNames, i);
+ aggregateFound |= splitSelectExpression(mapExps, rdcExps, colNames, i);
// Fill select expressions.
mapQry.clearSelect();
@@ -110,15 +112,20 @@ public class GridSqlQuerySplitter {
// -- ORDER BY
if (!srcQry.sort().isEmpty()) {
- mapQry.clearSort();
+ if (aggregateFound) // Ordering over aggregates does not make sense.
+ mapQry.clearSort(); // Otherwise map sort will be used by offset-limit.
for (GridSqlSortColumn sortCol : srcQry.sort().values())
rdcQry.addSort(column(((GridSqlAlias)mapExps.get(sortCol.column())).alias()), sortCol);
}
// -- LIMIT
- if (srcQry.limit() != null)
+ if (srcQry.limit() != null) {
+ if (aggregateFound)
+ mapQry.limit(null);
+
rdcQry.limit(srcQry.limit());
+ }
// -- OFFSET
if (srcQry.offset() != null) {
@@ -209,19 +216,24 @@ public class GridSqlQuerySplitter {
* @param rdcSelect Selects for reduce query.
* @param colNames Set of unique top level column names.
* @param idx Index.
+ * @return {@code true} If aggregate was found.
*/
- private static void splitSelectExpression(List<GridSqlElement> mapSelect, GridSqlElement[] rdcSelect,
+ private static boolean splitSelectExpression(List<GridSqlElement> mapSelect, GridSqlElement[] rdcSelect,
Set<String> colNames, int idx) {
GridSqlElement el = mapSelect.get(idx);
GridSqlAlias alias = null;
+ boolean aggregateFound = false;
+
if (el instanceof GridSqlAlias) { // Unwrap from alias.
alias = (GridSqlAlias)el;
el = alias.child();
}
if (el instanceof GridSqlAggregateFunction) {
+ aggregateFound = true;
+
GridSqlAggregateFunction agg = (GridSqlAggregateFunction)el;
GridSqlElement mapAgg, rdcAgg;
@@ -322,6 +334,8 @@ public class GridSqlQuerySplitter {
rdcSelect[idx] = rdcEl;
}
}
+
+ return aggregateFound;
}
/**
[30/50] incubator-ignite git commit: # IGNITE-540 Revert changes in
generateColumnsFromQuery().
Posted by vk...@apache.org.
# IGNITE-540 Revert changes in generateColumnsFromQuery().
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e1db4076
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1db4076
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1db4076
Branch: refs/heads/ignite-471
Commit: e1db4076f1719364a8498d7e6f6a52d13a454443
Parents: 39ee717
Author: sevdokimov <se...@gridgain.com>
Authored: Mon Apr 6 14:59:26 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon Apr 6 14:59:26 2015 +0300
----------------------------------------------------------------------
.../h2/twostep/GridReduceQueryExecutor.java | 29 ++++++++------------
1 file changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1db4076/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index acdc1bf..02c7c55 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -445,25 +445,20 @@ public class GridReduceQueryExecutor implements GridMessageListener {
String name = expr.getAlias();
long precision = expr.getPrecision();
int displaySize = expr.getDisplaySize();
+ DataType dt = DataType.getDataType(type);
+ if (precision > 0 && (dt.defaultPrecision == 0 ||
+ (dt.defaultPrecision > precision && dt.defaultPrecision < Byte.MAX_VALUE))) {
+ // dont' set precision to MAX_VALUE if this is the default
+ precision = dt.defaultPrecision;
+ }
int scale = expr.getScale();
-
- if (type != Value.UNKNOWN) {
- DataType dt = DataType.getDataType(type);
-
- if (precision > 0 && (dt.defaultPrecision == 0 ||
- (dt.defaultPrecision > precision && dt.defaultPrecision < Byte.MAX_VALUE))) {
- // dont' set precision to MAX_VALUE if this is the default
- precision = dt.defaultPrecision;
- }
-
- if (scale > 0 && (dt.defaultScale == 0 ||
- (dt.defaultScale > scale && dt.defaultScale < precision)))
- scale = dt.defaultScale;
-
- if (scale > precision)
- precision = scale;
+ if (scale > 0 && (dt.defaultScale == 0 ||
+ (dt.defaultScale > scale && dt.defaultScale < precision))) {
+ scale = dt.defaultScale;
+ }
+ if (scale > precision) {
+ precision = scale;
}
-
Column col = new Column(name, type, precision, scale, displaySize);
cols.add(col);
}
[40/50] incubator-ignite git commit: sprint-3 dependency fix
Posted by vk...@apache.org.
sprint-3 dependency fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e07b908
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e07b908
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e07b908
Branch: refs/heads/ignite-471
Commit: 7e07b90825a4a95789c87033023a77084ba0dcd2
Parents: 7e6d193
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 18:26:36 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 18:26:36 2015 +0300
----------------------------------------------------------------------
modules/schedule/pom.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e07b908/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index af1f000..fe11f3f 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -53,5 +53,25 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
[14/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-sprint-3
Posted by vk...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5b806d88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5b806d88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5b806d88
Branch: refs/heads/ignite-471
Commit: 5b806d8840aabd5cb9619c077d936f91f515e244
Parents: 6572efb 20d3ff8
Author: agura <ag...@gridgain.com>
Authored: Mon Apr 6 00:22:46 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Mon Apr 6 00:22:46 2015 +0300
----------------------------------------------------------------------
.../ignite/examples/streaming/numbers/StreamRandomNumbers.java | 2 +-
.../examples/java8/streaming/numbers/StreamRandomNumbers.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[33/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af5c9d3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af5c9d3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af5c9d3c
Branch: refs/heads/ignite-471
Commit: af5c9d3c9ab1b5d56ab4903a010a038a26443613
Parents: a7ba0be 60aaaaa
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Apr 6 15:56:05 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Apr 6 15:56:05 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../org/apache/ignite/internal/IgniteEx.java | 7 --
.../apache/ignite/internal/IgniteKernal.java | 25 +----
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 6 +-
.../DiscoveryNodeValidationProcessor.java | 27 +++++
.../OsDiscoveryNodeValidationProcessor.java | 72 +++++++++++++
.../ignite/spi/IgniteNodeValidationResult.java | 66 ++++++++++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 ------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 106 +------------------
.../testframework/GridSpiTestContext.java | 2 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 5 -
18 files changed, 186 insertions(+), 220 deletions(-)
----------------------------------------------------------------------
[50/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-471
Posted by vk...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-471
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.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/5290845f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5290845f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5290845f
Branch: refs/heads/ignite-471
Commit: 5290845f4db279cc30da757449ce059ef9aafcd9
Parents: 19a14bb 8242c15
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Mon Apr 6 11:34:49 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Mon Apr 6 11:34:49 2015 -0700
----------------------------------------------------------------------
.gitignore | 2 +-
DEVNOTES.txt | 4 +-
assembly/release-fabric.xml | 5 -
examples/schema-import/bin/db-init.sql | 17 +
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
modules/clients/readme.md | 2 -
modules/core/pom.xml | 38 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 4 +-
.../cache/eviction/fifo/FifoEvictionPolicy.java | 58 ++-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 16 +
.../configuration/CacheConfiguration.java | 31 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../apache/ignite/internal/GridComponent.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../ignite/internal/GridPluginComponent.java | 4 +-
.../org/apache/ignite/internal/IgniteEx.java | 7 -
.../apache/ignite/internal/IgniteKernal.java | 27 +-
.../ignite/internal/IgniteNodeAttributes.java | 3 -
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../internal/managers/GridManagerAdapter.java | 6 +-
.../processors/GridProcessorAdapter.java | 2 +-
.../processors/cache/CacheDistributionMode.java | 67 ----
.../cache/CacheEvictableEntryImpl.java | 11 +-
.../processors/cache/CacheProjection.java | 36 --
.../internal/processors/cache/CacheType.java | 77 ++++
.../cache/DynamicCacheChangeRequest.java | 17 +
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 266 +------------
.../processors/cache/GridCacheAttributes.java | 8 -
.../cache/GridCacheConcurrentMap.java | 34 +-
.../processors/cache/GridCacheContext.java | 26 +-
.../cache/GridCacheDeploymentManager.java | 9 +-
.../processors/cache/GridCacheEntryEx.java | 55 +--
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 264 ++-----------
.../cache/GridCacheMapEntryFactory.java | 2 -
.../processors/cache/GridCachePeekMode.java | 81 ----
.../processors/cache/GridCacheProcessor.java | 198 ++++++----
.../cache/GridCacheProjectionImpl.java | 11 -
.../processors/cache/GridCacheProxyImpl.java | 24 --
.../cache/GridCacheSharedContext.java | 4 +-
.../processors/cache/GridCacheUtils.java | 11 -
.../distributed/GridDistributedCacheEntry.java | 4 +-
.../distributed/dht/GridDhtCacheAdapter.java | 25 +-
.../distributed/dht/GridDhtCacheEntry.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../distributed/dht/GridNoStorageCacheMap.java | 11 +-
.../dht/atomic/GridDhtAtomicCache.java | 32 +-
.../dht/atomic/GridDhtAtomicCacheEntry.java | 4 +-
.../dht/colocated/GridDhtColocatedCache.java | 35 +-
.../colocated/GridDhtColocatedCacheEntry.java | 4 +-
.../colocated/GridDhtDetachedCacheEntry.java | 5 +-
.../distributed/near/GridNearCacheAdapter.java | 75 +---
.../distributed/near/GridNearCacheEntry.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../distributed/near/GridNearTxRemote.java | 11 +-
.../processors/cache/local/GridLocalCache.java | 3 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 3 +-
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 8 +
.../IgniteCacheObjectProcessorImpl.java | 5 +
.../datastreamer/DataStreamerImpl.java | 21 +-
.../DiscoveryNodeValidationProcessor.java | 27 ++
.../OsDiscoveryNodeValidationProcessor.java | 72 ++++
.../processors/plugin/CachePluginManager.java | 51 ++-
.../processors/query/GridQueryProcessor.java | 155 ++++----
.../messages/GridQueryNextPageResponse.java | 34 +-
.../processors/task/GridTaskProcessor.java | 31 +-
.../ignite/internal/util/IgniteUtils.java | 46 ++-
.../cache/VisorCacheDefaultConfiguration.java | 21 -
.../internal/visor/util/VisorTaskUtils.java | 18 +-
.../ignite/plugin/CachePluginContext.java | 11 +
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../ignite/spi/IgniteNodeValidationResult.java | 66 ++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 2 +-
.../spi/IgniteSpiNodeValidationResult.java | 66 ----
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 113 +-----
.../resources/META-INF/classnames.properties | 1 -
...idCacheConfigurationConsistencySelfTest.java | 3 -
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../processors/cache/GridCacheTestEntryEx.java | 40 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +--
.../cache/IgniteInternalCacheTypesTest.java | 159 ++++++++
.../IgniteCollectionAbstractTest.java | 23 --
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 16 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 24 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 8 +-
.../dht/GridCacheDhtMappingSelfTest.java | 2 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 103 ++---
.../near/GridCacheNearOneNodeSelfTest.java | 33 +-
.../near/GridCacheNearReadersSelfTest.java | 154 ++++----
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +-
...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +-
.../GridCacheReplicatedPreloadSelfTest.java | 11 +-
.../eviction/GridCacheEvictionAbstractTest.java | 5 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++++
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 3 +-
.../processors/igfs/IgfsSizeSelfTest.java | 46 +--
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 ------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../loadtests/hashmap/GridHashMapLoadTest.java | 2 +-
.../ignite/messaging/GridMessagingSelfTest.java | 50 +++
.../testframework/GridSpiTestContext.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 42 ++
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 3 +
.../HadoopDefaultMapReducePlannerSelfTest.java | 5 -
.../query/h2/sql/GridSqlQuerySplitter.java | 22 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 88 ++++-
.../h2/twostep/GridReduceQueryExecutor.java | 13 +-
.../query/h2/twostep/GridResultPage.java | 9 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 14 +-
...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +-
.../near/IgniteCacheAtomicQuerySelfTest.java | 7 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 368 ++++++++++++++++++
.../ttl/CacheTtlOffheapAbstractSelfTest.java | 29 ++
.../CacheTtlOffheapAtomicAbstractSelfTest.java | 29 ++
.../ttl/CacheTtlOffheapAtomicLocalSelfTest.java | 34 ++
...acheTtlOffheapAtomicPartitionedSelfTest.java | 34 ++
...TtlOffheapTransactionalAbstractSelfTest.java | 29 ++
...cheTtlOffheapTransactionalLocalSelfTest.java | 34 ++
...OffheapTransactionalPartitionedSelfTest.java | 34 ++
.../ttl/CacheTtlOnheapAbstractSelfTest.java | 29 ++
.../CacheTtlOnheapAtomicAbstractSelfTest.java | 29 ++
.../ttl/CacheTtlOnheapAtomicLocalSelfTest.java | 34 ++
...CacheTtlOnheapAtomicPartitionedSelfTest.java | 34 ++
...eTtlOnheapTransactionalAbstractSelfTest.java | 29 ++
...acheTtlOnheapTransactionalLocalSelfTest.java | 34 ++
...lOnheapTransactionalPartitionedSelfTest.java | 34 ++
.../query/h2/sql/GridQueryParsingTest.java | 1 +
.../query/h2/sql/IgniteVsH2QueryTest.java | 7 +
.../IgniteCacheWithIndexingTestSuite.java | 51 +++
.../IgniteH2IndexingSpiTestSuite.java | 7 -
modules/schedule/pom.xml | 20 +
.../commands/cache/VisorCacheCommand.scala | 4 +-
modules/yardstick/README.md | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 +-
.../org/apache/ignite/yardstick/IgniteNode.java | 11 +-
parent/pom.xml | 50 +--
pom.xml | 143 ++++++-
scripts/git-apply-patch.sh | 94 +++++
scripts/git-format-patch.sh | 87 +++++
scripts/git-patch-functions.sh | 171 ++++++++
scripts/git-patch-prop.sh | 24 ++
165 files changed, 3626 insertions(+), 2076 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index 449f745,2b470f6..387ccc4
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@@ -43,7 -43,7 +43,8 @@@ import org.jetbrains.annotations.*
import org.jsr166.*;
import javax.cache.*;
+import java.nio.*;
+ import javax.cache.expiry.*;
import java.util.*;
import java.util.Map.*;
import java.util.concurrent.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5290845f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
----------------------------------------------------------------------
[45/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2b40c16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2b40c16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2b40c16
Branch: refs/heads/ignite-471
Commit: f2b40c166bceaf5a29efb8fec4a9f89ad4dccfe1
Parents: ddaede6 369a36d
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 19:08:29 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 19:08:29 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/util/IgniteUtils.java | 46 ++++++++++++++++++--
1 file changed, 42 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[18/50] incubator-ignite git commit: # ignite-gg-9966 minor
Posted by vk...@apache.org.
# ignite-gg-9966 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/2f1ecc52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f1ecc52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f1ecc52
Branch: refs/heads/ignite-471
Commit: 2f1ecc52872586771f2b43c9f779632d46d650e7
Parents: c3a0344
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 10:37:27 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 10:37:27 2015 +0300
----------------------------------------------------------------------
.../nodevalidation/DiscoveryNodeValidationProcessor.java | 2 +-
.../nodevalidation/OsDiscoveryNodeValidationProcessor.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1ecc52/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
index d0f4624..00669e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/DiscoveryNodeValidationProcessor.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.nodevalidation;
import org.apache.ignite.internal.processors.*;
/**
- * Node Version Validation.
+ * Node validation.
*/
public interface DiscoveryNodeValidationProcessor extends GridProcessor {
//No-op.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1ecc52/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
index 628d7c9..7f4458f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.nodevalidation;
-import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.*;
@@ -27,7 +26,6 @@ import org.apache.ignite.spi.*;
import org.jetbrains.annotations.*;
import static org.apache.ignite.internal.IgniteNodeAttributes.*;
-import static org.apache.ignite.internal.IgniteVersionUtils.*;
/**
* Node validation.
[31/50] incubator-ignite git commit: Merge branch 'ignite-540' into
ignite-sprint-3
Posted by vk...@apache.org.
Merge branch 'ignite-540' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5421701a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5421701a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5421701a
Branch: refs/heads/ignite-471
Commit: 5421701acaa5c7d92f39fdc234df165d7ec5459b
Parents: aae951e e1db407
Author: sevdokimov <se...@gridgain.com>
Authored: Mon Apr 6 15:01:15 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon Apr 6 15:01:15 2015 +0300
----------------------------------------------------------------------
.../query/h2/twostep/GridReduceQueryExecutor.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[42/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/15cebfc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/15cebfc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/15cebfc4
Branch: refs/heads/ignite-471
Commit: 15cebfc417176a47244b66ffa686cded2ebc9460
Parents: 1aaa0b0 7e07b90
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Apr 6 18:53:30 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Apr 6 18:53:30 2015 +0300
----------------------------------------------------------------------
modules/schedule/pom.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
[06/50] incubator-ignite git commit: # patch-scripts: review
Posted by vk...@apache.org.
# patch-scripts: review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a95e8de4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a95e8de4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a95e8de4
Branch: refs/heads/ignite-471
Commit: a95e8de4377eeb6a840031d0254096f063590d36
Parents: 015420f
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 18:55:48 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 18:55:48 2015 +0300
----------------------------------------------------------------------
scripts/git-apply-patch.sh | 32 +++++++++++++----------
scripts/git-format-patch.sh | 35 +++++++++++++------------
scripts/git-patch-functions.sh | 51 ++++++++++++++++++++++++++++++++-----
scripts/git-patch-prop.sh | 10 +++-----
4 files changed, 86 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a95e8de4/scripts/git-apply-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-apply-patch.sh b/scripts/git-apply-patch.sh
old mode 100644
new mode 100755
index 448421b..500b0a5
--- a/scripts/git-apply-patch.sh
+++ b/scripts/git-apply-patch.sh
@@ -17,7 +17,7 @@
#
#
-# Git patch-file applyer.
+# Git patch-file applier.
#
echo 'Usage: scripts/git-apply-patch.sh <ignite-task> [-ih|--ignitehome <path>] [-idb|--ignitedefbranch <branch-name>] [-ph|--patchhome <path>]'
echo "It should be called from IGNITE_HOME directory."
@@ -26,6 +26,20 @@ echo "Note: you can use ${IGNITE_HOME}/scripts/git-patch-prop-local.sh to set yo
echo
#
+# Init home and import properties and functions.
+#
+if [ -z ${IGNITE_HOME} ] # Script can be called from not IGNITE_HOME if IGNITE_HOME was set.
+ then IGNITE_HOME=$PWD
+fi
+
+. ${IGNITE_HOME}/scripts/git-patch-prop.sh # Import properties.
+. ${IGNITE_HOME}/scripts/git-patch-functions.sh # Import patch functions.
+
+if [ -f ${IGNITE_HOME}/scripts/git-patch-prop-local.sh ] # Whether a local user properties file exists.
+ then . ${IGNITE_HOME}/scripts/git-patch-prop-local.sh # Import user properties (it will rewrite global properties).
+fi
+
+#
# Ignite task.
#
IGNITE_TASK=$1
@@ -42,32 +56,24 @@ do
IGNITE_HOME="$2"
shift
;;
+
-idb|--ignitedefbranch)
IGNITE_DEFAULT_BRANCH="$2"
shift
;;
+
-ph|--patchhome)
PATCHES_HOME="$2"
shift
;;
*)
- # unknown option
+
+ echo "Unknown parameter: ${key}"
;;
esac
shift
done
-if [ -z ${IGNITE_HOME} ] # Script can be called from not IGNITE_HOME if IGNITE_HOME was set.
- then IGNITE_HOME=$PWD
-fi
-
-. ${IGNITE_HOME}/scripts/git-patch-prop.sh # Import properties.
-. ${IGNITE_HOME}/scripts/git-patch-functions.sh # Import patch functions.
-
-if [ -f ${IGNITE_HOME}/scripts/git-patch-prop-local.sh ] # Whether a local user properties file exists.
- then . ${IGNITE_HOME}/scripts/git-patch-prop-local.sh # Import user properties (it will rewrite global properties).
-fi
-
echo "IGNITE_HOME : ${IGNITE_HOME}"
echo "Master branch : ${IGNITE_DEFAULT_BRANCH}"
echo "Ignite task : ${IGNITE_TASK}"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a95e8de4/scripts/git-format-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh
old mode 100644
new mode 100755
index 575a7bb..970347f
--- a/scripts/git-format-patch.sh
+++ b/scripts/git-format-patch.sh
@@ -26,6 +26,20 @@ echo "Note: you can use ${IGNITE_HOME}/scripts/git-patch-prop-local.sh to set yo
echo
#
+# Init home and import properties and functions.
+#
+if [ -z ${IGNITE_HOME} ] # Script can be called from not IGNITE_HOME if IGNITE_HOME was set.
+ then IGNITE_HOME=$PWD
+fi
+
+. ${IGNITE_HOME}/scripts/git-patch-prop.sh # Import properties.
+. ${IGNITE_HOME}/scripts/git-patch-functions.sh # Import patch functions.
+
+if [ -f ${IGNITE_HOME}/scripts/git-patch-prop-local.sh ] # Whether a local user properties file exists.
+ then . ${IGNITE_HOME}/scripts/git-patch-prop-local.sh # Import user properties (it will rewrite global properties).
+fi
+
+#
# Read command line params.
#
while [[ $# > 1 ]]
@@ -37,35 +51,24 @@ do
IGNITE_HOME="$2"
shift
;;
+
-idb|--ignitedefbranch)
IGNITE_DEFAULT_BRANCH="$2"
shift
;;
+
-ph|--patchhome)
PATCHES_HOME="$2"
shift
;;
+
*)
- # unknown option
+ echo "Unknown parameter: ${key}"
;;
esac
shift
done
-#
-# Init home and import properties and functions.
-#
-if [ -z ${IGNITE_HOME} ] # Script can be called from not IGNITE_HOME if IGNITE_HOME was set.
- then IGNITE_HOME=$PWD
-fi
-
-. ${IGNITE_HOME}/scripts/git-patch-prop.sh # Import properties.
-. ${IGNITE_HOME}/scripts/git-patch-functions.sh # Import patch functions.
-
-if [ -f ${IGNITE_HOME}/scripts/git-patch-prop-local.sh ] # Whether a local user properties file exists.
- then . ${IGNITE_HOME}/scripts/git-patch-prop-local.sh # Import user properties (it will rewrite global properties).
-fi
-
IGNITE_CURRENT_BRANCH=$( determineCurrentBranch ${IGNITE_HOME} )
echo "IGNITE_HOME : ${IGNITE_HOME}"
@@ -81,4 +84,4 @@ echo
requireCleanWorkTree ${IGNITE_HOME}
-formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH} _ignite.patch
\ No newline at end of file
+formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH} .patch
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a95e8de4/scripts/git-patch-functions.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-functions.sh b/scripts/git-patch-functions.sh
index ab9bec3..796bccd 100644
--- a/scripts/git-patch-functions.sh
+++ b/scripts/git-patch-functions.sh
@@ -23,6 +23,16 @@
#
# Define functions.
#
+
+#
+# Formats patch. Create patch in one commit from user who run script and with default comment.
+#
+# Params:
+# - Git home.
+# - Default branch.
+# - Patch with patch.
+# - Suffix for created patch-file.
+#
formatPatch () {
GIT_HOME=$1
DEFAULT_BRANCH=$2
@@ -33,11 +43,10 @@ formatPatch () {
git checkout ${DEFAULT_BRANCH}
git checkout -b tmppatch
-
- git merge --no-edit ${PATCHED_BRANCH}
-# Or we can 'squashe' merge to make only one commit.
-# git merge --squash ${PATCHED_BRANCH}
-# git commit -a -m "# PATCHED_BRANCH"
+
+ # Merge to make only one commit.
+ git merge --squash ${PATCHED_BRANCH}
+ git commit -a -m "# ${PATCHED_BRANCH}"
PATCH_FILE=${PATCHES_HOME}'/'${DEFAULT_BRANCH}_${PATCHED_BRANCH}${PATCH_SUFFIX}
@@ -52,6 +61,13 @@ formatPatch () {
echo "Patch created: ${PATCH_FILE}"
}
+#
+# Determines current branch.
+#
+# Params:
+# - Git home.
+# Return - Current branch.
+#
determineCurrentBranch () {
GIT_HOME=$1
@@ -62,6 +78,13 @@ determineCurrentBranch () {
echo "$CURRENT_BRANCH"
}
+#
+# Checks that given git repository has clean work tree (there is no uncommited changes).
+# Exit with code 1 in error case.
+#
+# Params:
+# - Git home.
+#
requireCleanWorkTree () {
cd $1 # At git home.
@@ -94,6 +117,14 @@ requireCleanWorkTree () {
fi
}
+#
+# Applies patch. Applies patch file created by formatPatch method.
+#
+# Params:
+# - Git home.
+# - Default branch.
+# - File with patch.
+#
applyPatch () {
GIT_HOME=$1
DEFAULT_BRANCH=$2
@@ -110,10 +141,18 @@ applyPatch () {
fi
echo "Patch $PATCH_FILE will be applied to $DEFAULT_BRANCH branch."
-# git apply ${PATCH_FILE}
+
git am ${PATCH_FILE}
}
+#
+# Checks that given default branch and current branch are equal.
+# Exit with code 1 in error case.
+#
+# Params:
+# - Git home.
+# - Default branch.
+#
currentAndDefaultBranchesShouldBeEqual () {
GIT_HOME=$1
DEFAULT_BRANCH=$2
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a95e8de4/scripts/git-patch-prop.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-prop.sh b/scripts/git-patch-prop.sh
index 7eb3639..9c52583 100644
--- a/scripts/git-patch-prop.sh
+++ b/scripts/git-patch-prop.sh
@@ -17,12 +17,8 @@
#
#
-# Git patch-file maker/applyer properties.
+# Git patch-file maker/applier properties.
#
-if [ "${IGNITE_DEFAULT_BRANCH}" = "" ]
- then IGNITE_DEFAULT_BRANCH='sprint-2'
-fi
+IGNITE_DEFAULT_BRANCH='ignite-sprint-3'
-if [ "${PATCHES_HOME}" = "" ]
- then PATCHES_HOME=${GG_HOME}
-fi
\ No newline at end of file
+PATCHES_HOME=${IGNITE_HOME}
[07/50] incubator-ignite git commit: # patch-scripts: review 2
Posted by vk...@apache.org.
# patch-scripts: review 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a523ceb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a523ceb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a523ceb
Branch: refs/heads/ignite-471
Commit: 9a523ceb1486b4b25dc47a6e0629681d1394d216
Parents: a95e8de
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 19:11:03 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 19:11:03 2015 +0300
----------------------------------------------------------------------
scripts/git-apply-patch.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a523ceb/scripts/git-apply-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-apply-patch.sh b/scripts/git-apply-patch.sh
index 500b0a5..c5f686f 100755
--- a/scripts/git-apply-patch.sh
+++ b/scripts/git-apply-patch.sh
@@ -89,6 +89,6 @@ currentAndDefaultBranchesShouldBeEqual ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH}
requireCleanWorkTree ${IGNITE_HOME}
-IGNITE_PATCH_FILE=${PATCHES_HOME}/${IGNITE_DEFAULT_BRANCH}_${IGNITE_TASK}_ignite.patch
+IGNITE_PATCH_FILE=${PATCHES_HOME}/${IGNITE_DEFAULT_BRANCH}_${IGNITE_TASK}.patch
applyPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_PATCH_FILE}
[23/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-571
Posted by vk...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-571
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/70d539cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/70d539cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/70d539cd
Branch: refs/heads/ignite-471
Commit: 70d539cd3d239302ebafefdadae2b99a53d022a4
Parents: 28072aa dd944bf
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Apr 6 12:28:22 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Apr 6 12:28:22 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
examples/schema-import/bin/db-init.sql | 17 ++
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../internal/processors/cache/CacheType.java | 77 ++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 189 +++++++++++++------
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../processors/plugin/CachePluginManager.java | 51 +++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../processors/task/GridTaskProcessor.java | 24 ++-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 7 -
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++--
.../cache/IgniteInternalCacheTypesTest.java | 159 ++++++++++++++++
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
.../near/GridCacheNearReadersSelfTest.java | 2 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 -----------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/messaging/GridMessagingSelfTest.java | 50 +++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +-
parent/pom.xml | 1 -
scripts/git-apply-patch.sh | 94 +++++++++
scripts/git-format-patch.sh | 87 +++++++++
scripts/git-patch-functions.sh | 171 +++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
56 files changed, 1214 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/70d539cd/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
[05/50] incubator-ignite git commit: ignite-sprint-3 - minor fix for
query events
Posted by vk...@apache.org.
ignite-sprint-3 - minor fix for query events
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cef5227a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cef5227a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cef5227a
Branch: refs/heads/ignite-471
Commit: cef5227afb48638c1c4aa0ce26eaaa2244a5edc1
Parents: ea777d4
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Apr 3 18:38:02 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Apr 3 18:38:02 2015 +0300
----------------------------------------------------------------------
.../ignite/events/CacheQueryExecutedEvent.java | 11 +++++------
.../apache/ignite/events/CacheQueryReadEvent.java | 11 +++++------
.../cache/query/GridCacheQueryManager.java | 18 +++++++++---------
.../continuous/CacheContinuousQueryHandler.java | 4 ++--
.../processors/query/GridQueryProcessor.java | 4 ++--
.../GridCacheContinuousQueryAbstractSelfTest.java | 4 ++--
.../query/h2/twostep/GridMapQueryExecutor.java | 4 ++--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 ++++----
8 files changed, 31 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
index 04f83c2..22892bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java
@@ -19,10 +19,9 @@ package org.apache.ignite.events;
import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.lang.*;
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.*;
@@ -67,7 +66,7 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter {
private static final long serialVersionUID = 3738753361235304496L;
/** Query type. */
- private final CacheQueryType qryType;
+ private final String qryType;
/** Cache name. */
private final String cacheName;
@@ -112,7 +111,7 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter {
ClusterNode node,
String msg,
int type,
- CacheQueryType qryType,
+ String qryType,
@Nullable String cacheName,
@Nullable String clsName,
@Nullable String clause,
@@ -139,9 +138,9 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter {
/**
* Gets query type.
*
- * @return Query type.
+ * @return Query type. Can be {@code "SQL"}, {@code "TEXT"}, {@code "SCAN"} or {@code "SPI"}.
*/
- public CacheQueryType queryType() {
+ public String queryType() {
return qryType;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java
index a399d8a..78acdc1 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
@@ -19,10 +19,9 @@ package org.apache.ignite.events;
import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.lang.*;
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.*;
@@ -67,7 +66,7 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter {
private static final long serialVersionUID = -1984731272984397445L;
/** Query type. */
- private final CacheQueryType qryType;
+ private final String qryType;
/** Cache name. */
private final String cacheName;
@@ -130,7 +129,7 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter {
ClusterNode node,
String msg,
int type,
- CacheQueryType qryType,
+ String qryType,
@Nullable String cacheName,
@Nullable String clsName,
@Nullable String clause,
@@ -165,9 +164,9 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter {
/**
* Gets query type.
*
- * @return Query type.
+ * @return Query type. Can be {@code "SQL"}, {@code "TEXT"}, {@code "SCAN"} or {@code "SPI"}.
*/
- public CacheQueryType queryType() {
+ public String queryType() {
return qryType;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 6c8cf9a..d571243 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -511,7 +511,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"SQL query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
cctx.namex(),
qry.queryClassName(),
qry.clause(),
@@ -533,7 +533,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"Scan query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SCAN,
+ CacheQueryType.SCAN.name(),
cctx.namex(),
null,
null,
@@ -554,7 +554,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"Full text query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.FULL_TEXT,
+ CacheQueryType.FULL_TEXT.name(),
cctx.namex(),
qry.queryClassName(),
qry.clause(),
@@ -628,7 +628,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"SQL fields query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SQL_FIELDS,
+ CacheQueryType.SQL_FIELDS.name(),
cctx.namex(),
null,
qry.clause(),
@@ -660,7 +660,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"SPI query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SPI,
+ CacheQueryType.SPI.name(),
cctx.namex(),
null,
null,
@@ -1119,7 +1119,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"SQL fields query result set row read.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.SQL_FIELDS,
+ CacheQueryType.SQL_FIELDS.name(),
cctx.namex(),
null,
qry.clause(),
@@ -1318,7 +1318,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"SQL query entry read.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
cctx.namex(),
qry.queryClassName(),
qry.clause(),
@@ -1339,7 +1339,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"Full text query entry read.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.FULL_TEXT,
+ CacheQueryType.FULL_TEXT.name(),
cctx.namex(),
qry.queryClassName(),
qry.clause(),
@@ -1360,7 +1360,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
cctx.localNode(),
"Scan query entry read.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.SCAN,
+ CacheQueryType.SCAN.name(),
cctx.namex(),
null,
null,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index 1fd1ded..ad78b92 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -172,7 +172,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
ctx.discovery().localNode(),
"Continuous query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.CONTINUOUS,
+ CacheQueryType.CONTINUOUS.name(),
cacheName,
null,
null,
@@ -236,7 +236,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler {
ctx.discovery().localNode(),
"Continuous query executed.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.CONTINUOUS,
+ CacheQueryType.CONTINUOUS.name(),
cacheName,
null,
null,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 048a0c8..ba8479f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -564,7 +564,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
ctx.discovery().localNode(),
"SQL query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
null,
null,
sqlQry,
@@ -631,7 +631,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
ctx.discovery().localNode(),
"SQL query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
null,
null,
sql,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index a22e0c7..5a78f9f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -909,7 +909,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
CacheQueryReadEvent qe = (CacheQueryReadEvent)evt;
- assertEquals(CONTINUOUS, qe.queryType());
+ assertEquals(CONTINUOUS.name(), qe.queryType());
assertNull(qe.cacheName());
assertEquals(grid(0).localNode().id(), qe.subjectId());
@@ -933,7 +933,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt;
- assertEquals(CONTINUOUS, qe.queryType());
+ assertEquals(CONTINUOUS.name(), qe.queryType());
assertNull(qe.cacheName());
assertEquals(grid(0).localNode().id(), qe.subjectId());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index 959d1cc..08ad38d 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -209,7 +209,7 @@ public class GridMapQueryExecutor implements GridMessageListener {
node,
"SQL query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
cctx.namex(),
null,
qry.query(),
@@ -537,7 +537,7 @@ public class GridMapQueryExecutor implements GridMessageListener {
cctx.localNode(),
"SQL fields query result set row read.",
EVT_CACHE_QUERY_OBJECT_READ,
- CacheQueryType.SQL,
+ CacheQueryType.SQL.name(),
cctx.namex(),
null,
qry.query(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cef5227a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
index 88effe1..3dcf9ac 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
@@ -1004,7 +1004,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
CacheQueryReadEvent<Integer, Integer> qe = (CacheQueryReadEvent<Integer, Integer>)evt;
- assertEquals(SCAN, qe.queryType());
+ assertEquals(SCAN.name(), qe.queryType());
assertNull(qe.cacheName());
assertNull(qe.className());
@@ -1027,7 +1027,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt;
- assertEquals(SCAN, qe.queryType());
+ assertEquals(SCAN.name(), qe.queryType());
assertNull(qe.cacheName());
assertNull(qe.className());
@@ -1080,7 +1080,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
CacheQueryReadEvent<UUID, Person> qe = (CacheQueryReadEvent<UUID, Person>)evt;
- assertEquals(FULL_TEXT, qe.queryType());
+ assertEquals(FULL_TEXT.name(), qe.queryType());
assertNull(qe.cacheName());
assertEquals("Person", qe.className());
@@ -1103,7 +1103,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt;
- assertEquals(FULL_TEXT, qe.queryType());
+ assertEquals(FULL_TEXT.name(), qe.queryType());
assertNull(qe.cacheName());
assertEquals("Person", qe.className());
[19/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-3' into ignite-571
Posted by vk...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-571
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/426f023b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/426f023b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/426f023b
Branch: refs/heads/ignite-471
Commit: 426f023be10ade518e3cd7756a6484af4bd0fe67
Parents: 28072aa dd944bf
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 10:44:17 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 10:44:17 2015 +0300
----------------------------------------------------------------------
.gitignore | 2 +-
examples/schema-import/bin/db-init.sql | 17 ++
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../streaming/numbers/StreamRandomNumbers.java | 2 +-
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/events/CacheQueryExecutedEvent.java | 11 +-
.../ignite/events/CacheQueryReadEvent.java | 11 +-
.../ignite/internal/GridCachePluginContext.java | 6 +
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../internal/processors/cache/CacheType.java | 77 ++++++++
.../cache/DynamicCacheChangeRequest.java | 17 ++
.../cache/DynamicCacheDescriptor.java | 15 +-
.../processors/cache/GridCacheAdapter.java | 6 +-
.../processors/cache/GridCacheContext.java | 26 ++-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 189 +++++++++++++------
.../cache/GridCacheSharedContext.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 18 +-
.../continuous/CacheContinuousQueryHandler.java | 4 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 19 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 8 +-
.../processors/plugin/CachePluginManager.java | 51 +++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../processors/task/GridTaskProcessor.java | 24 ++-
.../ignite/plugin/CachePluginContext.java | 11 ++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 7 -
.../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++--
.../cache/IgniteInternalCacheTypesTest.java | 159 ++++++++++++++++
.../IgniteCacheSystemTransactionsSelfTest.java | 3 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +
.../near/GridCacheNearReadersSelfTest.java | 2 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++
.../processors/igfs/IgsfStartCacheTest.java | 115 -----------
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../ignite/messaging/GridMessagingSelfTest.java | 50 +++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../query/h2/twostep/GridMapQueryExecutor.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +-
parent/pom.xml | 1 -
scripts/git-apply-patch.sh | 94 +++++++++
scripts/git-format-patch.sh | 87 +++++++++
scripts/git-patch-functions.sh | 171 +++++++++++++++++
scripts/git-patch-prop.sh | 24 +++
56 files changed, 1214 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/426f023b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
[20/50] incubator-ignite git commit: # ignite-sprint-3 Change debug
output.
Posted by vk...@apache.org.
# ignite-sprint-3 Change debug output.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e0619855
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e0619855
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e0619855
Branch: refs/heads/ignite-471
Commit: e06198559a65f0d91081a86e8fe68524bb91afa8
Parents: dd944bf
Author: Andrey Novikov <an...@gridgain.com>
Authored: Mon Apr 6 15:37:14 2015 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Mon Apr 6 15:37:14 2015 +0700
----------------------------------------------------------------------
.../internal/visor/util/VisorTaskUtils.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0619855/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 1209a40..909dc22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -678,8 +678,8 @@ public class VisorTaskUtils {
log.warning(msg);
}
else
- X.println("[" + DEBUG_DATE_FMT.get().format(time) + "]" +
- String.format("%30s %s", "<" + Thread.currentThread().getName() + ">", msg));
+ X.println(String.format("[%s][%s]%s",
+ DEBUG_DATE_FMT.get().format(time), Thread.currentThread().getName(), msg));
}
/**
@@ -734,6 +734,16 @@ public class VisorTaskUtils {
}
/**
+ * Log message.
+ *
+ * @param log Logger.
+ * @param msg Message.
+ */
+ public static void log(@Nullable IgniteLogger log, String msg) {
+ log0(log, U.currentTimeMillis(), " " + msg);
+ }
+
+ /**
* Checks if address can be reached using one argument InetAddress.isReachable() version or ping command if failed.
*
* @param addr Address to check.
@@ -810,7 +820,7 @@ public class VisorTaskUtils {
*
* @param input Input bytes.
* @return Zipped byte array.
- * @throws java.io.IOException If failed.
+ * @throws IOException If failed.
*/
public static byte[] zipBytes(byte[] input) throws IOException {
return zipBytes(input, 4096);
@@ -822,7 +832,7 @@ public class VisorTaskUtils {
* @param input Input bytes.
* @param initBufSize Initial buffer size.
* @return Zipped byte array.
- * @throws java.io.IOException If failed.
+ * @throws IOException If failed.
*/
public static byte[] zipBytes(byte[] input, int initBufSize) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream(initBufSize);
[47/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e6a6b64c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e6a6b64c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e6a6b64c
Branch: refs/heads/ignite-471
Commit: e6a6b64c6731ba6568e74bf1534d64200c46e80e
Parents: 0a8378c f2b40c1
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 20:20:41 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 20:20:41 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/util/IgniteUtils.java | 46 ++++++++++++++++++--
modules/schedule/pom.xml | 20 +++++++++
pom.xml | 2 +-
3 files changed, 63 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e6a6b64c/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 16a2cb0,92a85a7..e1e292c
--- a/pom.xml
+++ b/pom.xml
@@@ -508,9 -497,9 +508,9 @@@
<failOnError>false</failOnError>
<fileSets>
<fileSet>
- <directory>target</directory>
+ <directory>${basedir}/target</directory>
<includes>
- <include>ignite-${project.version}-source-release.zip</include>
+ <include>${project.artifactId}-${project.version}-source-release.zip</include>
</includes>
</fileSet>
</fileSets>
[08/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5cc2d36e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5cc2d36e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5cc2d36e
Branch: refs/heads/ignite-471
Commit: 5cc2d36ebd4eb2a759220891ed8027d3641e2893
Parents: 9a523ce cef5227
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 3 19:23:34 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 3 19:23:34 2015 +0300
----------------------------------------------------------------------
.../ignite/events/CacheQueryExecutedEvent.java | 11 +++++------
.../apache/ignite/events/CacheQueryReadEvent.java | 11 +++++------
.../processors/cache/GridCacheMapEntry.java | 4 ++--
.../cache/query/GridCacheQueryManager.java | 18 +++++++++---------
.../continuous/CacheContinuousQueryHandler.java | 4 ++--
.../processors/query/GridQueryProcessor.java | 4 ++--
.../GridCacheContinuousQueryAbstractSelfTest.java | 4 ++--
.../query/h2/twostep/GridMapQueryExecutor.java | 4 ++--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 8 ++++----
9 files changed, 33 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
[46/50] incubator-ignite git commit: ignite-678 site deploy
Posted by vk...@apache.org.
ignite-678 site deploy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0a8378c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0a8378c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0a8378c7
Branch: refs/heads/ignite-471
Commit: 0a8378c72f54c9dbc6a27850e7787b4c61c9f2b1
Parents: 7e6d193
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 20:20:18 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 20:20:18 2015 +0300
----------------------------------------------------------------------
pom.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 53 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a8378c7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bc58e04..16a2cb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,10 +31,14 @@
</parent>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite</artifactId>
+ <artifactId>incubator-ignite</artifactId>
<version>1.0.1-RC1-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <ignite.site>scp://localhost:/home</ignite.site>
+ </properties>
+
<scm>
<url>https://git-wip-us.apache.org/repos/asf/incubator-ignite</url>
<connection>scm:git:git://git-wip-us.apache.org/repos/asf/incubator-ignite</connection>
@@ -42,6 +46,13 @@
<tag>HEAD</tag>
</scm>
+ <distributionManagement>
+ <site>
+ <id>ignite-site</id>
+ <url>${ignite.site}/${project.artifactId}-${project.version}</url>
+ </site>
+ </distributionManagement>
+
<modules>
<module>modules/tools</module>
<module>modules/core</module>
@@ -499,7 +510,7 @@
<fileSet>
<directory>target</directory>
<includes>
- <include>ignite-${project.version}-source-release.zip</include>
+ <include>${project.artifactId}-${project.version}-source-release.zip</include>
</includes>
</fileSet>
</fileSets>
@@ -527,12 +538,17 @@
<target>
<zip destfile="${basedir}/target/sources-pack-${project.version}.zip" encoding="UTF-8">
<zipfileset dir="${basedir}/target" prefix="sources-pack-${project.version}">
- <include name="ignite-${project.version}-source-release.zip" />
- <include name="ignite-${project.version}-source-release.zip.asc" />
- <include name="ignite-${project.version}-source-release.zip.md5" />
- <include name="ignite-${project.version}-source-release.zip.sha1" />
+ <include name="${project.artifactId}-${project.version}-source-release.zip" />
+ <include name="${project.artifactId}-${project.version}-source-release.zip.asc" />
+ <include name="${project.artifactId}-${project.version}-source-release.zip.md5" />
+ <include name="${project.artifactId}-${project.version}-source-release.zip.sha1" />
</zipfileset>
</zip>
+ <mkdir dir="${basedir}/target/site"/>
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip" todir="${basedir}/target/site"/>
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.asc" todir="${basedir}/target/site"/>
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.md5" todir="${basedir}/target/site"/>
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.sha1" todir="${basedir}/target/site"/>
</target>
</configuration>
</execution>
@@ -541,5 +557,36 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>deploy-site</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.8</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ <phase>deploy</phase>
+ <configuration>
+ <inputDirectory>${basedir}/target/site</inputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
[39/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e6d1934
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e6d1934
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e6d1934
Branch: refs/heads/ignite-471
Commit: 7e6d1934dbe25d501bd6023ec875bb0bf9e53745
Parents: 2f34c46 888cff5
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Apr 6 17:41:35 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Apr 6 17:41:35 2015 +0300
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[37/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/888cff5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/888cff5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/888cff5f
Branch: refs/heads/ignite-471
Commit: 888cff5fd74f0f84db7c09a879c26131f096455c
Parents: 5e84cda 88268bf
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 17:26:39 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 17:26:39 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/sql/GridSqlQuerySplitter.java | 2 ++
.../processors/query/h2/sql/GridQueryParsingTest.java | 1 +
.../internal/processors/query/h2/sql/IgniteVsH2QueryTest.java | 7 +++++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
[48/50] incubator-ignite git commit: ignite-396 Batch eviction
support added to CacheFifoEvictionPolicy
Posted by vk...@apache.org.
ignite-396 Batch eviction support added to CacheFifoEvictionPolicy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8242c151
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8242c151
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8242c151
Branch: refs/heads/ignite-471
Commit: 8242c1512657dbbb0efe9a3e0238c88d2aac447a
Parents: e6a6b64
Author: Andrey Gura <ag...@gridgain.com>
Authored: Mon Apr 6 15:18:54 2015 +0300
Committer: Andrey Gura <ag...@gridgain.com>
Committed: Mon Apr 6 21:17:21 2015 +0300
----------------------------------------------------------------------
.../cache/eviction/fifo/FifoEvictionPolicy.java | 58 ++-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 16 +
.../eviction/GridCacheEvictionAbstractTest.java | 5 +-
...ridCacheFifoBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++++
4 files changed, 454 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8242c151/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
index d32c746..ca3cc1b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicy.java
@@ -27,8 +27,12 @@ import java.io.*;
import java.util.*;
/**
- * Eviction policy based on {@code First In First Out (FIFO)} algorithm. This
- * implementation is very efficient since it does not create any additional
+ * Eviction policy based on {@code First In First Out (FIFO)} algorithm and supports batch eviction.
+ * <p>
+ * The eviction starts when the cache size becomes {@code batchSize} elements greater than the maximum size.
+ * {@code batchSize} elements will be evicted in this case. The default {@code batchSize} value is {@code 1}.
+ * <p>
+ * This implementation is very efficient since it does not create any additional
* table-like data structures. The {@code FIFO} ordering information is
* maintained by attaching ordering metadata to cache entries.
*/
@@ -39,6 +43,9 @@ public class FifoEvictionPolicy<K, V> implements EvictionPolicy<K, V>, FifoEvict
/** Maximum size. */
private volatile int max = CacheConfiguration.DFLT_CACHE_SIZE;
+ /** Batch size. */
+ private volatile int batchSize = 1;
+
/** FIFO queue. */
private final ConcurrentLinkedDeque8<EvictableEntry<K, V>> queue =
new ConcurrentLinkedDeque8<>();
@@ -62,6 +69,20 @@ public class FifoEvictionPolicy<K, V> implements EvictionPolicy<K, V>, FifoEvict
}
/**
+ * Constructs FIFO eviction policy with maximum size and given batch size. Empty entries are allowed.
+ *
+ * @param max Maximum allowed size of cache before entry will start getting evicted.
+ * @param batchSize Maximum size of batch.
+ */
+ public FifoEvictionPolicy(int max, int batchSize) {
+ A.ensure(max > 0, "max > 0");
+ A.ensure(batchSize > 0, "batchSize > 0");
+
+ this.max = max;
+ this.batchSize = batchSize;
+ }
+
+ /**
* Gets maximum allowed size of cache before entry will start getting evicted.
*
* @return Maximum allowed size of cache before entry will start getting evicted.
@@ -82,6 +103,18 @@ public class FifoEvictionPolicy<K, V> implements EvictionPolicy<K, V>, FifoEvict
}
/** {@inheritDoc} */
+ @Override public int getBatchSize() {
+ return batchSize;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void setBatchSize(int batchSize) {
+ A.ensure(batchSize > 0, "batchSize > 0");
+
+ this.batchSize = batchSize;
+ }
+
+ /** {@inheritDoc} */
@Override public int getCurrentSize() {
return queue.size();
}
@@ -158,18 +191,23 @@ public class FifoEvictionPolicy<K, V> implements EvictionPolicy<K, V>, FifoEvict
private void shrink() {
int max = this.max;
+ int batchSize = this.batchSize;
+
int startSize = queue.sizex();
- for (int i = 0; i < startSize && queue.sizex() > max; i++) {
- EvictableEntry<K, V> entry = queue.poll();
+ // Shrink only if queue is full.
+ if (startSize >= max + batchSize) {
+ for (int i = max; i < startSize && queue.sizex() > max; i++) {
+ EvictableEntry<K, V> entry = queue.poll();
- if (entry == null)
- break;
+ if (entry == null)
+ break;
- if (!entry.evict()) {
- entry.removeMeta();
+ if (!entry.evict()) {
+ entry.removeMeta();
- touch(entry);
+ touch(entry);
+ }
}
}
}
@@ -177,11 +215,13 @@ public class FifoEvictionPolicy<K, V> implements EvictionPolicy<K, V>, FifoEvict
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeInt(max);
+ out.writeInt(batchSize);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
max = in.readInt();
+ batchSize = in.readInt();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8242c151/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyMBean.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyMBean.java
index 4827e95..63a413e 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/FifoEvictionPolicyMBean.java
@@ -41,6 +41,22 @@ public interface FifoEvictionPolicyMBean {
public void setMaxSize(int max);
/**
+ * Gets batch size.
+ *
+ * @return batch size.
+ */
+ @MXBeanDescription("Batch size.")
+ public int getBatchSize();
+
+ /**
+ * Sets batch size.
+ *
+ * @param batchSize Batch size.
+ */
+ @MXBeanDescription("Set batch size.")
+ public void setBatchSize(int batchSize);
+
+ /**
* Gets current queue size.
*
* @return Current queue size.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8242c151/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
index 2081bfd..e0dab7d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
@@ -63,6 +63,9 @@ public abstract class GridCacheEvictionAbstractTest<T extends EvictionPolicy<?,
/** Evict near sync. */
protected boolean evictNearSync = true;
+ /** Policy batch size. */
+ protected int plcBatchSize = 0;
+
/** Policy max. */
protected int plcMax = 10;
@@ -338,7 +341,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends EvictionPolicy<?,
int actual = colocated(i).size();
assertTrue("Cache size is greater then policy size [expected=" + endSize + ", actual=" + actual + ']',
- actual <= endSize);
+ actual <= endSize + plcBatchSize);
}
checkPolicies(endPlcSize);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8242c151/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoBatchEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoBatchEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoBatchEvictionPolicySelfTest.java
new file mode 100644
index 0000000..7a9f4f4
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/fifo/GridCacheFifoBatchEvictionPolicySelfTest.java
@@ -0,0 +1,385 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.eviction.fifo;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.eviction.*;
+import org.apache.ignite.cache.eviction.fifo.*;
+import org.apache.ignite.internal.processors.cache.eviction.*;
+
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * FIFO batch eviction test.
+ */
+public class GridCacheFifoBatchEvictionPolicySelfTest extends
+ GridCacheEvictionAbstractTest<FifoEvictionPolicy<String, String>> {
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPolicy() throws Exception {
+ try {
+ startGrid();
+
+ MockEntry e1 = new MockEntry("1", "1");
+ MockEntry e2 = new MockEntry("2", "2");
+ MockEntry e3 = new MockEntry("3", "3");
+ MockEntry e4 = new MockEntry("4", "4");
+ MockEntry e5 = new MockEntry("5", "5");
+
+ FifoEvictionPolicy<String, String> p = policy();
+
+ p.setMaxSize(3);
+
+ p.setBatchSize(2);
+
+ p.onEntryAccessed(false, e1);
+
+ check(p.queue(), e1);
+
+ p.onEntryAccessed(false, e2);
+
+ check(p.queue(), e1, e2);
+
+ p.onEntryAccessed(false, e3);
+
+ check(p.queue(), e1, e2, e3);
+
+ p.onEntryAccessed(false, e4);
+
+ check(p.queue(), e1, e2, e3, e4);
+
+ assertFalse(e1.isEvicted());
+ assertFalse(e2.isEvicted());
+ assertFalse(e3.isEvicted());
+ assertFalse(e4.isEvicted());
+
+ assertEquals(4, p.getCurrentSize());
+
+ p.onEntryAccessed(false, e5);
+
+ // Batch evicted.
+ check(p.queue(), e3, e4, e5);
+
+ assertEquals(3, p.getCurrentSize());
+
+ assertTrue(e1.isEvicted());
+ assertTrue(e2.isEvicted());
+ assertFalse(e3.isEvicted());
+ assertFalse(e4.isEvicted());
+ assertFalse(e5.isEvicted());
+
+ p.onEntryAccessed(false, e1 = new MockEntry("1", "1"));
+
+ check(p.queue(), e3, e4, e5, e1);
+
+ assertEquals(4, p.getCurrentSize());
+
+ assertFalse(e3.isEvicted());
+ assertFalse(e4.isEvicted());
+ assertFalse(e5.isEvicted());
+ assertFalse(e1.isEvicted());
+
+ p.onEntryAccessed(false, e5);
+
+ check(p.queue(), e3, e4, e5, e1);
+
+ assertFalse(e3.isEvicted());
+ assertFalse(e4.isEvicted());
+ assertFalse(e5.isEvicted());
+ assertFalse(e1.isEvicted());
+
+ p.onEntryAccessed(false, e1);
+
+ assertEquals(4, p.getCurrentSize());
+
+ check(p.queue(), e3, e4, e5, e1);
+
+ assertFalse(e3.isEvicted());
+ assertFalse(e4.isEvicted());
+ assertFalse(e5.isEvicted());
+ assertFalse(e1.isEvicted());
+
+ p.onEntryAccessed(true, e1);
+
+ assertEquals(3, p.getCurrentSize());
+
+ assertFalse(e3.isEvicted());
+ assertFalse(e4.isEvicted());
+ assertFalse(e5.isEvicted());
+
+ p.onEntryAccessed(true, e4);
+
+ assertEquals(2, p.getCurrentSize());
+
+ assertFalse(e3.isEvicted());
+ assertFalse(e5.isEvicted());
+
+ p.onEntryAccessed(true, e5);
+
+ assertEquals(1, p.getCurrentSize());
+
+ assertFalse(e3.isEvicted());
+
+ p.onEntryAccessed(true, e3);
+
+ assertEquals(0, p.getCurrentSize());
+
+ assertFalse(e3.isEvicted());
+
+ info(p);
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testMemory() throws Exception {
+ try {
+ startGrid();
+
+ FifoEvictionPolicy<String, String> p = policy();
+
+ int max = 10;
+
+ int batchSize = 2;
+
+ p.setMaxSize(max);
+ p.setBatchSize(batchSize);
+
+ int cnt = max + batchSize;
+
+ for (int i = 0; i < cnt; i++)
+ p.onEntryAccessed(false, new MockEntry(Integer.toString(i), Integer.toString(i)));
+
+ info(p);
+
+ assertEquals(cnt - batchSize, p.getCurrentSize());
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testRandom() throws Exception {
+ try {
+ startGrid();
+
+ FifoEvictionPolicy<String, String> p = policy();
+
+ int max = 10;
+
+ int batchSize = 2;
+
+ p.setMaxSize(max);
+
+ p.setBatchSize(batchSize);
+
+ Random rand = new Random();
+
+ int keys = 31;
+
+ MockEntry[] fifos = new MockEntry[keys];
+
+ for (int i = 0; i < fifos.length; i++)
+ fifos[i] = new MockEntry(Integer.toString(i));
+
+ int runs = 5000000;
+
+ for (int i = 0; i < runs; i++) {
+ boolean rmv = rand.nextBoolean();
+
+ int j = rand.nextInt(fifos.length);
+
+ MockEntry e = entry(fifos, j);
+
+ if (rmv)
+ fifos[j] = new MockEntry(Integer.toString(j));
+
+ p.onEntryAccessed(rmv, e);
+ }
+
+ info(p);
+
+ int curSize = p.getCurrentSize();
+
+ assert curSize < max + batchSize :
+ "curSize < max + batchSize [curSize=" + curSize + ", max=" + max + ", batchSize=" + batchSize + ']';
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testAllowEmptyEntries() throws Exception {
+ try {
+ startGrid();
+
+ MockEntry e1 = new MockEntry("1");
+
+ MockEntry e2 = new MockEntry("2");
+
+ MockEntry e3 = new MockEntry("3");
+
+ MockEntry e4 = new MockEntry("4");
+
+ MockEntry e5 = new MockEntry("5");
+
+ FifoEvictionPolicy<String, String> p = policy();
+
+ p.setBatchSize(2);
+
+ p.onEntryAccessed(false, e1);
+
+ assertFalse(e1.isEvicted());
+
+ p.onEntryAccessed(false, e2);
+
+ assertFalse(e1.isEvicted());
+ assertFalse(e2.isEvicted());
+
+ p.onEntryAccessed(false, e3);
+
+ assertFalse(e1.isEvicted());
+ assertFalse(e3.isEvicted());
+
+ p.onEntryAccessed(false, e4);
+
+ assertFalse(e1.isEvicted());
+ assertFalse(e3.isEvicted());
+ assertFalse(e4.isEvicted());
+
+ p.onEntryAccessed(false, e5);
+
+ assertFalse(e1.isEvicted());
+ assertFalse(e3.isEvicted());
+ assertFalse(e5.isEvicted());
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPut() throws Exception {
+ mode = LOCAL;
+ syncCommit = true;
+ plcMax = 10;
+
+ Ignite ignite = startGrid();
+
+ try {
+ IgniteCache<Object, Object> cache = ignite.cache(null);
+
+ int cnt = 500;
+
+ int min = Integer.MAX_VALUE;
+
+ int minIdx = 0;
+
+ for (int i = 0; i < cnt; i++) {
+ cache.put(i, i);
+
+ int cacheSize = cache.size();
+
+ if (i > plcMax && cacheSize < min) {
+ min = cacheSize;
+ minIdx = i;
+ }
+ }
+
+ // Batch evicted.
+ assert min >= plcMax : "Min cache size is too small: " + min;
+
+ info("Min cache size [min=" + min + ", idx=" + minIdx + ']');
+ info("Current cache size " + cache.size());
+ info("Current cache key size " + cache.size());
+
+ min = Integer.MAX_VALUE;
+
+ minIdx = 0;
+
+ // Touch.
+ for (int i = cnt; --i > cnt - plcMax;) {
+ cache.get(i);
+
+ int cacheSize = cache.size();
+
+ if (cacheSize < min) {
+ min = cacheSize;
+ minIdx = i;
+ }
+ }
+
+ info("----");
+ info("Min cache size [min=" + min + ", idx=" + minIdx + ']');
+ info("Current cache size " + cache.size());
+ info("Current cache key size " + cache.size());
+
+ // Batch evicted.
+ assert min >= plcMax : "Min cache size is too small: " + min;
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void testPartitionedNearDisabled() throws Exception {
+ plcBatchSize = 2;
+
+ super.testPartitionedNearDisabled();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected FifoEvictionPolicy<String, String> createPolicy(int plcMax) {
+ return new FifoEvictionPolicy<>(10, 2);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected FifoEvictionPolicy<String, String> createNearPolicy(int nearMax) {
+ return new FifoEvictionPolicy<>(nearMax, 2);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void checkNearPolicies(int endNearPlcSize) {
+ for (int i = 0; i < gridCnt; i++)
+ for (EvictableEntry<String, String> e : nearPolicy(i).queue())
+ assert !e.isCached() : "Invalid near policy size: " + nearPolicy(i).queue();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void checkPolicies(int plcMax) {
+ for (int i = 0; i < gridCnt; i++)
+ assert policy(i).queue().size() <= plcMax + policy(i).getBatchSize();
+ }
+
+}
[02/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea777d40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea777d40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea777d40
Branch: refs/heads/ignite-471
Commit: ea777d40f6a7e452b87a0ea592e8e0dea2e068f5
Parents: a28bc74 015420f
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 3 17:19:33 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 3 17:19:33 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 2 +-
.../ignite/internal/GridCachePluginContext.java | 6 ++
.../processors/cache/GridCacheProcessor.java | 64 +++++++++++++-------
.../processors/plugin/CachePluginManager.java | 51 ++++++++++++----
.../ignite/plugin/CachePluginContext.java | 11 ++++
.../ignite/plugin/CachePluginProvider.java | 4 +-
.../org/apache/ignite/plugin/PluginContext.java | 9 +--
7 files changed, 106 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
[16/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-675' into ignite-sprint-3
Posted by vk...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-675' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd944bf8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd944bf8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd944bf8
Branch: refs/heads/ignite-471
Commit: dd944bf83bc4c5cc9967a194aab3ff9a8c9ed56c
Parents: cad2ab3 dac23c4
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 6 09:13:59 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 6 09:13:59 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../processors/task/GridTaskProcessor.java | 24 ++++++++++++++++++--
2 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[12/50] incubator-ignite git commit: ignite-328
IgniteMessaging.remoteListen ignores forOldest() projection
Posted by vk...@apache.org.
ignite-328 IgniteMessaging.remoteListen ignores forOldest() projection
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6572efba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6572efba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6572efba
Branch: refs/heads/ignite-471
Commit: 6572efba2304756a0abb9a5453d9e1e0899ff865
Parents: 580f051
Author: Andrey Gura <ag...@gridgain.com>
Authored: Wed Apr 1 16:41:17 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Sun Apr 5 23:30:14 2015 +0300
----------------------------------------------------------------------
.../internal/cluster/ClusterGroupAdapter.java | 3 +-
.../ignite/messaging/GridMessagingSelfTest.java | 50 ++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6572efba/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
index c1d31af..0daffcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
@@ -806,7 +806,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable {
* @param isOldest Oldest flag.
*/
private AgeClusterGroup(ClusterGroupAdapter parent, boolean isOldest) {
- super(parent.ctx, parent.subjId, parent.p, parent.ids);
+ super(parent.ctx, parent.subjId, (IgnitePredicate<ClusterNode>) null);
this.isOldest = isOldest;
@@ -823,6 +823,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable {
lastTopVer = ctx.discovery().topologyVersion();
this.node = isOldest ? U.oldest(super.nodes(), null) : U.youngest(super.nodes(), null);
+ this.p = F.nodeForNodes(node);
}
finally {
unguard();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6572efba/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
index 4c844fc..c033750 100644
--- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
@@ -67,6 +67,9 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest {
/** */
private static final Integer I_TOPIC_2 = 2;
+ /** Message count. */
+ private static AtomicInteger MSG_CNT;
+
/** */
public static final String EXT_RESOURCE_CLS_NAME = "org.apache.ignite.tests.p2p.TestUserResource";
@@ -161,6 +164,8 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
+ MSG_CNT = new AtomicInteger();
+
ignite1 = startGrid(1);
ignite2 = startGrid(2);
}
@@ -1088,4 +1093,49 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest {
assertEquals(1, msgCnt.get());
}
+
+ /**
+ * Tests that message listener registers only for one oldest node.
+ *
+ * @throws Exception If an error occurred.
+ */
+ public void testRemoteListenForOldest() throws Exception {
+ remoteListenForOldest(ignite1);
+
+ // Restart oldest node.
+ stopGrid(1);
+
+ ignite1 = startGrid(1);
+
+ MSG_CNT.set(0);
+
+ // Ignite2 is oldest now.
+ remoteListenForOldest(ignite2);
+ }
+
+ /**
+ * @param expOldestIgnite Expected oldest ignite.
+ */
+ private void remoteListenForOldest(Ignite expOldestIgnite) throws InterruptedException {
+ ClusterGroup grp = ignite1.cluster().forOldest();
+
+ assertEquals(1, grp.nodes().size());
+ assertEquals(expOldestIgnite.cluster().localNode().id(), grp.node().id());
+
+ ignite1.message(grp).remoteListen(null, new P2<UUID, Object>() {
+ @Override public boolean apply(UUID nodeId, Object msg) {
+ System.out.println("Received new message [msg=" + msg + ", senderNodeId=" + nodeId + ']');
+
+ MSG_CNT.incrementAndGet();
+
+ return true;
+ }
+ });
+
+ ignite1.message().send(null, MSG_1);
+
+ Thread.sleep(3000);
+
+ assertEquals(1, MSG_CNT.get());
+ }
}
[44/50] incubator-ignite git commit: ignite-678
Posted by vk...@apache.org.
ignite-678
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ddaede6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ddaede6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ddaede6a
Branch: refs/heads/ignite-471
Commit: ddaede6a1d34dc71a4ffb6a31786e0bef67e97be
Parents: 7e07b90
Author: avinogradov <av...@gridgain.com>
Authored: Mon Apr 6 19:08:10 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Mon Apr 6 19:08:10 2015 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddaede6a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bc58e04..92a85a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -497,7 +497,7 @@
<failOnError>false</failOnError>
<fileSets>
<fileSet>
- <directory>target</directory>
+ <directory>${basedir}/target</directory>
<includes>
<include>ignite-${project.version}-source-release.zip</include>
</includes>
[35/50] incubator-ignite git commit: ignite-sprint-3 - map query sort
fix (IGNITE-682)
Posted by vk...@apache.org.
ignite-sprint-3 - map query sort fix (IGNITE-682)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/88268bf8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/88268bf8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/88268bf8
Branch: refs/heads/ignite-471
Commit: 88268bf8f1cf3c612bf0e68a471097817af9de87
Parents: af5c9d3
Author: S.Vladykin <sv...@gridgain.com>
Authored: Mon Apr 6 16:55:01 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Mon Apr 6 16:55:01 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/sql/GridSqlQuerySplitter.java | 2 ++
.../processors/query/h2/sql/GridQueryParsingTest.java | 1 +
.../internal/processors/query/h2/sql/IgniteVsH2QueryTest.java | 7 +++++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88268bf8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 47e5e05..77e0cc8 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -110,6 +110,8 @@ public class GridSqlQuerySplitter {
// -- ORDER BY
if (!srcQry.sort().isEmpty()) {
+ mapQry.clearSort();
+
for (GridSqlSortColumn sortCol : srcQry.sort().values())
rdcQry.addSort(column(((GridSqlAlias)mapExps.get(sortCol.column())).alias()), sortCol);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88268bf8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index eada55a..7c76ddb 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -172,6 +172,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("select count(*) as a from Person");
checkQuery("select count(*) as a, count(p.*), count(p.name) from Person p");
checkQuery("select count(distinct p.name) from Person p");
+ checkQuery("select name, count(*) cnt from Person group by name order by cnt desc limit 10");
checkQuery("select p.name, avg(p.old), max(p.old) from Person p group by p.name");
checkQuery("select p.name n, avg(p.old) a, max(p.old) m from Person p group by p.name");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88268bf8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
index 0506ddf..1f4771a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java
@@ -538,6 +538,13 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest {
}
/**
+ * @throws SQLException If failed.
+ */
+ public void testAggregateOrderBy() throws SQLException {
+ compareOrderedQueryRes0("select firstName name, count(*) cnt from \"part\".Person group by name order by cnt desc");
+ }
+
+ /**
* @throws Exception If failed.
*/
public void testNullParamSubstitution() throws Exception {