[2/2] incubator-ignite git commit: fixed hibernate examples
fixed hibernate 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/658b8234 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/658b8234 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/658b8234 Branch: refs/heads/ignite-45 Commit: 658b82342937653746cade566fc57b9e16875741 Parents: 5a46b29 Author: Yakov Zhdanov Authored: Sun Mar 22 09:58:45 2015 +0300 Committer: Yakov Zhdanov Committed: Sun Mar 22 09:58:45 2015 +0300 -- .../core/src/main/java/org/apache/ignite/cache/CacheManager.java| 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/658b8234/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java index 6174f2d..fc43d2a 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java @@ -31,7 +31,6 @@ import javax.cache.*; import javax.cache.configuration.*; import javax.cache.management.*; import javax.management.*; -import javax.sound.midi.*; import java.net.*; import java.util.*; import java.util.concurrent.atomic.*;
incubator-ignite git commit: revert try with resources
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 658b82342 -> 5f3c90b32
revert try with resources
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5f3c90b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5f3c90b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5f3c90b3
Branch: refs/heads/ignite-45
Commit: 5f3c90b325c15f84a97388e1918a887368c4bb69
Parents: 658b823
Author: Yakov Zhdanov
Authored: Sun Mar 22 10:00:37 2015 +0300
Committer: Yakov Zhdanov
Committed: Sun Mar 22 10:00:37 2015 +0300
--
.../src/main/java/org/apache/ignite/cache/CacheManager.java | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f3c90b3/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index fc43d2a..4a41dd5 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -257,7 +257,11 @@ public class CacheManager implements
javax.cache.CacheManager {
@Override public void destroyCache(String cacheName) {
kernalGateway.readLock();
-try (IgniteCache cache = getCache0(cacheName)) {
+IgniteCache cache;
+
+try {
+cache = getCache0(cacheName);
+
if (cache != null) {
unregisterCacheObject(cacheName, CACHE_CONFIGURATION);
unregisterCacheObject(cacheName, CACHE_STATISTICS);
@@ -266,6 +270,9 @@ public class CacheManager implements
javax.cache.CacheManager {
finally {
kernalGateway.readUnlock();
}
+
+if (cache != null)
+cache.close();
}
/**
[3/3] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Merge remote-tracking branch 'origin/ignite-45' into ignite-45 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0eb53a9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0eb53a9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0eb53a9d Branch: refs/heads/ignite-45 Commit: 0eb53a9d6be8c8d7d886772b3f24ba26c1a7430c Parents: c9df98f 5f3c90b Author: Valentin Kulichenko Authored: Sun Mar 22 00:08:51 2015 -0700 Committer: Valentin Kulichenko Committed: Sun Mar 22 00:08:51 2015 -0700 -- examples/config/hibernate/example-hibernate-L2-cache.xml | 10 +- .../hibernate/HibernateL2CacheExampleNodeStartup.java | 6 +++--- .../apache/ignite/testsuites/IgniteCacheTestSuite.java| 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) --
[2/3] incubator-ignite git commit: IGNITE-45 - Examples
IGNITE-45 - 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/c9df98f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c9df98f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c9df98f8
Branch: refs/heads/ignite-45
Commit: c9df98f8a647067d139cbd26f591e505bbfeada5
Parents: 74009c9
Author: Valentin Kulichenko
Authored: Sun Mar 22 00:08:43 2015 -0700
Committer: Valentin Kulichenko
Committed: Sun Mar 22 00:08:43 2015 -0700
--
examples/config/example-cache.xml | 7 +-
.../ComputeExecutorServiceExample.java | 71 ---
.../computegrid/ComputeScheduleExample.java | 81
.../IgniteExecutorServiceExample.java | 71 +++
.../messaging/MessagingPingPongExample.java | 48 ++---
.../misc/schedule/ComputeScheduleExample.java | 81
.../examples/misc/schedule/package-info.java| 22 +++
.../servicegrid/SimpleMapServiceImpl.java | 27 ++-
.../examples/servicegrid/package-info.java | 22 +++
.../ignite/examples/streaming/package-info.java | 22 +++
.../ComputeContinuousMapperExample.java | 158
.../ComputeExecutorServiceExample.java | 69 ---
.../ComputeFibonacciContinuationExample.java| 189 ---
.../computegrid/ComputeReducerExample.java | 87 -
.../computegrid/ComputeScheduleExample.java | 64 ---
.../computegrid/ComputeTaskMapExample.java | 105 ---
.../computegrid/ComputeTaskSplitExample.java| 96 --
.../failover/ComputeFailoverExample.java| 137 --
.../failover/ComputeFailoverNodeStartup.java| 77
.../computegrid/failover/package-info.java | 22 ---
.../java8/computegrid/montecarlo/Credit.java| 110 ---
.../montecarlo/CreditRiskExample.java | 149 ---
.../montecarlo/CreditRiskManager.java | 143 --
.../computegrid/montecarlo/package-info.java| 22 ---
.../examples/java8/datagrid/package-info.java | 22 +++
.../examples/java8/events/EventsExample.java| 132 +
.../examples/java8/events/package-info.java | 22 +++
.../messaging/MessagingPingPongExample.java | 111 +++
.../examples/java8/messaging/package-info.java | 22 +++
.../misc/schedule/ComputeScheduleExample.java | 64 +++
.../java8/misc/schedule/package-info.java | 22 +++
.../ignite/examples/java8/package-info.java | 22 +++
.../examples/java8/streaming/package-info.java | 22 +++
.../ignite/examples/BasicExamplesSelfTest.java | 3 +-
.../service/GridServiceProcessor.java | 31 +--
35 files changed, 718 insertions(+), 1635 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9df98f8/examples/config/example-cache.xml
--
diff --git a/examples/config/example-cache.xml
b/examples/config/example-cache.xml
index f34f12c..916c452 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -18,7 +18,12 @@
-->
+ * Demonstrates usage of cron-based scheduler.
+ */
+package org.apache.ignite.examples.misc.schedule;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9df98f8/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
b/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
index 5e6a9e7..5be2352 100644
---
a/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
+++
b/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
@@ -17,11 +17,12 @@
package org.apache.ignite.examples.servicegrid;
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.resources.*;
import org.apache.ignite.services.*;
-import java.util.*;
-import java.util.concurrent.*;
-
/**
* Simple service which loops infinitely and prints out a counter.
*/
@@ -29,8 +30,15 @@ public class SimpleMapServiceImpl implements Service,
SimpleMapService map;
+private IgniteCache map;
/** {@inheritDoc} */
@Override public void put(K key, V val) {
@@ -54,14 +62,21 @@ public class SimpleMapServiceImpl implements Service,
SimpleMapService cfg = new CacheConfiguration<>();
+
+cfg.setCacheMode(CacheMode.PARTITIONED);
+cfg.setName(CACHE_NAME);
-map = new ConcurrentHashMap<>();
+map = ignite.getOrCr
[1/3] incubator-ignite git commit: IGNITE-45 - Examples
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 5f3c90b32 -> 0eb53a9d6
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9df98f8/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/montecarlo/CreditRiskManager.java
--
diff --git
a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/montecarlo/CreditRiskManager.java
b/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/montecarlo/CreditRiskManager.java
deleted file mode 100644
index 2ee8e23..000
---
a/examples/src/main/java8/org/apache/ignite/examples/java8/computegrid/montecarlo/CreditRiskManager.java
+++ /dev/null
@@ -1,143 +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.examples.java8.computegrid.montecarlo;
-
-import java.util.*;
-
-/**
- * This class abstracts out the calculation of risk for a credit portfolio.
- */
-@SuppressWarnings({"FloatingPointEquality"})
-public class CreditRiskManager {
-/**
- * Default randomizer with normal distribution.
- * Note that since every JVM on the cluster will have its own random
- * generator (independently initialized) the Monte-Carlo simulation
- * will be slightly skewed when performed on the ignite cluster due to
skewed
- * normal distribution of the sub-jobs comparing to execution on the
- * local node only with single random generator. Real-life applications
- * may want to provide its own implementation of distributed random
- * generator.
- */
-private static Random rndGen = new Random();
-
-/**
- * Calculates credit risk for a given credit portfolio. This calculation
uses
- * Monte-Carlo Simulation to produce risk value.
- *
- * @param portfolio Credit portfolio.
- * @param horizon Forecast horizon (in days).
- * @param num Number of Monte-Carlo iterations.
- * @param percentile Cutoff level.
- * @return Credit risk value, i.e. the minimal amount that creditor has to
- * have available to cover possible defaults.
- */
-public double calculateCreditRiskMonteCarlo(Credit[] portfolio, int
horizon, int num, double percentile) {
-System.out.println(">>> Calculating credit risk for portfolio [size="
+ portfolio.length + ", horizon=" +
-horizon + ", percentile=" + percentile + ", iterations=" + num +
"] <<<");
-
-long start = System.currentTimeMillis();
-
-double[] losses = calculateLosses(portfolio, horizon, num);
-
-Arrays.sort(losses);
-
-double[] lossProbs = new double[losses.length];
-
-// Count variational numbers.
-// Every next one either has the same value or previous one plus
probability of loss.
-for (int i = 0; i < losses.length; i++)
-if (i == 0)
-// First time it's just a probability of first value.
-lossProbs[i] = getLossProbability(losses, 0);
-else if (losses[i] != losses[i - 1])
-// Probability of this loss plus previous one.
-lossProbs[i] = getLossProbability(losses, i) + lossProbs[i -
1];
-else
-// The same loss the same probability.
-lossProbs[i] = lossProbs[i - 1];
-
-// Count percentile.
-double crdRisk = 0;
-
-for (int i = 0; i < lossProbs.length; i++)
-if (lossProbs[i] > percentile) {
-crdRisk = losses[i - 1];
-
-break;
-}
-
-System.out.println(">>> Finished calculating portfolio risk [risk=" +
crdRisk +
-", time=" + (System.currentTimeMillis() - start) + "ms]");
-
-return crdRisk;
-}
-
-/**
- * Calculates losses for the given credit portfolio using Monte-Carlo
Simulation.
- * Simulates probability of default only.
- *
- * @param portfolio Credit portfolio.
- * @param horizon Forecast horizon.
- * @param num Number of Monte-Carlo iterations.
- * @return Losses array simulated by Monte Carlo method.
- */
-private double[] calculateLosses(Credit[] portfolio, int horizon, int num)
incubator-ignite git commit: # IGNITE-45 - Examples
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 0eb53a9d6 -> cc5bd026e
# IGNITE-45 - 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/cc5bd026
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cc5bd026
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cc5bd026
Branch: refs/heads/ignite-45
Commit: cc5bd026e7130589d876dc8e483dd23a28bc9f44
Parents: 0eb53a9
Author: Valentin Kulichenko
Authored: Sun Mar 22 01:11:48 2015 -0700
Committer: Valentin Kulichenko
Committed: Sun Mar 22 01:11:48 2015 -0700
--
.../IgniteExecutorServiceExample.java | 68
.../java8/datastructures/package-info.java | 22 +++
2 files changed, 90 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc5bd026/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
--
diff --git
a/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
b/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
new file mode 100644
index 000..bab9a2b
--- /dev/null
+++
b/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
@@ -0,0 +1,68 @@
+/*
+ * 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.examples.java8.datastructures;
+
+import org.apache.ignite.*;
+import org.apache.ignite.examples.*;
+
+import java.util.concurrent.*;
+
+/**
+ * Simple example to demonstrate usage of distributed executor service
provided by Ignite.
+ *
+ * Remote nodes should always be started with special configuration file which
+ * enables P2P class loading: {@code 'ignite.{sh|bat}
examples/config/example-ignite.xml'}.
+ *
+ * Alternatively you can run {@link ExampleNodeStartup} in another JVM which
will start node
+ * with {@code examples/config/example-ignite.xml} configuration.
+ */
+public final class IgniteExecutorServiceExample {
+/**
+ * Executes example.
+ *
+ * @param args Command line arguments, none required.
+ * @throws Exception If example execution failed.
+ */
+@SuppressWarnings({"TooBroadScope"})
+public static void main(String[] args) throws Exception {
+try (Ignite ignite =
Ignition.start("examples/config/example-ignite.xml")) {
+System.out.println();
+System.out.println(">>> Compute executor service example
started.");
+
+// Get ignite-enabled executor service.
+ExecutorService exec = ignite.executorService();
+
+// Iterate through all words in the sentence and create callable
jobs.
+for (final String word : "Print words using runnable".split(" ")) {
+// Execute runnable on some node.
+exec.submit(() -> {
+System.out.println();
+System.out.println(">>> Printing '" + word + "' on this
node from ignite job.");
+});
+}
+
+exec.shutdown();
+
+// Wait for all jobs to complete (0 means no limit).
+exec.awaitTermination(0, TimeUnit.MILLISECONDS);
+
+System.out.println();
+System.out.println(">>> Check all nodes for output (this node is
also part of the cluster).");
+}
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc5bd026/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/package-info.java
--
diff --git
a/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/package-info.java
b/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/package-info.java
new file mode 100644
index 000..baa5769
--- /dev/null
+++
b/examples/src/mai
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Merge remote-tracking branch 'origin/ignite-45' into ignite-45 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b34d7ae4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b34d7ae4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b34d7ae4 Branch: refs/heads/ignite-45 Commit: b34d7ae4e6bf755c65093f38237ca2246b0937b7 Parents: c2bfd69 cc5bd02 Author: Dmitiry Setrakyan Authored: Sun Mar 22 01:12:40 2015 -0700 Committer: Dmitiry Setrakyan Committed: Sun Mar 22 01:12:40 2015 -0700 -- .../IgniteExecutorServiceExample.java | 68 .../java8/datastructures/package-info.java | 22 +++ 2 files changed, 90 insertions(+) --
[1/2] incubator-ignite git commit: # ignite-45 - service example fixes..
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 cc5bd026e -> b34d7ae4e
# ignite-45 - service example 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/c2bfd696
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2bfd696
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2bfd696
Branch: refs/heads/ignite-45
Commit: c2bfd69626523b0d35bae08b4aa39dbec46a8724
Parents: 0eb53a9
Author: Dmitiry Setrakyan
Authored: Sun Mar 22 01:12:29 2015 -0700
Committer: Dmitiry Setrakyan
Committed: Sun Mar 22 01:12:29 2015 -0700
--
.../examples/servicegrid/ServicesExample.java | 17
.../servicegrid/SimpleMapServiceImpl.java | 29
2 files changed, 18 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2bfd696/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
index c8786cf..1a10211 100644
---
a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServicesExample.java
@@ -18,7 +18,6 @@
package org.apache.ignite.examples.servicegrid;
import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
import org.apache.ignite.examples.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
@@ -45,19 +44,15 @@ public class ServicesExample {
* @throws Exception If example execution failed.
*/
public static void main(String[] args) throws Exception {
-try (Ignite ignite =
Ignition.start("examples/config/example-ignite.xml")) {
-ClusterGroup rmts = ignite.cluster().forRemotes();
-
-if (rmts.nodes().isEmpty()) {
-System.err.println(">>>");
-System.err.println(">>> Must start at least one remote node
using " +
-ExampleNodeStartup.class.getSimpleName() + '.');
-System.err.println(">>>");
+// Mark this node as client node.
+Ignition.setClientMode(true);
+try (Ignite ignite =
Ignition.start("examples/config/example-ignite.xml")) {
+if (!ExamplesUtils.hasServerNodes(ignite))
return;
-}
-IgniteServices svcs = ignite.services(rmts);
+// Deploy services only on server nodes.
+IgniteServices svcs =
ignite.services(ignite.cluster().forServers());
try {
// Deploy cluster singleton.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2bfd696/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
b/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
index 5be2352..72bf7ef 100644
---
a/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
+++
b/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
@@ -18,63 +18,58 @@
package org.apache.ignite.examples.servicegrid;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.services.*;
/**
- * Simple service which loops infinitely and prints out a counter.
+ * Simple service which utilizes Ignite cache as a mechanism to provide
+ * distributed {@link SimpleMapService} functionality.
*/
public class SimpleMapServiceImpl implements Service,
SimpleMapService {
/** Serial version UID. */
private static final long serialVersionUID = 0L;
-/** Cache name. */
-private static final String CACHE_NAME =
SimpleMapServiceImpl.class.getSimpleName();
-
/** Ignite instance. */
@IgniteInstanceResource
private Ignite ignite;
/** Underlying cache map. */
-private IgniteCache map;
+private IgniteCache cache;
/** {@inheritDoc} */
@Override public void put(K key, V val) {
-map.put(key, val);
+cache.put(key, val);
}
/** {@inheritDoc} */
@Override public V get(K key) {
-return map.get(key);
+return cache.get(key);
}
/** {@inheritDoc} */
@Override public void clear() {
-map.clear();
+cache.clear();
}
incubator-ignite git commit: # ignite-45 - service example fixes..
Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 b34d7ae4e -> b31c9c29b # ignite-45 - service example 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/b31c9c29 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b31c9c29 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b31c9c29 Branch: refs/heads/ignite-45 Commit: b31c9c29b2be40b3a03ffb1189d9c5a2fbf9d881 Parents: b34d7ae Author: Dmitiry Setrakyan Authored: Sun Mar 22 01:47:48 2015 -0700 Committer: Dmitiry Setrakyan Committed: Sun Mar 22 01:47:48 2015 -0700 -- examples/config/store/example-database.script | 27 .../schema-import/bin/example-database.script | 34 2 files changed, 34 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b31c9c29/examples/config/store/example-database.script -- diff --git a/examples/config/store/example-database.script b/examples/config/store/example-database.script deleted file mode 100644 index 80e418b..000 --- a/examples/config/store/example-database.script +++ /dev/null @@ -1,27 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one or more --- contributor license agreements. See the NOTICE file distributed with --- this work for additional information regarding copyright ownership. --- The ASF licenses this file to You under the Apache License, Version 2.0 --- (the "License"); you may not use this file except in compliance with --- the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -create table PERSON(id bigint not null, first_name varchar(50), last_name varchar(50), PRIMARY KEY(id)); - -insert into PERSON(id, first_name, last_name) values(1, 'first-name-1', 'last-name-1'); -insert into PERSON(id, first_name, last_name) values(2, 'first-name-2', 'last-name-2'); -insert into PERSON(id, first_name, last_name) values(3, 'first-name-3', 'last-name-3'); -insert into PERSON(id, first_name, last_name) values(4, 'first-name-4', 'last-name-4'); -insert into PERSON(id, first_name, last_name) values(5, 'first-name-5', 'last-name-5'); -insert into PERSON(id, first_name, last_name) values(6, 'first-name-6', 'last-name-6'); -insert into PERSON(id, first_name, last_name) values(7, 'first-name-7', 'last-name-7'); -insert into PERSON(id, first_name, last_name) values(8, 'first-name-8', 'last-name-8'); -insert into PERSON(id, first_name, last_name) values(9, 'first-name-9', 'last-name-9'); -insert into PERSON(id, first_name, last_name) values(10, 'first-name-10', 'last-name-10'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b31c9c29/examples/schema-import/bin/example-database.script -- diff --git a/examples/schema-import/bin/example-database.script b/examples/schema-import/bin/example-database.script new file mode 100644 index 000..3a2a9fb --- /dev/null +++ b/examples/schema-import/bin/example-database.script @@ -0,0 +1,34 @@ +-- Licensed to the Apache Software Foundation (ASF) under one or more +-- contributor license agreements. See the NOTICE file distributed with +-- this work for additional information regarding copyright ownership. +-- The ASF licenses this file to You under the Apache License, Version 2.0 +-- (the "License"); you may not use this file except in compliance with +-- the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. + + +-- +-- This script is used to pre-populate the database for Schema Import Demo. +-- It can be executed on H2 database available with Ignite. +-- You can start H2 database server with "h2-server.sh" or "h2-server.bat" scripts. +-- + +create table PERSON(id bigint not null, first_name varchar(50), last_name varchar(50), PRIMARY KEY(id)); + +insert into PERSON(id, first_name, last_name) values(1, 'first-name-1', 'last-name-1'); +insert into PERSON
incubator-ignite git commit: # ignite-45 - update permissions
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 b31c9c29b -> 45329857e
# ignite-45 - update permissions
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45329857
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45329857
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45329857
Branch: refs/heads/ignite-45
Commit: 45329857ebfeb36db06e8c3201bfdcaa481fd976
Parents: b31c9c2
Author: Dmitiry Setrakyan
Authored: Sun Mar 22 02:00:47 2015 -0700
Committer: Dmitiry Setrakyan
Committed: Sun Mar 22 02:00:47 2015 -0700
--
examples/schema-import/bin/h2-server.bat | 0
examples/schema-import/bin/h2-server.sh | 0
examples/schema-import/bin/schema-import.bat | 0
examples/schema-import/bin/schema-import.sh | 2 +-
4 files changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45329857/examples/schema-import/bin/h2-server.bat
--
diff --git a/examples/schema-import/bin/h2-server.bat
b/examples/schema-import/bin/h2-server.bat
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45329857/examples/schema-import/bin/h2-server.sh
--
diff --git a/examples/schema-import/bin/h2-server.sh
b/examples/schema-import/bin/h2-server.sh
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45329857/examples/schema-import/bin/schema-import.bat
--
diff --git a/examples/schema-import/bin/schema-import.bat
b/examples/schema-import/bin/schema-import.bat
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45329857/examples/schema-import/bin/schema-import.sh
--
diff --git a/examples/schema-import/bin/schema-import.sh
b/examples/schema-import/bin/schema-import.sh
old mode 100644
new mode 100755
index e3cd9bd..4c0f910
--- a/examples/schema-import/bin/schema-import.sh
+++ b/examples/schema-import/bin/schema-import.sh
@@ -45,7 +45,7 @@ checkJava
#
setIgniteHome
-# Starts Ignite Schema Import Wizard with settings for demo.
+# Starts Ignite Schema Import Wizard with settings for this demo.
"${IGNITE_HOME}/bin/ignite-schema-import.sh" \
jdbc.db.preset=0 \
jdbc.driver.jar="${IGNITE_HOME}/libs/ignite-indexing/h2-1.3.175.jar" \
incubator-ignite git commit: # ignite-45 - fixing DB script.
Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 45329857e -> 30a78d6eb # ignite-45 - fixing DB script. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/30a78d6e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/30a78d6e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/30a78d6e Branch: refs/heads/ignite-45 Commit: 30a78d6ebc470db8ebe653b09f3801262790af58 Parents: 4532985 Author: Dmitiry Setrakyan Authored: Sun Mar 22 02:02:54 2015 -0700 Committer: Dmitiry Setrakyan Committed: Sun Mar 22 02:02:54 2015 -0700 -- examples/schema-import/bin/example-database.script | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30a78d6e/examples/schema-import/bin/example-database.script -- diff --git a/examples/schema-import/bin/example-database.script b/examples/schema-import/bin/example-database.script index 3a2a9fb..7222856 100644 --- a/examples/schema-import/bin/example-database.script +++ b/examples/schema-import/bin/example-database.script @@ -20,6 +20,8 @@ -- You can start H2 database server with "h2-server.sh" or "h2-server.bat" scripts. -- +drop table PERSON; + create table PERSON(id bigint not null, first_name varchar(50), last_name varchar(50), PRIMARY KEY(id)); insert into PERSON(id, first_name, last_name) values(1, 'first-name-1', 'last-name-1');
incubator-ignite git commit: # ignite-45 - fixing DB script.
Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 30a78d6eb -> a7f2c8297 # ignite-45 - fixing DB script. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a7f2c829 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7f2c829 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7f2c829 Branch: refs/heads/ignite-45 Commit: a7f2c82977c61035e96311840181bc4ecf995b6f Parents: 30a78d6 Author: Dmitiry Setrakyan Authored: Sun Mar 22 02:03:30 2015 -0700 Committer: Dmitiry Setrakyan Committed: Sun Mar 22 02:03:30 2015 -0700 -- examples/schema-import/bin/example-database.script | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7f2c829/examples/schema-import/bin/example-database.script -- diff --git a/examples/schema-import/bin/example-database.script b/examples/schema-import/bin/example-database.script index 7222856..8305127 100644 --- a/examples/schema-import/bin/example-database.script +++ b/examples/schema-import/bin/example-database.script @@ -18,6 +18,7 @@ -- This script is used to pre-populate the database for Schema Import Demo. -- It can be executed on H2 database available with Ignite. -- You can start H2 database server with "h2-server.sh" or "h2-server.bat" scripts. +-- When started, copy the SQL below into H2 console and execute. -- drop table PERSON;
[1/2] incubator-ignite git commit: # ignite-45 fixing permissions
Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 a7f2c8297 -> 7180e5baf # ignite-45 fixing permissions Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a45e827 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a45e827 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a45e827 Branch: refs/heads/ignite-45 Commit: 2a45e827f6ebab601afaffb280dc2c274dc9e854 Parents: a7f2c82 Author: Dmitiry Setrakyan Authored: Sun Mar 22 02:06:06 2015 -0700 Committer: Dmitiry Setrakyan Committed: Sun Mar 22 02:06:06 2015 -0700 -- bin/ignite-schema-import.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a45e827/bin/ignite-schema-import.sh -- diff --git a/bin/ignite-schema-import.sh b/bin/ignite-schema-import.sh old mode 100644 new mode 100755
[2/2] incubator-ignite git commit: # ignite-45: fixing permissions
# ignite-45: fixing permissions Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7180e5ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7180e5ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7180e5ba Branch: refs/heads/ignite-45 Commit: 7180e5baf40a7174a98254dc1b139f1d369d2249 Parents: 2a45e82 Author: Dmitiry Setrakyan Authored: Sun Mar 22 02:07:26 2015 -0700 Committer: Dmitiry Setrakyan Committed: Sun Mar 22 02:07:26 2015 -0700 -- examples/schema-import/bin/h2-server.bat | 0 examples/schema-import/bin/schema-import.bat | 0 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7180e5ba/examples/schema-import/bin/h2-server.bat -- diff --git a/examples/schema-import/bin/h2-server.bat b/examples/schema-import/bin/h2-server.bat old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7180e5ba/examples/schema-import/bin/schema-import.bat -- diff --git a/examples/schema-import/bin/schema-import.bat b/examples/schema-import/bin/schema-import.bat old mode 100755 new mode 100644
[4/4] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Merge remote-tracking branch 'origin/ignite-45' into ignite-45 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/56457639 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/56457639 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/56457639 Branch: refs/heads/ignite-45 Commit: 564576391e9c74b1dcfa280cc4c154c154283f6c Parents: 49be282 7180e5b Author: Valentin Kulichenko Authored: Sun Mar 22 02:13:25 2015 -0700 Committer: Valentin Kulichenko Committed: Sun Mar 22 02:13:25 2015 -0700 -- bin/ignite-schema-import.sh | 0 examples/schema-import/bin/h2-server.bat | 0 examples/schema-import/bin/schema-import.bat | 0 3 files changed, 0 insertions(+), 0 deletions(-) --
[1/4] incubator-ignite git commit: # IGNITE-45 - Examples
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 7180e5baf -> 564576391
# IGNITE-45 - 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/b8d18b84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b8d18b84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b8d18b84
Branch: refs/heads/ignite-45
Commit: b8d18b84b760a5539e2d3daa285ccf10fe1545aa
Parents: b34d7ae
Author: Valentin Kulichenko
Authored: Sun Mar 22 02:07:15 2015 -0700
Committer: Valentin Kulichenko
Committed: Sun Mar 22 02:07:15 2015 -0700
--
examples/config/example-cache.xml | 3 +--
examples/rest/http-rest-example.php | 10 ++
examples/rest/memcache-rest-example.php | 10 --
.../rest/handlers/cache/GridCacheCommandHandler.java | 2 --
.../rest/protocols/http/jetty/GridJettyRestHandler.java | 5 +++--
5 files changed, 14 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b8d18b84/examples/config/example-cache.xml
--
diff --git a/examples/config/example-cache.xml
b/examples/config/example-cache.xml
index 916c452..98e1a71 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -40,8 +40,7 @@
-
-
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b8d18b84/examples/rest/http-rest-example.php
--
diff --git a/examples/rest/http-rest-example.php
b/examples/rest/http-rest-example.php
index 82504ba..fe20f4e 100644
--- a/examples/rest/http-rest-example.php
+++ b/examples/rest/http-rest-example.php
@@ -19,7 +19,10 @@
*/
/**
- * To execute this script simply start up an instance of Ignite with cache
enabled.
+ * To execute this script you will have to enable optional `ignite-rest-http`
module -
+ * copy `libs/optional/ignite-rest-http` folder into `libs` (one level up).
+ *
+ * After that start up an instance of Ignite with cache enabled.
* You can use configuration from examples/config folder as follows:
*
* ${IGNITE_HOME}/bin/ignite.sh examples/config/example-cache.xml
@@ -40,9 +43,8 @@ if (!function_exists('json_decode'))
$URL = 'http://localhost:8080/ignite?';
-// Cache name to use.
-// Empty string represents default cache which is used by default in this
example.
-$CACHE_NAME = "";
+// Cache name to use (null or empty string for default cache).
+$CACHE_NAME = null;
/**
* Creates URL parameters.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b8d18b84/examples/rest/memcache-rest-example.php
--
diff --git a/examples/rest/memcache-rest-example.php
b/examples/rest/memcache-rest-example.php
index c5165eb..4edcd4b 100644
--- a/examples/rest/memcache-rest-example.php
+++ b/examples/rest/memcache-rest-example.php
@@ -19,13 +19,11 @@
*/
/**
- * This example shows how to use PHP Memcache client for manipulating Ignite
cache.
+ * To execute this script you will have to enable optional `ignite-rest-http`
module -
+ * copy `libs/optional/ignite-rest-http` folder into `libs` (one level up).
*
- * To execute this script you need to have PHP Memcached extension installed.
- * See http://pecl.php.net/package/memcached for details.
- *
- * You can use configuration from examples/config folder to
- * start up an instance of Ignite with cache enabled as follows:
+ * After that start up an instance of Ignite with cache enabled.
+ * You can use configuration from examples/config folder as follows:
*
* ${IGNITE_HOME}/bin/ignite.sh examples/config/example-cache.xml
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b8d18b84/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 0f45991..efa4f6f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -532,8 +532,6 @@ public class GridCacheCommandHandler e
[2/4] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Merge remote-tracking branch 'origin/ignite-45' into ignite-45 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e43c4655 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e43c4655 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e43c4655 Branch: refs/heads/ignite-45 Commit: e43c4655c4d271a7b11130d4813cdea6493b6129 Parents: b8d18b8 a7f2c82 Author: Valentin Kulichenko Authored: Sun Mar 22 02:07:54 2015 -0700 Committer: Valentin Kulichenko Committed: Sun Mar 22 02:07:54 2015 -0700 -- examples/config/store/example-database.script | 27 -- .../schema-import/bin/example-database.script | 37 examples/schema-import/bin/h2-server.bat| 0 examples/schema-import/bin/h2-server.sh | 0 examples/schema-import/bin/schema-import.bat| 0 examples/schema-import/bin/schema-import.sh | 2 +- 6 files changed, 38 insertions(+), 28 deletions(-) --
[3/4] incubator-ignite git commit: # IGNITE-45 - Examples
# IGNITE-45 - 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/49be282f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49be282f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49be282f Branch: refs/heads/ignite-45 Commit: 49be282f12f3c3fbec7478c5fbafd10566132f92 Parents: e43c465 Author: Valentin Kulichenko Authored: Sun Mar 22 02:13:05 2015 -0700 Committer: Valentin Kulichenko Committed: Sun Mar 22 02:13:05 2015 -0700 -- examples/rest/memcache-rest-example.php | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/49be282f/examples/rest/memcache-rest-example.php -- diff --git a/examples/rest/memcache-rest-example.php b/examples/rest/memcache-rest-example.php index 4edcd4b..66525dd 100644 --- a/examples/rest/memcache-rest-example.php +++ b/examples/rest/memcache-rest-example.php @@ -19,6 +19,9 @@ */ /** + * To execute this script you need to have PHP Memcached extension installed. + * See http://pecl.php.net/package/memcached for details. + * * To execute this script you will have to enable optional `ignite-rest-http` module - * copy `libs/optional/ignite-rest-http` folder into `libs` (one level up). *
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Merge remote-tracking branch 'origin/ignite-45' into ignite-45 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e7f3a158 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e7f3a158 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e7f3a158 Branch: refs/heads/ignite-45 Commit: e7f3a15815e071e858ca99d0916d003fec72fd0e Parents: ee46194 5645763 Author: Dmitiry Setrakyan Authored: Sun Mar 22 02:13:21 2015 -0700 Committer: Dmitiry Setrakyan Committed: Sun Mar 22 02:13:21 2015 -0700 -- examples/config/example-cache.xml | 3 +-- examples/rest/http-rest-example.php | 10 ++ examples/rest/memcache-rest-example.php | 9 + .../rest/handlers/cache/GridCacheCommandHandler.java | 2 -- .../rest/protocols/http/jetty/GridJettyRestHandler.java | 5 +++-- 5 files changed, 15 insertions(+), 14 deletions(-) --
[1/2] incubator-ignite git commit: # ignite-45 - fixing DB script.
Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 564576391 -> e7f3a1581 # ignite-45 - fixing DB script. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ee46194e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ee46194e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ee46194e Branch: refs/heads/ignite-45 Commit: ee46194e3ce487fbd5a6500ce1b4471f9a1a6740 Parents: 7180e5b Author: Dmitiry Setrakyan Authored: Sun Mar 22 02:13:13 2015 -0700 Committer: Dmitiry Setrakyan Committed: Sun Mar 22 02:13:13 2015 -0700 -- examples/schema-import/bin/schema-import.bat | 2 +- examples/schema-import/bin/schema-import.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee46194e/examples/schema-import/bin/schema-import.bat -- diff --git a/examples/schema-import/bin/schema-import.bat b/examples/schema-import/bin/schema-import.bat index 1ac78af..3016122 100644 --- a/examples/schema-import/bin/schema-import.bat +++ b/examples/schema-import/bin/schema-import.bat @@ -16,7 +16,7 @@ :: :: -:: Starts Ignite Schema Import Wizard with predefined settings for demo. +:: Starts Ignite Schema Import Wizard with predefined settings for the demo. :: @echo off http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee46194e/examples/schema-import/bin/schema-import.sh -- diff --git a/examples/schema-import/bin/schema-import.sh b/examples/schema-import/bin/schema-import.sh index 4c0f910..c59ed1b 100755 --- a/examples/schema-import/bin/schema-import.sh +++ b/examples/schema-import/bin/schema-import.sh @@ -17,7 +17,7 @@ # # -# Starts Ignite Schema Import Wizard with predefined settings for demo. +# Starts Ignite Schema Import Wizard with predefined settings for the demo. # #
incubator-ignite git commit: # ignite-45 - Moved memcached example.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 e7f3a1581 -> a515b4705
# ignite-45 - Moved memcached example.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a515b470
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a515b470
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a515b470
Branch: refs/heads/ignite-45
Commit: a515b470503058f9c8f4d8e1acbdbe36e0ed678a
Parents: e7f3a15
Author: Dmitiry Setrakyan
Authored: Sun Mar 22 02:15:22 2015 -0700
Committer: Dmitiry Setrakyan
Committed: Sun Mar 22 02:15:22 2015 -0700
--
examples/memcached/memcached-example.php | 93 +++
examples/rest/memcache-rest-example.php | 93 ---
2 files changed, 93 insertions(+), 93 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a515b470/examples/memcached/memcached-example.php
--
diff --git a/examples/memcached/memcached-example.php
b/examples/memcached/memcached-example.php
new file mode 100644
index 000..66525dd
--- /dev/null
+++ b/examples/memcached/memcached-example.php
@@ -0,0 +1,93 @@
+#!/bin/php
+
+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.
+ */
+
+/**
+ * To execute this script you need to have PHP Memcached extension installed.
+ * See http://pecl.php.net/package/memcached for details.
+ *
+ * To execute this script you will have to enable optional `ignite-rest-http`
module -
+ * copy `libs/optional/ignite-rest-http` folder into `libs` (one level up).
+ *
+ * After that start up an instance of Ignite with cache enabled.
+ * You can use configuration from examples/config folder as follows:
+ *
+ * ${IGNITE_HOME}/bin/ignite.sh examples/config/example-cache.xml
+ *
+ */
+
+// Create client instance.
+$client = new Memcached();
+
+// Set localhost and port (set to correct values).
+$client->addServer("localhost", 11211);
+
+// Force client to use binary protocol.
+$client->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
+
+// Put entry to cache.
+if ($client->add("key", "val"))
+echo ">>> Successfully put entry in cache.\n";
+
+// Check entry value.
+echo(">>> Value for 'key': " . $client->get("key") . "\n");
+
+echo(">>>\n");
+
+// Change value of entry.
+if ($client->set("key", "newVal"))
+echo(">>> Successfully changed value of entry.\n");
+
+// Check entry value.
+echo(">>> New value for 'key': " . $client->get("key") . "\n");
+
+echo(">>>\n");
+
+// Put one more entry to cache.
+if ($client->add("anotherKey", "anotherVal"))
+echo ">>> Successfully put entry in cache.\n";
+
+// Check entry value.
+echo(">>> Value for 'anotherKey': " . $client->get("anotherKey") . "\n");
+
+echo(">>>\n");
+
+// Get both entries.
+$map = $client->getMulti(array("key", "anotherKey"));
+
+if ($map) {
+echo(">>> Successfully fetched two entries from cache.\n");
+
+echo(">>> Value for 'key': " . $map["key"] . "\n");
+echo(">>> Value for 'anotherKey': " . $map["anotherKey"] . "\n");
+}
+
+echo(">>>\n");
+
+// Remove one entry.
+if ($client->delete("key"))
+echo(">>> Successfully removed entry from cache.\n");
+
+echo(">>>\n");
+
+// Remove all entries.
+if ($client->flush())
+echo(">>> Successfully cleared cache.\n");
+
+?>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a515b470/examples/rest/memcache-rest-example.php
--
diff --git a/examples/rest/memcache-rest-example.php
b/examples/rest/memcache-rest-example.php
deleted file mode 100644
index 66525dd..000
--- a/examples/rest/memcache-rest-example.php
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/php
-
-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.
- */
-
-/**
- * To execute this script you need to have PHP Memcached extension installed.
- * See http://pecl.php.net/package/memcached for details.
- *
- * To execute this script you will have to enable optional `ignite-rest-http`
module -
- * copy `libs/optional/ignite-rest-http` folder into `libs` (one level up).
- *
- * After that start up an i
incubator-ignite git commit: # ignite-45 - example update.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 a515b4705 -> 249537cd2
# ignite-45 - example update.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/249537cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/249537cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/249537cd
Branch: refs/heads/ignite-45
Commit: 249537cd2c0c7dadcd70a946c67ae668e68890ff
Parents: a515b47
Author: Dmitiry Setrakyan
Authored: Sun Mar 22 02:35:40 2015 -0700
Committer: Dmitiry Setrakyan
Committed: Sun Mar 22 02:35:40 2015 -0700
--
.../ignite/examples/java8/datagrid/CacheApiExample.java | 9 +
.../org/apache/ignite/examples/java8/package-info.java | 3 ++-
2 files changed, 3 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/249537cd/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
--
diff --git
a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
index 597a841..efe045f 100644
---
a/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
+++
b/examples/src/main/java8/org/apache/ignite/examples/java8/datagrid/CacheApiExample.java
@@ -89,14 +89,7 @@ public class CacheApiExample {
IgniteFuture fut = asyncCache.future();
//Asynchronously wait for result.
-fut.listen(fut1 -> {
-try {
-System.out.println("Put operation completed [previous-value="
+ fut1.get() + ']');
-}
-catch (IgniteException e) {
-e.printStackTrace();
-}
-});
+fut.listen(f -> System.out.println("Put operation completed
[previous-value=" + f.get() + ']'));
// Put-if-absent.
boolean b1 = cache.putIfAbsent(4, "4");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/249537cd/examples/src/main/java8/org/apache/ignite/examples/java8/package-info.java
--
diff --git
a/examples/src/main/java8/org/apache/ignite/examples/java8/package-info.java
b/examples/src/main/java8/org/apache/ignite/examples/java8/package-info.java
index 05fd206..d936877 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/java8/package-info.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/java8/package-info.java
@@ -17,6 +17,7 @@
/**
*
- * Basic examples for ignite functionality.
+ * Basic examples for ignite functionality utilizing Java8 lambdas.
+ * Use "java8" examples with JDK8 in addition to the "java" examples.
*/
package org.apache.ignite.examples.java8;
[1/3] incubator-ignite git commit: # IGNITE-330 Added README.txt.
Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 249537cd2 -> 2f32b7ed6 # IGNITE-330 Added README.txt. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e1922576 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1922576 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1922576 Branch: refs/heads/ignite-45 Commit: e192257677cbedda9890f9f64ebb5139799963f8 Parents: 249537c Author: AKuznetsov Authored: Sun Mar 22 18:06:20 2015 +0700 Committer: AKuznetsov Committed: Sun Mar 22 18:06:20 2015 +0700 -- examples/schema-import/README.txt | 15 +++ 1 file changed, 15 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1922576/examples/schema-import/README.txt -- diff --git a/examples/schema-import/README.txt b/examples/schema-import/README.txt new file mode 100644 index 000..5000d2a --- /dev/null +++ b/examples/schema-import/README.txt @@ -0,0 +1,15 @@ +Apache Ignite Schema Import Utility +=== + +Ignite ships with CacheJdbcPojoStore, which is out-of-the-box JDBC +implementation of the IgniteCacheStore interface, and automatically +handles all the write-through and read-through logic. + +Ignite also ships with its own database schema mapping wizard which provides automatic +support for integrating with persistence stores. This utility automatically connects to +the underlying database and generates all the required XML OR-mapping configuration +and Java domain model POJOs. + +For information on how to get started with Apache Ignite Schema Import Utility please visit: + +http://apacheignite.readme.io/v1.0/docs/automatic-persistence
[2/3] incubator-ignite git commit: # IGNITE-330 removed not needed check for simple type.
# IGNITE-330 removed not needed check for simple type.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6ff0792f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6ff0792f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6ff0792f
Branch: refs/heads/ignite-45
Commit: 6ff0792fd119adf5bcefa04633a845d959d41170
Parents: e192257
Author: AKuznetsov
Authored: Sun Mar 22 18:07:02 2015 +0700
Committer: AKuznetsov
Committed: Sun Mar 22 18:07:02 2015 +0700
--
.../apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java | 4
1 file changed, 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6ff0792f/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
index 6a43929..8861f85 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
@@ -513,10 +513,6 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
throw new CacheException("Missing database name in mapping
description [cache name=" + cacheName
+ ", type=" + clsName + " ]");
-if (field.getJavaName() != null)
-throw new CacheException("Missing field name in mapping
description [cache name=" + cacheName
-+ ", type=" + clsName + " ]");
-
field.setJavaType(cls);
}
else
[3/3] incubator-ignite git commit: # IGNITE-330 Reworked example to not use external script.
# IGNITE-330 Reworked example to not use external script.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f32b7ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f32b7ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f32b7ed
Branch: refs/heads/ignite-45
Commit: 2f32b7ed68bac65f2748631bc1e41088a8fbf6ca
Parents: 6ff0792
Author: AKuznetsov
Authored: Sun Mar 22 18:07:41 2015 +0700
Committer: AKuznetsov
Committed: Sun Mar 22 18:07:41 2015 +0700
--
.../schema-import/bin/example-database.script | 37
.../store/jdbc/CacheJdbcPojoPersonStore.java| 22 ++--
2 files changed, 11 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f32b7ed/examples/schema-import/bin/example-database.script
--
diff --git a/examples/schema-import/bin/example-database.script
b/examples/schema-import/bin/example-database.script
deleted file mode 100644
index 8305127..000
--- a/examples/schema-import/bin/example-database.script
+++ /dev/null
@@ -1,37 +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.
-
-
---
--- This script is used to pre-populate the database for Schema Import Demo.
--- It can be executed on H2 database available with Ignite.
--- You can start H2 database server with "h2-server.sh" or "h2-server.bat"
scripts.
--- When started, copy the SQL below into H2 console and execute.
---
-
-drop table PERSON;
-
-create table PERSON(id bigint not null, first_name varchar(50), last_name
varchar(50), PRIMARY KEY(id));
-
-insert into PERSON(id, first_name, last_name) values(1, 'first-name-1',
'last-name-1');
-insert into PERSON(id, first_name, last_name) values(2, 'first-name-2',
'last-name-2');
-insert into PERSON(id, first_name, last_name) values(3, 'first-name-3',
'last-name-3');
-insert into PERSON(id, first_name, last_name) values(4, 'first-name-4',
'last-name-4');
-insert into PERSON(id, first_name, last_name) values(5, 'first-name-5',
'last-name-5');
-insert into PERSON(id, first_name, last_name) values(6, 'first-name-6',
'last-name-6');
-insert into PERSON(id, first_name, last_name) values(7, 'first-name-7',
'last-name-7');
-insert into PERSON(id, first_name, last_name) values(8, 'first-name-8',
'last-name-8');
-insert into PERSON(id, first_name, last_name) values(9, 'first-name-9',
'last-name-9');
-insert into PERSON(id, first_name, last_name) values(10, 'first-name-10',
'last-name-10');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f32b7ed/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPojoPersonStore.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPojoPersonStore.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPojoPersonStore.java
index 86f3403..4d88463 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPojoPersonStore.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPojoPersonStore.java
@@ -20,7 +20,6 @@ package org.apache.ignite.examples.datagrid.store.jdbc;
import org.apache.ignite.*;
import org.apache.ignite.cache.store.jdbc.*;
import org.apache.ignite.examples.datagrid.store.model.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
import org.h2.tools.*;
import javax.cache.*;
@@ -52,6 +51,16 @@ public class CacheJdbcPojoPersonStore extends
CacheJdbcPojoStore {
}
}
+/** */
+private static final String DB_SCRIPT =
+"create table PERSON(id bigint not null, first_name varchar(50),
last_name varchar(50), PRIMARY KEY(id));\n" +
+"insert into PERSON(id, first_name, last_name) values(1, 'Johannes',
'Kepler');\n" +
+"insert into PERSON(id, first_name, last_name) values(2, 'Ga
incubator-ignite git commit: # IGNITE-45 Fixed compilation.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 2f32b7ed6 -> c2eab73e6
# IGNITE-45 Fixed compilation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2eab73e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2eab73e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2eab73e
Branch: refs/heads/ignite-45
Commit: c2eab73e636d79e1dcc7e5df6aba88a0e6a56e74
Parents: 2f32b7e
Author: AKuznetsov
Authored: Sun Mar 22 18:11:59 2015 +0700
Committer: AKuznetsov
Committed: Sun Mar 22 18:11:59 2015 +0700
--
.../apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2eab73e/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
b/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
index 72bf7ef..38db88b 100644
---
a/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
+++
b/examples/src/main/java/org/apache/ignite/examples/servicegrid/SimpleMapServiceImpl.java
@@ -69,7 +69,7 @@ public class SimpleMapServiceImpl implements Service,
SimpleMapService(ctx.name()));
+cache = ignite.getOrCreateCache(new CacheConfiguration(ctx.name()));
System.out.println("Service was initialized: " + ctx.name());
}
incubator-ignite git commit: # IGNITE-45 Enabled write behind.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 c2eab73e6 -> ea5346130
# IGNITE-45 Enabled write behind.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea534613
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea534613
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea534613
Branch: refs/heads/ignite-45
Commit: ea5346130eea5857ec5503bea4537d68064d9a40
Parents: c2eab73
Author: AKuznetsov
Authored: Sun Mar 22 19:09:36 2015 +0700
Committer: AKuznetsov
Committed: Sun Mar 22 19:09:36 2015 +0700
--
examples/schema-import/src/main/java/org/apache/ignite/Demo.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea534613/examples/schema-import/src/main/java/org/apache/ignite/Demo.java
--
diff --git a/examples/schema-import/src/main/java/org/apache/ignite/Demo.java
b/examples/schema-import/src/main/java/org/apache/ignite/Demo.java
index 10ed54e..8cd7818 100644
--- a/examples/schema-import/src/main/java/org/apache/ignite/Demo.java
+++ b/examples/schema-import/src/main/java/org/apache/ignite/Demo.java
@@ -37,6 +37,9 @@ public class Demo {
ccfg.setReadThrough(true);
ccfg.setWriteThrough(true);
+// Enable database batching.
+ccfg.setWriteBehindEnabled(true);
+
// Configure cache types metadata.
ccfg.setTypeMetadata(ConfigurationSnippet.typeMetadata());
incubator-ignite git commit: # IGNITE-330 Move code to "schema" package in order to avoid ambiguity.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 ea5346130 -> c7b864532
# IGNITE-330 Move code to "schema" package in order to avoid ambiguity.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7b86453
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7b86453
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7b86453
Branch: refs/heads/ignite-45
Commit: c7b864532ed910a27049588c25d6aee3b741fd5d
Parents: ea53461
Author: AKuznetsov
Authored: Sun Mar 22 19:30:19 2015 +0700
Committer: AKuznetsov
Committed: Sun Mar 22 19:30:19 2015 +0700
--
examples/schema-import/bin/schema-import.bat| 2 +-
examples/schema-import/bin/schema-import.sh | 2 +-
.../org/apache/ignite/ConfigurationSnippet.java | 38 -
.../src/main/java/org/apache/ignite/Demo.java | 59 ---
.../src/main/java/org/apache/ignite/Person.java | 33 ---
.../main/java/org/apache/ignite/PersonKey.java | 31 --
.../ignite/schema/ConfigurationSnippet.java | 38 +
.../java/org/apache/ignite/schema/Demo.java | 60
.../java/org/apache/ignite/schema/Person.java | 33 +++
.../org/apache/ignite/schema/PersonKey.java | 31 ++
10 files changed, 164 insertions(+), 163 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7b86453/examples/schema-import/bin/schema-import.bat
--
diff --git a/examples/schema-import/bin/schema-import.bat
b/examples/schema-import/bin/schema-import.bat
index 3016122..18bf01d 100644
--- a/examples/schema-import/bin/schema-import.bat
+++ b/examples/schema-import/bin/schema-import.bat
@@ -82,7 +82,7 @@ if exist "%IGNITE_HOME%\config" goto run
jdbc.url="jdbc:h2:tcp://localhost/%IGNITE_HOME%\examples\schema-import\demo" ^
jdbc.user=sa ^
out.folder="%IGNITE_HOME%\examples\schema-import\src\main\java" ^
- pojo.package=org.apache.ignite ^
+ pojo.package=org.apache.ignite.schema ^
pojo.constructor=true
:error_finish
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7b86453/examples/schema-import/bin/schema-import.sh
--
diff --git a/examples/schema-import/bin/schema-import.sh
b/examples/schema-import/bin/schema-import.sh
index c59ed1b..7517abb 100755
--- a/examples/schema-import/bin/schema-import.sh
+++ b/examples/schema-import/bin/schema-import.sh
@@ -53,5 +53,5 @@ setIgniteHome
jdbc.url="jdbc:h2:tcp://localhost/${IGNITE_HOME}/examples/schema-import/demo"
\
jdbc.user=sa \
out.folder="${IGNITE_HOME}/examples/schema-import/src/main/java" \
- pojo.package=org.apache.ignite \
+ pojo.package=org.apache.ignite.schema \
pojo.constructor=true
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7b86453/examples/schema-import/src/main/java/org/apache/ignite/ConfigurationSnippet.java
--
diff --git
a/examples/schema-import/src/main/java/org/apache/ignite/ConfigurationSnippet.java
b/examples/schema-import/src/main/java/org/apache/ignite/ConfigurationSnippet.java
deleted file mode 100644
index 640beb1..000
---
a/examples/schema-import/src/main/java/org/apache/ignite/ConfigurationSnippet.java
+++ /dev/null
@@ -1,38 +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;
-
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-
-import java.util.*;
-
-/**
- * ConfigurationSnippet stub. Will be generated by Ignite Schema Import
Utility.
- */
-public class ConfigurationSnippet {
-/** Configure cache store. */
-public static CacheStore store() {
-throw new IllegalStateException("ConfigurationSnippet should be
generated by Ignite Schema Import Utility");
-}
-
-/** Configure cache types metadata. */
-public static Collection typeMetadata() {
-t
incubator-ignite git commit: # IGNITE-45 - Examples
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 c7b864532 -> 082ad6b0a
# IGNITE-45 - 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/082ad6b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/082ad6b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/082ad6b0
Branch: refs/heads/ignite-45
Commit: 082ad6b0ad44f8134b83733e756b151acefdc81a
Parents: c7b8645
Author: Valentin Kulichenko
Authored: Sun Mar 22 11:44:10 2015 -0700
Committer: Valentin Kulichenko
Committed: Sun Mar 22 11:44:10 2015 -0700
--
.../java8/datastructures/IgniteExecutorServiceExample.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/082ad6b0/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
--
diff --git
a/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
b/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
index bab9a2b..2526f60 100644
---
a/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
+++
b/examples/src/main/java8/org/apache/ignite/examples/java8/datastructures/IgniteExecutorServiceExample.java
@@ -19,6 +19,7 @@ package org.apache.ignite.examples.java8.datastructures;
import org.apache.ignite.*;
import org.apache.ignite.examples.*;
+import org.apache.ignite.lang.*;
import java.util.concurrent.*;
@@ -50,7 +51,7 @@ public final class IgniteExecutorServiceExample {
// Iterate through all words in the sentence and create callable
jobs.
for (final String word : "Print words using runnable".split(" ")) {
// Execute runnable on some node.
-exec.submit(() -> {
+exec.submit((IgniteRunnable)() -> {
System.out.println();
System.out.println(">>> Printing '" + word + "' on this
node from ignite job.");
});
incubator-ignite git commit: # ignite-45 - example update.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 082ad6b0a -> 71976a7bb
# ignite-45 - example update.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71976a7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71976a7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71976a7b
Branch: refs/heads/ignite-45
Commit: 71976a7bb416d36d69f3e37a07083305d24c9bf6
Parents: 082ad6b
Author: Dmitiry Setrakyan
Authored: Sun Mar 22 12:08:01 2015 -0700
Committer: Dmitiry Setrakyan
Committed: Sun Mar 22 12:08:01 2015 -0700
--
.../datagrid/store/dummy/CacheDummyPersonStore.java | 9 -
1 file changed, 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71976a7b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
index 7b04528..3640122 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
@@ -106,15 +106,6 @@ public class CacheDummyPersonStore extends
CacheStoreAdapter {
* @return Current transaction.
*/
@Nullable private Transaction transaction() {
-CacheStoreSession ses = session();
-
return ses != null ? ses.transaction() : null;
}
-
-/**
- * @return Store session.
- */
-private CacheStoreSession session() {
-return ses;
-}
}
incubator-ignite git commit: # ignite-45 - example update.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 71976a7bb -> f4e9c473a
# ignite-45 - example update.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f4e9c473
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f4e9c473
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f4e9c473
Branch: refs/heads/ignite-45
Commit: f4e9c473a5c32f9073726eb0b1283f82c951088b
Parents: 71976a7
Author: Dmitiry Setrakyan
Authored: Sun Mar 22 12:10:17 2015 -0700
Committer: Dmitiry Setrakyan
Committed: Sun Mar 22 12:10:17 2015 -0700
--
.../hibernate/CacheHibernatePersonStore.java| 37 +++-
1 file changed, 13 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f4e9c473/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
index a022fb9..d6f14a0 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
@@ -204,11 +204,9 @@ public class CacheHibernatePersonStore extends
CacheStoreAdapter {
/** {@inheritDoc} */
@Override public void txEnd(boolean commit) {
-CacheStoreSession storeSes = session();
+Transaction tx = ses.transaction();
-Transaction tx = storeSes.transaction();
-
-Map props = storeSes.properties();
+Map props = ses.properties();
Session ses = props.remove(ATTR_SES);
@@ -245,47 +243,38 @@ public class CacheHibernatePersonStore extends
CacheStoreAdapter {
* @return Session.
*/
private Session session(@Nullable Transaction tx) {
-Session ses;
+Session hbSes;
if (tx != null) {
-Map props = session().properties();
+Map props = ses.properties();
-ses = props.get(ATTR_SES);
+hbSes = props.get(ATTR_SES);
-if (ses == null) {
-ses = sesFactory.openSession();
+if (hbSes == null) {
+hbSes = sesFactory.openSession();
-ses.beginTransaction();
+hbSes.beginTransaction();
// Store session in session properties, so it can be accessed
// for other operations on the same transaction.
-props.put(ATTR_SES, ses);
+props.put(ATTR_SES, hbSes);
-System.out.println("Hibernate session open [ses=" + ses + ",
tx=" + tx.xid() + "]");
+System.out.println("Hibernate session open [ses=" + hbSes + ",
tx=" + tx.xid() + "]");
}
}
else {
-ses = sesFactory.openSession();
+hbSes = sesFactory.openSession();
-ses.beginTransaction();
+hbSes.beginTransaction();
}
-return ses;
+return hbSes;
}
/**
* @return Current transaction.
*/
@Nullable private Transaction transaction() {
-CacheStoreSession ses = session();
-
return ses != null ? ses.transaction() : null;
}
-
-/**
- * @return Store session.
- */
-private CacheStoreSession session() {
-return ses;
-}
}
incubator-ignite git commit: IGNITE-45 - Fixed getOrCreate.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 f4e9c473a -> 60d63a61a
IGNITE-45 - Fixed getOrCreate.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60d63a61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60d63a61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60d63a61
Branch: refs/heads/ignite-45
Commit: 60d63a61a33e7c1dbe4e1283793ba1dd11a64955
Parents: f4e9c47
Author: Alexey Goncharuk
Authored: Sun Mar 22 12:44:27 2015 -0700
Committer: Alexey Goncharuk
Committed: Sun Mar 22 12:44:27 2015 -0700
--
.../cache/DynamicCacheChangeRequest.java| 17 ++
.../GridCachePartitionExchangeManager.java | 5 +-
.../processors/cache/GridCacheProcessor.java| 47 +++--
.../GridDhtPartitionsExchangeFuture.java| 3 +
.../ignite/internal/util/IgniteUtils.java | 3 -
.../cache/IgniteDynamicCacheStartSelfTest.java | 170 +++
6 files changed, 224 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/60d63a61/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index a539e1d..830078c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -54,6 +54,9 @@ public class DynamicCacheChangeRequest implements
Serializable {
/** Stop flag. */
private boolean stop;
+/** Fail if exists flag. */
+private boolean failIfExists;
+
/**
* Constructor creates cache stop request.
*
@@ -169,6 +172,20 @@ public class DynamicCacheChangeRequest implements
Serializable {
this.clientStartOnly = clientStartOnly;
}
+/**
+ * @return Fail if exists flag.
+ */
+public boolean failIfExists() {
+return failIfExists;
+}
+
+/**
+ * @param failIfExists Fail if exists flag.
+ */
+public void failIfExists(boolean failIfExists) {
+this.failIfExists = failIfExists;
+}
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(DynamicCacheChangeRequest.class, this, "cacheName",
cacheName());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/60d63a61/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 201801f..e44d666 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
@@ -151,6 +151,8 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
for (DynamicCacheChangeRequest req : batch.requests())
{
if (cctx.cache().dynamicCacheRegistered(req))
valid.add(req);
+else
+cctx.cache().completeStartFuture(req);
}
if (!F.isEmpty(valid)) {
@@ -672,9 +674,6 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
if (fut.onAdded()) {
exchWorker.addFuture(fut);
-for (GridCacheContext cacheCtx : cctx.cacheContexts())
-cacheCtx.preloader().onExchangeFutureAdded();
-
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/60d63a61/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 543e8c7..5bbba49 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/co
[40/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-542
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-542 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00b8a28e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00b8a28e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00b8a28e Branch: refs/heads/ignite-379-1 Commit: 00b8a28ec26952f6eeab795c5b3f1bba02dfc791 Parents: 3e1a05b 62f93c2 Author: Valentin Kulichenko Authored: Fri Mar 20 16:54:51 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Mar 20 16:54:51 2015 -0700 -- .../apache/ignite/cache/CacheTypeMetadata.java | 6 ++ .../ignite/cache/query/SqlFieldsQuery.java | 7 -- .../apache/ignite/cache/query/TextQuery.java| 14 ++-- .../processors/cache/IgniteCacheProxy.java | 10 ++- .../cache/query/GridCacheQueriesImpl.java | 2 +- .../cache/query/GridCacheTwoStepQuery.java | 20 ++ .../query/GridQueryCacheObjectsIterator.java| 70 .../processors/query/GridQueryIndexing.java | 20 +++--- .../processors/query/GridQueryProcessor.java| 62 ++--- .../ignite/internal/util/IgniteUtils.java | 16 + .../processors/query/h2/IgniteH2Indexing.java | 32 ++--- .../h2/twostep/GridReduceQueryExecutor.java | 13 ++-- 12 files changed, 197 insertions(+), 75 deletions(-) --
[18/50] [abbrv] incubator-ignite git commit: # IGNITE-515: Code cleanup from streamer.
# IGNITE-515: Code cleanup from streamer.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f08fe8b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f08fe8b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f08fe8b6
Branch: refs/heads/ignite-379-1
Commit: f08fe8b60a638c2991396c566f5f642643ebc31d
Parents: 1cc3d52
Author: AKuznetsov
Authored: Fri Mar 20 08:08:34 2015 +0700
Committer: AKuznetsov
Committed: Fri Mar 20 08:08:34 2015 +0700
--
.../visor/node/VisorNodeDataCollectorJob.java | 2 +-
.../node/VisorNodeDataCollectorJobResult.java | 17 ---
.../visor/node/VisorNodeDataCollectorTask.java | 3 --
.../node/VisorNodeDataCollectorTaskResult.java | 31 +++-
4 files changed, 11 insertions(+), 42 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f08fe8b6/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index a01bb1f..f40b1ec 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -207,7 +207,7 @@ public class VisorNodeDataCollectorJob extends
VisorJobhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f08fe8b6/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
index b1bc44e..134447c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
@@ -61,9 +61,6 @@ public class VisorNodeDataCollectorJobResult implements
Serializable {
/** Exception while collecting node IGFSs. */
private Throwable igfssEx;
-/** Exception while collecting node streamers. */
-private Throwable streamersEx;
-
/** Errors count. */
private long errCnt;
@@ -180,20 +177,6 @@ public class VisorNodeDataCollectorJobResult implements
Serializable {
}
/**
- * @return Exception caught during collecting streamers metrics.
- */
-public Throwable streamersEx() {
-return streamersEx;
-}
-
-/**
- * @param streamersEx Exception caught during collecting streamers metrics.
- */
-public void streamersEx(Throwable streamersEx) {
-this.streamersEx = streamersEx;
-}
-
-/**
* @return Errors count.
*/
public long errorCount() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f08fe8b6/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
index 723b1a3..b6c9bbd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
@@ -123,9 +123,6 @@ public class VisorNodeDataCollectorTask extends
VisorMultiNodeTaskhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f08fe8b6/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
index bacfbc4..6485978 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
@@ -67,26 +67,22 @@ public class VisorNodeDataCollectorTaskResult implements
Serializable {
/** Exceptions caught during collecting I
[01/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Repository: incubator-ignite Updated Branches: refs/heads/ignite-379-1 1ec04dfb1 -> d628234b6 Merge remote-tracking branch 'origin/sprint-2' into sprint-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/d6fdf05f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6fdf05f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6fdf05f Branch: refs/heads/ignite-379-1 Commit: d6fdf05f1c04b21f9be964bd587d41f26c0bf0b5 Parents: 48b41f2 12f0a8d Author: nikolay_tikhonov Authored: Thu Mar 19 17:15:33 2015 +0300 Committer: nikolay_tikhonov Committed: Thu Mar 19 17:15:33 2015 +0300 -- .../apache/ignite/internal/IgniteKernal.java| 2 +- .../deployment/GridDeploymentLocalStore.java| 5 +- .../GridDeploymentPerLoaderStore.java | 5 +- .../GridDeploymentPerVersionStore.java | 5 +- .../continuous/CacheContinuousQueryHandler.java | 3 -- .../continuous/CacheContinuousQueryManager.java | 4 -- .../optimized/OptimizedClassDescriptor.java | 20 ++-- .../optimized/OptimizedMarshaller.java | 30 +++- .../optimized/OptimizedMarshallerUtils.java | 50 +++- .../optimized/OptimizedObjectInputStream.java | 20 ++-- .../optimized/OptimizedObjectOutputStream.java | 22 +++-- .../processors/service/DummyService.java| 4 ++ .../optimized/OptimizedMarshallerTest.java | 4 +- .../OptimizedObjectStreamSelfTest.java | 8 +++- .../testframework/junits/GridAbstractTest.java | 2 +- .../config/benchmark-multicast.properties | 2 +- 16 files changed, 109 insertions(+), 77 deletions(-) --
[26/50] [abbrv] incubator-ignite git commit: # IGNITE-520 Minor fix for Heap Memory Used calculation.
# IGNITE-520 Minor fix for Heap Memory Used calculation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/49027b79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49027b79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49027b79
Branch: refs/heads/ignite-379-1
Commit: 49027b7983ac77440bc428ded6f949f914d78e3a
Parents: 747b4b8
Author: AKuznetsov
Authored: Fri Mar 20 15:46:37 2015 +0700
Committer: AKuznetsov
Committed: Fri Mar 20 15:46:37 2015 +0700
--
.../apache/ignite/visor/commands/cache/VisorCacheCommand.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/49027b79/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 37dc479..762f53d 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -349,9 +349,9 @@ class VisorCacheCommand {
ciT += (
nodeId8Addr(nid),
nm.getTotalCpus,
-formatDouble(nm.getHeapMemoryUsed /
nm.getHeapMemoryMaximum * 100.0d) + " %",
+formatDouble(100d * nm.getHeapMemoryUsed /
nm.getHeapMemoryMaximum) + " %",
-formatDouble(nm.getCurrentCpuLoad * 100.0) + "
%",
+formatDouble(nm.getCurrentCpuLoad * 100d) + "
%",
X.timeSpan2HMSM(nm.getUpTime),
cm.keySize(),
(
[23/50] [abbrv] incubator-ignite git commit: # ignite-519
# ignite-519
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46c9d815
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46c9d815
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46c9d815
Branch: refs/heads/ignite-379-1
Commit: 46c9d81536e55e9715bd0c359a5619632053a4e7
Parents: 747b4b8
Author: sboikov
Authored: Fri Mar 20 10:08:30 2015 +0300
Committer: sboikov
Committed: Fri Mar 20 10:08:30 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 23 ++-
.../IgniteCacheExpiryPolicyAbstractTest.java| 64 +++-
3 files changed, 72 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46c9d815/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 6710fbc..1418cac 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
@@ -4213,7 +4213,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
/**
- *
+ * @return JCache Iterator.
*/
private Iterator> localIteratorHonorExpirePolicy() {
return F.iterator(iterator(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46c9d815/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 4b2cbc3..a610354 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
@@ -3944,9 +3944,21 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx {
* @return {@code True} if entry is visitable.
*/
public boolean visitable(CacheEntryPredicate[] filter) {
+boolean rmv = false;
+
try {
-if (obsoleteOrDeleted() || (filter != CU.empty0() &&
-!cctx.isAll(this, filter)))
+synchronized (this) {
+if (obsoleteOrDeleted())
+return false;
+
+if (checkExpired()) {
+rmv = markObsolete0(cctx.versions().next(this.ver), true);
+
+return false;
+}
+}
+
+if (filter != CU.empty0() && !cctx.isAll(this, filter))
return false;
}
catch (IgniteCheckedException e) {
@@ -3964,6 +3976,13 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx {
return false;
}
+finally {
+if (rmv) {
+onMarkedObsolete();
+
+cctx.cache().map().removeEntry(this);
+}
+}
IgniteInternalTx tx = cctx.tm().localTxx();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46c9d815/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index bdbd7ec..338b09b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -49,16 +49,19 @@ import static
org.apache.ignite.transactions.TransactionIsolation.*;
*/
public abstract class IgniteCacheExpiryPolicyAbstractTest extends
IgniteCacheAbstractTest {
/** */
+private static final long TTL_FOR_EXPIRE = 500L;
+
+/** */
private Factory factory;
/** */
private boolean nearCache;
/** */
-private Integer lastKey = 0;
+private boolean disableEagerTtl;
/** */
-private static final long TTL_FOR_EXPIRE =
[03/50] [abbrv] incubator-ignite git commit: # Remove dead code.
# Remove dead 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/448e9c3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/448e9c3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/448e9c3c
Branch: refs/heads/ignite-379-1
Commit: 448e9c3c685a8ad08f2e0c02ce455409d487f989
Parents: d6fdf05
Author: sevdokimov
Authored: Thu Mar 19 17:35:04 2015 +0300
Committer: sevdokimov
Committed: Thu Mar 19 17:35:04 2015 +0300
--
.../cache/GridCacheAffinityManager.java | 50 -
.../processors/cache/GridPartitionLockKey.java | 104 ---
.../preloader/GridDhtPartitionSupplyPool.java | 2 +-
.../resources/META-INF/classnames.properties| 1 -
4 files changed, 1 insertion(+), 156 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/448e9c3c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
index c92e1fb..7298188 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -33,50 +33,13 @@ import java.util.*;
* Cache affinity manager.
*/
public class GridCacheAffinityManager extends GridCacheManagerAdapter {
-/** Factor for maximum number of attempts to calculate all partition
affinity keys. */
-private static final int MAX_PARTITION_KEY_ATTEMPT_RATIO = 10;
-
/** Affinity cached function. */
private GridAffinityAssignmentCache aff;
-/** Affinity keys. */
-private GridPartitionLockKey[] partAffKeys;
-
/** {@inheritDoc} */
@Override public void start0() throws IgniteCheckedException {
aff = new GridAffinityAssignmentCache(cctx, cctx.namex(),
cctx.config().getAffinity(),
cctx.config().getAffinityMapper(), cctx.config().getBackups());
-
-// Generate internal keys for partitions.
-int partCnt = partitions();
-
-partAffKeys = new GridPartitionLockKey[partCnt];
-
-Collection found = new HashSet<>();
-
-long affKey = 0;
-
-while (true) {
-GridPartitionLockKey key = new GridPartitionLockKey(affKey);
-
-int part = aff.partition(key);
-
-if (found.add(part)) {
-// This is a key for not yet calculated partition.
-key.partitionId(part);
-
-partAffKeys[part] = key;
-
-if (found.size() == partCnt)
-break;
-}
-
-affKey++;
-
-if (affKey > partCnt * MAX_PARTITION_KEY_ATTEMPT_RATIO)
-throw new IllegalStateException("Failed to calculate partition
affinity keys for given affinity " +
-"function [attemptCnt=" + affKey + ", found=" + found + ",
cacheName=" + cctx.name() + ']');
-}
}
/** {@inheritDoc} */
@@ -178,19 +141,6 @@ public class GridCacheAffinityManager extends
GridCacheManagerAdapter {
}
/**
- * Gets partition affinity key for given partition id. Partition affinity
keys are precalculated
- * on manager start.
- *
- * @param partId Partition ID.
- * @return Affinity key.
- */
-public GridPartitionLockKey partitionAffinityKey(int partId) {
-assert partId >=0 && partId < partAffKeys.length;
-
-return partAffKeys[partId];
-}
-
-/**
* NOTE: Use this method always when you need to calculate partition id for
* a key provided by user. It's required since we should apply affinity
mapper
* logic in order to find a key that will eventually be passed to affinity
function.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/448e9c3c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridPartitionLockKey.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridPartitionLockKey.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridPartitionLockKey.java
deleted file mode 100644
index 62982c0..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridPartitionLockKey.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOT
[24/50] [abbrv] incubator-ignite git commit: #ignite-gg-9924: Small fix in javadoc.
#ignite-gg-9924: Small fix in javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07ac8b18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07ac8b18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07ac8b18
Branch: refs/heads/ignite-379-1
Commit: 07ac8b1854426f24df5102e5ac815a379df7b3dd
Parents: 75ea4a3
Author: ivasilinets
Authored: Fri Mar 20 11:22:45 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 20 11:22:45 2015 +0300
--
.../ignite/marshaller/optimized/OptimizedObjectInputStream.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07ac8b18/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
index 6d02eeb..78190ea 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
@@ -1020,7 +1020,7 @@ class OptimizedObjectInputStream extends
ObjectInputStream {
* {@link GetField} implementation.
*/
private static class GetFieldImpl extends GetField {
-/** Field info map. */
+/** Field info. */
private final OptimizedClassDescriptor.ClassFields fieldInfo;
/** Values. */
[33/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-409' into sprint-2
Merge branch 'ignite-409' into sprint-2 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/302e683e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/302e683e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/302e683e Branch: refs/heads/ignite-379-1 Commit: 302e683ef886368d00fa4cb1e35f54480930da39 Parents: dfcfc0e a7c201c Author: Artem Shutak Authored: Fri Mar 20 16:27:18 2015 +0300 Committer: Artem Shutak Committed: Fri Mar 20 16:27:18 2015 +0300 -- .../managers/discovery/GridDiscoveryManager.java | 6 +++--- .../processors/cache/GridCacheEvictionManager.java| 2 +- .../cache/GridCachePartitionExchangeManager.java | 2 +- .../internal/processors/clock/GridClockServer.java| 2 +- .../processors/clock/GridClockSyncProcessor.java | 2 +- .../ignite/internal/processors/igfs/IgfsServer.java | 4 ++-- .../internal/processors/igfs/IgfsServerManager.java | 4 ++-- .../processors/timeout/GridTimeoutProcessor.java | 2 +- .../ignite/internal/util/worker/GridWorker.java | 14 +++--- .../communication/HadoopExternalCommunication.java| 4 ++-- 10 files changed, 17 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/302e683e/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java --
[39/50] [abbrv] incubator-ignite git commit: ignite-gg-9933 - review fixes
ignite-gg-9933 - review 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/62f93c20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62f93c20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62f93c20
Branch: refs/heads/ignite-379-1
Commit: 62f93c20668fa2fa940481ffde968a0a5e05295b
Parents: eb335a9
Author: S.Vladykin
Authored: Sat Mar 21 02:16:31 2015 +0300
Committer: S.Vladykin
Committed: Sat Mar 21 02:16:31 2015 +0300
--
.../query/GridQueryCacheObjectsIterator.java| 70
.../query/GridQueryPortableFieldsIterator.java | 70
.../processors/query/GridQueryProcessor.java| 2 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
4 files changed, 72 insertions(+), 72 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62f93c20/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
new file mode 100644
index 000..3dc7ddc
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
@@ -0,0 +1,70 @@
+/*
+ * 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.query;
+
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+
+import java.util.*;
+
+/**
+ * Deserializes portable objects if needed.
+ */
+public class GridQueryCacheObjectsIterator implements Iterator>,
AutoCloseable {
+/** */
+private final Iterator> iter;
+
+/** */
+private final GridCacheContext cctx;
+
+/** */
+private final boolean keepPortable;
+
+/**
+ * @param iter Iterator.
+ * @param cctx Cache context.
+ * @param keepPortable Keep portable.
+ */
+public GridQueryCacheObjectsIterator(Iterator> iter,
GridCacheContext cctx, boolean keepPortable) {
+this.iter = iter;
+this.cctx = cctx;
+this.keepPortable = keepPortable;
+}
+
+/** {@inheritDoc} */
+@Override public void close() throws Exception {
+if (iter instanceof AutoCloseable)
+U.closeQuiet((AutoCloseable)iter);
+}
+
+/** {@inheritDoc} */
+@Override public boolean hasNext() {
+return iter.hasNext();
+}
+
+/** {@inheritDoc} */
+@SuppressWarnings("unchecked")
+@Override public List next() {
+return
(List)cctx.unwrapPortablesIfNeeded((Collection)iter.next(),
keepPortable);
+}
+
+/** {@inheritDoc} */
+@Override public void remove() {
+iter.remove();
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62f93c20/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryPortableFieldsIterator.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryPortableFieldsIterator.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryPortableFieldsIterator.java
deleted file mode 100644
index 8ccebe2..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryPortableFieldsIterator.java
+++ /dev/null
@@ -1,70 +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 wi
[50/50] [abbrv] incubator-ignite git commit: # IGNITE-379 Fix compilation errors
# IGNITE-379 Fix compilation errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d628234b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d628234b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d628234b
Branch: refs/heads/ignite-379-1
Commit: d628234b6ea972bacf11e4f4c8ab2de04a650de3
Parents: 03b9ddb
Author: sevdokimov
Authored: Sun Mar 22 22:45:07 2015 +0300
Committer: sevdokimov
Committed: Sun Mar 22 22:45:07 2015 +0300
--
.../IgniteCacheStoreSessionWriteBehindAbstractTest.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d628234b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
index 408bd93..97d7bcd 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
@@ -162,7 +162,7 @@ public abstract class
IgniteCacheStoreSessionWriteBehindAbstractTest extends Ign
}
/** {@inheritDoc} */
-@Override public void txEnd(boolean commit) throws
CacheWriterException {
+@Override public void sessionEnd(boolean commit) throws
CacheWriterException {
fail();
}
[12/50] [abbrv] incubator-ignite git commit: sp-2 streaming cleanup
sp-2 streaming cleanup Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1cc3d528 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1cc3d528 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1cc3d528 Branch: refs/heads/ignite-379-1 Commit: 1cc3d528f8b04e6d5760de297ccfd18afac5c087 Parents: 448e9c3 Author: Yakov Zhdanov Authored: Thu Mar 19 19:50:02 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Mar 19 19:50:02 2015 +0300 -- .../apache/ignite/examples/ExamplesUtils.java | 18 - .../streaming/StreamingCheckInExample.java | 580 .../streaming/StreamingNodeStartup.java | 35 - .../StreamingPopularNumbersExample.java | 250 .../streaming/StreamingPriceBarsExample.java| 451 -- .../StreamingRunningAverageExample.java | 247 .../ignite/examples/streaming/package-info.java | 22 - .../src/main/java/org/apache/ignite/Ignite.java | 17 - .../java/org/apache/ignite/IgniteStreamer.java | 154 -- .../org/apache/ignite/cluster/ClusterGroup.java |9 - .../configuration/IgniteConfiguration.java | 23 - .../ignite/internal/GridKernalContext.java |8 - .../ignite/internal/GridKernalContextImpl.java | 12 - .../apache/ignite/internal/IgniteKernal.java| 26 - .../org/apache/ignite/internal/IgnitionEx.java | 12 - .../internal/cluster/ClusterGroupAdapter.java | 40 - .../cluster/IgniteClusterAsyncImpl.java |5 - .../communication/GridIoMessageFactory.java | 16 - .../GridDeploymentPerLoaderStore.java |1 - .../GridDeploymentPerVersionStore.java |1 - .../streamer/GridStreamProcessor.java | 347 - .../streamer/GridStreamerAttributes.java| 127 -- .../streamer/GridStreamerCancelRequest.java | 110 -- .../streamer/GridStreamerContextDelegate.java | 102 -- .../streamer/GridStreamerContextImpl.java | 201 --- .../streamer/GridStreamerExecutionBatch.java| 175 --- .../streamer/GridStreamerExecutionRequest.java | 293 .../streamer/GridStreamerResponse.java | 144 -- .../GridStreamerRouteFailedException.java | 36 - .../GridStreamerStageExecutionFuture.java | 340 - .../streamer/GridStreamerWindowIterator.java| 40 - .../processors/streamer/IgniteStreamerEx.java | 94 -- .../processors/streamer/IgniteStreamerImpl.java | 1375 -- .../streamer/StreamerMBeanAdapter.java | 116 -- .../streamer/StreamerMetricsAdapter.java| 272 .../streamer/StreamerMetricsHolder.java | 424 -- .../streamer/StreamerStageMBeanAdapter.java | 101 -- .../streamer/StreamerStageMetricsAdapter.java | 135 -- .../streamer/StreamerStageMetricsHolder.java| 167 --- .../streamer/StreamerStageWrapper.java | 90 -- .../streamer/StreamerWindowMetricsAdapter.java | 65 - .../streamer/StreamerWindowMetricsHolder.java | 50 - .../processors/streamer/package-info.java | 22 - .../task/GridStreamerBroadcastTask.java | 137 -- .../streamer/task/GridStreamerQueryTask.java| 140 -- .../streamer/task/GridStreamerReduceTask.java | 144 -- .../ignite/internal/util/IgniteUtils.java | 23 - .../visor/node/VisorGridConfiguration.java | 12 - .../visor/node/VisorNodeDataCollectorJob.java | 35 - .../node/VisorNodeDataCollectorJobResult.java | 11 - .../visor/node/VisorNodeDataCollectorTask.java |3 - .../node/VisorNodeDataCollectorTaskResult.java | 12 - .../internal/visor/streamer/VisorStreamer.java | 104 -- .../streamer/VisorStreamerConfiguration.java| 177 --- .../visor/streamer/VisorStreamerMetrics.java| 350 - .../streamer/VisorStreamerMetricsResetTask.java | 75 - .../visor/streamer/VisorStreamerResetTask.java | 75 - .../streamer/VisorStreamerStageMetrics.java | 277 .../ignite/streamer/StreamerConfiguration.java | 249 .../apache/ignite/streamer/StreamerContext.java | 142 -- .../ignite/streamer/StreamerEventRouter.java| 55 - .../streamer/StreamerEventRouterAdapter.java| 60 - .../streamer/StreamerFailureListener.java | 44 - .../apache/ignite/streamer/StreamerMBean.java | 169 --- .../apache/ignite/streamer/StreamerMetrics.java | 209 --- .../apache/ignite/streamer/StreamerStage.java | 61 - .../ignite/streamer/StreamerStageMBean.java | 114 -- .../ignite/streamer/StreamerStageMetrics.java | 93 -- .../apache/ignite/streamer/StreamerWindow.java | 206 --- .../ignite/streamer/StreamerWindowMBean.java| 58 - .../ignite/streamer/StreamerWindowMetrics.java | 44 - .../ignite/streamer/index/StreamerIndex.java| 305 .../streamer/index/StreamerIndexEntry.java | 57 - .../streamer/index/StreamerIndexPoli
[14/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-409
Merge branch 'sprint-2' into ignite-409 Conflicts: modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/847aeffb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/847aeffb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/847aeffb Branch: refs/heads/ignite-379-1 Commit: 847aeffb483ecd30116375a44d8dd74602f54cfe Parents: 3eca9cc 12f0a8d Author: Artem Shutak Authored: Thu Mar 19 20:42:06 2015 +0300 Committer: Artem Shutak Committed: Thu Mar 19 20:42:06 2015 +0300 -- DEVNOTES.txt| 11 +- assembly/dependencies-hadoop.xml|7 +- bin/ignite-schema-import.bat| 27 +- bin/ignite-schema-import.sh |8 +- bin/include/igniteservice.exe | Bin 6144 -> 0 bytes examples/config/example-cache.xml | 42 +- examples/config/filesystem/example-igfs.xml | 11 +- examples/config/store/example-database.script | 22 +- .../config/store/example-jdbc-pojo-store.xml| 142 -- examples/pom.xml|7 + .../ComputeContinuousMapperExample.java |2 +- .../ComputeFibonacciContinuationExample.java|2 +- .../failover/ComputeFailoverExample.java|1 + .../computegrid/failover/package-info.java | 22 + .../examples/computegrid/failover/package.html | 24 - .../computegrid/montecarlo/package-info.java| 22 + .../computegrid/montecarlo/package.html | 24 - .../examples/computegrid/package-info.java | 22 + .../ignite/examples/computegrid/package.html| 24 - .../datagrid/CachePopularNumbersExample.java|6 +- .../examples/datagrid/CacheQueryExample.java| 73 +- .../datagrid/hibernate/package-info.java| 22 + .../examples/datagrid/hibernate/package.html| 24 - .../ignite/examples/datagrid/package-info.java | 22 + .../ignite/examples/datagrid/package.html | 24 - .../starschema/CacheStarSchemaExample.java | 17 +- .../datagrid/starschema/DimProduct.java |3 +- .../examples/datagrid/starschema/DimStore.java |3 +- .../datagrid/starschema/FactPurchase.java |2 + .../datagrid/starschema/package-info.java | 22 + .../examples/datagrid/starschema/package.html | 24 - .../store/CacheNodeWithStoreStartup.java| 48 +- .../datagrid/store/CacheStoreExample.java | 19 + .../store/CacheStoreLoadDataExample.java| 18 +- .../store/dummy/CacheDummyPersonStore.java |1 + .../datagrid/store/dummy/package-info.java | 22 + .../examples/datagrid/store/dummy/package.html | 24 - .../datagrid/store/hibernate/package-info.java | 22 + .../datagrid/store/hibernate/package.html | 24 - .../store/jdbc/CacheJdbcPojoPersonStore.java| 11 - .../datagrid/store/jdbc/package-info.java | 22 + .../examples/datagrid/store/jdbc/package.html | 24 - .../examples/datagrid/store/model/Person.java |2 +- .../datagrid/store/model/PersonKey.java | 97 - .../examples/datagrid/store/package-info.java | 22 + .../ignite/examples/datagrid/store/package.html | 24 - .../examples/datastructures/package-info.java | 22 + .../ignite/examples/datastructures/package.html | 24 - .../ignite/examples/events/package-info.java| 22 + .../apache/ignite/examples/events/package.html | 24 - .../ignite/examples/igfs/package-info.java | 22 + .../apache/ignite/examples/igfs/package.html| 24 - .../ignite/examples/messaging/package-info.java | 22 + .../ignite/examples/messaging/package.html | 24 - .../MemcacheRestExampleNodeStartup.java |7 - .../misc/client/memcache/package-info.java | 22 + .../examples/misc/client/memcache/package.html | 24 - .../examples/misc/client/package-info.java | 22 + .../ignite/examples/misc/client/package.html| 24 - .../examples/misc/deployment/package-info.java | 22 + .../examples/misc/deployment/package.html | 24 - .../examples/misc/lifecycle/package-info.java | 22 + .../ignite/examples/misc/lifecycle/package.html | 24 - .../ignite/examples/misc/package-info.java | 22 + .../apache/ignite/examples/misc/package.html| 24 - .../examples/misc/springbean/package-info.java | 22 + .../examples/misc/springbean/package.html | 24 - .../apache/ignite/examples/package-info.java| 22 + .../org/apache/ignite/examples/package.html | 24 - .../ignite/examples/streaming/package-info.java | 22 + .../ignite/examples/streaming/package.html | 24 - .../apache/ignite/examples/ComputeExample.java |2 +- .../gridify/aop/aspectj
[45/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-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/6dbffbe7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6dbffbe7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6dbffbe7 Branch: refs/heads/ignite-379-1 Commit: 6dbffbe78edc503858d70f8557356c056c64234a Parents: 05dacbb 71ac8f0 Author: Valentin Kulichenko Authored: Fri Mar 20 20:59:15 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Mar 20 20:59:15 2015 -0700 -- .../ignite/internal/processors/query/GridQueryProcessor.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) --
[19/50] [abbrv] incubator-ignite git commit: # GG-9898 Fixed DR data-node identification.
# GG-9898 Fixed DR data-node identification. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/747b4b82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/747b4b82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/747b4b82 Branch: refs/heads/ignite-379-1 Commit: 747b4b82c3fa5ecd80e12220f40aacc782bcc8cf Parents: 448e9c3 Author: AKuznetsov Authored: Fri Mar 20 10:26:54 2015 +0700 Committer: AKuznetsov Committed: Fri Mar 20 10:26:54 2015 +0700 -- .../resources/META-INF/classnames.properties| 51 +++- 1 file changed, 18 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/747b4b82/modules/core/src/main/resources/META-INF/classnames.properties -- diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index 68765df..05d3d68 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -93,7 +93,6 @@ org.apache.ignite.compute.gridify.aop.GridifyArgumentAdapter org.apache.ignite.compute.gridify.aop.GridifyDefaultRangeTask org.apache.ignite.compute.gridify.aop.GridifyDefaultTask org.apache.ignite.configuration.CacheConfiguration -org.apache.ignite.configuration.CacheQueryConfiguration org.apache.ignite.configuration.DeploymentMode org.apache.ignite.configuration.TransactionConfiguration org.apache.ignite.events.CacheEvent @@ -427,7 +426,6 @@ org.apache.ignite.internal.processors.cache.IgniteCacheProxy$2 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$4 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$5 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$6 -org.apache.ignite.internal.processors.cache.IgniteCacheProxy$7 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$ClIter org.apache.ignite.internal.processors.cache.KeyCacheObject org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl @@ -687,7 +685,6 @@ org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcMetadat org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcTask org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcTask$JdbcDriverJob org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcTask$JdbcDriverJob$1 -org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcTask$JdbcDriverJob$2 org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcValidationTask org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcValidationTask$1 org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx$FinalizationStatus @@ -752,7 +749,7 @@ org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictCont org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$1 org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$2 -org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$3 +org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$IgniteCacheObjectImpl org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage org.apache.ignite.internal.processors.clock.GridClockDeltaVersion org.apache.ignite.internal.processors.closure.GridClosurePolicy @@ -915,6 +912,11 @@ org.apache.ignite.internal.processors.job.GridJobWorker$3 org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor$SnapshotReducer org.apache.ignite.internal.processors.query.GridQueryFieldMetadata org.apache.ignite.internal.processors.query.GridQueryIndexType +org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryCancelRequest +org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryFailResponse +org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageRequest +org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageResponse +org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryRequest org.apache.ignite.internal.processors.rest.GridRestCommand org.apache.ignite.internal.processors.rest.GridRestProcessor$2$1 org.apache.ignite.internal.processors.rest.GridRestProcessor$3 @@ -1124,8 +1126,6 @@ org.apache.ignite.internal.util.lang.GridComputeJobWrapper org.apache.ignite.internal.util.lang.GridFunc$1 org.apache.ignite.internal.util.lang.GridFunc$10 org.apache.ignite.internal.util.lang.GridFunc$100 -org.apache.
[43/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-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/71ac8f09 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71ac8f09 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71ac8f09 Branch: refs/heads/ignite-379-1 Commit: 71ac8f092f37bc83d6ed8161686683b4bc6a7b2c Parents: e444ffc e1c6290 Author: S.Vladykin Authored: Sat Mar 21 06:05:16 2015 +0300 Committer: S.Vladykin Committed: Sat Mar 21 06:05:16 2015 +0300 -- .../internal/util/future/IgniteFutureImpl.java | 5 .../org/apache/ignite/lang/IgniteFuture.java| 31 .../processors/schedule/ScheduleFutureImpl.java | 11 --- 3 files changed, 25 insertions(+), 22 deletions(-) --
[20/50] [abbrv] incubator-ignite git commit: # IGNITE-515 removed pcollection and romix.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1f89b21/modules/core/src/main/java/org/pcollections/HashTreePMap.java
--
diff --git a/modules/core/src/main/java/org/pcollections/HashTreePMap.java
b/modules/core/src/main/java/org/pcollections/HashTreePMap.java
deleted file mode 100644
index 7a8071b..000
--- a/modules/core/src/main/java/org/pcollections/HashTreePMap.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.pcollections;
-
-import java.util.*;
-import java.util.Map.*;
-
-
-/**
- * A static convenience class for creating efficient persistent maps.
- *
- * This class simply creates HashPMaps backed by IntTreePMaps.
- *
- * @author harold
- */
-public final class HashTreePMap {
-private static final HashPMap EMPTY
-= HashPMap.empty(IntTreePMap.>>empty());
-
-// not instantiable (or subclassable):
-private HashTreePMap() {
-}
-
-/**
- * @param
- * @param
- * @return an empty map
- */
-@SuppressWarnings("unchecked")
-public static HashPMap empty() {
-return (HashPMap) EMPTY;
-}
-
-/**
- * @param
- * @param
- * @param key
- * @param value
- * @return empty().plus(key, value)
- */
-public static HashPMap singleton(final K key, final V value) {
-return HashTreePMap.empty().plus(key, value);
-}
-
-/**
- * @param
- * @param
- * @param map
- * @return empty().plusAll(map)
- */
-public static HashPMap from(final Map map) {
-return HashTreePMap.empty().plusAll(map);
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1f89b21/modules/core/src/main/java/org/pcollections/HashTreePSet.java
--
diff --git a/modules/core/src/main/java/org/pcollections/HashTreePSet.java
b/modules/core/src/main/java/org/pcollections/HashTreePSet.java
deleted file mode 100644
index e33e01e..000
--- a/modules/core/src/main/java/org/pcollections/HashTreePSet.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.pcollections;
-
-import java.util.*;
-
-
-/**
- * A static convenience class for creating efficient persistent sets.
- *
- * This class simply creates MapPSets backed by HashTreePMaps.
- *
- * @author harold
- */
-public final class HashTreePSet {
-private static final MapPSet EMPTY =
MapPSet.from(HashTreePMap.empty());
-
-// not instantiable (or subclassable):
-private HashTreePSet() {
-}
-
-/**
- * @param
- * @return an empty set
- */
-@SuppressWarnings("unchecked")
-public static MapPSet empty() {
-return (MapPSet) EMPTY;
-}
-
-/**
- * @param
- * @param e
- * @return empty().plus(e)
- */
-public static MapPSet singleton(final E e) {
-return HashTreePSet.empty().plus(e);
-}
-
-/**
- * @param
- * @param list
- * @return empty().plusAll(map)
- */
-public static MapPSet from(final Collection list) {
-return HashTreePSet.empty().plusAll(list);
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1f89b21/modules/core/src/main/java/org/pcollections/IntTree.java
--
diff --git a/modules/core/src/main/java/org/pcollections/IntTree.java
b/modules/core/src/main/java/org/pcollections/IntTree.java
deleted file mode 100644
index 5d2335a..000
--- a/modules/core/src/main/java/org/pcollections/IntTree.java
+++ /dev/null
@@ -1,320 +0,0 @@
-package org.pcollections;
-
-import java.util.*;
-import java.util.Map.*;
-
-
-/**
- * A non-public utility class for persistent balanced tree maps with integer
keys.
- *
- * To allow for efficiently increasing all keys above a certain value or
decreasing
- * all keys below a certain value, the keys values are stored relative to
their parent.
- * This makes this map a good backing for fast insertion and removal of
indices in a
- * vector.
- *
- * This implementation is thread-safe except for its iterators.
- *
- * Other than that, this tree is based on the Glasgow Haskell Compiler's
Data.Map implementation,
- * which in turn is based on "size balanced binary trees" as described by:
- *
- * Stephen Adams, "Efficient sets: a balancing act",
- * Journal of Functional Programming 3(4):553-562, October 1993,
- * http://www.swiss.ai.mit.edu/~adams/BB/.
- *
- * J. Nievergelt and E.M. Reingold, "Binary search trees of bounded balance",
- * SIAM journal of computing 2(1), March 1973.
- *
- * @param
- * @author harold
- */
-class IntTree {
-// marker value:
-static final IntTree EMPTYNODE = new IntTree();
-private static final int OMEGA = 5;
-private static final int ALPHA = 2;
-private final long key; // we use longs so relative keys can express all
ints
-// (e.g. if this has key -10 and right has 'absolute' key MAXINT,
-// then its relative key
[06/50] [abbrv] incubator-ignite git commit: sp-2 streaming cleanup
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java
b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java
deleted file mode 100644
index 9132972..000
---
a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java
+++ /dev/null
@@ -1,804 +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.streamer.window;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.streamer.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-/**
- * Window that is bounded by size and accumulates events to batches.
- */
-public class StreamerBoundedSizeBatchWindow extends
StreamerWindowAdapter {
-/** Max size. */
-private int batchSize;
-
-/** Min size. */
-private int maxBatches;
-
-/** Reference for queue and size. */
-private volatile QueueHolder holder;
-
-/** Enqueue lock. */
-private ReadWriteLock enqueueLock = new ReentrantReadWriteLock();
-
-/**
- * Gets maximum number of batches can be stored in window.
- *
- * @return Maximum number of batches for window.
- */
-public int getMaximumBatches() {
-return maxBatches;
-}
-
-/**
- * Sets maximum number of batches can be stored in window.
- *
- * @param maxBatches Maximum number of batches for window.
- */
-public void setMaximumBatches(int maxBatches) {
-this.maxBatches = maxBatches;
-}
-
-/**
- * Gets batch size.
- *
- * @return Batch size.
- */
-public int getBatchSize() {
-return batchSize;
-}
-
-/**
- * Sets batch size.
- *
- * @param batchSize Batch size.
- */
-public void setBatchSize(int batchSize) {
-this.batchSize = batchSize;
-}
-
-/** {@inheritDoc} */
-@Override public void checkConfiguration() {
-if (batchSize <= 0)
-throw new IgniteException("Failed to initialize window (batchSize
size must be positive) " +
-"[windowClass=" + getClass().getSimpleName() +
-", maximumBatches=" + maxBatches +
-", batchSize=" + batchSize + ']');
-
-if (maxBatches < 0)
-throw new IgniteException("Failed to initialize window
(maximumBatches cannot be negative) " +
-"[windowClass=" + getClass().getSimpleName() +
-", maximumBatches=" + maxBatches +
-", batchSize=" + batchSize + ']');
-}
-
-/** {@inheritDoc} */
-@Override protected void stop0() {
-// No-op.
-}
-
-/** {@inheritDoc} */
-@Override protected void reset0() {
-ConcurrentLinkedDeque8 first = new ConcurrentLinkedDeque8<>();
-
-Batch b = new Batch(batchSize);
-
-ConcurrentLinkedDeque8.Node n = first.offerLastx(b);
-
-b.node(n);
-
-holder = new QueueHolder(first, new AtomicInteger(1), new
AtomicInteger());
-}
-
-/** {@inheritDoc} */
-@Override public int size() {
-return holder.totalQueueSize().get();
-}
-
-/** {@inheritDoc} */
-@Override protected GridStreamerWindowIterator iterator0() {
-final QueueHolder win = holder;
-
-final Iterator batchIt = win.batchQueue().iterator();
-
-return new GridStreamerWindowIterator() {
-/** Current batch iterator. */
-private ConcurrentLinkedDeque8.IteratorEx curBatchIt;
-
-/** Next batch iterator. Will be null if no more batches
available. */
-private ConcurrentLinkedDeque8.IteratorE
[22/50] [abbrv] incubator-ignite git commit: # IGNITE-515 removed pcollection and romix.
# IGNITE-515 removed pcollection and romix. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c1f89b21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c1f89b21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c1f89b21 Branch: refs/heads/ignite-379-1 Commit: c1f89b2176f3d299a0a758b66ee4905d26240167 Parents: f08fe8b Author: AKuznetsov Authored: Fri Mar 20 13:51:45 2015 +0700 Committer: AKuznetsov Committed: Fri Mar 20 13:51:45 2015 +0700 -- LICENSE.txt | 26 - NOTICE.txt | 11 - modules/core/pom.xml|2 +- .../src/main/java/com/romix/scala/None.java | 27 - .../src/main/java/com/romix/scala/Option.java | 42 - .../src/main/java/com/romix/scala/Some.java | 38 - .../scala/collection/concurrent/BasicNode.java | 32 - .../scala/collection/concurrent/CNodeBase.java | 49 - .../romix/scala/collection/concurrent/Gen.java | 29 - .../scala/collection/concurrent/INodeBase.java | 47 - .../scala/collection/concurrent/ListMap.java| 247 --- .../scala/collection/concurrent/MainNode.java | 51 - .../romix/scala/collection/concurrent/Pair.java | 54 - .../scala/collection/concurrent/TrieMap.java| 1826 -- .../java/org/pcollections/AmortizedPQueue.java | 156 -- .../main/java/org/pcollections/ConsPStack.java | 225 --- .../src/main/java/org/pcollections/Empty.java | 47 - .../main/java/org/pcollections/HashPMap.java| 175 -- .../java/org/pcollections/HashTreePBag.java | 47 - .../java/org/pcollections/HashTreePMap.java | 52 - .../java/org/pcollections/HashTreePSet.java | 46 - .../src/main/java/org/pcollections/IntTree.java | 320 --- .../main/java/org/pcollections/IntTreePMap.java | 165 -- .../src/main/java/org/pcollections/MapPBag.java | 143 -- .../src/main/java/org/pcollections/MapPSet.java | 101 - .../main/java/org/pcollections/OrderedPSet.java | 85 - .../src/main/java/org/pcollections/PBag.java| 23 - .../main/java/org/pcollections/PCollection.java | 56 - .../src/main/java/org/pcollections/PMap.java| 49 - .../main/java/org/pcollections/POrderedSet.java | 25 - .../src/main/java/org/pcollections/PQueue.java | 38 - .../main/java/org/pcollections/PSequence.java | 73 - .../src/main/java/org/pcollections/PSet.java| 23 - .../src/main/java/org/pcollections/PStack.java | 51 - .../src/main/java/org/pcollections/PVector.java | 45 - .../org/pcollections/SimpleImmutableEntry.java | 146 -- .../main/java/org/pcollections/TreePVector.java | 155 -- .../resources/META-INF/classnames.properties|2 - .../GridImmutableCollectionsPerfomanceTest.java | 120 -- .../ignite/lang/utils/GridPCollectionsTest.java | 54 - .../ignite/lang/utils/GridTrieMapSelfTest.java | 242 --- pom.xml |4 +- 42 files changed, 2 insertions(+), 5147 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1f89b21/LICENSE.txt -- diff --git a/LICENSE.txt b/LICENSE.txt index 185cf44..623a7be 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -213,32 +213,6 @@ licenses. == -For the pcollections library (https://github.com/blackdrag/pcollections) -== -The MIT License (MIT) - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - -== For SnapTree: ==
[27/50] [abbrv] incubator-ignite git commit: # IGNITE-517 Minor fix for Schema Import to support java 8.
# IGNITE-517 Minor fix for Schema Import to support java 8.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1356a206
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1356a206
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1356a206
Branch: refs/heads/ignite-379-1
Commit: 1356a20627be5aa0405a8a04823e5ee0af47ba5a
Parents: 49027b7
Author: AKuznetsov
Authored: Fri Mar 20 16:01:00 2015 +0700
Committer: AKuznetsov
Committed: Fri Mar 20 16:01:00 2015 +0700
--
.../org/apache/ignite/schema/ui/Controls.java | 42 ++--
.../ignite/schema/ui/SchemaImportApp.java | 14 ++-
2 files changed, 25 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1356a206/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/Controls.java
--
diff --git
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/Controls.java
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/Controls.java
index e270edb..6c4d6bd 100644
---
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/Controls.java
+++
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/Controls.java
@@ -31,6 +31,7 @@ import javafx.scene.input.*;
import javafx.scene.layout.*;
import javafx.scene.text.*;
import javafx.util.*;
+import javafx.util.converter.*;
/**
* Utility class to create controls.
@@ -541,10 +542,6 @@ public class Controls {
/** */
private final TextColumnValidator validator;
/** */
-private boolean cancelling;
-/** */
-private boolean hardCancel;
-/** */
private String curTxt = "";
/** Row value. */
@@ -566,6 +563,8 @@ public class Controls {
* @param validator Input text validator.
*/
private TextFieldTableCellEx(TextColumnValidator validator) {
+super(new DefaultStringConverter());
+
this.validator = validator;
}
@@ -580,15 +579,13 @@ public class Controls {
rowVal = getTableView().getSelectionModel().getSelectedItem();
-curTxt = "";
-
-hardCancel = false;
-
Node g = getGraphic();
if (g != null) {
final TextField tf = (TextField)g;
+curTxt = tf.getText();
+
tf.textProperty().addListener(new ChangeListener() {
@Override public void changed(ObservableValue val, String oldVal, String newVal) {
curTxt = newVal;
@@ -597,13 +594,8 @@ public class Controls {
tf.setOnKeyPressed(new EventHandler() {
@Override public void handle(KeyEvent evt) {
-if (KeyCode.ENTER == evt.getCode())
+if (KeyCode.ENTER == evt.getCode() || KeyCode.ESCAPE
== evt.getCode())
cancelEdit();
-else if (KeyCode.ESCAPE == evt.getCode()) {
-hardCancel = true;
-
-cancelEdit();
-}
}
});
@@ -640,22 +632,12 @@ public class Controls {
/** {@inheritDoc} */
@Override public void cancelEdit() {
-if (cancelling)
-super.cancelEdit();
-else
-try {
-cancelling = true;
-
-if (hardCancel || curTxt.trim().isEmpty())
-super.cancelEdit();
-else if (validator.valid(rowVal, curTxt))
-commitEdit(curTxt);
-else
-super.cancelEdit();
-}
-finally {
-cancelling = false;
-}
+boolean editing = isEditing();
+
+super.cancelEdit();
+
+if (editing && validator.valid(rowVal, curTxt))
+updateItem(curTxt, false);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1356a206/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
--
diff --git
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
index bbd5f3f..22192cd 100644
---
a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
+++
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
@@ -753,6
[41/50] [abbrv] incubator-ignite git commit: ignite-gg-9933 - value type can be a class
ignite-gg-9933 - value type can be a class
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e444ffc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e444ffc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e444ffc2
Branch: refs/heads/ignite-379-1
Commit: e444ffc2c0a55f0b0d067ed36dd09799c4a04783
Parents: 62f93c2
Author: S.Vladykin
Authored: Sat Mar 21 04:55:43 2015 +0300
Committer: S.Vladykin
Committed: Sat Mar 21 04:55:43 2015 +0300
--
.../ignite/internal/processors/query/GridQueryProcessor.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e444ffc2/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 63fe7ac..6bd47a4 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
@@ -1064,9 +1064,11 @@ public class GridQueryProcessor extends
GridProcessorAdapter {
if (F.isEmpty(meta.getValueType()))
throw new IgniteCheckedException("Value type is not set: " + meta);
-d.name(meta.getValueType());
+Class valCls = U.classForName(meta.getValueType(), null);
-d.valueClass(U.classForName(meta.getValueType(), Object.class));
+d.name(valCls != null ? typeName(valCls) : meta.getValueType());
+
+d.valueClass(valCls != null ? valCls : Object.class);
d.keyClass(meta.getKeyType() == null ? Object.class :
U.classForName(meta.getKeyType(), Object.class));
return d;
[48/50] [abbrv] incubator-ignite git commit: Merge sprint-2 to ignite-379-1
Merge sprint-2 to ignite-379-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d1ffd0e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d1ffd0e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d1ffd0e4 Branch: refs/heads/ignite-379-1 Commit: d1ffd0e42669f1eaab3eacc26f5fbcc385ef4b05 Parents: 1ec04df 6837e12 Author: sevdokimov Authored: Sun Mar 22 22:28:04 2015 +0300 Committer: sevdokimov Committed: Sun Mar 22 22:28:04 2015 +0300 -- DEVNOTES.txt| 23 + DISCLAIMER.txt | 15 + LICENSE.txt | 68 +- NOTICE.txt | 20 +- README.txt | 25 + RELEASE_NOTES.txt | 18 + assembly/dependencies-hadoop.xml|7 +- assembly/dependencies-optional-fabric.xml |2 +- assembly/dependencies-optional-hadoop.xml |2 +- assembly/dependencies-schema-import.xml | 56 + assembly/dependencies-schema-load.xml | 56 - assembly/release-base.xml | 20 +- assembly/release-fabric.xml |5 - assembly/release-hadoop.xml | 16 +- bin/ignite-schema-import.bat| 97 + bin/ignite-schema-import.sh | 78 + bin/ignite-schema-load.bat | 116 - bin/ignite-schema-load.sh | 78 - bin/igniterouter.sh |7 +- bin/ignitevisorcmd.bat |7 +- bin/ignitevisorcmd.sh |7 +- bin/include/igniteservice.exe | Bin 6144 -> 0 bytes bin/include/target-classpath.bat|2 +- bin/include/target-classpath.sh |2 +- bin/setup-hadoop.sh |7 +- config/hadoop/default-config.xml| 10 +- docs/core-site.ignite.xml | 90 - docs/hadoop_readme.md | 117 - docs/hadoop_readme.pdf | Bin 82297 -> 0 bytes docs/hive-site.ignite.xml | 37 - docs/ignite_readme.md | 100 - docs/ignite_readme.pdf | Bin 77136 -> 0 bytes docs/mapred-site.ignite.xml | 66 - docs/release_notes.md | 16 - docs/release_notes.pdf | Bin 33174 -> 0 bytes examples/config/example-cache.xml | 46 +- examples/config/filesystem/example-igfs.xml | 24 +- examples/config/store/example-database.script | 27 + examples/pom-standalone.xml |2 +- examples/pom.xml|7 + .../apache/ignite/examples/ExamplesUtils.java | 18 - .../ComputeContinuousMapperExample.java |2 +- .../ComputeFibonacciContinuationExample.java| 14 +- .../failover/ComputeFailoverExample.java|1 + .../computegrid/failover/package-info.java | 22 + .../examples/computegrid/failover/package.html | 24 - .../computegrid/montecarlo/package-info.java| 22 + .../computegrid/montecarlo/package.html | 24 - .../examples/computegrid/package-info.java | 22 + .../ignite/examples/computegrid/package.html| 24 - .../examples/datagrid/CacheApiExample.java |2 +- .../datagrid/CacheDataLoaderExample.java| 85 - .../datagrid/CacheDataStreamerExample.java | 85 + .../datagrid/CachePopularNumbersExample.java| 18 +- .../examples/datagrid/CacheQueryExample.java| 73 +- .../datagrid/hibernate/package-info.java| 22 + .../examples/datagrid/hibernate/package.html| 24 - .../ignite/examples/datagrid/package-info.java | 22 + .../ignite/examples/datagrid/package.html | 24 - .../starschema/CacheStarSchemaExample.java | 17 +- .../datagrid/starschema/DimProduct.java |3 +- .../examples/datagrid/starschema/DimStore.java |3 +- .../datagrid/starschema/FactPurchase.java |2 + .../datagrid/starschema/package-info.java | 22 + .../examples/datagrid/starschema/package.html | 24 - .../store/CacheNodeWithStoreStartup.java| 67 +- .../datagrid/store/CacheStoreExample.java | 20 + .../store/CacheStoreLoadDataExample.java| 20 +- .../ignite/examples/datagrid/store/Person.java | 103 - .../store/dummy/CacheDummyPersonStore.java |3 +- .../datagrid/store/dummy/package-info.java | 22 + .../examples/datagrid/store/dummy/package.html | 24 - .../hibernate/CacheHibernatePersonStore.java|2 +- .../datagrid/store/hibernate/Person.
[04/50] [abbrv] incubator-ignite git commit: sp-2 streaming cleanup
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java
deleted file mode 100644
index 9c34085..000
---
a/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java
+++ /dev/null
@@ -1,179 +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.loadtests.streamer;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.streamer.index.*;
-import org.apache.ignite.streamer.index.hash.*;
-import org.apache.ignite.streamer.index.tree.*;
-import org.apache.ignite.streamer.window.*;
-
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import static org.apache.ignite.loadtests.util.GridLoadTestArgs.*;
-import static org.apache.ignite.testframework.GridTestUtils.*;
-
-/**
- * Load test for streamer index.
- */
-public class GridStreamerIndexLoadTest {
-/**
- * Window index configuration.
- */
-private enum IndexConfiguration {
-/**
- * Tree index with non-unique elements and no event tracking.
- */
-TREE_INDEX_NOT_UNIQUE {
-/** {@inheritDoc} */
-@Override
-StreamerIndexProvider indexProvider() {
-StreamerTreeIndexProvider idx = new
StreamerTreeIndexProvider<>();
-
-idx.setUpdater(new IndexUpdater());
-idx.setUnique(false);
-idx.setPolicy(StreamerIndexPolicy.EVENT_TRACKING_OFF);
-
-return idx;
-}
-},
-
-/**
- * Hash index with non-unique elements and no event tracking.
- */
-HASH_INDEX_NOT_UNIQUE {
-/** {@inheritDoc} */
-@Override
-StreamerIndexProvider indexProvider() {
-StreamerHashIndexProvider idx = new
StreamerHashIndexProvider<>();
-
-idx.setUpdater(new IndexUpdater());
-idx.setUnique(false);
-idx.setPolicy(StreamerIndexPolicy.EVENT_TRACKING_OFF);
-
-return idx;
-}
-};
-
-/**
- * @return Index provider for this index configuration.
- */
-abstract StreamerIndexProvider indexProvider();
-}
-
-/**
- * @param args Command line arguments.
- * @throws Exception If error occurs.
- */
-public static void main(String[] args) throws Exception {
-for (IndexConfiguration idxCfg :
EnumSet.allOf(IndexConfiguration.class)) {
-X.println(">>> Running benchmark for configuration: " + idxCfg);
-
-runBenchmark(idxCfg);
-}
-}
-
-/**
- * Runs the benchmark for the specified index configuration.
- *
- * @param idxCfg Index configuration.
- * @throws Exception If error occurs.
- */
-public static void runBenchmark(IndexConfiguration idxCfg) throws
Exception {
-int thrCnt = getIntProperty(THREADS_CNT, 1);
-int dur = getIntProperty(TEST_DUR_SEC, 60);
-int winSize = getIntProperty("IGNITE_WIN_SIZE", 5000);
-
-dumpProperties(System.out);
-
-final StreamerBoundedSizeWindow win = new
StreamerBoundedSizeWindow<>();
-
-win.setMaximumSize(winSize);
-win.setIndexes(idxCfg.indexProvider());
-
-win.start();
-
-final AtomicLong enqueueCntr = new AtomicLong();
-
-IgniteInternalFuture enqueueFut = runMultiThreadedAsync(new
CAX() {
-@Override public void applyx() {
-Random rnd = new Random();
-
-while (!Thread.currentThread().isInterrupted()) {
-win.enqueue(rnd.nextInt());
-
-enqueueCntr.incrementAndGet();
-}
-}
-
[42/50] [abbrv] incubator-ignite git commit: #IGNITE-542 - Minor
#IGNITE-542 - 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/e1c6290b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1c6290b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1c6290b Branch: refs/heads/ignite-379-1 Commit: e1c6290ba53dca6090725e2f8bda3ea2488e01c3 Parents: 00b8a28 Author: Valentin Kulichenko Authored: Fri Mar 20 19:36:06 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Mar 20 19:36:06 2015 -0700 -- .../core/src/main/java/org/apache/ignite/lang/IgniteFuture.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1c6290b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java index 9a4aa9b..cb12a76 100644 --- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java @@ -23,8 +23,7 @@ import java.util.concurrent.*; /** * Future with simplified exception handling, functional programming support - * and ability to listen for future completion via functional - * callback. + * and ability to listen for future completion via functional callback. * * @param Type of the result for the future. */
[47/50] [abbrv] incubator-ignite git commit: Merge sprint-2 to ignite-379-1
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionProxyImpl.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d1ffd0e4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java --
[09/50] [abbrv] incubator-ignite git commit: sp-2 streaming cleanup
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/StreamerWindowMetricsAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/StreamerWindowMetricsAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/StreamerWindowMetricsAdapter.java
deleted file mode 100644
index 2739ad1..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/StreamerWindowMetricsAdapter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.streamer;
-
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.streamer.*;
-
-/**
- * Streamer window metrics adapter.
- */
-public class StreamerWindowMetricsAdapter implements StreamerWindowMetrics {
-/** Window name. */
-private String name;
-
-/** Window size. */
-private int size;
-
-/** Window eviction queue size. */
-private int evictionQueueSize;
-
-/**
- * @param m Metrics to copy.
- */
-public StreamerWindowMetricsAdapter(StreamerWindowMetrics m) {
-// Preserve alphabetic order for maintenance.
-evictionQueueSize = m.evictionQueueSize();
-name = m.name();
-size = m.size();
-}
-
-/** {@inheritDoc} */
-@Override public String name() {
-return name;
-}
-
-/** {@inheritDoc} */
-@Override public int size() {
-return size;
-}
-
-/** {@inheritDoc} */
-@Override public int evictionQueueSize() {
-return evictionQueueSize;
-}
-
-/** {@inheritDoc} */
-@Override public String toString() {
-return S.toString(StreamerWindowMetricsAdapter.class, this);
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/StreamerWindowMetricsHolder.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/StreamerWindowMetricsHolder.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/StreamerWindowMetricsHolder.java
deleted file mode 100644
index 44e7e90..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/StreamerWindowMetricsHolder.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.streamer;
-
-import org.apache.ignite.streamer.*;
-
-/**
- * Streamer window metrics holder.
- */
-public class StreamerWindowMetricsHolder implements StreamerWindowMetrics {
-/** Window instance. */
-private StreamerWindow window;
-
-/**
- * @param window Streamer window.
- */
-public StreamerWindowMetricsHolder(StreamerWindow window) {
-this.window = window;
-}
-
-/** {@inheritDoc} */
-@Override public String name() {
-return window.name();
-}
-
-/** {@inheritDoc} */
-@Override public int size() {
-return window.size();
-}
-
-/** {@inheritDoc} */
-@Override public int evictionQueueSize() {
-return window.evictionQueueSize();
-}
-}
http://git-wip-
[16/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9933
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9933 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/89ac9dc5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/89ac9dc5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/89ac9dc5 Branch: refs/heads/ignite-379-1 Commit: 89ac9dc57530a4d21ed70cbf247b5d2ae0f651c3 Parents: eebcc9c 448e9c3 Author: S.Vladykin Authored: Fri Mar 20 00:06:36 2015 +0300 Committer: S.Vladykin Committed: Fri Mar 20 00:06:36 2015 +0300 -- .../cache/GridCacheAffinityManager.java | 50 - .../processors/cache/GridPartitionLockKey.java | 104 --- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../resources/META-INF/classnames.properties| 1 - 4 files changed, 1 insertion(+), 156 deletions(-) --
[37/50] [abbrv] incubator-ignite git commit: IGNITE-542 - Removed 'extends Future' from IgniteFuture
IGNITE-542 - Removed 'extends Future' from IgniteFuture
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/deaad898
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/deaad898
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/deaad898
Branch: refs/heads/ignite-379-1
Commit: deaad898cd11805deb24e13d54da94529b53eccd
Parents: 38fadda
Author: Valentin Kulichenko
Authored: Fri Mar 20 12:59:26 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Mar 20 12:59:26 2015 -0700
--
.../internal/util/future/IgniteFutureImpl.java | 5
.../org/apache/ignite/lang/IgniteFuture.java| 30
.../processors/schedule/ScheduleFutureImpl.java | 11 ---
3 files changed, 25 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/deaad898/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
index ba3881f..86ad438 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/future/IgniteFutureImpl.java
@@ -105,11 +105,6 @@ public class IgniteFutureImpl implements
IgniteFuture {
}
/** {@inheritDoc} */
-@Override public boolean cancel(boolean mayInterruptIfRunning) {
-return mayInterruptIfRunning && cancel();
-}
-
-/** {@inheritDoc} */
@Override public V get() {
try {
return fut.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/deaad898/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
index 6941426..f9549b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
@@ -22,12 +22,13 @@ import org.apache.ignite.*;
import java.util.concurrent.*;
/**
- * Extension for standard {@link Future} interface. It adds simplified
exception handling,
- * functional programming support and ability to listen for future completion
via functional
+ * Future with simplified exception handling, functional programming support
+ * and ability to listen for future completion via functional
* callback.
+ *
* @param Type of the result for the future.
*/
-public interface IgniteFuture extends Future {
+public interface IgniteFuture {
/**
* Synchronously waits for completion of the computation and
* returns computation result.
@@ -37,7 +38,7 @@ public interface IgniteFuture extends Future {
* @throws IgniteFutureCancelledException Subclass of {@link
IgniteException} thrown if computation was cancelled.
* @throws IgniteException If computation failed.
*/
-@Override public V get() throws IgniteException;
+public V get() throws IgniteException;
/**
* Synchronously waits for completion of the computation for
@@ -65,7 +66,7 @@ public interface IgniteFuture extends Future {
* @throws IgniteFutureTimeoutException Subclass of {@link
IgniteException} thrown if the wait was timed out.
* @throws IgniteException If computation failed.
*/
-@Override public V get(long timeout, TimeUnit unit) throws IgniteException;
+public V get(long timeout, TimeUnit unit) throws IgniteException;
/**
* Cancels this future.
@@ -76,6 +77,25 @@ public interface IgniteFuture extends Future {
public boolean cancel() throws IgniteException;
/**
+ * Returns {@code true} if this task was cancelled before it completed
+ * normally.
+ *
+ * @return {@code true} if this task was cancelled before it completed
+ */
+boolean isCancelled();
+
+/**
+ * Returns {@code true} if this task completed.
+ *
+ * Completion may be due to normal termination, an exception, or
+ * cancellation - in all of these cases, this method will return
+ * {@code true}.
+ *
+ * @return {@code true} if this task completed.
+ */
+boolean isDone();
+
+/**
* Gets start time for this future.
*
* @return Start time for this future.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/deaad898/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/Schedu
[21/50] [abbrv] incubator-ignite git commit: # IGNITE-515 removed pcollection and romix.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1f89b21/modules/core/src/main/java/com/romix/scala/collection/concurrent/TrieMap.java
--
diff --git
a/modules/core/src/main/java/com/romix/scala/collection/concurrent/TrieMap.java
b/modules/core/src/main/java/com/romix/scala/collection/concurrent/TrieMap.java
deleted file mode 100644
index b709632..000
---
a/modules/core/src/main/java/com/romix/scala/collection/concurrent/TrieMap.java
+++ /dev/null
@@ -1,1826 +0,0 @@
-/*
- Copyright (C) Roman Levenstein. All Rights Reserved.
-
- Licensed 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 com.romix.scala.collection.concurrent;
-
-import com.romix.scala.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-/**
- * This is a port of Scala's TrieMap class from the Scala Collections library.
- *
- * @param
- * @param
- * @author Roman Levenstein
- */
-@SuppressWarnings({"unchecked", "rawtypes", "unused"})
-public class TrieMap extends AbstractMap implements
ConcurrentMap {
-/**
- * Only used for ctrie serialization.
- */
-// @SerialVersionUID(0L - 7237891413820527142L)
-private static long TrieMapSerializationEnd = 0L - 7237891413820527142L;
-/**
- * EntrySet
- */
-private final EntrySet entrySet = new EntrySet();
-AtomicReferenceFieldUpdater inodeupdater =
AtomicReferenceFieldUpdater.newUpdater(INodeBase.class, MainNode.class,
"mainnode");
-
-// static class MangledHashing extends Hashing {
-// int hash(K k) {
-// return util.hashing.byteswap32(k);
-// }
-// }
-private Object r;
-private AtomicReferenceFieldUpdater rtupd;
-private Hashing hashf;
-private Equiv ef;
-private Hashing hashingobj;
-private Equiv equalityobj;
-private AtomicReferenceFieldUpdater rootupdater;
-private volatile Object root;
-
-TrieMap(final Object r, final AtomicReferenceFieldUpdater
rtupd, final Hashing hashf, final Equiv ef) {
-this.r = r;
-this.rtupd = rtupd;
-this.hashf = hashf;
-this.ef = ef;
-this.hashingobj = (hashf instanceof Default) ? hashf : hashf;
-equalityobj = ef;
-rootupdater = rtupd;
-root = r;
-}
-
-public TrieMap(final Hashing hashf, final Equiv ef) {
-this(INode.newRootNode(),
AtomicReferenceFieldUpdater.newUpdater(TrieMap.class, Object.class, "root"),
hashf, ef);
-}
-
-public TrieMap() {
-this(new Default(), Equiv.universal);
-}
-
-public static TrieMap empty() {
-return new TrieMap();
-}
-
-Hashing hashing() {
-return hashingobj;
-}
-
-Equiv equality() {
-return equalityobj;
-}
-
-final boolean CAS_ROOT(Object ov, Object nv) {
-return rootupdater.compareAndSet(this, ov, nv);
-}
-
-// FIXME: abort = false by default
-final INode readRoot(boolean abort) {
-return RDCSS_READ_ROOT(abort);
-}
-
-final INode readRoot() {
-return RDCSS_READ_ROOT(false);
-}
-
-final INode RDCSS_READ_ROOT() {
-return RDCSS_READ_ROOT(false);
-}
-
-final INode RDCSS_READ_ROOT(boolean abort) {
-Object r = /* READ */root;
-if (r instanceof INode)
-return (INode) r;
-else if (r instanceof RDCSS_Descriptor) {
-return RDCSS_Complete(abort);
-}
-throw new RuntimeException("Should not happen");
-}
-
-private final INode RDCSS_Complete(final boolean abort) {
-while (true) {
-Object v = /* READ */root;
-if (v instanceof INode)
-return (INode) v;
-else if (v instanceof RDCSS_Descriptor) {
-RDCSS_Descriptor desc = (RDCSS_Descriptor) v;
-INode ov = desc.old;
-MainNode exp = desc.expectedmain;
-INode nv = desc.nv;
-
-if (abort) {
-if (CAS_ROOT(desc, ov))
-return ov;
-else {
-// return RDCSS_Complete (abort);
-// tailrec
-continue;
-}
-}
-else {
-MainNode oldmain = ov.gcasRead(this);
-if (oldmain == exp) {
-if (CAS_ROOT(desc, nv)) {
-des
[10/50] [abbrv] incubator-ignite git commit: sp-2 streaming cleanup
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java
deleted file mode 100644
index 4610204..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java
+++ /dev/null
@@ -1,1375 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.streamer;
-
-import org.apache.ignite.*;
-import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.cluster.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.managers.eventstorage.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.util.worker.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.streamer.*;
-import org.apache.ignite.streamer.router.*;
-import org.apache.ignite.thread.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.internal.GridTopic.*;
-
-/**
- *
- */
-public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable {
-/** */
-private static final long serialVersionUID = 0L;
-
-/** Number of message send retries. */
-private static final int SEND_RETRY_COUNT = 3;
-
-/** Retry delay. */
-private static final int SEND_RETRY_DELAY = 1000;
-
-/** How many cancelled future IDs to keep in history. */
-private static final int CANCELLED_FUTS_HISTORY_SIZE = 4096;
-
-/** Log. */
-private IgniteLogger log;
-
-/** Context. */
-private GridKernalContext ctx;
-
-/** */
-private StreamerContext streamerCtx;
-
-/** Read-write lock. */
-private GridSpinReadWriteLock lock;
-
-/** Stopping flag. */
-private boolean stopping;
-
-/** Streamer configuration. */
-private StreamerConfiguration c;
-
-/** Name. */
-private String name;
-
-/** Stages. */
-@GridToStringInclude
-private Map stages;
-
-/** Windows. */
-@GridToStringInclude
-private Map winMap;
-
-/** Default streamer window. */
-private StreamerWindow dfltWin;
-
-/** */
-private String firstStage;
-
-/** Router. */
-private StreamerEventRouter router;
-
-/** At least once. */
-private boolean atLeastOnce;
-
-/** Streamer metrics. */
-private volatile StreamerMetricsHolder streamerMetrics;
-
-/** Topic. */
-private Object topic;
-
-/** Stage execution futures. */
-private ConcurrentMap
stageFuts;
-
-/** Batch execution futures. */
-private ConcurrentMap batchFuts;
-
-/** Streamer executor service. */
-private ExecutorService execSvc;
-
-/** Failure listeners. */
-private Collection failureLsnrs = new
ConcurrentLinkedQueue<>();
-
-/** Cancelled */
-private Collection cancelledFutIds =
-new GridBoundedConcurrentLinkedHashSet<>(CANCELLED_FUTS_HISTORY_SIZE);
-
-/** Load control semaphore. */
-private Semaphore sem;
-
-/** Deploy class. */
-private Class depCls;
-
-/** Executor service capacity. */
-private int execSvcCap;
-
-/** Window lock. */
-private final GridSpinReadWriteLock winLock = new GridSpinReadWriteLock();
-
-/**
- * Empty constructor required by {@link Externalizable}.
- */
-public IgniteStreamerImpl() {
-
[05/50] [abbrv] incubator-ignite git commit: sp-2 streaming cleanup
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerUnboundedWindow.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerUnboundedWindow.java
b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerUnboundedWindow.java
deleted file mode 100644
index ef7900d..000
---
a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerUnboundedWindow.java
+++ /dev/null
@@ -1,111 +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.streamer.window;
-
-import org.apache.ignite.internal.processors.streamer.*;
-import org.jdk8.backport.*;
-
-import java.util.*;
-
-/**
- * Unbounded window which holds all events. Events can be evicted manually
from window
- * via any of the {@code dequeue(...)} methods.
- */
-public class StreamerUnboundedWindow extends StreamerWindowAdapter {
-/** Events. */
-private ConcurrentLinkedDeque8 evts = new ConcurrentLinkedDeque8<>();
-
-/** {@inheritDoc} */
-@Override protected void stop0() {
-// No-op.
-}
-
-/** {@inheritDoc} */
-@Override public void checkConfiguration() {
-// No-op.
-}
-
-/** {@inheritDoc} */
-@Override protected void reset0() {
-evts.clear();
-}
-
-/** {@inheritDoc} */
-@Override public int size() {
-return evts.sizex();
-}
-
-/** {@inheritDoc} */
-@Override protected GridStreamerWindowIterator iterator0() {
-final ConcurrentLinkedDeque8.IteratorEx it =
(ConcurrentLinkedDeque8.IteratorEx)evts.iterator();
-
-return new GridStreamerWindowIterator() {
-private E lastRet;
-
-@Override public boolean hasNext() {
-return it.hasNext();
-}
-
-@Override public E next() {
-lastRet = it.next();
-
-return lastRet;
-}
-
-@Override public E removex() {
-return (it.removex()) ? lastRet : null;
-}
-};
-}
-
-/** {@inheritDoc} */
-@Override public int evictionQueueSize() {
-return 0;
-}
-
-/** {@inheritDoc} */
-@Override public boolean enqueue0(E evt) {
-return evts.add(evt);
-}
-
-/** {@inheritDoc} */
-@Override protected Collection dequeue0(int cnt) {
-Collection res = new ArrayList<>(cnt);
-
-for (int i = 0; i < cnt; i++) {
-E evicted = evts.pollLast();
-
-if (evicted != null)
-res.add(evicted);
-else
-break;
-}
-
-return res;
-}
-
-/** {@inheritDoc} */
-@Override protected Collection pollEvicted0(int cnt) {
-return Collections.emptyList();
-}
-
-/** {@inheritDoc} */
-@Override protected Collection pollEvictedBatch0() {
-return Collections.emptyList();
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java
b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java
deleted file mode 100644
index 963671a..000
---
a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java
+++ /dev/null
@@ -1,537 +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
[46/50] [abbrv] incubator-ignite git commit: Remove square brackes from copyright year in NOTICE.txt. (cherry picked from commit 1b0b998)
Remove square brackes from copyright year in NOTICE.txt. (cherry picked from commit 1b0b998) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6837e129 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6837e129 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6837e129 Branch: refs/heads/ignite-379-1 Commit: 6837e1294718dbf4337b8d35be06f36ae955bc4f Parents: 6dbffbe Author: Branko Čibej Authored: Fri Mar 20 03:03:28 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Mar 20 21:22:36 2015 -0700 -- NOTICE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6837e129/NOTICE.txt -- diff --git a/NOTICE.txt b/NOTICE.txt index 7ca4e12..256cf7d 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache Ignite (incubating) -Copyright [2015] The Apache Software Foundation +Copyright 2015 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
[34/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-gg-9924' into sprint-2
Merge remote-tracking branch 'remotes/origin/ignite-gg-9924' into sprint-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/38a99a33 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38a99a33 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38a99a33 Branch: refs/heads/ignite-379-1 Commit: 38a99a33f8ad4ee7851187abbdafb0283ad6f692 Parents: 302e683 f74751c Author: ivasilinets Authored: Fri Mar 20 16:38:59 2015 +0300 Committer: ivasilinets Committed: Fri Mar 20 16:38:59 2015 +0300 -- .../optimized/OptimizedClassDescriptor.java | 268 --- .../optimized/OptimizedObjectInputStream.java | 93 --- .../optimized/OptimizedObjectOutputStream.java | 64 ++--- ...arshallerSerialPersistentFieldsSelfTest.java | 110 .../IgniteMarshallerSelfTestSuite.java | 1 + 5 files changed, 371 insertions(+), 165 deletions(-) --
[44/50] [abbrv] incubator-ignite git commit: # sprint-2 - Headers
# sprint-2 - Headers Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/05dacbb9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/05dacbb9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/05dacbb9 Branch: refs/heads/ignite-379-1 Commit: 05dacbb92162c29b46599f676444d1d9f885c9cb Parents: e1c6290 Author: Valentin Kulichenko Authored: Fri Mar 20 20:59:02 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Mar 20 20:59:02 2015 -0700 -- .../org/jdk8/backport/ConcurrentHashMap8.java | 32 +--- .../jdk8/backport/ConcurrentLinkedDeque8.java | 32 +--- .../jdk8/backport/ConcurrentLinkedHashMap.java | 32 +--- .../main/java/org/jdk8/backport/LongAdder.java | 32 +--- .../main/java/org/jdk8/backport/Striped64.java | 27 + .../org/jdk8/backport/ThreadLocalRandom8.java | 32 +--- 6 files changed, 6 insertions(+), 181 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05dacbb9/modules/core/src/main/java/org/jdk8/backport/ConcurrentHashMap8.java -- diff --git a/modules/core/src/main/java/org/jdk8/backport/ConcurrentHashMap8.java b/modules/core/src/main/java/org/jdk8/backport/ConcurrentHashMap8.java index 91181d5..0ef6e2c 100644 --- a/modules/core/src/main/java/org/jdk8/backport/ConcurrentHashMap8.java +++ b/modules/core/src/main/java/org/jdk8/backport/ConcurrentHashMap8.java @@ -1,41 +1,11 @@ /* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * This file is available under and governed by the GNU General Public - * License version 2 only, as published by the Free Software Foundation. - * However, the following notice accompanied the original version of this - * file: - * * Written by Doug Lea with assistance from members of JCP JSR-166 * Expert Group and released to the public domain, as explained at * http://creativecommons.org/publicdomain/zero/1.0/ */ /* - * Copyright © 1993, 2013, Oracle and/or its affiliates. - * All rights reserved. + * This file is from JSR-166: http://gee.cs.oswego.edu/dl/concurrency-interest/ */ package org.jdk8.backport; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05dacbb9/modules/core/src/main/java/org/jdk8/backport/ConcurrentLinkedDeque8.java -- diff --git a/modules/core/src/main/java/org/jdk8/backport/ConcurrentLinkedDeque8.java b/modules/core/src/main/java/org/jdk8/backport/ConcurrentLinkedDeque8.java index 3f149ab..264de17 100644 --- a/modules/core/src/main/java/org/jdk8/backport/ConcurrentLinkedDeque8.java +++ b/modules/core/src/main/java/org/jdk8/backport/ConcurrentLinkedDeque8.java @@ -1,41 +1,11 @@ /* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - *
[35/50] [abbrv] incubator-ignite git commit: # sprint-2 fix for ignite-523
# sprint-2 fix for ignite-523
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/38faddae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38faddae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38faddae
Branch: refs/heads/ignite-379-1
Commit: 38faddaebf257eecdb756441ab3f9e267369c250
Parents: 38a99a3
Author: sboikov
Authored: Fri Mar 20 17:23:22 2015 +0300
Committer: sboikov
Committed: Fri Mar 20 17:23:22 2015 +0300
--
.../continuous/CacheContinuousQueryHandler.java | 3 ++
...ridCacheContinuousQueryAbstractSelfTest.java | 29 ++--
2 files changed, 30 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38faddae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index c475a30..72fd192 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -200,6 +200,9 @@ class CacheContinuousQueryHandler implements
GridContinuousHandler {
try {
notify = rmtFilter.evaluate(evt);
}
+catch (Exception e) {
+
U.error(cctx.logger(CacheContinuousQueryHandler.class), "CacheEntryEventFilter
failed: " + e);
+}
finally {
cctx.forceFlags(f);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38faddae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index b19a6ca..080a5a3 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -316,6 +316,32 @@ public abstract class
GridCacheContinuousQueryAbstractSelfTest extends GridCommo
/**
* @throws Exception If failed.
*/
+public void testFilterException() throws Exception {
+IgniteCache cache = grid(0).jcache(null);
+
+ContinuousQuery qry = new ContinuousQuery<>();
+
+qry.setLocalListener(new CacheEntryUpdatedListener()
{
+@Override public void onUpdated(Iterable> evts) {
+// No-op.
+}
+});
+
+qry.setRemoteFilter(new CacheEntryEventFilter() {
+@Override public boolean evaluate(CacheEntryEvent evt) {
+throw new RuntimeException("Test error.");
+}
+});
+
+try (QueryCursor> ignored =
cache.query(qry)) {
+for (int i = 0; i < 100; i++)
+cache.put(i, i);
+}
+}
+
+/**
+ * @throws Exception If failed.
+ */
public void testEntriesByFilter() throws Exception {
IgniteCache cache = grid(0).jcache(null);
@@ -345,8 +371,7 @@ public abstract class
GridCacheContinuousQueryAbstractSelfTest extends GridCommo
});
qry.setRemoteFilter(new CacheEntryEventFilter() {
-@Override
-public boolean evaluate(CacheEntryEvent evt) {
+@Override public boolean evaluate(CacheEntryEvent evt) {
return evt.getKey() > 2;
}
});
[11/50] [abbrv] incubator-ignite git commit: sp-2 streaming cleanup
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
index 178c604..4cbd11a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
@@ -528,11 +528,6 @@ public class ClusterGroupAdapter implements
ClusterGroupEx, Externalizable {
}
/** {@inheritDoc} */
-@Override public final ClusterGroup forStreamer(@Nullable String
streamerName, @Nullable String... streamerNames) {
-return forPredicate(new StreamersFilter(streamerName, streamerNames));
-}
-
-/** {@inheritDoc} */
@Override public ClusterGroup forCacheNodes(@Nullable String cacheName,
Set distributionModes) {
return forPredicate(new CachesFilter(cacheName, distributionModes));
@@ -700,41 +695,6 @@ public class ClusterGroupAdapter implements
ClusterGroupEx, Externalizable {
/**
*/
-private static class StreamersFilter implements
IgnitePredicate {
-/** */
-private static final long serialVersionUID = 0L;
-
-/** Streamer name. */
-private final String streamerName;
-
-/** Streamer names. */
-private final String[] streamerNames;
-
-/**
- * @param streamerName Streamer name.
- * @param streamerNames Streamer names.
- */
-private StreamersFilter(@Nullable String streamerName, @Nullable
String[] streamerNames) {
-this.streamerName = streamerName;
-this.streamerNames = streamerNames;
-}
-
-/** {@inheritDoc} */
-@Override public boolean apply(ClusterNode n) {
-if (!U.hasStreamer(n, streamerName))
- return false;
-
-if (!F.isEmpty(streamerNames))
-for (String sn : streamerNames)
-if (!U.hasStreamer(n, sn))
-return false;
-
-return true;
-}
-}
-
-/**
- */
private static class AttributeFilter implements
IgnitePredicate {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
index 960bacd..75386e2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
@@ -213,11 +213,6 @@ public class IgniteClusterAsyncImpl extends
AsyncSupportAdapter
}
/** {@inheritDoc} */
-@Override public ClusterGroup forStreamer(String streamerName, @Nullable
String... streamerNames) {
-return cluster.forStreamer(streamerName, streamerNames);
-}
-
-/** {@inheritDoc} */
@Override public ClusterGroup forRemotes() {
return cluster.forRemotes();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index d69a809..f54d85f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -38,7 +38,6 @@ import org.apache.ignite.internal.processors.datastreamer.*;
import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.processors.query.h2.twostep.messages.*;
import org.apache.ignite.internal.processors.rest.handlers.task.*;
-import org.apache.ignite.internal.processors.streamer.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.extensions.communication.*;
@@ -445,21 +444,6 @@ public class GridIoMessageFactory implements
MessageFactory {
break;
-case 79:
-msg = new GridStreamerCancelRequest();
-
-brea
[08/50] [abbrv] incubator-ignite git commit: sp-2 streaming cleanup
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/streamer/StreamerFailureListener.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerFailureListener.java
b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerFailureListener.java
deleted file mode 100644
index 8bf23a4..000
---
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerFailureListener.java
+++ /dev/null
@@ -1,44 +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.streamer;
-
-import java.util.*;
-
-/**
- * Streamer failure listener. Asynchronous callback passed to user in case of
any failure determined by streamer.
- *
- * @see
org.apache.ignite.IgniteStreamer#addStreamerFailureListener(StreamerFailureListener)
- *
- */
-public interface StreamerFailureListener {
-/**
- * Callback invoked when unrecoverable failure is detected by streamer.
- *
- * If {@link StreamerConfiguration#isAtLeastOnce()} is set to {@code
false}, then this callback
- * will be invoked on node on which failure occurred. If {@link
StreamerConfiguration#isAtLeastOnce()}
- * is set to {@code true}, then this callback will be invoked on node on
which
- * {@link org.apache.ignite.IgniteStreamer#addEvents(Collection)} or its
variant was called. Callback will be called if maximum
- * number of failover attempts exceeded or failover cannot be performed
(for example, if router
- * returned {@code null}).
- *
- * @param stageName Failed stage name.
- * @param evts Failed set of events.
- * @param err Error cause.
- */
-public void onFailure(String stageName, Collection evts, Throwable
err);
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
deleted file mode 100644
index 18eaf35..000
--- a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
+++ /dev/null
@@ -1,169 +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.streamer;
-
-import org.apache.ignite.mxbean.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Streamer MBean interface.
- */
-@MXBeanDescription("MBean that provides access to streamer description and
metrics.")
-public interface StreamerMBean {
-/**
- * Gets streamer name.
- *
- * @return Streamer name.
- */
-@MXBeanDescription("Streamer name.")
-@Nullable public String getName();
-
-/**
- * Gets {@code atLeastOnce} configuration flag.
- *
- * @return {@code True} if {@code atLeastOnce} is configured.
- */
-@MXBeanDescription("True if atLeastOnce is configured.")
-public boolean isAtLeastOnce();
-
-/**
- * Gets size of stage futures map. This map is maintained only when {@code
atLeastOnce} configuration
- * flag is set to true.
- *
- * @return Stage future map size.
- */
-@MXBeanDescription("Stage future map size.")
-public int getStageFutureMapSize();
-
-/**
- * Gets size of batch futures m
[15/50] [abbrv] incubator-ignite git commit: # ignite-409: review
# ignite-409: review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a7c201cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7c201cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7c201cd
Branch: refs/heads/ignite-379-1
Commit: a7c201cded47a7a1066c3780623696699f2f37f4
Parents: 847aeff
Author: Artem Shutak
Authored: Thu Mar 19 20:55:45 2015 +0300
Committer: Artem Shutak
Committed: Thu Mar 19 20:55:45 2015 +0300
--
.../java/org/apache/ignite/internal/util/worker/GridWorker.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c201cd/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
index 1381f1e..696687b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java
@@ -75,7 +75,7 @@ public abstract class GridWorker implements Runnable {
this.gridName = gridName;
this.name = name;
this.lsnr = lsnr;
-this.log = log.getLogger(GridWorker.class);
+this.log = log;
}
/**
[13/50] [abbrv] incubator-ignite git commit: #ignite-gg-9924: add fix for marshalling from 6.6.4
#ignite-gg-9924: add fix for marshalling from 6.6.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/75ea4a3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75ea4a3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75ea4a3d
Branch: refs/heads/ignite-379-1
Commit: 75ea4a3d6f8bd680a3ffd4a8a4d1b2b6489ed1c6
Parents: 448e9c3
Author: ivasilinets
Authored: Thu Mar 19 20:31:49 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 19 20:31:49 2015 +0300
--
.../optimized/OptimizedClassDescriptor.java | 268 ---
.../optimized/OptimizedObjectInputStream.java | 91 ---
.../optimized/OptimizedObjectOutputStream.java | 64 ++---
...arshallerSerialPersistentFieldsSelfTest.java | 107
.../IgniteMarshallerSelfTestSuite.java | 1 +
5 files changed, 367 insertions(+), 164 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75ea4a3d/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
index 9eaf7af..05ef534 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedClassDescriptor.java
@@ -18,8 +18,7 @@
package org.apache.ignite.marshaller.optimized;
import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.lang.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.marshaller.*;
import sun.misc.*;
@@ -337,10 +336,7 @@ class OptimizedClassDescriptor {
writeObjMtds = new ArrayList<>();
readObjMtds = new ArrayList<>();
-List> fields = new ArrayList<>();
-List>> fieldOffs = new
ArrayList<>();
-List>> fieldInfoMaps = new ArrayList<>();
-List>>
fieldInfoLists = new ArrayList<>();
+List fields = new ArrayList<>();
for (c = cls; c != null && !c.equals(Object.class); c =
c.getSuperclass()) {
Method mtd;
@@ -381,33 +377,14 @@ class OptimizedClassDescriptor {
Field[] clsFields0 = c.getDeclaredFields();
-Arrays.sort(clsFields0, new Comparator() {
-@Override public int compare(Field f1, Field f2) {
-return f1.getName().compareTo(f2.getName());
-}
-});
-
-List clsFields = new
ArrayList<>(clsFields0.length);
-List> clsFieldOffs =
-new ArrayList<>(clsFields0.length);
-
-for (int i = 0; i < clsFields0.length; i++) {
-Field f = clsFields0[i];
-
-int mod = f.getModifiers();
-
-if (!isStatic(mod) && !isTransient(mod)) {
-OptimizedFieldType type =
fieldType(f.getType());
+Map fieldNames = new HashMap<>();
-clsFields.add(f);
-clsFieldOffs.add(new T2<>(type,
UNSAFE.objectFieldOffset(f)));
-}
-}
+for (Field f : clsFields0)
+fieldNames.put(f.getName(), f);
-fields.add(clsFields);
-fieldOffs.add(clsFieldOffs);
+List clsFields = new
ArrayList<>(clsFields0.length);
-Map> fieldInfoMap = null;
+boolean hasSerialPersistentFields = false;
try {
Field serFieldsDesc =
c.getDeclaredField("serialPersistentFields");
@@ -416,16 +393,33 @@ class OptimizedClassDescriptor {
if (serFieldsDesc.getType() ==
ObjectStreamField[].class &&
isPrivate(mod) && isStatic(mod) &&
isFinal(mod)) {
-serFieldsDesc.setAccessible(true);
+hasSerialPersistentFields = true;
-ObjectStreamField[] serFields =
(ObjectStreamField[])serFieldsDesc.get(null);
+serFieldsDesc.s
[17/50] [abbrv] incubator-ignite git commit: ignite-gg-9933 - keep portable flag fix
ignite-gg-9933 - keep portable flag 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/f16eadee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f16eadee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f16eadee
Branch: refs/heads/ignite-379-1
Commit: f16eadee1c230170768448114a05358542b1ab05
Parents: 89ac9dc
Author: S.Vladykin
Authored: Fri Mar 20 02:03:15 2015 +0300
Committer: S.Vladykin
Committed: Fri Mar 20 02:03:15 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 10 ++-
.../cache/query/GridCacheQueriesImpl.java | 2 +-
.../cache/query/GridCacheTwoStepQuery.java | 20 ++
.../processors/query/GridQueryIndexing.java | 20 +++---
.../query/GridQueryPortableFieldsIterator.java | 70
.../processors/query/GridQueryProcessor.java| 48 --
.../processors/query/h2/IgniteH2Indexing.java | 32 ++---
.../h2/twostep/GridReduceQueryExecutor.java | 13 ++--
8 files changed, 160 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f16eadee/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 3216ccc..53e9a00 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -422,7 +422,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter extends
AsyncSupportAdapter extends
AsyncSupportAdapter> doLocalQuery(SqlQuery p) {
-return new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocal(
-ctx.name(), p.getType(), p.getSql(), p.getArgs()));
+return new
QueryCursorImpl<>(ctx.kernalContext().query().queryLocal(ctx, p));
}
/**
@@ -489,8 +488,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> doLocalFieldsQuery(SqlFieldsQuery q) {
-return ctx.kernalContext().query().queryLocalFields(
-ctx.name(), q.getSql(), q.getArgs());
+return ctx.kernalContext().query().queryLocalFields(ctx, q);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f16eadee/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
index a018e98..ae25c1c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
@@ -165,7 +165,7 @@ public class GridCacheQueriesImpl implements
GridCacheQueriesEx, Ext
/** {@inheritDoc} */
@Override public QueryCursor> executeTwoStepQuery(String space,
String sqlQry, Object[] params) {
-return ctx.kernalContext().query().queryTwoStep(space, sqlQry, params);
+return ctx.kernalContext().query().queryTwoStep(ctx, new
SqlFieldsQuery(sqlQry).setArgs(params));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f16eadee/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
index 585d78e..11b2057 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheTwoStepQuery.java
@@ -34,6 +34,9 @@ public class GridCacheTwoStepQuery implements Serializable {
private static final long serialVersionUID = 0L;
/** */
+public static final int DFLT_PAGE_SIZE = 1000;
+
+/** */
@GridToStringInclude
private Map mapQrys;
@@ -41,6 +44,9 @@ public class GridCacheTwoStepQuery implements Serializable {
@GridToStringInclude
private GridCacheSqlQuery reduce;
+/** */
+privat
[30/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Merge remote-tracking branch 'origin/sprint-2' into sprint-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/16a4265e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/16a4265e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/16a4265e Branch: refs/heads/ignite-379-1 Commit: 16a4265ea6cd95d7319b0c995653f259fd42e21d Parents: 385f868 4477cdb Author: sboikov Authored: Fri Mar 20 13:27:44 2015 +0300 Committer: sboikov Committed: Fri Mar 20 13:27:44 2015 +0300 -- LICENSE.txt | 26 - NOTICE.txt | 11 - .../apache/ignite/examples/ExamplesUtils.java | 18 - .../streaming/StreamingCheckInExample.java | 580 -- .../streaming/StreamingNodeStartup.java | 35 - .../StreamingPopularNumbersExample.java | 250 --- .../streaming/StreamingPriceBarsExample.java| 451 - .../StreamingRunningAverageExample.java | 247 --- .../ignite/examples/streaming/package-info.java | 22 - modules/core/pom.xml|2 +- .../src/main/java/com/romix/scala/None.java | 27 - .../src/main/java/com/romix/scala/Option.java | 42 - .../src/main/java/com/romix/scala/Some.java | 38 - .../scala/collection/concurrent/BasicNode.java | 32 - .../scala/collection/concurrent/CNodeBase.java | 49 - .../romix/scala/collection/concurrent/Gen.java | 29 - .../scala/collection/concurrent/INodeBase.java | 47 - .../scala/collection/concurrent/ListMap.java| 247 --- .../scala/collection/concurrent/MainNode.java | 51 - .../romix/scala/collection/concurrent/Pair.java | 54 - .../scala/collection/concurrent/TrieMap.java| 1826 -- .../src/main/java/org/apache/ignite/Ignite.java | 17 - .../java/org/apache/ignite/IgniteStreamer.java | 154 -- .../org/apache/ignite/cluster/ClusterGroup.java |9 - .../configuration/IgniteConfiguration.java | 23 - .../ignite/internal/GridKernalContext.java |8 - .../ignite/internal/GridKernalContextImpl.java | 12 - .../apache/ignite/internal/IgniteKernal.java| 26 - .../org/apache/ignite/internal/IgnitionEx.java | 12 - .../internal/cluster/ClusterGroupAdapter.java | 40 - .../cluster/IgniteClusterAsyncImpl.java |5 - .../communication/GridIoMessageFactory.java | 16 - .../GridDeploymentPerLoaderStore.java |1 - .../GridDeploymentPerVersionStore.java |1 - .../streamer/GridStreamProcessor.java | 347 .../streamer/GridStreamerAttributes.java| 127 -- .../streamer/GridStreamerCancelRequest.java | 110 -- .../streamer/GridStreamerContextDelegate.java | 102 - .../streamer/GridStreamerContextImpl.java | 201 -- .../streamer/GridStreamerExecutionBatch.java| 175 -- .../streamer/GridStreamerExecutionRequest.java | 293 --- .../streamer/GridStreamerResponse.java | 144 -- .../GridStreamerRouteFailedException.java | 36 - .../GridStreamerStageExecutionFuture.java | 340 .../streamer/GridStreamerWindowIterator.java| 40 - .../processors/streamer/IgniteStreamerEx.java | 94 - .../processors/streamer/IgniteStreamerImpl.java | 1375 - .../streamer/StreamerMBeanAdapter.java | 116 -- .../streamer/StreamerMetricsAdapter.java| 272 --- .../streamer/StreamerMetricsHolder.java | 424 .../streamer/StreamerStageMBeanAdapter.java | 101 - .../streamer/StreamerStageMetricsAdapter.java | 135 -- .../streamer/StreamerStageMetricsHolder.java| 167 -- .../streamer/StreamerStageWrapper.java | 90 - .../streamer/StreamerWindowMetricsAdapter.java | 65 - .../streamer/StreamerWindowMetricsHolder.java | 50 - .../processors/streamer/package-info.java | 22 - .../task/GridStreamerBroadcastTask.java | 137 -- .../streamer/task/GridStreamerQueryTask.java| 140 -- .../streamer/task/GridStreamerReduceTask.java | 144 -- .../ignite/internal/util/IgniteUtils.java | 23 - .../visor/node/VisorGridConfiguration.java | 12 - .../visor/node/VisorNodeDataCollectorJob.java | 37 +- .../node/VisorNodeDataCollectorJobResult.java | 28 - .../visor/node/VisorNodeDataCollectorTask.java |6 - .../node/VisorNodeDataCollectorTaskResult.java | 43 +- .../internal/visor/streamer/VisorStreamer.java | 104 - .../streamer/VisorStreamerConfiguration.java| 177 -- .../visor/streamer/VisorStreamerMetrics.java| 350 .../streamer/VisorStreamerMetricsResetTask.java | 75 - .../visor/streamer/VisorStreamerResetTask.java | 75 - .../streamer/VisorStreamerStageMetrics.java | 277 --- .../ignite/streamer/StreamerConfiguration.java | 249 --- .../apache/ignite/st
[02/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-gg-9933' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9933
Merge branches 'ignite-gg-9933' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9933 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eebcc9c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eebcc9c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eebcc9c7 Branch: refs/heads/ignite-379-1 Commit: eebcc9c72e8f81a49ec1a78a1b5fd90b0e9b6256 Parents: 06324b1 d6fdf05 Author: S.Vladykin Authored: Thu Mar 19 17:18:22 2015 +0300 Committer: S.Vladykin Committed: Thu Mar 19 17:18:22 2015 +0300 -- .../store/jdbc/CacheAbstractJdbcStore.java | 169 -- .../cache/store/jdbc/CacheJdbcPojoStore.java| 6 +- .../apache/ignite/internal/IgniteKernal.java| 2 +- .../deployment/GridDeploymentLocalStore.java| 5 +- .../GridDeploymentPerLoaderStore.java | 5 +- .../GridDeploymentPerVersionStore.java | 5 +- .../discovery/GridDiscoveryManager.java | 1 + .../continuous/CacheContinuousQueryHandler.java | 3 - .../continuous/CacheContinuousQueryManager.java | 4 - .../optimized/OptimizedClassDescriptor.java | 20 +- .../optimized/OptimizedMarshaller.java | 30 +- .../optimized/OptimizedMarshallerUtils.java | 50 +- .../optimized/OptimizedObjectInputStream.java | 20 +- .../optimized/OptimizedObjectOutputStream.java | 22 +- .../core/src/test/config/store/jdbc/Ignite.xml | 82 +++ .../store/jdbc/CacheJdbcPojoStoreTest.java | 562 --- .../internal/ClusterNodeMetricsSelfTest.java| 31 +- .../processors/service/DummyService.java| 4 + .../optimized/OptimizedMarshallerTest.java | 4 +- .../OptimizedObjectStreamSelfTest.java | 8 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../config/benchmark-multicast.properties | 2 +- 22 files changed, 455 insertions(+), 582 deletions(-) --
[07/50] [abbrv] incubator-ignite git commit: sp-2 streaming cleanup
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexUpdateSync.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexUpdateSync.java
b/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexUpdateSync.java
deleted file mode 100644
index 838f9af..000
---
a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexUpdateSync.java
+++ /dev/null
@@ -1,77 +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.streamer.index;
-
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-/**
- * Streamer index update synchronizer.
- *
- * Used in {@link StreamerIndexProvider} to synchronize
- * operations on window index.
- *
- * @see StreamerIndexProvider
- *
- */
-public class StreamerIndexUpdateSync {
-/** */
-private volatile int res;
-
-/**
- * Waits for a notification from another thread, which
- * should call {@link #finish(int)} with an operation result.
- * That result is returned by this method.
- *
- * @return Operation results, passed to {@link #finish(int)}.
- * @throws InterruptedException If wait was interrupted.
- */
-public int await() throws InterruptedException {
-int res0 = res;
-
-if (res0 == 0) {
-synchronized (this) {
-while ((res0 = res) == 0)
-wait();
-}
-}
-
-assert res0 != 0;
-
-return res0;
-}
-
-/**
- * Notifies all waiting threads to finish waiting.
- *
- * @param res Operation result to return from {@link #await()}.
- */
-public void finish(int res) {
-assert res != 0;
-
-synchronized (this) {
-this.res = res;
-
-notifyAll();
-}
-}
-
-/** {@inheritDoc} */
-@Override public String toString() {
-return S.toString(StreamerIndexUpdateSync.class, this);
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1cc3d528/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexUpdater.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexUpdater.java
b/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexUpdater.java
deleted file mode 100644
index ebb3a97..000
---
a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexUpdater.java
+++ /dev/null
@@ -1,88 +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.streamer.index;
-
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Index updater. The main responsibility of index updater is to maintain
index values
- * up to date whenever events are added or removed from window.
- *
- * Updater is provided to index provider in configuration usually via
- * {@link StreamerIndexProviderAdapter#setUpdater(StreamerIndexUpdater)}
method.
- */
-public interface StreamerIndexUpdater {
-/**
- * Given an event, extract index key. For example, if you have a 'Person'
object
- * with field 'age' and need to index based on this field, then this method
- * should return the value of age f
[38/50] [abbrv] incubator-ignite git commit: # IGNITE-542 - Removed 'extends Future' from IgniteFuture
# IGNITE-542 - Removed 'extends Future' from IgniteFuture
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3e1a05b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3e1a05b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3e1a05b8
Branch: refs/heads/ignite-379-1
Commit: 3e1a05b8093df017818a8a6dd54917f46f718942
Parents: deaad89
Author: Valentin Kulichenko
Authored: Fri Mar 20 12:59:56 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Mar 20 12:59:56 2015 -0700
--
.../core/src/main/java/org/apache/ignite/lang/IgniteFuture.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e1a05b8/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
index f9549b9..9a4aa9b 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
@@ -82,7 +82,7 @@ public interface IgniteFuture {
*
* @return {@code true} if this task was cancelled before it completed
*/
-boolean isCancelled();
+public boolean isCancelled();
/**
* Returns {@code true} if this task completed.
@@ -93,7 +93,7 @@ public interface IgniteFuture {
*
* @return {@code true} if this task completed.
*/
-boolean isDone();
+public boolean isDone();
/**
* Gets start time for this future.
[49/50] [abbrv] incubator-ignite git commit: # IGNITE-379 Fix compilation error.
# IGNITE-379 Fix compilation error.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/03b9ddbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/03b9ddbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/03b9ddbb
Branch: refs/heads/ignite-379-1
Commit: 03b9ddbb3e64a7793e95be9e2c211a654f83fe35
Parents: d1ffd0e
Author: sevdokimov
Authored: Sun Mar 22 22:34:33 2015 +0300
Committer: sevdokimov
Committed: Sun Mar 22 22:34:33 2015 +0300
--
.../processors/cache/transactions/TransactionEx.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03b9ddbb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java
index 7c21575..69b7b60 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionEx.java
@@ -19,6 +19,8 @@ package
org.apache.ignite.internal.processors.cache.transactions;
import org.apache.ignite.transactions.*;
+import java.util.*;
+
/**
*
*/
@@ -27,10 +29,10 @@ public interface TransactionEx extends Transaction {
* Removes metadata by name.
*
* @param name Name of the metadata to remove.
- * @param Type of the value.
+ * @param Type of the value.
* @return Value of removed metadata or {@code null}.
*/
-public V removeMeta(String name);
+public V1 removeMeta(UUID name);
/**
* Gets metadata by name.
@@ -39,7 +41,7 @@ public interface TransactionEx extends Transaction {
* @param Type of the value.
* @return Metadata value or {@code null}.
*/
-public V meta(String name);
+public V meta(UUID name);
/**
* Adds a new metadata.
@@ -50,5 +52,5 @@ public interface TransactionEx extends Transaction {
* @return Metadata previously associated with given name, or
* {@code null} if there was none.
*/
-public V addMeta(String name, V val);
+public V addMeta(UUID name, V val);
}
[31/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-519' into sprint-2
Merge remote-tracking branch 'remotes/origin/ignite-519' into sprint-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/dfcfc0e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dfcfc0e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dfcfc0e4 Branch: refs/heads/ignite-379-1 Commit: dfcfc0e4bd575b7b253a159442529a8e6aa5f873 Parents: 16a4265 46c9d81 Author: sboikov Authored: Fri Mar 20 13:29:52 2015 +0300 Committer: sboikov Committed: Fri Mar 20 13:29:52 2015 +0300 -- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 23 ++- .../IgniteCacheExpiryPolicyAbstractTest.java| 64 +++- 3 files changed, 72 insertions(+), 17 deletions(-) --
[25/50] [abbrv] incubator-ignite git commit: #ignite-gg-9924: Fix test for marshalling.
#ignite-gg-9924: Fix test for marshalling.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d673092e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d673092e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d673092e
Branch: refs/heads/ignite-379-1
Commit: d673092ee60bd009cf88c6c9874b68dedf14e239
Parents: 07ac8b1
Author: ivasilinets
Authored: Fri Mar 20 11:30:27 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 20 11:30:27 2015 +0300
--
...izedMarshallerSerialPersistentFieldsSelfTest.java | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d673092e/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
index 3dbbd4c..ce23567 100644
---
a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
@@ -16,23 +16,26 @@
*/
package org.apache.ignite.marshaller.optimized;
-import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.marshaller.*;
import java.io.*;
/**
* Test that Optimized Marshaller works with classes with
serialPersistentFields.
*/
-public class OptimizedMarshallerSerialPersistentFieldsSelfTest extends
GridCommonAbstractTest {
+public class OptimizedMarshallerSerialPersistentFieldsSelfTest extends
GridMarshallerAbstractTest {
+/** {@inheritDoc} */
+@Override protected Marshaller marshaller() {
+return new OptimizedMarshaller(false);
+}
+
/**
* @throws Exception If failed.
*/
public void testOptimizedMarshaller() throws Exception {
-OptimizedMarshaller m = new OptimizedMarshaller();
-
-m.unmarshal(m.marshal(new TestClass()),
TestClass.class.getClassLoader());
+unmarshal(marshal(new TestClass()));
-TestClass2 val = m.unmarshal(m.marshal(new TestClass2()),
TestClass2.class.getClassLoader());
+TestClass2 val = unmarshal(marshal(new TestClass2()));
assertNull(val.field3);
}
[29/50] [abbrv] incubator-ignite git commit: # sprint-2
# sprint-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/385f8689
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/385f8689
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/385f8689
Branch: refs/heads/ignite-379-1
Commit: 385f86895f378dabc2de55ef67763d4e71116b52
Parents: 1356a20
Author: sboikov
Authored: Fri Mar 20 13:26:44 2015 +0300
Committer: sboikov
Committed: Fri Mar 20 13:26:44 2015 +0300
--
.../internal/processors/cache/GridCacheContext.java| 13 ++---
1 file changed, 2 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/385f8689/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 1efc49a..c5cea72 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -145,12 +145,6 @@ public class GridCacheContext implements
Externalizable {
/** Grid cache. */
private GridCacheAdapter cache;
-/** No value filter array. */
-private CacheEntryPredicate[] noValArr;
-
-/** Has value filter array. */
-private CacheEntryPredicate[] hasValArr;
-
/** Cached local rich node. */
private ClusterNode locNode;
@@ -274,9 +268,6 @@ public class GridCacheContext implements
Externalizable {
log = ctx.log(getClass());
-noValArr = new CacheEntryPredicate[]{new
CacheEntrySerializablePredicate(new CacheEntryPredicateNoValue())};
-hasValArr = new CacheEntryPredicate[]{new
CacheEntrySerializablePredicate(new CacheEntryPredicateHasValue())};
-
// Create unsafe memory only if writing values
unsafeMemory = (cacheCfg.getMemoryMode() == OFFHEAP_VALUES ||
cacheCfg.getMemoryMode() == OFFHEAP_TIERED) ?
new GridUnsafeMemory(cacheCfg.getOffHeapMaxMemory()) : null;
@@ -965,14 +956,14 @@ public class GridCacheContext implements
Externalizable {
* @return No value filter.
*/
public CacheEntryPredicate[] noValArray() {
-return noValArr;
+return new CacheEntryPredicate[]{new
CacheEntrySerializablePredicate(new CacheEntryPredicateNoValue())};
}
/**
* @return Has value filter.
*/
public CacheEntryPredicate[] hasValArray() {
-return hasValArr;
+return new CacheEntryPredicate[]{new
CacheEntrySerializablePredicate(new CacheEntryPredicateHasValue())};
}
/**
[28/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2-streaming-cleanup' into sprint-2
Merge branch 'sprint-2-streaming-cleanup' into sprint-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/4477cdb2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4477cdb2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4477cdb2 Branch: refs/heads/ignite-379-1 Commit: 4477cdb2227a3450d90b6c6c3087a7bf6dde69e8 Parents: 1356a20 c1f89b2 Author: AKuznetsov Authored: Fri Mar 20 16:35:54 2015 +0700 Committer: AKuznetsov Committed: Fri Mar 20 16:35:54 2015 +0700 -- LICENSE.txt | 26 - NOTICE.txt | 11 - .../apache/ignite/examples/ExamplesUtils.java | 18 - .../streaming/StreamingCheckInExample.java | 580 -- .../streaming/StreamingNodeStartup.java | 35 - .../StreamingPopularNumbersExample.java | 250 --- .../streaming/StreamingPriceBarsExample.java| 451 - .../StreamingRunningAverageExample.java | 247 --- .../ignite/examples/streaming/package-info.java | 22 - modules/core/pom.xml|2 +- .../src/main/java/com/romix/scala/None.java | 27 - .../src/main/java/com/romix/scala/Option.java | 42 - .../src/main/java/com/romix/scala/Some.java | 38 - .../scala/collection/concurrent/BasicNode.java | 32 - .../scala/collection/concurrent/CNodeBase.java | 49 - .../romix/scala/collection/concurrent/Gen.java | 29 - .../scala/collection/concurrent/INodeBase.java | 47 - .../scala/collection/concurrent/ListMap.java| 247 --- .../scala/collection/concurrent/MainNode.java | 51 - .../romix/scala/collection/concurrent/Pair.java | 54 - .../scala/collection/concurrent/TrieMap.java| 1826 -- .../src/main/java/org/apache/ignite/Ignite.java | 17 - .../java/org/apache/ignite/IgniteStreamer.java | 154 -- .../org/apache/ignite/cluster/ClusterGroup.java |9 - .../configuration/IgniteConfiguration.java | 23 - .../ignite/internal/GridKernalContext.java |8 - .../ignite/internal/GridKernalContextImpl.java | 12 - .../apache/ignite/internal/IgniteKernal.java| 26 - .../org/apache/ignite/internal/IgnitionEx.java | 12 - .../internal/cluster/ClusterGroupAdapter.java | 40 - .../cluster/IgniteClusterAsyncImpl.java |5 - .../communication/GridIoMessageFactory.java | 16 - .../GridDeploymentPerLoaderStore.java |1 - .../GridDeploymentPerVersionStore.java |1 - .../streamer/GridStreamProcessor.java | 347 .../streamer/GridStreamerAttributes.java| 127 -- .../streamer/GridStreamerCancelRequest.java | 110 -- .../streamer/GridStreamerContextDelegate.java | 102 - .../streamer/GridStreamerContextImpl.java | 201 -- .../streamer/GridStreamerExecutionBatch.java| 175 -- .../streamer/GridStreamerExecutionRequest.java | 293 --- .../streamer/GridStreamerResponse.java | 144 -- .../GridStreamerRouteFailedException.java | 36 - .../GridStreamerStageExecutionFuture.java | 340 .../streamer/GridStreamerWindowIterator.java| 40 - .../processors/streamer/IgniteStreamerEx.java | 94 - .../processors/streamer/IgniteStreamerImpl.java | 1375 - .../streamer/StreamerMBeanAdapter.java | 116 -- .../streamer/StreamerMetricsAdapter.java| 272 --- .../streamer/StreamerMetricsHolder.java | 424 .../streamer/StreamerStageMBeanAdapter.java | 101 - .../streamer/StreamerStageMetricsAdapter.java | 135 -- .../streamer/StreamerStageMetricsHolder.java| 167 -- .../streamer/StreamerStageWrapper.java | 90 - .../streamer/StreamerWindowMetricsAdapter.java | 65 - .../streamer/StreamerWindowMetricsHolder.java | 50 - .../processors/streamer/package-info.java | 22 - .../task/GridStreamerBroadcastTask.java | 137 -- .../streamer/task/GridStreamerQueryTask.java| 140 -- .../streamer/task/GridStreamerReduceTask.java | 144 -- .../ignite/internal/util/IgniteUtils.java | 23 - .../visor/node/VisorGridConfiguration.java | 12 - .../visor/node/VisorNodeDataCollectorJob.java | 37 +- .../node/VisorNodeDataCollectorJobResult.java | 28 - .../visor/node/VisorNodeDataCollectorTask.java |6 - .../node/VisorNodeDataCollectorTaskResult.java | 43 +- .../internal/visor/streamer/VisorStreamer.java | 104 - .../streamer/VisorStreamerConfiguration.java| 177 -- .../visor/streamer/VisorStreamerMetrics.java| 350 .../streamer/VisorStreamerMetricsResetTask.java | 75 - .../visor/streamer/VisorStreamerResetTask.java | 75 - .../streamer/VisorStreamerStageMetrics.java | 277 --- .../ignite/streamer/StreamerConfiguration.java | 249 --- .../apache/ignite/s
[36/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-gg-9933' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9933
Merge branches 'ignite-gg-9933' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9933 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eb335a9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb335a9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb335a9d Branch: refs/heads/ignite-379-1 Commit: eb335a9d8ba256f182fac3e9322bd7ed8779d182 Parents: f16eade 38fadda Author: S.Vladykin Authored: Fri Mar 20 20:44:13 2015 +0300 Committer: S.Vladykin Committed: Fri Mar 20 20:44:13 2015 +0300 -- LICENSE.txt | 26 - NOTICE.txt | 11 - .../apache/ignite/examples/ExamplesUtils.java | 18 - .../streaming/StreamingCheckInExample.java | 580 -- .../streaming/StreamingNodeStartup.java | 35 - .../StreamingPopularNumbersExample.java | 250 --- .../streaming/StreamingPriceBarsExample.java| 451 - .../StreamingRunningAverageExample.java | 247 --- .../ignite/examples/streaming/package-info.java | 22 - modules/core/pom.xml|2 +- .../src/main/java/com/romix/scala/None.java | 27 - .../src/main/java/com/romix/scala/Option.java | 42 - .../src/main/java/com/romix/scala/Some.java | 38 - .../scala/collection/concurrent/BasicNode.java | 32 - .../scala/collection/concurrent/CNodeBase.java | 49 - .../romix/scala/collection/concurrent/Gen.java | 29 - .../scala/collection/concurrent/INodeBase.java | 47 - .../scala/collection/concurrent/ListMap.java| 247 --- .../scala/collection/concurrent/MainNode.java | 51 - .../romix/scala/collection/concurrent/Pair.java | 54 - .../scala/collection/concurrent/TrieMap.java| 1826 -- .../src/main/java/org/apache/ignite/Ignite.java | 17 - .../java/org/apache/ignite/IgniteStreamer.java | 154 -- .../org/apache/ignite/cluster/ClusterGroup.java |9 - .../configuration/IgniteConfiguration.java | 23 - .../ignite/internal/GridKernalContext.java |8 - .../ignite/internal/GridKernalContextImpl.java | 12 - .../apache/ignite/internal/IgniteKernal.java| 26 - .../org/apache/ignite/internal/IgnitionEx.java | 12 - .../internal/cluster/ClusterGroupAdapter.java | 40 - .../cluster/IgniteClusterAsyncImpl.java |5 - .../communication/GridIoMessageFactory.java | 16 - .../GridDeploymentPerLoaderStore.java |1 - .../GridDeploymentPerVersionStore.java |1 - .../discovery/GridDiscoveryManager.java |6 +- .../processors/cache/GridCacheAdapter.java |2 +- .../processors/cache/GridCacheContext.java | 13 +- .../cache/GridCacheEvictionManager.java |2 +- .../processors/cache/GridCacheMapEntry.java | 23 +- .../GridCachePartitionExchangeManager.java |2 +- .../continuous/CacheContinuousQueryHandler.java |3 + .../processors/clock/GridClockServer.java |2 +- .../clock/GridClockSyncProcessor.java |2 +- .../internal/processors/igfs/IgfsServer.java|4 +- .../processors/igfs/IgfsServerManager.java |4 +- .../streamer/GridStreamProcessor.java | 347 .../streamer/GridStreamerAttributes.java| 127 -- .../streamer/GridStreamerCancelRequest.java | 110 -- .../streamer/GridStreamerContextDelegate.java | 102 - .../streamer/GridStreamerContextImpl.java | 201 -- .../streamer/GridStreamerExecutionBatch.java| 175 -- .../streamer/GridStreamerExecutionRequest.java | 293 --- .../streamer/GridStreamerResponse.java | 144 -- .../GridStreamerRouteFailedException.java | 36 - .../GridStreamerStageExecutionFuture.java | 340 .../streamer/GridStreamerWindowIterator.java| 40 - .../processors/streamer/IgniteStreamerEx.java | 94 - .../processors/streamer/IgniteStreamerImpl.java | 1375 - .../streamer/StreamerMBeanAdapter.java | 116 -- .../streamer/StreamerMetricsAdapter.java| 272 --- .../streamer/StreamerMetricsHolder.java | 424 .../streamer/StreamerStageMBeanAdapter.java | 101 - .../streamer/StreamerStageMetricsAdapter.java | 135 -- .../streamer/StreamerStageMetricsHolder.java| 167 -- .../streamer/StreamerStageWrapper.java | 90 - .../streamer/StreamerWindowMetricsAdapter.java | 65 - .../streamer/StreamerWindowMetricsHolder.java | 50 - .../processors/streamer/package-info.java | 22 - .../task/GridStreamerBroadcastTask.java | 137 -- .../streamer/task/GridStreamerQueryTask.java| 140 -- .../streamer/task/GridStreamerReduceTask.java | 144 -- .../timeout/GridTimeoutProcessor.java |2 +- .../
[32/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-gg-9924
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-gg-9924 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f74751c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f74751c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f74751c0 Branch: refs/heads/ignite-379-1 Commit: f74751c0202fbe6fe033287ec868de2f63785e2c Parents: d673092 dfcfc0e Author: ivasilinets Authored: Fri Mar 20 15:07:19 2015 +0300 Committer: ivasilinets Committed: Fri Mar 20 15:07:19 2015 +0300 -- LICENSE.txt | 26 - NOTICE.txt | 11 - .../apache/ignite/examples/ExamplesUtils.java | 18 - .../streaming/StreamingCheckInExample.java | 580 -- .../streaming/StreamingNodeStartup.java | 35 - .../StreamingPopularNumbersExample.java | 250 --- .../streaming/StreamingPriceBarsExample.java| 451 - .../StreamingRunningAverageExample.java | 247 --- .../ignite/examples/streaming/package-info.java | 22 - modules/core/pom.xml|2 +- .../src/main/java/com/romix/scala/None.java | 27 - .../src/main/java/com/romix/scala/Option.java | 42 - .../src/main/java/com/romix/scala/Some.java | 38 - .../scala/collection/concurrent/BasicNode.java | 32 - .../scala/collection/concurrent/CNodeBase.java | 49 - .../romix/scala/collection/concurrent/Gen.java | 29 - .../scala/collection/concurrent/INodeBase.java | 47 - .../scala/collection/concurrent/ListMap.java| 247 --- .../scala/collection/concurrent/MainNode.java | 51 - .../romix/scala/collection/concurrent/Pair.java | 54 - .../scala/collection/concurrent/TrieMap.java| 1826 -- .../src/main/java/org/apache/ignite/Ignite.java | 17 - .../java/org/apache/ignite/IgniteStreamer.java | 154 -- .../org/apache/ignite/cluster/ClusterGroup.java |9 - .../configuration/IgniteConfiguration.java | 23 - .../ignite/internal/GridKernalContext.java |8 - .../ignite/internal/GridKernalContextImpl.java | 12 - .../apache/ignite/internal/IgniteKernal.java| 26 - .../org/apache/ignite/internal/IgnitionEx.java | 12 - .../internal/cluster/ClusterGroupAdapter.java | 40 - .../cluster/IgniteClusterAsyncImpl.java |5 - .../communication/GridIoMessageFactory.java | 16 - .../GridDeploymentPerLoaderStore.java |1 - .../GridDeploymentPerVersionStore.java |1 - .../processors/cache/GridCacheAdapter.java |2 +- .../processors/cache/GridCacheContext.java | 13 +- .../processors/cache/GridCacheMapEntry.java | 23 +- .../streamer/GridStreamProcessor.java | 347 .../streamer/GridStreamerAttributes.java| 127 -- .../streamer/GridStreamerCancelRequest.java | 110 -- .../streamer/GridStreamerContextDelegate.java | 102 - .../streamer/GridStreamerContextImpl.java | 201 -- .../streamer/GridStreamerExecutionBatch.java| 175 -- .../streamer/GridStreamerExecutionRequest.java | 293 --- .../streamer/GridStreamerResponse.java | 144 -- .../GridStreamerRouteFailedException.java | 36 - .../GridStreamerStageExecutionFuture.java | 340 .../streamer/GridStreamerWindowIterator.java| 40 - .../processors/streamer/IgniteStreamerEx.java | 94 - .../processors/streamer/IgniteStreamerImpl.java | 1375 - .../streamer/StreamerMBeanAdapter.java | 116 -- .../streamer/StreamerMetricsAdapter.java| 272 --- .../streamer/StreamerMetricsHolder.java | 424 .../streamer/StreamerStageMBeanAdapter.java | 101 - .../streamer/StreamerStageMetricsAdapter.java | 135 -- .../streamer/StreamerStageMetricsHolder.java| 167 -- .../streamer/StreamerStageWrapper.java | 90 - .../streamer/StreamerWindowMetricsAdapter.java | 65 - .../streamer/StreamerWindowMetricsHolder.java | 50 - .../processors/streamer/package-info.java | 22 - .../task/GridStreamerBroadcastTask.java | 137 -- .../streamer/task/GridStreamerQueryTask.java| 140 -- .../streamer/task/GridStreamerReduceTask.java | 144 -- .../ignite/internal/util/IgniteUtils.java | 23 - .../visor/node/VisorGridConfiguration.java | 12 - .../visor/node/VisorNodeDataCollectorJob.java | 37 +- .../node/VisorNodeDataCollectorJobResult.java | 28 - .../visor/node/VisorNodeDataCollectorTask.java |6 - .../node/VisorNodeDataCollectorTaskResult.java | 43 +- .../internal/visor/streamer/VisorStreamer.java | 104 - .../streamer/VisorStreamerConfiguration.java| 177 -- .../visor/streamer/VisorStreamerMetrics.java| 350 .../streamer/VisorStreamerMetricsResetTask.java | 75 -
incubator-ignite git commit: IGNITE-45 - Moved exception to public package.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 60d63a61a -> afb1de605
IGNITE-45 - Moved exception to public package.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/afb1de60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/afb1de60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/afb1de60
Branch: refs/heads/ignite-45
Commit: afb1de605d36b5b8f2ca4e4163485d25c34a7ce4
Parents: 60d63a6
Author: Alexey Goncharuk
Authored: Sun Mar 22 12:52:30 2015 -0700
Committer: Alexey Goncharuk
Committed: Sun Mar 22 12:52:30 2015 -0700
--
.../ignite/cache/CacheExistsException.java | 52
.../processors/cache/GridCacheProcessor.java| 8 +--
.../cache/IgniteCacheExistsException.java | 52
.../resources/META-INF/classnames.properties| 2 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 2 +-
5 files changed, 58 insertions(+), 58 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afb1de60/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
new file mode 100644
index 000..f1db94d
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.cache;
+
+import org.jetbrains.annotations.*;
+
+import javax.cache.*;
+
+/**
+ * Exception thrown when cache already exists.
+ */
+public class CacheExistsException extends CacheException {
+/** */
+private static final long serialVersionUID = 0L;
+
+/**
+ * @param msg Error message.
+ */
+public CacheExistsException(String msg) {
+super(msg);
+}
+
+/**
+ * @param cause Error cause.
+ */
+public CacheExistsException(Throwable cause) {
+super(cause);
+}
+
+/**
+ * @param msg Error message.
+ * @param cause Error cause.
+ */
+public CacheExistsException(String msg, @Nullable Throwable cause) {
+super(msg, cause);
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afb1de60/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 5bbba49..e9b7ae2 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
@@ -1577,7 +1577,7 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
if (ccfg != null) {
if (desc != null && !desc.cancelled()) {
if (failIfExists)
-return new GridFinishedFuture<>(new
IgniteCacheExistsException("Failed to start cache " +
+return new GridFinishedFuture<>(new
CacheExistsException("Failed to start cache " +
"(a cache with the same name is already started):
" + cacheName));
else {
CacheConfiguration descCfg = desc.cacheConfiguration();
@@ -1627,7 +1627,7 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
ccfg = desc.cacheConfiguration();
if (ccfg == null)
-return new GridFinishedFuture<>(new
IgniteCacheExistsException("Failed to start near cache " +
+return new GridFinishedFuture<>(new
CacheExistsException("Failed to start near cac
[3/3] incubator-ignite git commit: # ignite-45 - javadoc fix.
# ignite-45 - javadoc fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2b62e434
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b62e434
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b62e434
Branch: refs/heads/ignite-45
Commit: 2b62e4348d89f8fa7a1c7cff39717ca0cf400aaa
Parents: 61d8a1a
Author: Dmitiry Setrakyan
Authored: Sun Mar 22 12:54:19 2015 -0700
Committer: Dmitiry Setrakyan
Committed: Sun Mar 22 12:54:19 2015 -0700
--
.../main/java/org/apache/ignite/cache/CacheExistsException.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2b62e434/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
index f1db94d..8d2afbb 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
@@ -22,10 +22,10 @@ import org.jetbrains.annotations.*;
import javax.cache.*;
/**
- * Exception thrown when cache already exists.
+ * Exception thrown when cache must be created by it already exists.
*/
public class CacheExistsException extends CacheException {
-/** */
+/** Serialization ID. */
private static final long serialVersionUID = 0L;
/**
[2/3] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Merge remote-tracking branch 'origin/ignite-45' into ignite-45 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/61d8a1a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/61d8a1a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/61d8a1a2 Branch: refs/heads/ignite-45 Commit: 61d8a1a28b8021339003e1c8e2a0f1fdec8c7368 Parents: 9fabbea afb1de6 Author: Dmitiry Setrakyan Authored: Sun Mar 22 12:53:29 2015 -0700 Committer: Dmitiry Setrakyan Committed: Sun Mar 22 12:53:29 2015 -0700 -- .../ignite/cache/CacheExistsException.java | 52 .../processors/cache/GridCacheProcessor.java| 8 +-- .../cache/IgniteCacheExistsException.java | 52 .../resources/META-INF/classnames.properties| 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 2 +- 5 files changed, 58 insertions(+), 58 deletions(-) --
[1/3] incubator-ignite git commit: # ignite-45 - javadoc fix.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 afb1de605 -> 2b62e4348
# ignite-45 - javadoc fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9fabbeab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9fabbeab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9fabbeab
Branch: refs/heads/ignite-45
Commit: 9fabbeab00029ce62e4255b22e5cdea9faf6c81b
Parents: 60d63a6
Author: Dmitiry Setrakyan
Authored: Sun Mar 22 12:53:18 2015 -0700
Committer: Dmitiry Setrakyan
Committed: Sun Mar 22 12:53:18 2015 -0700
--
.../org/apache/ignite/cache/CacheServerNotFoundException.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fabbeab/modules/core/src/main/java/org/apache/ignite/cache/CacheServerNotFoundException.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheServerNotFoundException.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheServerNotFoundException.java
index 693a5eb..3c035d3 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/CacheServerNotFoundException.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/CacheServerNotFoundException.java
@@ -16,13 +16,13 @@
*/
package org.apache.ignite.cache;
-import javax.cache.CacheException;
+import javax.cache.*;
/**
* Exception thrown when all data nodes left the grid.
*/
public class CacheServerNotFoundException extends CacheException {
-/** */
+/** Serialization ID. */
private static final long serialVersionUID = 0L;
/**
[1/3] incubator-ignite git commit: IGNITE-45 - Added warning message when server nodes left the grid.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 2b62e4348 -> d22e6f4b2
IGNITE-45 - Added warning message when server nodes left the grid.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f6e02dcb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f6e02dcb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f6e02dcb
Branch: refs/heads/ignite-45
Commit: f6e02dcb0e688c76e56dd77aaa534e0a9c56d0d7
Parents: afb1de6
Author: Alexey Goncharuk
Authored: Sun Mar 22 14:34:09 2015 -0700
Committer: Alexey Goncharuk
Committed: Sun Mar 22 14:34:09 2015 -0700
--
.../org/apache/ignite/events/EventType.java | 11 ++-
.../processors/cache/GridCacheGateway.java | 8 +-
.../processors/cache/GridCacheProcessor.java| 15
.../GridDhtPartitionsExchangeFuture.java| 80 +++-
.../cache/IgniteDynamicCacheStartSelfTest.java | 80
5 files changed, 177 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f6e02dcb/modules/core/src/main/java/org/apache/ignite/events/EventType.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java
b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
index 3573ba4..2448d0a 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
@@ -640,6 +640,14 @@ public interface EventType {
public static final int EVT_CACHE_STOPPED = 99;
/**
+ * Built-in event type: cache nodes left.
+ *
+ * NOTE: all types in range from 1 to 1000 are reserved for
+ * internal Ignite events and should not be used by user-defined events.
+ */
+public static final int EVT_CACHE_NODES_LEFT = 100;
+
+/**
* Built-in event type: Visor detects that some events were evicted from
events buffer since last poll.
*
* NOTE: all types in range from 1 to 1000 are reserved for
@@ -953,7 +961,8 @@ public interface EventType {
*/
public static final int[] EVTS_CACHE_LIFECYCLE = {
EVT_CACHE_STARTED,
-EVT_CACHE_STOPPED
+EVT_CACHE_STOPPED,
+EVT_CACHE_NODES_LEFT
};
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f6e02dcb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index 35a5d90..4868b3f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -176,10 +176,14 @@ public class GridCacheGateway {
/**
*
*/
-public void onStopped() {
-// Must prevent re-entries to the read lock.
+public void block() {
stopped = true;
+}
+/**
+ *
+ */
+public void onStopped() {
boolean interrupted = false;
while (true) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f6e02dcb/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 e9b7ae2..6633356 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
@@ -1360,6 +1360,19 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
assert req.stop();
// Break the proxy before exchange future is done.
+IgniteCacheProxy proxy =
jCacheProxies.get(maskNull(req.cacheName()));
+
+if (proxy != null)
+proxy.gate().block();
+}
+
+/**
+ * @param req Request.
+ */
+private void stopGateway(DynamicCacheChangeRequest req) {
+assert req.stop();
+
+// Break the proxy before exchange future is done.
IgniteCacheProxy proxy =
jCacheProxies.remove(maskNull(req.cacheName()));
if (proxy != null)
@@ -1416,6 +1429,8 @@ public class GridCacheProcessor extends
GridProcessorAdapter
[3/3] incubator-ignite git commit: IGNITE-45 - Minor.
IGNITE-45 - 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/d22e6f4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d22e6f4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d22e6f4b
Branch: refs/heads/ignite-45
Commit: d22e6f4b26c2578fb554f47ffa8afeaa2c63ffdc
Parents: 60fb365
Author: Alexey Goncharuk
Authored: Sun Mar 22 14:34:58 2015 -0700
Committer: Alexey Goncharuk
Committed: Sun Mar 22 14:34:58 2015 -0700
--
.../main/java/org/apache/ignite/cache/CacheExistsException.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d22e6f4b/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
index 8d2afbb..113f329 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/CacheExistsException.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.*;
import javax.cache.*;
/**
- * Exception thrown when cache must be created by it already exists.
+ * Exception thrown when cache must be created but it already exists.
*/
public class CacheExistsException extends CacheException {
/** Serialization ID. */
[2/3] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Merge remote-tracking branch 'origin/ignite-45' into ignite-45 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60fb365a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60fb365a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60fb365a Branch: refs/heads/ignite-45 Commit: 60fb365aed324634828663860057efb03654925f Parents: f6e02dc 2b62e43 Author: Alexey Goncharuk Authored: Sun Mar 22 14:34:19 2015 -0700 Committer: Alexey Goncharuk Committed: Sun Mar 22 14:34:19 2015 -0700 -- .../main/java/org/apache/ignite/cache/CacheExistsException.java | 4 ++-- .../org/apache/ignite/cache/CacheServerNotFoundException.java| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --
incubator-ignite git commit: IGNITE-45 - Commented failing test.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 d22e6f4b2 -> 16acd3fb1
IGNITE-45 - Commented failing 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/16acd3fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/16acd3fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/16acd3fb
Branch: refs/heads/ignite-45
Commit: 16acd3fb1a2eb3a310ce95cf7d643f8662226d5d
Parents: d22e6f4
Author: Alexey Goncharuk
Authored: Sun Mar 22 16:24:31 2015 -0700
Committer: Alexey Goncharuk
Committed: Sun Mar 22 16:24:31 2015 -0700
--
.../org/apache/ignite/examples/MessagingExamplesSelfTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16acd3fb/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
--
diff --git
a/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
index 0932b47..9950870 100644
---
a/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
+++
b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
@@ -37,9 +37,10 @@ public class MessagingExamplesSelfTest extends
GridAbstractExamplesTest {
}
/**
+ * TODO IGNITE-533
* @throws Exception If failed.
*/
-public void testMessagingPingPongExample() throws Exception {
+public void _testMessagingPingPongExample() throws Exception {
MessagingPingPongExample.main(EMPTY_ARGS);
}
incubator-ignite git commit: ignite-341 - fix attempt
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-341 [created] 2c8716430
ignite-341 - fix attempt
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2c871643
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c871643
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c871643
Branch: refs/heads/ignite-341
Commit: 2c8716430db5f4461c34974b9266a21ca90c0372
Parents: 6837e12
Author: S.Vladykin
Authored: Mon Mar 23 04:30:53 2015 +0300
Committer: S.Vladykin
Committed: Mon Mar 23 04:30:53 2015 +0300
--
.../distributed/dht/GridDhtLocalPartition.java | 111 ++-
.../ignite/internal/util/lang/GridFunc.java | 14 +
...CacheOffheapTieredMultithreadedSelfTest.java | 324 +++
3 files changed, 434 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c871643/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 92c62d7..66f555c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -22,6 +22,7 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.processors.query.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.lang.*;
@@ -32,6 +33,7 @@ import org.apache.ignite.lang.*;
import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
+import javax.cache.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
@@ -420,7 +422,8 @@ public class GridDhtLocalPartition implements
Comparable
* @return Future for evict attempt.
*/
private IgniteInternalFuture tryEvictAsync(boolean updateSeq) {
-if (map.isEmpty() && state.compareAndSet(RENTING, EVICTED, 0, 0)) {
+if (map.isEmpty() && !GridQueryProcessor.isEnabled(cctx.config()) &&
+state.compareAndSet(RENTING, EVICTED, 0, 0)) {
if (log.isDebugEnabled())
log.debug("Evicted partition: " + this);
@@ -460,7 +463,8 @@ public class GridDhtLocalPartition implements
Comparable
if (log.isDebugEnabled())
log.debug("Evicted partition: " + this);
-clearSwap();
+if (!GridQueryProcessor.isEnabled(cctx.config()))
+clearSwap();
if (cctx.isDrEnabled())
cctx.dr().partitionEvicted(id);
@@ -484,6 +488,7 @@ public class GridDhtLocalPartition implements
Comparable
*/
private void clearSwap() {
assert state() == EVICTED;
+assert !GridQueryProcessor.isEnabled(cctx.config()) : "Indexing needs
to have unswapped values.";
try {
GridCloseableIterator> it =
cctx.swap().iterator(id);
@@ -536,27 +541,103 @@ public class GridDhtLocalPartition implements
Comparable
boolean rec =
cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_UNLOADED);
-for (Iterator it = map.values().iterator();
it.hasNext();) {
-GridDhtCacheEntry cached = it.next();
+Iterator it = map.values().iterator();
+
+GridCloseableIterator> swapIt =
null;
+
+if (swap && GridQueryProcessor.isEnabled(cctx.config())) { // Indexing
needs to unswap cache values.
+Iterator unswapIt = null;
try {
-if (cached.clearInternal(clearVer, swap)) {
-it.remove();
+swapIt = cctx.swap().iterator(id);
+unswapIt = unswapIterator(swapIt);
+}
+catch (Exception e) {
+U.error(log, "Failed to clear swap for evicted partition: " +
this, e);
+}
+
+if (unswapIt != null)
+it = F.concat(it, unswapIt);
+}
+
+try {
+while (it.hasNext()) {
+GridDhtCacheEntry cached = it.next();
-if (!cached.isInternal()) {
-mapPubSize.decrement();
+try {
+
[3/8] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Merge remote-tracking branch 'origin/ignite-45' into ignite-45 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/364a7230 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/364a7230 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/364a7230 Branch: refs/heads/ignite-45 Commit: 364a72307190e62a1724d390ea2cd1d9ff3fb291 Parents: 8f26539 d22e6f4 Author: Valentin Kulichenko Authored: Sun Mar 22 15:27:55 2015 -0700 Committer: Valentin Kulichenko Committed: Sun Mar 22 15:27:55 2015 -0700 -- .../ignite/cache/CacheExistsException.java | 2 +- .../org/apache/ignite/events/EventType.java | 11 ++- .../processors/cache/GridCacheGateway.java | 8 +- .../processors/cache/GridCacheProcessor.java| 15 .../GridDhtPartitionsExchangeFuture.java| 80 +++- .../cache/IgniteDynamicCacheStartSelfTest.java | 80 6 files changed, 178 insertions(+), 18 deletions(-) --
[8/8] incubator-ignite git commit: IGNITE-45 - Examples
IGNITE-45 - 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/d086ae05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d086ae05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d086ae05
Branch: refs/heads/ignite-45
Commit: d086ae05040e5c6f28bccce0747d95e6d15aea4f
Parents: 02c4ca5
Author: Valentin Kulichenko
Authored: Sun Mar 22 18:35:18 2015 -0700
Committer: Valentin Kulichenko
Committed: Sun Mar 22 18:35:18 2015 -0700
--
.../computegrid/ComputeAsyncExample.java| 73 +
.../computegrid/ComputeRunnableExample.java | 15 +---
.../examples/datagrid/CacheApiExample.java | 25 +-
.../examples/datagrid/CacheAsyncApiExample.java | 86
.../java8/computegrid/ComputeAsyncExample.java | 71
.../computegrid/ComputeRunnableExample.java | 12 +--
.../java8/datagrid/CacheApiExample.java | 13 ---
.../java8/datagrid/CacheAsyncApiExample.java| 82 +++
8 files changed, 317 insertions(+), 60 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d086ae05/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeAsyncExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeAsyncExample.java
b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeAsyncExample.java
new file mode 100644
index 000..22a5847
--- /dev/null
+++
b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeAsyncExample.java
@@ -0,0 +1,73 @@
+/*
+ * 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.examples.computegrid;
+
+import org.apache.ignite.*;
+import org.apache.ignite.examples.*;
+import org.apache.ignite.lang.*;
+
+import java.util.*;
+
+/**
+ * Demonstrates a simple use of {@link IgniteRunnable}.
+ *
+ * Remote nodes should always be started with special configuration file which
+ * enables P2P class loading: {@code 'ignite.{sh|bat}
examples/config/example-ignite.xml'}.
+ *
+ * Alternatively you can run {@link ExampleNodeStartup} in another JVM which
will start node
+ * with {@code examples/config/example-ignite.xml} configuration.
+ */
+public class ComputeAsyncExample {
+/**
+ * Executes example.
+ *
+ * @param args Command line arguments, none required.
+ * @throws IgniteException If example execution failed.
+ */
+public static void main(String[] args) throws IgniteException {
+try (Ignite ignite =
Ignition.start("examples/config/example-ignite.xml")) {
+System.out.println();
+System.out.println("Compute asynchronous example started.");
+
+// Enable asynchronous mode.
+IgniteCompute compute = ignite.compute().withAsync();
+
+Collection> futs = new ArrayList<>();
+
+// Iterate through all words in the sentence and create runnable
jobs.
+for (final String word : "Print words using runnable".split(" ")) {
+// Execute runnable on some node.
+compute.run(new IgniteRunnable() {
+@Override public void run() {
+System.out.println();
+System.out.println(">>> Printing '" + word + "' on
this node from ignite job.");
+}
+});
+
+futs.add(compute.future());
+}
+
+// Wait for completion of all futures.
+futs.forEach(IgniteFuture::get);
+
+System.out.println();
+System.out.println(">>> Finished printing words using runnable
execution.");
+System.out.println(">>> Check all nodes for output (this node is
also part of the cluster).");
+}
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d086ae05/examples/src/main/java/org/apache/ignite/examples/computegri
[4/8] incubator-ignite git commit: IGNITE-45 - Examples
IGNITE-45 - 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/8568c703
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8568c703
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8568c703
Branch: refs/heads/ignite-45
Commit: 8568c703c7371074a74d5776ccbcc1c1157b6c6a
Parents: 364a723
Author: Valentin Kulichenko
Authored: Sun Mar 22 16:36:22 2015 -0700
Committer: Valentin Kulichenko
Committed: Sun Mar 22 16:36:22 2015 -0700
--
.../store/CacheNodeWithStoreStartup.java| 155 ---
.../datagrid/store/CacheStoreExample.java | 75 -
.../CacheStoreExampleCacheConfigurator.java | 125 +++
.../store/CacheStoreLoadDataExample.java| 28 ++--
.../ignite/examples/datagrid/store/Person.java | 155 +++
.../store/dummy/CacheDummyPersonStore.java | 2 +-
.../hibernate/CacheHibernatePersonStore.java| 2 +-
.../datagrid/store/hibernate/Person.hbm.xml | 2 +-
.../store/jdbc/CacheJdbcPersonStore.java| 2 +-
.../store/jdbc/CacheJdbcPojoPersonStore.java| 2 +-
.../examples/datagrid/store/model/Person.java | 155 ---
...heStoreLoadDataExampleMultiNodeSelfTest.java | 2 +-
modules/schema-import/readme.txt| 4 +-
13 files changed, 334 insertions(+), 375 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8568c703/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
deleted file mode 100644
index 0edf591..000
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
+++ /dev/null
@@ -1,155 +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.examples.datagrid.store;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.examples.datagrid.store.dummy.*;
-import org.apache.ignite.examples.datagrid.store.hibernate.*;
-import org.apache.ignite.examples.datagrid.store.jdbc.*;
-import org.apache.ignite.examples.datagrid.store.model.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-
-import javax.cache.configuration.*;
-import java.sql.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-
-/**
- * Starts up an empty node with example cache and store configuration.
- */
-public class CacheNodeWithStoreStartup {
-/** Use
org.apache.ignite.examples.datagrid.store.dummy.CacheDummyPersonStore to run
example. */
-public static final String DUMMY = "DUMMY";
-
-/** Use
org.apache.ignite.examples.datagrid.store.jdbc.CacheJdbcPersonStore to run
example. */
-public static final String SIMPLE_JDBC = "SIMPLE_JDBC";
-
-/** Use
org.apache.ignite.examples.datagrid.store.hibernate.CacheHibernatePersonStore
to run example. */
-public static final String HIBERNATE = "HIBERNATE";
-
-/** Use
org.apache.ignite.examples.datagrid.store.jdbc.CacheJdbcPojoPersonStore to run
example. */
-public static final String AUTO = "AUTO";
-
-/** Store to use. */
-public static final String STORE = DUMMY;
-
-/**
- * Start up an empty node with specified cache configuration.
- *
- * @param args Command line arguments, none required.
- * @throws IgniteException If example execution failed.
- */
-public static void main(String[] args) throws IgniteException {
-Ignition.st
[1/8] incubator-ignite git commit: # IGNITE-45 - Examples
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 16acd3fb1 -> d086ae050
# IGNITE-45 - 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/da36a72d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/da36a72d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/da36a72d
Branch: refs/heads/ignite-45
Commit: da36a72df408de3bdd77dd877121ea0f569ebb38
Parents: 2b62e43
Author: Valentin Kulichenko
Authored: Sun Mar 22 13:56:25 2015 -0700
Committer: Valentin Kulichenko
Committed: Sun Mar 22 13:56:25 2015 -0700
--
.../ComputeClusterGroupsExample.java| 93
.../cluster/ClusterGroupExample.java| 93
.../computegrid/cluster/package-info.java | 22 +
.../java8/cluster/ClusterGroupExample.java | 82 +
.../examples/java8/cluster/package-info.java| 22 +
.../ComputeClusterGroupsExample.java| 82 -
.../examples/ClusterGroupExampleSelfTest.java | 39
.../ComputeClusterGroupsExampleSelfTest.java| 39
.../testsuites/IgniteExamplesSelfTestSuite.java | 2 +-
9 files changed, 259 insertions(+), 215 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da36a72d/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClusterGroupsExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClusterGroupsExample.java
b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClusterGroupsExample.java
deleted file mode 100644
index 40f8598..000
---
a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeClusterGroupsExample.java
+++ /dev/null
@@ -1,93 +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.examples.computegrid;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.examples.*;
-import org.apache.ignite.lang.*;
-
-/**
- * Demonstrates new functional APIs.
- *
- * Remote nodes should always be started with special configuration file which
- * enables P2P class loading: {@code 'ignite.{sh|bat}
examples/config/example-ignite.xml'}.
- *
- * Alternatively you can run {@link ExampleNodeStartup} in another JVM which
will start node
- * with {@code examples/config/example-ignite.xml} configuration.
- */
-public class ComputeClusterGroupsExample {
-/**
- * Executes example.
- *
- * @param args Command line arguments, none required.
- * @throws IgniteException If example execution failed.
- */
-public static void main(String[] args) throws IgniteException {
-try (Ignite ignite =
Ignition.start("examples/config/example-ignite.xml")) {
-if (!ExamplesUtils.checkMinTopologySize(ignite.cluster(), 2))
-return;
-
-System.out.println();
-System.out.println("Compute example started.");
-
-IgniteCluster cluster = ignite.cluster();
-
-// Say hello to all nodes in the cluster, including local node.
-sayHello(ignite, cluster);
-
-// Say hello to all remote nodes.
-sayHello(ignite, cluster.forRemotes());
-
-// Pick random node out of remote nodes.
-ClusterGroup randomNode = cluster.forRemotes().forRandom();
-
-// Say hello to a random node.
-sayHello(ignite, randomNode);
-
-// Say hello to all nodes residing on the same host with random
node.
-sayHello(ignite, cluster.forHost(randomNode.node()));
-
-// Say hello to all nodes that have current CPU load less than 50%.
-sayHello(ignite, cluster.forPredicate(new
IgnitePredicate() {
-@Override public boolean apply(ClusterNode n) {
-return n.metrics().getCurrentCpuLoad() < 0.5;
[7/8] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Merge remote-tracking branch 'origin/ignite-45' into ignite-45 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/02c4ca59 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/02c4ca59 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/02c4ca59 Branch: refs/heads/ignite-45 Commit: 02c4ca590d5524ae711057ab5448360135520a93 Parents: 2ea4871 16acd3f Author: Valentin Kulichenko Authored: Sun Mar 22 17:21:51 2015 -0700 Committer: Valentin Kulichenko Committed: Sun Mar 22 17:21:51 2015 -0700 -- .../org/apache/ignite/examples/MessagingExamplesSelfTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[5/8] incubator-ignite git commit: IGNITE-45 - Examples
IGNITE-45 - 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/280b4f68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/280b4f68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/280b4f68
Branch: refs/heads/ignite-45
Commit: 280b4f68d6421f32b952d62cf1ffbe6b22fcd08a
Parents: 8568c70
Author: Valentin Kulichenko
Authored: Sun Mar 22 17:03:14 2015 -0700
Committer: Valentin Kulichenko
Committed: Sun Mar 22 17:03:14 2015 -0700
--
.../hibernate/example-hibernate-L2-cache.xml| 3 -
.../hibernate/HibernateL2CacheExample.java | 135 ---
.../HibernateL2CacheExampleNodeStartup.java | 97 -
...ibernateL2CacheExampleMultiNodeSelfTest.java | 2 +-
.../cache/hibernate/HibernateRegionFactory.java | 15 +--
5 files changed, 91 insertions(+), 161 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/280b4f68/examples/config/hibernate/example-hibernate-L2-cache.xml
--
diff --git a/examples/config/hibernate/example-hibernate-L2-cache.xml
b/examples/config/hibernate/example-hibernate-L2-cache.xml
index 324c040..3248946 100644
--- a/examples/config/hibernate/example-hibernate-L2-cache.xml
+++ b/examples/config/hibernate/example-hibernate-L2-cache.xml
@@ -46,9 +46,6 @@
org.apache.ignite.cache.hibernate.HibernateRegionFactory
-
-hibernate-grid
-
on_close
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/280b4f68/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
index 7ba7ea1..6bb3f33 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
@@ -18,6 +18,8 @@
package org.apache.ignite.examples.datagrid.hibernate;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.examples.*;
import org.hibernate.*;
import org.hibernate.cache.spi.access.AccessType;
@@ -28,6 +30,10 @@ import org.hibernate.stat.*;
import java.net.*;
import java.util.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+
/**
* This example demonstrates the use of Ignite In-Memory Data Ignite cluster
as a Hibernate
* Second-Level cache provider.
@@ -63,7 +69,11 @@ import java.util.*;
* can experiment with other access types by modifying the Hibernate
configuration file
* {@code
IGNITE_HOME/examples/config/hibernate/example-hibernate-L2-cache.xml}, used by
the example.
*
- * Remote nodes should always be started using {@link
HibernateL2CacheExampleNodeStartup}
+ * Remote nodes should always be started with special configuration file which
+ * enables P2P class loading: {@code 'ignite.{sh|bat}
examples/config/example-ignite.xml'}.
+ *
+ * Alternatively you can run {@link ExampleNodeStartup} in another JVM which
will
+ * start node with {@code examples/config/example-ignite.xml} configuration.
*/
public class HibernateL2CacheExample {
/** JDBC URL for backing database (an H2 in-memory database is used). */
@@ -84,84 +94,111 @@ public class HibernateL2CacheExample {
*/
public static void main(String[] args) throws IgniteException {
// Start the node, run the example, and stop the node when finished.
-try (Ignite ignite =
Ignition.start(HibernateL2CacheExampleNodeStartup.configuration())) {
+try (Ignite ignite =
Ignition.start("examples/config/example-ignite.xml")) {
// We use a single session factory, but create a dedicated session
// for each transaction or query. This way we ensure that L1 cache
// is not used (L1 cache has per-session scope only).
System.out.println();
System.out.println(">>> Hibernate L2 cache example started.");
-URL hibernateCfg = ExamplesUtils.url(HIBERNATE_CFG);
+try (
+// Create all required caches.
+IgniteCache c1 =
createCache("org.hibernate.cache.spi.UpdateTimestampsCache", ATOMIC);
+IgniteCache c2 =
createCache("org.hibernate.cache.internal.StandardQueryCach
[2/8] incubator-ignite git commit: # IGNITE-45 - Examples
# IGNITE-45 - 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/8f26539f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f26539f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f26539f
Branch: refs/heads/ignite-45
Commit: 8f26539f8a16cbc52001f5e84199d9e257a3f4b4
Parents: da36a72
Author: Valentin Kulichenko
Authored: Sun Mar 22 14:10:59 2015 -0700
Committer: Valentin Kulichenko
Committed: Sun Mar 22 14:10:59 2015 -0700
--
.../streaming/marketdata/CacheConfig.java | 2 +-
.../streaming/marketdata/Instrument.java| 14 ++---
.../streaming/marketdata/MarketTick.java| 59
.../streaming/marketdata/StreamMarketData.java | 18 ++
.../java8/streaming/marketdata/CacheConfig.java | 2 +-
.../java8/streaming/marketdata/Instrument.java | 14 ++---
.../java8/streaming/marketdata/MarketTick.java | 59
.../streaming/marketdata/StreamMarketData.java | 10 ++--
8 files changed, 26 insertions(+), 152 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f26539f/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/CacheConfig.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/CacheConfig.java
b/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/CacheConfig.java
index 7a2850e..f26ffb7 100644
---
a/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/CacheConfig.java
+++
b/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/CacheConfig.java
@@ -26,7 +26,7 @@ public class CacheConfig {
/**
* Configure streaming cache for market ticks.
*/
-public static CacheConfiguration marketTicksCache() {
+public static CacheConfiguration marketTicksCache() {
return new CacheConfiguration<>("marketTicks");
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f26539f/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/Instrument.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/Instrument.java
b/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/Instrument.java
index 23f002a..6daaffe 100644
---
a/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/Instrument.java
+++
b/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/Instrument.java
@@ -51,17 +51,17 @@ public class Instrument implements Serializable {
}
/**
- * Updates this instrument based on the latest market tick.
+ * Updates this instrument based on the latest price.
*
- * @param tick Market tick.
+ * @param price Latest price.
*/
-public void update(MarketTick tick) {
+public void update(double price) {
if (open == 0)
-open = tick.price();
+open = price;
-high = Math.max(high, tick.price());
-low = Math.min(low, tick.price());
-this.latest = tick.price();
+high = Math.max(high, price);
+low = Math.min(low, price);
+this.latest = price;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f26539f/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/MarketTick.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/MarketTick.java
b/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/MarketTick.java
deleted file mode 100644
index 949921ba..000
---
a/examples/src/main/java/org/apache/ignite/examples/streaming/marketdata/MarketTick.java
+++ /dev/null
@@ -1,59 +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.ap
[6/8] incubator-ignite git commit: IGNITE-45 - Examples
IGNITE-45 - 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/2ea4871e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ea4871e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ea4871e Branch: refs/heads/ignite-45 Commit: 2ea4871ea0984c0cfed50d404dc2a9a4fabaa6c8 Parents: 280b4f6 Author: Valentin Kulichenko Authored: Sun Mar 22 17:21:42 2015 -0700 Committer: Valentin Kulichenko Committed: Sun Mar 22 17:21:42 2015 -0700 -- assembly/release-fabric.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ea4871e/assembly/release-fabric.xml -- diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml index 442bbe5..3bc591c 100644 --- a/assembly/release-fabric.xml +++ b/assembly/release-fabric.xml @@ -69,6 +69,7 @@ /examples rest/** +memcached/** schema-import/**
incubator-ignite git commit: # ignite-45 - javadoc fix.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 d086ae050 -> 1466d1d08
# ignite-45 - javadoc fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1466d1d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1466d1d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1466d1d0
Branch: refs/heads/ignite-45
Commit: 1466d1d086aa9ccb23bff22c8c9652436e5048cf
Parents: d086ae0
Author: Dmitiry Setrakyan
Authored: Sun Mar 22 19:20:45 2015 -0700
Committer: Dmitiry Setrakyan
Committed: Sun Mar 22 19:20:45 2015 -0700
--
modules/core/src/main/java/org/apache/ignite/IgniteCache.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1466d1d0/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index f54597d..b1628b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -91,7 +91,7 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
* Executes {@link #localLoadCache(IgniteBiPredicate, Object...)} on all
cache nodes.
*
* @param p Optional predicate (may be {@code null}). If provided, will be
used to
- * filter values to be put into cache.
+ * filter values loaded from storage before they are put into cache.
* @param args Optional user arguments to be passed into
* {@link CacheStore#loadCache(IgniteBiInClosure, Object...)} method.
* @throws CacheException If loading failed.
