incubator-ignite git commit: # 843 WIP Clusters page.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 d58bae6b4 -> f8be27395
# 843 WIP Clusters page.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f8be2739
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f8be2739
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f8be2739
Branch: refs/heads/ignite-843
Commit: f8be27395826e03bbfc3be7fb08964be258efa69
Parents: d58bae6
Author: Andrey
Authored: Wed May 20 14:08:03 2015 +0700
Committer: Andrey
Committed: Wed May 20 14:08:03 2015 +0700
--
modules/webconfig/nodejs/app.js | 4 +-
modules/webconfig/nodejs/db.js | 2 +-
.../nodejs/public/javascripts/bundle.js | 0
.../public/javascripts/controllers/clusters.js | 108 ++-
.../public/javascripts/controllers/sidebar.js | 6 +
.../nodejs/public/stylesheets/style.css | 2 +-
.../nodejs/public/stylesheets/style.less| 669 +++
modules/webconfig/nodejs/routes/pages.js| 28 +-
modules/webconfig/nodejs/views/caches.jade | 10 +
modules/webconfig/nodejs/views/clients.jade | 10 +
modules/webconfig/nodejs/views/cluster.jade | 30 -
modules/webconfig/nodejs/views/clusters.jade| 47 ++
.../webconfig/nodejs/views/includes/footer.jade | 15 +-
.../webconfig/nodejs/views/includes/header.jade | 38 +-
modules/webconfig/nodejs/views/index.jade | 3 -
modules/webconfig/nodejs/views/layout.jade | 82 ++-
modules/webconfig/nodejs/views/persistence.jade | 10 +
modules/webconfig/nodejs/views/sql.jade | 10 +
18 files changed, 922 insertions(+), 152 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8be2739/modules/webconfig/nodejs/app.js
--
diff --git a/modules/webconfig/nodejs/app.js b/modules/webconfig/nodejs/app.js
index 666dbff..344ec96 100644
--- a/modules/webconfig/nodejs/app.js
+++ b/modules/webconfig/nodejs/app.js
@@ -7,7 +7,7 @@ var bodyParser = require('body-parser');
var session = require('express-session')
var pageRoutes = require('./routes/pages');
-var clusterRouter = require('./routes/clusters');
+var clustersRouter = require('./routes/clusters');
var passport = require('passport');
var LocalStrategy = require('passport-local').Strategy;
@@ -33,7 +33,7 @@ app.use(passport.initialize());
app.use(passport.session());
app.use('/', pageRoutes);
-app.use('/rest', clusterRouter);
+app.use('/rest', clustersRouter);
// catch 404 and forward to error handler
app.use(function (req, res, next) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8be2739/modules/webconfig/nodejs/db.js
--
diff --git a/modules/webconfig/nodejs/db.js b/modules/webconfig/nodejs/db.js
index 33764b7..59534f5 100644
--- a/modules/webconfig/nodejs/db.js
+++ b/modules/webconfig/nodejs/db.js
@@ -24,6 +24,6 @@ exports.Cache = mongoose.model('Cache', new mongoose.Schema({
exports.Cluster = mongoose.model('Cluster', new mongoose.Schema({
name : String,
caches : [String],
-discovery : { type: String, enum: ['VM', 'Multicast'] },
+discovery : { type: String, enum: ['TcpDiscoveryVmIpFinder',
'TcpDiscoveryMulticastIpFinder'] },
addresses : [String]
}));
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8be2739/modules/webconfig/nodejs/public/javascripts/bundle.js
--
diff --git a/modules/webconfig/nodejs/public/javascripts/bundle.js
b/modules/webconfig/nodejs/public/javascripts/bundle.js
new file mode 100644
index 000..e69de29
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8be2739/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
--
diff --git
a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
index 9be3f8d..ff144ae 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
@@ -1,23 +1,43 @@
-angular.module('ignite-web-configurator', ['ngTable', 'mgcrea.ngStrap',
'ngSanitize'])
-.controller('clusterRouter', ['$scope', '$modal', '$http', '$filter',
'ngTableParams', function($scope, $modal, $http, $filter, ngTableParams) {
+angular.module('ignite-web-configurator', ['ngTable', 'mgcrea.ngStrap'])
+.controller('activeLink', ['$scope', function($scope) {
+$scope.isActive = function(path) {
+return window.lo
incubator-ignite git commit: #IGNITE-857 Added resource limit.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-857 e32087382 -> ae8bcf83b
#IGNITE-857 Added resource limit.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae8bcf83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae8bcf83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae8bcf83
Branch: refs/heads/ignite-857
Commit: ae8bcf83b5e14efeb21dbd541ef56c629c8e214d
Parents: e320873
Author: nikolay tikhonov
Authored: Wed May 20 11:50:39 2015 +0300
Committer: nikolay tikhonov
Committed: Wed May 20 11:50:39 2015 +0300
--
.../apache/ignite/mesos/ClusterResources.java | 38 -
.../apache/ignite/mesos/IgniteFramework.java| 4 +-
.../apache/ignite/mesos/IgniteScheduler.java| 87 +++-
.../ignite/mesos/IgniteSchedulerSelfTest.java | 2 +-
4 files changed, 103 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae8bcf83/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterResources.java
--
diff --git
a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterResources.java
b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterResources.java
index 0a2193f..1887530 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterResources.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/ClusterResources.java
@@ -52,6 +52,18 @@ public class ClusterResources {
private double nodeCnt = DEFAULT_VALUE;
/** */
+public static final String IGNITE_RESOURCE_MIN_CPU_CNT_PER_NODE =
"IGNITE_RESOURCE_MIN_CPU_CNT_PER_NODE";
+
+/** Min memory per node. */
+private int minCpu = 2;
+
+/** */
+public static final String IGNITE_RESOURCE_MIN_MEMORY_PER_NODE =
"IGNITE_RESOURCE_MIN_MEMORY_PER_NODE";
+
+/** Min memory per node. */
+private int minMemoryCnt = 256;
+
+/** */
public ClusterResources() {
// No-op.
}
@@ -85,14 +97,32 @@ public class ClusterResources {
}
/**
+ * @return min memory per node.
+ */
+public int minMemoryPerNode() {
+return minMemoryCnt;
+}
+
+/**
+ * @return min cpu count per node.
+ */
+public int minCpuPerNode() {
+return minCpu;
+}
+
+/**
* @param config path to config file.
* @return Cluster configuration.
*/
public static ClusterResources from(String config) {
try {
-Properties props = new Properties();
+Properties props = null;
+
+if (config != null) {
+props = new Properties();
-props.load(new FileInputStream(config));
+props.load(new FileInputStream(config));
+}
ClusterResources resources = new ClusterResources();
@@ -114,13 +144,13 @@ public class ClusterResources {
* @return Property value.
*/
private static double getProperty(String name, Properties fileProps) {
-if (fileProps.containsKey(name))
+if (fileProps != null && fileProps.containsKey(name))
return Double.valueOf(fileProps.getProperty(name));
String property = System.getProperty(name);
if (property == null)
-System.getenv(name);
+property = System.getenv(name);
if (property == null)
return DEFAULT_VALUE;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae8bcf83/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteFramework.java
--
diff --git
a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteFramework.java
b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteFramework.java
index 3d309f3..2d74f71 100644
--- a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteFramework.java
+++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteFramework.java
@@ -42,8 +42,8 @@ public class IgniteFramework {
frameworkBuilder.setCheckpoint(true);
}
-// create the scheduler
-final Scheduler scheduler = new
IgniteScheduler(ClusterResources.from(args[1]));
+// Create the scheduler.
+final Scheduler scheduler = new
IgniteScheduler(ClusterResources.from(null));
// create the driver
MesosSchedulerDriver driver;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae8bcf83/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
--
diff --git
a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java
b/modules/mesos/src/mai
incubator-ignite git commit: # ignite-23
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-23 c06fade99 -> 804e0d967
# ignite-23
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/804e0d96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/804e0d96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/804e0d96
Branch: refs/heads/ignite-23
Commit: 804e0d967bea588e884f5c7d4a5a3da60bca8d27
Parents: c06fade
Author: sboikov
Authored: Wed May 20 11:53:40 2015 +0300
Committer: sboikov
Committed: Wed May 20 11:53:40 2015 +0300
--
.../processors/cache/GridCacheProcessor.java| 3 +
.../processors/cache/GridCacheUtils.java| 2 +-
.../distributed/dht/GridDhtCacheAdapter.java| 4 +-
.../dht/GridDhtPartitionTopologyImpl.java | 16 +-
.../IgniteCachePartitionMapUpdateTest.java | 226 +++
...niteCacheClientNodeChangingTopologyTest.java | 1 -
.../junits/common/GridCommonAbstractTest.java | 2 +-
7 files changed, 243 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/804e0d96/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index fed9504..f94f9d7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -798,6 +798,9 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
}
ctx.cacheObjects().onCacheProcessorStarted();
+
+assert caches.containsKey(CU.MARSH_CACHE_NAME) : "Marshaller cache
should be started";
+assert caches.containsKey(CU.UTILITY_CACHE_NAME) : "Utility cache
should be started";
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/804e0d96/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index b7bc115..4041f13 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -398,7 +398,7 @@ public class GridCacheUtils {
* @return Partition to state transformer.
*/
@SuppressWarnings({"unchecked"})
-public static IgniteClosure part2state() {
+public static IgniteClosure
part2state() {
return PART2STATE;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/804e0d96/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 23060e6..822c795 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -75,7 +75,7 @@ public abstract class GridDhtCacheAdapter extends
GridDistributedCacheAdap
protected GridDhtCacheAdapter(GridCacheContext ctx) {
super(ctx, ctx.config().getStartSize());
-top = new GridDhtPartitionTopologyImpl<>(ctx);
+top = new GridDhtPartitionTopologyImpl(ctx);
}
/**
@@ -87,7 +87,7 @@ public abstract class GridDhtCacheAdapter extends
GridDistributedCacheAdap
protected GridDhtCacheAdapter(GridCacheContext ctx,
GridCacheConcurrentMap map) {
super(ctx, map);
-top = new GridDhtPartitionTopologyImpl<>(ctx);
+top = new GridDhtPartitionTopologyImpl(ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/804e0d96/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
--
diff --git
a/modules/core/src/main/jav
[4/5] incubator-ignite git commit: # ignite-596 Add missed scala examples and remove unnecessary scala examples.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41a5bf67/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
--
diff --git
a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
deleted file mode 100644
index 2656f44..000
---
a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.scalar.examples
-
-import java.lang.{Integer => JavaInt}
-import java.util.ConcurrentModificationException
-import javax.cache.Cache
-
-import org.apache.ignite.IgniteCache
-import org.apache.ignite.cache.CacheMode
-import org.apache.ignite.scalar.scalar
-import org.apache.ignite.scalar.scalar._
-import org.jsr166.ThreadLocalRandom8
-
-import scala.collection.JavaConversions._
-
-/**
- * http://en.wikipedia.org/wiki/Snowflake_schema";>Snowflake
Schema is a logical
- * arrangement of data in which data is split into `dimensions` and `facts`
- * Dimensions can be referenced or joined by other dimensions or
facts,
- * however, facts are generally not referenced by other facts. You can
view dimensions
- * as your master or reference data, while facts are usually large data
sets of events or
- * other objects that continuously come into the system and may change
frequently. In Ignite
- * such architecture is supported via cross-cache queries. By storing
dimensions in
- * `CacheMode#REPLICATED REPLICATED` caches and facts in much larger
- * `CacheMode#PARTITIONED PARTITIONED` caches you can freely execute
distributed joins across
- * your whole in-memory data ignite cluster, thus querying your in memory data
without any limitations.
- *
- * In this example we have two dimensions, `DimProduct` and `DimStore`
and
- * one fact - `FactPurchase`. Queries are executed by joining
dimensions and facts
- * in various ways.
- *
- * Remote nodes should be started using `ExampleNodeStartup` which will
- * start node with `examples/config/example-ignite.xml` configuration.
- */
-object ScalarSnowflakeSchemaExample {
-/** Configuration file name. */
-private val CONFIG = "examples/config/example-ignite.xml"
-
-/** Name of replicated cache specified in spring configuration. */
-private val REPL_NAME = "ScalarSnowflakeSchemaExampleReplicated"
-
-/** Name of partitioned cache specified in spring configuration. */
-private val PART_NAME = "ScalarSnowflakeSchemaExamplePartitioned"
-
-/** ID generator. */
-private[this] val idGen =
Stream.from(System.currentTimeMillis.toInt).iterator
-
-/** DimStore data. */
-private[this] val dataStore = scala.collection.mutable.Map[JavaInt,
DimStore]()
-
-/** DimProduct data. */
-private[this] val dataProduct = scala.collection.mutable.Map[JavaInt,
DimProduct]()
-
-/**
- * Example entry point. No arguments required.
- */
-def main(args: Array[String]) {
-scalar(CONFIG) {
-val dimCache = createCache$[JavaInt, AnyRef](REPL_NAME,
CacheMode.REPLICATED, Seq(classOf[JavaInt], classOf[DimStore],
-classOf[JavaInt], classOf[DimProduct]))
-
-try {
-val factCache = createCache$[JavaInt, FactPurchase](PART_NAME,
indexedTypes = Seq(classOf[JavaInt], classOf[FactPurchase]))
-
-try {
-populateDimensions(dimCache)
-populateFacts(factCache)
-
-queryStorePurchases()
-queryProductPurchases()
-}
-finally {
-factCache.close()
-}
-}
-finally {
-dimCache.close()
-}
-}
-}
-
-/**
- * Populate cache with `dimensions` which in our case are
- * `DimStore` and `DimProduct` instances.
- */
-def populateDimensions(dimCache: IgniteCache[JavaInt, AnyRef]) {
-val store1 = new DimStore(idGen.next(),
[1/5] incubator-ignite git commit: # ignite-596 Add missed scala examples and remove unnecessary scala examples.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-596 [created] 41a5bf67b
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41a5bf67/examples/src/main/scala/org/apache/ignite/scalar/examples/messaging/ScalarMessagingExample.scala
--
diff --git
a/examples/src/main/scala/org/apache/ignite/scalar/examples/messaging/ScalarMessagingExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/messaging/ScalarMessagingExample.scala
new file mode 100644
index 000..51788d1
--- /dev/null
+++
b/examples/src/main/scala/org/apache/ignite/scalar/examples/messaging/ScalarMessagingExample.scala
@@ -0,0 +1,166 @@
+/*
+ *
+ * * Licensed to the Apache Software Foundation (ASF) under one or more
+ * * contributor license agreements. See the NOTICE file distributed with
+ * * this work for additional information regarding copyright ownership.
+ * * The ASF licenses this file to You under the Apache License, Version 2.0
+ * * (the "License"); you may not use this file except in compliance with
+ * * the License. You may obtain a copy of the License at
+ * *
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * *
+ * * Unless required by applicable law or agreed to in writing, software
+ * * distributed under the License is distributed on an "AS IS" BASIS,
+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * * See the License for the specific language governing permissions and
+ * * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.scalar.examples.messaging
+
+import org.apache.ignite.examples.{ExampleNodeStartup, ExamplesUtils}
+import org.apache.ignite.internal.util.scala.impl
+import org.apache.ignite.lang.IgniteBiPredicate
+import org.apache.ignite.resources.IgniteInstanceResource
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
+import org.apache.ignite.{Ignite, IgniteException, IgniteMessaging}
+
+import java.util.UUID
+import java.util.concurrent.CountDownLatch
+
+/**
+ * Example that demonstrates how to exchange messages between nodes. Use such
+ * functionality for cases when you need to communicate to other nodes outside
+ * of ignite task.
+ *
+ * To run this example you must have at least one remote node started.
+ *
+ * Remote nodes should always be started with special configuration file which
+ * enables P2P class loading: `'ignite.{sh|bat}`
examples/config/example-ignite.xml'}.
+ *
+ * Alternatively you can run [[ExampleNodeStartup]] in another JVM which will
start node
+ * with `examples/config/example-ignite.xml` configuration.
+ */
+object ScalarMessagingExample extends App {
+/** Configuration file name. */
+private val CONFIG = "examples/config/example-ignite.xml"
+
+/** Number of messages. */
+private val MESSAGES_NUM = 10
+
+/** Message topics. */
+private object TOPIC extends Enumeration {
+type TOPIC = Value
+val ORDERED, UNORDERED = Value
+}
+
+scalar(CONFIG) {
+val cluster = cluster$
+
+if (ExamplesUtils.checkMinTopologySize(cluster, 2)) {
+println()
+println(">>> Messaging example started.")
+
+// Group for remote nodes.
+val rmts = cluster.forRemotes
+
+// Listen for messages from remote nodes to make sure that they
received all the messages.
+val msgCnt = rmts.nodes.size * MESSAGES_NUM
+
+val orderedLatch = new CountDownLatch(msgCnt)
+val unorderedLatch = new CountDownLatch(msgCnt)
+
+localListen(ignite$.message(cluster.forLocal), orderedLatch,
unorderedLatch)
+
+// Register listeners on all cluster nodes.
+startListening(ignite$.message(rmts))
+
+// Send unordered messages to all remote nodes.
+for (i <- 0 until MESSAGES_NUM)
+ignite$.message(rmts).send(TOPIC.UNORDERED,
Integer.toString(i))
+
+println(">>> Finished sending unordered messages.")
+
+// Send ordered messages to all remote nodes.
+for (i <- 0 until MESSAGES_NUM)
+ignite$.message(rmts).sendOrdered(TOPIC.ORDERED,
Integer.toString(i), 0)
+
+println(">>> Finished sending ordered messages.")
+println(">>> Check output on all nodes for message printouts.")
+println(">>> Will wait for messages acknowledgements from all
remote nodes.")
+
+orderedLatch.await()
+unorderedLatch.await()
+
+println(">>> Messaging example finished.")
+}
+}
+
+/**
+ * Start listening to messages on remote cluster nodes.
+ *
+ * @param msg Ignite messaging.
+ */
+private def startListening(msg: IgniteMessaging) {
+msg.remoteListen(TOPIC.ORDERED, new IgniteBiPredicate[UUID, String] {
+@IgniteInstanceResource private var ignite: Ignite
[3/5] incubator-ignite git commit: # ignite-596 Add missed scala examples and remove unnecessary scala examples.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41a5bf67/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/ScalarCacheAsyncApiExample.scala
--
diff --git
a/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/ScalarCacheAsyncApiExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/ScalarCacheAsyncApiExample.scala
new file mode 100644
index 000..1059c5b
--- /dev/null
+++
b/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/ScalarCacheAsyncApiExample.scala
@@ -0,0 +1,75 @@
+/*
+ *
+ * * Licensed to the Apache Software Foundation (ASF) under one or more
+ * * contributor license agreements. See the NOTICE file distributed with
+ * * this work for additional information regarding copyright ownership.
+ * * The ASF licenses this file to You under the Apache License, Version 2.0
+ * * (the "License"); you may not use this file except in compliance with
+ * * the License. You may obtain a copy of the License at
+ * *
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * *
+ * * Unless required by applicable law or agreed to in writing, software
+ * * distributed under the License is distributed on an "AS IS" BASIS,
+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * * See the License for the specific language governing permissions and
+ * * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.scalar.examples.datagrid
+
+import org.apache.ignite.examples.ExampleNodeStartup
+import org.apache.ignite.internal.util.scala.impl
+import org.apache.ignite.lang.{IgniteFuture, IgniteInClosure}
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
+
+/**
+ * This example demonstrates some of the cache rich API capabilities.
+ *
+ * Remote nodes should always be started with special configuration file which
+ * enables P2P class loading: `'ignite.{sh|bat}
examples/config/example-ignite.xml'`.
+ *
+ * Alternatively you can run [[ExampleNodeStartup]] in another JVM which will
+ * start node with `examples/config/example-ignite.xml` configuration.
+ */
+object ScalarCacheAsyncApiExample extends App {
+/** Configuration file name. */
+private val CONFIG = "examples/config/example-ignite.xml"
+
+/** Cache name. */
+private val CACHE_NAME = ScalarCacheAsyncApiExample.getClass.getSimpleName
+
+scalar(CONFIG) {
+println()
+println(">>> Cache asynchronous API example started.")
+
+val cache = createCache$[Integer, String](CACHE_NAME)
+
+try {
+// Enable asynchronous mode.
+val asyncCache = cache.withAsync()
+
+// Execute several puts asynchronously.
+val t = (0 until 10).map(i => {
+asyncCache.put(i, String.valueOf(i))
+
+asyncCache.future().asInstanceOf[IgniteFuture[_]]
+}).foreach(_.get())
+
+// Execute get operation asynchronously.
+asyncCache.get(1)
+
+// Asynchronously wait for result.
+asyncCache.future[String].listen(new
IgniteInClosure[IgniteFuture[String]] {
+@impl def apply(fut: IgniteFuture[String]) {
+println("Get operation completed [value=" + fut.get + ']')
+}
+})
+}
+finally {
+cache.close()
+}
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41a5bf67/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/ScalarCacheContinuousQueryExample.scala
--
diff --git
a/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/ScalarCacheContinuousQueryExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/ScalarCacheContinuousQueryExample.scala
new file mode 100644
index 000..637c13c
--- /dev/null
+++
b/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/ScalarCacheContinuousQueryExample.scala
@@ -0,0 +1,108 @@
+/*
+ *
+ * * 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 a
[2/5] incubator-ignite git commit: # ignite-596 Add missed scala examples and remove unnecessary scala examples.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41a5bf67/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/store/hibernate/Person.hbm.xml
--
diff --git
a/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/store/hibernate/Person.hbm.xml
b/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/store/hibernate/Person.hbm.xml
new file mode 100644
index 000..ba07a84
--- /dev/null
+++
b/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/store/hibernate/Person.hbm.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41a5bf67/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/store/hibernate/ScalarCacheHibernatePersonStore.scala
--
diff --git
a/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/store/hibernate/ScalarCacheHibernatePersonStore.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/store/hibernate/ScalarCacheHibernatePersonStore.scala
new file mode 100644
index 000..91c2c07
--- /dev/null
+++
b/examples/src/main/scala/org/apache/ignite/scalar/examples/datagrid/store/hibernate/ScalarCacheHibernatePersonStore.scala
@@ -0,0 +1,268 @@
+/*
+ *
+ * * Licensed to the Apache Software Foundation (ASF) under one or more
+ * * contributor license agreements. See the NOTICE file distributed with
+ * * this work for additional information regarding copyright ownership.
+ * * The ASF licenses this file to You under the Apache License, Version 2.0
+ * * (the "License"); you may not use this file except in compliance with
+ * * the License. You may obtain a copy of the License at
+ * *
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * *
+ * * Unless required by applicable law or agreed to in writing, software
+ * * distributed under the License is distributed on an "AS IS" BASIS,
+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * * See the License for the specific language governing permissions and
+ * * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.scalar.examples.datagrid.store.hibernate
+
+import org.apache.ignite.cache.store.{CacheStore, CacheStoreAdapter,
CacheStoreSession}
+import org.apache.ignite.lang.IgniteBiInClosure
+import org.apache.ignite.resources.CacheStoreSessionResource
+import org.apache.ignite.scalar.examples.datagrid.store._
+import org.apache.ignite.transactions.Transaction
+
+import org.hibernate.cfg.Configuration
+import org.hibernate.{FlushMode, HibernateException, Session}
+import org.jetbrains.annotations.Nullable
+
+import javax.cache.Cache
+import javax.cache.integration.{CacheLoaderException, CacheWriterException}
+import java.lang.{Long => JavaLong}
+import java.util.UUID
+
+/**
+ * Example of [[CacheStore]] implementation that uses Hibernate
+ * and deals with maps [[UUID]] to [[Person]].
+ */
+class ScalarCacheHibernatePersonStore extends CacheStoreAdapter[JavaLong,
Person]{
+/** Default hibernate configuration resource path. */
+private val DFLT_HIBERNATE_CFG =
"/org/apache/ignite/scalar/examples/datagrid/store/hibernate/hibernate.cfg.xml"
+
+/** Session attribute name. */
+private val ATTR_SES = "HIBERNATE_STORE_SESSION"
+
+/** Session factory. */
+private val sesFactory = new
Configuration().configure(DFLT_HIBERNATE_CFG).buildSessionFactory
+
+/** Auto-injected store session. */
+@CacheStoreSessionResource private var ses: CacheStoreSession = null
+
+def load(key: JavaLong): Person = {
+val tx = transaction
+
+println(">>> Store load [key=" + key + ", xid=" + (if (tx == null)
null else tx.xid) + ']')
+
+val ses = session(tx)
+
+try {
+ses.get(classOf[Person], key).asInstanceOf[Person]
+}
+catch {
+case e: HibernateException =>
+rollback(ses, tx)
+
+throw new CacheLoaderException("Failed to load value from
cache store with key: " + key, e)
+}
+finally {
+end(ses, tx)
+}
+}
+
+def write(entry: Cache.Entry[_ <: JavaLong, _ <: Person]) {
+val tx = transaction
+
+val key = entry.getKey
+
+val value = entry.getValue
+
+println(">>> Store put [key=" + key + ", val=" + value + ", xid=" +
(if (tx == null) null else tx.xid) + ']')
+
+if (value == null)
+delete(key)
+else {
+val ses = session(tx)
+
+try {
+ses.saveOrUpdate(value)
+}
+catch {
+case e: HibernateException =>
+rollback(ses, tx)
+
+throw new CacheWrit
[5/5] incubator-ignite git commit: # ignite-596 Add missed scala examples and remove unnecessary scala examples.
# ignite-596 Add missed scala examples and remove unnecessary scala examples. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41a5bf67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41a5bf67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41a5bf67 Branch: refs/heads/ignite-596 Commit: 41a5bf67b519b6fc2eb7a7d09428a9e593096021 Parents: f9a4dd7 Author: Andrey Authored: Wed May 20 16:05:56 2015 +0700 Committer: Andrey Committed: Wed May 20 16:05:56 2015 +0700 -- .../example-scalar-hibernate-L2-cache.xml | 66 .../computegrid/ComputeTaskMapExample.java | 2 +- .../examples/datagrid/CacheQueryExample.java| 3 +- .../starschema/CacheStarSchemaExample.java | 1 - .../datagrid/store/auto/DbH2ServerStartup.java | 28 +- .../misc/deployment/DeploymentExample.java | 2 +- .../examples/ScalarCacheAffinityExample.scala | 115 --- .../scalar/examples/ScalarCacheExample.scala| 117 --- .../ScalarCachePopularNumbersExample.scala | 151 - .../examples/ScalarCacheQueryExample.scala | 192 .../scalar/examples/ScalarClosureExample.scala | 100 -- .../examples/ScalarContinuationExample.scala| 175 --- .../examples/ScalarCreditRiskExample.scala | 249 --- .../scalar/examples/ScalarJvmCloudExample.scala | 95 -- .../scalar/examples/ScalarPingPongExample.scala | 160 -- .../scalar/examples/ScalarPrimeExample.scala| 134 .../scalar/examples/ScalarScheduleExample.scala | 66 .../examples/ScalarSnowflakeSchemaExample.scala | 312 -- .../scalar/examples/ScalarTaskExample.scala | 55 .../examples/ScalarWorldShortestMapReduce.scala | 42 --- .../computegrid/ScalarComputeAsyncExample.scala | 59 .../ScalarComputeBroadcastExample.scala | 107 +++ .../ScalarComputeCallableExample.scala | 73 + .../ScalarComputeClosureExample.scala | 64 .../ScalarComputeContinuousMapperExample.scala | 144 + ...larComputeFibonacciContinuationExample.scala | 159 ++ .../ScalarComputeReduceExample.scala| 83 + .../ScalarComputeRunnableExample.scala | 58 .../ScalarComputeTaskMapExample.scala | 108 +++ .../ScalarComputeTaskSplitExample.scala | 97 ++ .../ScalarComputeClusterGroupExample.scala | 88 ++ .../failover/ScalarComputeFailoverExample.scala | 124 .../ScalarComputeCreditRiskExample.scala| 231 ++ .../datagrid/ScalarCacheAffinityExample.scala | 117 +++ .../datagrid/ScalarCacheApiExample.scala| 101 ++ .../datagrid/ScalarCacheAsyncApiExample.scala | 75 + .../ScalarCacheContinuousQueryExample.scala | 108 +++ .../ScalarCacheDataStreamerExample.scala| 88 ++ .../datagrid/ScalarCacheEventsExample.scala | 89 ++ .../datagrid/ScalarCachePutGetExample.scala | 106 +++ .../datagrid/ScalarCacheQueryExample.scala | 305 ++ .../ScalarCacheTransactionExample.scala | 127 .../examples/datagrid/hibernate/Post.scala | 115 +++ .../ScalarHibernateL2CacheExample.scala | 242 ++ .../examples/datagrid/hibernate/User.scala | 136 .../starschema/ScalarStarSchemaExample.scala| 314 +++ .../scalar/examples/datagrid/store/Person.scala | 93 ++ .../datagrid/store/auto/CacheConfig.scala | 77 + .../auto/ScalarCacheAutoStoreExample.scala | 94 ++ .../ScalarCacheAutoStoreLoadDataExample.scala | 84 + .../dummy/ScalarCacheDummyPersonStore.scala | 101 ++ .../dummy/ScalarCacheDummyStoreExample.scala| 133 .../datagrid/store/hibernate/Person.hbm.xml | 36 +++ .../ScalarCacheHibernatePersonStore.scala | 268 .../ScalarCacheHibernateStoreExample.scala | 133 .../datagrid/store/hibernate/hibernate.cfg.xml | 43 +++ .../store/jdbc/ScalarCacheJdbcPersonStore.scala | 311 ++ .../jdbc/ScalarCacheJdbcStoreExample.scala | 159 ++ .../ScalarExecutorServiceExample.scala | 64 .../ScalarIgniteAtomicLongExample.scala | 74 + .../ScalarIgniteAtomicSequenceExample.scala | 69 .../ScalarIgniteAtomicStampedExample.scala | 96 ++ .../ScalarIgniteCountDownLatchExample.scala | 75 + .../ScalarIgniteQueueExample.scala | 180 +++ .../datastructures/ScalarIgniteSetExample.scala | 154 + .../examples/events/ScalarEventsExample.scala | 123 .../examples/igfs/ScalarIgfsExample.scala | 285 + .../igfs/ScalarIgfsMapReduceExample.scala | 231 ++ .../
[04/19] incubator-ignite git commit: Changed default timeout: SocketWrite - 200 AckTimeout - 50 HeartbeatFrequency -100 NetworkTimeout - 5000
Changed default timeout: SocketWrite - 200 AckTimeout - 50 HeartbeatFrequency -100 NetworkTimeout - 5000 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/df25d350 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/df25d350 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/df25d350 Branch: refs/heads/ignite-471-2 Commit: df25d35067beb8d5f40c97139eac0c06310b Parents: c3dde57 Author: nikolay_tikhonov Authored: Mon May 18 11:41:41 2015 +0300 Committer: nikolay_tikhonov Committed: Mon May 18 11:41:41 2015 +0300 -- .../spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df25d350/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java index b7e3cd5..802da02 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java @@ -54,17 +54,17 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov /** Default socket operations timeout in milliseconds (value is 200ms). */ public static final long DFLT_SOCK_TIMEOUT = 200; -/** Default timeout for receiving message acknowledgement in milliseconds (value is 200ms). */ -public static final long DFLT_ACK_TIMEOUT = 200; +/** Default timeout for receiving message acknowledgement in milliseconds (value is 50ms). */ +public static final long DFLT_ACK_TIMEOUT = 50; -/** Default network timeout in milliseconds (value is 200ms). */ -public static final long DFLT_NETWORK_TIMEOUT = 200; +/** Default network timeout in milliseconds (value is 5000ms). */ +public static final long DFLT_NETWORK_TIMEOUT = 5000; /** Default value for thread priority (value is 10). */ public static final int DFLT_THREAD_PRI = 10; -/** Default heartbeat messages issuing frequency (value is 300ms). */ -public static final long DFLT_HEARTBEAT_FREQ = 300; +/** Default heartbeat messages issuing frequency (value is 100ms). */ +public static final long DFLT_HEARTBEAT_FREQ = 100; /** Default size of topology snapshots history. */ public static final int DFLT_TOP_HISTORY_SIZE = 1000;
[12/19] incubator-ignite git commit: Filenames fix
Filenames 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/4423a465 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4423a465 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4423a465 Branch: refs/heads/ignite-471-2 Commit: 4423a4655c03936bb48fb70b713240aefa3f4219 Parents: 9c30fba Author: avinogradov Authored: Tue May 19 16:42:08 2015 +0300 Committer: avinogradov Committed: Tue May 19 16:42:08 2015 +0300 -- LICENSE | 238 + LICENSE.txt | 238 - NOTICE| 12 +++ NOTICE.txt| 12 --- assembly/release-base.xml | 4 +- 5 files changed, 252 insertions(+), 252 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4423a465/LICENSE -- diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..7649b39 --- /dev/null +++ b/LICENSE @@ -0,0 +1,238 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + wor
[10/19] incubator-ignite git commit: IGNITE-920 - Fixed value sending in near cache.
IGNITE-920 - Fixed value sending in near cache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a927eb29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a927eb29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a927eb29
Branch: refs/heads/ignite-471-2
Commit: a927eb29276796831ead8e9351e30947c4480bf8
Parents: d3c056e
Author: Alexey Goncharuk
Authored: Mon May 18 11:38:49 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon May 18 11:38:49 2015 -0700
--
.../apache/ignite/internal/IgniteKernal.java| 24 +++-
.../distributed/GridDistributedTxMapping.java | 5 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 1 +
.../distributed/near/GridNearCacheEntry.java| 2 +-
.../cache/distributed/near/GridNearTxLocal.java | 5 +-
.../near/GridNearTxPrepareFuture.java | 10 +-
.../near/GridNearTxPrepareResponse.java | 28 +++-
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../cache/IgniteCacheNearLockValueSelfTest.java | 144 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
10 files changed, 212 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a927eb29/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index d98b023..2d9828a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2297,7 +2297,8 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(), null,
false).get();
+if (ctx.cache().cache(cacheCfg.getName()) == null)
+ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(),
null, false).get();
return ctx.cache().publicJCache(cacheCfg.getName());
}
@@ -2341,7 +2342,14 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(),
nearCfg, false).get();
+IgniteInternalCache cache =
ctx.cache().cache(cacheCfg.getName());
+
+if (cache == null)
+ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(),
nearCfg, false).get();
+else {
+if (cache.configuration().getNearConfiguration() == null)
+ctx.cache().dynamicStartCache(cacheCfg,
cacheCfg.getName(), nearCfg, false).get();
+}
return ctx.cache().publicJCache(cacheCfg.getName());
}
@@ -2380,7 +2388,14 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().dynamicStartCache(null, cacheName, nearCfg,
false).get();
+IgniteInternalCache internalCache =
ctx.cache().cache(cacheName);
+
+if (internalCache == null)
+ctx.cache().dynamicStartCache(null, cacheName, nearCfg,
false).get();
+else {
+if (internalCache.configuration().getNearConfiguration() ==
null)
+ctx.cache().dynamicStartCache(null, cacheName, nearCfg,
false).get();
+}
return ctx.cache().publicJCache(cacheName);
}
@@ -2418,7 +2433,8 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().getOrCreateFromTemplate(cacheName).get();
+if (ctx.cache().cache(cacheName) == null)
+ctx.cache().getOrCreateFromTemplate(cacheName).get();
return ctx.cache().publicJCache(cacheName);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a927eb29/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
index 58c7725..fded3c9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache
[03/19] 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/b218e78a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b218e78a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b218e78a Branch: refs/heads/ignite-471-2 Commit: b218e78adb72d759e646a1042f44fa19b44cf09e Parents: 5de74fe 54f9492 Author: Alexey Goncharuk Authored: Tue May 5 11:17:56 2015 -0700 Committer: Alexey Goncharuk Committed: Tue May 5 11:17:56 2015 -0700 -- DEVNOTES.txt| 2 +- assembly/release-base.xml | 2 + assembly/release-schema-import.xml | 50 .../streaming/wordcount/CacheConfig.java| 5 - .../config/grid-client-config.properties| 50 ++-- .../ClientPropertiesConfigurationSelfTest.java | 12 +- .../java/org/apache/ignite/IgniteCache.java | 5 + .../org/apache/ignite/IgniteJdbcDriver.java | 81 --- .../client/GridClientConfiguration.java | 2 +- .../managers/communication/GridIoManager.java | 8 +- .../processors/cache/GridCacheTtlManager.java | 168 +- .../processors/cache/GridCacheUtils.java| 5 +- .../apache/ignite/lang/IgniteAsyncSupport.java | 4 +- .../discovery/tcp/TcpClientDiscoverySpi.java| 4 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 - .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- ...CacheLoadingConcurrentGridStartSelfTest.java | 154 + ...GridCacheLoadingConcurrentGridStartTest.java | 154 - .../tcp/TcpClientDiscoverySelfTest.java | 8 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- modules/schema-import/pom.xml | 6 +- pom.xml | 227 --- 23 files changed, 625 insertions(+), 340 deletions(-) --
[16/19] incubator-ignite git commit: Merge branch ignite-920 into ignite-sprint-5
Merge branch ignite-920 into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9a4dd7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9a4dd7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9a4dd7f
Branch: refs/heads/ignite-471-2
Commit: f9a4dd7f580abc3d66630531bb66c3bf4d75d1d8
Parents: 02d0acd
Author: Alexey Goncharuk
Authored: Tue May 19 11:16:27 2015 -0700
Committer: Alexey Goncharuk
Committed: Tue May 19 11:16:27 2015 -0700
--
.../internal/processors/cache/GridCacheIoManager.java | 1 +
.../distributed/near/GridNearTxPrepareFutureAdapter.java| 9 +++--
.../processors/cache/IgniteCacheNearLockValueSelfTest.java | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index d5dd492..02f16c0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -487,6 +487,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
req.futureId(),
req.miniId(),
req.version(),
+req.version(),
null, null, null);
res.error(req.classError());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index 60b918c..b7a2fee 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -214,10 +214,15 @@ public abstract class GridNearTxPrepareFutureAdapter
extends GridCompoundIdentit
}
if (!m.empty()) {
+GridCacheVersion writeVer = res.writeVersion();
+
+if (writeVer == null)
+writeVer = res.dhtVersion();
+
// Register DHT version.
-tx.addDhtVersion(m.node().id(), res.dhtVersion());
+tx.addDhtVersion(m.node().id(), res.dhtVersion(), writeVer);
-m.dhtVersion(res.dhtVersion());
+m.dhtVersion(res.dhtVersion(), writeVer);
if (m.near())
tx.readyNearLocks(m, res.pending(), res.committedVersions(),
res.rolledbackVersions());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
index fe60331..5cc9d04 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
[01/19] incubator-ignite git commit: IGNITE-80 - Porting changes to a separate branch.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471-2 1f4f6 -> 19d3aac7c
IGNITE-80 - Porting changes to a separate branch.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dcda61b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dcda61b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dcda61b4
Branch: refs/heads/ignite-471-2
Commit: dcda61b4fe2be3005544a3fc915b19ac3e4c9598
Parents: 1e53395
Author: Alexey Goncharuk
Authored: Wed Apr 29 14:08:05 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed Apr 29 14:08:05 2015 -0700
--
.../processors/cache/GridCacheIoManager.java| 5 +--
.../GridCachePartitionExchangeManager.java | 4 +-
.../distributed/dht/GridDhtCacheAdapter.java| 6 ++-
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++---
.../colocated/GridDhtColocatedLockFuture.java | 4 +-
.../cache/transactions/IgniteTxManager.java | 24 +++
8 files changed, 101 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcda61b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index b8668e6..112330a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -146,9 +146,8 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
c = clsHandlers.get(new ListenerKey(cacheMsg.cacheId(),
cacheMsg.getClass()));
if (c == null) {
-if (log.isDebugEnabled())
-log.debug("Received message without registered handler (will
ignore) [msg=" + cacheMsg +
-", nodeId=" + nodeId + ']');
+U.warn(log, "Received message without registered handler (will
ignore) [msg=" + cacheMsg +
+", nodeId=" + nodeId + ']');
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcda61b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 5f82ae2..e61168e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -409,10 +409,10 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
* @param ver Topology version.
* @return Future or {@code null} is future is already completed.
*/
-public @Nullable IgniteInternalFuture
affinityReadyFuture(AffinityTopologyVersion ver) {
+@Nullable public IgniteInternalFuture
affinityReadyFuture(AffinityTopologyVersion ver) {
GridDhtPartitionsExchangeFuture lastInitializedFut0 =
lastInitializedFut;
-if (lastInitializedFut0 != null &&
lastInitializedFut0.topologyVersion().compareTo(ver) >= 0) {
+if (lastInitializedFut0 != null &&
lastInitializedFut0.topologyVersion().compareTo(ver) == 0) {
if (log.isDebugEnabled())
log.debug("Return lastInitializedFut for topology ready future
" +
"[ver=" + ver + ", fut=" + lastInitializedFut0 + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcda61b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 1c46fd0..4d1db85 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++
b/modules/core/src/main/java/org
[14/19] incubator-ignite git commit: GG-9614 Interop .Net: Implement GridEvents API. - done
GG-9614 Interop .Net: Implement GridEvents API. - done
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26a713c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26a713c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26a713c8
Branch: refs/heads/ignite-471-2
Commit: 26a713c84b96bb0d89b802bd2ab3cd1319da0e2c
Parents: 3f7a80a
Author: ptupitsyn
Authored: Tue May 19 18:26:20 2015 +0300
Committer: ptupitsyn
Committed: Tue May 19 18:26:20 2015 +0300
--
.../internal/GridEventConsumeHandler.java | 26 ++
.../interop/InteropAwareEventFilter.java| 37
.../interop/InteropLocalEventListener.java | 28 +++
.../eventstorage/GridEventStorageManager.java | 24 -
4 files changed, 114 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26a713c8/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index c60646e..505204d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
+import org.apache.ignite.internal.interop.*;
import org.apache.ignite.internal.managers.deployment.*;
import org.apache.ignite.internal.managers.discovery.*;
import org.apache.ignite.internal.managers.eventstorage.*;
@@ -124,6 +125,9 @@ class GridEventConsumeHandler implements
GridContinuousHandler {
if (filter != null)
ctx.resource().injectGeneric(filter);
+if (filter instanceof InteropAwareEventFilter)
+((InteropAwareEventFilter)filter).initialize(ctx);
+
final boolean loc = nodeId.equals(ctx.localNodeId());
lsnr = new GridLocalEventListener() {
@@ -188,6 +192,28 @@ class GridEventConsumeHandler implements
GridContinuousHandler {
if (lsnr != null)
ctx.event().removeLocalEventListener(lsnr, types);
+
+RuntimeException err = null;
+
+try {
+if (filter instanceof InteropAwareEventFilter)
+((InteropAwareEventFilter)filter).close();
+}
+catch(RuntimeException ex) {
+err = ex;
+}
+
+try {
+if (cb instanceof InteropLocalEventListener)
+((InteropLocalEventListener)cb).close();
+}
+catch (RuntimeException ex) {
+if (err == null)
+err = ex;
+}
+
+if (err != null)
+throw err;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26a713c8/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
new file mode 100644
index 000..8dbc73b
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.interop;
+
+import org.apache.ignite.events.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.lang.*;
+
+/**
+ * Special version of predicate for events with initialize/close callbacks.
+ */
+public interface InteropAwareEventFilter extends
IgnitePredicate {
+/**
+ * Initializes the filter.
[17/19] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-471-2
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-471-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/379c73f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/379c73f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/379c73f6 Branch: refs/heads/ignite-471-2 Commit: 379c73f63ac5920978ed9032fb5efad939fc2b1e Parents: 1f4 f9a4dd7 Author: Denis Magda Authored: Wed May 20 08:20:04 2015 +0300 Committer: Denis Magda Committed: Wed May 20 08:20:04 2015 +0300 -- LICENSE | 238 +++ LICENSE.txt | 238 --- NOTICE | 12 + NOTICE.txt | 12 - assembly/release-base.xml | 4 +- .../internal/GridEventConsumeHandler.java | 26 ++ .../apache/ignite/internal/IgniteKernal.java| 26 +- .../interop/InteropAwareEventFilter.java| 37 +++ .../interop/InteropLocalEventListener.java | 28 +++ .../managers/communication/GridIoManager.java | 6 +- .../GridLifecycleAwareMessageFilter.java| 5 +- .../eventstorage/GridEventStorageManager.java | 24 +- .../processors/cache/GridCacheIoManager.java| 6 +- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/GridDistributedTxMapping.java | 5 +- .../distributed/dht/GridDhtCacheAdapter.java| 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../distributed/near/GridNearCacheEntry.java| 2 +- .../cache/distributed/near/GridNearTxLocal.java | 5 +- .../near/GridNearTxPrepareFutureAdapter.java| 9 +- .../near/GridNearTxPrepareResponse.java | 28 ++- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 ++ .../discovery/tcp/TcpDiscoverySpiAdapter.java | 12 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 145 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../testsuites/IgniteCacheTestSuite2.java | 1 + 31 files changed, 695 insertions(+), 301 deletions(-) --
[11/19] incubator-ignite git commit: IGNITE-920 - Trigger TC.
IGNITE-920 - Trigger TC.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1b5ecd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1b5ecd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1b5ecd1
Branch: refs/heads/ignite-471-2
Commit: f1b5ecd16dd2315bab79944f192dbf9a1113b81b
Parents: a927eb2
Author: Alexey Goncharuk
Authored: Mon May 18 14:22:54 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon May 18 14:22:54 2015 -0700
--
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1b5ecd1/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 2d9828a..ffd264d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -118,7 +118,7 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
@GridToStringExclude
private GridKernalContextImpl ctx;
-/** */
+/** Configuration. */
private IgniteConfiguration cfg;
/** */
[13/19] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f7a80a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f7a80a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f7a80a2 Branch: refs/heads/ignite-471-2 Commit: 3f7a80a26ee06723f75bbb7247f4ce04d4586038 Parents: ba7fddb 4423a46 Author: avinogradov Authored: Tue May 19 16:42:46 2015 +0300 Committer: avinogradov Committed: Tue May 19 16:42:46 2015 +0300 -- LICENSE | 238 + LICENSE.txt | 238 - NOTICE| 12 +++ NOTICE.txt| 12 --- assembly/release-base.xml | 4 +- 5 files changed, 252 insertions(+), 252 deletions(-) --
[02/19] incubator-ignite git commit: IGNITE-80 - Merge branch 'ignite-80-1' into ignite-sprint-4
IGNITE-80 - Merge branch 'ignite-80-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/5de74fe6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5de74fe6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5de74fe6 Branch: refs/heads/ignite-471-2 Commit: 5de74fe6d7f3837310cfd9f4f9e5d2636560e182 Parents: 81ce0e6 dcda61b Author: Alexey Goncharuk Authored: Wed Apr 29 22:49:14 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Apr 29 22:49:14 2015 -0700 -- .../processors/cache/GridCacheIoManager.java| 5 +-- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java| 6 ++- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++--- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 +++ 8 files changed, 101 insertions(+), 24 deletions(-) --
[06/19] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36805cc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36805cc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36805cc1 Branch: refs/heads/ignite-471-2 Commit: 36805cc1dd157b343301ff4661bbdf3db5b596ff Parents: 489323b c3dde57 Author: avinogradov Authored: Mon May 18 12:55:06 2015 +0300 Committer: avinogradov Committed: Mon May 18 12:55:06 2015 +0300 -- .../socket/WordsSocketStreamerServer.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 136 - .../internal/interop/InteropBootstrap.java | 34 .../interop/InteropBootstrapFactory.java| 39 .../internal/interop/InteropIgnition.java | 166 .../internal/interop/InteropProcessor.java | 36 .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 35 +--- .../distributed/GridDistributedLockRequest.java | 111 ++- .../GridDistributedTxFinishRequest.java | 70 ++- .../GridDistributedTxPrepareRequest.java| 112 +++ .../GridDistributedTxRemoteAdapter.java | 20 +- .../distributed/dht/GridDhtLockFuture.java | 2 - .../distributed/dht/GridDhtLockRequest.java | 45 ++--- .../dht/GridDhtTransactionalCacheAdapter.java | 6 - .../distributed/dht/GridDhtTxFinishFuture.java | 3 - .../distributed/dht/GridDhtTxFinishRequest.java | 43 ++--- .../cache/distributed/dht/GridDhtTxLocal.java | 6 - .../distributed/dht/GridDhtTxLocalAdapter.java | 68 +-- .../distributed/dht/GridDhtTxPrepareFuture.java | 18 +- .../dht/GridDhtTxPrepareRequest.java| 60 +++--- .../cache/distributed/dht/GridDhtTxRemote.java | 8 +- .../colocated/GridDhtColocatedLockFuture.java | 6 - .../distributed/near/GridNearLockFuture.java| 6 - .../distributed/near/GridNearLockRequest.java | 61 +++--- .../near/GridNearOptimisticTxPrepareFuture.java | 15 +- .../GridNearPessimisticTxPrepareFuture.java | 2 - .../near/GridNearTransactionalCache.java| 4 - .../near/GridNearTxFinishRequest.java | 28 +-- .../cache/distributed/near/GridNearTxLocal.java | 20 +- .../near/GridNearTxPrepareRequest.java | 52 +++-- .../distributed/near/GridNearTxRemote.java | 24 +-- .../cache/transactions/IgniteInternalTx.java| 10 - .../transactions/IgniteTransactionsImpl.java| 4 +- .../cache/transactions/IgniteTxAdapter.java | 72 +-- .../cache/transactions/IgniteTxEntry.java | 48 + .../cache/transactions/IgniteTxHandler.java | 6 - .../transactions/IgniteTxLocalAdapter.java | 165 ++-- .../cache/transactions/IgniteTxLocalEx.java | 21 +- .../cache/transactions/IgniteTxManager.java | 62 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 26 --- .../near/IgniteCacheNearOnlyTxTest.java | 190 +++ .../processors/cache/jta/CacheJtaManager.java | 4 +- 43 files changed, 744 insertions(+), 1110 deletions(-) --
[15/19] incubator-ignite git commit: Merge branch ignite-920 into ignite-sprint-5
Merge branch ignite-920 into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/02d0acd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/02d0acd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/02d0acd1 Branch: refs/heads/ignite-471-2 Commit: 02d0acd1d412914efdaf13c3ac0d798df74083b2 Parents: 26a713c f1b5ecd Author: Alexey Goncharuk Authored: Tue May 19 11:16:12 2015 -0700 Committer: Alexey Goncharuk Committed: Tue May 19 11:16:12 2015 -0700 -- .../apache/ignite/internal/IgniteKernal.java| 26 +++- .../processors/cache/GridCacheIoManager.java| 5 +- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/GridDistributedTxMapping.java | 5 +- .../distributed/dht/GridDhtCacheAdapter.java| 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 -- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 - .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../distributed/near/GridNearCacheEntry.java| 2 +- .../cache/distributed/near/GridNearTxLocal.java | 5 +- .../near/GridNearTxPrepareResponse.java | 28 +++- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 .../cache/IgniteCacheNearLockValueSelfTest.java | 144 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + 17 files changed, 306 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java -- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index 9fd4e88,159a8d8..3fa3d9d --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@@ -153,6 -159,295 +153,8 @@@ public class IgniteCacheTestSuite exten //suite.addTestSuite(GridCacheNearT
[09/19] 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/d3c056e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d3c056e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d3c056e1 Branch: refs/heads/ignite-471-2 Commit: d3c056e153c17629c1b12db593877c3c1fde9798 Parents: b218e78 9c30fba Author: Alexey Goncharuk Authored: Mon May 18 11:07:11 2015 -0700 Committer: Alexey Goncharuk Committed: Mon May 18 11:07:11 2015 -0700 -- DEVNOTES.txt| 6 - assembly/release-base.xml | 4 +- bin/ignite-schema-import.bat| 2 +- bin/ignite-schema-import.sh | 2 +- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/ignitevisorcmd.sh | 2 +- bin/include/build-classpath.bat | 46 ++ bin/include/build-classpath.sh | 71 +++ bin/include/target-classpath.bat| 46 -- bin/include/target-classpath.sh | 71 --- 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 +- .../ignite/codegen/MessageCodeGenerator.java| 4 +- modules/core/pom.xml| 2 +- .../communication/GridIoMessageFactory.java | 4 +- .../cache/DynamicCacheDescriptor.java | 16 +- .../processors/cache/GridCacheAdapter.java | 518 +- .../processors/cache/GridCacheMapEntry.java | 18 +- .../GridCachePartitionExchangeManager.java | 3 + .../processors/cache/GridCacheProcessor.java| 189 --- .../processors/cache/GridCacheTtlManager.java | 42 +- .../processors/cache/GridCacheUtils.java| 5 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 434 --- ...idCacheOptimisticCheckPreparedTxRequest.java | 232 ...dCacheOptimisticCheckPreparedTxResponse.java | 179 --- .../distributed/GridCacheTxRecoveryFuture.java | 506 ++ .../distributed/GridCacheTxRecoveryRequest.java | 261 + .../GridCacheTxRecoveryResponse.java| 182 +++ .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../cache/query/GridCacheSqlQuery.java | 2 +- .../cache/query/GridCacheTwoStepQuery.java | 17 + .../cache/transactions/IgniteInternalTx.java| 5 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 38 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 173 ++ .../datastreamer/DataStreamerImpl.java | 2 + .../processors/igfs/IgfsDataManager.java| 3 + .../processors/igfs/IgfsMetaManager.java| 2 +- .../internal/processors/igfs/IgfsUtils.java | 11 +- .../internal/visor/query/VisorQueryArg.java | 14 +- .../internal/visor/query/VisorQueryJob.java | 2 + .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../resources/META-INF/classnames.properties| 12 +- .../internal/GridUpdateNotifierSelfTest.java| 21 +- .../processors/cache/CacheGetFromJobTest.java | 110 .../GridCacheAbstractFailoverSelfTest.java | 4 +- .../GridCacheAbstractNodeRestartSelfTest.java | 94 ++-- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadSelfTest.java| 2 +- ...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 ++ ...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 ++ ...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 ++ ...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 +++ .../GridCachePartitionedNodeRestartTest.java| 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + .../IgniteCacheExpiryPolicyAbstractTest.java| 2 +- .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../expiry/IgniteCacheTtlCleanupSelfTest.java | 85 +++ .../igfs/IgfsClientCacheSelfTest.java | 132 + .../processors/igfs/IgfsOneClientNodeTest.java | 133 + .../processors/igfs/IgfsStreamsSelfTest.java| 2 +- .../testsuites/IgniteCacheR
[08/19] incubator-ignite git commit: # Minor changes.
# Minor changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba7fddb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba7fddb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba7fddb0
Branch: refs/heads/ignite-471-2
Commit: ba7fddb004a840fdad66bc9fd127eafda27fee2f
Parents: 15d55b1
Author: vozerov-gridgain
Authored: Mon May 18 17:45:38 2015 +0300
Committer: vozerov-gridgain
Committed: Mon May 18 17:45:38 2015 +0300
--
.../ignite/internal/managers/communication/GridIoManager.java | 6 +++---
.../communication/GridLifecycleAwareMessageFilter.java | 5 -
2 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7fddb0/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 16d582b..c877d57 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1697,10 +1697,10 @@ public class GridIoManager extends
GridManagerAdapterhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7fddb0/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
index cb99d2e..f8cd78f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.managers.communication;
+import org.apache.ignite.internal.*;
import org.apache.ignite.lang.*;
/**
@@ -25,8 +26,10 @@ import org.apache.ignite.lang.*;
public interface GridLifecycleAwareMessageFilter extends
IgniteBiPredicate {
/**
* Initializes the filter.
+ *
+ * @param ctx Kernal context.
*/
-public void initialize();
+public void initialize(GridKernalContext ctx);
/**
* Closes the filter.
[05/19] incubator-ignite git commit: GG-7190
GG-7190
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/489323b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/489323b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/489323b0
Branch: refs/heads/ignite-471-2
Commit: 489323b0175f6eba897caf3f40f4f0fcb970df19
Parents: 04774b5f
Author: avinogradov
Authored: Mon May 18 12:54:41 2015 +0300
Committer: avinogradov
Committed: Mon May 18 12:54:41 2015 +0300
--
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java| 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/489323b0/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index 5738778..7fa0a03 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -64,6 +64,7 @@ public class IgniteCacheTestSuite2 extends TestSuite {
suite.addTest(new TestSuite(GridCacheNearMultiNodeSelfTest.class));
suite.addTest(new
TestSuite(GridCacheAtomicNearMultiNodeSelfTest.class));
suite.addTest(new TestSuite(GridCacheNearReadersSelfTest.class));
+suite.addTest(new TestSuite(GridCacheNearReaderPreloadSelfTest.class));
suite.addTest(new TestSuite(GridCacheAtomicNearReadersSelfTest.class));
suite.addTest(new
TestSuite(GridCachePartitionedAffinitySelfTest.class));
suite.addTest(new
TestSuite(GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.class));
[19/19] incubator-ignite git commit: ignite-471-2: fixed grid messaging tests
ignite-471-2: fixed grid messaging tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19d3aac7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19d3aac7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19d3aac7
Branch: refs/heads/ignite-471-2
Commit: 19d3aac7c878255639dbc30a163699b6883b2b00
Parents: 490a252
Author: Denis Magda
Authored: Wed May 20 12:47:49 2015 +0300
Committer: Denis Magda
Committed: Wed May 20 12:47:49 2015 +0300
--
...GridMessagingNoPeerClassLoadingSelfTest.java | 70 ++--
1 file changed, 48 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19d3aac7/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java
index 610ce64..b6a775f 100644
---
a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingNoPeerClassLoadingSelfTest.java
@@ -17,8 +17,10 @@
package org.apache.ignite.messaging;
+import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.resources.*;
import org.apache.ignite.testframework.config.*;
import java.net.*;
@@ -54,37 +56,61 @@ public class GridMessagingNoPeerClassLoadingSelfTest
extends GridMessagingSelfTe
Class rcCls = extLdr.loadClass(EXT_RESOURCE_CLS_NAME);
+MessageListener list = new MessageListener(ignite1);
+
+ignite2.message().remoteListen("", list);
+
+message(ignite1.cluster().forRemotes()).send(null,
Collections.singleton(rcCls.newInstance()));
+
+/*
+We shouldn't get a message, because remote node won't be able to
+unmarshal it (peer class loading is disabled.)
+ */
+assertFalse(list.rcvLatch.await(3, TimeUnit.SECONDS));
+}
+
+/**
+ *
+ */
+private static class MessageListener implements P2 {
+/** */
final AtomicBoolean error = new AtomicBoolean(false); //to make it
modifiable
+/** */
final CountDownLatch rcvLatch = new CountDownLatch(1);
-ignite2.message().remoteListen("", new P2() {
-@Override public boolean apply(UUID nodeId, Object msg) {
-try {
-log.info("Received new message [msg=" + msg + ",
senderNodeId=" + nodeId + ']');
+/** */
+final Ignite sender;
-if (!nodeId.equals(ignite1.cluster().localNode().id())) {
-log.error("Unexpected sender node: " + nodeId);
+/** */
+@LoggerResource
+private transient IgniteLogger log;
-error.set(true);
+/**
+ * @param sender
+ */
+private MessageListener(Ignite sender) {
+this.sender = sender;
+}
-return false;
-}
+/** {@inheritDoc} */
+@Override public boolean apply(UUID nodeId, Object msg) {
+try {
+log.info("Received new message [msg=" + msg + ",
senderNodeId=" + nodeId + ']');
-return true;
-}
-finally {
-rcvLatch.countDown();
-}
-}
-});
+if (!nodeId.equals(sender.cluster().localNode().id())) {
+log.error("Unexpected sender node: " + nodeId);
-message(ignite1.cluster().forRemotes()).send(null,
Collections.singleton(rcCls.newInstance()));
+error.set(true);
-/*
-We shouldn't get a message, because remote node won't be able to
-unmarshal it (peer class loading is disabled.)
- */
-assertFalse(rcvLatch.await(3, TimeUnit.SECONDS));
+return false;
+}
+
+return true;
+}
+finally {
+rcvLatch.countDown();
+}
+}
}
}
[07/19] incubator-ignite git commit: Merge branch 'ignite-timeout' into ignite-sprint-5
Merge branch 'ignite-timeout' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/15d55b1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/15d55b1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/15d55b1a Branch: refs/heads/ignite-471-2 Commit: 15d55b1a5fcaee7c91f450426bc537f3dffd77cf Parents: 36805cc df25d35 Author: nikolay tikhonov Authored: Mon May 18 14:49:20 2015 +0300 Committer: nikolay tikhonov Committed: Mon May 18 14:49:20 2015 +0300 -- .../spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --
[18/19] incubator-ignite git commit: ignite-471-2: GridQueryProcessor fix and other test suites fixes
ignite-471-2: GridQueryProcessor fix and other test suites fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/490a2526
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/490a2526
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/490a2526
Branch: refs/heads/ignite-471-2
Commit: 490a2526906e7d22b1e20da2436f664393dc65f5
Parents: 379c73f
Author: Denis Magda
Authored: Wed May 20 12:38:23 2015 +0300
Committer: Denis Magda
Committed: Wed May 20 12:38:23 2015 +0300
--
.../ignite/messaging/GridMessagingSelfTest.java | 559 +--
.../ignite/testframework/GridTestUtils.java | 16 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 26 +-
.../IgniteMarshallerSelfTestSuite.java | 28 +-
4 files changed, 317 insertions(+), 312 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/490a2526/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
index c033750..36c2a9f 100644
---
a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
@@ -24,7 +24,6 @@ import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -182,8 +181,6 @@ public class GridMessagingSelfTest extends
GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
-
((OptimizedMarshaller)cfg.getMarshaller()).setRequireSerializable(false);
-
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(ipFinder);
@@ -199,34 +196,9 @@ public class GridMessagingSelfTest extends
GridCommonAbstractTest {
* @throws Exception If error occurs.
*/
public void testSendReceiveMessage() throws Exception {
-final Collection rcvMsgs = new GridConcurrentHashSet<>();
-
-final AtomicBoolean error = new AtomicBoolean(false); //to make it
modifiable
-
-final CountDownLatch rcvLatch = new CountDownLatch(3);
-
-ignite1.message().localListen(null, new P2() {
-@Override public boolean apply(UUID nodeId, Object msg) {
-try {
-log.info("Received new message [msg=" + msg + ",
senderNodeId=" + nodeId + ']');
-
-if (!nodeId.equals(ignite2.cluster().localNode().id())) {
-log.error("Unexpected sender node: " + nodeId);
+ReceiveRemoteMessageListener list = new
ReceiveRemoteMessageListener<>(ignite2, 3);
-error.set(true);
-
-return false;
-}
-
-rcvMsgs.add(msg);
-
-return true;
-}
-finally {
-rcvLatch.countDown();
-}
-}
-});
+ignite1.message().localListen(null, list);
ClusterGroup rNode1 = ignite2.cluster().forRemotes();
@@ -234,13 +206,13 @@ public class GridMessagingSelfTest extends
GridCommonAbstractTest {
message(rNode1).send(null, MSG_2);
message(rNode1).send(null, MSG_3);
-assertTrue(rcvLatch.await(3, TimeUnit.SECONDS));
+assertTrue(list.rcvLatch.await(3, TimeUnit.SECONDS));
-assertFalse(error.get());
+assertFalse(list.error.get());
-assertTrue(rcvMsgs.contains(MSG_1));
-assertTrue(rcvMsgs.contains(MSG_2));
-assertTrue(rcvMsgs.contains(MSG_3));
+assertTrue(list.rcvMsgs.contains(MSG_1));
+assertTrue(list.rcvMsgs.contains(MSG_2));
+assertTrue(list.rcvMsgs.contains(MSG_3));
}
/**
@@ -607,24 +579,9 @@ public class GridMessagingSelfTest extends
GridCommonAbstractTest {
* @throws Exception If error occurs.
*/
public void testRemoteListen() throws Exception {
-final Collection rcvMsgs = new GridConcurrentHashSet<>();
-
-final CountDownLatch rcvLatch = new CountDownLatch(4);
+MessageReceiverListener list = new MessageReceiverListener();
-ignite2.message().remoteLis
incubator-ignite git commit: "Version changed
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-5 f9a4dd7f5 -> fa07e18f7 "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/fa07e18f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa07e18f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa07e18f Branch: refs/heads/ignite-sprint-5 Commit: fa07e18f7583a5c4f306056dcba5dfd4fe60ac5d Parents: f9a4dd7 Author: Ignite Teamcity Authored: Wed May 20 13:22:53 2015 +0300 Committer: Ignite Teamcity Committed: Wed May 20 13:22:53 2015 +0300 -- modules/core/src/main/resources/ignite.properties | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa07e18f/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 80bffed..aec41ea 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.4 +ignite.version=1.0.6-SNAPSHOT1.0.6 ignite.build=0 ignite.revision=DEV ignite.rel.date=01011970 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa07e18f/pom.xml -- diff --git a/pom.xml b/pom.xml index 8886c8a..0c6d0ba 100644 --- a/pom.xml +++ b/pom.xml @@ -291,7 +291,7 @@ - + @@ -566,7 +566,7 @@ - +
incubator-ignite git commit: "Version changed
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-5 fa07e18f7 -> c4d81fec5 "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/c4d81fec Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c4d81fec Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c4d81fec Branch: refs/heads/ignite-sprint-5 Commit: c4d81fec5546a748b2a67f6ddeffac2fc8b52d3a Parents: fa07e18 Author: Ignite Teamcity Authored: Wed May 20 13:31:58 2015 +0300 Committer: Ignite Teamcity Committed: Wed May 20 13:31:58 2015 +0300 -- modules/core/src/main/resources/ignite.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4d81fec/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 aec41ea..58aed26 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.6-SNAPSHOT1.0.6 +ignite.version=1.0.6 ignite.build=0 ignite.revision=DEV ignite.rel.date=01011970
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-5-version-test [created] c4d81fec5
incubator-ignite git commit: 1.0.7-SNAPSHOT
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-5-version-test c4d81fec5 -> 80987a288 1.0.7-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/80987a28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/80987a28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/80987a28 Branch: refs/heads/ignite-sprint-5-version-test Commit: 80987a288cfe47c37674ba2f74a2d909e20d9019 Parents: c4d81fe Author: Ignite Teamcity Authored: Wed May 20 13:48:59 2015 +0300 Committer: Ignite Teamcity Committed: Wed May 20 13:48:59 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/core/src/main/resources/ignite.properties | 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 +- 32 files changed, 32 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80987a28/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 064b804..0c53874 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.6-SNAPSHOT +1.0.7-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80987a28/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index a248f85..0f7f3e4 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,7 +31,7 @@ ignite-aop -1.0.6-SNAPSHOT +1.0.7-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80987a28/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index a6604f9..abb89a8 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -31,7 +31,7 @@ ignite-aws -1.0.6-SNAPSHOT +1.0.7-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80987a28/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index 96b6542..2efa860 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -31,7 +31,7 @@ ignite-clients -1.0.6-SNAPSHOT +1.0.7-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80987a28/modules/cloud/pom.xml -- diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml index 25d610e..5c8e07e 100644 --- a/modules/cloud/pom.xml +++ b/modules/cloud/pom.xml @@ -29,7 +29,7 @@ ignite-cloud -1.0.6-SNAPSHOT +1.0.7-SNAPSHOT 1.9.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80987a28/modules/codegen/pom.xml -- diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index e
incubator-ignite git commit: ignite-471-2: fixed data streamer bug
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471-2 19d3aac7c -> 12c6d4a91
ignite-471-2: fixed data streamer bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/12c6d4a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/12c6d4a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/12c6d4a9
Branch: refs/heads/ignite-471-2
Commit: 12c6d4a9120137055c687b75d3bf5964b61c9c91
Parents: 19d3aac
Author: Denis Magda
Authored: Wed May 20 13:46:25 2015 +0300
Committer: Denis Magda
Committed: Wed May 20 13:46:25 2015 +0300
--
.../datastreamer/DataStreamProcessorSelfTest.java| 15 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 14 +-
2 files changed, 24 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c6d4a9/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index 8233b9d..cbf834a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -890,7 +890,7 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
try (IgniteDataStreamer ldr =
ignite.dataStreamer(null)) {
ldr.allowOverwrite(true);
-ldr.receiver(new TestDataReceiver());
+ldr.receiver(getStreamReceiver());
for (int i = 0; i < 100; i++)
ldr.addData(String.valueOf(i), new TestObject(i));
@@ -913,14 +913,14 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
/**
*
*/
-private static class TestObject {
+protected static class TestObject {
/** Value. */
-private final int val;
+public final int val;
/**
* @param val Value.
*/
-private TestObject(int val) {
+public TestObject(int val) {
this.val = val;
}
@@ -946,6 +946,13 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
/**
*
*/
+protected StreamReceiver getStreamReceiver() {
+return new TestDataReceiver();
+}
+
+/**
+ *
+ */
@SuppressWarnings("PublicInnerClass")
public static class TestStore extends CacheStoreAdapter {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c6d4a9/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 3fa3d9d..2dfa1e7 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
@@ -29,6 +29,9 @@ import
org.apache.ignite.internal.processors.cache.distributed.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.distributed.near.*;
import org.apache.ignite.internal.processors.datastreamer.*;
+import org.apache.ignite.testframework.*;
+
+import java.util.*;
/**
* Test suite.
@@ -39,6 +42,15 @@ public class IgniteCacheTestSuite extends TestSuite {
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suite() throws Exception {
+return suite(null);
+}
+
+/**
+ * @param ignoredTests
+ * @return Test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+public static TestSuite suite(Set ignoredTests) throws Exception {
TestSuite suite = new TestSuite("IgniteCache Test Suite");
suite.addTestSuite(IgniteCacheEntryListenerAtomicTest.class);
@@ -107,7 +119,7 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(GridCacheBalancingStoreSelfTest.class);
suite.addTestSuite(GridCacheAffinityApiSelfTest.class);
suite.addTestSuite(GridCacheStoreValueBytesSelfTest.class);
-suite.addTestSuite(DataStreamProcessorSelfTest.class);
+GridTestUtils.addT
incubator-ignite git commit: ignite-471-2: fix
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471-2 12c6d4a91 -> 6c134a06b
ignite-471-2: 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/6c134a06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c134a06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c134a06
Branch: refs/heads/ignite-471-2
Commit: 6c134a06b0e3a293d7c5d057a40973ded3ea7380
Parents: 12c6d4a
Author: Denis Magda
Authored: Wed May 20 14:32:14 2015 +0300
Committer: Denis Magda
Committed: Wed May 20 14:32:14 2015 +0300
--
.../processors/cacheobject/IgniteCacheObjectProcessor.java | 2 +-
.../processors/cacheobject/IgniteCacheObjectProcessorImpl.java | 2 +-
.../processors/datastreamer/DataStreamProcessorSelfTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c134a06/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
index 8d0dd25..c6e85c7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
@@ -80,7 +80,7 @@ public interface IgniteCacheObjectProcessor extends
GridProcessor {
* @param cls Class.
* @return {@code true} If the class was registered as portable.
*/
-public boolean isPortableClass(Class cls);
+public boolean isPortableEnabled();
/**
* @param obj Portable object to get field from.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c134a06/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index a1d3844..1565869 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -229,7 +229,7 @@ public class IgniteCacheObjectProcessorImpl extends
GridProcessorAdapter impleme
}
/** {@inheritDoc} */
-@Override public boolean isPortableClass(Class cls) {
+@Override public boolean isPortableEnabled() {
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c134a06/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index cbf834a..3a1e4b8 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -913,7 +913,7 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
/**
*
*/
-protected static class TestObject {
+public static class TestObject {
/** Value. */
public final int val;
incubator-ignite git commit: ignite-471-2: introduce isPortableEnabled instead of isPortableClass
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471-2 6c134a06b -> c3b53e250
ignite-471-2: introduce isPortableEnabled instead of isPortableClass
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c3b53e25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3b53e25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3b53e25
Branch: refs/heads/ignite-471-2
Commit: c3b53e250aa69dec829f1eee65932c34f572677e
Parents: 6c134a0
Author: Denis Magda
Authored: Wed May 20 14:37:06 2015 +0300
Committer: Denis Magda
Committed: Wed May 20 14:37:06 2015 +0300
--
.../ignite/internal/processors/query/GridQueryProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3b53e25/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 7a3cb68..4843d15 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -135,7 +135,7 @@ public class GridQueryProcessor extends
GridProcessorAdapter {
TypeId typeId;
-if (valCls == null ||
ctx.cacheObjects().isPortableClass(valCls)) {
+if (valCls == null ||
ctx.cacheObjects().isPortableEnabled()) {
processPortableMeta(meta, desc);
typeId = new TypeId(ccfg.getName(),
ctx.cacheObjects().typeId(meta.getValueType()));
incubator-ignite git commit: 1.0.6-SNAPSHOT
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-5-version-test 80987a288 -> 008048170 1.0.6-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00804817 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00804817 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00804817 Branch: refs/heads/ignite-sprint-5-version-test Commit: 00804817067de79967fc2f62257c34639778a878 Parents: 80987a2 Author: Ignite Teamcity Authored: Wed May 20 14:53:22 2015 +0300 Committer: Ignite Teamcity Committed: Wed May 20 14:53:22 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/core/src/main/resources/ignite.properties | 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 +- 32 files changed, 32 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00804817/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 0c53874..064b804 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.7-SNAPSHOT +1.0.6-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00804817/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 0f7f3e4..a248f85 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,7 +31,7 @@ ignite-aop -1.0.7-SNAPSHOT +1.0.6-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00804817/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index abb89a8..a6604f9 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -31,7 +31,7 @@ ignite-aws -1.0.7-SNAPSHOT +1.0.6-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00804817/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index 2efa860..96b6542 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -31,7 +31,7 @@ ignite-clients -1.0.7-SNAPSHOT +1.0.6-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00804817/modules/cloud/pom.xml -- diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml index 5c8e07e..25d610e 100644 --- a/modules/cloud/pom.xml +++ b/modules/cloud/pom.xml @@ -29,7 +29,7 @@ ignite-cloud -1.0.7-SNAPSHOT +1.0.6-SNAPSHOT 1.9.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00804817/modules/codegen/pom.xml -- diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index 6
incubator-ignite git commit: 1.0.8-SNAPSHOT
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-5-version-test 008048170 -> 4a995bf8d 1.0.8-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4a995bf8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4a995bf8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4a995bf8 Branch: refs/heads/ignite-sprint-5-version-test Commit: 4a995bf8d7b654791081902d7c0af97bf938d8d6 Parents: 0080481 Author: Ignite Teamcity Authored: Wed May 20 14:59:03 2015 +0300 Committer: Ignite Teamcity Committed: Wed May 20 14:59:03 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/core/src/main/resources/ignite.properties | 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 +- 32 files changed, 32 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a995bf8/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 064b804..6174cff 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.6-SNAPSHOT +1.0.8-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a995bf8/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index a248f85..df97c68 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,7 +31,7 @@ ignite-aop -1.0.6-SNAPSHOT +1.0.8-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a995bf8/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index a6604f9..5020437 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -31,7 +31,7 @@ ignite-aws -1.0.6-SNAPSHOT +1.0.8-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a995bf8/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index 96b6542..3ea4d52 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -31,7 +31,7 @@ ignite-clients -1.0.6-SNAPSHOT +1.0.8-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a995bf8/modules/cloud/pom.xml -- diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml index 25d610e..6f39cad 100644 --- a/modules/cloud/pom.xml +++ b/modules/cloud/pom.xml @@ -29,7 +29,7 @@ ignite-cloud -1.0.6-SNAPSHOT +1.0.8-SNAPSHOT 1.9.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a995bf8/modules/codegen/pom.xml -- diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index e
incubator-ignite git commit: 1.0.88-SNAPSHOT
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-5-version-test 4a995bf8d -> 1eb08d725 1.0.88-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1eb08d72 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1eb08d72 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1eb08d72 Branch: refs/heads/ignite-sprint-5-version-test Commit: 1eb08d725b498e6cd5488abc6c94951bba688caf Parents: 4a995bf Author: Ignite Teamcity Authored: Wed May 20 15:03:22 2015 +0300 Committer: Ignite Teamcity Committed: Wed May 20 15:03:22 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/core/src/main/resources/ignite.properties | 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 +- 32 files changed, 32 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1eb08d72/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 6174cff..6d56bdc 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.0.8-SNAPSHOT +1.0.88-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1eb08d72/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index df97c68..4781173 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,7 +31,7 @@ ignite-aop -1.0.8-SNAPSHOT +1.0.88-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1eb08d72/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index 5020437..9f10089 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -31,7 +31,7 @@ ignite-aws -1.0.8-SNAPSHOT +1.0.88-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1eb08d72/modules/clients/pom.xml -- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index 3ea4d52..af048a5 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -31,7 +31,7 @@ ignite-clients -1.0.8-SNAPSHOT +1.0.88-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1eb08d72/modules/cloud/pom.xml -- diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml index 6f39cad..70ecc87 100644 --- a/modules/cloud/pom.xml +++ b/modules/cloud/pom.xml @@ -29,7 +29,7 @@ ignite-cloud -1.0.8-SNAPSHOT +1.0.88-SNAPSHOT 1.9.0 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1eb08d72/modules/codegen/pom.xml -- diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml i
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-5-version-test [deleted] 1eb08d725
incubator-ignite git commit: # IGNITE-709 Fix tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709_2 ecf34cae4 -> 9d4d01c31
# IGNITE-709 Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9d4d01c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9d4d01c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9d4d01c3
Branch: refs/heads/ignite-709_2
Commit: 9d4d01c31dbc90f453406ba41ae9b375e014193d
Parents: ecf34ca
Author: sevdokimov
Authored: Wed May 20 15:13:46 2015 +0300
Committer: sevdokimov
Committed: Wed May 20 15:13:46 2015 +0300
--
.../GridDiscoveryManagerAttributesSelfTest.java | 29
.../discovery/GridDiscoveryManagerSelfTest.java | 19 ++---
2 files changed, 27 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d4d01c3/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
index 2698eca..fc953d9 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.managers.discovery;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -38,7 +37,7 @@ public abstract class GridDiscoveryManagerAttributesSelfTest
extends GridCommonA
private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
/** */
-private static DeploymentMode mode = SHARED;
+private static DeploymentMode mode;
/** */
private static boolean p2pEnabled;
@@ -53,12 +52,24 @@ public abstract class
GridDiscoveryManagerAttributesSelfTest extends GridCommonA
cfg.setIncludeProperties(PREFER_IPV4);
cfg.setDeploymentMode(mode);
cfg.setPeerClassLoadingEnabled(p2pEnabled);
-cfg.setDiscoverySpi(createDiscovery(cfg));
+
+TcpDiscoverySpiAdapter discoverySpi = createDiscovery(cfg);
+
+discoverySpi.setIpFinder(IP_FINDER);
+
+cfg.setDiscoverySpi(discoverySpi);
return cfg;
}
/** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+mode = SHARED;
+
+p2pEnabled = false;
+}
+
+/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
}
@@ -67,12 +78,8 @@ public abstract class GridDiscoveryManagerAttributesSelfTest
extends GridCommonA
* @return Discovery SPI.
* @param cfg DiscoverySpi
*/
-protected DiscoverySpi createDiscovery(IgniteConfiguration cfg) {
-TcpDiscoverySpi disc = new TcpDiscoverySpi();
-
-disc.setIpFinder(IP_FINDER);
-
-return disc;
+protected TcpDiscoverySpiAdapter createDiscovery(IgniteConfiguration cfg) {
+return new TcpDiscoverySpi();
}
/**
@@ -180,9 +187,9 @@ public abstract class
GridDiscoveryManagerAttributesSelfTest extends GridCommonA
public static class ClientDiscovery extends
GridDiscoveryManagerAttributesSelfTest {
/** {@inheritDoc}
* @param cfg*/
-@Override protected DiscoverySpi createDiscovery(IgniteConfiguration
cfg) {
+@Override protected TcpDiscoverySpiAdapter
createDiscovery(IgniteConfiguration cfg) {
if (Boolean.TRUE.equals(cfg.isClientMode()))
-return createClientDiscovery(IP_FINDER);
+return new TcpClientDiscoverySpi();
return super.createDiscovery(cfg);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d4d01c3/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java
index 2fdc084..5f5bddb 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridD
incubator-ignite git commit: IGNITE-927 Revisit license packaging
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-4 4423a4655 -> 736791283 IGNITE-927 Revisit license packaging IGNITE-926 Revisit artifacts namings Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/73679128 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/73679128 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/73679128 Branch: refs/heads/ignite-sprint-4 Commit: 736791283c016fed5957f6cc64d1645e480e Parents: 4423a46 Author: avinogradov Authored: Wed May 20 15:40:18 2015 +0300 Committer: avinogradov Committed: Wed May 20 15:40:18 2015 +0300 -- modules/ssh/licenses/jcraft-revised-bsd.txt | 28 modules/tools/licenses/jodd-revised-bsd.txt | 21 --- .../licenses/jcraft-revised-bsd.txt | 28 pom.xml | 6 ++--- 4 files changed, 3 insertions(+), 80 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73679128/modules/ssh/licenses/jcraft-revised-bsd.txt -- diff --git a/modules/ssh/licenses/jcraft-revised-bsd.txt b/modules/ssh/licenses/jcraft-revised-bsd.txt deleted file mode 100644 index 3748f98..000 --- a/modules/ssh/licenses/jcraft-revised-bsd.txt +++ /dev/null @@ -1,28 +0,0 @@ -3-clause BSD license --- -Copyright (c) 2002-2014 Atsuhiko Yamanaka, JCraft,Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the distribution. - - 3. The names of the authors may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73679128/modules/tools/licenses/jodd-revised-bsd.txt -- diff --git a/modules/tools/licenses/jodd-revised-bsd.txt b/modules/tools/licenses/jodd-revised-bsd.txt deleted file mode 100644 index 129f3f0..000 --- a/modules/tools/licenses/jodd-revised-bsd.txt +++ /dev/null @@ -1,21 +0,0 @@ -Jodd software is released under Revised BSD License. - -Copyright (c) 2003-2014, Jodd Team All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -Neither the name of the Jodd nor the names of its contributors may be used to endorse or promote products derived from this software without specific -prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHE
[01/28] incubator-ignite git commit: IGNITE-80 - Porting changes to a separate branch.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-456 41915f546 -> e9b94d516
IGNITE-80 - Porting changes to a separate branch.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dcda61b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dcda61b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dcda61b4
Branch: refs/heads/ignite-456
Commit: dcda61b4fe2be3005544a3fc915b19ac3e4c9598
Parents: 1e53395
Author: Alexey Goncharuk
Authored: Wed Apr 29 14:08:05 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed Apr 29 14:08:05 2015 -0700
--
.../processors/cache/GridCacheIoManager.java| 5 +--
.../GridCachePartitionExchangeManager.java | 4 +-
.../distributed/dht/GridDhtCacheAdapter.java| 6 ++-
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++---
.../colocated/GridDhtColocatedLockFuture.java | 4 +-
.../cache/transactions/IgniteTxManager.java | 24 +++
8 files changed, 101 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcda61b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index b8668e6..112330a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -146,9 +146,8 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
c = clsHandlers.get(new ListenerKey(cacheMsg.cacheId(),
cacheMsg.getClass()));
if (c == null) {
-if (log.isDebugEnabled())
-log.debug("Received message without registered handler (will
ignore) [msg=" + cacheMsg +
-", nodeId=" + nodeId + ']');
+U.warn(log, "Received message without registered handler (will
ignore) [msg=" + cacheMsg +
+", nodeId=" + nodeId + ']');
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcda61b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 5f82ae2..e61168e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -409,10 +409,10 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
* @param ver Topology version.
* @return Future or {@code null} is future is already completed.
*/
-public @Nullable IgniteInternalFuture
affinityReadyFuture(AffinityTopologyVersion ver) {
+@Nullable public IgniteInternalFuture
affinityReadyFuture(AffinityTopologyVersion ver) {
GridDhtPartitionsExchangeFuture lastInitializedFut0 =
lastInitializedFut;
-if (lastInitializedFut0 != null &&
lastInitializedFut0.topologyVersion().compareTo(ver) >= 0) {
+if (lastInitializedFut0 != null &&
lastInitializedFut0.topologyVersion().compareTo(ver) == 0) {
if (log.isDebugEnabled())
log.debug("Return lastInitializedFut for topology ready future
" +
"[ver=" + ver + ", fut=" + lastInitializedFut0 + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcda61b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 1c46fd0..4d1db85 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++
b/modules/core/src/main/java/org/apa
[02/28] incubator-ignite git commit: IGNITE-80 - Merge branch 'ignite-80-1' into ignite-sprint-4
IGNITE-80 - Merge branch 'ignite-80-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/5de74fe6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5de74fe6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5de74fe6 Branch: refs/heads/ignite-456 Commit: 5de74fe6d7f3837310cfd9f4f9e5d2636560e182 Parents: 81ce0e6 dcda61b Author: Alexey Goncharuk Authored: Wed Apr 29 22:49:14 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Apr 29 22:49:14 2015 -0700 -- .../processors/cache/GridCacheIoManager.java| 5 +-- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java| 6 ++- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++--- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 +++ 8 files changed, 101 insertions(+), 24 deletions(-) --
[16/28] incubator-ignite git commit: Merge branch 'ignite-timeout' into ignite-sprint-5
Merge branch 'ignite-timeout' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/15d55b1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/15d55b1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/15d55b1a Branch: refs/heads/ignite-456 Commit: 15d55b1a5fcaee7c91f450426bc537f3dffd77cf Parents: 36805cc df25d35 Author: nikolay tikhonov Authored: Mon May 18 14:49:20 2015 +0300 Committer: nikolay tikhonov Committed: Mon May 18 14:49:20 2015 +0300 -- .../spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --
[23/28] incubator-ignite git commit: GG-9614 Interop .Net: Implement GridEvents API. - done
GG-9614 Interop .Net: Implement GridEvents API. - done
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26a713c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26a713c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26a713c8
Branch: refs/heads/ignite-456
Commit: 26a713c84b96bb0d89b802bd2ab3cd1319da0e2c
Parents: 3f7a80a
Author: ptupitsyn
Authored: Tue May 19 18:26:20 2015 +0300
Committer: ptupitsyn
Committed: Tue May 19 18:26:20 2015 +0300
--
.../internal/GridEventConsumeHandler.java | 26 ++
.../interop/InteropAwareEventFilter.java| 37
.../interop/InteropLocalEventListener.java | 28 +++
.../eventstorage/GridEventStorageManager.java | 24 -
4 files changed, 114 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26a713c8/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index c60646e..505204d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
+import org.apache.ignite.internal.interop.*;
import org.apache.ignite.internal.managers.deployment.*;
import org.apache.ignite.internal.managers.discovery.*;
import org.apache.ignite.internal.managers.eventstorage.*;
@@ -124,6 +125,9 @@ class GridEventConsumeHandler implements
GridContinuousHandler {
if (filter != null)
ctx.resource().injectGeneric(filter);
+if (filter instanceof InteropAwareEventFilter)
+((InteropAwareEventFilter)filter).initialize(ctx);
+
final boolean loc = nodeId.equals(ctx.localNodeId());
lsnr = new GridLocalEventListener() {
@@ -188,6 +192,28 @@ class GridEventConsumeHandler implements
GridContinuousHandler {
if (lsnr != null)
ctx.event().removeLocalEventListener(lsnr, types);
+
+RuntimeException err = null;
+
+try {
+if (filter instanceof InteropAwareEventFilter)
+((InteropAwareEventFilter)filter).close();
+}
+catch(RuntimeException ex) {
+err = ex;
+}
+
+try {
+if (cb instanceof InteropLocalEventListener)
+((InteropLocalEventListener)cb).close();
+}
+catch (RuntimeException ex) {
+if (err == null)
+err = ex;
+}
+
+if (err != null)
+throw err;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26a713c8/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
new file mode 100644
index 000..8dbc73b
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.interop;
+
+import org.apache.ignite.events.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.lang.*;
+
+/**
+ * Special version of predicate for events with initialize/close callbacks.
+ */
+public interface InteropAwareEventFilter extends
IgnitePredicate {
+/**
+ * Initializes the filter.
+
[17/28] incubator-ignite git commit: # Minor changes.
# Minor changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba7fddb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba7fddb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba7fddb0
Branch: refs/heads/ignite-456
Commit: ba7fddb004a840fdad66bc9fd127eafda27fee2f
Parents: 15d55b1
Author: vozerov-gridgain
Authored: Mon May 18 17:45:38 2015 +0300
Committer: vozerov-gridgain
Committed: Mon May 18 17:45:38 2015 +0300
--
.../ignite/internal/managers/communication/GridIoManager.java | 6 +++---
.../communication/GridLifecycleAwareMessageFilter.java | 5 -
2 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7fddb0/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 16d582b..c877d57 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1697,10 +1697,10 @@ public class GridIoManager extends
GridManagerAdapterhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7fddb0/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
index cb99d2e..f8cd78f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.managers.communication;
+import org.apache.ignite.internal.*;
import org.apache.ignite.lang.*;
/**
@@ -25,8 +26,10 @@ import org.apache.ignite.lang.*;
public interface GridLifecycleAwareMessageFilter extends
IgniteBiPredicate {
/**
* Initializes the filter.
+ *
+ * @param ctx Kernal context.
*/
-public void initialize();
+public void initialize(GridKernalContext ctx);
/**
* Closes the filter.
[27/28] 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/c4d81fec Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c4d81fec Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c4d81fec Branch: refs/heads/ignite-456 Commit: c4d81fec5546a748b2a67f6ddeffac2fc8b52d3a Parents: fa07e18 Author: Ignite Teamcity Authored: Wed May 20 13:31:58 2015 +0300 Committer: Ignite Teamcity Committed: Wed May 20 13:31:58 2015 +0300 -- modules/core/src/main/resources/ignite.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4d81fec/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 aec41ea..58aed26 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.6-SNAPSHOT1.0.6 +ignite.version=1.0.6 ignite.build=0 ignite.revision=DEV ignite.rel.date=01011970
[03/28] 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/b218e78a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b218e78a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b218e78a Branch: refs/heads/ignite-456 Commit: b218e78adb72d759e646a1042f44fa19b44cf09e Parents: 5de74fe 54f9492 Author: Alexey Goncharuk Authored: Tue May 5 11:17:56 2015 -0700 Committer: Alexey Goncharuk Committed: Tue May 5 11:17:56 2015 -0700 -- DEVNOTES.txt| 2 +- assembly/release-base.xml | 2 + assembly/release-schema-import.xml | 50 .../streaming/wordcount/CacheConfig.java| 5 - .../config/grid-client-config.properties| 50 ++-- .../ClientPropertiesConfigurationSelfTest.java | 12 +- .../java/org/apache/ignite/IgniteCache.java | 5 + .../org/apache/ignite/IgniteJdbcDriver.java | 81 --- .../client/GridClientConfiguration.java | 2 +- .../managers/communication/GridIoManager.java | 8 +- .../processors/cache/GridCacheTtlManager.java | 168 +- .../processors/cache/GridCacheUtils.java| 5 +- .../apache/ignite/lang/IgniteAsyncSupport.java | 4 +- .../discovery/tcp/TcpClientDiscoverySpi.java| 4 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 - .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- ...CacheLoadingConcurrentGridStartSelfTest.java | 154 + ...GridCacheLoadingConcurrentGridStartTest.java | 154 - .../tcp/TcpClientDiscoverySelfTest.java | 8 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- modules/schema-import/pom.xml | 6 +- pom.xml | 227 --- 23 files changed, 625 insertions(+), 340 deletions(-) --
[12/28] incubator-ignite git commit: # IGNITE-915: Implemented.
# IGNITE-915: 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/c3dde572
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3dde572
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3dde572
Branch: refs/heads/ignite-456
Commit: c3dde5726a84645d6d08b69099c644d250d0dbcb
Parents: 2149639
Author: vozerov-gridgain
Authored: Mon May 18 11:27:44 2015 +0300
Committer: vozerov-gridgain
Committed: Mon May 18 11:27:44 2015 +0300
--
.../internal/interop/InteropIgnition.java | 65 +++-
.../internal/interop/InteropProcessor.java | 13 +++-
2 files changed, 76 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3dde572/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
index f245122..3ccd361 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
@@ -25,6 +25,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
+import java.lang.ref.*;
import java.net.*;
import java.security.*;
import java.util.*;
@@ -52,9 +53,19 @@ public class InteropIgnition {
InteropBootstrap bootstrap = bootstrap(factoryId);
-return bootstrap.start(cfg, envPtr);
+InteropProcessor proc = bootstrap.start(cfg, envPtr);
+
+trackFinalization(proc);
+
+return proc;
}
+/**
+ * Create configuration.
+ *
+ * @param springCfgPath Path to Spring XML.
+ * @return Configuration.
+ */
private static IgniteConfiguration configuration(@Nullable String
springCfgPath) {
try {
URL url = springCfgPath == null ?
U.resolveIgniteUrl(IgnitionEx.DFLT_CFG) :
@@ -95,6 +106,58 @@ public class InteropIgnition {
}
/**
+ * Track processor finalization.
+ *
+ * @param proc Processor.
+ */
+private static void trackFinalization(InteropProcessor proc) {
+Thread thread = new Thread(new Finalizer(proc));
+
+thread.setDaemon(true);
+
+thread.start();
+}
+
+/**
+ * Finalizer runnable.
+ */
+private static class Finalizer implements Runnable {
+/** Queue where we expect notification to appear. */
+private final ReferenceQueue queue;
+
+/** Phantom reference to processor. */
+private final PhantomReference proc;
+
+/** Cleanup runnable. */
+private final Runnable cleanup;
+
+/**
+ * Constructor.
+ *
+ * @param proc Processor.
+ */
+public Finalizer(InteropProcessor proc) {
+queue = new ReferenceQueue<>();
+
+this.proc = new PhantomReference<>(proc, queue);
+
+cleanup = proc.cleanupCallback();
+}
+
+/** {@inheritDoc} */
+@Override public void run() {
+try {
+queue.remove(0);
+
+cleanup.run();
+}
+catch (InterruptedException ignore) {
+// No-op.
+}
+}
+}
+
+/**
* Private constructor.
*/
private InteropIgnition() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3dde572/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
index 6c55296..aa4f877 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
@@ -17,9 +17,20 @@
package org.apache.ignite.internal.interop;
+import org.jetbrains.annotations.*;
+
/**
* Interop processor.
*/
public interface InteropProcessor {
-// No-op.
+/**
+ * Get stop runnable to perform cleanup when interop is not longer used.
+ *
+ * NOTE! This runnable is called when current instance of interop
processor is eligible for garbage
+ * collection. Therefore you should never store any references to
Ignite internal inside it. Otherwise
+ * this runnable will never be called.
+ *
+ * @return Stop
[07/28] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/94e202aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/94e202aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/94e202aa Branch: refs/heads/ignite-456 Commit: 94e202aa7046de67a2c0e0da4230d424e1c95705 Parents: ee40819 15aa1cf Author: Yakov Zhdanov Authored: Fri May 15 17:53:29 2015 +0300 Committer: Yakov Zhdanov Committed: Fri May 15 17:53:29 2015 +0300 -- .../org/apache/ignite/internal/IgnitionEx.java | 136 ++- .../internal/interop/InteropBootstrap.java | 34 + .../interop/InteropBootstrapFactory.java| 39 ++ .../internal/interop/InteropIgnition.java | 103 ++ .../internal/interop/InteropProcessor.java | 25 5 files changed, 240 insertions(+), 97 deletions(-) --
[20/28] incubator-ignite git commit: IGNITE-920 - Trigger TC.
IGNITE-920 - Trigger TC.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1b5ecd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1b5ecd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1b5ecd1
Branch: refs/heads/ignite-456
Commit: f1b5ecd16dd2315bab79944f192dbf9a1113b81b
Parents: a927eb2
Author: Alexey Goncharuk
Authored: Mon May 18 14:22:54 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon May 18 14:22:54 2015 -0700
--
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1b5ecd1/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 2d9828a..ffd264d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -118,7 +118,7 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
@GridToStringExclude
private GridKernalContextImpl ctx;
-/** */
+/** Configuration. */
private IgniteConfiguration cfg;
/** */
[09/28] incubator-ignite git commit: #ignite-797: Remove 'groupLock' logic from cache code.
#ignite-797: Remove 'groupLock' logic from cache 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/da5a2282
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/da5a2282
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/da5a2282
Branch: refs/heads/ignite-456
Commit: da5a2282edc8e32d58d504d4ce96d5e88ab046e5
Parents: 94e202a
Author: ivasilinets
Authored: Fri May 15 18:04:23 2015 +0300
Committer: ivasilinets
Committed: Fri May 15 18:04:23 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 8 +-
.../processors/cache/GridCacheMapEntry.java | 35 +---
.../distributed/GridDistributedLockRequest.java | 111 +++--
.../GridDistributedTxFinishRequest.java | 70 ++--
.../GridDistributedTxPrepareRequest.java| 112 +++--
.../GridDistributedTxRemoteAdapter.java | 20 +--
.../distributed/dht/GridDhtLockFuture.java | 2 -
.../distributed/dht/GridDhtLockRequest.java | 45 +++--
.../dht/GridDhtTransactionalCacheAdapter.java | 6 -
.../distributed/dht/GridDhtTxFinishFuture.java | 3 -
.../distributed/dht/GridDhtTxFinishRequest.java | 43 +++--
.../cache/distributed/dht/GridDhtTxLocal.java | 6 -
.../distributed/dht/GridDhtTxLocalAdapter.java | 68 +---
.../distributed/dht/GridDhtTxPrepareFuture.java | 18 +-
.../dht/GridDhtTxPrepareRequest.java| 60 ---
.../cache/distributed/dht/GridDhtTxRemote.java | 8 +-
.../colocated/GridDhtColocatedLockFuture.java | 6 -
.../distributed/near/GridNearLockFuture.java| 6 -
.../distributed/near/GridNearLockRequest.java | 61 +++
.../near/GridNearOptimisticTxPrepareFuture.java | 15 +-
.../GridNearPessimisticTxPrepareFuture.java | 2 -
.../near/GridNearTransactionalCache.java| 4 -
.../near/GridNearTxFinishRequest.java | 28 ++--
.../cache/distributed/near/GridNearTxLocal.java | 20 +--
.../near/GridNearTxPrepareRequest.java | 52 +++---
.../distributed/near/GridNearTxRemote.java | 24 +--
.../cache/transactions/IgniteInternalTx.java| 10 --
.../transactions/IgniteTransactionsImpl.java| 4 +-
.../cache/transactions/IgniteTxAdapter.java | 72 +---
.../cache/transactions/IgniteTxEntry.java | 48 +-
.../cache/transactions/IgniteTxHandler.java | 6 -
.../transactions/IgniteTxLocalAdapter.java | 165 ++-
.../cache/transactions/IgniteTxLocalEx.java | 21 +--
.../cache/transactions/IgniteTxManager.java | 62 +--
.../processors/cache/jta/CacheJtaManager.java | 4 +-
35 files changed, 239 insertions(+), 986 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da5a2282/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 4106cb0..8d7b135 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -3906,9 +3906,7 @@ public abstract class GridCacheAdapter implements
IgniteInternalCache implements
IgniteInternalCachehttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da5a2282/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 86ed57a..92035af 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -961,13 +961,8 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx {
synchronized (this) {
checkObsolete();
-if (cctx.kernalContext().config().isCacheSanityCheckEnabled()) {
-if (tx != null && tx.groupLock())
-groupLockSanityCheck(tx);
-else
-assert tx == null || (!tx.local() && tx.onePhaseCommit())
|| tx.ownsLock(this) :
-"Transaction does not own lock for update [entry=" +
this + ", tx=" + tx + ']';
-}
+assert tx == null || (!tx.local() && tx.onePh
[11/28] incubator-ignite git commit: # added test
# 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/2149639d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2149639d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2149639d
Branch: refs/heads/ignite-456
Commit: 2149639dd360ad6f180e16d23dbe878b05cc730a
Parents: a27a35d
Author: sboikov
Authored: Sat May 16 06:59:51 2015 +0300
Committer: sboikov
Committed: Sat May 16 06:59:51 2015 +0300
--
.../near/IgniteCacheNearOnlyTxTest.java | 52 +++-
1 file changed, 51 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2149639d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
index 06a4bfc..88e7f03 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
@@ -20,6 +20,7 @@ package
org.apache.ignite.internal.processors.cache.distributed.near;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.testframework.*;
import org.apache.ignite.transactions.*;
@@ -77,7 +78,7 @@ public class IgniteCacheNearOnlyTxTest extends
IgniteCacheAbstractTest {
ignite1.createNearCache(null, new NearCacheConfiguration<>());
-GridTestUtils.runMultiThreaded(new Callable() {
+GridTestUtils.runMultiThreadedAsync(new Callable() {
@Override public Object call() throws Exception {
IgniteCache cache = ignite1.cache(null);
@@ -137,4 +138,53 @@ public class IgniteCacheNearOnlyTxTest extends
IgniteCacheAbstractTest {
}
}, 5, "put-thread");
}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testConcurrentTx() throws Exception {
+final Ignite ignite1 = ignite(1);
+
+assertTrue(ignite1.configuration().isClientMode());
+
+ignite1.createNearCache(null, new NearCacheConfiguration<>());
+
+IgniteInternalFuture fut1 = GridTestUtils.runMultiThreadedAsync(new
Callable() {
+@Override public Object call() throws Exception {
+IgniteCache cache = ignite1.cache(null);
+
+int key = 1;
+
+for (int i = 0; i < 100; i++)
+cache.put(key, 1);
+
+return null;
+}
+}, 5, "put1-thread");
+
+IgniteInternalFuture fut2 = GridTestUtils.runMultiThreadedAsync(new
Callable() {
+@Override public Object call() throws Exception {
+IgniteCache cache = ignite1.cache(null);
+
+int key = 1;
+
+IgniteTransactions txs = ignite1.transactions();
+
+for (int i = 0; i < 100; i++) {
+try (Transaction tx = txs.txStart(PESSIMISTIC,
REPEATABLE_READ)) {
+cache.get(key);
+
+cache.put(key, 1);
+
+tx.commit();
+}
+}
+
+return null;
+}
+}, 5, "put2-thread");
+
+fut1.get();
+fut2.get();
+}
}
[06/28] incubator-ignite git commit: # removed cleaning of IpFinder by coordinator on topology changes.
# removed cleaning of IpFinder by coordinator on topology changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ee408190
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ee408190
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ee408190
Branch: refs/heads/ignite-456
Commit: ee40819088fe3724ad7e7cad66d501d7db237102
Parents: 7fa8abc
Author: Yakov Zhdanov
Authored: Fri May 15 17:53:28 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri May 15 17:53:28 2015 +0300
--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 26
1 file changed, 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee408190/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 1dea37a..ed0e9dd 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -3952,18 +3952,6 @@ public class TcpDiscoverySpi extends
TcpDiscoverySpiAdapter implements TcpDiscov
long topVer;
if (locNodeCoord) {
-if (!msg.client() && ipFinder.isShared()) {
-try {
-
ipFinder.unregisterAddresses(leftNode.socketAddresses());
-}
-catch (IgniteSpiException e) {
-if (log.isDebugEnabled())
-log.debug("Failed to unregister left node
address: " + leftNode);
-
-onException("Failed to unregister left node
address: " + leftNode, e);
-}
-}
-
topVer = ring.incrementTopologyVersion();
msg.topologyVersion(topVer);
@@ -4131,20 +4119,6 @@ public class TcpDiscoverySpi extends
TcpDiscoverySpiAdapter implements TcpDiscov
long topVer;
if (locNodeCoord) {
-if (!node.isClient() && ipFinder.isShared()) {
-try {
-
ipFinder.unregisterAddresses(node.socketAddresses());
-}
-catch (IgniteSpiException e) {
-if (log.isDebugEnabled())
-log.debug("Failed to unregister failed node
address [node=" + node +
-", err=" + e.getMessage() + ']');
-
-onException("Failed to unregister failed node
address [node=" + node +
-", err=" + e.getMessage() + ']', e);
-}
-}
-
topVer = ring.incrementTopologyVersion();
msg.topologyVersion(topVer);
[19/28] incubator-ignite git commit: IGNITE-920 - Fixed value sending in near cache.
IGNITE-920 - Fixed value sending in near cache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a927eb29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a927eb29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a927eb29
Branch: refs/heads/ignite-456
Commit: a927eb29276796831ead8e9351e30947c4480bf8
Parents: d3c056e
Author: Alexey Goncharuk
Authored: Mon May 18 11:38:49 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon May 18 11:38:49 2015 -0700
--
.../apache/ignite/internal/IgniteKernal.java| 24 +++-
.../distributed/GridDistributedTxMapping.java | 5 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 1 +
.../distributed/near/GridNearCacheEntry.java| 2 +-
.../cache/distributed/near/GridNearTxLocal.java | 5 +-
.../near/GridNearTxPrepareFuture.java | 10 +-
.../near/GridNearTxPrepareResponse.java | 28 +++-
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../cache/IgniteCacheNearLockValueSelfTest.java | 144 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
10 files changed, 212 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a927eb29/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index d98b023..2d9828a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2297,7 +2297,8 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(), null,
false).get();
+if (ctx.cache().cache(cacheCfg.getName()) == null)
+ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(),
null, false).get();
return ctx.cache().publicJCache(cacheCfg.getName());
}
@@ -2341,7 +2342,14 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(),
nearCfg, false).get();
+IgniteInternalCache cache =
ctx.cache().cache(cacheCfg.getName());
+
+if (cache == null)
+ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(),
nearCfg, false).get();
+else {
+if (cache.configuration().getNearConfiguration() == null)
+ctx.cache().dynamicStartCache(cacheCfg,
cacheCfg.getName(), nearCfg, false).get();
+}
return ctx.cache().publicJCache(cacheCfg.getName());
}
@@ -2380,7 +2388,14 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().dynamicStartCache(null, cacheName, nearCfg,
false).get();
+IgniteInternalCache internalCache =
ctx.cache().cache(cacheName);
+
+if (internalCache == null)
+ctx.cache().dynamicStartCache(null, cacheName, nearCfg,
false).get();
+else {
+if (internalCache.configuration().getNearConfiguration() ==
null)
+ctx.cache().dynamicStartCache(null, cacheName, nearCfg,
false).get();
+}
return ctx.cache().publicJCache(cacheName);
}
@@ -2418,7 +2433,8 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().getOrCreateFromTemplate(cacheName).get();
+if (ctx.cache().cache(cacheName) == null)
+ctx.cache().getOrCreateFromTemplate(cacheName).get();
return ctx.cache().publicJCache(cacheName);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a927eb29/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
index 58c7725..fded3c9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/d
[05/28] 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/7fa8abcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7fa8abcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7fa8abcc
Branch: refs/heads/ignite-456
Commit: 7fa8abcc8aee3fe038cb28e7666b49de6b7be796
Parents: 04774b5f
Author: Yakov Zhdanov
Authored: Fri May 15 17:52:38 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri May 15 17:52:38 2015 +0300
--
.../streaming/wordcount/socket/WordsSocketStreamerServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7fa8abcc/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
index 6a8911c..9e68096 100644
---
a/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
+++
b/examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/socket/WordsSocketStreamerServer.java
@@ -114,7 +114,7 @@ public class WordsSocketStreamerServer {
sockStmr.start();
}
catch (IgniteException e) {
-System.out.println("Streaming server didn't start due to an error:
");
+System.err.println("Streaming server didn't start due to an error:
");
e.printStackTrace();
[10/28] incubator-ignite git commit: # added test
# 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/a27a35d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a27a35d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a27a35d8
Branch: refs/heads/ignite-456
Commit: a27a35d8bfd4954b5f6b912e2d5dd54f75c31f3c
Parents: da5a228
Author: sboikov
Authored: Sat May 16 06:56:15 2015 +0300
Committer: sboikov
Committed: Sat May 16 06:56:15 2015 +0300
--
.../near/IgniteCacheNearOnlyTxTest.java | 140 +++
1 file changed, 140 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a27a35d8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
new file mode 100644
index 000..06a4bfc
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearOnlyTxTest.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.transactions.*;
+
+import java.util.concurrent.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.transactions.TransactionConcurrency.*;
+import static org.apache.ignite.transactions.TransactionIsolation.*;
+
+/**
+ *
+ */
+public class IgniteCacheNearOnlyTxTest extends IgniteCacheAbstractTest {
+/** {@inheritDoc} */
+@Override protected int gridCount() {
+return 2;
+}
+
+/** {@inheritDoc} */
+@Override protected CacheMode cacheMode() {
+return CacheMode.PARTITIONED;
+}
+
+/** {@inheritDoc} */
+@Override protected CacheAtomicityMode atomicityMode() {
+return TRANSACTIONAL;
+}
+
+/** {@inheritDoc} */
+@Override protected NearCacheConfiguration nearConfiguration() {
+return null;
+}
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+if (getTestGridName(1).equals(gridName)) {
+cfg.setClientMode(true);
+
+cfg.setCacheConfiguration();
+}
+
+return cfg;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testNearOnlyPutMultithreaded() throws Exception {
+final Ignite ignite1 = ignite(1);
+
+assertTrue(ignite1.configuration().isClientMode());
+
+ignite1.createNearCache(null, new NearCacheConfiguration<>());
+
+GridTestUtils.runMultiThreaded(new Callable() {
+@Override public Object call() throws Exception {
+IgniteCache cache = ignite1.cache(null);
+
+int key = 1;
+
+for (int i = 0; i < 100; i++)
+cache.put(key, 1);
+
+return null;
+}
+}, 5, "put-thread");
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testOptimisticTx() throws Exception {
+txMultithreaded(true);
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testPessimisticTx() throws Exception {
+txMultithreaded(false);
+}
+
+/**
+ * @throws Exception If failed.
+ */
+private void txMultithreaded(final boolean optimistic) throws Exception {
+final Ignite ignite1 = ignite(1);
+
+
[26/28] 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/fa07e18f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa07e18f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa07e18f Branch: refs/heads/ignite-456 Commit: fa07e18f7583a5c4f306056dcba5dfd4fe60ac5d Parents: f9a4dd7 Author: Ignite Teamcity Authored: Wed May 20 13:22:53 2015 +0300 Committer: Ignite Teamcity Committed: Wed May 20 13:22:53 2015 +0300 -- modules/core/src/main/resources/ignite.properties | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa07e18f/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 80bffed..aec41ea 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.4 +ignite.version=1.0.6-SNAPSHOT1.0.6 ignite.build=0 ignite.revision=DEV ignite.rel.date=01011970 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa07e18f/pom.xml -- diff --git a/pom.xml b/pom.xml index 8886c8a..0c6d0ba 100644 --- a/pom.xml +++ b/pom.xml @@ -291,7 +291,7 @@ - + @@ -566,7 +566,7 @@ - +
[18/28] 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/d3c056e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d3c056e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d3c056e1 Branch: refs/heads/ignite-456 Commit: d3c056e153c17629c1b12db593877c3c1fde9798 Parents: b218e78 9c30fba Author: Alexey Goncharuk Authored: Mon May 18 11:07:11 2015 -0700 Committer: Alexey Goncharuk Committed: Mon May 18 11:07:11 2015 -0700 -- DEVNOTES.txt| 6 - assembly/release-base.xml | 4 +- bin/ignite-schema-import.bat| 2 +- bin/ignite-schema-import.sh | 2 +- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/ignitevisorcmd.sh | 2 +- bin/include/build-classpath.bat | 46 ++ bin/include/build-classpath.sh | 71 +++ bin/include/target-classpath.bat| 46 -- bin/include/target-classpath.sh | 71 --- 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 +- .../ignite/codegen/MessageCodeGenerator.java| 4 +- modules/core/pom.xml| 2 +- .../communication/GridIoMessageFactory.java | 4 +- .../cache/DynamicCacheDescriptor.java | 16 +- .../processors/cache/GridCacheAdapter.java | 518 +- .../processors/cache/GridCacheMapEntry.java | 18 +- .../GridCachePartitionExchangeManager.java | 3 + .../processors/cache/GridCacheProcessor.java| 189 --- .../processors/cache/GridCacheTtlManager.java | 42 +- .../processors/cache/GridCacheUtils.java| 5 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 434 --- ...idCacheOptimisticCheckPreparedTxRequest.java | 232 ...dCacheOptimisticCheckPreparedTxResponse.java | 179 --- .../distributed/GridCacheTxRecoveryFuture.java | 506 ++ .../distributed/GridCacheTxRecoveryRequest.java | 261 + .../GridCacheTxRecoveryResponse.java| 182 +++ .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../cache/query/GridCacheSqlQuery.java | 2 +- .../cache/query/GridCacheTwoStepQuery.java | 17 + .../cache/transactions/IgniteInternalTx.java| 5 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 38 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 173 ++ .../datastreamer/DataStreamerImpl.java | 2 + .../processors/igfs/IgfsDataManager.java| 3 + .../processors/igfs/IgfsMetaManager.java| 2 +- .../internal/processors/igfs/IgfsUtils.java | 11 +- .../internal/visor/query/VisorQueryArg.java | 14 +- .../internal/visor/query/VisorQueryJob.java | 2 + .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../resources/META-INF/classnames.properties| 12 +- .../internal/GridUpdateNotifierSelfTest.java| 21 +- .../processors/cache/CacheGetFromJobTest.java | 110 .../GridCacheAbstractFailoverSelfTest.java | 4 +- .../GridCacheAbstractNodeRestartSelfTest.java | 94 ++-- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadSelfTest.java| 2 +- ...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 ++ ...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 ++ ...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 ++ ...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 +++ .../GridCachePartitionedNodeRestartTest.java| 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + .../IgniteCacheExpiryPolicyAbstractTest.java| 2 +- .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../expiry/IgniteCacheTtlCleanupSelfTest.java | 85 +++ .../igfs/IgfsClientCacheSelfTest.java | 132 + .../processors/igfs/IgfsOneClientNodeTest.java | 133 + .../processors/igfs/IgfsStreamsSelfTest.java| 2 +- .../testsuites/IgniteCacheRes
[14/28] incubator-ignite git commit: GG-7190
GG-7190
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/489323b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/489323b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/489323b0
Branch: refs/heads/ignite-456
Commit: 489323b0175f6eba897caf3f40f4f0fcb970df19
Parents: 04774b5f
Author: avinogradov
Authored: Mon May 18 12:54:41 2015 +0300
Committer: avinogradov
Committed: Mon May 18 12:54:41 2015 +0300
--
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java| 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/489323b0/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index 5738778..7fa0a03 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -64,6 +64,7 @@ public class IgniteCacheTestSuite2 extends TestSuite {
suite.addTest(new TestSuite(GridCacheNearMultiNodeSelfTest.class));
suite.addTest(new
TestSuite(GridCacheAtomicNearMultiNodeSelfTest.class));
suite.addTest(new TestSuite(GridCacheNearReadersSelfTest.class));
+suite.addTest(new TestSuite(GridCacheNearReaderPreloadSelfTest.class));
suite.addTest(new TestSuite(GridCacheAtomicNearReadersSelfTest.class));
suite.addTest(new
TestSuite(GridCachePartitionedAffinitySelfTest.class));
suite.addTest(new
TestSuite(GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.class));
[25/28] incubator-ignite git commit: Merge branch ignite-920 into ignite-sprint-5
Merge branch ignite-920 into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9a4dd7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9a4dd7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9a4dd7f
Branch: refs/heads/ignite-456
Commit: f9a4dd7f580abc3d66630531bb66c3bf4d75d1d8
Parents: 02d0acd
Author: Alexey Goncharuk
Authored: Tue May 19 11:16:27 2015 -0700
Committer: Alexey Goncharuk
Committed: Tue May 19 11:16:27 2015 -0700
--
.../internal/processors/cache/GridCacheIoManager.java | 1 +
.../distributed/near/GridNearTxPrepareFutureAdapter.java| 9 +++--
.../processors/cache/IgniteCacheNearLockValueSelfTest.java | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index d5dd492..02f16c0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -487,6 +487,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
req.futureId(),
req.miniId(),
req.version(),
+req.version(),
null, null, null);
res.error(req.classError());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index 60b918c..b7a2fee 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -214,10 +214,15 @@ public abstract class GridNearTxPrepareFutureAdapter
extends GridCompoundIdentit
}
if (!m.empty()) {
+GridCacheVersion writeVer = res.writeVersion();
+
+if (writeVer == null)
+writeVer = res.dhtVersion();
+
// Register DHT version.
-tx.addDhtVersion(m.node().id(), res.dhtVersion());
+tx.addDhtVersion(m.node().id(), res.dhtVersion(), writeVer);
-m.dhtVersion(res.dhtVersion());
+m.dhtVersion(res.dhtVersion(), writeVer);
if (m.near())
tx.readyNearLocks(m, res.pending(), res.committedVersions(),
res.rolledbackVersions());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
index fe60331..5cc9d04 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
[22/28] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f7a80a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f7a80a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f7a80a2 Branch: refs/heads/ignite-456 Commit: 3f7a80a26ee06723f75bbb7247f4ce04d4586038 Parents: ba7fddb 4423a46 Author: avinogradov Authored: Tue May 19 16:42:46 2015 +0300 Committer: avinogradov Committed: Tue May 19 16:42:46 2015 +0300 -- LICENSE | 238 + LICENSE.txt | 238 - NOTICE| 12 +++ NOTICE.txt| 12 --- assembly/release-base.xml | 4 +- 5 files changed, 252 insertions(+), 252 deletions(-) --
[21/28] incubator-ignite git commit: Filenames fix
Filenames 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/4423a465 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4423a465 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4423a465 Branch: refs/heads/ignite-456 Commit: 4423a4655c03936bb48fb70b713240aefa3f4219 Parents: 9c30fba Author: avinogradov Authored: Tue May 19 16:42:08 2015 +0300 Committer: avinogradov Committed: Tue May 19 16:42:08 2015 +0300 -- LICENSE | 238 + LICENSE.txt | 238 - NOTICE| 12 +++ NOTICE.txt| 12 --- assembly/release-base.xml | 4 +- 5 files changed, 252 insertions(+), 252 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4423a465/LICENSE -- diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..7649b39 --- /dev/null +++ b/LICENSE @@ -0,0 +1,238 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + world
[24/28] incubator-ignite git commit: Merge branch ignite-920 into ignite-sprint-5
Merge branch ignite-920 into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/02d0acd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/02d0acd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/02d0acd1 Branch: refs/heads/ignite-456 Commit: 02d0acd1d412914efdaf13c3ac0d798df74083b2 Parents: 26a713c f1b5ecd Author: Alexey Goncharuk Authored: Tue May 19 11:16:12 2015 -0700 Committer: Alexey Goncharuk Committed: Tue May 19 11:16:12 2015 -0700 -- .../apache/ignite/internal/IgniteKernal.java| 26 +++- .../processors/cache/GridCacheIoManager.java| 5 +- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/GridDistributedTxMapping.java | 5 +- .../distributed/dht/GridDhtCacheAdapter.java| 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 -- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 - .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../distributed/near/GridNearCacheEntry.java| 2 +- .../cache/distributed/near/GridNearTxLocal.java | 5 +- .../near/GridNearTxPrepareResponse.java | 28 +++- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 .../cache/IgniteCacheNearLockValueSelfTest.java | 144 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + 17 files changed, 306 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java -- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index 9fd4e88,159a8d8..3fa3d9d --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@@ -153,6 -159,295 +153,8 @@@ public class IgniteCacheTestSuite exten //suite.addTestSuite(GridCacheNearTxE
[13/28] incubator-ignite git commit: Changed default timeout: SocketWrite - 200 AckTimeout - 50 HeartbeatFrequency -100 NetworkTimeout - 5000
Changed default timeout: SocketWrite - 200 AckTimeout - 50 HeartbeatFrequency -100 NetworkTimeout - 5000 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/df25d350 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/df25d350 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/df25d350 Branch: refs/heads/ignite-456 Commit: df25d35067beb8d5f40c97139eac0c06310b Parents: c3dde57 Author: nikolay_tikhonov Authored: Mon May 18 11:41:41 2015 +0300 Committer: nikolay_tikhonov Committed: Mon May 18 11:41:41 2015 +0300 -- .../spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df25d350/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java index b7e3cd5..802da02 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java @@ -54,17 +54,17 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov /** Default socket operations timeout in milliseconds (value is 200ms). */ public static final long DFLT_SOCK_TIMEOUT = 200; -/** Default timeout for receiving message acknowledgement in milliseconds (value is 200ms). */ -public static final long DFLT_ACK_TIMEOUT = 200; +/** Default timeout for receiving message acknowledgement in milliseconds (value is 50ms). */ +public static final long DFLT_ACK_TIMEOUT = 50; -/** Default network timeout in milliseconds (value is 200ms). */ -public static final long DFLT_NETWORK_TIMEOUT = 200; +/** Default network timeout in milliseconds (value is 5000ms). */ +public static final long DFLT_NETWORK_TIMEOUT = 5000; /** Default value for thread priority (value is 10). */ public static final int DFLT_THREAD_PRI = 10; -/** Default heartbeat messages issuing frequency (value is 300ms). */ -public static final long DFLT_HEARTBEAT_FREQ = 300; +/** Default heartbeat messages issuing frequency (value is 100ms). */ +public static final long DFLT_HEARTBEAT_FREQ = 100; /** Default size of topology snapshots history. */ public static final int DFLT_TOP_HISTORY_SIZE = 1000;
[28/28] incubator-ignite git commit: Merge branch 'ignite-sprint-5' into ignite-456
Merge branch 'ignite-sprint-5' into ignite-456 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e9b94d51 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e9b94d51 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e9b94d51 Branch: refs/heads/ignite-456 Commit: e9b94d5160f198b639029a824cc2c76d8b0443aa Parents: 41915f5 c4d81fe Author: null Authored: Wed May 20 15:41:09 2015 +0300 Committer: null Committed: Wed May 20 15:41:09 2015 +0300 -- LICENSE | 238 +++ LICENSE.txt | 238 --- NOTICE | 12 + NOTICE.txt | 12 - assembly/release-base.xml | 4 +- .../socket/WordsSocketStreamerServer.java | 2 +- .../internal/GridEventConsumeHandler.java | 26 ++ .../apache/ignite/internal/IgniteKernal.java| 26 +- .../org/apache/ignite/internal/IgnitionEx.java | 136 +++ .../interop/InteropAwareEventFilter.java| 37 +++ .../internal/interop/InteropBootstrap.java | 34 +++ .../interop/InteropBootstrapFactory.java| 39 +++ .../internal/interop/InteropIgnition.java | 166 + .../interop/InteropLocalEventListener.java | 28 +++ .../internal/interop/InteropProcessor.java | 36 +++ .../managers/communication/GridIoManager.java | 6 +- .../GridLifecycleAwareMessageFilter.java| 5 +- .../eventstorage/GridEventStorageManager.java | 24 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheIoManager.java| 6 +- .../processors/cache/GridCacheMapEntry.java | 35 +-- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/GridDistributedLockRequest.java | 111 ++--- .../GridDistributedTxFinishRequest.java | 70 ++ .../distributed/GridDistributedTxMapping.java | 5 +- .../GridDistributedTxPrepareRequest.java| 112 ++--- .../GridDistributedTxRemoteAdapter.java | 20 +- .../distributed/dht/GridDhtCacheAdapter.java| 6 +- .../distributed/dht/GridDhtLockFuture.java | 2 - .../distributed/dht/GridDhtLockRequest.java | 45 ++-- .../dht/GridDhtTransactionalCacheAdapter.java | 6 - .../distributed/dht/GridDhtTxFinishFuture.java | 3 - .../distributed/dht/GridDhtTxFinishRequest.java | 43 ++-- .../cache/distributed/dht/GridDhtTxLocal.java | 6 - .../distributed/dht/GridDhtTxLocalAdapter.java | 68 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 19 +- .../dht/GridDhtTxPrepareRequest.java| 60 +++-- .../cache/distributed/dht/GridDhtTxRemote.java | 8 +- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++- .../colocated/GridDhtColocatedLockFuture.java | 10 +- .../distributed/near/GridNearCacheEntry.java| 2 +- .../distributed/near/GridNearLockFuture.java| 6 - .../distributed/near/GridNearLockRequest.java | 61 +++-- .../near/GridNearOptimisticTxPrepareFuture.java | 15 +- .../GridNearPessimisticTxPrepareFuture.java | 2 - .../near/GridNearTransactionalCache.java| 4 - .../near/GridNearTxFinishRequest.java | 28 +-- .../cache/distributed/near/GridNearTxLocal.java | 25 +- .../near/GridNearTxPrepareFutureAdapter.java| 9 +- .../near/GridNearTxPrepareRequest.java | 52 ++-- .../near/GridNearTxPrepareResponse.java | 28 ++- .../distributed/near/GridNearTxRemote.java | 24 +- .../cache/transactions/IgniteInternalTx.java| 10 - .../transactions/IgniteTransactionsImpl.java| 4 +- .../cache/transactions/IgniteTxAdapter.java | 72 +- .../cache/transactions/IgniteTxEntry.java | 48 +--- .../cache/transactions/IgniteTxHandler.java | 6 - .../transactions/IgniteTxLocalAdapter.java | 169 ++--- .../cache/transactions/IgniteTxLocalEx.java | 21 +- .../cache/transactions/IgniteTxManager.java | 86 +++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 26 -- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 12 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 145 +++ .../near/IgniteCacheNearOnlyTxTest.java | 190 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../testsuites/IgniteCacheTestSuite2.java | 1 + .../processors/cache/jta/CacheJtaManager.java | 4 +- pom.xml | 4 +- 71 files changed, 1442 insertions(+), 1414 deletions(-)
[08/28] incubator-ignite git commit: #ignite-797: Remove 'groupLock' logic from cache code.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da5a2282/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 1ba4bfe..e71dd65 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -21,7 +21,6 @@ import org.apache.ignite.*;
import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.distributed.*;
-import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.processors.cache.version.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -105,8 +104,6 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
* @param keyCnt Number of keys.
* @param txSize Expected transaction size.
* @param syncCommit Synchronous commit flag.
- * @param grpLockKey Group lock key if this is a group-lock transaction.
- * @param partLock If partition is locked.
* @param subjId Subject ID.
* @param taskNameHash Task name hash code.
* @param accessTtl TTL for read operation.
@@ -130,8 +127,6 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
int keyCnt,
int txSize,
boolean syncCommit,
-@Nullable IgniteTxKey grpLockKey,
-boolean partLock,
@Nullable UUID subjId,
int taskNameHash,
long accessTtl,
@@ -151,8 +146,6 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
timeout,
keyCnt,
txSize,
-grpLockKey,
-partLock,
skipStore);
assert topVer.compareTo(AffinityTopologyVersion.ZERO) > 0;
@@ -356,79 +349,79 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
}
switch (writer.state()) {
-case 23:
+case 21:
if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
-case 24:
+case 22:
if (!writer.writeObjectArray("dhtVers", dhtVers,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
-case 25:
+case 23:
if (!writer.writeObjectArray("filter", filter,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
-case 26:
+case 24:
if (!writer.writeBoolean("hasTransforms", hasTransforms))
return false;
writer.incrementState();
-case 27:
+case 25:
if (!writer.writeBoolean("implicitSingleTx", implicitSingleTx))
return false;
writer.incrementState();
-case 28:
+case 26:
if (!writer.writeBoolean("implicitTx", implicitTx))
return false;
writer.incrementState();
-case 29:
+case 27:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
-case 30:
+case 28:
if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit))
return false;
writer.incrementState();
-case 31:
+case 29:
if (!writer.writeBoolean("retVal", retVal))
return false;
writer.incrementState();
-case 32:
+case 30:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
-case 33:
+case 31:
if (!writer.writeBoolean("syncCommit", syncCommit))
return false;
writer.incrementState();
-case 34:
+case 32:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
-case 35:
+case 33:
if (!writer.writeMessage("topVer", topVer))
return fals
[04/28] incubator-ignite git commit: # IGNITE-904: Implemented interop start routine.
# IGNITE-904: Implemented interop start routine.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/15aa1cfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/15aa1cfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/15aa1cfa
Branch: refs/heads/ignite-456
Commit: 15aa1cfac4bd30c1d613c941d5afc994f34aa8e3
Parents: 04774b5f
Author: vozerov-gridgain
Authored: Fri May 15 17:28:34 2015 +0300
Committer: vozerov-gridgain
Committed: Fri May 15 17:28:34 2015 +0300
--
.../org/apache/ignite/internal/IgnitionEx.java | 136 ++-
.../internal/interop/InteropBootstrap.java | 34 +
.../interop/InteropBootstrapFactory.java| 39 ++
.../internal/interop/InteropIgnition.java | 103 ++
.../internal/interop/InteropProcessor.java | 25
5 files changed, 240 insertions(+), 97 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15aa1cfa/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 8d88677..d54e06f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -532,22 +532,6 @@ public class IgnitionEx {
}
/**
- * Start Grid passing a closure which will modify configuration before it
is passed to start routine.
- *
- * @param springCfgPath Spring config path.
- * @param gridName Grid name.
- * @param cfgClo Configuration closure.
- * @return Started Grid.
- * @throws IgniteCheckedException If failed.
- */
-public static Ignite startWithClosure(@Nullable String springCfgPath,
@Nullable String gridName,
-IgniteClosure cfgClo) throws
IgniteCheckedException {
-URL url = U.resolveSpringUrl(springCfgPath);
-
-return start(url, gridName, null, cfgClo);
-}
-
-/**
* Loads all grid configurations specified within given Spring XML
configuration file.
*
* Usually Spring XML configuration file will contain only one Grid
definition. Note that
@@ -734,7 +718,40 @@ public class IgnitionEx {
*/
public static Ignite start(URL springCfgUrl, @Nullable String gridName,
@Nullable GridSpringResourceContext springCtx) throws
IgniteCheckedException {
-return start(springCfgUrl, gridName, springCtx, null);
+A.notNull(springCfgUrl, "springCfgUrl");
+
+boolean isLog4jUsed =
U.gridClassLoader().getResource("org/apache/log4j/Appender.class") != null;
+
+IgniteBiTuple t = null;
+
+if (isLog4jUsed) {
+try {
+t = U.addLog4jNoOpLogger();
+}
+catch (IgniteCheckedException ignore) {
+isLog4jUsed = false;
+}
+}
+
+Collection savedHnds = null;
+
+if (!isLog4jUsed)
+savedHnds = U.addJavaNoOpLogger();
+
+IgniteBiTuple, ? extends
GridSpringResourceContext> cfgMap;
+
+try {
+cfgMap = loadConfigurations(springCfgUrl);
+}
+finally {
+if (isLog4jUsed && t != null)
+U.removeLog4jNoOpLogger(t);
+
+if (!isLog4jUsed)
+U.removeJavaNoOpLogger(savedHnds);
+}
+
+return startConfigurations(cfgMap, springCfgUrl, gridName, springCtx);
}
/**
@@ -780,73 +797,6 @@ public class IgnitionEx {
*/
public static Ignite start(InputStream springCfgStream, @Nullable String
gridName,
@Nullable GridSpringResourceContext springCtx) throws
IgniteCheckedException {
-return start(springCfgStream, gridName, springCtx, null);
-}
-
-/**
- * Internal Spring-based start routine.
- *
- * @param springCfgUrl Spring XML configuration file URL. This cannot be
{@code null}.
- * @param gridName Grid name that will override default.
- * @param springCtx Optional Spring application context.
- * @param cfgClo Optional closure to change configuration before it is
used to start the grid.
- * @return Started grid.
- * @throws IgniteCheckedException If failed.
- */
-private static Ignite start(final URL springCfgUrl, @Nullable String
gridName,
-@Nullable GridSpringResourceContext springCtx,
-@Nullable IgniteClosure
cfgClo)
-throws IgniteCheckedException {
-A.notNull(springCfgUrl, "springCfgUrl");
-
-boolean isLog4jUsed =
U.gridClassLoader().getResource("org/apache/log4j/Appender.class") != null
[15/28] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36805cc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36805cc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36805cc1 Branch: refs/heads/ignite-456 Commit: 36805cc1dd157b343301ff4661bbdf3db5b596ff Parents: 489323b c3dde57 Author: avinogradov Authored: Mon May 18 12:55:06 2015 +0300 Committer: avinogradov Committed: Mon May 18 12:55:06 2015 +0300 -- .../socket/WordsSocketStreamerServer.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 136 - .../internal/interop/InteropBootstrap.java | 34 .../interop/InteropBootstrapFactory.java| 39 .../internal/interop/InteropIgnition.java | 166 .../internal/interop/InteropProcessor.java | 36 .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 35 +--- .../distributed/GridDistributedLockRequest.java | 111 ++- .../GridDistributedTxFinishRequest.java | 70 ++- .../GridDistributedTxPrepareRequest.java| 112 +++ .../GridDistributedTxRemoteAdapter.java | 20 +- .../distributed/dht/GridDhtLockFuture.java | 2 - .../distributed/dht/GridDhtLockRequest.java | 45 ++--- .../dht/GridDhtTransactionalCacheAdapter.java | 6 - .../distributed/dht/GridDhtTxFinishFuture.java | 3 - .../distributed/dht/GridDhtTxFinishRequest.java | 43 ++--- .../cache/distributed/dht/GridDhtTxLocal.java | 6 - .../distributed/dht/GridDhtTxLocalAdapter.java | 68 +-- .../distributed/dht/GridDhtTxPrepareFuture.java | 18 +- .../dht/GridDhtTxPrepareRequest.java| 60 +++--- .../cache/distributed/dht/GridDhtTxRemote.java | 8 +- .../colocated/GridDhtColocatedLockFuture.java | 6 - .../distributed/near/GridNearLockFuture.java| 6 - .../distributed/near/GridNearLockRequest.java | 61 +++--- .../near/GridNearOptimisticTxPrepareFuture.java | 15 +- .../GridNearPessimisticTxPrepareFuture.java | 2 - .../near/GridNearTransactionalCache.java| 4 - .../near/GridNearTxFinishRequest.java | 28 +-- .../cache/distributed/near/GridNearTxLocal.java | 20 +- .../near/GridNearTxPrepareRequest.java | 52 +++-- .../distributed/near/GridNearTxRemote.java | 24 +-- .../cache/transactions/IgniteInternalTx.java| 10 - .../transactions/IgniteTransactionsImpl.java| 4 +- .../cache/transactions/IgniteTxAdapter.java | 72 +-- .../cache/transactions/IgniteTxEntry.java | 48 + .../cache/transactions/IgniteTxHandler.java | 6 - .../transactions/IgniteTxLocalAdapter.java | 165 ++-- .../cache/transactions/IgniteTxLocalEx.java | 21 +- .../cache/transactions/IgniteTxManager.java | 62 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 26 --- .../near/IgniteCacheNearOnlyTxTest.java | 190 +++ .../processors/cache/jta/CacheJtaManager.java | 4 +- 43 files changed, 744 insertions(+), 1110 deletions(-) --
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-456 [deleted] e9b94d516
incubator-ignite git commit: # ignite-456: Implemented
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-5 c4d81fec5 -> 3cc3fbe31
# ignite-456: 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/3cc3fbe3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3cc3fbe3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3cc3fbe3
Branch: refs/heads/ignite-sprint-5
Commit: 3cc3fbe3168acaf49e691ffe74d780239968b311
Parents: c4d81fe
Author: null
Authored: Wed May 20 15:45:33 2015 +0300
Committer: null
Committed: Wed May 20 15:45:33 2015 +0300
--
dev-tools/build.gradle | 35 +-
dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 51017 bytes
.../gradle/wrapper/gradle-wrapper.properties| 6 +
dev-tools/gradlew | 164 ++
dev-tools/src/main/groovy/jiraslurp.groovy | 326 ++-
parent/pom.xml | 4 +
6 files changed, 442 insertions(+), 93 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/build.gradle
--
diff --git a/dev-tools/build.gradle b/dev-tools/build.gradle
index b760bc1..164a775 100644
--- a/dev-tools/build.gradle
+++ b/dev-tools/build.gradle
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
apply plugin: 'groovy'
repositories {
@@ -25,21 +26,29 @@ dependencies {
}
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'''
+println '''There are 3 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
+- to run all test builds for a single JIRA's latest attachment and run
test validation on it
+ JIRA_NUM=INGITE-### gradle runAllBuilds'''
+}
+
+task slurp(dependsOn: 'classes', type: JavaExec) {
+args(project.buildDir, "slurp,${System.getenv('TEST_BUILDS')}")
+main = 'jiraslurp'
+classpath = sourceSets.main.runtimeClasspath
}
-task slurp (dependsOn: 'classes', type: JavaExec) {
- args (project.buildDir, 'slurp')
- main = 'jiraslurp'
- classpath = sourceSets.main.runtimeClasspath
+task patchapply(dependsOn: 'classes', type: JavaExec) {
+args("patchApply,${System.getenv('JIRA_NUM')}")
+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
+task runAllBuilds(dependsOn: 'classes', type: JavaExec) {
+args("runAllBuilds,${System.getenv('JIRA_NUM')}")
+main = 'jiraslurp'
+classpath = sourceSets.main.runtimeClasspath
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/gradle/wrapper/gradle-wrapper.jar
--
diff --git a/dev-tools/gradle/wrapper/gradle-wrapper.jar
b/dev-tools/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000..b761216
Binary files /dev/null and b/dev-tools/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/gradle/wrapper/gradle-wrapper.properties
--
diff --git a/dev-tools/gradle/wrapper/gradle-wrapper.properties
b/dev-tools/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000..3111cd7
--- /dev/null
+++ b/dev-tools/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Feb 24 21:36:05 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/gradlew
--
diff --git a/dev-tools/gradlew b/dev-tools/gradlew
new file mode 100755
index 000..91a7e26
--- /dev/null
+++ b/dev-tools/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##
+##
+## Gradle start up script for UN*X
+##
+###
[05/15] incubator-ignite git commit: IGNITE-920 - Fixed value sending in near cache.
IGNITE-920 - Fixed value sending in near cache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a927eb29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a927eb29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a927eb29
Branch: refs/heads/ignite-gg-10249
Commit: a927eb29276796831ead8e9351e30947c4480bf8
Parents: d3c056e
Author: Alexey Goncharuk
Authored: Mon May 18 11:38:49 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon May 18 11:38:49 2015 -0700
--
.../apache/ignite/internal/IgniteKernal.java| 24 +++-
.../distributed/GridDistributedTxMapping.java | 5 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 1 +
.../distributed/near/GridNearCacheEntry.java| 2 +-
.../cache/distributed/near/GridNearTxLocal.java | 5 +-
.../near/GridNearTxPrepareFuture.java | 10 +-
.../near/GridNearTxPrepareResponse.java | 28 +++-
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../cache/IgniteCacheNearLockValueSelfTest.java | 144 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
10 files changed, 212 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a927eb29/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index d98b023..2d9828a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2297,7 +2297,8 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(), null,
false).get();
+if (ctx.cache().cache(cacheCfg.getName()) == null)
+ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(),
null, false).get();
return ctx.cache().publicJCache(cacheCfg.getName());
}
@@ -2341,7 +2342,14 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(),
nearCfg, false).get();
+IgniteInternalCache cache =
ctx.cache().cache(cacheCfg.getName());
+
+if (cache == null)
+ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(),
nearCfg, false).get();
+else {
+if (cache.configuration().getNearConfiguration() == null)
+ctx.cache().dynamicStartCache(cacheCfg,
cacheCfg.getName(), nearCfg, false).get();
+}
return ctx.cache().publicJCache(cacheCfg.getName());
}
@@ -2380,7 +2388,14 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().dynamicStartCache(null, cacheName, nearCfg,
false).get();
+IgniteInternalCache internalCache =
ctx.cache().cache(cacheName);
+
+if (internalCache == null)
+ctx.cache().dynamicStartCache(null, cacheName, nearCfg,
false).get();
+else {
+if (internalCache.configuration().getNearConfiguration() ==
null)
+ctx.cache().dynamicStartCache(null, cacheName, nearCfg,
false).get();
+}
return ctx.cache().publicJCache(cacheName);
}
@@ -2418,7 +2433,8 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
guard();
try {
-ctx.cache().getOrCreateFromTemplate(cacheName).get();
+if (ctx.cache().cache(cacheName) == null)
+ctx.cache().getOrCreateFromTemplate(cacheName).get();
return ctx.cache().publicJCache(cacheName);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a927eb29/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
index 58c7725..fded3c9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/ca
[06/15] incubator-ignite git commit: IGNITE-920 - Trigger TC.
IGNITE-920 - Trigger TC.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1b5ecd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1b5ecd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1b5ecd1
Branch: refs/heads/ignite-gg-10249
Commit: f1b5ecd16dd2315bab79944f192dbf9a1113b81b
Parents: a927eb2
Author: Alexey Goncharuk
Authored: Mon May 18 14:22:54 2015 -0700
Committer: Alexey Goncharuk
Committed: Mon May 18 14:22:54 2015 -0700
--
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1b5ecd1/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 2d9828a..ffd264d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -118,7 +118,7 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
@GridToStringExclude
private GridKernalContextImpl ctx;
-/** */
+/** Configuration. */
private IgniteConfiguration cfg;
/** */
[03/15] 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/b218e78a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b218e78a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b218e78a Branch: refs/heads/ignite-gg-10249 Commit: b218e78adb72d759e646a1042f44fa19b44cf09e Parents: 5de74fe 54f9492 Author: Alexey Goncharuk Authored: Tue May 5 11:17:56 2015 -0700 Committer: Alexey Goncharuk Committed: Tue May 5 11:17:56 2015 -0700 -- DEVNOTES.txt| 2 +- assembly/release-base.xml | 2 + assembly/release-schema-import.xml | 50 .../streaming/wordcount/CacheConfig.java| 5 - .../config/grid-client-config.properties| 50 ++-- .../ClientPropertiesConfigurationSelfTest.java | 12 +- .../java/org/apache/ignite/IgniteCache.java | 5 + .../org/apache/ignite/IgniteJdbcDriver.java | 81 --- .../client/GridClientConfiguration.java | 2 +- .../managers/communication/GridIoManager.java | 8 +- .../processors/cache/GridCacheTtlManager.java | 168 +- .../processors/cache/GridCacheUtils.java| 5 +- .../apache/ignite/lang/IgniteAsyncSupport.java | 4 +- .../discovery/tcp/TcpClientDiscoverySpi.java| 4 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 - .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- ...CacheLoadingConcurrentGridStartSelfTest.java | 154 + ...GridCacheLoadingConcurrentGridStartTest.java | 154 - .../tcp/TcpClientDiscoverySelfTest.java | 8 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- modules/schema-import/pom.xml | 6 +- pom.xml | 227 --- 23 files changed, 625 insertions(+), 340 deletions(-) --
[10/15] incubator-ignite git commit: Merge branch ignite-920 into ignite-sprint-5
Merge branch ignite-920 into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/02d0acd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/02d0acd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/02d0acd1 Branch: refs/heads/ignite-gg-10249 Commit: 02d0acd1d412914efdaf13c3ac0d798df74083b2 Parents: 26a713c f1b5ecd Author: Alexey Goncharuk Authored: Tue May 19 11:16:12 2015 -0700 Committer: Alexey Goncharuk Committed: Tue May 19 11:16:12 2015 -0700 -- .../apache/ignite/internal/IgniteKernal.java| 26 +++- .../processors/cache/GridCacheIoManager.java| 5 +- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/GridDistributedTxMapping.java | 5 +- .../distributed/dht/GridDhtCacheAdapter.java| 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 -- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 - .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../distributed/near/GridNearCacheEntry.java| 2 +- .../cache/distributed/near/GridNearTxLocal.java | 5 +- .../near/GridNearTxPrepareResponse.java | 28 +++- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 .../cache/IgniteCacheNearLockValueSelfTest.java | 144 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + 17 files changed, 306 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02d0acd1/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java -- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index 9fd4e88,159a8d8..3fa3d9d --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@@ -153,6 -159,295 +153,8 @@@ public class IgniteCacheTestSuite exten //suite.addTestSuite(GridCacheNe
[14/15] incubator-ignite git commit: # ignite-456: Implemented
# ignite-456: 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/3cc3fbe3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3cc3fbe3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3cc3fbe3
Branch: refs/heads/ignite-gg-10249
Commit: 3cc3fbe3168acaf49e691ffe74d780239968b311
Parents: c4d81fe
Author: null
Authored: Wed May 20 15:45:33 2015 +0300
Committer: null
Committed: Wed May 20 15:45:33 2015 +0300
--
dev-tools/build.gradle | 35 +-
dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 51017 bytes
.../gradle/wrapper/gradle-wrapper.properties| 6 +
dev-tools/gradlew | 164 ++
dev-tools/src/main/groovy/jiraslurp.groovy | 326 ++-
parent/pom.xml | 4 +
6 files changed, 442 insertions(+), 93 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/build.gradle
--
diff --git a/dev-tools/build.gradle b/dev-tools/build.gradle
index b760bc1..164a775 100644
--- a/dev-tools/build.gradle
+++ b/dev-tools/build.gradle
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
apply plugin: 'groovy'
repositories {
@@ -25,21 +26,29 @@ dependencies {
}
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'''
+println '''There are 3 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
+- to run all test builds for a single JIRA's latest attachment and run
test validation on it
+ JIRA_NUM=INGITE-### gradle runAllBuilds'''
+}
+
+task slurp(dependsOn: 'classes', type: JavaExec) {
+args(project.buildDir, "slurp,${System.getenv('TEST_BUILDS')}")
+main = 'jiraslurp'
+classpath = sourceSets.main.runtimeClasspath
}
-task slurp (dependsOn: 'classes', type: JavaExec) {
- args (project.buildDir, 'slurp')
- main = 'jiraslurp'
- classpath = sourceSets.main.runtimeClasspath
+task patchapply(dependsOn: 'classes', type: JavaExec) {
+args("patchApply,${System.getenv('JIRA_NUM')}")
+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
+task runAllBuilds(dependsOn: 'classes', type: JavaExec) {
+args("runAllBuilds,${System.getenv('JIRA_NUM')}")
+main = 'jiraslurp'
+classpath = sourceSets.main.runtimeClasspath
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/gradle/wrapper/gradle-wrapper.jar
--
diff --git a/dev-tools/gradle/wrapper/gradle-wrapper.jar
b/dev-tools/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000..b761216
Binary files /dev/null and b/dev-tools/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/gradle/wrapper/gradle-wrapper.properties
--
diff --git a/dev-tools/gradle/wrapper/gradle-wrapper.properties
b/dev-tools/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000..3111cd7
--- /dev/null
+++ b/dev-tools/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Feb 24 21:36:05 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/gradlew
--
diff --git a/dev-tools/gradlew b/dev-tools/gradlew
new file mode 100755
index 000..91a7e26
--- /dev/null
+++ b/dev-tools/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##
+##
+## Gradle start up script for UN*X
+##
+##
+
+# Add default JVM options here. You ca
[12/15] 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/fa07e18f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa07e18f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa07e18f Branch: refs/heads/ignite-gg-10249 Commit: fa07e18f7583a5c4f306056dcba5dfd4fe60ac5d Parents: f9a4dd7 Author: Ignite Teamcity Authored: Wed May 20 13:22:53 2015 +0300 Committer: Ignite Teamcity Committed: Wed May 20 13:22:53 2015 +0300 -- modules/core/src/main/resources/ignite.properties | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa07e18f/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 80bffed..aec41ea 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.4 +ignite.version=1.0.6-SNAPSHOT1.0.6 ignite.build=0 ignite.revision=DEV ignite.rel.date=01011970 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa07e18f/pom.xml -- diff --git a/pom.xml b/pom.xml index 8886c8a..0c6d0ba 100644 --- a/pom.xml +++ b/pom.xml @@ -291,7 +291,7 @@ - + @@ -566,7 +566,7 @@ - +
[15/15] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10249
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10249 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46f5e608 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46f5e608 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46f5e608 Branch: refs/heads/ignite-gg-10249 Commit: 46f5e608bc95429ffe357a2dd3b3817b0166b68d Parents: 185f1aa 3cc3fbe Author: iveselovskiy Authored: Wed May 20 15:48:45 2015 +0300 Committer: iveselovskiy Committed: Wed May 20 15:48:45 2015 +0300 -- LICENSE | 238 ++ LICENSE.txt | 238 -- NOTICE | 12 + NOTICE.txt | 12 - assembly/release-base.xml | 4 +- dev-tools/build.gradle | 35 +- dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 51017 bytes .../gradle/wrapper/gradle-wrapper.properties| 6 + dev-tools/gradlew | 164 ++ dev-tools/src/main/groovy/jiraslurp.groovy | 326 ++- .../internal/GridEventConsumeHandler.java | 26 ++ .../apache/ignite/internal/IgniteKernal.java| 26 +- .../interop/InteropAwareEventFilter.java| 37 +++ .../interop/InteropLocalEventListener.java | 28 ++ .../eventstorage/GridEventStorageManager.java | 24 +- .../processors/cache/GridCacheIoManager.java| 6 +- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/GridDistributedTxMapping.java | 5 +- .../distributed/dht/GridDhtCacheAdapter.java| 6 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 ++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 +- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../distributed/near/GridNearCacheEntry.java| 2 +- .../cache/distributed/near/GridNearTxLocal.java | 5 +- .../near/GridNearTxPrepareFutureAdapter.java| 9 +- .../near/GridNearTxPrepareResponse.java | 28 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 ++ .../core/src/main/resources/ignite.properties | 2 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 145 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + parent/pom.xml | 4 + pom.xml | 4 +- 35 files changed, 1126 insertions(+), 387 deletions(-) --
[02/15] incubator-ignite git commit: IGNITE-80 - Merge branch 'ignite-80-1' into ignite-sprint-4
IGNITE-80 - Merge branch 'ignite-80-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/5de74fe6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5de74fe6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5de74fe6 Branch: refs/heads/ignite-gg-10249 Commit: 5de74fe6d7f3837310cfd9f4f9e5d2636560e182 Parents: 81ce0e6 dcda61b Author: Alexey Goncharuk Authored: Wed Apr 29 22:49:14 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Apr 29 22:49:14 2015 -0700 -- .../processors/cache/GridCacheIoManager.java| 5 +-- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java| 6 ++- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++--- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 +++ 8 files changed, 101 insertions(+), 24 deletions(-) --
[04/15] 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/d3c056e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d3c056e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d3c056e1 Branch: refs/heads/ignite-gg-10249 Commit: d3c056e153c17629c1b12db593877c3c1fde9798 Parents: b218e78 9c30fba Author: Alexey Goncharuk Authored: Mon May 18 11:07:11 2015 -0700 Committer: Alexey Goncharuk Committed: Mon May 18 11:07:11 2015 -0700 -- DEVNOTES.txt| 6 - assembly/release-base.xml | 4 +- bin/ignite-schema-import.bat| 2 +- bin/ignite-schema-import.sh | 2 +- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/ignitevisorcmd.sh | 2 +- bin/include/build-classpath.bat | 46 ++ bin/include/build-classpath.sh | 71 +++ bin/include/target-classpath.bat| 46 -- bin/include/target-classpath.sh | 71 --- 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 +- .../ignite/codegen/MessageCodeGenerator.java| 4 +- modules/core/pom.xml| 2 +- .../communication/GridIoMessageFactory.java | 4 +- .../cache/DynamicCacheDescriptor.java | 16 +- .../processors/cache/GridCacheAdapter.java | 518 +- .../processors/cache/GridCacheMapEntry.java | 18 +- .../GridCachePartitionExchangeManager.java | 3 + .../processors/cache/GridCacheProcessor.java| 189 --- .../processors/cache/GridCacheTtlManager.java | 42 +- .../processors/cache/GridCacheUtils.java| 5 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 434 --- ...idCacheOptimisticCheckPreparedTxRequest.java | 232 ...dCacheOptimisticCheckPreparedTxResponse.java | 179 --- .../distributed/GridCacheTxRecoveryFuture.java | 506 ++ .../distributed/GridCacheTxRecoveryRequest.java | 261 + .../GridCacheTxRecoveryResponse.java| 182 +++ .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../cache/query/GridCacheSqlQuery.java | 2 +- .../cache/query/GridCacheTwoStepQuery.java | 17 + .../cache/transactions/IgniteInternalTx.java| 5 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 38 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 173 ++ .../datastreamer/DataStreamerImpl.java | 2 + .../processors/igfs/IgfsDataManager.java| 3 + .../processors/igfs/IgfsMetaManager.java| 2 +- .../internal/processors/igfs/IgfsUtils.java | 11 +- .../internal/visor/query/VisorQueryArg.java | 14 +- .../internal/visor/query/VisorQueryJob.java | 2 + .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../resources/META-INF/classnames.properties| 12 +- .../internal/GridUpdateNotifierSelfTest.java| 21 +- .../processors/cache/CacheGetFromJobTest.java | 110 .../GridCacheAbstractFailoverSelfTest.java | 4 +- .../GridCacheAbstractNodeRestartSelfTest.java | 94 ++-- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadSelfTest.java| 2 +- ...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 ++ ...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 ++ ...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 ++ ...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 +++ .../GridCachePartitionedNodeRestartTest.java| 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + .../IgniteCacheExpiryPolicyAbstractTest.java| 2 +- .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../expiry/IgniteCacheTtlCleanupSelfTest.java | 85 +++ .../igfs/IgfsClientCacheSelfTest.java | 132 + .../processors/igfs/IgfsOneClientNodeTest.java | 133 + .../processors/igfs/IgfsStreamsSelfTest.java| 2 +- .../testsuites/IgniteCac
[13/15] 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/c4d81fec Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c4d81fec Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c4d81fec Branch: refs/heads/ignite-gg-10249 Commit: c4d81fec5546a748b2a67f6ddeffac2fc8b52d3a Parents: fa07e18 Author: Ignite Teamcity Authored: Wed May 20 13:31:58 2015 +0300 Committer: Ignite Teamcity Committed: Wed May 20 13:31:58 2015 +0300 -- modules/core/src/main/resources/ignite.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4d81fec/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 aec41ea..58aed26 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.6-SNAPSHOT1.0.6 +ignite.version=1.0.6 ignite.build=0 ignite.revision=DEV ignite.rel.date=01011970
[08/15] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f7a80a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f7a80a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f7a80a2 Branch: refs/heads/ignite-gg-10249 Commit: 3f7a80a26ee06723f75bbb7247f4ce04d4586038 Parents: ba7fddb 4423a46 Author: avinogradov Authored: Tue May 19 16:42:46 2015 +0300 Committer: avinogradov Committed: Tue May 19 16:42:46 2015 +0300 -- LICENSE | 238 + LICENSE.txt | 238 - NOTICE| 12 +++ NOTICE.txt| 12 --- assembly/release-base.xml | 4 +- 5 files changed, 252 insertions(+), 252 deletions(-) --
[07/15] incubator-ignite git commit: Filenames fix
Filenames 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/4423a465 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4423a465 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4423a465 Branch: refs/heads/ignite-gg-10249 Commit: 4423a4655c03936bb48fb70b713240aefa3f4219 Parents: 9c30fba Author: avinogradov Authored: Tue May 19 16:42:08 2015 +0300 Committer: avinogradov Committed: Tue May 19 16:42:08 2015 +0300 -- LICENSE | 238 + LICENSE.txt | 238 - NOTICE| 12 +++ NOTICE.txt| 12 --- assembly/release-base.xml | 4 +- 5 files changed, 252 insertions(+), 252 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4423a465/LICENSE -- diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..7649b39 --- /dev/null +++ b/LICENSE @@ -0,0 +1,238 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, +
[01/15] incubator-ignite git commit: IGNITE-80 - Porting changes to a separate branch.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-10249 185f1aa02 -> 46f5e608b
IGNITE-80 - Porting changes to a separate branch.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dcda61b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dcda61b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dcda61b4
Branch: refs/heads/ignite-gg-10249
Commit: dcda61b4fe2be3005544a3fc915b19ac3e4c9598
Parents: 1e53395
Author: Alexey Goncharuk
Authored: Wed Apr 29 14:08:05 2015 -0700
Committer: Alexey Goncharuk
Committed: Wed Apr 29 14:08:05 2015 -0700
--
.../processors/cache/GridCacheIoManager.java| 5 +--
.../GridCachePartitionExchangeManager.java | 4 +-
.../distributed/dht/GridDhtCacheAdapter.java| 6 ++-
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++---
.../colocated/GridDhtColocatedLockFuture.java | 4 +-
.../cache/transactions/IgniteTxManager.java | 24 +++
8 files changed, 101 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcda61b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index b8668e6..112330a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -146,9 +146,8 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
c = clsHandlers.get(new ListenerKey(cacheMsg.cacheId(),
cacheMsg.getClass()));
if (c == null) {
-if (log.isDebugEnabled())
-log.debug("Received message without registered handler (will
ignore) [msg=" + cacheMsg +
-", nodeId=" + nodeId + ']');
+U.warn(log, "Received message without registered handler (will
ignore) [msg=" + cacheMsg +
+", nodeId=" + nodeId + ']');
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcda61b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 5f82ae2..e61168e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -409,10 +409,10 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
* @param ver Topology version.
* @return Future or {@code null} is future is already completed.
*/
-public @Nullable IgniteInternalFuture
affinityReadyFuture(AffinityTopologyVersion ver) {
+@Nullable public IgniteInternalFuture
affinityReadyFuture(AffinityTopologyVersion ver) {
GridDhtPartitionsExchangeFuture lastInitializedFut0 =
lastInitializedFut;
-if (lastInitializedFut0 != null &&
lastInitializedFut0.topologyVersion().compareTo(ver) >= 0) {
+if (lastInitializedFut0 != null &&
lastInitializedFut0.topologyVersion().compareTo(ver) == 0) {
if (log.isDebugEnabled())
log.debug("Return lastInitializedFut for topology ready future
" +
"[ver=" + ver + ", fut=" + lastInitializedFut0 + ']');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dcda61b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 1c46fd0..4d1db85 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++
b/modules/core/src/main/ja
[11/15] incubator-ignite git commit: Merge branch ignite-920 into ignite-sprint-5
Merge branch ignite-920 into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9a4dd7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9a4dd7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9a4dd7f
Branch: refs/heads/ignite-gg-10249
Commit: f9a4dd7f580abc3d66630531bb66c3bf4d75d1d8
Parents: 02d0acd
Author: Alexey Goncharuk
Authored: Tue May 19 11:16:27 2015 -0700
Committer: Alexey Goncharuk
Committed: Tue May 19 11:16:27 2015 -0700
--
.../internal/processors/cache/GridCacheIoManager.java | 1 +
.../distributed/near/GridNearTxPrepareFutureAdapter.java| 9 +++--
.../processors/cache/IgniteCacheNearLockValueSelfTest.java | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index d5dd492..02f16c0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -487,6 +487,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
req.futureId(),
req.miniId(),
req.version(),
+req.version(),
null, null, null);
res.error(req.classError());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index 60b918c..b7a2fee 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -214,10 +214,15 @@ public abstract class GridNearTxPrepareFutureAdapter
extends GridCompoundIdentit
}
if (!m.empty()) {
+GridCacheVersion writeVer = res.writeVersion();
+
+if (writeVer == null)
+writeVer = res.dhtVersion();
+
// Register DHT version.
-tx.addDhtVersion(m.node().id(), res.dhtVersion());
+tx.addDhtVersion(m.node().id(), res.dhtVersion(), writeVer);
-m.dhtVersion(res.dhtVersion());
+m.dhtVersion(res.dhtVersion(), writeVer);
if (m.near())
tx.readyNearLocks(m, res.pending(), res.committedVersions(),
res.rolledbackVersions());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9a4dd7f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
index fe60331..5cc9d04 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
[09/15] incubator-ignite git commit: GG-9614 Interop .Net: Implement GridEvents API. - done
GG-9614 Interop .Net: Implement GridEvents API. - done
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26a713c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26a713c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26a713c8
Branch: refs/heads/ignite-gg-10249
Commit: 26a713c84b96bb0d89b802bd2ab3cd1319da0e2c
Parents: 3f7a80a
Author: ptupitsyn
Authored: Tue May 19 18:26:20 2015 +0300
Committer: ptupitsyn
Committed: Tue May 19 18:26:20 2015 +0300
--
.../internal/GridEventConsumeHandler.java | 26 ++
.../interop/InteropAwareEventFilter.java| 37
.../interop/InteropLocalEventListener.java | 28 +++
.../eventstorage/GridEventStorageManager.java | 24 -
4 files changed, 114 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26a713c8/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index c60646e..505204d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
+import org.apache.ignite.internal.interop.*;
import org.apache.ignite.internal.managers.deployment.*;
import org.apache.ignite.internal.managers.discovery.*;
import org.apache.ignite.internal.managers.eventstorage.*;
@@ -124,6 +125,9 @@ class GridEventConsumeHandler implements
GridContinuousHandler {
if (filter != null)
ctx.resource().injectGeneric(filter);
+if (filter instanceof InteropAwareEventFilter)
+((InteropAwareEventFilter)filter).initialize(ctx);
+
final boolean loc = nodeId.equals(ctx.localNodeId());
lsnr = new GridLocalEventListener() {
@@ -188,6 +192,28 @@ class GridEventConsumeHandler implements
GridContinuousHandler {
if (lsnr != null)
ctx.event().removeLocalEventListener(lsnr, types);
+
+RuntimeException err = null;
+
+try {
+if (filter instanceof InteropAwareEventFilter)
+((InteropAwareEventFilter)filter).close();
+}
+catch(RuntimeException ex) {
+err = ex;
+}
+
+try {
+if (cb instanceof InteropLocalEventListener)
+((InteropLocalEventListener)cb).close();
+}
+catch (RuntimeException ex) {
+if (err == null)
+err = ex;
+}
+
+if (err != null)
+throw err;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26a713c8/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
new file mode 100644
index 000..8dbc73b
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.interop;
+
+import org.apache.ignite.events.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.lang.*;
+
+/**
+ * Special version of predicate for events with initialize/close callbacks.
+ */
+public interface InteropAwareEventFilter extends
IgnitePredicate {
+/**
+ * Initializes the filte
incubator-ignite git commit: IGNITE-926 Revisit artifacts namings
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-4 736791283 -> 0a4b12670
IGNITE-926
Revisit artifacts namings
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0a4b1267
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0a4b1267
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0a4b1267
Branch: refs/heads/ignite-sprint-4
Commit: 0a4b12670e6f38229690288eaadde776d380c600
Parents: 7367912
Author: avinogradov
Authored: Wed May 20 16:03:48 2015 +0300
Committer: avinogradov
Committed: Wed May 20 16:03:48 2015 +0300
--
pom.xml | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a4b1267/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 29ef8ed..b91c904 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
org.apache.ignite
-ignite
+apache-ignite
1.0.4-SNAPSHOT
pom
@@ -39,7 +39,7 @@
scp://localhost:/home
${project.artifactId}-${project.version}
-
ignite-${ignite.edition}-${project.version}-bin
+
${project.artifactId}-${ignite.edition}-${project.version}-bin
@@ -470,7 +470,7 @@
${sourceReleaseAssemblyDescriptor}
gnu
-
ignite-${project.version}-src
+
${project.artifactId}-${project.version}-src
false
@@ -482,7 +482,7 @@
maven-antrun-plugin
-attach-artifact
+attach-artifact
package
run
@@ -490,8 +490,8 @@
false
-
-
+
+
@@ -538,7 +538,7 @@
${basedir}/target
-
ignite-${project.version}-src.zip
+
${project.artifactId}-${project.version}-src.zip
bin/*.zip
@@ -566,10 +566,10 @@
false
-
-
-
-
+
+
+
+
incubator-ignite git commit: # ignite-456: fix paramether
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-456 [created] 4f637d0a0
# ignite-456: fix paramether
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f637d0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f637d0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f637d0a
Branch: refs/heads/ignite-456
Commit: 4f637d0a02a6e9700b4a3fd949a1ac4ed5bf6b3a
Parents: 3cc3fbe
Author: null
Authored: Wed May 20 16:15:16 2015 +0300
Committer: null
Committed: Wed May 20 16:15:16 2015 +0300
--
dev-tools/src/main/groovy/jiraslurp.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f637d0a/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
index 34ac79c..655f464 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -198,7 +198,7 @@ def runAllTestBuilds = { builds, jiraNum ->
"" +
" " +
" " +
-"" +
+""
+
" " +
"";
incubator-ignite git commit: revert IGNITE-927 Revisit license packaging
Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-4 0a4b12670 -> 7ec8df69b revert IGNITE-927 Revisit license packaging Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ec8df69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ec8df69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ec8df69 Branch: refs/heads/ignite-sprint-4 Commit: 7ec8df69b8fa385e765dbaf3df481a5fb7a72a97 Parents: 0a4b126 Author: avinogradov Authored: Wed May 20 16:27:15 2015 +0300 Committer: avinogradov Committed: Wed May 20 16:27:15 2015 +0300 -- modules/ssh/licenses/jcraft-revised-bsd.txt | 28 modules/tools/licenses/jodd-revised-bsd.txt | 21 +++ .../licenses/jcraft-revised-bsd.txt | 28 3 files changed, 77 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ec8df69/modules/ssh/licenses/jcraft-revised-bsd.txt -- diff --git a/modules/ssh/licenses/jcraft-revised-bsd.txt b/modules/ssh/licenses/jcraft-revised-bsd.txt new file mode 100644 index 000..3748f98 --- /dev/null +++ b/modules/ssh/licenses/jcraft-revised-bsd.txt @@ -0,0 +1,28 @@ +3-clause BSD license +-- +Copyright (c) 2002-2014 Atsuhiko Yamanaka, JCraft,Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ec8df69/modules/tools/licenses/jodd-revised-bsd.txt -- diff --git a/modules/tools/licenses/jodd-revised-bsd.txt b/modules/tools/licenses/jodd-revised-bsd.txt new file mode 100644 index 000..129f3f0 --- /dev/null +++ b/modules/tools/licenses/jodd-revised-bsd.txt @@ -0,0 +1,21 @@ +Jodd software is released under Revised BSD License. + +Copyright (c) 2003-2014, Jodd Team All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +Neither the name of the Jodd nor the names of its contributors may be used to endorse or promote products derived from this software without specific +prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE US
incubator-ignite git commit: # ignite-456: runAllBuilds with null JiraNum
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-456 4f637d0a0 -> 28cfe8089
# ignite-456: runAllBuilds with null JiraNum
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/28cfe808
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/28cfe808
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/28cfe808
Branch: refs/heads/ignite-456
Commit: 28cfe80895260e2708107772290860b79e014966
Parents: 4f637d0
Author: null
Authored: Wed May 20 16:39:38 2015 +0300
Committer: null
Committed: Wed May 20 16:39:38 2015 +0300
--
dev-tools/src/main/groovy/jiraslurp.groovy | 24
1 file changed, 16 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28cfe808/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
index 655f464..e9f9820 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -194,13 +194,21 @@ def runAllTestBuilds = { builds, jiraNum ->
try {
println "Triggering $it build for $jiraNum jira..."
-String postData =
-"" +
-" " +
-" " +
-""
+
-" " +
-"";
+String postData
+
+if (jiraNum != 'null' || jiraNum != null) {
+postData = "" +
+" " +
+"";
+}
+else {
+postData = "" +
+" " +
+" " +
+"" +
+" " +
+"";
+}
URL url = new
URL("http://$tcURL:80/httpAuth/app/rest/buildQueue";);
@@ -285,7 +293,7 @@ args.each {
applyPatch(jira, attachementURL)
}
}
-else if (parameters.length >= 2 && parameters[0] == "runAllBuilds" &&
parameters[1] ==~ /\w+-\d+/) {
+else if (parameters.length >= 2 && parameters[0] == "runAllBuilds") {
def jiraNum = parameters[1]
def attachementURL=null
incubator-ignite git commit: IGNITE-709 Fix tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709_2 9d4d01c31 -> ce20aec3c
IGNITE-709 Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce20aec3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce20aec3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce20aec3
Branch: refs/heads/ignite-709_2
Commit: ce20aec3c8046bb3635893ec181ba027691db638
Parents: 9d4d01c
Author: sevdokimov
Authored: Wed May 20 16:41:45 2015 +0300
Committer: sevdokimov
Committed: Wed May 20 16:41:45 2015 +0300
--
.../continuous/GridContinuousProcessor.java | 2 +-
.../discovery/tcp/TcpClientDiscoverySpi.java| 2 +-
.../IgniteClientDataStructuresAbstractTest.java | 6 +--
...ientModesTcpClientDiscoveryAbstractTest.java | 9 ++--
...pClientDiscoveryMarshallerCheckSelfTest.java | 16 +++
.../tcp/TcpDiscoveryConcurrentStartTest.java| 45 ++--
.../ignite/testframework/GridTestUtils.java | 15 +++
.../testframework/junits/GridAbstractTest.java | 19 +++--
.../junits/common/GridCommonAbstractTest.java | 31 --
.../IgniteSpiDiscoverySelfTestSuite.java| 2 +
10 files changed, 81 insertions(+), 66 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce20aec3/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index 1b204a6..d67a45a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -168,7 +168,7 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
ctx.discovery().setCustomEventListener(StartRoutineDiscoveryMessage.class,
new CustomEventListener() {
@Override public void onCustomEvent(ClusterNode snd,
StartRoutineDiscoveryMessage msg) {
-if (!snd.id().equals(ctx.localNodeId()))
+if (!snd.id().equals(ctx.localNodeId()) &&
!ctx.isStopping())
processStartRequest(snd, msg);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce20aec3/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 7097e1b..e4c5147 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -1461,7 +1461,7 @@ public class TcpClientDiscoverySpi extends
TcpDiscoverySpiAdapter implements Tcp
* @param msg Message.
*/
private void processCustomMessage(TcpDiscoveryCustomEventMessage msg) {
-if (msg.verified()) {
+if (msg.verified() && joinLatch.getCount() == 0) {
DiscoverySpiListener lsnr = TcpClientDiscoverySpi.this.lsnr;
if (lsnr != null) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce20aec3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
index 36f1910..21233cc 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
@@ -43,16 +43,14 @@ public abstract class
IgniteClientDataStructuresAbstractTest extends GridCommonA
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
-((TcpDisco
[1/2] incubator-ignite git commit: # ignite-456: runAllBuilds fix
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-456 28cfe8089 -> 1f22ab13f
# ignite-456: runAllBuilds 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/57805914
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/57805914
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/57805914
Branch: refs/heads/ignite-456
Commit: 57805914fb1d43f0128767b05ffe50d49eb0416d
Parents: 28cfe80
Author: null
Authored: Wed May 20 16:43:15 2015 +0300
Committer: null
Committed: Wed May 20 16:43:15 2015 +0300
--
dev-tools/src/main/groovy/jiraslurp.groovy | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57805914/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
index e9f9820..4db6099 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -293,17 +293,14 @@ args.each {
applyPatch(jira, attachementURL)
}
}
-else if (parameters.length >= 2 && parameters[0] == "runAllBuilds") {
-def jiraNum = parameters[1]
-
-def attachementURL=null
+else if (parameters.length >= 2 && parameters[0] == "runAllBuilds" &&
parameters[1] != 'null') {
+def builds = parameters[1].split(' ');
-if (parameters[2] ==~ /\d+/)
-attachementURL = parameters[2]
+def jiraNum = parameters[2]
-println "Running in 'all builds' mode with jira number='$jiraNum' and
attachment URL='$attachementURL'."
+println "Running in 'all builds' mode for builds=$builds with jira
number='$jiraNum'."
-runAllTestBuilds jiraNum attachmentURL
+runAllTestBuilds(builds, jiraNum)
}
}
[2/2] incubator-ignite git commit: # ignite-456: runAllBuilds fix
# ignite-456: runAllBuilds 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/1f22ab13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1f22ab13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1f22ab13
Branch: refs/heads/ignite-456
Commit: 1f22ab13fc15337af9ea4b1b3d6ca7284133faaf
Parents: 5780591
Author: null
Authored: Wed May 20 16:51:33 2015 +0300
Committer: null
Committed: Wed May 20 16:51:33 2015 +0300
--
dev-tools/build.gradle | 2 +-
dev-tools/src/main/groovy/jiraslurp.groovy | 91 -
2 files changed, 45 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f22ab13/dev-tools/build.gradle
--
diff --git a/dev-tools/build.gradle b/dev-tools/build.gradle
index 164a775..02dfea6 100644
--- a/dev-tools/build.gradle
+++ b/dev-tools/build.gradle
@@ -48,7 +48,7 @@ task patchapply(dependsOn: 'classes', type: JavaExec) {
}
task runAllBuilds(dependsOn: 'classes', type: JavaExec) {
-args("runAllBuilds,${System.getenv('JIRA_NUM')}")
+
args("runAllBuilds,${System.getenv('TEST_BUILDS')},${System.getenv('JIRA_NUM')}")
main = 'jiraslurp'
classpath = sourceSets.main.runtimeClasspath
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f22ab13/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
index 4db6099..5089a27 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -182,68 +182,65 @@ def JIRA_xml = { jiranum ->
* Runs all given test builds to validate last patch from given jira.
*/
def runAllTestBuilds = { builds, jiraNum ->
-assert jiraNum != 'null', 'Jira number should not be null.'
-assert jiraNum != null, 'Jira number should not be null.'
+def tcURL = System.getenv('TC_URL')
+def user = System.getenv('TASK_RUNNER_USER')
+def pwd = System.getenv('TASK_RUNNER_PWD')
-if (jiraNum) {
-def tcURL = System.getenv('TC_URL')
-def user = System.getenv('TASK_RUNNER_USER')
-def pwd = System.getenv('TASK_RUNNER_PWD')
+builds.each {
+try {
+println "Triggering $it build for $jiraNum jira..."
-builds.each {
-try {
-println "Triggering $it build for $jiraNum jira..."
+String postData
-String postData
+if (jiraNum == 'null' || jiraNum == null) {
+postData = "" +
+" " +
+"";
+}
+else {
+postData = "" +
+" " +
+" " +
+""
+
+" " +
+"";
+}
-if (jiraNum != 'null' || jiraNum != null) {
-postData = "" +
-" " +
-"";
-}
-else {
-postData = "" +
-" " +
-" " +
-"" +
-" " +
-"";
-}
+println "Request: $postData"
-URL url = new
URL("http://$tcURL:80/httpAuth/app/rest/buildQueue";);
+URL url = new URL("http://$tcURL:80/httpAuth/app/rest/buildQueue";);
-HttpURLConnection conn =
(HttpURLConnection)url.openConnection();
+HttpURLConnection conn = (HttpURLConnection)url.openConnection();
-String encoded = new
sun.misc.BASE64Encoder().encode("$user:$pwd".getBytes());
+String encoded = new
sun.misc.BASE64Encoder().encode("$user:$pwd".getBytes());
-conn.setRequestProperty("Authorization", "Basic " + encoded);
+conn.setRequestProperty("Authorization", "Basic " + encoded);
-conn.setDoOutput(true);
-conn.setRequestMethod("POST");
-conn.setRequestProperty("Content-Type", "application/xml");
-conn.setRequestProperty("Content-Length",
String.valueOf(postData.length()));
+conn.setDoOutput(true);
+conn.setRequestMethod("POST");
+conn.setRequestProperty("Content-Type", "application/xml");
+conn.setRequestProperty("Content-Length",
String.valueOf(postData.length()));
-OutputStream os = conn.getOutputStream();
-o
incubator-ignite git commit: # IGNITE-709 Fix GridDiscoveryEventSelfTest.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709_2 ce20aec3c -> c35537de5
# IGNITE-709 Fix GridDiscoveryEventSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c35537de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c35537de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c35537de
Branch: refs/heads/ignite-709_2
Commit: c35537de58a90d99ae3b90e3b9905bb54e798e66
Parents: ce20aec
Author: sevdokimov
Authored: Wed May 20 16:56:33 2015 +0300
Committer: sevdokimov
Committed: Wed May 20 16:56:33 2015 +0300
--
.../apache/ignite/internal/GridDiscoveryEventSelfTest.java| 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c35537de/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
index 59a4f5d..d90bafe 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
@@ -33,7 +33,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -163,8 +163,6 @@ public class GridDiscoveryEventSelfTest extends
GridCommonAbstractTest {
private AtomicInteger cnt = new AtomicInteger();
@Override public boolean apply(Event evt) {
-assert evt.type() == EVT_NODE_LEFT;
-
evts.put(cnt.getAndIncrement(), ((DiscoveryEvent)
evt).topologyNodes());
latch.countDown();
@@ -228,7 +226,8 @@ public class GridDiscoveryEventSelfTest extends
GridCommonAbstractTest {
private AtomicInteger cnt = new AtomicInteger();
@Override public boolean apply(Event evt) {
-assert evt.type() == EVT_NODE_JOINED || evt.type() ==
EVT_NODE_LEFT;
+assert evt.type() == EVT_NODE_JOINED
+|| evt.type() == EVT_NODE_LEFT || evt.type() ==
EVT_NODE_FAILED;
evts.put(cnt.getAndIncrement(), ((DiscoveryEvent)
evt).topologyNodes());
[1/2] incubator-ignite git commit: ignite-471-2: fixing ssl tests
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471-2 c3b53e250 -> cb3bc8fe8
ignite-471-2: fixing ssl tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c493627b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c493627b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c493627b
Branch: refs/heads/ignite-471-2
Commit: c493627b87e05a71ce01970179fd4fa4e790633d
Parents: c3b53e2
Author: Denis Magda
Authored: Wed May 20 15:52:22 2015 +0300
Committer: Denis Magda
Committed: Wed May 20 15:52:22 2015 +0300
--
modules/core/src/test/config/tests.properties | 2 +-
.../org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java| 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c493627b/modules/core/src/test/config/tests.properties
--
diff --git a/modules/core/src/test/config/tests.properties
b/modules/core/src/test/config/tests.properties
index 781b0f1..a9c6b77 100644
--- a/modules/core/src/test/config/tests.properties
+++ b/modules/core/src/test/config/tests.properties
@@ -129,7 +129,7 @@ ssh.username=uname
ssh.password=passwd
# SSL tests keystore.
-ssl.keystore.path=modules/clients/src/test/keystore/server.jks
+ssl.keystore.path=@{IGNITE_HOME}/modules/clients/src/test/keystore/server.jks
ssl.keystore.password=123456
# Hadoop home directory.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c493627b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java
index ccf01c6..35fe2fa 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java
@@ -35,6 +35,7 @@ public class GridNioSslSelfTest extends GridNioSelfTest {
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
+super.beforeTestsStarted();
sslCtx = GridTestUtils.sslContext();
}
[2/2] incubator-ignite git commit: ignite-471-2: adjusted P2PTestTaskExternalPath to work with PortableMarshaller
ignite-471-2: adjusted P2PTestTaskExternalPath to work with PortableMarshaller
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb3bc8fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb3bc8fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb3bc8fe
Branch: refs/heads/ignite-471-2
Commit: cb3bc8fe88cdbdb81041b5bda76189415f60f81c
Parents: c493627
Author: Denis Magda
Authored: Wed May 20 16:42:10 2015 +0300
Committer: Denis Magda
Committed: Wed May 20 16:42:10 2015 +0300
--
.../apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java | 10 +-
.../apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java | 8
2 files changed, 9 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb3bc8fe/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java
--
diff --git
a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java
index c997358..2ae54aa 100644
---
a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java
+++
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath1.java
@@ -64,11 +64,11 @@ public class P2PTestTaskExternalPath1 extends
ComputeTaskAdapter jobs = U.newHashMap(subgrid.size());
+Map jobs = U.newHashMap(subgrid.size());
for (ClusterNode node : subgrid) {
if (nodeIds.contains(node.id()))
-jobs.put(new TestJob(node.id(), sleep), node);
+jobs.put(new TestJob1(node.id(), sleep), node);
}
if (!jobs.isEmpty())
@@ -88,7 +88,7 @@ public class P2PTestTaskExternalPath1 extends
ComputeTaskAdapterhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb3bc8fe/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java
--
diff --git
a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java
index 6c7565b..01f3991 100644
---
a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java
+++
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java
@@ -64,11 +64,11 @@ public class P2PTestTaskExternalPath2 extends
ComputeTaskAdapter jobs = U.newHashMap(subgrid.size());
+Map jobs = U.newHashMap(subgrid.size());
for (ClusterNode node : subgrid) {
if (nodeIds.contains(node.id()))
-jobs.put(new TestJob(node.id(), sleep), node);
+jobs.put(new TestJob2(node.id(), sleep), node);
}
if (!jobs.isEmpty())
@@ -88,7 +88,7 @@ public class P2PTestTaskExternalPath2 extends
ComputeTaskAdapter
incubator-ignite git commit: # ignite-456: extract response info
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-456 1f22ab13f -> 9ddc38c09
# ignite-456: extract response info
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9ddc38c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9ddc38c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9ddc38c0
Branch: refs/heads/ignite-456
Commit: 9ddc38c09e64215c959e42fc4ab9053792bb35f0
Parents: 1f22ab1
Author: null
Authored: Wed May 20 17:21:24 2015 +0300
Committer: null
Committed: Wed May 20 17:21:24 2015 +0300
--
dev-tools/src/main/groovy/jiraslurp.groovy | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ddc38c0/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
index 5089a27..5c783ea 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -229,15 +229,23 @@ def runAllTestBuilds = { builds, jiraNum ->
conn.connect();
// Read response.
-print "Response: "
-
BufferedReader br = new BufferedReader(new
InputStreamReader(conn.getInputStream()));
+String response = "";
String line;
+
while ((line = br.readLine()) != null)
-println line
+response += line
br.close();
+
+println "Response: $response"
+
+def build = new XmlSlurper().parseText(response)
+
+println "Triggered build: ${build.@name}"
+println "Triggered build url: ${build.@webUrl}"
+println "Triggered build branch: ${build.@branchName}"
}
catch (Exception e) {
e.printStackTrace()
incubator-ignite git commit: # ignite-456: fix info extracting
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-456 9ddc38c09 -> ba44f76e9
# ignite-456: fix info extracting
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba44f76e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba44f76e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba44f76e
Branch: refs/heads/ignite-456
Commit: ba44f76e91554a6b76d33abfbadcbc05a5e6e8e1
Parents: 9ddc38c
Author: null
Authored: Wed May 20 17:23:36 2015 +0300
Committer: null
Committed: Wed May 20 17:23:36 2015 +0300
--
dev-tools/src/main/groovy/jiraslurp.groovy | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba44f76e/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
index 5c783ea..f16f47b 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -233,17 +233,17 @@ def runAllTestBuilds = { builds, jiraNum ->
String response = "";
String line;
-
+
while ((line = br.readLine()) != null)
response += line
br.close();
println "Response: $response"
-
+
def build = new XmlSlurper().parseText(response)
-println "Triggered build: ${build.@name}"
+println "Triggered build: ${build.buildType.@name}"
println "Triggered build url: ${build.@webUrl}"
println "Triggered build branch: ${build.@branchName}"
}
incubator-ignite git commit: # ignite-797 fixed test to do not start near cache on client
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709_2 c35537de5 -> bc2269d22
# ignite-797 fixed test to do not start near cache on client
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bc2269d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bc2269d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bc2269d2
Branch: refs/heads/ignite-709_2
Commit: bc2269d2284e90c8097195233e0340c264204b71
Parents: c35537d
Author: sboikov
Authored: Wed May 20 17:28:57 2015 +0300
Committer: sboikov
Committed: Wed May 20 17:28:57 2015 +0300
--
.../IgniteCacheP2pUnmarshallingErrorTest.java | 29 +-
...gniteCacheP2pUnmarshallingNearErrorTest.java | 13 ---
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +-
...gniteCacheP2pUnmarshallingErrorTestSuit.java | 41
...niteCacheP2pUnmarshallingErrorTestSuite.java | 41
5 files changed, 70 insertions(+), 56 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc2269d2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
index 5aa0ac8..ce68b17 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
@@ -65,27 +65,33 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends
IgniteCacheAbstractTes
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
-if (gridName.endsWith("0"))
+if (getTestGridName(0).equals(gridName)) {
cfg.setClientMode(true);
+cfg.setCacheConfiguration();
+}
+
return cfg;
}
/** Test key 1. */
public static class TestKey implements Externalizable {
-/** Test key 1. */
+/** Field. */
+@QuerySqlField(index = true)
+private String field;
+
+/**
+ * @param field Test key 1.
+ */
public TestKey(String field) {
this.field = field;
}
/** Test key 1. */
public TestKey() {
+// No-op.
}
-/** Field. */
-@QuerySqlField(index = true)
-private String field;
-
/** {@inheritDoc} */
@Override public boolean equals(Object o) {
if (this == o)
@@ -112,14 +118,15 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends
IgniteCacheAbstractTes
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
field = (String)in.readObject();
-if (readCnt.decrementAndGet() <= 0) {
-throw new IOException("Class can not be unmarshalled");
-}
+if (readCnt.decrementAndGet() <= 0)
+throw new IOException("Class can not be unmarshalled.");
}
}
/**
* Sends put atomically and handles fail.
+ *
+ * @param k Key.
*/
protected void failAtomicPut(int k) {
try {
@@ -136,6 +143,8 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends
IgniteCacheAbstractTes
/**
* Sends get atomically and handles fail.
+ *
+ * @param k Key.
*/
protected void failAtomicGet(int k) {
try {
@@ -150,6 +159,8 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends
IgniteCacheAbstractTes
/**
* Tests that correct response will be sent to client node in case of
unmarshalling failed.
+ *
+ * @throws Exception If failed.
*/
public void testResponseMessageOnUnmarshallingFailed() throws Exception {
//GridNearAtomicUpdateRequest unmarshalling failed test
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc2269d2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
index
incubator-ignite git commit: # ignite-456: log paramethers checking
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-456 ba44f76e9 -> c82aa443d
# ignite-456: log paramethers checking
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c82aa443
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c82aa443
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c82aa443
Branch: refs/heads/ignite-456
Commit: c82aa443d74968e1295143b2912cd4d2c2bef9d8
Parents: ba44f76
Author: null
Authored: Wed May 20 17:36:15 2015 +0300
Committer: null
Committed: Wed May 20 17:36:15 2015 +0300
--
dev-tools/src/main/groovy/jiraslurp.groovy | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82aa443/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
index f16f47b..2d434e5 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -263,7 +263,13 @@ args.each {
println parameters
-if (parameters.length == 2 && parameters[0] == "slurp" && parameters[1] !=
'null') {
+if (parameters.length >= 1 && parameters[0] == "slurp") {
+if (parameters.length < 2 || parameters[1] == 'null') {
+println "There is no builds to run. Exit."
+
+return
+}
+
def builds = parameters[1].split(' ');
println "Running in 'slurp' mode. Test builds=${builds}"
@@ -278,7 +284,13 @@ args.each {
runAllTestBuilds(builds,k)
}
}
-else if (parameters.length == 2 && parameters[0] == "patchApply" &&
parameters[1] ==~ /\w+-\d+/) {
+else if (parameters.length > 1 && parameters[0] == "patchApply") {
+if (parameters.length < 2 || parameters[1] !=~ /\w+-\d+/) {
+println "There is no jira number to apply. Exit."
+
+return
+}
+
def jiraNum = parameters[1]
println "Running in 'patch apply' mode with jira number '$jiraNum'"
@@ -298,7 +310,13 @@ args.each {
applyPatch(jira, attachementURL)
}
}
-else if (parameters.length >= 2 && parameters[0] == "runAllBuilds" &&
parameters[1] != 'null') {
+else if (parameters.length > 1 && parameters[0] == "runAllBuilds" ) {
+if (parameters.length < 2 || parameters[1] == 'null') {
+println "There is no builds to run. Exit."
+
+return
+}
+
def builds = parameters[1].split(' ');
def jiraNum = parameters[2]
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10249a [created] 46f5e608b
