incubator-ignite git commit: IGNITE-434. Add DISCLAIMER file for the release
Repository: incubator-ignite Updated Branches: refs/heads/sprint-2 2b3be9845 -> fa500af58 IGNITE-434. Add DISCLAIMER file for the release Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa500af5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa500af5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa500af5 Branch: refs/heads/sprint-2 Commit: fa500af58a3c730ebf24b15e0e7dee002dbfae38 Parents: 2b3be98 Author: Konstantin Boudnik Authored: Mon Mar 9 14:14:12 2015 -0700 Committer: Konstantin Boudnik Committed: Mon Mar 9 15:59:40 2015 -0700 -- DISCLAIMER | 15 +++ 1 file changed, 15 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa500af5/DISCLAIMER -- diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 000..734f01a --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,15 @@ +Apache Ignite is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. + +For more information about the incubation status of the Apache Ignite project +you can go to the following page: + +http://ignite.incubator.apache.org/
incubator-ignite git commit: IGNITE-620. Add CI tooling code for patch validation
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-620 [created] 56edc9045
IGNITE-620. Add CI tooling code for patch validation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/56edc904
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/56edc904
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/56edc904
Branch: refs/heads/ignite-620
Commit: 56edc90450d2f9e474ee1808a4c38fdd72ff8289
Parents: b53e531
Author: Konstantin Boudnik
Authored: Thu Mar 26 12:46:19 2015 -0700
Committer: Konstantin Boudnik
Committed: Thu Mar 26 12:46:19 2015 -0700
--
dev-tools/.gitignore | 2 +
dev-tools/build.gradle | 46
dev-tools/src/main/groovy/jiraslurp.groovy | 147
3 files changed, 195 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56edc904/dev-tools/.gitignore
--
diff --git a/dev-tools/.gitignore b/dev-tools/.gitignore
new file mode 100644
index 000..3036616
--- /dev/null
+++ b/dev-tools/.gitignore
@@ -0,0 +1,2 @@
+validated-jira.txt
+.gradle
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56edc904/dev-tools/build.gradle
--
diff --git a/dev-tools/build.gradle b/dev-tools/build.gradle
new file mode 100644
index 000..30ae6b7
--- /dev/null
+++ b/dev-tools/build.gradle
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+apply plugin: 'groovy'
+
+repositories {
+mavenCentral()
+}
+
+dependencies {
+compile 'org.codehaus.groovy:groovy-all:2.2.1'
+}
+
+task help {
+ println '''There are two interfaces to work with JIRA attachment validation
tool
+ - to do the batch validation of all latest patch attachments
+ gradle slurp
+ - to grab a single JIRA's latest attachment and run test validation on it
+ JIRA_NUM=INGITE-### gradle patchapply'''
+}
+
+task slurp (dependsOn: 'classes', type: JavaExec) {
+ args (project.buildDir, 'slurp')
+ main = 'jiraslurp'
+ classpath = sourceSets.main.runtimeClasspath
+}
+
+task patchapply (dependsOn: 'classes', type: JavaExec) {
+ args ("JIRA_NUM=${System.getenv('JIRA_NUM')}")
+ main = 'jiraslurp'
+ classpath = sourceSets.main.runtimeClasspath
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56edc904/dev-tools/src/main/groovy/jiraslurp.groovy
--
diff --git a/dev-tools/src/main/groovy/jiraslurp.groovy
b/dev-tools/src/main/groovy/jiraslurp.groovy
new file mode 100644
index 000..7161e1e
--- /dev/null
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -0,0 +1,147 @@
+/*
+ * 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.
+ */
+/**
+ * Parsing a special filter from Apache Ignite JIRA and picking up latest by ID
+ * attachments to process.
+ */
+final GIT_REPO =
"https://git1-us-west.apache.org/repos/asf/incubator-ignite.git";
+final ATTACHMENT_URL = "https://issues.apache.org/jira/secure/attachment";
+final validated_filename = "validated-jira.txt"
+final LAST_SUCCESSFUL_ARTIFACT =
"guestAuth/repository/download/Ignite_PatchVali
svn commit: r1669683 - /incubator/ignite/site/trunk/download-mirrors.html
Author: cos Date: Fri Mar 27 20:52:53 2015 New Revision: 1669683 URL: http://svn.apache.org/r1669683 Log: IGNITE-622. Add nightly binaries link to the website download page Modified: incubator/ignite/site/trunk/download-mirrors.html Modified: incubator/ignite/site/trunk/download-mirrors.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/download-mirrors.html?rev=1669683&r1=1669682&r2=1669683&view=diff == --- incubator/ignite/site/trunk/download-mirrors.html (original) +++ incubator/ignite/site/trunk/download-mirrors.html Fri Mar 27 20:52:53 2015 @@ -100,4 +100,17 @@ $ mvn clean package -DskipTests -P-release + + +Latest Nightly Binaries +From builds.apache.org: + + +last successful: +https://builds.apache.org/view/H-L/view/Ignite/job/Ignite-nightly/lastSuccessfulBuild/artifact/target/"; + + + +
svn commit: r1669684 - /incubator/ignite/site/trunk/download-mirrors.html
Author: cos Date: Fri Mar 27 20:54:29 2015 New Revision: 1669684 URL: http://svn.apache.org/r1669684 Log: IGNITE-622. Add nightly binaries link to the website download page Fixing an id name Modified: incubator/ignite/site/trunk/download-mirrors.html Modified: incubator/ignite/site/trunk/download-mirrors.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/download-mirrors.html?rev=1669684&r1=1669683&r2=1669684&view=diff == --- incubator/ignite/site/trunk/download-mirrors.html (original) +++ incubator/ignite/site/trunk/download-mirrors.html Fri Mar 27 20:54:29 2015 @@ -107,7 +107,7 @@ last successful: -https://builds.apache.org/view/H-L/view/Ignite/job/Ignite-nightly/lastSuccessfulBuild/artifact/target/";
svn commit: r1669685 - /incubator/ignite/site/trunk/download-mirrors.html
Author: cos Date: Fri Mar 27 20:56:33 2015 New Revision: 1669685 URL: http://svn.apache.org/r1669685 Log: IGNITE-622. Add nightly binaries link to the website download page Adding the name to the link Modified: incubator/ignite/site/trunk/download-mirrors.html Modified: incubator/ignite/site/trunk/download-mirrors.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/download-mirrors.html?rev=1669685&r1=1669684&r2=1669685&view=diff == --- incubator/ignite/site/trunk/download-mirrors.html (original) +++ incubator/ignite/site/trunk/download-mirrors.html Fri Mar 27 20:56:33 2015 @@ -107,8 +107,8 @@ last successful: -https://builds.apache.org/view/H-L/view/Ignite/job/Ignite-nightly/lastSuccessfulBuild/artifact/target/"; +https://builds.apache.org/view/H-L/view/Ignite/job/Ignite-nightly/lastSuccessfulBuild/artifact/target/";>Night binaries
svn commit: r1669686 - /incubator/ignite/site/trunk/download-mirrors.html
Author: cos Date: Fri Mar 27 20:57:21 2015 New Revision: 1669686 URL: http://svn.apache.org/r1669686 Log: IGNITE-622. Add nightly binaries link to the website download page Typo on the name Modified: incubator/ignite/site/trunk/download-mirrors.html Modified: incubator/ignite/site/trunk/download-mirrors.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/download-mirrors.html?rev=1669686&r1=1669685&r2=1669686&view=diff == --- incubator/ignite/site/trunk/download-mirrors.html (original) +++ incubator/ignite/site/trunk/download-mirrors.html Fri Mar 27 20:57:21 2015 @@ -108,7 +108,7 @@ last successful: https://builds.apache.org/view/H-L/view/Ignite/job/Ignite-nightly/lastSuccessfulBuild/artifact/target/";>Night binaries + href="https://builds.apache.org/view/H-L/view/Ignite/job/Ignite-nightly/lastSuccessfulBuild/artifact/target/";>Nightly binaries
svn commit: r1669699 - /incubator/ignite/site/trunk/download-mirrors.html
Author: cos Date: Fri Mar 27 22:43:45 2015 New Revision: 1669699 URL: http://svn.apache.org/r1669699 Log: IGNITE-622: Using a link to the lastSuccessfulBuild Modified: incubator/ignite/site/trunk/download-mirrors.html Modified: incubator/ignite/site/trunk/download-mirrors.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/download-mirrors.html?rev=1669699&r1=1669698&r2=1669699&view=diff == --- incubator/ignite/site/trunk/download-mirrors.html (original) +++ incubator/ignite/site/trunk/download-mirrors.html Fri Mar 27 22:43:45 2015 @@ -108,7 +108,7 @@ last successful: https://builds.apache.org/view/H-L/view/Ignite/job/Ignite-nightly/lastSuccessfulBuild/artifact/target/";>Nightly binaries + href="https://builds.apache.org/view/H-L/view/Ignite/job/Ignite-nightly/lastSuccessfulBuild/";>Nightly binaries
[04/50] incubator-ignite git commit: Merge branches 'ignite-gg-9830' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830
Merge branches 'ignite-gg-9830' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e0a19d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e0a19d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e0a19d4 Branch: refs/heads/ignite-620 Commit: 7e0a19d432b21b0d9561ecf2dcb51b4b11af2ec2 Parents: 6932fc6 fbd Author: AKuznetsov Authored: Tue Apr 28 20:18:25 2015 +0700 Committer: AKuznetsov Committed: Tue Apr 28 20:18:25 2015 +0700 -- .../eviction/sorted/SortedEvictionPolicy.java | 2 +- .../distributed/dht/GridDhtLockRequest.java | 38 +++--- .../distributed/near/GridNearLockRequest.java | 54 ++-- 3 files changed, 47 insertions(+), 47 deletions(-) --
[17/50] incubator-ignite git commit: # IGNITE-789 Review.
# IGNITE-789 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/96f3c037
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96f3c037
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96f3c037
Branch: refs/heads/ignite-620
Commit: 96f3c0373b4e28c55dae1c6ff6cde1712ad78b70
Parents: c33d096
Author: AKuznetsov
Authored: Wed Apr 29 10:26:43 2015 +0700
Committer: AKuznetsov
Committed: Wed Apr 29 10:26:43 2015 +0700
--
.../internal/visor/cache/VisorCacheStartTask.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96f3c037/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
index 34f7b18..270c48a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
@@ -35,7 +35,8 @@ import java.util.*;
* Task that start cache or near cache with specified configuration.
*/
@GridInternal
-public class VisorCacheStartTask extends
VisorMultiNodeTask, Void, Void> {
+public class VisorCacheStartTask extends
+VisorMultiNodeTask, Map, Void> {
/** */
private static final long serialVersionUID = 0L;
@@ -44,8 +45,15 @@ public class VisorCacheStartTask extends
VisorMultiNodeTask results)
throws IgniteException {
-return null;
+/** {@inheritDoc} */
+@Nullable @Override protected Map
reduce0(List results) throws IgniteException {
+Map map = new HashMap<>();
+
+for (ComputeJobResult res : results)
+if (res.getException() != null)
+map.put(res.getNode().id(), res.getException());
+
+return map;
}
/**
[24/50] incubator-ignite git commit: # ignite-sprint-4 disabled hanging test
# ignite-sprint-4 disabled hanging test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e253e994
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e253e994
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e253e994
Branch: refs/heads/ignite-620
Commit: e253e994dbd743d699b71d69bd9ae6520875e594
Parents: bc9687f
Author: sboikov
Authored: Wed Apr 29 11:51:05 2015 +0300
Committer: sboikov
Committed: Wed Apr 29 11:51:05 2015 +0300
--
.../processors/datastreamer/DataStreamerMultiThreadedSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e253e994/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
index 2382a66..bea3809 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
@@ -68,6 +68,8 @@ public class DataStreamerMultiThreadedSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testStartStopIgnites() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-840";);
+
for (int attempt = 0; attempt < 3; ++attempt) {
log.info("Iteration: " + attempt);
[07/50] incubator-ignite git commit: Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830
Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d411b9f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d411b9f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d411b9f2 Branch: refs/heads/ignite-620 Commit: d411b9f24a5bd8d07f4cce494667e717a6122707 Parents: 576c888 2a68725 Author: AKuznetsov Authored: Tue Apr 28 21:06:18 2015 +0700 Committer: AKuznetsov Committed: Tue Apr 28 21:06:18 2015 +0700 -- .../processors/cache/GridCacheMvccManager.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtTxFinishFuture.java | 102 +- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 +++ .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../cache/distributed/near/GridNearTxLocal.java | 6 + .../cache/transactions/IgniteInternalTx.java| 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 +- .../cache/transactions/IgniteTxManager.java | 117 +-- .../cache/IgniteCachePutAllRestartTest.java | 203 +++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 ++- ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 7 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 2 - .../near/IgniteCacheNearTxRollbackTest.java | 133 .../IgniteCacheFailoverTestSuite.java | 8 +- .../testsuites/IgniteCacheRestartTestSuite.java | 3 +- 20 files changed, 747 insertions(+), 56 deletions(-) --
[21/50] incubator-ignite git commit: release notes
release notes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f10a06b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f10a06b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f10a06b5
Branch: refs/heads/ignite-620
Commit: f10a06b5ca870f221e4d4f0b0573becbcddce60b
Parents: 48c12bb
Author: Yakov Zhdanov
Authored: Wed Apr 29 11:38:57 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Apr 29 11:38:57 2015 +0300
--
RELEASE_NOTES.txt | 20 +++-
.../processors/cache/IgniteCacheProxy.java | 10 +-
2 files changed, 12 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f10a06b5/RELEASE_NOTES.txt
--
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index cef9a54..b968c92 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,28 +1,22 @@
Apache Ignite Release Notes
===
-Apache Ignite In-Memory Data Fabric 1.0.3
--
+Apache Ignite In-Memory Data Fabric 1.1
+---
* Added Google Compute Engine TCP discovery IP finder.
* Added generic cloud TCP discovery IP finder (based on jcoulds).
* Added SortedEvictionPolicy.
* Added chaining for IgniteConfiguration and CacheConfiguration setters.
-* Improved expiry policy handling.
+* Added AffinityUuid class for easier generation of unique collocated keys.
+* Added support for cache configuration templates.
+* Added support for (*) star notation in cache names.
+* Added "collocated" mode for SQL queries.
+* Improved expiry policy handling (TTL based evictions) to avoid thrashing.
* Fixed job continuations.
* Fixed compilation and runtime with OpenJDK 7 & 8
-* Many stability and fault-tolerance fixes.
-
-
-Apache Ignite In-Memory Data Fabric 1.1
-
* Fixed SQL Union support
-* Added "collocated" mode for SQL queries.
* Fixed Word-Count streaming example to produce better results.
-* Added AffinityUuid class for easier generation of unique collocated keys.
-* Added support for cache configuration templates.
-* Added support for (*) star notation in cache names.
* Removed edtFTPj scanner from URI deployment due to licensing issues.
* Made deployment scanners for URI-based deployment pluggable.
* Many stability and fault-tolerance fixes.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f10a06b5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index c833705..2de5bf0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -222,7 +222,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter randomEntry() {
+@Nullable @Override public Cache.Entry randomEntry() {
CacheOperationContext prev = onEnter(opCtx);
try {
@@ -344,7 +344,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> query(Query filter, @Nullable ClusterGroup
grp) {
+private QueryCursor> query(Query filter, @Nullable
ClusterGroup grp) {
final CacheQuery> qry;
final CacheQueryFuture> fut;
@@ -433,7 +433,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> queryContinuous(ContinuousQuery qry,
boolean loc) {
+private QueryCursor> queryContinuous(ContinuousQuery
qry, boolean loc) {
if (qry.getInitialQuery() instanceof ContinuousQuery)
throw new IgniteException("Initial predicate for continuous query
can't be an instance of another " +
"continuous query. Use SCAN or SQL query for initial
iteration.");
@@ -546,7 +546,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> localEntries(CachePeekMode...
peekModes) throws CacheException {
+@Override public Iterable> localEntries(CachePeekMode...
peekModes) throws CacheException {
CacheOperationContext prev = onEnter(opCtx);
try {
@@ -730,7 +730,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> entrySetx(CacheEntryPredicate... filter) {
+public Set> entrySetx(CacheEntryPredicate... filter) {
CacheOperationContext prev = onEnter(opCtx);
try {
[20/50] incubator-ignite git commit: # ignite-sprint-4 more info in test
# ignite-sprint-4 more info in test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a7599bf0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7599bf0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7599bf0
Branch: refs/heads/ignite-620
Commit: a7599bf0380386c84ef96150987bdf1d861f6455
Parents: 7d9df3d
Author: sboikov
Authored: Wed Apr 29 09:36:19 2015 +0300
Committer: sboikov
Committed: Wed Apr 29 09:36:19 2015 +0300
--
.../cache/distributed/GridCacheLockAbstractTest.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7599bf0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
index 72a64a1..ab0f7d0 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@ -19,6 +19,7 @@ package
org.apache.ignite.internal.processors.cache.distributed;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -502,8 +503,12 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
public void testLockReentrancy() throws Throwable {
fail("https://issues.apache.org/jira/browse/IGNITE-835";);
+Affinity aff = ignite1.affinity(null);
+
for (int i = 10; i < 100; i++) {
-log.info("Key: " + i);
+log.info("Test lock [key=" + i +
+", primary=" + aff.isPrimary(ignite1.cluster().localNode(), i)
+
+", backup=" + aff.isBackup(ignite1.cluster().localNode(), i) +
']');
final int i0 = i;
[23/50] incubator-ignite git commit: release notes
release notes Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/77d092c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/77d092c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/77d092c7 Branch: refs/heads/ignite-620 Commit: 77d092c75fd8de40dd6a814c3a38839b80190119 Parents: bc9687f Author: Yakov Zhdanov Authored: Wed Apr 29 11:40:34 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Apr 29 11:40:34 2015 +0300 -- RELEASE_NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77d092c7/RELEASE_NOTES.txt -- diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index b968c92..0369ecd 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -5,7 +5,7 @@ Apache Ignite In-Memory Data Fabric 1.1 --- * Added Google Compute Engine TCP discovery IP finder. -* Added generic cloud TCP discovery IP finder (based on jcoulds). +* Added generic cloud TCP discovery IP finder (based on jclouds). * Added SortedEvictionPolicy. * Added chaining for IgniteConfiguration and CacheConfiguration setters. * Added AffinityUuid class for easier generation of unique collocated keys.
[15/50] incubator-ignite git commit: Merge branches 'ignite-789' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-789
Merge branches 'ignite-789' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-789 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a9a4c4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a9a4c4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a9a4c4d Branch: refs/heads/ignite-620 Commit: 1a9a4c4d96091624dbbfb2c52b638877f13972c3 Parents: b166eea acc731c Author: AKuznetsov Authored: Wed Apr 29 07:24:46 2015 +0700 Committer: AKuznetsov Committed: Wed Apr 29 07:24:46 2015 +0700 -- RELEASE_NOTES.txt | 13 + .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- .../clients/src/test/resources/spring-cache.xml | 4 +- .../src/test/resources/spring-server-node.xml | 4 +- .../test/resources/spring-server-ssl-node.xml | 4 +- .../java/org/apache/ignite/IgniteLogger.java| 8 +- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../main/java/org/apache/ignite/Ignition.java | 2 +- .../eviction/sorted/SortedEvictionPolicy.java | 2 +- .../configuration/ConnectorConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../internal/cluster/ClusterGroupAdapter.java | 16 + .../managers/communication/GridIoManager.java | 6 +- .../deployment/GridDeploymentManager.java | 2 +- .../GridDeploymentPerVersionStore.java | 3 +- .../processors/cache/GridCacheMvccManager.java | 2 +- .../cache/GridCacheSharedContext.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtLockRequest.java | 38 +- .../distributed/dht/GridDhtTxFinishFuture.java | 102 +++- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 + .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearLockRequest.java | 54 +- .../cache/distributed/near/GridNearTxLocal.java | 6 + .../cache/transactions/IgniteInternalTx.java| 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 +- .../cache/transactions/IgniteTxManager.java | 117 +++- .../util/tostring/GridToStringBuilder.java | 2 +- .../visor/cache/VisorCacheConfiguration.java| 7 - .../visor/cache/VisorCacheNodesTask.java| 74 +++ .../cache/VisorCacheStoreConfiguration.java | 35 -- .../cache/VisorCacheTypeFieldMetadata.java | 36 +- .../visor/cache/VisorCacheTypeMetadata.java | 99 +--- .../internal/visor/igfs/VisorIgfsMetrics.java | 128 + .../node/VisorNodeEventsCollectorTask.java | 58 +- .../internal/visor/query/VisorQueryArg.java | 19 +- .../internal/visor/query/VisorQueryCursor.java | 1 - .../internal/visor/query/VisorQueryJob.java | 9 +- .../internal/visor/query/VisorQueryTask.java| 41 -- .../internal/visor/util/VisorEventMapper.java | 13 + .../internal/visor/util/VisorTaskUtils.java | 2 +- .../apache/ignite/logger/java/JavaLogger.java | 12 +- .../apache/ignite/marshaller/Marshaller.java| 14 +- .../ignite/marshaller/jdk/JdkMarshaller.java| 10 +- .../optimized/OptimizedMarshaller.java | 8 +- .../apache/ignite/resources/LoggerResource.java | 2 +- .../apache/ignite/resources/SpringResource.java | 2 +- .../org/apache/ignite/services/Service.java | 2 +- .../ignite/services/ServiceConfiguration.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java| 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 4 +- .../fifoqueue/FifoQueueCollisionSpi.java| 10 +- .../jobstealing/JobStealingCollisionSpi.java| 14 +- .../PriorityQueueCollisionSpi.java | 6 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 10 +- .../memory/MemoryEventStorageSpi.java | 10 +- .../spi/failover/always/AlwaysFailoverSpi.java | 10 +- .../jobstealing/JobStealingFailoverSpi.java | 6 +- .../spi/failover/never/NeverFailoverSpi.java| 8 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 4 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 12 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +- .../WeightedRandomLoadBalancingSpi.java | 10 +- .../spi/swapspace/file/FileSwapSpaceSpi.java| 10 +- .../src/test/config/load/merge-sort-base.xml| 2 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 + .../cache/IgniteCachePutAllR
[03/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fbde Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fbde Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fbde Branch: refs/heads/ignite-620 Commit: fbde9dfef2af51357434d3e1264ce5f572a4 Parents: e46bef0 d125eb6 Author: Yakov Zhdanov Authored: Tue Apr 28 16:13:55 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Apr 28 16:13:55 2015 +0300 -- .../distributed/dht/GridDhtLockRequest.java | 38 +++--- .../distributed/near/GridNearLockRequest.java | 54 ++-- .../ignite/internal/util/GridJavaProcess.java | 4 ++ 3 files changed, 50 insertions(+), 46 deletions(-) --
[05/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-157-2' into ignite-sprint-4
Merge remote-tracking branch 'remotes/origin/ignite-157-2' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a68725e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a68725e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a68725e Branch: refs/heads/ignite-620 Commit: 2a68725ed9475aa74a9db222169073da2dca2159 Parents: fbd 2ea83ce Author: sboikov Authored: Tue Apr 28 16:51:53 2015 +0300 Committer: sboikov Committed: Tue Apr 28 16:51:53 2015 +0300 -- .../processors/cache/GridCacheMvccManager.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtTxFinishFuture.java | 102 +- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 +++ .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../cache/distributed/near/GridNearTxLocal.java | 6 + .../cache/transactions/IgniteInternalTx.java| 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 +- .../cache/transactions/IgniteTxManager.java | 117 +-- .../cache/IgniteCachePutAllRestartTest.java | 203 +++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 ++- ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 7 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 2 - .../near/IgniteCacheNearTxRollbackTest.java | 133 .../IgniteCacheFailoverTestSuite.java | 8 +- .../testsuites/IgniteCacheRestartTestSuite.java | 3 +- 20 files changed, 747 insertions(+), 56 deletions(-) --
[12/50] incubator-ignite git commit: release notes
release notes Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/daf8364a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/daf8364a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/daf8364a Branch: refs/heads/ignite-620 Commit: daf8364ac872e61563c57f4d2fff9d7ba9857043 Parents: fbd Author: Yakov Zhdanov Authored: Tue Apr 28 18:03:13 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Apr 28 18:03:13 2015 +0300 -- RELEASE_NOTES.txt | 13 + 1 file changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/daf8364a/RELEASE_NOTES.txt -- diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 7aeafaf..cef9a54 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,6 +1,19 @@ Apache Ignite Release Notes === +Apache Ignite In-Memory Data Fabric 1.0.3 +- + +* Added Google Compute Engine TCP discovery IP finder. +* Added generic cloud TCP discovery IP finder (based on jcoulds). +* Added SortedEvictionPolicy. +* Added chaining for IgniteConfiguration and CacheConfiguration setters. +* Improved expiry policy handling. +* Fixed job continuations. +* Fixed compilation and runtime with OpenJDK 7 & 8 +* Many stability and fault-tolerance fixes. + + Apache Ignite In-Memory Data Fabric 1.1 ---
[02/50] incubator-ignite git commit: minor
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/e46bef07 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e46bef07 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e46bef07 Branch: refs/heads/ignite-620 Commit: e46bef07e1d34ee0e978b4b90a82304f6337dee6 Parents: 51dc6aa Author: Yakov Zhdanov Authored: Tue Apr 28 16:13:39 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Apr 28 16:13:39 2015 +0300 -- .../apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e46bef07/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java index 0065244..7965c97 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/sorted/SortedEvictionPolicy.java @@ -381,7 +381,7 @@ public class SortedEvictionPolicy implements EvictionPolicy, SortedE private static final long serialVersionUID = 0L; /** Size. */ -private volatile LongAdder8 size = new LongAdder8(); +private final LongAdder8 size = new LongAdder8(); /** * @param comp Comparator.
[10/50] incubator-ignite git commit: Added support of "-v" for VisorConsole.
Added support of "-v" for VisorConsole.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3a2e2d21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3a2e2d21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3a2e2d21
Branch: refs/heads/ignite-620
Commit: 3a2e2d21e5a56bfca66fe054c47a40a0c1fa25a7
Parents: 8d5121a
Author: AKuznetsov
Authored: Tue Apr 28 21:33:38 2015 +0700
Committer: AKuznetsov
Committed: Tue Apr 28 21:33:38 2015 +0700
--
.../src/main/scala/org/apache/ignite/visor/visor.scala| 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a2e2d21/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index c24cc13..356c80a 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -1665,10 +1665,9 @@ object visor extends VisorTag {
// Make sure visor starts without shutdown hook.
System.setProperty(IGNITE_NO_SHUTDOWN_HOOK, "true")
-sys.props.get(IGNITE_QUIET).map(_.toBoolean) match {
-case Some(true) => // Node will print to Visor console in verbose
mode..
-case _ => cfg.setGridLogger(new NullLogger) // Set NullLoger in
quite mode.
-}
+// Set NullLoger in quite mode.
+if ("true".equalsIgnoreCase(sys.props.getOrElse(IGNITE_QUIET, "true")))
+cfg.setGridLogger(new NullLogger)
val startedGridName = try {
Ignition.start(cfg).name
[18/50] incubator-ignite git commit: Merge branches 'ignite-757' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757
Merge branches 'ignite-757' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36192bdd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36192bdd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36192bdd Branch: refs/heads/ignite-620 Commit: 36192bdd2339d9c2794462ee5b5a40e2ac014752 Parents: 2587900 acc731c Author: S.Vladykin Authored: Wed Apr 29 09:27:14 2015 +0300 Committer: S.Vladykin Committed: Wed Apr 29 09:27:14 2015 +0300 -- RELEASE_NOTES.txt | 13 + .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- .../clients/src/test/resources/spring-cache.xml | 4 +- .../src/test/resources/spring-server-node.xml | 4 +- .../test/resources/spring-server-ssl-node.xml | 4 +- .../java/org/apache/ignite/IgniteLogger.java| 8 +- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../main/java/org/apache/ignite/Ignition.java | 2 +- .../eviction/sorted/SortedEvictionPolicy.java | 2 +- .../configuration/ConnectorConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../internal/cluster/ClusterGroupAdapter.java | 16 + .../managers/communication/GridIoManager.java | 6 +- .../deployment/GridDeploymentManager.java | 2 +- .../GridDeploymentPerVersionStore.java | 3 +- .../processors/cache/GridCacheMvccManager.java | 2 +- .../cache/GridCacheSharedContext.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtTxFinishFuture.java | 102 +++- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 + .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../dht/preloader/GridDhtPreloader.java | 2 +- .../cache/distributed/near/GridNearTxLocal.java | 6 + .../cache/transactions/IgniteInternalTx.java| 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 +- .../cache/transactions/IgniteTxManager.java | 117 +++- .../util/tostring/GridToStringBuilder.java | 2 +- .../visor/cache/VisorCacheConfiguration.java| 7 - .../visor/cache/VisorCacheNodesTask.java| 74 +++ .../cache/VisorCacheStoreConfiguration.java | 35 -- .../cache/VisorCacheTypeFieldMetadata.java | 36 +- .../visor/cache/VisorCacheTypeMetadata.java | 99 +--- .../internal/visor/igfs/VisorIgfsMetrics.java | 128 + .../node/VisorNodeEventsCollectorTask.java | 58 +- .../internal/visor/query/VisorQueryArg.java | 19 +- .../internal/visor/query/VisorQueryCursor.java | 1 - .../internal/visor/query/VisorQueryJob.java | 9 +- .../internal/visor/query/VisorQueryTask.java| 41 -- .../internal/visor/util/VisorEventMapper.java | 13 + .../internal/visor/util/VisorTaskUtils.java | 2 +- .../apache/ignite/logger/java/JavaLogger.java | 12 +- .../apache/ignite/marshaller/Marshaller.java| 14 +- .../ignite/marshaller/jdk/JdkMarshaller.java| 10 +- .../optimized/OptimizedMarshaller.java | 8 +- .../apache/ignite/resources/LoggerResource.java | 2 +- .../apache/ignite/resources/SpringResource.java | 2 +- .../org/apache/ignite/services/Service.java | 2 +- .../ignite/services/ServiceConfiguration.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java| 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 4 +- .../fifoqueue/FifoQueueCollisionSpi.java| 10 +- .../jobstealing/JobStealingCollisionSpi.java| 14 +- .../PriorityQueueCollisionSpi.java | 6 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 10 +- .../memory/MemoryEventStorageSpi.java | 10 +- .../spi/failover/always/AlwaysFailoverSpi.java | 10 +- .../jobstealing/JobStealingFailoverSpi.java | 6 +- .../spi/failover/never/NeverFailoverSpi.java| 8 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 4 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 12 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +- .../WeightedRandomLoadBalancingSpi.java | 10 +- .../spi/swapspace/file/FileSwapSpaceSpi.java| 10 +- .../src/test/config/load/merge-sort-base.xml| 2 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 + .../cache/IgniteCachePutAllRestartTest.java | 203 +++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 +- ...xOriginatingNodeFail
[01/50] incubator-ignite git commit: Merge branches 'ignite-757' and 'ignite-sprint-4' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757
Repository: incubator-ignite Updated Branches: refs/heads/ignite-620 56edc9045 -> 14321c410 (forced update) Merge branches 'ignite-757' and 'ignite-sprint-4' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25879005 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25879005 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25879005 Branch: refs/heads/ignite-620 Commit: 25879005c01b99077f4421780cebc9cfb553eb6c Parents: 876430d d125eb6 Author: anovikov Authored: Tue Apr 28 19:45:11 2015 +0700 Committer: anovikov Committed: Tue Apr 28 19:45:11 2015 +0700 -- .../ignite/internal/GridJobContextImpl.java | 7 +- .../distributed/dht/GridDhtLockRequest.java | 38 .../distributed/dht/GridDhtTxPrepareFuture.java | 10 ++- .../distributed/near/GridNearLockRequest.java | 54 ++-- .../ignite/internal/util/GridJavaProcess.java | 4 + .../ignite/internal/visor/cache/VisorCache.java | 92 +++- .../visor/node/VisorBasicConfiguration.java | 11 +++ .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../internal/GridDiscoveryEventSelfTest.java| 30 --- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 5 +- .../config/VisorConfigurationCommand.scala | 1 + .../scala/org/apache/ignite/visor/visor.scala | 11 +++ pom.xml | 5 +- 13 files changed, 160 insertions(+), 110 deletions(-) --
[09/50] incubator-ignite git commit: Merge branch 'ignite-gg-9830' into ignite-sprint-4
Merge branch 'ignite-gg-9830' into ignite-sprint-4
Conflicts:
modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8d5121aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8d5121aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8d5121aa
Branch: refs/heads/ignite-620
Commit: 8d5121aafd1471bd716c77e43a96f7896ceda4b7
Parents: 998fb78 d411b9f
Author: AKuznetsov
Authored: Tue Apr 28 21:26:14 2015 +0700
Committer: AKuznetsov
Committed: Tue Apr 28 21:26:14 2015 +0700
--
.../internal/cluster/ClusterGroupAdapter.java | 16 +
.../visor/cache/VisorCacheConfiguration.java| 7 -
.../visor/cache/VisorCacheNodesTask.java| 74 +++
.../cache/VisorCacheStoreConfiguration.java | 35 --
.../cache/VisorCacheTypeFieldMetadata.java | 36 +-
.../visor/cache/VisorCacheTypeMetadata.java | 99 +---
.../internal/visor/igfs/VisorIgfsMetrics.java | 128 +
.../node/VisorNodeEventsCollectorTask.java | 58 +-
.../internal/visor/query/VisorQueryArg.java | 19 +-
.../internal/visor/query/VisorQueryCursor.java | 1 -
.../internal/visor/query/VisorQueryJob.java | 9 +-
.../internal/visor/query/VisorQueryTask.java| 41 --
.../internal/visor/util/VisorEventMapper.java | 13 +
.../internal/visor/util/VisorTaskUtils.java | 2 +-
...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 +
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +
.../ignite/visor/commands/VisorConsole.scala| 314 ++-
.../visor/commands/VisorConsoleCommand.scala| 77 ---
.../ignite/visor/commands/VisorTextTable.scala | 539 --
.../visor/commands/ack/VisorAckCommand.scala| 42 +-
.../commands/alert/VisorAlertCommand.scala | 35 +-
.../commands/cache/VisorCacheClearCommand.scala | 51 +-
.../commands/cache/VisorCacheCommand.scala | 34 +-
.../commands/cache/VisorCacheScanCommand.scala | 60 +-
.../commands/cache/VisorCacheStopCommand.scala | 30 +-
.../commands/cache/VisorCacheSwapCommand.scala | 66 +--
.../commands/common/VisorConsoleCommand.scala | 90 +++
.../visor/commands/common/VisorTextTable.scala | 543 +++
.../config/VisorConfigurationCommand.scala | 439 +++
.../commands/deploy/VisorDeployCommand.scala| 47 +-
.../commands/disco/VisorDiscoveryCommand.scala | 58 +-
.../commands/events/VisorEventsCommand.scala| 338 +---
.../visor/commands/gc/VisorGcCommand.scala | 130 ++---
.../visor/commands/kill/VisorKillCommand.scala | 53 +-
.../visor/commands/node/VisorNodeCommand.scala | 47 +-
.../visor/commands/ping/VisorPingCommand.scala | 41 +-
.../commands/start/VisorStartCommand.scala | 34 +-
.../commands/tasks/VisorTasksCommand.scala | 76 +--
.../commands/top/VisorTopologyCommand.scala | 36 +-
.../visor/commands/vvm/VisorVvmCommand.scala| 32 +-
.../scala/org/apache/ignite/visor/visor.scala | 278 +++---
.../ignite/visor/VisorTextTableSpec.scala | 3 +-
42 files changed, 1973 insertions(+), 2207 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d5121aa/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
--
diff --cc
modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index cab7f03,6bf72aa..c24cc13
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@@ -1620,9 -1665,10 +1665,10 @@@ object visor extends VisorTag
// Make sure visor starts without shutdown hook.
System.setProperty(IGNITE_NO_SHUTDOWN_HOOK, "true")
- // Set NullLoger in quite mode.
- if ("true".equalsIgnoreCase(System.getProperty(IGNITE_QUIET, "true")))
- cfg.setGridLogger(new NullLogger)
+ sys.props.get(IGNITE_QUIET).map(_.toBoolean) match {
-case Some(true) => // No-op.
-case _ => cfg.setGridLogger(new NullLogger)
++case Some(true) => // Node will print to Visor console in
verbose mode..
++case _ => cfg.setGridLogger(new NullLogger) // Set NullLoger in
quite mode.
+ }
val startedGridName = try {
Ignition.start(cfg).name
[08/50] incubator-ignite git commit: Added support of "-v" for VisorConsole.
Added support of "-v" for VisorConsole.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/998fb789
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/998fb789
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/998fb789
Branch: refs/heads/ignite-620
Commit: 998fb78954b12f3da2a2c34cc7d7e2d1d7cb02f1
Parents: 2a68725
Author: AKuznetsov
Authored: Tue Apr 28 21:21:09 2015 +0700
Committer: AKuznetsov
Committed: Tue Apr 28 21:21:09 2015 +0700
--
.../src/main/scala/org/apache/ignite/visor/visor.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/998fb789/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 976ac3a..cab7f03 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -1620,7 +1620,9 @@ object visor extends VisorTag {
// Make sure visor starts without shutdown hook.
System.setProperty(IGNITE_NO_SHUTDOWN_HOOK, "true")
-cfg.setGridLogger(new NullLogger)
+// Set NullLoger in quite mode.
+if ("true".equalsIgnoreCase(System.getProperty(IGNITE_QUIET, "true")))
+cfg.setGridLogger(new NullLogger)
val startedGridName = try {
Ignition.start(cfg).name
[31/50] incubator-ignite git commit: Merge branches 'ignite-789' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-789
Merge branches 'ignite-789' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-789 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be7bfda5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be7bfda5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be7bfda5 Branch: refs/heads/ignite-620 Commit: be7bfda54b0e1f70fed377d94c6f2955ac742858 Parents: 96f3c03 2b02dd0 Author: AKuznetsov Authored: Wed Apr 29 17:53:48 2015 +0700 Committer: AKuznetsov Committed: Wed Apr 29 17:53:48 2015 +0700 -- RELEASE_NOTES.txt | 22 +- modules/cloud/README.txt| 32 ++ modules/cloud/licenses/apache-2.0.txt | 202 + modules/cloud/pom.xml | 108 + .../cloud/TcpDiscoveryCloudIpFinder.java| 433 +++ .../tcp/ipfinder/cloud/package-info.java| 21 + .../TcpDiscoveryCloudIpFinderSelfTest.java | 124 ++ .../tcp/ipfinder/cloud/package-info.java| 22 + .../ignite/testsuites/IgniteCloudTestSuite.java | 112 + .../processors/cache/IgniteCacheProxy.java | 10 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- .../distributed/GridCacheLockAbstractTest.java | 75 .../DataStreamerMultiThreadedSelfTest.java | 2 + modules/gce/README.txt | 32 ++ modules/gce/licenses/apache-2.0.txt | 202 + modules/gce/pom.xml | 94 .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 380 .../tcp/ipfinder/gce/package-info.java | 22 + ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 73 .../tcp/ipfinder/gce/package-info.java | 22 + .../ignite/testsuites/IgniteGCETestSuite.java | 71 +++ pom.xml | 2 + 22 files changed, 2049 insertions(+), 22 deletions(-) --
[13/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/48c12bb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/48c12bb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/48c12bb7 Branch: refs/heads/ignite-620 Commit: 48c12bb753d86f9fbe20d8fc23672f29b6f790bf Parents: daf8364 3a2e2d2 Author: Yakov Zhdanov Authored: Tue Apr 28 18:03:26 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Apr 28 18:03:26 2015 +0300 -- .../internal/cluster/ClusterGroupAdapter.java | 16 + .../processors/cache/GridCacheMvccManager.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtTxFinishFuture.java | 102 +++- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 + .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../cache/distributed/near/GridNearTxLocal.java | 6 + .../cache/transactions/IgniteInternalTx.java| 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 +- .../cache/transactions/IgniteTxManager.java | 117 +++- .../visor/cache/VisorCacheConfiguration.java| 7 - .../visor/cache/VisorCacheNodesTask.java| 74 +++ .../cache/VisorCacheStoreConfiguration.java | 35 -- .../cache/VisorCacheTypeFieldMetadata.java | 36 +- .../visor/cache/VisorCacheTypeMetadata.java | 99 +--- .../internal/visor/igfs/VisorIgfsMetrics.java | 128 + .../node/VisorNodeEventsCollectorTask.java | 58 +- .../internal/visor/query/VisorQueryArg.java | 19 +- .../internal/visor/query/VisorQueryCursor.java | 1 - .../internal/visor/query/VisorQueryJob.java | 9 +- .../internal/visor/query/VisorQueryTask.java| 41 -- .../internal/visor/util/VisorEventMapper.java | 13 + .../internal/visor/util/VisorTaskUtils.java | 2 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 + .../cache/IgniteCachePutAllRestartTest.java | 203 +++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 7 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 2 - .../near/IgniteCacheNearTxRollbackTest.java | 133 + .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheFailoverTestSuite.java | 8 +- .../testsuites/IgniteCacheRestartTestSuite.java | 3 +- .../ignite/visor/commands/VisorConsole.scala| 314 ++- .../visor/commands/VisorConsoleCommand.scala| 77 --- .../ignite/visor/commands/VisorTextTable.scala | 539 -- .../visor/commands/ack/VisorAckCommand.scala| 42 +- .../commands/alert/VisorAlertCommand.scala | 35 +- .../commands/cache/VisorCacheClearCommand.scala | 51 +- .../commands/cache/VisorCacheCommand.scala | 34 +- .../commands/cache/VisorCacheScanCommand.scala | 60 +- .../commands/cache/VisorCacheStopCommand.scala | 30 +- .../commands/cache/VisorCacheSwapCommand.scala | 66 +-- .../commands/common/VisorConsoleCommand.scala | 90 +++ .../visor/commands/common/VisorTextTable.scala | 543 +++ .../config/VisorConfigurationCommand.scala | 439 +++ .../commands/deploy/VisorDeployCommand.scala| 47 +- .../commands/disco/VisorDiscoveryCommand.scala | 58 +- .../commands/events/VisorEventsCommand.scala| 338 +--- .../visor/commands/gc/VisorGcCommand.scala | 130 ++--- .../visor/commands/kill/VisorKillCommand.scala | 53 +- .../visor/commands/node/VisorNodeCommand.scala | 47 +- .../visor/commands/ping/VisorPingCommand.scala | 41 +- .../commands/start/VisorStartCommand.scala | 34 +- .../commands/tasks/VisorTasksCommand.scala | 76 +-- .../commands/top/VisorTopologyCommand.scala | 36 +- .../visor/commands/vvm/VisorVvmCommand.scala| 32 +- .../scala/org/apache/ignite/visor/visor.scala | 275 +++--- .../ignite/visor/VisorTextTableSpec.scala | 3 +- 62 files changed, 2719 insertions(+), 2261 deletions(-) --
[28/50] incubator-ignite git commit: Merge branches 'ignite-839' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-839
Merge branches 'ignite-839' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-839 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e2ae5979 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e2ae5979 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e2ae5979 Branch: refs/heads/ignite-620 Commit: e2ae5979ec494e3d3f829ff6b8e0978d9b1caae8 Parents: db8333d 18b4c39 Author: AKuznetsov Authored: Wed Apr 29 17:43:21 2015 +0700 Committer: AKuznetsov Committed: Wed Apr 29 17:43:21 2015 +0700 -- RELEASE_NOTES.txt | 22 +++- .../processors/cache/IgniteCacheProxy.java | 10 - .../DataStreamerMultiThreadedSelfTest.java | 2 ++ 3 files changed, 15 insertions(+), 19 deletions(-) --
[27/50] incubator-ignite git commit: # IGNITE-839 Fixed cache metrics.
# IGNITE-839 Fixed cache metrics.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/db8333d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db8333d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db8333d7
Branch: refs/heads/ignite-620
Commit: db8333d77d68669edc203de8e69ad49ecc62f4c0
Parents: a7599bf
Author: AKuznetsov
Authored: Wed Apr 29 17:42:43 2015 +0700
Committer: AKuznetsov
Committed: Wed Apr 29 17:42:43 2015 +0700
--
.../internal/visor/cache/VisorCacheMetrics.java | 53 +++-
1 file changed, 19 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db8333d7/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
index c05b9e0..30be424 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
@@ -29,7 +29,7 @@ import java.io.*;
*/
public class VisorCacheMetrics implements Serializable {
/** */
-private static final int MICROSECONDS_IN_SECOND = 1_000_000;
+private static final float MICROSECONDS_IN_SECOND = 1_000_000;
/** */
private static final long serialVersionUID = 0L;
@@ -94,14 +94,11 @@ public class VisorCacheMetrics implements Serializable {
/** Reads per second. */
private int readsPerSec;
-/** Writes per second. */
-private int writesPerSec;
+/** Puts per second. */
+private int putsPerSec;
-/** Hits per second. */
-private int hitsPerSec;
-
-/** Misses per second. */
-private int missesPerSec;
+/** Removes per second. */
+private int removalsPerSec;
/** Commits per second. */
private int commitsPerSec;
@@ -160,15 +157,11 @@ public class VisorCacheMetrics implements Serializable {
/**
* Calculate rate of metric per second.
*
- * @param metric Metric value.
- * @param time Metric finish time.
- * @param createTime Metric start time.
+ * @param meanTime Metric mean time.
* @return Metric per second.
*/
-private static int perSecond(int metric, long time, long createTime) {
-long seconds = (time - createTime) / 1000;
-
-return (seconds > 0) ? (int)(metric / seconds) : 0;
+private static int perSecond(float meanTime) {
+return (meanTime > 0) ? (int)(MICROSECONDS_IN_SECOND / meanTime) : 0;
}
/**
@@ -209,12 +202,11 @@ public class VisorCacheMetrics implements Serializable {
cm.avgPutTime = m.getAveragePutTime();
cm.avgRemovalTime = m.getAverageRemoveTime();
-cm.readsPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f /
m.getAverageGetTime());
-cm.writesPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f /
m.getAveragePutTime());
-cm.hitsPerSec = -1;
-cm.missesPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f /
m.getAverageRemoveTime());
-cm.commitsPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f /
m.getAverageTxCommitTime());
-cm.rollbacksPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f /
m.getAverageTxRollbackTime());
+cm.readsPerSec = perSecond(m.getAverageGetTime());
+cm.putsPerSec = perSecond(m.getAveragePutTime());
+cm.removalsPerSec = perSecond(m.getAverageRemoveTime());
+cm.commitsPerSec = perSecond(m.getAverageTxCommitTime());
+cm.rollbacksPerSec = perSecond(m.getAverageTxRollbackTime());
cm.qryMetrics =
VisorCacheQueryMetrics.from(c.context().queries().metrics());
@@ -364,24 +356,17 @@ public class VisorCacheMetrics implements Serializable {
}
/**
- * @return Writes per second.
- */
-public int writesPerSecond() {
-return writesPerSec;
-}
-
-/**
- * @return Hits per second.
+ * @return Puts per second.
*/
-public int hitsPerSecond() {
-return hitsPerSec;
+public int putsPerSecond() {
+return putsPerSec;
}
/**
- * @return Misses per second.
+ * @return Removes per second.
*/
-public int missesPerSecond() {
-return missesPerSec;
+public int removalsPerSecond() {
+return removalsPerSec;
}
/**
[37/50] incubator-ignite git commit: javadoc fix
javadoc 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/1d5db0c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1d5db0c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1d5db0c1
Branch: refs/heads/ignite-620
Commit: 1d5db0c1ef7edcf2ba42a98ccc7e36d6bcec064a
Parents: acc731c
Author: avinogradov
Authored: Wed Apr 29 15:39:53 2015 +0300
Committer: avinogradov
Committed: Wed Apr 29 15:39:53 2015 +0300
--
.../apache/ignite/internal/util/spring/IgniteSpringHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d5db0c1/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java
index 82ef421..a9e9e93 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelper.java
@@ -69,7 +69,7 @@ public interface IgniteSpringHelper {
* Loads all configurations with given type specified within given
configuration file.
*
* @param cfgUrl Configuration file path or URL. This cannot be {@code
null}.
- * @param cl Required type of configuration.
+ * @param cls Required type of configuration.
* @param excludedProps Properties to exclude.
* @return Tuple containing all loaded configurations and Spring context
used to load them.
* @throws IgniteCheckedException If configuration could not be read.
@@ -81,7 +81,7 @@ public interface IgniteSpringHelper {
* Loads all configurations with given type specified within given
configuration input stream.
*
* @param cfgStream Configuration input stream. This cannot be {@code
null}.
- * @param cl Required type of configuration.
+ * @param cls Required type of configuration.
* @param excludedProps Properties to exclude.
* @return Tuple containing all loaded configurations and Spring context
used to load them.
* @throws IgniteCheckedException If configuration could not be read.
[26/50] incubator-ignite git commit: ignite-757 - prepareMarshall/finishUnmarshall
ignite-757 - prepareMarshall/finishUnmarshall
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a2dba8b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a2dba8b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a2dba8b6
Branch: refs/heads/ignite-620
Commit: a2dba8b63450b6c1d502d3de8f805b884e6f5431
Parents: 36192bd
Author: S.Vladykin
Authored: Wed Apr 29 13:24:39 2015 +0300
Committer: S.Vladykin
Committed: Wed Apr 29 13:24:39 2015 +0300
--
.../query/h2/twostep/GridResultPage.java| 9 +-
.../query/h2/twostep/msg/GridH2Array.java | 6 ++--
.../query/h2/twostep/msg/GridH2CacheObject.java | 30 +++-
.../h2/twostep/msg/GridH2ValueMessage.java | 4 ++-
.../twostep/msg/GridH2ValueMessageFactory.java | 19 +++--
5 files changed, 49 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2dba8b6/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java
index 0a4b746..9392fd1 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridResultPage.java
@@ -17,12 +17,14 @@
package org.apache.ignite.internal.processors.query.h2.twostep;
+import org.apache.ignite.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.query.h2.twostep.messages.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.plugin.extensions.communication.*;
import org.h2.value.*;
+import javax.cache.*;
import java.util.*;
import static
org.apache.ignite.internal.processors.query.h2.twostep.msg.GridH2ValueMessageFactory.*;
@@ -93,7 +95,12 @@ public class GridResultPage {
rowIdx++;
-return fillArray(valsIter, new Value[cols], ctx);
+try {
+return fillArray(valsIter, new Value[cols], ctx);
+}
+catch (IgniteCheckedException e) {
+throw new CacheException(e);
+}
}
@Override public void remove() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2dba8b6/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
index ec427b9..26fd81d 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.query.h2.twostep.msg;
+import org.apache.ignite.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.plugin.extensions.communication.*;
import org.h2.value.*;
@@ -43,8 +44,9 @@ public class GridH2Array extends GridH2ValueMessage {
/**
* @param val Value.
+ * @throws IgniteCheckedException If failed.
*/
-public GridH2Array(Value val) {
+public GridH2Array(Value val) throws IgniteCheckedException {
assert val.getType() == Value.ARRAY : val.getType();
ValueArray arr = (ValueArray)val;
@@ -56,7 +58,7 @@ public class GridH2Array extends GridH2ValueMessage {
}
/** {@inheritDoc} */
-@Override public Value value(GridKernalContext ctx) {
+@Override public Value value(GridKernalContext ctx) throws
IgniteCheckedException {
return ValueArray.get(fillArray(x.iterator(), new Value[x.size()],
ctx));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2dba8b6/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
b/modules/indexing/src/main/j
[45/50] incubator-ignite git commit: Merge branches 'ignite-839' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-839
Merge branches 'ignite-839' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-839 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b01ff382 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b01ff382 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b01ff382 Branch: refs/heads/ignite-620 Commit: b01ff3824ba81b348da2d45342163c906e0f811c Parents: e2ae597 d1a84a5 Author: AKuznetsov Authored: Wed Apr 29 21:13:11 2015 +0700 Committer: AKuznetsov Committed: Wed Apr 29 21:13:11 2015 +0700 -- modules/cloud/README.txt| 32 ++ modules/cloud/licenses/apache-2.0.txt | 202 + modules/cloud/pom.xml | 108 + .../cloud/TcpDiscoveryCloudIpFinder.java| 433 +++ .../tcp/ipfinder/cloud/package-info.java| 21 + .../TcpDiscoveryCloudIpFinderSelfTest.java | 124 ++ .../tcp/ipfinder/cloud/package-info.java| 22 + .../ignite/testsuites/IgniteCloudTestSuite.java | 112 + .../ignite/codegen/MessageCodeGenerator.java| 26 +- .../configuration/CacheConfiguration.java | 4 +- .../ignite/internal/GridDirectCollection.java | 3 + .../ignite/internal/IgniteComponentType.java| 36 +- .../managers/communication/GridIoManager.java | 22 +- .../communication/GridIoMessageFactory.java | 8 + .../managers/indexing/GridIndexingManager.java | 14 +- .../processors/cache/CacheObjectImpl.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 9 +- .../processors/cache/GridCacheProcessor.java| 3 +- .../processors/cache/GridCacheSwapManager.java | 35 +- .../cache/query/GridCacheQueryManager.java | 22 +- .../cache/query/GridCacheSqlQuery.java | 135 +- .../cache/query/GridCacheTwoStepQuery.java | 8 +- .../processors/query/GridQueryIndexing.java | 19 +- .../processors/query/GridQueryProcessor.java| 78 +++- .../messages/GridQueryNextPageResponse.java | 68 ++- .../h2/twostep/messages/GridQueryRequest.java | 21 +- .../util/spring/IgniteSpringHelper.java | 4 +- .../cache/VisorCacheNearConfiguration.java | 4 +- .../visor/cache/VisorCacheStartTask.java| 155 +++ .../internal/visor/util/VisorTaskUtils.java | 10 + .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- .../resources/META-INF/classnames.properties| 13 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- modules/gce/README.txt | 32 ++ modules/gce/licenses/apache-2.0.txt | 202 + modules/gce/pom.xml | 94 .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 380 .../tcp/ipfinder/gce/package-info.java | 22 + ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 73 .../tcp/ipfinder/gce/package-info.java | 22 + .../ignite/testsuites/IgniteGCETestSuite.java | 71 +++ .../processors/query/h2/IgniteH2Indexing.java | 169 +++- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 92 +--- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 7 +- .../query/h2/opt/GridH2KeyValueRowOnheap.java | 6 +- .../query/h2/opt/GridH2RowDescriptor.java | 14 +- .../processors/query/h2/opt/GridH2Table.java| 10 +- .../query/h2/opt/GridH2ValueCacheObject.java| 191 .../query/h2/opt/GridLuceneIndex.java | 84 ++-- .../query/h2/twostep/GridMapQueryExecutor.java | 21 +- .../query/h2/twostep/GridMergeIndex.java| 6 +- .../h2/twostep/GridMergeIndexUnsorted.java | 4 +- .../h2/twostep/GridReduceQueryExecutor.java | 13 +- .../query/h2/twostep/GridResultPage.java| 80 +++- .../query/h2/twostep/msg/GridH2Array.java | 124 ++ .../query/h2/twostep/msg/GridH2Boolean.java | 112 + .../query/h2/twostep/msg/GridH2Byte.java| 113 + .../query/h2/twostep/msg/GridH2Bytes.java | 113 + .../query/h2/twostep/msg/GridH2CacheObject.java | 148 +++ .../query/h2/twostep/msg/GridH2Date.java| 115 + .../query/h2/twostep/msg/GridH2Decimal.java | 134 ++ .../query/h2/twostep/msg/GridH2Double.java | 113 + .../query/h2/twostep/msg/GridH2Float.java | 113 + .../query/h2/twostep/msg/GridH2Geometry.java| 134 ++ .../query/h2/twostep/msg/GridH2Integer.java | 113 + .../query/h2/twostep/msg/GridH2JavaObject.java | 113 + .../query/h2/twostep/msg/GridH2Long.java| 113 + .../query/h2/twostep/msg/GridH2Null.java| 78 .../query/h2/twostep/msg/GridH2Short.java | 113 + .../query/h2/twostep/msg/GridH2String.java | 115 + .../query/h2/twostep/msg/GridH2Time.java| 116 + .../query
[47/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/47136b5f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/47136b5f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/47136b5f Branch: refs/heads/ignite-620 Commit: 47136b5fe9a4afa31f6ca4cb6909fcabb28c9200 Parents: b01ff38 5854f1d Author: AKuznetsov Authored: Wed Apr 29 21:36:19 2015 +0700 Committer: AKuznetsov Committed: Wed Apr 29 21:36:19 2015 +0700 -- modules/cloud/pom.xml | 4 +--- modules/core/src/main/resources/ignite.properties | 2 +- modules/gce/pom.xml | 4 +--- pom.xml | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) --
[16/50] incubator-ignite git commit: # IGNITE-789 Review.
# IGNITE-789 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/c33d0968
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c33d0968
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c33d0968
Branch: refs/heads/ignite-620
Commit: c33d0968357afe339cdb6517bc6844959a6d7cb8
Parents: 1a9a4c4
Author: AKuznetsov
Authored: Wed Apr 29 09:51:45 2015 +0700
Committer: AKuznetsov
Committed: Wed Apr 29 09:51:45 2015 +0700
--
.../ignite/internal/visor/cache/VisorCacheNearConfiguration.java | 4 ++--
.../apache/ignite/visor/commands/cache/VisorCacheCommand.scala | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c33d0968/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
index a968f4f..3706650 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
@@ -33,7 +33,7 @@ public class VisorCacheNearConfiguration implements
Serializable {
/** */
private static final long serialVersionUID = 0L;
-/** Flag to enable/disable near cache eviction policy. */
+/** Flag indicating if near cache enabled. */
private boolean nearEnabled;
/** Near cache start size. */
@@ -66,7 +66,7 @@ public class VisorCacheNearConfiguration implements
Serializable {
}
/**
- * @return Flag to enable/disable near cache eviction policy.
+ * @return {@code true} if near cache enabled.
*/
public boolean nearEnabled() {
return nearEnabled;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c33d0968/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index ccfc5ef..144779c 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -859,9 +859,9 @@ object VisorCacheCommand {
cacheT += ("Synchronous Eviction Timeout",
evictCfg.synchronizedTimeout())
cacheT += ("Synchronous Eviction Concurrency Level",
evictCfg.synchronizedConcurrencyLevel())
+cacheT += ("Near Cache Enabled", bool2Str(nearCfg.nearEnabled()))
cacheT += ("Near Start Size", nearCfg.nearStartSize())
cacheT += ("Near Eviction Policy", safe(nearCfg.nearEvictPolicy()))
-cacheT += ("Near Eviction Enabled", bool2Str(nearCfg.nearEnabled()))
cacheT += ("Near Eviction Policy Max Size",
safe(nearCfg.nearEvictMaxSize()))
cacheT += ("Default Lock Timeout", defaultCfg.txLockTimeout())
[33/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd852d95 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd852d95 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd852d95 Branch: refs/heads/ignite-620 Commit: dd852d95f181a3847b31ae8e33921ececcf164fb Parents: 2ad974e 2b02dd0 Author: Yakov Zhdanov Authored: Wed Apr 29 13:59:47 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Apr 29 13:59:47 2015 +0300 -- modules/cloud/README.txt| 32 ++ modules/cloud/licenses/apache-2.0.txt | 202 + modules/cloud/pom.xml | 108 + .../cloud/TcpDiscoveryCloudIpFinder.java| 433 +++ .../tcp/ipfinder/cloud/package-info.java| 21 + .../TcpDiscoveryCloudIpFinderSelfTest.java | 124 ++ .../tcp/ipfinder/cloud/package-info.java| 22 + .../ignite/testsuites/IgniteCloudTestSuite.java | 112 + .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- .../DataStreamerMultiThreadedSelfTest.java | 2 + modules/gce/README.txt | 32 ++ modules/gce/licenses/apache-2.0.txt | 202 + modules/gce/pom.xml | 94 .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 380 .../tcp/ipfinder/gce/package-info.java | 22 + ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 73 .../tcp/ipfinder/gce/package-info.java | 22 + .../ignite/testsuites/IgniteGCETestSuite.java | 71 +++ pom.xml | 2 + 19 files changed, 1961 insertions(+), 3 deletions(-) --
[39/50] incubator-ignite git commit: javadoc fix
javadoc 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/d099dd69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d099dd69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d099dd69
Branch: refs/heads/ignite-620
Commit: d099dd6973f78197037611d6b4619e6ddca5d30c
Parents: 23729ef
Author: avinogradov
Authored: Wed Apr 29 15:51:11 2015 +0300
Committer: avinogradov
Committed: Wed Apr 29 15:51:11 2015 +0300
--
.../apache/ignite/internal/util/spring/IgniteSpringHelperImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d099dd69/modules/spring/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelperImpl.java
--
diff --git
a/modules/spring/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelperImpl.java
b/modules/spring/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelperImpl.java
index f05e991..2c7c7e1 100644
---
a/modules/spring/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelperImpl.java
+++
b/modules/spring/src/main/java/org/apache/ignite/internal/util/spring/IgniteSpringHelperImpl.java
@@ -399,7 +399,7 @@ public class IgniteSpringHelperImpl implements
IgniteSpringHelper {
* Prepares Spring context.
*
* @param excludedProps Properties to be excluded.
- * @return
+ * @return application context.
*/
private static GenericApplicationContext prepareSpringContext(final
String... excludedProps){
GenericApplicationContext springCtx = new GenericApplicationContext();
[35/50] incubator-ignite git commit: Merge branches 'ignite-757' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757
Merge branches 'ignite-757' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/856b8471 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/856b8471 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/856b8471 Branch: refs/heads/ignite-620 Commit: 856b8471c10d595b4dac614b9f9f0da1c069f199 Parents: a2dba8b dd852d9 Author: S.Vladykin Authored: Wed Apr 29 14:59:43 2015 +0300 Committer: S.Vladykin Committed: Wed Apr 29 14:59:43 2015 +0300 -- RELEASE_NOTES.txt | 22 +- modules/cloud/README.txt| 32 ++ modules/cloud/licenses/apache-2.0.txt | 202 + modules/cloud/pom.xml | 108 + .../cloud/TcpDiscoveryCloudIpFinder.java| 433 +++ .../tcp/ipfinder/cloud/package-info.java| 21 + .../TcpDiscoveryCloudIpFinderSelfTest.java | 124 ++ .../tcp/ipfinder/cloud/package-info.java| 22 + .../ignite/testsuites/IgniteCloudTestSuite.java | 112 + .../processors/cache/IgniteCacheProxy.java | 10 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- .../distributed/GridCacheLockAbstractTest.java | 75 .../DataStreamerMultiThreadedSelfTest.java | 2 + modules/gce/README.txt | 32 ++ modules/gce/licenses/apache-2.0.txt | 202 + modules/gce/pom.xml | 94 .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 380 .../tcp/ipfinder/gce/package-info.java | 22 + ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 73 .../tcp/ipfinder/gce/package-info.java | 22 + .../ignite/testsuites/IgniteGCETestSuite.java | 71 +++ ...gniteProjectionStartStopRestartSelfTest.java | 21 +- pom.xml | 2 + 23 files changed, 2063 insertions(+), 29 deletions(-) --
[44/50] incubator-ignite git commit: Merge branch 'ignite-789' into ignite-sprint-4
Merge branch 'ignite-789' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d1a84a57 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d1a84a57 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d1a84a57 Branch: refs/heads/ignite-620 Commit: d1a84a576f5a07d89fbc190a7365b6e328ff5353 Parents: edcf921 98aa8f1 Author: AKuznetsov Authored: Wed Apr 29 20:56:10 2015 +0700 Committer: AKuznetsov Committed: Wed Apr 29 20:56:10 2015 +0700 -- .../configuration/CacheConfiguration.java | 4 +- .../cache/VisorCacheNearConfiguration.java | 4 +- .../visor/cache/VisorCacheStartTask.java| 155 +++ .../internal/visor/util/VisorTaskUtils.java | 10 ++ .../resources/META-INF/classnames.properties| 13 ++ .../commands/cache/VisorCacheCommand.scala | 2 +- 6 files changed, 183 insertions(+), 5 deletions(-) --
[14/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4-pull-1' into ignite-sprint-4
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4-pull-1' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/acc731c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/acc731c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/acc731c5 Branch: refs/heads/ignite-620 Commit: acc731c5e58ff56e28cb2f16524648d05ae24f14 Parents: 48c12bb 955e648 Author: avinogradov Authored: Tue Apr 28 20:15:41 2015 +0300 Committer: avinogradov Committed: Tue Apr 28 20:15:41 2015 +0300 -- .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- .../clients/src/test/resources/spring-cache.xml | 4 +- .../src/test/resources/spring-server-node.xml | 4 +- .../test/resources/spring-server-ssl-node.xml | 4 +- .../java/org/apache/ignite/IgniteLogger.java| 8 +- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../main/java/org/apache/ignite/Ignition.java | 2 +- .../configuration/ConnectorConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../managers/communication/GridIoManager.java | 6 +- .../deployment/GridDeploymentManager.java | 2 +- .../GridDeploymentPerVersionStore.java | 3 +- .../cache/GridCacheSharedContext.java | 2 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../util/tostring/GridToStringBuilder.java | 2 +- .../apache/ignite/logger/java/JavaLogger.java | 12 +- .../apache/ignite/marshaller/Marshaller.java| 14 +- .../ignite/marshaller/jdk/JdkMarshaller.java| 10 +- .../optimized/OptimizedMarshaller.java | 8 +- .../apache/ignite/resources/LoggerResource.java | 2 +- .../apache/ignite/resources/SpringResource.java | 2 +- .../org/apache/ignite/services/Service.java | 2 +- .../ignite/services/ServiceConfiguration.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java| 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 4 +- .../fifoqueue/FifoQueueCollisionSpi.java| 10 +- .../jobstealing/JobStealingCollisionSpi.java| 14 +- .../PriorityQueueCollisionSpi.java | 6 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 10 +- .../memory/MemoryEventStorageSpi.java | 10 +- .../spi/failover/always/AlwaysFailoverSpi.java | 10 +- .../jobstealing/JobStealingFailoverSpi.java | 6 +- .../spi/failover/never/NeverFailoverSpi.java| 8 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 4 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 12 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +- .../WeightedRandomLoadBalancingSpi.java | 10 +- .../spi/swapspace/file/FileSwapSpaceSpi.java| 10 +- .../src/test/config/load/merge-sort-base.xml| 2 +- .../logger/java/IgniteJavaLoggerTest.java | 65 .../ignite/logger/java/JavaLoggerTest.java | 65 .../junits/logger/GridTestLog4jLogger.java | 10 +- .../testsuites/IgniteLoggingSelfTestSuite.java | 2 +- .../processors/hadoop/HadoopProcessor.java | 2 +- .../ignite/logger/jcl/IgniteJclLogger.java | 167 --- .../org/apache/ignite/logger/jcl/JclLogger.java | 167 +++ .../ignite/logger/jcl/IgniteJclLoggerTest.java | 48 -- .../apache/ignite/logger/jcl/JclLoggerTest.java | 48 ++ .../ignite/testsuites/IgniteJclTestSuite.java | 2 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 8 +- .../ignite/logger/slf4j/GridSlf4jLogger.java| 138 --- .../apache/ignite/logger/slf4j/Slf4jLogger.java | 138 +++ .../spi/deployment/uri/UriDeploymentSpi.java| 2 +- 56 files changed, 553 insertions(+), 552 deletions(-) --
[50/50] incubator-ignite git commit: IGNITE-620. Add CI tooling code for patch validation
IGNITE-620. Add CI tooling code for patch validation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/14321c41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/14321c41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/14321c41
Branch: refs/heads/ignite-620
Commit: 14321c410b0e861976e0f0482f1c44589754fc0b
Parents: d617759
Author: Konstantin Boudnik
Authored: Thu Mar 26 12:46:19 2015 -0700
Committer: Konstantin Boudnik
Committed: Wed Apr 29 21:43:01 2015 -0700
--
dev-tools/.gitignore | 2 +
dev-tools/build.gradle | 46
dev-tools/src/main/groovy/jiraslurp.groovy | 147
3 files changed, 195 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/14321c41/dev-tools/.gitignore
--
diff --git a/dev-tools/.gitignore b/dev-tools/.gitignore
new file mode 100644
index 000..3036616
--- /dev/null
+++ b/dev-tools/.gitignore
@@ -0,0 +1,2 @@
+validated-jira.txt
+.gradle
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/14321c41/dev-tools/build.gradle
--
diff --git a/dev-tools/build.gradle b/dev-tools/build.gradle
new file mode 100644
index 000..30ae6b7
--- /dev/null
+++ b/dev-tools/build.gradle
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+apply plugin: 'groovy'
+
+repositories {
+mavenCentral()
+}
+
+dependencies {
+compile 'org.codehaus.groovy:groovy-all:2.2.1'
+}
+
+task help {
+ println '''There are two interfaces to work with JIRA attachment validation
tool
+ - to do the batch validation of all latest patch attachments
+ gradle slurp
+ - to grab a single JIRA's latest attachment and run test validation on it
+ JIRA_NUM=INGITE-### gradle patchapply'''
+}
+
+task slurp (dependsOn: 'classes', type: JavaExec) {
+ args (project.buildDir, 'slurp')
+ main = 'jiraslurp'
+ classpath = sourceSets.main.runtimeClasspath
+}
+
+task patchapply (dependsOn: 'classes', type: JavaExec) {
+ args ("JIRA_NUM=${System.getenv('JIRA_NUM')}")
+ main = 'jiraslurp'
+ classpath = sourceSets.main.runtimeClasspath
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/14321c41/dev-tools/src/main/groovy/jiraslurp.groovy
--
diff --git a/dev-tools/src/main/groovy/jiraslurp.groovy
b/dev-tools/src/main/groovy/jiraslurp.groovy
new file mode 100644
index 000..332686f
--- /dev/null
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -0,0 +1,147 @@
+/*
+ * 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.
+ */
+/**
+ * Parsing a special filter from Apache Ignite JIRA and picking up latest by ID
+ * attachments to process.
+ */
+final GIT_REPO =
"https://git1-us-west.apache.org/repos/asf/incubator-ignite.git";
+final ATTACHMENT_URL = "https://issues.apache.org/jira/secure/attachment";
+final validated_filename = "validated-jira.txt"
+final LAST_SUCCESSFUL_ARTIFACT =
"guestAuth/repository/download/Ignite_PatchValidation_Main/.lastSuccessful/$validated_filename"
+
+final def JIRA_CMD = System.getProperty('
[19/50] incubator-ignite git commit: # ignite-sprint-4 added test
# ignite-sprint-4 added test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d9df3d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d9df3d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d9df3d4
Branch: refs/heads/ignite-620
Commit: 7d9df3d43a3bfe89021784654ae4e0283c54af94
Parents: acc731c
Author: sboikov
Authored: Wed Apr 29 09:30:49 2015 +0300
Committer: sboikov
Committed: Wed Apr 29 09:31:35 2015 +0300
--
.../distributed/GridCacheLockAbstractTest.java | 70
1 file changed, 70 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d9df3d4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
index 257f88a..72a64a1 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@ -31,6 +31,7 @@ import org.jetbrains.annotations.*;
import javax.cache.*;
import java.util.*;
import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
@@ -494,4 +495,73 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
fut1.get();
fut2.get();
}
+
+/**
+ * @throws Throwable If failed.
+ */
+public void testLockReentrancy() throws Throwable {
+fail("https://issues.apache.org/jira/browse/IGNITE-835";);
+
+for (int i = 10; i < 100; i++) {
+log.info("Key: " + i);
+
+final int i0 = i;
+
+final Lock lock = cache1.lock(i);
+
+lock.lockInterruptibly();
+
+try {
+final AtomicReference err = new AtomicReference<>();
+
+Thread t = new Thread(new Runnable() {
+@Override public void run() {
+try {
+assert !lock.tryLock();
+assert !lock.tryLock(100, TimeUnit.MILLISECONDS);
+
+assert !cache1.lock(i0).tryLock();
+assert !cache1.lock(i0).tryLock(100,
TimeUnit.MILLISECONDS);
+}
+catch (Throwable e) {
+err.set(e);
+}
+}
+});
+
+t.start();
+t.join();
+
+if (err.get() != null)
+throw err.get();
+
+lock.lock();
+lock.unlock();
+
+t = new Thread(new Runnable() {
+@Override public void run() {
+try {
+assert !lock.tryLock();
+assert !lock.tryLock(100, TimeUnit.MILLISECONDS);
+
+assert !cache1.lock(i0).tryLock();
+assert !cache1.lock(i0).tryLock(100,
TimeUnit.MILLISECONDS);
+}
+catch (Throwable e) {
+err.set(e);
+}
+}
+});
+
+t.start();
+t.join();
+
+if (err.get() != null)
+throw err.get();
+}
+finally {
+lock.unlock();
+}
+}
+}
}
[43/50] incubator-ignite git commit: IGNITE-789 classnames
IGNITE-789 classnames Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98aa8f1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98aa8f1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98aa8f1f Branch: refs/heads/ignite-620 Commit: 98aa8f1f242a6d841a304a2c958d0bdd48ed1bbd Parents: a06f5fa Author: AKuznetsov Authored: Wed Apr 29 20:38:23 2015 +0700 Committer: AKuznetsov Committed: Wed Apr 29 20:38:23 2015 +0700 -- .../src/main/resources/META-INF/classnames.properties | 13 + 1 file changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/98aa8f1f/modules/core/src/main/resources/META-INF/classnames.properties -- diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index a79d5b8..35495ed 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -115,6 +115,7 @@ org.apache.ignite.configuration.CollectionConfiguration org.apache.ignite.configuration.DeploymentMode org.apache.ignite.configuration.IgniteReflectionFactory org.apache.ignite.configuration.NearCacheConfiguration +org.apache.ignite.configuration.TopologyValidator org.apache.ignite.configuration.TransactionConfiguration org.apache.ignite.events.CacheEvent org.apache.ignite.events.CacheQueryExecutedEvent @@ -248,6 +249,7 @@ org.apache.ignite.internal.managers.communication.GridIoManager$ConcurrentHashMa org.apache.ignite.internal.managers.communication.GridIoMessage org.apache.ignite.internal.managers.communication.GridIoPolicy org.apache.ignite.internal.managers.communication.GridIoUserMessage +org.apache.ignite.internal.managers.communication.GridLifecycleAwareMessageFilter org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean org.apache.ignite.internal.managers.deployment.GridDeploymentPerVersionStore$2 org.apache.ignite.internal.managers.deployment.GridDeploymentRequest @@ -445,6 +447,7 @@ org.apache.ignite.internal.processors.cache.IgniteCacheProxy$2 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$4 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$5 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$6 +org.apache.ignite.internal.processors.cache.IgniteCacheProxy$7 org.apache.ignite.internal.processors.cache.KeyCacheObject org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl org.apache.ignite.internal.processors.cache.affinity.GridCacheAffinityProxy @@ -452,6 +455,7 @@ org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresMa org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager$QueueHeaderPredicate org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager$RemoveSetDataCallable org.apache.ignite.internal.processors.cache.distributed.GridCacheCommittedTxInfo +org.apache.ignite.internal.processors.cache.distributed.GridCacheOptimisticCheckPreparedTxFuture$1 org.apache.ignite.internal.processors.cache.distributed.GridCacheOptimisticCheckPreparedTxRequest org.apache.ignite.internal.processors.cache.distributed.GridCacheOptimisticCheckPreparedTxResponse org.apache.ignite.internal.processors.cache.distributed.GridCacheTtlUpdateRequest @@ -725,6 +729,7 @@ org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$11 org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$12 org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$13 org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$14 +org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$15 org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$2 org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$3 org.apache.ignite.internal.processors.cache.transactions.IgniteTxHandler$4 @@ -762,9 +767,11 @@ org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$Po org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$PostLockClosure2 org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$PostMissClosure org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$2 +org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$3 org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$AtomicInt org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager$CommitListener org.apache.ignite.internal.processors.cache.transactions.
[38/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23729efa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23729efa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23729efa Branch: refs/heads/ignite-620 Commit: 23729efad779d402bd7e9dcfe53ad3866031e2ef Parents: 1d5db0c 49df20c Author: avinogradov Authored: Wed Apr 29 15:40:45 2015 +0300 Committer: avinogradov Committed: Wed Apr 29 15:40:45 2015 +0300 -- RELEASE_NOTES.txt | 22 +- modules/cloud/README.txt| 32 ++ modules/cloud/licenses/apache-2.0.txt | 202 + modules/cloud/pom.xml | 108 + .../cloud/TcpDiscoveryCloudIpFinder.java| 433 +++ .../tcp/ipfinder/cloud/package-info.java| 21 + .../TcpDiscoveryCloudIpFinderSelfTest.java | 124 ++ .../tcp/ipfinder/cloud/package-info.java| 22 + .../ignite/testsuites/IgniteCloudTestSuite.java | 112 + .../processors/cache/IgniteCacheProxy.java | 10 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- .../distributed/GridCacheLockAbstractTest.java | 75 .../DataStreamerMultiThreadedSelfTest.java | 2 + modules/gce/README.txt | 32 ++ modules/gce/licenses/apache-2.0.txt | 202 + modules/gce/pom.xml | 94 .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 380 .../tcp/ipfinder/gce/package-info.java | 22 + ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 73 .../tcp/ipfinder/gce/package-info.java | 22 + .../ignite/testsuites/IgniteGCETestSuite.java | 71 +++ ...gniteProjectionStartStopRestartSelfTest.java | 26 +- pom.xml | 2 + 23 files changed, 2066 insertions(+), 31 deletions(-) --
[06/50] incubator-ignite git commit: GG-9830 Cleanup code.
GG-9830 Cleanup 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/576c8883
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/576c8883
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/576c8883
Branch: refs/heads/ignite-620
Commit: 576c88834cbe2dfd444e12f0ab345aa75d1cc9ad
Parents: 7e0a19d
Author: AKuznetsov
Authored: Tue Apr 28 21:05:56 2015 +0700
Committer: AKuznetsov
Committed: Tue Apr 28 21:05:56 2015 +0700
--
.../visor/cache/VisorCacheConfiguration.java| 7 -
.../cache/VisorCacheStoreConfiguration.java | 35 -
.../cache/VisorCacheTypeFieldMetadata.java | 36 +-
.../visor/cache/VisorCacheTypeMetadata.java | 99 ++
.../internal/visor/igfs/VisorIgfsMetrics.java | 128 +++
5 files changed, 30 insertions(+), 275 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/576c8883/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index d070872..4097c4f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -250,13 +250,6 @@ public class VisorCacheConfiguration implements
Serializable {
}
/**
- * @param memoryMode New memory mode.
- */
-public void memoryMode(CacheMemoryMode memoryMode) {
-this.memoryMode = memoryMode;
-}
-
-/**
* @return Cache interceptor.
*/
@Nullable public String interceptor() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/576c8883/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
index a4a2235..06dbfbf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
@@ -146,13 +146,6 @@ public class VisorCacheStoreConfiguration implements
Serializable {
}
/**
- * @param writeBehindEnabled New flag indicating whether write-behind
behaviour should be used for the cache store.
- */
-public void writeBehindEnabled(boolean writeBehindEnabled) {
-this.writeBehindEnabled = writeBehindEnabled;
-}
-
-/**
* @return Maximum batch size for write-behind cache store operations.
*/
public int batchSize() {
@@ -160,13 +153,6 @@ public class VisorCacheStoreConfiguration implements
Serializable {
}
/**
- * @param batchSz New maximum batch size for write-behind cache store
operations.
- */
-public void batchSize(int batchSz) {
-this.batchSz = batchSz;
-}
-
-/**
* @return Frequency with which write-behind cache is flushed to the cache
store in milliseconds.
*/
public long flushFrequency() {
@@ -174,13 +160,6 @@ public class VisorCacheStoreConfiguration implements
Serializable {
}
/**
- * @param flushFreq New frequency with which write-behind cache is flushed
to the cache store in milliseconds.
- */
-public void flushFrequency(long flushFreq) {
-this.flushFreq = flushFreq;
-}
-
-/**
* @return Maximum object count in write-behind cache.
*/
public int flushSize() {
@@ -188,26 +167,12 @@ public class VisorCacheStoreConfiguration implements
Serializable {
}
/**
- * @param flushSz New maximum object count in write-behind cache.
- */
-public void flushSize(int flushSz) {
-this.flushSz = flushSz;
-}
-
-/**
* @return Number of threads that will perform cache flushing.
*/
public int flushThreadCount() {
return flushThreadCnt;
}
-/**
- * @param flushThreadCnt New number of threads that will perform cache
flushing.
- */
-public void flushThreadCount(int flushThreadCnt) {
-this.flushThreadCnt = flushThreadCnt;
-}
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorCacheStoreConfiguration.class, this);
http://git-wip-
[40/50] incubator-ignite git commit: GridCacheLoadingConcurrentGridStartTest uncommented
GridCacheLoadingConcurrentGridStartTest uncommented
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/033e8ed7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/033e8ed7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/033e8ed7
Branch: refs/heads/ignite-620
Commit: 033e8ed709f59c360075f2e7fe1c1528b5b253c9
Parents: 23729ef
Author: agura
Authored: Wed Apr 29 15:52:26 2015 +0300
Committer: agura
Committed: Wed Apr 29 15:52:26 2015 +0300
--
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/033e8ed7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 6e70052..6f954cd 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -224,7 +224,7 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridCacheDhtPreloadUnloadSelfTest.class));
suite.addTest(new
TestSuite(GridCachePartitionedAffinityFilterSelfTest.class));
suite.addTest(new
TestSuite(GridCachePartitionedPreloadLifecycleSelfTest.class));
-//suite.addTest(new
TestSuite(GridCacheLoadingConcurrentGridStartTest.class)); TODO-ignite-500
+suite.addTest(new
TestSuite(GridCacheLoadingConcurrentGridStartTest.class));
suite.addTest(new TestSuite(GridCacheDhtPreloadDelayedSelfTest.class));
suite.addTest(new TestSuite(GridPartitionedBackupLoadSelfTest.class));
suite.addTest(new
TestSuite(GridCachePartitionedLoadCacheSelfTest.class));
[34/50] incubator-ignite git commit: # IGNITE-789 review.
# IGNITE-789 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/a06f5faf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a06f5faf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a06f5faf
Branch: refs/heads/ignite-620
Commit: a06f5faf6e0fe509a9fed339c32002834aa672a9
Parents: be7bfda
Author: AKuznetsov
Authored: Wed Apr 29 18:54:55 2015 +0700
Committer: AKuznetsov
Committed: Wed Apr 29 18:54:55 2015 +0700
--
.../visor/cache/VisorCacheStartTask.java| 86
1 file changed, 68 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a06f5faf/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
index 270c48a..2aa03a2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.visor.*;
import org.apache.ignite.internal.visor.util.*;
-import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -36,12 +35,12 @@ import java.util.*;
*/
@GridInternal
public class VisorCacheStartTask extends
-VisorMultiNodeTask, Map, Void> {
+VisorMultiNodeTask, Void> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
-@Override protected VisorCacheStartJob job(IgniteBiTuple
arg) {
+@Override protected VisorCacheStartJob job(VisorCacheStartArg arg) {
return new VisorCacheStartJob(arg, debug);
}
@@ -57,9 +56,59 @@ public class VisorCacheStartTask extends
}
/**
+ * Cache start arguments.
+ */
+@SuppressWarnings("PublicInnerClass")
+public static class VisorCacheStartArg implements Serializable {
+/** */
+private static final long serialVersionUID = 0L;
+
+/** */
+private final boolean near;
+
+/** */
+private final String name;
+
+/** */
+private final String cfg;
+
+/**
+ * @param near {@code true} if near cache should be started.
+ * @param name Name for near cache.
+ * @param cfg Cache XML configuration.
+ */
+public VisorCacheStartArg(boolean near, String name, String cfg) {
+this.near = near;
+this.name = name;
+this.cfg = cfg;
+}
+
+/**
+ * @return {@code true} if near cache should be started.
+ */
+public boolean near() {
+return near;
+}
+
+/**
+ * @return Name for near cache.
+ */
+public String name() {
+return name;
+}
+
+/**
+ * @return Cache XML configuration.
+ */
+public String configuration() {
+return cfg;
+}
+}
+
+/**
* Job that start cache or near cache with specified configuration.
*/
-private static class VisorCacheStartJob extends
VisorJob, Void> {
+private static class VisorCacheStartJob extends
VisorJob {
/** */
private static final long serialVersionUID = 0L;
@@ -69,29 +118,30 @@ public class VisorCacheStartTask extends
* @param arg Contains cache name and XML configurations of cache.
* @param debug Debug flag.
*/
-private VisorCacheStartJob(IgniteBiTuple arg, boolean
debug) {
+private VisorCacheStartJob(VisorCacheStartArg arg, boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
-@Override protected Void run(IgniteBiTuple arg) {
-String name = arg.get1();
-
-String cfg = arg.get2();
+@Override protected Void run(VisorCacheStartArg arg) throws
IgniteException {
+String cfg = arg.configuration();
assert !F.isEmpty(cfg);
-if (name == null) {
-CacheConfiguration cacheCfg = Ignition.loadSpringBean(new
ByteArrayInputStream(cfg.getBytes()),
-"cacheConfiguration");
+try (ByteArrayInputStream bais = new
ByteArrayInputStream(cfg.getBytes())) {
+if (arg.near) {
+NearCacheConfiguration nearCfg =
Ignition.loadSpringBean(bais, "nearCach
[32/50] incubator-ignite git commit: fixed NPE
fixed NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2ad974e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ad974e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ad974e6
Branch: refs/heads/ignite-620
Commit: 2ad974e6af0767f4b639564092f9ae18116616cf
Parents: 77d092c
Author: Yakov Zhdanov
Authored: Wed Apr 29 13:59:30 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Apr 29 13:59:30 2015 +0300
--
...gniteProjectionStartStopRestartSelfTest.java | 21 +---
1 file changed, 14 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ad974e6/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
--
diff --git
a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
index 7fa5b4b..e175064 100644
---
a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
+++
b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
@@ -145,15 +145,21 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
-if (!ignite.cluster().nodes().isEmpty()) {
-leftLatch = new CountDownLatch(ignite.cluster().nodes().size());
+boolean wasEmpty = true;
-ignite.cluster().stopNodes();
+if (ignite != null) {
+if (!ignite.cluster().nodes().isEmpty()) {
+leftLatch = new
CountDownLatch(ignite.cluster().nodes().size());
-assert leftLatch.await(WAIT_TIMEOUT, MILLISECONDS);
-}
+ignite.cluster().stopNodes();
+
+assert leftLatch.await(
+WAIT_TIMEOUT,
+MILLISECONDS);
+}
-boolean wasEmpty = ignite.cluster().nodes().isEmpty();
+wasEmpty = ignite.cluster().nodes().isEmpty();
+}
G.stop(true);
@@ -163,7 +169,8 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
joinedLatch = null;
leftLatch = null;
-assert wasEmpty : "grid.isEmpty() returned false after all nodes were
stopped [nodes=" + ignite.cluster().nodes() + ']';
+assert wasEmpty : "grid.isEmpty() returned false after all nodes were
stopped " +
+"[nodes=" + ignite.cluster().nodes() + ']';
}
/** {@inheritDoc} */
[41/50] incubator-ignite git commit: Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dfca76bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dfca76bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dfca76bf Branch: refs/heads/ignite-620 Commit: dfca76bfba939fc1547d00916c6a19d371a13c86 Parents: 033e8ed d099dd6 Author: agura Authored: Wed Apr 29 15:53:26 2015 +0300 Committer: agura Committed: Wed Apr 29 15:53:26 2015 +0300 -- .../apache/ignite/internal/util/spring/IgniteSpringHelperImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[22/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bc9687f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bc9687f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bc9687f4 Branch: refs/heads/ignite-620 Commit: bc9687f4e0bd83809b908a226e0b8150abe527b2 Parents: f10a06b a7599bf Author: Yakov Zhdanov Authored: Wed Apr 29 11:39:12 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Apr 29 11:39:12 2015 +0300 -- .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- .../clients/src/test/resources/spring-cache.xml | 4 +- .../src/test/resources/spring-server-node.xml | 4 +- .../test/resources/spring-server-ssl-node.xml | 4 +- .../java/org/apache/ignite/IgniteLogger.java| 8 +- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../main/java/org/apache/ignite/Ignition.java | 2 +- .../configuration/ConnectorConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../managers/communication/GridIoManager.java | 6 +- .../deployment/GridDeploymentManager.java | 2 +- .../GridDeploymentPerVersionStore.java | 3 +- .../cache/GridCacheSharedContext.java | 2 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../util/tostring/GridToStringBuilder.java | 2 +- .../apache/ignite/logger/java/JavaLogger.java | 12 +- .../apache/ignite/marshaller/Marshaller.java| 14 +- .../ignite/marshaller/jdk/JdkMarshaller.java| 10 +- .../optimized/OptimizedMarshaller.java | 8 +- .../apache/ignite/resources/LoggerResource.java | 2 +- .../apache/ignite/resources/SpringResource.java | 2 +- .../org/apache/ignite/services/Service.java | 2 +- .../ignite/services/ServiceConfiguration.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java| 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 4 +- .../fifoqueue/FifoQueueCollisionSpi.java| 10 +- .../jobstealing/JobStealingCollisionSpi.java| 14 +- .../PriorityQueueCollisionSpi.java | 6 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 10 +- .../memory/MemoryEventStorageSpi.java | 10 +- .../spi/failover/always/AlwaysFailoverSpi.java | 10 +- .../jobstealing/JobStealingFailoverSpi.java | 6 +- .../spi/failover/never/NeverFailoverSpi.java| 8 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 4 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 12 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +- .../WeightedRandomLoadBalancingSpi.java | 10 +- .../spi/swapspace/file/FileSwapSpaceSpi.java| 10 +- .../src/test/config/load/merge-sort-base.xml| 2 +- .../distributed/GridCacheLockAbstractTest.java | 75 + .../logger/java/IgniteJavaLoggerTest.java | 65 .../ignite/logger/java/JavaLoggerTest.java | 65 .../junits/logger/GridTestLog4jLogger.java | 10 +- .../testsuites/IgniteLoggingSelfTestSuite.java | 2 +- .../processors/hadoop/HadoopProcessor.java | 2 +- .../ignite/logger/jcl/IgniteJclLogger.java | 167 --- .../org/apache/ignite/logger/jcl/JclLogger.java | 167 +++ .../ignite/logger/jcl/IgniteJclLoggerTest.java | 48 -- .../apache/ignite/logger/jcl/JclLoggerTest.java | 48 ++ .../ignite/testsuites/IgniteJclTestSuite.java | 2 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 8 +- .../ignite/logger/slf4j/GridSlf4jLogger.java| 138 --- .../apache/ignite/logger/slf4j/Slf4jLogger.java | 138 +++ .../spi/deployment/uri/UriDeploymentSpi.java| 2 +- 57 files changed, 628 insertions(+), 552 deletions(-) --
[49/50] incubator-ignite git commit: "Version changed
"Version changed Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d617759d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d617759d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d617759d Branch: refs/heads/ignite-620 Commit: d617759da292917df4b827abc8d50b6152c4190e Parents: bba8c2f Author: Ignite Teamcity Authored: Wed Apr 29 19:23:41 2015 +0300 Committer: Ignite Teamcity Committed: Wed Apr 29 19:23:41 2015 +0300 -- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml| 2 +- modules/hadoop/pom.xml| 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml| 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml| 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d617759d/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 9dda753..f38ff9d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.3-SNAPSHOT +1.1.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d617759d/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index ef44603..1b03acd 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,7 +31,7 @@ ignite-aop -1.0.3-SNAPSHOT +1.1.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d617759d/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index 43f24bc..057f246 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -31,7 +31,7 @@ ignite-aws -1.0.3-SNAPSHOT +1.1.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d617759d/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index ca93673..19d6a25 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -31,7 +31,7 @@ ignite-clients -1.0.3-SNAPSHOT +1.1.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d617759d/modules/cloud/pom.xml -- diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml index 8cb97d0..91ba978 100644 --- a/modules/cloud/pom.xml +++ b/modules/cloud/pom.xml @@ -29,7 +29,7 @@ ignite-cloud -1.0.3-SNAPSHOT +1.1.0-SNAPSHOT 1.9.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d617759d/modules/codegen/pom.xml -- diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index 9e03dab..7cce037 100644 --- a/modules/codegen/pom.xml +++ b/modules/codegen/pom.xml @@ -31,7 +31,7 @@ ignite-codegen -1.0.3-SNAPSHOT +1.1.0-SNAPSHOT UTF-8 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d617759d/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 62612f8..cdf2cf2 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -31,7 +31,7 @@ ignite-core -1.0.3-SNAPSHOT +1.1.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d617759d/modules/extdata/p2p/pom.xml -- diff --git a/modules/extdata/p2p/pom.xml
[30/50] incubator-ignite git commit: merge from ignite-790 to ignite-sprint-4
merge from ignite-790 to ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2b02dd02 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b02dd02 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b02dd02 Branch: refs/heads/ignite-620 Commit: 2b02dd0269f93a4817daf7c6c19b2ed8301b693c Parents: ac399d9 5e28951 Author: Denis Magda Authored: Wed Apr 29 13:47:35 2015 +0300 Committer: Denis Magda Committed: Wed Apr 29 13:47:35 2015 +0300 -- modules/cloud/README.txt| 32 ++ modules/cloud/licenses/apache-2.0.txt | 202 + modules/cloud/pom.xml | 108 + .../cloud/TcpDiscoveryCloudIpFinder.java| 433 +++ .../tcp/ipfinder/cloud/package-info.java| 21 + .../TcpDiscoveryCloudIpFinderSelfTest.java | 124 ++ .../tcp/ipfinder/cloud/package-info.java| 22 + .../ignite/testsuites/IgniteCloudTestSuite.java | 112 + .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- pom.xml | 1 + 10 files changed, 1062 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2b02dd02/pom.xml -- diff --cc pom.xml index 200a84d,6585c37..2a45704 --- a/pom.xml +++ b/pom.xml @@@ -76,7 -75,7 +76,8 @@@ modules/jcl modules/schema-import modules/codegen +modules/gce + modules/cloud
[42/50] incubator-ignite git commit: Merge branch 'ignite-757' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Merge branch 'ignite-757' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/edcf921c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/edcf921c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/edcf921c Branch: refs/heads/ignite-620 Commit: edcf921cde63ee551fc3b9e8a02873cc40813360 Parents: dfca76b 856b847 Author: S.Vladykin Authored: Wed Apr 29 16:34:10 2015 +0300 Committer: S.Vladykin Committed: Wed Apr 29 16:34:10 2015 +0300 -- .../ignite/codegen/MessageCodeGenerator.java| 26 ++- .../ignite/internal/GridDirectCollection.java | 3 + .../ignite/internal/IgniteComponentType.java| 36 +++- .../managers/communication/GridIoManager.java | 22 +- .../communication/GridIoMessageFactory.java | 8 + .../managers/indexing/GridIndexingManager.java | 14 +- .../processors/cache/CacheObjectImpl.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 9 +- .../processors/cache/GridCacheProcessor.java| 3 +- .../processors/cache/GridCacheSwapManager.java | 35 +--- .../cache/query/GridCacheQueryManager.java | 22 +- .../cache/query/GridCacheSqlQuery.java | 135 +++-- .../cache/query/GridCacheTwoStepQuery.java | 8 +- .../processors/query/GridQueryIndexing.java | 19 +- .../processors/query/GridQueryProcessor.java| 78 +-- .../messages/GridQueryNextPageResponse.java | 68 +-- .../h2/twostep/messages/GridQueryRequest.java | 21 +- .../processors/query/h2/IgniteH2Indexing.java | 169 ++-- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 92 ++--- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 7 +- .../query/h2/opt/GridH2KeyValueRowOnheap.java | 6 +- .../query/h2/opt/GridH2RowDescriptor.java | 14 +- .../processors/query/h2/opt/GridH2Table.java| 10 +- .../query/h2/opt/GridH2ValueCacheObject.java| 191 ++ .../query/h2/opt/GridLuceneIndex.java | 84 +--- .../query/h2/twostep/GridMapQueryExecutor.java | 21 +- .../query/h2/twostep/GridMergeIndex.java| 6 +- .../h2/twostep/GridMergeIndexUnsorted.java | 4 +- .../h2/twostep/GridReduceQueryExecutor.java | 13 +- .../query/h2/twostep/GridResultPage.java| 80 +++- .../query/h2/twostep/msg/GridH2Array.java | 124 .../query/h2/twostep/msg/GridH2Boolean.java | 112 +++ .../query/h2/twostep/msg/GridH2Byte.java| 113 +++ .../query/h2/twostep/msg/GridH2Bytes.java | 113 +++ .../query/h2/twostep/msg/GridH2CacheObject.java | 148 ++ .../query/h2/twostep/msg/GridH2Date.java| 115 +++ .../query/h2/twostep/msg/GridH2Decimal.java | 134 + .../query/h2/twostep/msg/GridH2Double.java | 113 +++ .../query/h2/twostep/msg/GridH2Float.java | 113 +++ .../query/h2/twostep/msg/GridH2Geometry.java| 134 + .../query/h2/twostep/msg/GridH2Integer.java | 113 +++ .../query/h2/twostep/msg/GridH2JavaObject.java | 113 +++ .../query/h2/twostep/msg/GridH2Long.java| 113 +++ .../query/h2/twostep/msg/GridH2Null.java| 78 +++ .../query/h2/twostep/msg/GridH2Short.java | 113 +++ .../query/h2/twostep/msg/GridH2String.java | 115 +++ .../query/h2/twostep/msg/GridH2Time.java| 116 +++ .../query/h2/twostep/msg/GridH2Timestamp.java | 133 .../query/h2/twostep/msg/GridH2Uuid.java| 133 .../h2/twostep/msg/GridH2ValueMessage.java | 49 + .../twostep/msg/GridH2ValueMessageFactory.java | 201 +++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 6 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 130 +--- 53 files changed, 3507 insertions(+), 331 deletions(-) --
[36/50] incubator-ignite git commit: minor
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/49df20c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49df20c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49df20c8
Branch: refs/heads/ignite-620
Commit: 49df20c8c3e58d56266a0ef85357e582f4fb281f
Parents: dd852d9
Author: Yakov Zhdanov
Authored: Wed Apr 29 15:02:46 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Apr 29 15:02:46 2015 +0300
--
.../internal/IgniteProjectionStartStopRestartSelfTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/49df20c8/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
--
diff --git
a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
index e175064..3618c2c 100644
---
a/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
+++
b/modules/ssh/src/test/java/org/apache/ignite/internal/IgniteProjectionStartStopRestartSelfTest.java
@@ -131,7 +131,8 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
if (joinedLatch != null)
joinedLatch.countDown();
-} else if (evt.type() == EVT_NODE_LEFT) {
+}
+else if (evt.type() == EVT_NODE_LEFT || evt.type() ==
EVT_NODE_FAILED) {
leftCnt.incrementAndGet();
if (leftLatch != null)
@@ -140,7 +141,7 @@ public class IgniteProjectionStartStopRestartSelfTest
extends GridCommonAbstract
return true;
}
-}, EVT_NODE_JOINED, EVT_NODE_LEFT);
+}, EVT_NODE_JOINED, EVT_NODE_LEFT, EVT_NODE_FAILED);
}
/** {@inheritDoc} */
[11/50] incubator-ignite git commit: ignite-790: improvements after the review
ignite-790: improvements after the 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/5e28951e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5e28951e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5e28951e Branch: refs/heads/ignite-620 Commit: 5e28951e1f21cce6e22f29b67aea8943b154a5dc Parents: ae8d017 Author: Denis Magda Authored: Tue Apr 28 17:56:04 2015 +0300 Committer: Denis Magda Committed: Tue Apr 28 17:56:04 2015 +0300 -- modules/cloud/configs/example-aws-config.xml| 99 - modules/cloud/configs/example-gce-config.xml| 93 .../cloud/configs/example-rackspace-config.xml | 94 .../cloud/TcpDiscoveryCloudIpFinder.java| 433 +++ .../cloud/TcpDiscoveryCloudNodesIpFinder.java | 398 - .../TcpDiscoveryCloudIpFinderSelfTest.java | 124 ++ .../TcpDiscoveryCloudNodesIpFinderSelfTest.java | 93 .../ignite/testsuites/IgniteCloudTestSuite.java | 2 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- 9 files changed, 565 insertions(+), 781 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e28951e/modules/cloud/configs/example-aws-config.xml -- diff --git a/modules/cloud/configs/example-aws-config.xml b/modules/cloud/configs/example-aws-config.xml deleted file mode 100644 index ba3a28e..000 --- a/modules/cloud/configs/example-aws-config.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - -http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" -http://www.springframework.org/schema/beans -http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/util -http://www.springframework.org/schema/util/spring-util.xsd";> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -us-east-1 - - - - - -us-east-1b -us-east-1e - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e28951e/modules/cloud/configs/example-gce-config.xml -- diff --git a/modules/cloud/configs/example-gce-config.xml b/modules/cloud/configs/example-gce-config.xml deleted file mode 100644 index a3a912a..000 --- a/modules/cloud/configs/example-gce-config.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - -http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xsi:schemaLocation=" -http://www.springframework.org/schema/beans -http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/util -http://www.springframework.org/schema/util/spring-util.xsd";> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -us-central1-a -asia-east1-a -europe-west1-b - -
[29/50] incubator-ignite git commit: Merge branch 'ignite-734' into ignite-sprint-4
Merge branch 'ignite-734' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ac399d91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ac399d91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ac399d91 Branch: refs/heads/ignite-620 Commit: ac399d9164ebeffc1b7c98b640edaf3c412587a5 Parents: 18b4c39 a809539 Author: Denis Magda Authored: Wed Apr 29 13:45:14 2015 +0300 Committer: Denis Magda Committed: Wed Apr 29 13:45:14 2015 +0300 -- modules/gce/README.txt | 32 ++ modules/gce/licenses/apache-2.0.txt | 202 ++ modules/gce/pom.xml | 94 + .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 380 +++ .../tcp/ipfinder/gce/package-info.java | 22 ++ ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 73 .../tcp/ipfinder/gce/package-info.java | 22 ++ .../ignite/testsuites/IgniteGCETestSuite.java | 71 pom.xml | 1 + 9 files changed, 897 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac399d91/pom.xml --
[25/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/18b4c394 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/18b4c394 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/18b4c394 Branch: refs/heads/ignite-620 Commit: 18b4c394106b7ae2daeddaf52a6999f352267763 Parents: e253e99 77d092c Author: sboikov Authored: Wed Apr 29 11:51:19 2015 +0300 Committer: sboikov Committed: Wed Apr 29 11:51:19 2015 +0300 -- RELEASE_NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[46/50] incubator-ignite git commit: "Version changed
"Version changed Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5854f1db Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5854f1db Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5854f1db Branch: refs/heads/ignite-620 Commit: 5854f1dbe312a5b8673bfdd93a2f3acfe699c202 Parents: d1a84a5 Author: Ignite Teamcity Authored: Wed Apr 29 17:27:47 2015 +0300 Committer: Ignite Teamcity Committed: Wed Apr 29 17:27:47 2015 +0300 -- modules/cloud/pom.xml | 4 +--- modules/core/src/main/resources/ignite.properties | 2 +- modules/gce/pom.xml | 4 +--- pom.xml | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5854f1db/modules/cloud/pom.xml -- diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml index 38c126f..8cb97d0 100644 --- a/modules/cloud/pom.xml +++ b/modules/cloud/pom.xml @@ -17,9 +17,7 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5854f1db/modules/core/src/main/resources/ignite.properties -- diff --git a/modules/core/src/main/resources/ignite.properties b/modules/core/src/main/resources/ignite.properties index 549bde3..432b2ad 100644 --- a/modules/core/src/main/resources/ignite.properties +++ b/modules/core/src/main/resources/ignite.properties @@ -15,7 +15,7 @@ # limitations under the License. # -ignite.version=1.0.0 +ignite.version=1.0.3 ignite.build=0 ignite.revision=DEV ignite.rel.date=01011970 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5854f1db/modules/gce/pom.xml -- diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml index b12bb18..8b2a019 100644 --- a/modules/gce/pom.xml +++ b/modules/gce/pom.xml @@ -20,9 +20,7 @@ -http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5854f1db/pom.xml -- diff --git a/pom.xml b/pom.xml index 2a45704..0e84a50 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,7 @@ -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0
[48/50] incubator-ignite git commit: ignite-786: Implemented.
ignite-786: Implemented.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bba8c2fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bba8c2fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bba8c2fe
Branch: refs/heads/ignite-620
Commit: bba8c2fefaa68712c6993482f74c947bdde8aaa9
Parents: 47136b5
Author: Artem Shutak
Authored: Wed Apr 29 19:07:47 2015 +0300
Committer: Artem Shutak
Committed: Wed Apr 29 19:07:47 2015 +0300
--
.../configuration/CacheConfiguration.java | 255 +++---
.../configuration/IgniteConfiguration.java | 344 +++
2 files changed, 479 insertions(+), 120 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bba8c2fe/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 63da524..df6b2ee 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -417,11 +417,14 @@ public class CacheConfiguration extends
MutableConfiguration {
* Sets cache name.
*
* @param name Cache name. May be null, but may not be empty
string.
+ * @return {@code this} for chaining.
*/
-public void setName(String name) {
+public CacheConfiguration setName(String name) {
A.ensure(name == null || !name.isEmpty(), "Name cannot be null or
empty.");
this.name = name;
+
+return this;
}
/**
@@ -439,9 +442,12 @@ public class CacheConfiguration extends
MutableConfiguration {
* Sets cache eviction policy.
*
* @param evictPlc Cache expiration policy.
+ * @return {@code this} for chaining.
*/
-public void setEvictionPolicy(@Nullable EvictionPolicy evictPlc) {
+public CacheConfiguration setEvictionPolicy(@Nullable EvictionPolicy
evictPlc) {
this.evictPlc = evictPlc;
+
+return this;
}
/**
@@ -453,9 +459,12 @@ public class CacheConfiguration extends
MutableConfiguration {
/**
* @param nearCfg Near cache configuration.
+ * @return {@code this} for chaining.
*/
-public void setNearConfiguration(NearCacheConfiguration nearCfg) {
+public CacheConfiguration setNearConfiguration(NearCacheConfiguration nearCfg) {
this.nearCfg = nearCfg;
+
+return this;
}
/**
@@ -472,9 +481,12 @@ public class CacheConfiguration extends
MutableConfiguration {
* Sets write synchronization mode.
*
* @param writeSync Write synchronization mode.
+ * @return {@code this} for chaining.
*/
-public void setWriteSynchronizationMode(CacheWriteSynchronizationMode
writeSync) {
+public CacheConfiguration
setWriteSynchronizationMode(CacheWriteSynchronizationMode writeSync) {
this.writeSync = writeSync;
+
+return this;
}
/**
@@ -490,9 +502,12 @@ public class CacheConfiguration extends
MutableConfiguration {
* Sets filter which determines on what nodes the cache should be started.
*
* @param nodeFilter Predicate specifying on which nodes the cache should
be started.
+ * @return {@code this} for chaining.
*/
-public void setNodeFilter(IgnitePredicate nodeFilter) {
+public CacheConfiguration setNodeFilter(IgnitePredicate
nodeFilter) {
this.nodeFilter = nodeFilter;
+
+return this;
}
/**
@@ -519,9 +534,12 @@ public class CacheConfiguration extends
MutableConfiguration {
* (or the rest of the nodes for replicated cache).
*
* @param evictSync {@code true} if synchronized, {@code false} if not.
+ * @return {@code this} for chaining.
*/
-public void setEvictSynchronized(boolean evictSync) {
+public CacheConfiguration setEvictSynchronized(boolean evictSync) {
this.evictSync = evictSync;
+
+return this;
}
/**
@@ -539,9 +557,12 @@ public class CacheConfiguration extends
MutableConfiguration {
* Sets eviction key buffer size.
*
* @param evictKeyBufSize Eviction key buffer size.
+ * @return {@code this} for chaining.
*/
-public void setEvictSynchronizedKeyBufferSize(int evictKeyBufSize) {
+public CacheConfiguration setEvictSynchronizedKeyBufferSize(int
evictKeyBufSize) {
this.evictKeyBufSize = evictKeyBufSize;
+
+return this;
}
/**
@@ -570,9 +591,12 @@ public class CacheConfiguration exten
incubator-ignite git commit: IGNITE-620. Add CI tooling code for patch validation
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-5 8c2e03e43 -> 114a8528c
IGNITE-620. Add CI tooling code for patch validation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/114a8528
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/114a8528
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/114a8528
Branch: refs/heads/ignite-sprint-5
Commit: 114a8528c6c0030434227a26523e3c16588145c1
Parents: 8c2e03e
Author: Konstantin Boudnik
Authored: Thu Mar 26 12:46:19 2015 -0700
Committer: Konstantin Boudnik
Committed: Fri May 1 16:49:09 2015 -0700
--
dev-tools/.gitignore | 2 +
dev-tools/build.gradle | 46
dev-tools/src/main/groovy/jiraslurp.groovy | 147
3 files changed, 195 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/114a8528/dev-tools/.gitignore
--
diff --git a/dev-tools/.gitignore b/dev-tools/.gitignore
new file mode 100644
index 000..3036616
--- /dev/null
+++ b/dev-tools/.gitignore
@@ -0,0 +1,2 @@
+validated-jira.txt
+.gradle
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/114a8528/dev-tools/build.gradle
--
diff --git a/dev-tools/build.gradle b/dev-tools/build.gradle
new file mode 100644
index 000..30ae6b7
--- /dev/null
+++ b/dev-tools/build.gradle
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+apply plugin: 'groovy'
+
+repositories {
+mavenCentral()
+}
+
+dependencies {
+compile 'org.codehaus.groovy:groovy-all:2.2.1'
+}
+
+task help {
+ println '''There are two interfaces to work with JIRA attachment validation
tool
+ - to do the batch validation of all latest patch attachments
+ gradle slurp
+ - to grab a single JIRA's latest attachment and run test validation on it
+ JIRA_NUM=INGITE-### gradle patchapply'''
+}
+
+task slurp (dependsOn: 'classes', type: JavaExec) {
+ args (project.buildDir, 'slurp')
+ main = 'jiraslurp'
+ classpath = sourceSets.main.runtimeClasspath
+}
+
+task patchapply (dependsOn: 'classes', type: JavaExec) {
+ args ("JIRA_NUM=${System.getenv('JIRA_NUM')}")
+ main = 'jiraslurp'
+ classpath = sourceSets.main.runtimeClasspath
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/114a8528/dev-tools/src/main/groovy/jiraslurp.groovy
--
diff --git a/dev-tools/src/main/groovy/jiraslurp.groovy
b/dev-tools/src/main/groovy/jiraslurp.groovy
new file mode 100644
index 000..332686f
--- /dev/null
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -0,0 +1,147 @@
+/*
+ * 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.
+ */
+/**
+ * Parsing a special filter from Apache Ignite JIRA and picking up latest by ID
+ * attachments to process.
+ */
+final GIT_REPO =
"https://git1-us-west.apache.org/repos/asf/incubator-ignite.git";
+final ATTACHMENT_URL = "https://issues.apache.org/jira/secure/attachment";
+final validated_filename = "validated-jira.txt"
+final LAST_SUCCESSFUL_ARTIFACT =
"guestAuth/repository/download/Igni
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-620 [deleted] 14321c410
svn commit: r1645226 - /incubator/ignite/site/trunk/index.html
Author: cos Date: Sat Dec 13 09:44:18 2014 New Revision: 1645226 URL: http://svn.apache.org/r1645226 Log: Fixing some statements around community Modified: incubator/ignite/site/trunk/index.html Modified: incubator/ignite/site/trunk/index.html URL: http://svn.apache.org/viewvc/incubator/ignite/site/trunk/index.html?rev=1645226&r1=1645225&r2=1645226&view=diff == --- incubator/ignite/site/trunk/index.html (original) +++ incubator/ignite/site/trunk/index.html Sat Dec 13 09:44:18 2014 @@ -333,9 +333,9 @@ Community - We embrase open source development and cherish outside contributions. If you are interested in becoming a contributor, - - please mailto:dev-subscr...@ignite.incubator.apache.org";>subscribe to dev@ list and let us know. + We are very excited to grow our community. If you are interested in becoming a contributor, + please mailto:dev-subscr...@ignite.incubator.apache.org";>subscribe +to dev@ list and let us know how you'd like to help.
git commit: Initial commit of .gitignore
Repository: incubator-ignite Updated Branches: refs/heads/master [created] 403951f46 Initial commit of .gitignore Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/403951f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/403951f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/403951f4 Branch: refs/heads/master Commit: 403951f469eae8a2f9a99ad7ea90ab41760abe94 Parents: Author: Konstantin Boudnik Authored: Wed Oct 22 17:21:14 2014 -0700 Committer: Konstantin Boudnik Committed: Wed Oct 22 17:21:14 2014 -0700 -- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/403951f4/.gitignore -- diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..e69de29
svn commit: r1634181 - in /incubator/ignite/site: ./ publish/
Author: cos Date: Sat Oct 25 06:25:43 2014 New Revision: 1634181 URL: http://svn.apache.org/r1634181 Log: Adding site/publish to Ignite podling (as per http://is.gd/1Lgfxj) Added: incubator/ignite/site/ incubator/ignite/site/publish/
svn commit: r1634182 - /incubator/ignite/site/trunk/
Author: cos Date: Sat Oct 25 06:27:56 2014 New Revision: 1634182 URL: http://svn.apache.org/r1634182 Log: Adding site/trunk for Ignite Added: incubator/ignite/site/trunk/
