[25/50] [abbrv] incubator-ignite git commit: rat settings updated
rat settings updated Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45e2b8f0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45e2b8f0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45e2b8f0 Branch: refs/heads/ignite-437-sqltests Commit: 45e2b8f01ec05efb885e85129ffb9a190355038a Parents: 1e2845c Author: avinogradov Authored: Wed Mar 18 17:28:54 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 17:28:54 2015 +0300 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45e2b8f0/pom.xml -- diff --git a/pom.xml b/pom.xml index d2e42eb..8bf07a1 100644 --- a/pom.xml +++ b/pom.xml @@ -580,6 +580,7 @@ **/keystore/*.pem **/keystore/*.pfx +**/package-info.java DEVNOTES.txt src/main/java/com/romix/scala/** src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java
[21/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/013b4bac Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/013b4bac Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/013b4bac Branch: refs/heads/ignite-437-sqltests Commit: 013b4bac275a6c5c98ac5da28b0c54e96591e336 Parents: a6f75cd 3236419 Author: ivasilinets Authored: Wed Mar 18 16:50:01 2015 +0300 Committer: ivasilinets Committed: Wed Mar 18 16:50:01 2015 +0300 -- ...GridCacheLoadingConcurrentGridStartTest.java | 154 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + 2 files changed, 155 insertions(+) --
[18/50] [abbrv] incubator-ignite git commit: # sprint-2: Added tests for cache data loading during simultaneous grids start.
# sprint-2: Added tests for cache data loading during simultaneous grids start.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae11c586
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae11c586
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae11c586
Branch: refs/heads/ignite-437-sqltests
Commit: ae11c586e950a76775ecc36f84ecdb44ddfe8bdf
Parents: 3eca5e7
Author: Andrey Gura
Authored: Wed Mar 18 16:39:32 2015 +0300
Committer: Andrey Gura
Committed: Wed Mar 18 16:39:32 2015 +0300
--
...GridCacheLoadingConcurrentGridStartTest.java | 154 +++
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
2 files changed, 155 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae11c586/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLoadingConcurrentGridStartTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLoadingConcurrentGridStartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLoadingConcurrentGridStartTest.java
new file mode 100644
index 000..ac47b88
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLoadingConcurrentGridStartTest.java
@@ -0,0 +1,154 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.store.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+import org.jetbrains.annotations.*;
+
+import javax.cache.*;
+import javax.cache.configuration.*;
+import javax.cache.integration.*;
+import java.util.concurrent.*;
+
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Tests for cache data loading during simultaneous grids start.
+ */
+public class GridCacheLoadingConcurrentGridStartTest extends
GridCommonAbstractTest {
+/** Grids count */
+private static int GRIDS_CNT = 5;
+
+/** Keys count */
+private static int KEYS_CNT = 1_000_000;
+
+/** {@inheritDoc} */
+@SuppressWarnings("unchecked")
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+CacheConfiguration ccfg = new CacheConfiguration();
+
+ccfg.setCacheMode(PARTITIONED);
+
+ccfg.setBackups(1);
+
+CacheStore store = new CacheStoreAdapter() {
+@Override public void loadCache(IgniteBiInClosure
f, Object... args) {
+for (int i = 0; i < KEYS_CNT; i++)
+f.apply(i, Integer.toString(i));
+}
+
+@Nullable @Override public String load(Integer i) throws
CacheLoaderException {
+return null;
+}
+
+@Override public void write(Cache.Entry entry) throws CacheWriterException {
+// No-op.
+}
+
+@Override public void delete(Object o) throws CacheWriterException
{
+// No-op.
+}
+};
+
+ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store));
+
+cfg.setCacheConfiguration(ccfg);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+stopAllGrids();
+}
+
+/**
+ * @throws Exception if failed
+ */
+public void testLoadCacheWithDataStreamer() throws Exception {
+IgniteInClosure f = new IgniteInClosure() {
+@Override public void apply(Ignite grid) {
+try (IgniteDa
[34/50] [abbrv] incubator-ignite git commit: rat settings updated
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69865a9/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/package-info.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/package-info.java b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/package-info.java index 8fd49eb..954b919 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/package-info.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains internal tests or test related classes and interfaces. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69865a9/modules/core/src/test/java/org/apache/ignite/spi/failover/always/package-info.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/always/package-info.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/always/package-info.java index 87103f5..b3dcb25 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/failover/always/package-info.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/always/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains internal tests or test related classes and interfaces. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69865a9/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package-info.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package-info.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package-info.java index 583f268..e68cca7 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package-info.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains internal tests or test related classes and interfaces. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69865a9/modules/core/src/test/java/org/apache/ignite/spi/failover/never/package-info.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/never/package-info.java b/modules/core/src/test/java
[47/50] [abbrv] incubator-ignite git commit: # ignite-510
# ignite-510
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/839cfd0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/839cfd0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/839cfd0a
Branch: refs/heads/ignite-437-sqltests
Commit: 839cfd0acee72fb3903822c8fba3512b72ad23a4
Parents: 385d9c8
Author: sboikov
Authored: Thu Mar 19 14:29:11 2015 +0300
Committer: sboikov
Committed: Thu Mar 19 14:29:11 2015 +0300
--
.../ignite/marshaller/optimized/OptimizedObjectInputStream.java | 1 +
.../ignite/marshaller/optimized/OptimizedObjectOutputStream.java| 1 +
2 files changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/839cfd0a/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 4bc648f..f8c6e46 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
@@ -122,6 +122,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
ctx = null;
clsLdr = null;
+clsMap = null;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/839cfd0a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
index 06c2554..c5f9f08 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
@@ -115,6 +115,7 @@ class OptimizedObjectOutputStream extends
ObjectOutputStream {
reset();
ctx = null;
+clsMap = null;
}
/** {@inheritDoc} */
[23/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-432' into sprint-2
Merge remote-tracking branch 'remotes/origin/ignite-432' 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/1e2845c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1e2845c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1e2845c5 Branch: refs/heads/ignite-437-sqltests Commit: 1e2845c5d5bd5469bfe42e43f944ae67221a578f Parents: 013b4ba 291f3ba Author: avinogradov Authored: Wed Mar 18 17:08:54 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 17:08:54 2015 +0300 -- .../ComputeContinuousMapperExample.java | 2 +- .../ComputeFibonacciContinuationExample.java| 2 +- .../computegrid/failover/package-info.java | 5 + .../examples/computegrid/failover/package.html | 24 - .../computegrid/montecarlo/package-info.java| 5 + .../computegrid/montecarlo/package.html | 24 - .../examples/computegrid/package-info.java | 5 + .../ignite/examples/computegrid/package.html| 24 - .../datagrid/hibernate/package-info.java| 5 + .../examples/datagrid/hibernate/package.html| 24 - .../ignite/examples/datagrid/package-info.java | 5 + .../ignite/examples/datagrid/package.html | 24 - .../datagrid/starschema/package-info.java | 5 + .../examples/datagrid/starschema/package.html | 24 - .../datagrid/store/dummy/package-info.java | 5 + .../examples/datagrid/store/dummy/package.html | 24 - .../datagrid/store/hibernate/package-info.java | 5 + .../datagrid/store/hibernate/package.html | 24 - .../datagrid/store/jdbc/package-info.java | 5 + .../examples/datagrid/store/jdbc/package.html | 24 - .../examples/datagrid/store/package-info.java | 5 + .../ignite/examples/datagrid/store/package.html | 24 - .../examples/datastructures/package-info.java | 5 + .../ignite/examples/datastructures/package.html | 24 - .../ignite/examples/events/package-info.java| 5 + .../apache/ignite/examples/events/package.html | 24 - .../ignite/examples/igfs/package-info.java | 5 + .../apache/ignite/examples/igfs/package.html| 24 - .../ignite/examples/messaging/package-info.java | 5 + .../ignite/examples/messaging/package.html | 24 - .../misc/client/memcache/package-info.java | 5 + .../examples/misc/client/memcache/package.html | 24 - .../examples/misc/client/package-info.java | 5 + .../ignite/examples/misc/client/package.html| 24 - .../examples/misc/deployment/package-info.java | 5 + .../examples/misc/deployment/package.html | 24 - .../examples/misc/lifecycle/package-info.java | 5 + .../ignite/examples/misc/lifecycle/package.html | 24 - .../ignite/examples/misc/package-info.java | 5 + .../apache/ignite/examples/misc/package.html| 24 - .../examples/misc/springbean/package-info.java | 5 + .../examples/misc/springbean/package.html | 24 - .../apache/ignite/examples/package-info.java| 5 + .../org/apache/ignite/examples/package.html | 24 - .../ignite/examples/streaming/package-info.java | 5 + .../ignite/examples/streaming/package.html | 24 - .../gridify/aop/aspectj/package-info.java | 5 + .../compute/gridify/aop/aspectj/package.html| 24 - .../gridify/aop/spring/package-info.java| 5 + .../compute/gridify/aop/spring/package.html | 25 - .../ignite/gridify/hierarchy/package-info.java | 5 + .../ignite/gridify/hierarchy/package.html | 25 - .../org/apache/ignite/gridify/package-info.java | 5 + .../java/org/apache/ignite/gridify/package.html | 25 - .../direct/singlesplit/package-info.java| 5 + .../loadtests/direct/singlesplit/package.html | 24 - .../java/org/test/gridify/package-info.java | 5 + .../src/test/java/org/test/gridify/package.html | 24 - .../ignite/spi/checkpoint/s3/package-info.java | 5 + .../ignite/spi/checkpoint/s3/package.html | 24 - .../discovery/tcp/ipfinder/s3/package-info.java | 5 + .../spi/discovery/tcp/ipfinder/s3/package.html | 24 - .../ignite/spi/checkpoint/s3/package-info.java | 5 + .../ignite/spi/checkpoint/s3/package.html | 24 - .../discovery/tcp/ipfinder/s3/package-info.java | 5 + .../spi/discovery/tcp/ipfinder/s3/package.html | 24 - .../scala/collection/concurrent/TrieMap.java| 4 +- .../java/org/apache/ignite/IgniteCache.java | 14 +- .../java/org/apache/ignite/IgniteCompute.java | 4 - .../java/org/apache/ignite/IgniteQueue.java | 4 +- .../main/java/org/apache/ignite/IgniteSet.java | 2 +- .../cache/affinity/CacheAffinityKeyMapped.java | 44 -- .../cache/affinity/fair/package-info.java | 4 + .../ignite/cache/affinity/fair/package.html | 24 - .../ignite/cache/affinity/package-info.java | 4 + .../apache/ignite/cache/aff
[41/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-375' and 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-375
Merge branches 'ignite-375' and 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-375 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5c856ed5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5c856ed5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5c856ed5 Branch: refs/heads/ignite-437-sqltests Commit: 5c856ed50aa1b4c61eff520fe2c84c5ed2762671 Parents: 1c608cd fe649a4 Author: anovikov Authored: Thu Mar 19 08:33:18 2015 +0700 Committer: anovikov Committed: Thu Mar 19 08:33:18 2015 +0700 -- .../ComputeContinuousMapperExample.java | 2 +- .../ComputeFibonacciContinuationExample.java| 2 +- .../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/hibernate/package-info.java| 22 + .../examples/datagrid/hibernate/package.html| 24 - .../ignite/examples/datagrid/package-info.java | 22 + .../ignite/examples/datagrid/package.html | 24 - .../datagrid/starschema/package-info.java | 22 + .../examples/datagrid/starschema/package.html | 24 - .../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 - .../datagrid/store/jdbc/package-info.java | 22 + .../examples/datagrid/store/jdbc/package.html | 24 - .../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 - .../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 - .../gridify/aop/aspectj/package-info.java | 22 + .../compute/gridify/aop/aspectj/package.html| 24 - .../gridify/aop/spring/package-info.java| 22 + .../compute/gridify/aop/spring/package.html | 25 - .../ignite/gridify/hierarchy/package-info.java | 22 + .../ignite/gridify/hierarchy/package.html | 25 - .../org/apache/ignite/gridify/package-info.java | 22 + .../java/org/apache/ignite/gridify/package.html | 25 - .../direct/singlesplit/package-info.java| 22 + .../loadtests/direct/singlesplit/package.html | 24 - .../java/org/test/gridify/package-info.java | 22 + .../src/test/java/org/test/gridify/package.html | 24 - .../ignite/spi/checkpoint/s3/package-info.java | 22 + .../ignite/spi/checkpoint/s3/package.html | 24 - .../discovery/tcp/ipfinder/s3/package-info.java | 22 + .../spi/discovery/tcp/ipfinder/s3/package.html | 24 - .../ignite/spi/checkpoint/s3/package-info.java | 22 + .../ignite/spi/checkpoint/s3/package.html | 24 - .../discovery/tcp/ipfinder/s3/package-info.java | 22 + .../spi/discovery/tcp/ipfinder/s3/package.html | 24 - .../scala/collection/concurrent/TrieMap.java| 4 +- .../java/org/apache/ignite/IgniteCache.java | 14 +- .../java/org/apache/ignite/IgniteCompute.java | 4 - .../java/org/apache/ignite/IgniteQueue.java | 4 +- .../main/java/org/apache/ignite/IgniteSet.java | 2 +- .../cache/affinity/CacheAffinityKeyMapped.java | 44 -- .../cache/affinity/fair/package-info.java | 21 + .../ignite/cache/affinity/fair/package.html | 24 - .../ignite/cache/affinity/package-info.jav
[50/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-437-sqltests
Merge branch 'sprint-2' into ignite-437-sqltests Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cdf934ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cdf934ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cdf934ba Branch: refs/heads/ignite-437-sqltests Commit: cdf934ba70404aa99843ed18224e07d760e2362a Parents: f8f3be0 12f0a8d Author: Artem Shutak Authored: Thu Mar 19 15:02:16 2015 +0300 Committer: Artem Shutak Committed: Thu Mar 19 15:02:16 2015 +0300 -- DEVNOTES.txt| 23 + LICENSE.txt | 54 +- NOTICE.txt | 11 + RELEASE_NOTES.txt |0 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-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/include/igniteservice.exe | Bin 6144 -> 0 bytes bin/include/target-classpath.bat|2 +- bin/include/target-classpath.sh |2 +- 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/mapred-site.ignite.xml | 66 - examples/config/example-cache.xml |4 +- examples/config/filesystem/example-igfs.xml | 13 +- examples/config/store/example-database.script | 27 + examples/pom-standalone.xml |2 +- examples/pom.xml|7 + .../ComputeContinuousMapperExample.java |2 +- .../ComputeFibonacciContinuationExample.java|2 +- .../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/CacheDataLoaderExample.java| 85 - .../datagrid/CacheDataStreamerExample.java | 85 + .../datagrid/CachePopularNumbersExample.java| 14 +- .../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 - .../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 |2 +- .../datagrid/store/dummy/package-info.java | 22 + .../examples/datagrid/store/dummy/package.html | 24 - .../hibernate/CacheHibernatePersonStore.java|2 +- .../datagrid/store/hibernate/Person.hbm.xml |2 +- .../datagrid/store/hibernate/hibernate.cfg.xml |3 - .../datagrid/store/hibernate/package-info.java | 22 + .../datagrid/store/hibernate/package.html | 24 - .../store/jdbc/CacheJdbcPersonStore.java|4 +- .../store/jdbc/CacheJdbcPojoPersonStore.java| 85 + .../datagrid/store/jdbc/package-info.java | 22 + .../examples/datagrid/store/jdbc/package.html | 24 - .../examples/datagrid/store/model/Person.java | 155 ++ .../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 |4 +- .../misc/client/memcache/package-info.java
[30/50] [abbrv] incubator-ignite git commit: rat settings updated
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/package-info.java -- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/package-info.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/package-info.java index 418f17d..ec5b0b9 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/package-info.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains URI-based deployment SPI implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/package-info.java -- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/package-info.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/package-info.java index afc6e4d..c6e61b4 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/package-info.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains directory scanner for URI deployer SPI. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/package-info.java -- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/package-info.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/package-info.java index 08b2b87..ca29005 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/package-info.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains FTP scanner for URI deployer SPI. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/http/package-info.java -- diff --
[37/50] [abbrv] incubator-ignite git commit: ignite-432 package.html becomes package-info.java
ignite-432 package.html becomes package-info.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/b92a4299 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b92a4299 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b92a4299 Branch: refs/heads/ignite-437-sqltests Commit: b92a4299ebc8868d2cf340bbeffcd83fbb9039da Parents: 5183626 Author: avinogradov Authored: Wed Mar 18 19:16:20 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 19:16:20 2015 +0300 -- .../ignite/spi/indexing/noop/package-info.java | 22 ++ .../ignite/spi/indexing/noop/package.html | 24 2 files changed, 22 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b92a4299/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package-info.java new file mode 100644 index 000..75d40e9 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package-info.java @@ -0,0 +1,22 @@ +/* + * 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. + */ + +/** + * + * Contains default no-op indexing SPI implementation. + */ +package org.apache.ignite.spi.indexing.noop; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b92a4299/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package.html b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package.html deleted file mode 100644 index 8faf421..000 --- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains default no-op indexing SPI implementation. - -
[14/50] [abbrv] incubator-ignite git commit: #sprint-2: add licence to GridCacheQuerySimpleBenchmark file.
#sprint-2: add licence to GridCacheQuerySimpleBenchmark file. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6657fc33 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6657fc33 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6657fc33 Branch: refs/heads/ignite-437-sqltests Commit: 6657fc33eebe1f45bd972bd926b00c1211e92d39 Parents: 7eb269d Author: ivasilinets Authored: Wed Mar 18 16:08:41 2015 +0300 Committer: ivasilinets Committed: Wed Mar 18 16:08:41 2015 +0300 -- .../cache/GridCacheQuerySimpleBenchmark.java| 16 1 file changed, 16 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6657fc33/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java index e2be751..86cea6b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*;
[31/50] [abbrv] incubator-ignite git commit: rat settings updated
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/core/src/main/java/org/apache/ignite/spi/collision/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/package-info.java index a40e7a4..0587369 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/package-info.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains APIs for collision SPI. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/package-info.java index 8c4a3c5..f8f74b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/package-info.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains priority based collision SPI implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/core/src/main/java/org/apache/ignite/spi/communication/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/package-info.java index 152ce3d..b31b798 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/package-info.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains APIs for grid communication SPI. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package-info.java index a821cbe..76fb782 100644 --- a/modules
[16/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-432
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-432 Conflicts: modules/core/src/main/java/org/apache/ignite/cache/query/Query.java modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.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/4ce78a06 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4ce78a06 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4ce78a06 Branch: refs/heads/ignite-437-sqltests Commit: 4ce78a061ffcb74d75fd84e863f7f68c37a02ce2 Parents: 2ae6d27 7eb269d Author: avinogradov Authored: Wed Mar 18 16:34:40 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 16:34:40 2015 +0300 -- examples/config/example-cache.xml | 42 +- examples/config/filesystem/example-igfs.xml | 11 +- .../failover/ComputeFailoverExample.java|1 + .../datagrid/CachePopularNumbersExample.java|6 +- .../examples/datagrid/CacheQueryExample.java| 73 +- .../starschema/CacheStarSchemaExample.java | 17 +- .../datagrid/starschema/DimProduct.java |3 +- .../examples/datagrid/starschema/DimStore.java |3 +- .../datagrid/starschema/FactPurchase.java |2 + .../store/CacheNodeWithStoreStartup.java|3 - .../store/dummy/CacheDummyPersonStore.java |1 + .../MemcacheRestExampleNodeStartup.java |7 - .../apache/ignite/examples/ComputeExample.java |2 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java |8 +- .../ignite/jdbc/JdbcEmptyCacheSelfTest.java |5 +- .../ignite/jdbc/JdbcLocalCachesSelfTest.java| 16 +- .../ignite/jdbc/JdbcMetadataSelfTest.java |6 +- .../jdbc/JdbcPreparedStatementSelfTest.java |5 +- .../ignite/jdbc/JdbcResultSetSelfTest.java |7 +- .../ignite/jdbc/JdbcStatementSelfTest.java |7 +- .../clients/src/test/resources/spring-cache.xml | 15 - .../src/test/resources/spring-server-node.xml |7 - .../test/resources/spring-server-ssl-node.xml |4 - modules/codegen/pom.xml |6 + .../ignite/codegen/MessageCodeGenerator.java|8 + modules/core/pom.xml| 105 + .../java/org/apache/ignite/IgniteCache.java | 17 +- .../org/apache/ignite/cache/query/Query.java| 74 +- .../apache/ignite/cache/query/QueryMetrics.java |4 +- .../ignite/cache/query/QueryTypeResolver.java | 32 - .../org/apache/ignite/cache/query/SqlQuery.java | 16 +- .../query/annotations/QuerySqlFunction.java |4 +- .../configuration/CacheConfiguration.java | 284 +-- .../configuration/CacheQueryConfiguration.java | 182 -- .../configuration/IgniteConfiguration.java | 20 +- .../configuration/QueryConfiguration.java | 227 -- .../ignite/events/CacheQueryExecutedEvent.java |2 +- .../ignite/events/CacheQueryReadEvent.java |2 + .../org/apache/ignite/internal/IgnitionEx.java |3 - .../managers/communication/GridIoManager.java |8 +- .../communication/GridIoMessageFactory.java | 26 + .../processors/cache/CacheProjection.java |5 +- .../cache/CacheWeakQueryIteratorsHolder.java|2 +- .../processors/cache/GridCacheAttributes.java | 27 - .../cache/GridCacheClearAllRunnable.java|5 +- .../processors/cache/GridCacheContext.java |2 + .../processors/cache/GridCacheProcessor.java| 22 +- .../processors/cache/GridCacheSwapListener.java |5 +- .../processors/cache/GridCacheSwapManager.java | 29 +- .../processors/cache/GridCacheUtils.java|1 - .../processors/cache/IgniteCacheProxy.java | 145 +- .../processors/cache/QueryCursorImpl.java | 116 + .../processors/cache/query/CacheQuery.java |2 +- .../query/GridCacheDistributedQueryManager.java |2 + .../cache/query/GridCacheQueriesEx.java |9 +- .../cache/query/GridCacheQueriesImpl.java | 11 +- .../cache/query/GridCacheQueriesProxy.java |4 +- .../cache/query/GridCacheQueryAdapter.java |3 +- .../cache/query/GridCacheQueryManager.java | 16 +- .../cache/query/GridCacheSqlQuery.java |2 +- .../cache/query/GridCacheSqlResult.java | 29 - .../cache/query/GridCacheTwoStepQuery.java |2 +- .../processors/cache/query/QueryCursorImpl.java | 97 - .../continuous/CacheContinuousQueryHandler.java |3 + .../query/jdbc/GridCacheQueryJdbcTask.java | 241 +- .../IgniteCacheObjectProcessorImpl.java | 86 +- .../internal/processors/igfs/IgfsProcessor.java |6 - .../processors/query/GridQueryIndexing.java | 34 +- .../processo
[05/50] [abbrv] incubator-ignite git commit: #sprint-2: add licence to ExcludeList file.
#sprint-2: add licence to ExcludeList file. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7eb269d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7eb269d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7eb269d6 Branch: refs/heads/ignite-437-sqltests Commit: 7eb269d61c84fdcfbfb383974acef8d6ad920507 Parents: 3eca5e7 Author: ivasilinets Authored: Wed Mar 18 15:52:13 2015 +0300 Committer: ivasilinets Committed: Wed Mar 18 15:52:13 2015 +0300 -- modules/core/src/test/java/ExcludeList | 16 1 file changed, 16 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eb269d6/modules/core/src/test/java/ExcludeList -- diff --git a/modules/core/src/test/java/ExcludeList b/modules/core/src/test/java/ExcludeList index 9af6366..2c3e722 100644 --- a/modules/core/src/test/java/ExcludeList +++ b/modules/core/src/test/java/ExcludeList @@ -1,3 +1,19 @@ +# +# 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. + # List of excluded TCK tests. # This is a dummy test that fails if not in the exclude list.
[46/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/92656726 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92656726 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92656726 Branch: refs/heads/ignite-437-sqltests Commit: 92656726fb56891c58e78bcaf2336cd5f36b3b25 Parents: 30591b2 184b1a5 Author: Yakov Zhdanov Authored: Thu Mar 19 13:49:18 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Mar 19 13:49:18 2015 +0300 -- .../computegrid/failover/package-info.java | 17 + .../computegrid/montecarlo/package-info.java| 17 + .../examples/computegrid/package-info.java | 17 + .../datagrid/hibernate/package-info.java| 17 + .../ignite/examples/datagrid/package-info.java | 17 + .../datagrid/starschema/package-info.java | 17 + .../datagrid/store/dummy/package-info.java | 17 + .../datagrid/store/hibernate/package-info.java | 17 + .../datagrid/store/jdbc/package-info.java | 17 + .../examples/datagrid/store/package-info.java | 17 + .../examples/datastructures/package-info.java | 17 + .../ignite/examples/events/package-info.java| 17 + .../ignite/examples/igfs/package-info.java | 17 + .../ignite/examples/messaging/package-info.java | 17 + .../misc/client/memcache/package-info.java | 17 + .../examples/misc/client/package-info.java | 17 + .../examples/misc/deployment/package-info.java | 17 + .../examples/misc/lifecycle/package-info.java | 17 + .../ignite/examples/misc/package-info.java | 17 + .../examples/misc/springbean/package-info.java | 17 + .../apache/ignite/examples/package-info.java| 17 + .../ignite/examples/streaming/package-info.java | 17 + .../gridify/aop/aspectj/package-info.java | 17 + .../gridify/aop/spring/package-info.java| 17 + .../ignite/gridify/hierarchy/package-info.java | 17 + .../org/apache/ignite/gridify/package-info.java | 17 + .../direct/singlesplit/package-info.java| 17 + .../java/org/test/gridify/package-info.java | 17 + .../ignite/spi/checkpoint/s3/package-info.java | 17 + .../discovery/tcp/ipfinder/s3/package-info.java | 17 + .../ignite/spi/checkpoint/s3/package-info.java | 17 + .../discovery/tcp/ipfinder/s3/package-info.java | 17 + .../cache/affinity/fair/package-info.java | 17 + .../ignite/cache/affinity/package-info.java | 17 + .../cache/affinity/rendezvous/package-info.java | 17 + .../cache/eviction/fifo/package-info.java | 17 + .../cache/eviction/igfs/package-info.java | 17 + .../ignite/cache/eviction/lru/package-info.java | 17 + .../ignite/cache/eviction/package-info.java | 17 + .../cache/eviction/random/package-info.java | 17 + .../org/apache/ignite/cache/package-info.java | 17 + .../apache/ignite/cache/query/package-info.java | 17 + .../cache/store/CacheLoadOnlyStoreAdapter.java | 8 +- .../store/jdbc/CacheAbstractJdbcStore.java | 169 -- .../cache/store/jdbc/CacheJdbcPojoStore.java| 6 +- .../cache/store/jdbc/dialect/package-info.java | 17 + .../ignite/cache/store/jdbc/package-info.java | 17 + .../apache/ignite/cache/store/package-info.java | 17 + .../compute/gridify/aop/package-info.java | 17 + .../ignite/compute/gridify/package-info.java| 17 + .../org/apache/ignite/compute/package-info.java | 17 + .../org/apache/ignite/events/package-info.java | 17 + .../ignite/igfs/mapreduce/package-info.java | 17 + .../igfs/mapreduce/records/package-info.java| 17 + .../org/apache/ignite/igfs/package-info.java| 17 + .../ignite/igfs/secondary/package-info.java | 17 + .../ignite/internal/executor/package-info.java | 17 + .../internal/igfs/common/package-info.java | 17 + .../managers/checkpoint/package-info.java | 17 + .../managers/collision/package-info.java| 17 + .../managers/communication/package-info.java| 17 + .../managers/deployment/package-info.java | 17 + .../deployment/protocol/gg/package-info.java| 17 + .../managers/discovery/package-info.java| 17 + .../managers/eventstorage/package-info.java | 17 + .../managers/failover/package-info.java | 17 + .../managers/indexing/package-info.java | 17 + .../managers/loadbalancer/package-info.java | 17 + .../ignite/internal/managers/package-info.java | 17 + .../managers/swapspace/package-info.java| 17 + .../ignite/internal/mxbean/package-info.java| 17 + .../apache/ignite/internal/package-info.java| 17 + .../processors/affinity/package-info.java | 17 + .../processors/cacheobject/package-info.java| 17 + .../processors/closure/package-info.java| 17 + .../processors/datastreamer/packa
[45/50] [abbrv] incubator-ignite git commit: sp-2 minor
sp-2 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/30591b2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/30591b2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/30591b2d
Branch: refs/heads/ignite-437-sqltests
Commit: 30591b2db0967be32ed759c575bc9853502bfe76
Parents: 4aabbbd
Author: Yakov Zhdanov
Authored: Thu Mar 19 13:49:03 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Mar 19 13:49:03 2015 +0300
--
.../cache/query/continuous/CacheContinuousQueryHandler.java | 3 ---
.../cache/query/continuous/CacheContinuousQueryManager.java | 4
2 files changed, 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30591b2d/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 6269eca..c475a30 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
@@ -21,9 +21,6 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.internal.managers.deployment.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.query.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30591b2d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index acc17cb..eb0fc1d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -614,9 +614,6 @@ public class CacheContinuousQueryManager extends
GridCacheManagerAdapter {
private final CacheEntryListener impl;
/** */
-private final Cache cache;
-
-/** */
private final IgniteLogger log;
/**
@@ -628,7 +625,6 @@ public class CacheContinuousQueryManager extends
GridCacheManagerAdapter {
assert cache != null;
this.impl = impl;
-this.cache = cache;
log =
cache.unwrap(Ignite.class).log().getLogger(CacheContinuousQueryManager.class);
}
[43/50] [abbrv] incubator-ignite git commit: # ignite-510
# ignite-510
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/385d9c8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/385d9c8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/385d9c8e
Branch: refs/heads/ignite-437-sqltests
Commit: 385d9c8e5d13423bbb7e49e36afaa3775e075f1d
Parents: 2e6e93d
Author: sboikov
Authored: Thu Mar 19 12:38:35 2015 +0300
Committer: sboikov
Committed: Thu Mar 19 12:38:35 2015 +0300
--
.../apache/ignite/internal/IgniteKernal.java| 2 +-
.../deployment/GridDeploymentLocalStore.java| 5 +-
.../GridDeploymentPerLoaderStore.java | 5 +-
.../GridDeploymentPerVersionStore.java | 5 +-
.../optimized/OptimizedClassDescriptor.java | 20 ++--
.../optimized/OptimizedMarshaller.java | 30 +++-
.../optimized/OptimizedMarshallerUtils.java | 50 +++-
.../optimized/OptimizedObjectInputStream.java | 19 ++--
.../optimized/OptimizedObjectOutputStream.java | 21 ++--
.../processors/service/DummyService.java| 4 ++
.../optimized/OptimizedMarshallerTest.java | 4 +-
.../OptimizedObjectStreamSelfTest.java | 8 +++-
.../testframework/junits/GridAbstractTest.java | 2 +-
13 files changed, 106 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/385d9c8e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 031c054..ab1038c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1797,7 +1797,7 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
notifyLifecycleBeansEx(LifecycleEventType.AFTER_NODE_STOP);
// Clean internal class/classloader caches to avoid stopped
contexts held in memory.
-OptimizedMarshaller.clearCache();
+U.clearClassCache();
MarshallerExclusions.clearCache();
GridEnumCache.clear();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/385d9c8e/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
index 195621c..cd94854 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
@@ -523,8 +523,9 @@ class GridDeploymentLocalStore extends
GridDeploymentStoreAdapter {
// Resource cleanup.
ctx.resource().onUndeployed(dep);
-// Clear optimized marshaller's cache. If another marshaller
is used, this is no-op.
-OptimizedMarshaller.onUndeploy(ldr);
+// Clear optimized marshaller's cache.
+if (ctx.config().getMarshaller() instanceof
OptimizedMarshaller)
+
((OptimizedMarshaller)ctx.config().getMarshaller()).onUndeploy(ldr);
clearSerializationCaches();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/385d9c8e/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
index 7a98cbc..e81cf38 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
@@ -496,8 +496,9 @@ public class GridDeploymentPerLoaderStore extends
GridDeploymentStoreAdapter {
ctx.cache().onUndeployed(ldr);
ctx.stream().onUndeployed(ldr);
-// Clear optimized marshaller's cache. If another marshaller
is used, this is no-op.
-OptimizedMarshaller.onUndeploy(ldr);
+// Clear
[01/50] [abbrv] incubator-ignite git commit: # ignite-375 Add support UUID in pojo store.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-437-sqltests f8f3be0d3 -> cdf934ba7
# ignite-375 Add support UUID in pojo store.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8d38c529
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8d38c529
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8d38c529
Branch: refs/heads/ignite-437-sqltests
Commit: 8d38c52925e46ceb04239dde8d01e5e12fee6751
Parents: 86987b0
Author: anovikov
Authored: Wed Mar 18 10:18:47 2015 +0700
Committer: anovikov
Committed: Wed Mar 18 10:18:47 2015 +0700
--
.../store/jdbc/CacheAbstractJdbcStore.java | 162 --
.../cache/store/jdbc/CacheJdbcPojoStore.java| 6 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 54 ++
.../store/jdbc/CacheJdbcPojoStoreTest.java | 559 ++-
4 files changed, 239 insertions(+), 542 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d38c529/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 80a22c0..79f7315 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
@@ -34,6 +34,7 @@ import org.jetbrains.annotations.*;
import javax.cache.*;
import javax.cache.integration.*;
import javax.sql.*;
+import java.nio.*;
import java.sql.*;
import java.util.*;
import java.util.concurrent.*;
@@ -127,7 +128,7 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
private int parallelLoadCacheMinThreshold =
DFLT_PARALLEL_LOAD_CACHE_MINIMUM_THRESHOLD;
/**
- * Get field value from object.
+ * Get field value from object for use as query parameter.
*
* @param cacheName Cache name.
* @param typeName Type name.
@@ -135,7 +136,7 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
* @param obj Cache object.
* @return Field value from object.
*/
-@Nullable protected abstract Object extractField(@Nullable String
cacheName, String typeName, String fieldName,
+@Nullable protected abstract Object extractParameter(@Nullable String
cacheName, String typeName, String fieldName,
Object obj) throws CacheException;
/**
@@ -387,7 +388,26 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
return EMPTY_COLUMN_VALUE;
}
-return rs.getObject(colIdx);
+Object val = rs.getObject(colIdx);
+
+if (type == UUID.class && val != null) {
+if (val instanceof UUID)
+return val;
+
+if (val instanceof byte[]) {
+ByteBuffer bb = ByteBuffer.wrap((byte[])val);
+
+long most = bb.getLong();
+long least = bb.getLong();
+
+return new UUID(most, least);
+}
+
+if (val instanceof String)
+return UUID.fromString((String)val);
+}
+
+return val;
}
/**
@@ -461,6 +481,65 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
}
/**
+ * Object is a simple type.
+ *
+ * @param cls Class.
+ * @return {@code True} if object is a simple type.
+ */
+protected static boolean simpleType(Class cls) {
+return (Number.class.isAssignableFrom(cls) ||
String.class.isAssignableFrom(cls) ||
+java.util.Date.class.isAssignableFrom(cls) ||
Boolean.class.isAssignableFrom(cls) ||
+UUID.class.isAssignableFrom(cls));
+}
+
+/**
+ * @param clsName Class name.
+ * @param fields Fields descriptors.
+ * @throws CacheException If failed.
+ */
+private static void checkMapping(@Nullable String cacheName, String
clsName,
+Collection fields) throws CacheException {
+try {
+Class cls = Class.forName(clsName);
+
+if (simpleType(cls)) {
+if (fields.size() != 1)
+throw new CacheException("More than one field for simple
type [cache name=" + cacheName
++ ", type=" + clsName + " ]");
+
+CacheTypeFieldMetadata field = F.first(fields);
+
+if (field.getDatabaseName() == null)
+throw new CacheException("Missing database name in mapping
description [cache name=" + cacheName
+
[44/50] [abbrv] incubator-ignite git commit: #Fixed yardstick configuration.
#Fixed yardstick configuration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/184b1a55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/184b1a55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/184b1a55
Branch: refs/heads/ignite-437-sqltests
Commit: 184b1a558628f59e36ae6a377cf668f3bbdf7f53
Parents: 2e6e93d
Author: nikolay tikhonov
Authored: Thu Mar 19 13:30:07 2015 +0300
Committer: nikolay tikhonov
Committed: Thu Mar 19 13:30:07 2015 +0300
--
modules/yardstick/config/benchmark-multicast.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/184b1a55/modules/yardstick/config/benchmark-multicast.properties
--
diff --git a/modules/yardstick/config/benchmark-multicast.properties
b/modules/yardstick/config/benchmark-multicast.properties
index f0fe47f..74b152c 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -18,7 +18,7 @@
#
# JVM options.
-JVM_OPTS=${JVM_OPTS}" -DIgnite_QUIET=false"
+JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
# Uncomment to enable concurrent garbage collection (GC) if you encounter long
GC pauses.
JVM_OPTS=${JVM_OPTS}" \
[42/50] [abbrv] incubator-ignite git commit: # ignite-375 Add tests.
# ignite-375 Add tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2e6e93d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2e6e93d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2e6e93d3
Branch: refs/heads/ignite-437-sqltests
Commit: 2e6e93d33827348031bef3f061e387c172318140
Parents: 5c856ed
Author: anovikov
Authored: Thu Mar 19 09:53:58 2015 +0700
Committer: anovikov
Committed: Thu Mar 19 09:53:58 2015 +0700
--
.../store/jdbc/CacheAbstractJdbcStore.java | 5 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 28 +++
.../store/jdbc/CacheJdbcPojoStoreTest.java | 83 +++-
3 files changed, 113 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e6e93d3/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 85c036f..6a43929 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
@@ -1197,12 +1197,13 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
if (field.getJavaType() == UUID.class) {
switch (field.getDatabaseType()) {
case Types.BINARY:
-U.uuidToBytes((UUID)fieldVal);
-break;
+fieldVal = U.uuidToBytes((UUID)fieldVal);
+break;
case Types.CHAR:
case Types.VARCHAR:
fieldVal = fieldVal.toString();
+
break;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e6e93d3/modules/core/src/test/config/store/jdbc/Ignite.xml
--
diff --git a/modules/core/src/test/config/store/jdbc/Ignite.xml
b/modules/core/src/test/config/store/jdbc/Ignite.xml
index 3a64d60..91d77cd 100644
--- a/modules/core/src/test/config/store/jdbc/Ignite.xml
+++ b/modules/core/src/test/config/store/jdbc/Ignite.xml
@@ -237,4 +237,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e6e93d3/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
index 76cc119..98308cb 100644
---
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.jdbc.dialect.*;
import org.apache.ignite.cache.store.jdbc.model.*;
-import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
@@ -33,6 +33,7 @@ import org.springframework.beans.factory.xml.*;
import org.springframework.context.support.*;
import org.springframework.core.io.*;
+import javax.cache.integration.*;
import java.net.*;
import java.sql.*;
import java.util.*;
@@ -175,8 +176,16 @@ public class CacheJdbcPojoStoreTest extends
GridAbstractCacheStoreSelfTest keyCols, Iterable valCols) {
+return super.updateQuery(tblName, keyCols, valCols) + " AND 1
= 0";
+}
+};
+
+store.setDialect(dialect);
+
+Map>
cacheMappings =
+GridTestUtils.getFieldValue(store, CacheAbstractJdbcStore.class,
"cacheMappings");
+
+CacheAbstrac
incubator-ignite git commit: ignite-45-release snapshot becomes release
Repository: incubator-ignite Updated Branches: refs/heads/ignite-45-release [created] 045ed9222 ignite-45-release snapshot becomes release Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/045ed922 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/045ed922 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/045ed922 Branch: refs/heads/ignite-45-release Commit: 045ed922296189ee4167bf9e4fc6e4b7c1414bc7 Parents: 8656001 Author: avinogradov Authored: Thu Mar 19 15:41:40 2015 +0300 Committer: avinogradov Committed: Thu Mar 19 15:41:40 2015 +0300 -- examples/pom-standalone.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045ed922/examples/pom-standalone.xml -- diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml index 12db596..55d81ba 100644 --- a/examples/pom-standalone.xml +++ b/examples/pom-standalone.xml @@ -28,7 +28,7 @@ UTF-8 -1.0.0-RC3-SNAPSHOT +1.0.0-RC3 org.apache.ignite http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/045ed922/pom.xml -- diff --git a/pom.xml b/pom.xml index 8b08f05..a824821 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ -1.0.0-RC3-SNAPSHOT +1.0.0-RC3 fabric 2.4.1 4.1.0.RELEASE
incubator-ignite git commit: # Cleanup code.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 8656001e5 -> f3b49a553
# Cleanup code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f3b49a55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f3b49a55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f3b49a55
Branch: refs/heads/ignite-45
Commit: f3b49a5533fbac9886c870b33375ccf2aedaff2d
Parents: 8656001
Author: sevdokimov
Authored: Thu Mar 19 16:21:40 2015 +0300
Committer: sevdokimov
Committed: Thu Mar 19 16:21:40 2015 +0300
--
.../cache/GridCachePartitionExchangeManager.java| 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f3b49a55/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 36bafdf..88bc892 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
@@ -88,7 +88,7 @@ public class GridCachePartitionExchangeManager extends
GridCacheSharedMana
private final ConcurrentMap
clientTops = new ConcurrentHashMap8<>();
/** */
-private volatile GridDhtPartitionsExchangeFuture lastInitializedFuture;
+private volatile GridDhtPartitionsExchangeFuture lastInitializedFut;
/**
* Partition map futures.
@@ -105,9 +105,9 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
if (!enterBusy())
return;
-DiscoveryEvent e = (DiscoveryEvent)evt;
-
try {
+DiscoveryEvent e = (DiscoveryEvent)evt;
+
ClusterNode loc = cctx.localNode();
assert e.type() == EVT_NODE_JOINED || e.type() ==
EVT_NODE_LEFT || e.type() == EVT_NODE_FAILED ||
@@ -370,14 +370,14 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
* @return Topology version.
*/
public AffinityTopologyVersion topologyVersion() {
-return lastInitializedFuture.exchangeId().topologyVersion();
+return lastInitializedFut.exchangeId().topologyVersion();
}
/**
* @return Last completed topology future.
*/
public GridDhtTopologyFuture lastTopologyFuture() {
-return lastInitializedFuture;
+return lastInitializedFut;
}
/**
@@ -893,7 +893,7 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
break;
if (!exchFut.dummy() && !exchFut.forcePreload()) {
-lastInitializedFuture = exchFut;
+lastInitializedFut = exchFut;
exchFut.init();
incubator-ignite git commit: #ignite-45-client-tests: Remove client cache tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45-client-tests [created] 242eaa51c
#ignite-45-client-tests: Remove client cache tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/242eaa51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/242eaa51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/242eaa51
Branch: refs/heads/ignite-45-client-tests
Commit: 242eaa51cd5e52174962642945de7a1dc51129a9
Parents: 8656001
Author: ivasilinets
Authored: Thu Mar 19 16:38:59 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 19 16:38:59 2015 +0300
--
.../ClientAbstractMultiThreadedSelfTest.java| 102 +---
.../client/ClientDefaultCacheSelfTest.java | 48 --
.../ClientAbstractMultiNodeSelfTest.java| 199 --
.../integration/ClientAbstractSelfTest.java | 599 ---
.../loadtests/client/ClientTcpSslLoadTest.java | 108
5 files changed, 109 insertions(+), 947 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/242eaa51/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
index bb5b246..e9064b3 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
@@ -18,14 +18,11 @@
package org.apache.ignite.internal.client;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.client.impl.*;
import org.apache.ignite.internal.client.ssl.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -43,7 +40,6 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
@@ -95,7 +91,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest
extends GridCommonAbst
}
/** Client instance for each test. */
-private GridClient client;
+protected GridClient client;
/**
* @return Client protocol that should be used.
@@ -379,102 +375,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest
extends GridCommonAbst
info(">>> " + e.getKey() + " run " + e.getValue().get() + "
tasks");
}
-/**
- * @throws Exception If failed.
- */
-public void test6Affinity() throws Exception {
-GridClientData cache = client.data(PARTITIONED_CACHE_NAME);
-UUID nodeId = cache.affinity("6");
-
-info("Affinity node: " + nodeId);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testMultithreadedCachePut() throws Exception {
-final AtomicLong keyCnt = new AtomicLong();
-
-final AtomicReference err = new AtomicReference<>();
-
-final ConcurrentMap> puts = new
ConcurrentHashMap<>();
-
-final Map gridMap = new HashMap<>();
-
-for (int i = 0; i < NODES_CNT; i++) {
-Ignite g = grid(i);
-
-gridMap.put(g.cluster().localNode().id(), g);
-}
-
-final Ignite ignite = F.first(gridMap.values());
-
-assertEquals(NODES_CNT, client.compute().refreshTopology(false,
false).size());
-
-IgniteInternalFuture fut = multithreadedAsync(new Runnable() {
-@SuppressWarnings("OverlyStrongTypeCast")
-@Override public void run() {
-try {
-GridClientData cache = client.data(PARTITIONED_CACHE_NAME);
-
-assertEquals(NODES_CNT,
((GridClientDataImpl)cache).projectionNodes().size());
-
-long rawKey;
-
-while ((rawKey = keyCnt.getAndIncrement()) <
cachePutCount()) {
-String key = String.valueOf(rawKey);
-
-UUID nodeId = cache.affinity(key);
-
-String val = "val" + rawKey;
-
-
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-9826 [deleted] 23ed06465
incubator-ignite git commit: #ignite-45-client-tests: Remove client cache tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45-client-tests 242eaa51c -> 0db819bb2
#ignite-45-client-tests: Remove client cache tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0db819bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0db819bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0db819bb
Branch: refs/heads/ignite-45-client-tests
Commit: 0db819bb23d37707838df85ac0114143cfcc5575
Parents: 242eaa5
Author: ivasilinets
Authored: Thu Mar 19 17:00:03 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 19 17:00:03 2015 +0300
--
.../integration/ClientAbstractSelfTest.java | 122 ---
1 file changed, 122 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0db819bb/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
index a07c1b0..e590f6e 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
@@ -451,128 +451,6 @@ public abstract class ClientAbstractSelfTest extends
GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
-public void testPut() throws Exception {
-IgniteCache dfltCache = grid().jcache(null);
-IgniteCache namedCache = grid().jcache(CACHE_NAME);
-
-GridClientData dfltData = client.data();
-
-assertNotNull(dfltData);
-
-GridClientData namedData = client.data(CACHE_NAME);
-
-assertNotNull(namedData);
-
-assertTrue(dfltData.put("key1", "val1"));
-assertEquals("val1", dfltCache.get("key1"));
-
-assertTrue(dfltData.putAsync("key2", "val2").get());
-assertEquals("val2", dfltCache.get("key2"));
-
-assertTrue(namedData.put("key1", "val1"));
-assertEquals("val1", namedCache.get("key1"));
-
-assertTrue(namedData.putAsync("key2", "val2").get());
-assertEquals("val2", namedCache.get("key2"));
-
-assertTrue(dfltData.put("", ""));
-assertEquals("", dfltCache.get(""));
-
-assertTrue(namedData.put("", ""));
-assertEquals("", namedCache.get(""));
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testPutAll() throws Exception {
-GridClientData dfltData = client.data();
-
-assertNotNull(dfltData);
-
-GridClientData namedData = client.data(CACHE_NAME);
-
-assertNotNull(namedData);
-
-dfltData.putAll(F.asMap("key1", "val1", "key2", "val2"));
-
-Map map = grid().jcache(null).getAll(F.asSet("key1", "key2"));
-
-assertEquals(2, map.size());
-assertEquals("val1", map.get("key1"));
-assertEquals("val2", map.get("key2"));
-
-dfltData.putAllAsync(F.asMap("key3", "val3", "key4", "val4")).get();
-
-map = grid().jcache(null).getAll(F.asSet("key3",
"key4"));
-
-assertEquals(2, map.size());
-assertEquals("val3", map.get("key3"));
-assertEquals("val4", map.get("key4"));
-
-namedData.putAll(F.asMap("key1", "val1", "key2", "val2"));
-
-map = grid().jcache(CACHE_NAME).getAll(F.asSet("key1",
"key2"));
-
-assertEquals(2, map.size());
-assertEquals("val1", map.get("key1"));
-assertEquals("val2", map.get("key2"));
-
-namedData.putAllAsync(F.asMap("key3", "val3", "key4", "val4")).get();
-
-map = grid().jcache(CACHE_NAME).getAll(F.asSet("key3",
"key4"));
-
-assertEquals(2, map.size());
-assertEquals("val3", map.get("key3"));
-assertEquals("val4", map.get("key4"));
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testPutAllWithCornerCases() throws Exception {
-final GridClientData dfltData = client.data();
-
-assertNotNull(dfltData);
-
-GridClientData namedData = client.data(CACHE_NAME);
-
-assertNotNull(namedData);
-
-dfltData.putAll(F.asMap("", "val1"));
-
-assertEquals(F.asMap("", "val1"), grid().jcache(null).getAll(F.asSet("")));
-
-GridClientProtocol proto = clientConfiguration().getProtocol();
-
-assertThrows(log, new Callable() {
-@Override public Object call() throws Exception {
-dfltData.putAll(Collections.singletonMap("key3", null));
-
-ret
[1/2] incubator-ignite git commit: # IGNITE-45 Fix NPE.
Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 f3b49a553 -> a8505ff3d # IGNITE-45 Fix NPE. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/99321a1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/99321a1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/99321a1a Branch: refs/heads/ignite-45 Commit: 99321a1adb54899bf65ac88e8c20ae51d41c6bc1 Parents: f3b49a5 Author: sevdokimov Authored: Thu Mar 19 17:02:22 2015 +0300 Committer: sevdokimov Committed: Thu Mar 19 17:02:22 2015 +0300 -- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99321a1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 56af218..73c7418 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -740,9 +740,13 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter rmtNodes = this.rmtNodes; + +if (rmtNodes != null) +rmtNodes.clear(); } /**
[2/2] incubator-ignite git commit: # Cleanup code.
# Cleanup code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a8505ff3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a8505ff3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a8505ff3
Branch: refs/heads/ignite-45
Commit: a8505ff3d71e4b15f4e2ce2b0f25c1b9961481c2
Parents: 99321a1
Author: sevdokimov
Authored: Thu Mar 19 17:02:37 2015 +0300
Committer: sevdokimov
Committed: Thu Mar 19 17:02:37 2015 +0300
--
.../internal/processors/affinity/AffinityTopologyVersion.java | 6 +-
.../processors/cache/GridCachePartitionExchangeManager.java| 4 +---
2 files changed, 2 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a8505ff3/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
index 6faa6bf..9583215 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
@@ -107,11 +107,7 @@ public class AffinityTopologyVersion implements
Comparable>> 32));
-
-result = 31 * result + minorTopVer;
-
-return result;
+return 31 * (int)topVer + minorTopVer;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a8505ff3/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 88bc892..94bfb0e 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
@@ -1061,9 +1061,7 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
assert t2.topologyVersion() > 0;
// Reverse order.
-int cmp = t1.compareTo(t2);
-
-return cmp < 0 ? 1 : cmp == 0 ? 0 : -1;
+return t2.compareTo(t1);
}
}, /*not strict*/false);
}
incubator-ignite git commit: #ignite-45-client-tests: Remove client cache tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45-client-tests 0db819bb2 -> f2d23ff91
#ignite-45-client-tests: Remove client cache tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2d23ff9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2d23ff9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2d23ff9
Branch: refs/heads/ignite-45-client-tests
Commit: f2d23ff916e746e6d1bb682ee13af5b52f7aa3bf
Parents: 0db819b
Author: ivasilinets
Authored: Thu Mar 19 17:13:54 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 19 17:13:54 2015 +0300
--
.../ClientAbstractMultiNodeSelfTest.java| 81
.../integration/ClientAbstractSelfTest.java | 74 --
2 files changed, 155 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2d23ff9/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
index 8c4794d..2dee305 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -227,36 +227,6 @@ public abstract class ClientAbstractMultiNodeSelfTest
extends GridCommonAbstract
/**
* @throws Exception If failed.
*/
-public void testSyncCommitRollbackFlags() throws Exception {
-commSpiEnabled = true;
-
-try {
-GridClientData data = client.data(REPLICATED_ASYNC_CACHE_NAME);
-
-info("Before put x1");
-
-data.put("x1", "y1");
-
-info("Before put x2");
-
-data.flagsOn(GridClientCacheFlag.SYNC_COMMIT).put("x2", "y2");
-
-info("Before put x3");
-
-data.put("x3", "y3");
-
-info("Before put x4");
-
-data.flagsOn(GridClientCacheFlag.SYNC_COMMIT).put("x4", "y4");
-}
-finally {
-commSpiEnabled = false;
-}
-}
-
-/**
- * @throws Exception If failed.
- */
public void testEmptyProjections() throws Exception {
final GridClientCompute dflt = client.compute();
@@ -528,55 +498,4 @@ public abstract class ClientAbstractMultiNodeSelfTest
extends GridCommonAbstract
assertTrue("Invalid tx flags: " + t, t.syncCommit());
}
}
-
-/**
- * @throws Exception If failed.
- */
-public void testMultithreadedCommand() throws Exception {
-final GridClientData data = client.data(PARTITIONED_CACHE_NAME);
-final GridClientCompute compute = client.compute();
-final AtomicInteger cnt = new AtomicInteger(0);
-
-multithreaded(new Callable() {
-@Override public Object call() throws Exception {
-for (int i = 0; i < 20; i++) {
-String key = UUID.randomUUID().toString();
-String val = UUID.randomUUID().toString();
-
-switch (cnt.incrementAndGet() % 4) {
-case 0: {
-assertTrue(data.put(key, val));
-assertEquals(val, data.get(key));
-assertTrue(data.remove(key));
-
-break;
-}
-
-case 1: {
-assertNotNull(data.metrics());
-
-break;
-}
-
-case 2: {
-String nodeId =
compute.execute(TestTask.class.getName(), null);
-
-assertNotNull(nodeId);
-
assertNotNull(compute.refreshNode(UUID.fromString(nodeId), true, true));
-
-break;
-}
-
-case 3: {
-assertEquals(NODES_CNT,
compute.refreshTopology(true, true).size());
-
-break;
-}
-}
-}
-
-return null;
-}
-}, 50, "multithreaded-client-access");
-}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2d23ff9/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
--
[1/2] incubator-ignite git commit: Fixed metrics "totalNodes" for single node.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 12f0a8d2a -> d6fdf05f1
Fixed metrics "totalNodes" for single node.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/48b41f2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/48b41f2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/48b41f2d
Branch: refs/heads/sprint-2
Commit: 48b41f2d82b0d792b880342e14c82e699e18ee7d
Parents: 2e6e93d
Author: nikolay_tikhonov
Authored: Thu Mar 19 17:14:56 2015 +0300
Committer: nikolay_tikhonov
Committed: Thu Mar 19 17:14:56 2015 +0300
--
.../discovery/GridDiscoveryManager.java | 1 +
.../internal/ClusterNodeMetricsSelfTest.java| 31 ++--
2 files changed, 30 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48b41f2d/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index f5354b3..c37ac3d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -519,6 +519,7 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
nm.setMaximumThreadCount(metrics.getPeakThreadCount());
nm.setTotalStartedThreadCount(metrics.getTotalStartedThreadCount());
nm.setCurrentDaemonThreadCount(metrics.getDaemonThreadCount());
+nm.setTotalNodes(1);
// Data metrics.
nm.setLastDataVersion(ctx.cache().lastDataVersion());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48b41f2d/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
index 87bb788..3d0df7c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
@@ -22,8 +22,13 @@ import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.processors.task.*;
+import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.messaging.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
import org.apache.ignite.testframework.junits.common.*;
import java.io.*;
@@ -37,6 +42,9 @@ import static org.apache.ignite.events.EventType.*;
*/
@GridCommonTest(group = "Kernal Self")
public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
+
/** Test message size. */
private static final int MSG_SIZE = 1024;
@@ -57,6 +65,12 @@ public class ClusterNodeMetricsSelfTest extends
GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+TcpDiscoverySpi spi = new TcpDiscoverySpi();
+
+spi.setIpFinder(IP_FINDER);
+
+cfg.setDiscoverySpi(spi);
+
cfg.setCacheConfiguration();
cfg.setMetricsUpdateFrequency(0);
@@ -231,8 +245,15 @@ public class ClusterNodeMetricsSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testClusterNodeMetrics() throws Exception {
-Ignite ignite0 = grid();
-Ignite ignite1 = startGrid(1);
+final Ignite ignite0 = grid();
+final Ignite ignite1 = startGrid(1);
+
+GridTestUtils.waitForCondition(new GridAbsPredicate() {
+@Override
+public boolean apply() {
+return ignite0.cluster().nodes().size() == 2 &&
ignite1.cluster().nodes().size() == 2;
+}
+}, 3000L);
ClusterMetrics metrics0 = ignite0.cluster().localNode().metrics();
@@ -240,6 +261,12 @@ public class Clus
[2/2] 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/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/sprint-2 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(-) --
[3/4] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-510' into sprint-2
Merge remote-tracking branch 'remotes/origin/ignite-510' 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/12f0a8d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/12f0a8d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/12f0a8d2 Branch: refs/heads/ignite-330 Commit: 12f0a8d2ac7c479ff42470a31361f7961a1014b0 Parents: 9265672 839cfd0 Author: sboikov Authored: Thu Mar 19 14:32:26 2015 +0300 Committer: sboikov Committed: Thu Mar 19 14:32:26 2015 +0300 -- .../apache/ignite/internal/IgniteKernal.java| 2 +- .../deployment/GridDeploymentLocalStore.java| 5 +- .../GridDeploymentPerLoaderStore.java | 5 +- .../GridDeploymentPerVersionStore.java | 5 +- .../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 +- 13 files changed, 108 insertions(+), 69 deletions(-) --
[1/4] incubator-ignite git commit: # ignite-510
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-330 2a9171351 -> 85f02911c
# ignite-510
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/385d9c8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/385d9c8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/385d9c8e
Branch: refs/heads/ignite-330
Commit: 385d9c8e5d13423bbb7e49e36afaa3775e075f1d
Parents: 2e6e93d
Author: sboikov
Authored: Thu Mar 19 12:38:35 2015 +0300
Committer: sboikov
Committed: Thu Mar 19 12:38:35 2015 +0300
--
.../apache/ignite/internal/IgniteKernal.java| 2 +-
.../deployment/GridDeploymentLocalStore.java| 5 +-
.../GridDeploymentPerLoaderStore.java | 5 +-
.../GridDeploymentPerVersionStore.java | 5 +-
.../optimized/OptimizedClassDescriptor.java | 20 ++--
.../optimized/OptimizedMarshaller.java | 30 +++-
.../optimized/OptimizedMarshallerUtils.java | 50 +++-
.../optimized/OptimizedObjectInputStream.java | 19 ++--
.../optimized/OptimizedObjectOutputStream.java | 21 ++--
.../processors/service/DummyService.java| 4 ++
.../optimized/OptimizedMarshallerTest.java | 4 +-
.../OptimizedObjectStreamSelfTest.java | 8 +++-
.../testframework/junits/GridAbstractTest.java | 2 +-
13 files changed, 106 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/385d9c8e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 031c054..ab1038c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1797,7 +1797,7 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
notifyLifecycleBeansEx(LifecycleEventType.AFTER_NODE_STOP);
// Clean internal class/classloader caches to avoid stopped
contexts held in memory.
-OptimizedMarshaller.clearCache();
+U.clearClassCache();
MarshallerExclusions.clearCache();
GridEnumCache.clear();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/385d9c8e/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
index 195621c..cd94854 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java
@@ -523,8 +523,9 @@ class GridDeploymentLocalStore extends
GridDeploymentStoreAdapter {
// Resource cleanup.
ctx.resource().onUndeployed(dep);
-// Clear optimized marshaller's cache. If another marshaller
is used, this is no-op.
-OptimizedMarshaller.onUndeploy(ldr);
+// Clear optimized marshaller's cache.
+if (ctx.config().getMarshaller() instanceof
OptimizedMarshaller)
+
((OptimizedMarshaller)ctx.config().getMarshaller()).onUndeploy(ldr);
clearSerializationCaches();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/385d9c8e/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
index 7a98cbc..e81cf38 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
@@ -496,8 +496,9 @@ public class GridDeploymentPerLoaderStore extends
GridDeploymentStoreAdapter {
ctx.cache().onUndeployed(ldr);
ctx.stream().onUndeployed(ldr);
-// Clear optimized marshaller's cache. If another marshaller
is used, this is
[2/4] incubator-ignite git commit: # ignite-510
# ignite-510
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/839cfd0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/839cfd0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/839cfd0a
Branch: refs/heads/ignite-330
Commit: 839cfd0acee72fb3903822c8fba3512b72ad23a4
Parents: 385d9c8
Author: sboikov
Authored: Thu Mar 19 14:29:11 2015 +0300
Committer: sboikov
Committed: Thu Mar 19 14:29:11 2015 +0300
--
.../ignite/marshaller/optimized/OptimizedObjectInputStream.java | 1 +
.../ignite/marshaller/optimized/OptimizedObjectOutputStream.java| 1 +
2 files changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/839cfd0a/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 4bc648f..f8c6e46 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
@@ -122,6 +122,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
ctx = null;
clsLdr = null;
+clsMap = null;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/839cfd0a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
index 06c2554..c5f9f08 100644
---
a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
+++
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectOutputStream.java
@@ -115,6 +115,7 @@ class OptimizedObjectOutputStream extends
ObjectOutputStream {
reset();
ctx = null;
+clsMap = null;
}
/** {@inheritDoc} */
[4/4] incubator-ignite git commit: Merge branches 'ignite-330' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-330
Merge branches 'ignite-330' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-330 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/85f02911 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/85f02911 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/85f02911 Branch: refs/heads/ignite-330 Commit: 85f02911c30e96b6c3b1a0183addaa90e619c2e7 Parents: 2a91713 12f0a8d Author: AKuznetsov Authored: Thu Mar 19 21:09:26 2015 +0700 Committer: AKuznetsov Committed: Thu Mar 19 21:09:26 2015 +0700 -- .../apache/ignite/internal/IgniteKernal.java| 2 +- .../deployment/GridDeploymentLocalStore.java| 5 +- .../GridDeploymentPerLoaderStore.java | 5 +- .../GridDeploymentPerVersionStore.java | 5 +- .../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 +- 13 files changed, 108 insertions(+), 69 deletions(-) --
incubator-ignite git commit: # Remove dead code.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 d6fdf05f1 -> 448e9c3c6
# 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/sprint-2
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 So
incubator-ignite git commit: #ignite-45-client-tests: Remove client cache tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45-client-tests f2d23ff91 -> 0c00f9301
#ignite-45-client-tests: Remove client cache tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c00f930
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c00f930
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c00f930
Branch: refs/heads/ignite-45-client-tests
Commit: 0c00f930121a6409fc35f4207a17f0b768d83f4c
Parents: f2d23ff
Author: ivasilinets
Authored: Thu Mar 19 17:42:22 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 19 17:42:22 2015 +0300
--
.../ClientAbstractMultiThreadedSelfTest.java| 89 --
.../client/ClientTopologyCacheSelfTest.java | 288 ---
.../client/suite/IgniteClientTestSuite.java | 2 -
3 files changed, 379 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c00f930/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
index e9064b3..41df0da 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
@@ -24,7 +24,6 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.client.balancer.*;
import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
@@ -33,7 +32,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
import org.jetbrains.annotations.*;
-import org.junit.*;
import java.util.*;
import java.util.concurrent.*;
@@ -114,13 +112,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest
extends GridCommonAbst
protected abstract GridSslContextFactory sslContextFactory();
/**
- * @return Count of iterations for sync commit test.
- */
-protected int syncCommitIterCount() {
-return 1000;
-}
-
-/**
* @return Topology refresh frequency interval.
*/
protected int topologyRefreshFrequency() {
@@ -241,86 +232,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest
extends GridCommonAbst
/**
* @throws Exception If failed.
*/
-public void testSyncCommitFlagReplicated() throws Exception {
-doTestSyncCommitFlag(client.data(REPLICATED_ASYNC_CACHE_NAME));
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testSyncCommitFlagPartitioned() throws Exception {
-doTestSyncCommitFlag(client.data(PARTITIONED_ASYNC_BACKUP_CACHE_NAME));
-}
-
-/**
- * Extracts array from given iterator.
- *
- * @param nodes Iterator of nodes.
- * @return Nodes array.
- */
-private GridClientNode[] toArray(Iterator nodes)
{
-ArrayList res = new ArrayList<>();
-
-while (nodes.hasNext())
-res.add(nodes.next());
-
-return res.toArray(new GridClientNode[res.size()]);
-}
-
-/**
- * Runs test on SYNC_COMMIT flag.
- *
- * @param data Client data to run test on.
- * @throws Exception If failed.
- */
-private void doTestSyncCommitFlag(final GridClientData data) throws
Exception {
-final String key = "k0";
-
-Collection affNodesIds = F.viewReadOnly(
-
affinity(grid(0).jcache(data.cacheName())).mapKeyToPrimaryAndBackups(key),
-F.node2id());
-
-final GridClientData dataFirst =
data.pinNodes(F.first(client.compute().nodes()));
-
-List affNodes = new ArrayList<>();
-
-for (GridClientNode node : client.compute().nodes()) {
-if (affNodesIds.contains(node.nodeId()))
-affNodes.add(node);
-}
-
-Assert.assertFalse(affNodes.isEmpty());
-
-Iterator it = affNodes.iterator();
-
-final GridClientData dataOthers = data.pinNodes(it.next(),
toArray(it));
-
-for (int i = 0; i < syncCommitIterCount(); i++) {
-final CountDownLatch l = new CountDownLatch(1);
-
-final String val = "v" + i;
-
-IgniteInternalFuture f = multithreadedAsync(new
Callabl
incubator-ignite git commit: # Cleanup code.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 a8505ff3d -> 852b03525
# Cleanup code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/852b0352
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/852b0352
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/852b0352
Branch: refs/heads/ignite-45
Commit: 852b0352503e1087e17cdd752f0ceef34471ca9a
Parents: a8505ff
Author: sevdokimov
Authored: Thu Mar 19 17:44:55 2015 +0300
Committer: sevdokimov
Committed: Thu Mar 19 17:44:55 2015 +0300
--
.../java/org/apache/ignite/internal/util/lang/GridFunc.java | 2 +-
.../apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java| 9 ++---
2 files changed, 3 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/852b0352/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 4cbb40c..a527d65 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -5779,7 +5779,7 @@ public class GridFunc {
public static Collection upcast(Collection c) {
A.notNull(c, "c");
-return viewReadOnly(c, IDENTITY);
+return (Collection)c;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/852b0352/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 9dbdd66..fc0eb0f 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -642,17 +642,12 @@ public class TcpDiscoverySpi extends
TcpDiscoverySpiAdapter implements TcpDiscov
/** {@inheritDoc} */
@Override public Collection getRemoteNodes() {
-return F.upcast(ring.visibleRemoteNodes());
+return F.upcast(ring.visibleRemoteNodes());
}
/** {@inheritDoc} */
@Override public Collection injectables() {
-Collection res = new LinkedList<>();
-
-if (ipFinder != null)
-res.add(ipFinder);
-
-return res;
+return F.asList(ipFinder);
}
/** {@inheritDoc} */
[04/10] incubator-ignite git commit: # IGNITE-375 Review.
# IGNITE-375 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/1c608cd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1c608cd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1c608cd3
Branch: refs/heads/ignite-496
Commit: 1c608cd3f7a898cf6b77c1e1a952830058a79212
Parents: 412b87d
Author: AKuznetsov
Authored: Wed Mar 18 15:51:00 2015 +0700
Committer: AKuznetsov
Committed: Wed Mar 18 15:51:00 2015 +0700
--
.../apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c608cd3/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 3d62dca..85c036f 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
@@ -1223,7 +1223,7 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
* @param em Entry mapping.
* @param key Key object.
* @return Next index for parameters.
- * @throws CacheException If failed to set statement parameter.
+ * @throws CacheException If failed to set statement parameters.
*/
protected int fillKeyParameters(PreparedStatement stmt, int idx,
EntryMapping em,
Object key) throws CacheException {
@@ -1241,7 +1241,7 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
* @param m Type mapping description.
* @param key Key object.
* @return Next index for parameters.
- * @throws CacheException If failed to set statement parameter.
+ * @throws CacheException If failed to set statement parameters.
*/
protected int fillKeyParameters(PreparedStatement stmt, EntryMapping m,
Object key) throws CacheException {
return fillKeyParameters(stmt, 1, m, key);
@@ -1253,7 +1253,7 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
* @param em Type mapping description.
* @param val Value object.
* @return Next index for parameters.
- * @throws CacheException If failed to set statement parameter.
+ * @throws CacheException If failed to set statement parameters.
*/
protected int fillValueParameters(PreparedStatement stmt, int idx,
EntryMapping em, Object val)
throws CacheWriterException {
[02/10] incubator-ignite git commit: Merge branch 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-375
Merge branch 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-375 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1c5b45a8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1c5b45a8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1c5b45a8 Branch: refs/heads/ignite-496 Commit: 1c5b45a8b9796c7d6760aa3d370a28604e5204f3 Parents: 8d38c52 3eca5e7 Author: anovikov Authored: Wed Mar 18 10:23:05 2015 +0700 Committer: anovikov Committed: Wed Mar 18 10:23:05 2015 +0700 -- examples/config/example-cache.xml | 42 +- examples/config/filesystem/example-igfs.xml | 11 +- .../failover/ComputeFailoverExample.java|1 + .../datagrid/CachePopularNumbersExample.java|6 +- .../examples/datagrid/CacheQueryExample.java| 73 +- .../starschema/CacheStarSchemaExample.java | 17 +- .../datagrid/starschema/DimProduct.java |3 +- .../examples/datagrid/starschema/DimStore.java |3 +- .../datagrid/starschema/FactPurchase.java |2 + .../store/CacheNodeWithStoreStartup.java|3 - .../store/dummy/CacheDummyPersonStore.java |1 + .../MemcacheRestExampleNodeStartup.java |7 - .../apache/ignite/examples/ComputeExample.java |2 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java |8 +- .../ignite/jdbc/JdbcEmptyCacheSelfTest.java |5 +- .../ignite/jdbc/JdbcLocalCachesSelfTest.java| 16 +- .../ignite/jdbc/JdbcMetadataSelfTest.java |6 +- .../jdbc/JdbcPreparedStatementSelfTest.java |5 +- .../ignite/jdbc/JdbcResultSetSelfTest.java |7 +- .../ignite/jdbc/JdbcStatementSelfTest.java |7 +- .../clients/src/test/resources/spring-cache.xml | 15 - .../src/test/resources/spring-server-node.xml |7 - .../test/resources/spring-server-ssl-node.xml |4 - modules/codegen/pom.xml |6 + .../ignite/codegen/MessageCodeGenerator.java|8 + .../java/org/apache/ignite/IgniteCache.java | 17 +- .../org/apache/ignite/cache/query/Query.java| 72 +- .../apache/ignite/cache/query/QueryMetrics.java |4 +- .../ignite/cache/query/QueryTypeResolver.java | 32 - .../org/apache/ignite/cache/query/SqlQuery.java | 16 +- .../query/annotations/QuerySqlFunction.java |4 +- .../configuration/CacheConfiguration.java | 284 +-- .../configuration/CacheQueryConfiguration.java | 182 -- .../configuration/IgniteConfiguration.java | 20 +- .../configuration/QueryConfiguration.java | 227 -- .../ignite/events/CacheQueryExecutedEvent.java |2 +- .../ignite/events/CacheQueryReadEvent.java |2 + .../org/apache/ignite/internal/IgnitionEx.java |3 - .../managers/communication/GridIoManager.java |8 +- .../communication/GridIoMessageFactory.java | 26 + .../processors/cache/CacheProjection.java |5 +- .../cache/CacheWeakQueryIteratorsHolder.java|2 +- .../processors/cache/GridCacheAttributes.java | 27 - .../cache/GridCacheClearAllRunnable.java|5 +- .../processors/cache/GridCacheContext.java |2 + .../processors/cache/GridCacheProcessor.java| 22 +- .../processors/cache/GridCacheSwapListener.java |5 +- .../processors/cache/GridCacheSwapManager.java | 29 +- .../processors/cache/GridCacheUtils.java|1 - .../processors/cache/IgniteCacheProxy.java | 145 +- .../processors/cache/QueryCursorImpl.java | 116 + .../processors/cache/query/CacheQuery.java |2 +- .../query/GridCacheDistributedQueryManager.java |2 + .../cache/query/GridCacheQueriesEx.java |9 +- .../cache/query/GridCacheQueriesImpl.java | 11 +- .../cache/query/GridCacheQueriesProxy.java |4 +- .../cache/query/GridCacheQueryAdapter.java |3 +- .../cache/query/GridCacheQueryManager.java | 16 +- .../cache/query/GridCacheSqlQuery.java |2 +- .../cache/query/GridCacheSqlResult.java | 29 - .../cache/query/GridCacheTwoStepQuery.java |2 +- .../processors/cache/query/QueryCursorImpl.java | 97 - .../continuous/CacheContinuousQueryHandler.java |3 + .../query/jdbc/GridCacheQueryJdbcTask.java | 241 +- .../IgniteCacheObjectProcessorImpl.java |6 +- .../internal/processors/igfs/IgfsProcessor.java |6 - .../processors/query/GridQueryIndexing.java | 34 +- .../processors/query/GridQueryProcessor.java| 523 ++--- .../query/GridQueryTypeDescriptor.java | 18 +- .../messages/GridQueryCancelRequest.java| 114 + .../twostep/messages/GridQueryFailResponse.java | 140 ++ .../messages/GridQueryNextPageRequest.java | 167 ++ .../messages/GridQueryNextPageResponse.java | 240 ++ .../h2/t
[09/10] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-496
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-496 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/97f0c03a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/97f0c03a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/97f0c03a Branch: refs/heads/ignite-496 Commit: 97f0c03ad9e00459438b0ff5f508edf5dc2b7c00 Parents: f691328 2e6e93d Author: sboikov Authored: Thu Mar 19 12:42:56 2015 +0300 Committer: sboikov Committed: Thu Mar 19 12:42:56 2015 +0300 -- .../store/jdbc/CacheAbstractJdbcStore.java | 169 -- .../cache/store/jdbc/CacheJdbcPojoStore.java| 6 +- .../core/src/test/config/store/jdbc/Ignite.xml | 82 +++ .../store/jdbc/CacheJdbcPojoStoreTest.java | 562 --- .../cache/GridCacheAbstractFullApiSelfTest.java | 4 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 31 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 32 ++ 7 files changed, 381 insertions(+), 505 deletions(-) --
[03/10] incubator-ignite git commit: # IGNITE-375 Review.
# IGNITE-375 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/412b87d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/412b87d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/412b87d0
Branch: refs/heads/ignite-496
Commit: 412b87d020a67ee96d11265073e3800d9b904414
Parents: 1c5b45a
Author: AKuznetsov
Authored: Wed Mar 18 15:36:18 2015 +0700
Committer: AKuznetsov
Committed: Wed Mar 18 15:36:18 2015 +0700
--
.../cache/store/jdbc/CacheAbstractJdbcStore.java | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/412b87d0/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 79f7315..3d62dca 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
@@ -1195,10 +1195,16 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
try {
if (fieldVal != null) {
if (field.getJavaType() == UUID.class) {
-if (field.getDatabaseType() == Types.BINARY)
-fieldVal = U.uuidToBytes((UUID)fieldVal);
-else if (F.contains(new int[] { Types.CHAR, Types.VARCHAR
}, field.getDatabaseType()))
-fieldVal = fieldVal.toString();
+switch (field.getDatabaseType()) {
+case Types.BINARY:
+U.uuidToBytes((UUID)fieldVal);
+break;
+
+case Types.CHAR:
+case Types.VARCHAR:
+fieldVal = fieldVal.toString();
+break;
+}
}
stmt.setObject(i, fieldVal);
[10/10] incubator-ignite git commit: # ignite-496
# ignite-496
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5fa19eb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5fa19eb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5fa19eb6
Branch: refs/heads/ignite-496
Commit: 5fa19eb6c3227f72eec33c36904ddf1b76f5fca8
Parents: 97f0c03
Author: sboikov
Authored: Thu Mar 19 17:56:48 2015 +0300
Committer: sboikov
Committed: Thu Mar 19 17:56:48 2015 +0300
--
.../processors/interop/InteropCache.java| 16 +++
.../processors/interop/InteropTarget.java | 4 +-
.../interop/InteropTargetAdapter.java | 50 -
.../processors/interop/InteropUtils.java| 4 +-
.../ignite-interop-api/ignite-interop-api.cpp | 44 ++--
.../ignite-interop-api/ignite-interop-api.h | 8 ++
.../src/ignite_cache.cpp| 102 ++-
7 files changed, 213 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fa19eb6/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropCache.java
index 6b2e8e0..d17d7b3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropCache.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.interop;
import org.apache.ignite.*;
+import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.interop.*;
@@ -67,4 +68,19 @@ public class InteropCache extends InteropTargetAdapter {
marsh.writeObject(val, out);
}
+
+/** {@inheritDoc} */
+@Override protected IgniteInternalFuture inOutAsyncOp(int type,
+InteropInputStream in,
+InteropOutputStream out,
+InteropMarshaller marsh)
+{
+Object key = marsh.readObject(in);
+
+Object val = marsh.readObject(in);
+
+log.info("Interop put async [key=" + key + ", val=" + val + ']');
+
+return cache.putxAsync(key, val);
+}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fa19eb6/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropTarget.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropTarget.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropTarget.java
index bbb99bc..28a4794 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropTarget.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropTarget.java
@@ -46,9 +46,9 @@ public interface InteropTarget {
* @param ptr Input data pointer.
* @param len Input data length.
* @param cb Callback address.
- * @param cbArg Value passed to callback.
+ * @param cbData Value passed to callback.
* @throws IgniteCheckedException If failed.
*/
-public void inOutAsyncOp(int type, long ptr, int len, long cb, long cbArg)
+public void inOutOpAsync(int type, long ptr, int len, long cb, long cbData)
throws IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fa19eb6/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropTargetAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropTargetAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropTargetAdapter.java
index 58f5f3e..7b29301 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropTargetAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/interop/InteropTargetAdapter.java
@@ -18,6 +18,8 @@
package org.apache.ignite.internal.processors.interop;
import org.apache.ignite.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.interop.*;
/**
@@ -87,6 +89,52 @@ public abstract class InteropTargetAdapter implements
InteropTarget {
throws IgniteCheckedException;
/** {@inheritDoc} */
-@Override public void inOutAsyncOp(int type, long ptr, int len, long cb,
long cbArg) throws IgniteC
[06/10] incubator-ignite git commit: #ignite-333: fix test
#ignite-333: fix 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/fe649a4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fe649a4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fe649a4c
Branch: refs/heads/ignite-496
Commit: fe649a4c9adaf23975ad7b4051cd1989ffe43f9b
Parents: 79ea159
Author: ivasilinets
Authored: Wed Mar 18 22:25:42 2015 +0300
Committer: ivasilinets
Committed: Wed Mar 18 22:25:42 2015 +0300
--
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 31
1 file changed, 31 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe649a4c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
index 505aed9..a97f700 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java
@@ -144,6 +144,37 @@ public class
GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache
}
/** {@inheritDoc} */
+@Override public void testLocalClearKeys() throws Exception {
+IgniteCache nearCache = jcache();
+IgniteCache primary = fullCache();
+
+Collection keys = primaryKeysForCache(primary, 3);
+
+int i = 0;
+
+for (String key : keys)
+nearCache.put(key, i++);
+
+String lastKey = F.last(keys);
+
+Set keysToRmv = new HashSet<>(keys);
+
+keysToRmv.remove(lastKey);
+
+assert keysToRmv.size() > 1;
+
+nearCache.localClearAll(keysToRmv);
+
+for (String key : keys) {
+if (keysToRmv.contains(key)) {
+assertNull(nearCache.localPeek(key, CachePeekMode.ONHEAP));
+
+assertNotNull(primary.localPeek(key, CachePeekMode.ONHEAP));
+}
+}
+}
+
+/** {@inheritDoc} */
@Override public void testEvictExpired() throws Exception {
IgniteCache cache = jcache();
[08/10] incubator-ignite git commit: # ignite-375 Add tests.
# ignite-375 Add tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2e6e93d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2e6e93d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2e6e93d3
Branch: refs/heads/ignite-496
Commit: 2e6e93d33827348031bef3f061e387c172318140
Parents: 5c856ed
Author: anovikov
Authored: Thu Mar 19 09:53:58 2015 +0700
Committer: anovikov
Committed: Thu Mar 19 09:53:58 2015 +0700
--
.../store/jdbc/CacheAbstractJdbcStore.java | 5 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 28 +++
.../store/jdbc/CacheJdbcPojoStoreTest.java | 83 +++-
3 files changed, 113 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e6e93d3/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 85c036f..6a43929 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
@@ -1197,12 +1197,13 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
if (field.getJavaType() == UUID.class) {
switch (field.getDatabaseType()) {
case Types.BINARY:
-U.uuidToBytes((UUID)fieldVal);
-break;
+fieldVal = U.uuidToBytes((UUID)fieldVal);
+break;
case Types.CHAR:
case Types.VARCHAR:
fieldVal = fieldVal.toString();
+
break;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e6e93d3/modules/core/src/test/config/store/jdbc/Ignite.xml
--
diff --git a/modules/core/src/test/config/store/jdbc/Ignite.xml
b/modules/core/src/test/config/store/jdbc/Ignite.xml
index 3a64d60..91d77cd 100644
--- a/modules/core/src/test/config/store/jdbc/Ignite.xml
+++ b/modules/core/src/test/config/store/jdbc/Ignite.xml
@@ -237,4 +237,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e6e93d3/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
index 76cc119..98308cb 100644
---
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.jdbc.dialect.*;
import org.apache.ignite.cache.store.jdbc.model.*;
-import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
@@ -33,6 +33,7 @@ import org.springframework.beans.factory.xml.*;
import org.springframework.context.support.*;
import org.springframework.core.io.*;
+import javax.cache.integration.*;
import java.net.*;
import java.sql.*;
import java.util.*;
@@ -175,8 +176,16 @@ public class CacheJdbcPojoStoreTest extends
GridAbstractCacheStoreSelfTest keyCols, Iterable valCols) {
+return super.updateQuery(tblName, keyCols, valCols) + " AND 1
= 0";
+}
+};
+
+store.setDialect(dialect);
+
+Map>
cacheMappings =
+GridTestUtils.getFieldValue(store, CacheAbstractJdbcStore.class,
"cacheMappings");
+
+CacheAbstractJdbcStor
[01/10] incubator-ignite git commit: # ignite-375 Add support UUID in pojo store.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-496 f6913288f -> 5fa19eb6c
# ignite-375 Add support UUID in pojo store.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8d38c529
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8d38c529
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8d38c529
Branch: refs/heads/ignite-496
Commit: 8d38c52925e46ceb04239dde8d01e5e12fee6751
Parents: 86987b0
Author: anovikov
Authored: Wed Mar 18 10:18:47 2015 +0700
Committer: anovikov
Committed: Wed Mar 18 10:18:47 2015 +0700
--
.../store/jdbc/CacheAbstractJdbcStore.java | 162 --
.../cache/store/jdbc/CacheJdbcPojoStore.java| 6 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 54 ++
.../store/jdbc/CacheJdbcPojoStoreTest.java | 559 ++-
4 files changed, 239 insertions(+), 542 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d38c529/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 80a22c0..79f7315 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
@@ -34,6 +34,7 @@ import org.jetbrains.annotations.*;
import javax.cache.*;
import javax.cache.integration.*;
import javax.sql.*;
+import java.nio.*;
import java.sql.*;
import java.util.*;
import java.util.concurrent.*;
@@ -127,7 +128,7 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
private int parallelLoadCacheMinThreshold =
DFLT_PARALLEL_LOAD_CACHE_MINIMUM_THRESHOLD;
/**
- * Get field value from object.
+ * Get field value from object for use as query parameter.
*
* @param cacheName Cache name.
* @param typeName Type name.
@@ -135,7 +136,7 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
* @param obj Cache object.
* @return Field value from object.
*/
-@Nullable protected abstract Object extractField(@Nullable String
cacheName, String typeName, String fieldName,
+@Nullable protected abstract Object extractParameter(@Nullable String
cacheName, String typeName, String fieldName,
Object obj) throws CacheException;
/**
@@ -387,7 +388,26 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
return EMPTY_COLUMN_VALUE;
}
-return rs.getObject(colIdx);
+Object val = rs.getObject(colIdx);
+
+if (type == UUID.class && val != null) {
+if (val instanceof UUID)
+return val;
+
+if (val instanceof byte[]) {
+ByteBuffer bb = ByteBuffer.wrap((byte[])val);
+
+long most = bb.getLong();
+long least = bb.getLong();
+
+return new UUID(most, least);
+}
+
+if (val instanceof String)
+return UUID.fromString((String)val);
+}
+
+return val;
}
/**
@@ -461,6 +481,65 @@ public abstract class CacheAbstractJdbcStore
implements CacheStore,
}
/**
+ * Object is a simple type.
+ *
+ * @param cls Class.
+ * @return {@code True} if object is a simple type.
+ */
+protected static boolean simpleType(Class cls) {
+return (Number.class.isAssignableFrom(cls) ||
String.class.isAssignableFrom(cls) ||
+java.util.Date.class.isAssignableFrom(cls) ||
Boolean.class.isAssignableFrom(cls) ||
+UUID.class.isAssignableFrom(cls));
+}
+
+/**
+ * @param clsName Class name.
+ * @param fields Fields descriptors.
+ * @throws CacheException If failed.
+ */
+private static void checkMapping(@Nullable String cacheName, String
clsName,
+Collection fields) throws CacheException {
+try {
+Class cls = Class.forName(clsName);
+
+if (simpleType(cls)) {
+if (fields.size() != 1)
+throw new CacheException("More than one field for simple
type [cache name=" + cacheName
++ ", type=" + clsName + " ]");
+
+CacheTypeFieldMetadata field = F.first(fields);
+
+if (field.getDatabaseName() == null)
+throw new CacheException("Missing database name in mapping
description [cache name=" + cacheName
++ ", type=" +
[05/10] incubator-ignite git commit: #ignite-333: Override testLocalClearKeys in GridCacheNearOnlyMultiNodeFullApiSelfTest.
#ignite-333: Override testLocalClearKeys in
GridCacheNearOnlyMultiNodeFullApiSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79ea1593
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79ea1593
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79ea1593
Branch: refs/heads/ignite-496
Commit: 79ea1593bc6d2448f22c019159aafdc185bd6840
Parents: f16407d
Author: ivasilinets
Authored: Wed Mar 18 20:29:25 2015 +0300
Committer: ivasilinets
Committed: Wed Mar 18 20:29:25 2015 +0300
--
.../cache/GridCacheAbstractFullApiSelfTest.java | 4 +--
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 32
2 files changed, 34 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79ea1593/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 181d3e2..b55b4d1 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4123,7 +4123,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
/**
* @param keyToRmv Removed key.
*/
-private void checkLocalRemovedKey(String keyToRmv) {
+protected void checkLocalRemovedKey(String keyToRmv) {
for (int i = 0; i < 500; ++i) {
String key = "key" + i;
@@ -4189,7 +4189,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
*
* @return Map grid's name to its primary keys.
*/
-private Map> addKeys() {
+protected Map> addKeys() {
// Save entries only on their primary nodes. If we didn't do so,
clearLocally() will not remove all entries
// because some of them were blocked due to having readers.
Map> keys = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79ea1593/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index 660b64b..94d0616 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -496,6 +496,38 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest
extends GridCachePartitio
}
}
+/** {@inheritDoc} */
+@Override public void testLocalClearKeys() throws Exception {
+IgniteCache nearCache = jcache();
+IgniteCache primary = fullCache();
+
+Collection keys = primaryKeysForCache(primary, 3);
+
+int i = 0;
+
+for (String key : keys)
+nearCache.put(key, i++);
+
+String lastKey = F.last(keys);
+
+Set keysToRmv = new HashSet<>(keys);
+
+keysToRmv.remove(lastKey);
+
+assert keysToRmv.size() > 1;
+
+nearCache.localClearAll(keysToRmv);
+
+for (String key : keys) {
+boolean found = nearCache.localPeek(key, CachePeekMode.ONHEAP) !=
null;
+
+if (keysToRmv.contains(key))
+assertFalse("Found removed key " + key, found);
+else
+assertTrue("Not found key " + key, found);
+}
+}
+
/**
* @param async If {@code true} uses async method.
* @throws Exception If failed.
[07/10] incubator-ignite git commit: Merge branches 'ignite-375' and 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-375
Merge branches 'ignite-375' and 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-375 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5c856ed5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5c856ed5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5c856ed5 Branch: refs/heads/ignite-496 Commit: 5c856ed50aa1b4c61eff520fe2c84c5ed2762671 Parents: 1c608cd fe649a4 Author: anovikov Authored: Thu Mar 19 08:33:18 2015 +0700 Committer: anovikov Committed: Thu Mar 19 08:33:18 2015 +0700 -- .../ComputeContinuousMapperExample.java | 2 +- .../ComputeFibonacciContinuationExample.java| 2 +- .../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/hibernate/package-info.java| 22 + .../examples/datagrid/hibernate/package.html| 24 - .../ignite/examples/datagrid/package-info.java | 22 + .../ignite/examples/datagrid/package.html | 24 - .../datagrid/starschema/package-info.java | 22 + .../examples/datagrid/starschema/package.html | 24 - .../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 - .../datagrid/store/jdbc/package-info.java | 22 + .../examples/datagrid/store/jdbc/package.html | 24 - .../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 - .../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 - .../gridify/aop/aspectj/package-info.java | 22 + .../compute/gridify/aop/aspectj/package.html| 24 - .../gridify/aop/spring/package-info.java| 22 + .../compute/gridify/aop/spring/package.html | 25 - .../ignite/gridify/hierarchy/package-info.java | 22 + .../ignite/gridify/hierarchy/package.html | 25 - .../org/apache/ignite/gridify/package-info.java | 22 + .../java/org/apache/ignite/gridify/package.html | 25 - .../direct/singlesplit/package-info.java| 22 + .../loadtests/direct/singlesplit/package.html | 24 - .../java/org/test/gridify/package-info.java | 22 + .../src/test/java/org/test/gridify/package.html | 24 - .../ignite/spi/checkpoint/s3/package-info.java | 22 + .../ignite/spi/checkpoint/s3/package.html | 24 - .../discovery/tcp/ipfinder/s3/package-info.java | 22 + .../spi/discovery/tcp/ipfinder/s3/package.html | 24 - .../ignite/spi/checkpoint/s3/package-info.java | 22 + .../ignite/spi/checkpoint/s3/package.html | 24 - .../discovery/tcp/ipfinder/s3/package-info.java | 22 + .../spi/discovery/tcp/ipfinder/s3/package.html | 24 - .../scala/collection/concurrent/TrieMap.java| 4 +- .../java/org/apache/ignite/IgniteCache.java | 14 +- .../java/org/apache/ignite/IgniteCompute.java | 4 - .../java/org/apache/ignite/IgniteQueue.java | 4 +- .../main/java/org/apache/ignite/IgniteSet.java | 2 +- .../cache/affinity/CacheAffinityKeyMapped.java | 44 -- .../cache/affinity/fair/package-info.java | 21 + .../ignite/cache/affinity/fair/package.html | 24 - .../ignite/cache/affinity/package-info.java |
[1/6] incubator-ignite git commit: #ignite-45-client-tests: Remove client cache tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 852b03525 -> 8eb79a74d
#ignite-45-client-tests: Remove client cache tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/242eaa51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/242eaa51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/242eaa51
Branch: refs/heads/ignite-45
Commit: 242eaa51cd5e52174962642945de7a1dc51129a9
Parents: 8656001
Author: ivasilinets
Authored: Thu Mar 19 16:38:59 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 19 16:38:59 2015 +0300
--
.../ClientAbstractMultiThreadedSelfTest.java| 102 +---
.../client/ClientDefaultCacheSelfTest.java | 48 --
.../ClientAbstractMultiNodeSelfTest.java| 199 --
.../integration/ClientAbstractSelfTest.java | 599 ---
.../loadtests/client/ClientTcpSslLoadTest.java | 108
5 files changed, 109 insertions(+), 947 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/242eaa51/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
index bb5b246..e9064b3 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
@@ -18,14 +18,11 @@
package org.apache.ignite.internal.client;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.client.balancer.*;
-import org.apache.ignite.internal.client.impl.*;
import org.apache.ignite.internal.client.ssl.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -43,7 +40,6 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
@@ -95,7 +91,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest
extends GridCommonAbst
}
/** Client instance for each test. */
-private GridClient client;
+protected GridClient client;
/**
* @return Client protocol that should be used.
@@ -379,102 +375,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest
extends GridCommonAbst
info(">>> " + e.getKey() + " run " + e.getValue().get() + "
tasks");
}
-/**
- * @throws Exception If failed.
- */
-public void test6Affinity() throws Exception {
-GridClientData cache = client.data(PARTITIONED_CACHE_NAME);
-UUID nodeId = cache.affinity("6");
-
-info("Affinity node: " + nodeId);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testMultithreadedCachePut() throws Exception {
-final AtomicLong keyCnt = new AtomicLong();
-
-final AtomicReference err = new AtomicReference<>();
-
-final ConcurrentMap> puts = new
ConcurrentHashMap<>();
-
-final Map gridMap = new HashMap<>();
-
-for (int i = 0; i < NODES_CNT; i++) {
-Ignite g = grid(i);
-
-gridMap.put(g.cluster().localNode().id(), g);
-}
-
-final Ignite ignite = F.first(gridMap.values());
-
-assertEquals(NODES_CNT, client.compute().refreshTopology(false,
false).size());
-
-IgniteInternalFuture fut = multithreadedAsync(new Runnable() {
-@SuppressWarnings("OverlyStrongTypeCast")
-@Override public void run() {
-try {
-GridClientData cache = client.data(PARTITIONED_CACHE_NAME);
-
-assertEquals(NODES_CNT,
((GridClientDataImpl)cache).projectionNodes().size());
-
-long rawKey;
-
-while ((rawKey = keyCnt.getAndIncrement()) <
cachePutCount()) {
-String key = String.valueOf(rawKey);
-
-UUID nodeId = cache.affinity(key);
-
-String val = "val" + rawKey;
-
-if (cache.put(
[3/6] incubator-ignite git commit: #ignite-45-client-tests: Remove client cache tests.
#ignite-45-client-tests: Remove client cache tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2d23ff9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2d23ff9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2d23ff9
Branch: refs/heads/ignite-45
Commit: f2d23ff916e746e6d1bb682ee13af5b52f7aa3bf
Parents: 0db819b
Author: ivasilinets
Authored: Thu Mar 19 17:13:54 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 19 17:13:54 2015 +0300
--
.../ClientAbstractMultiNodeSelfTest.java| 81
.../integration/ClientAbstractSelfTest.java | 74 --
2 files changed, 155 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2d23ff9/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
index 8c4794d..2dee305 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -227,36 +227,6 @@ public abstract class ClientAbstractMultiNodeSelfTest
extends GridCommonAbstract
/**
* @throws Exception If failed.
*/
-public void testSyncCommitRollbackFlags() throws Exception {
-commSpiEnabled = true;
-
-try {
-GridClientData data = client.data(REPLICATED_ASYNC_CACHE_NAME);
-
-info("Before put x1");
-
-data.put("x1", "y1");
-
-info("Before put x2");
-
-data.flagsOn(GridClientCacheFlag.SYNC_COMMIT).put("x2", "y2");
-
-info("Before put x3");
-
-data.put("x3", "y3");
-
-info("Before put x4");
-
-data.flagsOn(GridClientCacheFlag.SYNC_COMMIT).put("x4", "y4");
-}
-finally {
-commSpiEnabled = false;
-}
-}
-
-/**
- * @throws Exception If failed.
- */
public void testEmptyProjections() throws Exception {
final GridClientCompute dflt = client.compute();
@@ -528,55 +498,4 @@ public abstract class ClientAbstractMultiNodeSelfTest
extends GridCommonAbstract
assertTrue("Invalid tx flags: " + t, t.syncCommit());
}
}
-
-/**
- * @throws Exception If failed.
- */
-public void testMultithreadedCommand() throws Exception {
-final GridClientData data = client.data(PARTITIONED_CACHE_NAME);
-final GridClientCompute compute = client.compute();
-final AtomicInteger cnt = new AtomicInteger(0);
-
-multithreaded(new Callable() {
-@Override public Object call() throws Exception {
-for (int i = 0; i < 20; i++) {
-String key = UUID.randomUUID().toString();
-String val = UUID.randomUUID().toString();
-
-switch (cnt.incrementAndGet() % 4) {
-case 0: {
-assertTrue(data.put(key, val));
-assertEquals(val, data.get(key));
-assertTrue(data.remove(key));
-
-break;
-}
-
-case 1: {
-assertNotNull(data.metrics());
-
-break;
-}
-
-case 2: {
-String nodeId =
compute.execute(TestTask.class.getName(), null);
-
-assertNotNull(nodeId);
-
assertNotNull(compute.refreshNode(UUID.fromString(nodeId), true, true));
-
-break;
-}
-
-case 3: {
-assertEquals(NODES_CNT,
compute.refreshTopology(true, true).size());
-
-break;
-}
-}
-}
-
-return null;
-}
-}, 50, "multithreaded-client-access");
-}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2d23ff9/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/Cl
[2/6] incubator-ignite git commit: #ignite-45-client-tests: Remove client cache tests.
#ignite-45-client-tests: Remove client cache tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0db819bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0db819bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0db819bb
Branch: refs/heads/ignite-45
Commit: 0db819bb23d37707838df85ac0114143cfcc5575
Parents: 242eaa5
Author: ivasilinets
Authored: Thu Mar 19 17:00:03 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 19 17:00:03 2015 +0300
--
.../integration/ClientAbstractSelfTest.java | 122 ---
1 file changed, 122 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0db819bb/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
index a07c1b0..e590f6e 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
@@ -451,128 +451,6 @@ public abstract class ClientAbstractSelfTest extends
GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
-public void testPut() throws Exception {
-IgniteCache dfltCache = grid().jcache(null);
-IgniteCache namedCache = grid().jcache(CACHE_NAME);
-
-GridClientData dfltData = client.data();
-
-assertNotNull(dfltData);
-
-GridClientData namedData = client.data(CACHE_NAME);
-
-assertNotNull(namedData);
-
-assertTrue(dfltData.put("key1", "val1"));
-assertEquals("val1", dfltCache.get("key1"));
-
-assertTrue(dfltData.putAsync("key2", "val2").get());
-assertEquals("val2", dfltCache.get("key2"));
-
-assertTrue(namedData.put("key1", "val1"));
-assertEquals("val1", namedCache.get("key1"));
-
-assertTrue(namedData.putAsync("key2", "val2").get());
-assertEquals("val2", namedCache.get("key2"));
-
-assertTrue(dfltData.put("", ""));
-assertEquals("", dfltCache.get(""));
-
-assertTrue(namedData.put("", ""));
-assertEquals("", namedCache.get(""));
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testPutAll() throws Exception {
-GridClientData dfltData = client.data();
-
-assertNotNull(dfltData);
-
-GridClientData namedData = client.data(CACHE_NAME);
-
-assertNotNull(namedData);
-
-dfltData.putAll(F.asMap("key1", "val1", "key2", "val2"));
-
-Map map = grid().jcache(null).getAll(F.asSet("key1", "key2"));
-
-assertEquals(2, map.size());
-assertEquals("val1", map.get("key1"));
-assertEquals("val2", map.get("key2"));
-
-dfltData.putAllAsync(F.asMap("key3", "val3", "key4", "val4")).get();
-
-map = grid().jcache(null).getAll(F.asSet("key3",
"key4"));
-
-assertEquals(2, map.size());
-assertEquals("val3", map.get("key3"));
-assertEquals("val4", map.get("key4"));
-
-namedData.putAll(F.asMap("key1", "val1", "key2", "val2"));
-
-map = grid().jcache(CACHE_NAME).getAll(F.asSet("key1",
"key2"));
-
-assertEquals(2, map.size());
-assertEquals("val1", map.get("key1"));
-assertEquals("val2", map.get("key2"));
-
-namedData.putAllAsync(F.asMap("key3", "val3", "key4", "val4")).get();
-
-map = grid().jcache(CACHE_NAME).getAll(F.asSet("key3",
"key4"));
-
-assertEquals(2, map.size());
-assertEquals("val3", map.get("key3"));
-assertEquals("val4", map.get("key4"));
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testPutAllWithCornerCases() throws Exception {
-final GridClientData dfltData = client.data();
-
-assertNotNull(dfltData);
-
-GridClientData namedData = client.data(CACHE_NAME);
-
-assertNotNull(namedData);
-
-dfltData.putAll(F.asMap("", "val1"));
-
-assertEquals(F.asMap("", "val1"), grid().jcache(null).getAll(F.asSet("")));
-
-GridClientProtocol proto = clientConfiguration().getProtocol();
-
-assertThrows(log, new Callable() {
-@Override public Object call() throws Exception {
-dfltData.putAll(Collections.singletonMap("key3", null));
-
-return null;
-}
-}, proto == GridClientProtocol.TCP ? GridClientException.class :
IllegalArgumentExcept
incubator-ignite git commit: #ignite-45-client-tests: Remove imports.
Repository: incubator-ignite Updated Branches: refs/heads/ignite-45-client-tests 0c00f9301 -> d57374e9b #ignite-45-client-tests: Remove imports. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d57374e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d57374e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d57374e9 Branch: refs/heads/ignite-45-client-tests Commit: d57374e9b40f830c89e3c01d1f3adeaf67f6188f Parents: 0c00f93 Author: ivasilinets Authored: Thu Mar 19 18:20:23 2015 +0300 Committer: ivasilinets Committed: Thu Mar 19 18:20:23 2015 +0300 -- .../client/integration/ClientAbstractMultiNodeSelfTest.java| 1 - .../ignite/internal/client/integration/ClientAbstractSelfTest.java | 2 -- 2 files changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d57374e9/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java -- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java index 2dee305..1d010e6 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -46,7 +46,6 @@ import org.jetbrains.annotations.*; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d57374e9/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java -- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java index 58d628c..bc3e314 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.client.integration; import junit.framework.*; import net.sf.json.*; -import org.apache.ignite.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -42,7 +41,6 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.testframework.GridTestUtils.*; /** * Tests for Java client.
[4/6] incubator-ignite git commit: #ignite-45-client-tests: Remove client cache tests.
#ignite-45-client-tests: Remove client cache tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c00f930
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c00f930
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c00f930
Branch: refs/heads/ignite-45
Commit: 0c00f930121a6409fc35f4207a17f0b768d83f4c
Parents: f2d23ff
Author: ivasilinets
Authored: Thu Mar 19 17:42:22 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 19 17:42:22 2015 +0300
--
.../ClientAbstractMultiThreadedSelfTest.java| 89 --
.../client/ClientTopologyCacheSelfTest.java | 288 ---
.../client/suite/IgniteClientTestSuite.java | 2 -
3 files changed, 379 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c00f930/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
index e9064b3..41df0da 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
@@ -24,7 +24,6 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.client.balancer.*;
import org.apache.ignite.internal.client.ssl.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
@@ -33,7 +32,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
import org.jetbrains.annotations.*;
-import org.junit.*;
import java.util.*;
import java.util.concurrent.*;
@@ -114,13 +112,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest
extends GridCommonAbst
protected abstract GridSslContextFactory sslContextFactory();
/**
- * @return Count of iterations for sync commit test.
- */
-protected int syncCommitIterCount() {
-return 1000;
-}
-
-/**
* @return Topology refresh frequency interval.
*/
protected int topologyRefreshFrequency() {
@@ -241,86 +232,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest
extends GridCommonAbst
/**
* @throws Exception If failed.
*/
-public void testSyncCommitFlagReplicated() throws Exception {
-doTestSyncCommitFlag(client.data(REPLICATED_ASYNC_CACHE_NAME));
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testSyncCommitFlagPartitioned() throws Exception {
-doTestSyncCommitFlag(client.data(PARTITIONED_ASYNC_BACKUP_CACHE_NAME));
-}
-
-/**
- * Extracts array from given iterator.
- *
- * @param nodes Iterator of nodes.
- * @return Nodes array.
- */
-private GridClientNode[] toArray(Iterator nodes)
{
-ArrayList res = new ArrayList<>();
-
-while (nodes.hasNext())
-res.add(nodes.next());
-
-return res.toArray(new GridClientNode[res.size()]);
-}
-
-/**
- * Runs test on SYNC_COMMIT flag.
- *
- * @param data Client data to run test on.
- * @throws Exception If failed.
- */
-private void doTestSyncCommitFlag(final GridClientData data) throws
Exception {
-final String key = "k0";
-
-Collection affNodesIds = F.viewReadOnly(
-
affinity(grid(0).jcache(data.cacheName())).mapKeyToPrimaryAndBackups(key),
-F.node2id());
-
-final GridClientData dataFirst =
data.pinNodes(F.first(client.compute().nodes()));
-
-List affNodes = new ArrayList<>();
-
-for (GridClientNode node : client.compute().nodes()) {
-if (affNodesIds.contains(node.nodeId()))
-affNodes.add(node);
-}
-
-Assert.assertFalse(affNodes.isEmpty());
-
-Iterator it = affNodes.iterator();
-
-final GridClientData dataOthers = data.pinNodes(it.next(),
toArray(it));
-
-for (int i = 0; i < syncCommitIterCount(); i++) {
-final CountDownLatch l = new CountDownLatch(1);
-
-final String val = "v" + i;
-
-IgniteInternalFuture f = multithreadedAsync(new
Callable() {
-@Override public Object call() throws Exception {
-l.await();
-
-
[6/6] incubator-ignite git commit: Merge branch 'ignite-45' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45
Merge branch 'ignite-45' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/8eb79a74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8eb79a74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8eb79a74 Branch: refs/heads/ignite-45 Commit: 8eb79a74d4930f479b4a44590b1075395f8033e9 Parents: d57374e 852b035 Author: ivasilinets Authored: Thu Mar 19 18:21:37 2015 +0300 Committer: ivasilinets Committed: Thu Mar 19 18:21:37 2015 +0300 -- .../affinity/AffinityTopologyVersion.java | 6 +- .../cache/GridCachePartitionExchangeManager.java| 16 +++- .../preloader/GridDhtPartitionsExchangeFuture.java | 6 +- .../apache/ignite/internal/util/lang/GridFunc.java | 2 +- .../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 9 ++--- 5 files changed, 16 insertions(+), 23 deletions(-) --
[5/6] incubator-ignite git commit: #ignite-45-client-tests: Remove imports.
#ignite-45-client-tests: Remove imports. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d57374e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d57374e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d57374e9 Branch: refs/heads/ignite-45 Commit: d57374e9b40f830c89e3c01d1f3adeaf67f6188f Parents: 0c00f93 Author: ivasilinets Authored: Thu Mar 19 18:20:23 2015 +0300 Committer: ivasilinets Committed: Thu Mar 19 18:20:23 2015 +0300 -- .../client/integration/ClientAbstractMultiNodeSelfTest.java| 1 - .../ignite/internal/client/integration/ClientAbstractSelfTest.java | 2 -- 2 files changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d57374e9/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java -- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java index 2dee305..1d010e6 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -46,7 +46,6 @@ import org.jetbrains.annotations.*; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d57374e9/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java -- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java index 58d628c..bc3e314 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.client.integration; import junit.framework.*; import net.sf.json.*; -import org.apache.ignite.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -42,7 +41,6 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.testframework.GridTestUtils.*; /** * Tests for Java client.
incubator-ignite git commit: #ignite-45: merge ignite-45-client-tests
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 8eb79a74d -> 21e1f16ea
#ignite-45: merge ignite-45-client-tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/21e1f16e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/21e1f16e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/21e1f16e
Branch: refs/heads/ignite-45
Commit: 21e1f16ea372a7c4356a73857b5fb7329a9ef8ce
Parents: 8eb79a7
Author: ivasilinets
Authored: Thu Mar 19 18:24:31 2015 +0300
Committer: ivasilinets
Committed: Thu Mar 19 18:24:31 2015 +0300
--
.../loadtests/client/ClientTcpSslLoadTest.java | 110 ---
1 file changed, 110 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/21e1f16e/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
index 17e0a8d..63fd232 100644
---
a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
@@ -18,18 +18,9 @@
package org.apache.ignite.loadtests.client;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
import org.apache.ignite.internal.client.*;
-import org.apache.ignite.internal.client.impl.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
/**
* Makes a long run to ensure stability and absence of memory leaks.
*/
@@ -43,9 +34,6 @@ public class ClientTcpSslLoadTest extends
ClientTcpSslMultiThreadedSelfTest {
/** Time to let connections closed by idle. */
private static final long RELAX_INTERVAL = 60 * 1000;
-/** Thread count to run tests. */
-private static final int THREAD_CNT = 20;
-
/**
* @throws Exception If failed.
*/
@@ -59,8 +47,6 @@ public class ClientTcpSslLoadTest extends
ClientTcpSslMultiThreadedSelfTest {
testMultithreadedTaskRun();
-testMultithreadedCachePut();
-
long now = System.currentTimeMillis();
if (now - lastPrint > STATISTICS_PRINT_INTERVAL) {
@@ -97,100 +83,4 @@ public class ClientTcpSslLoadTest extends
ClientTcpSslMultiThreadedSelfTest {
log.error("Cache clear failed.", e);
}
}
-
-/**
- * @throws Exception If failed.
- */
-public void test6Affinity() throws Exception {
-GridClientData cache = client.data(PARTITIONED_CACHE_NAME);
-UUID nodeId = cache.affinity("6");
-
-info("Affinity node: " + nodeId);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testMultithreadedCachePut() throws Exception {
-final AtomicLong keyCnt = new AtomicLong();
-
-final AtomicReference err = new AtomicReference<>();
-
-final ConcurrentMap> puts = new
ConcurrentHashMap<>();
-
-final Map gridMap = new HashMap<>();
-
-for (int i = 0; i < NODES_CNT; i++) {
-Ignite g = grid(i);
-
-gridMap.put(g.cluster().localNode().id(), g);
-}
-
-final Ignite ignite = F.first(gridMap.values());
-
-assertEquals(NODES_CNT, client.compute().refreshTopology(false,
false).size());
-
-IgniteInternalFuture fut = multithreadedAsync(new Runnable() {
-@SuppressWarnings("OverlyStrongTypeCast")
-@Override public void run() {
-try {
-GridClientData cache = client.data(PARTITIONED_CACHE_NAME);
-
-assertEquals(NODES_CNT,
((GridClientDataImpl)cache).projectionNodes().size());
-
-long rawKey;
-
-while ((rawKey = keyCnt.getAndIncrement()) <
cachePutCount()) {
-String key = String.valueOf(rawKey);
-
-UUID nodeId = cache.affinity(key);
-
-String val = "val" + rawKey;
-
-if (cache.put(key, val)) {
-T2 old = puts.putIfAbsent(key, new
T2<>(nodeId, val));
-
-assert old == null : "Map contained entry [key=" +
rawKey + ", entry=" + old + ']';
-}
-}
-}
-catch (Exception e) {
-err.
incubator-ignite git commit: # Cleanup code: use Integer.compare() and Long.compare() in compareTo() methods.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 21e1f16ea -> 58f0ec97c
# Cleanup code: use Integer.compare() and Long.compare() in compareTo() methods.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/58f0ec97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/58f0ec97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/58f0ec97
Branch: refs/heads/ignite-45
Commit: 58f0ec97c201890de95e25586278c4cc5b377e3e
Parents: 21e1f16
Author: sevdokimov
Authored: Thu Mar 19 18:32:08 2015 +0300
Committer: sevdokimov
Committed: Thu Mar 19 18:32:31 2015 +0300
--
.../client/GridClientPartitionAffinity.java | 8 ++
.../processors/cache/GridCacheMapEntry.java | 5 ++--
.../processors/cache/GridCacheTtlManager.java | 12 -
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../preloader/GridDhtPartitionExchangeId.java | 2 --
.../dht/preloader/GridDhtPartitionFullMap.java | 8 --
.../dht/preloader/GridDhtPartitionMap.java | 2 +-
.../query/GridCacheDistributedQueryManager.java | 8 +++---
.../cache/version/GridCacheVersion.java | 19 +++--
.../processors/clock/GridClockDeltaVersion.java | 10 +++
.../ignite/lang/IgniteProductVersion.java | 28 +++-
.../java/org/apache/ignite/lang/IgniteUuid.java | 7 -
.../jobstealing/JobStealingCollisionSpi.java| 2 +-
.../tcp/internal/TcpDiscoveryNode.java | 10 ---
.../index/tree/StreamerTreeIndexProvider.java | 5 +++-
15 files changed, 71 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/58f0ec97/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
index b747bc4..1cce940 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientPartitionAffinity.java
@@ -349,12 +349,8 @@ public class GridClientPartitionAffinity implements
GridClientDataAffinity, Grid
@Override public int compareTo(NodeInfo o) {
int diff = nodeId.compareTo(o.nodeId);
-if (diff == 0) {
-int h1 = hashCode();
-int h2 = o.hashCode();
-
-diff = h1 == h2 ? 0 : (h1 < h2 ? -1 : 1);
-}
+if (diff == 0)
+diff = Integer.compare(hashCode(), o.hashCode());
return diff;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/58f0ec97/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 f14a765..cbc16b6 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
@@ -43,7 +43,6 @@ import javax.cache.processor.*;
import java.io.*;
import java.nio.*;
import java.util.*;
-import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.events.EventType.*;
@@ -3756,11 +3755,11 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx {
/** {@inheritDoc} */
@Override public Cache.Entry wrapLazyValue() {
-return new LazyValueEntry(key);
+return new LazyValueEntry<>(key);
}
/** {@inheritDoc} */
-@Nullable public CacheObject peekVisibleValue() {
+@Override @Nullable public CacheObject peekVisibleValue() {
try {
IgniteInternalTx tx = cctx.tm().userTx();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/58f0ec97/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
index 7bfdbfa..5198b53 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
[32/50] [abbrv] incubator-ignite git commit: #Fixed ExecutionContext tests.
#Fixed ExecutionContext tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d683fbe4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d683fbe4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d683fbe4
Branch: refs/heads/ignite-454
Commit: d683fbe4daade5ffbec805e009f1e182ddeb6144
Parents: 0a7176f
Author: nikolay_tikhonov
Authored: Wed Mar 18 18:47:20 2015 +0300
Committer: nikolay_tikhonov
Committed: Wed Mar 18 18:47:20 2015 +0300
--
.../cache/context/IgniteCacheAbstractExecutionContextTest.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d683fbe4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java
index 7575c7a..b681ab1 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/context/IgniteCacheAbstractExecutionContextTest.java
@@ -74,8 +74,11 @@ public abstract class
IgniteCacheAbstractExecutionContextTest extends IgniteCach
for (int i = 0; i < ITER_CNT; i++) {
int idx = i % gridCount();
+// Check that entry was loaded by user's classloader.
if (idx == 0)
-assertEquals(jcache.get(i).getClass().getClassLoader(),
testClassLdr);
+// Or testClassLdr either classloader from cache configuration.
+assertTrue(grid(0).configuration().getClassLoader() ==
jcache.get(i).getClass().getClassLoader()
+|| jcache.get(i).getClass().getClassLoader() ==
testClassLdr);
else
assertEquals(grid(idx).jcache(null).get(i).getClass().getClassLoader(),
grid(idx).configuration().getClassLoader());
[14/50] [abbrv] incubator-ignite git commit: ignite-432 package.html becomes package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/package-info.java new file mode 100644 index 000..2d606af --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/package-info.java @@ -0,0 +1,5 @@ +/** + * + * TODO. + */ +package org.apache.ignite.internal.managers.eventstorage; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/package.html b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/package.html deleted file mode 100644 index 6247e89..000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -TODO. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/package-info.java new file mode 100644 index 000..46b77a4 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/package-info.java @@ -0,0 +1,5 @@ +/** + * + * TODO. + */ +package org.apache.ignite.internal.managers.failover; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/package.html b/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/package.html deleted file mode 100644 index 6247e89..000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/failover/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -TODO. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/package-info.java new file mode 100644 index 000..5707937 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Indexing manager classes. + */ +package org.apache.ignite.internal.managers.indexing; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/package.html b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/package.html deleted file mode 100644 index 9117c95..000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Indexing manager classes. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/package-info.java new file mode 100644 index 000..1f31b81 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/loadbalancer/package-info.java @@ -0,0 +1,5 @@ +/** + * + * TODO. + */ +package org.apache.ignite.internal.managers.loadbalancer; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/or
[17/50] [abbrv] incubator-ignite git commit: #sprint-2: add licence to GridCacheQuerySimpleBenchmark file.
#sprint-2: add licence to GridCacheQuerySimpleBenchmark file. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6657fc33 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6657fc33 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6657fc33 Branch: refs/heads/ignite-454 Commit: 6657fc33eebe1f45bd972bd926b00c1211e92d39 Parents: 7eb269d Author: ivasilinets Authored: Wed Mar 18 16:08:41 2015 +0300 Committer: ivasilinets Committed: Wed Mar 18 16:08:41 2015 +0300 -- .../cache/GridCacheQuerySimpleBenchmark.java| 16 1 file changed, 16 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6657fc33/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java index e2be751..86cea6b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*;
[39/50] [abbrv] incubator-ignite git commit: rat settings updated
rat settings updated Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5183626d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5183626d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5183626d Branch: refs/heads/ignite-454 Commit: 5183626d2e5eed9b7de09c645a3530442874ef2c Parents: f69865a Author: avinogradov Authored: Wed Mar 18 18:51:15 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 19:02:16 2015 +0300 -- .../computegrid/failover/package-info.java | 17 + .../computegrid/montecarlo/package-info.java | 17 + .../ignite/examples/computegrid/package-info.java | 17 + .../examples/datagrid/hibernate/package-info.java | 17 + .../ignite/examples/datagrid/package-info.java | 17 + .../examples/datagrid/starschema/package-info.java | 17 + .../datagrid/store/dummy/package-info.java | 17 + .../datagrid/store/hibernate/package-info.java | 17 + .../examples/datagrid/store/jdbc/package-info.java | 17 + .../examples/datagrid/store/package-info.java | 17 + .../examples/datastructures/package-info.java | 17 + .../ignite/examples/events/package-info.java | 17 + .../apache/ignite/examples/igfs/package-info.java | 17 + .../ignite/examples/messaging/package-info.java| 17 + .../misc/client/memcache/package-info.java | 17 + .../ignite/examples/misc/client/package-info.java | 17 + .../examples/misc/deployment/package-info.java | 17 + .../examples/misc/lifecycle/package-info.java | 17 + .../apache/ignite/examples/misc/package-info.java | 17 + .../examples/misc/springbean/package-info.java | 17 + .../org/apache/ignite/examples/package-info.java | 17 + .../ignite/examples/streaming/package-info.java| 17 + 22 files changed, 374 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5183626d/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package-info.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package-info.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package-info.java index 86f4c75..506a2a2 100644 --- a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package-info.java +++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Compute failover example. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5183626d/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package-info.java -- diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package-info.java b/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package-info.java index ac86cda..2e4a018 100644 --- a/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package-info.java +++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of th
[31/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-432' into sprint-2
Merge remote-tracking branch 'remotes/origin/ignite-432' 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/0a7176f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0a7176f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0a7176f4 Branch: refs/heads/ignite-454 Commit: 0a7176f4f923c164f2ab345515cd0b1f5a98ada6 Parents: 4aabbbd 52e0ec6 Author: avinogradov Authored: Wed Mar 18 17:58:10 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 17:58:10 2015 +0300 -- .../apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java | 8 1 file changed, 4 insertions(+), 4 deletions(-) --
[26/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-432' into sprint-2
Merge remote-tracking branch 'remotes/origin/ignite-432' 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/1e2845c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1e2845c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1e2845c5 Branch: refs/heads/ignite-454 Commit: 1e2845c5d5bd5469bfe42e43f944ae67221a578f Parents: 013b4ba 291f3ba Author: avinogradov Authored: Wed Mar 18 17:08:54 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 17:08:54 2015 +0300 -- .../ComputeContinuousMapperExample.java | 2 +- .../ComputeFibonacciContinuationExample.java| 2 +- .../computegrid/failover/package-info.java | 5 + .../examples/computegrid/failover/package.html | 24 - .../computegrid/montecarlo/package-info.java| 5 + .../computegrid/montecarlo/package.html | 24 - .../examples/computegrid/package-info.java | 5 + .../ignite/examples/computegrid/package.html| 24 - .../datagrid/hibernate/package-info.java| 5 + .../examples/datagrid/hibernate/package.html| 24 - .../ignite/examples/datagrid/package-info.java | 5 + .../ignite/examples/datagrid/package.html | 24 - .../datagrid/starschema/package-info.java | 5 + .../examples/datagrid/starschema/package.html | 24 - .../datagrid/store/dummy/package-info.java | 5 + .../examples/datagrid/store/dummy/package.html | 24 - .../datagrid/store/hibernate/package-info.java | 5 + .../datagrid/store/hibernate/package.html | 24 - .../datagrid/store/jdbc/package-info.java | 5 + .../examples/datagrid/store/jdbc/package.html | 24 - .../examples/datagrid/store/package-info.java | 5 + .../ignite/examples/datagrid/store/package.html | 24 - .../examples/datastructures/package-info.java | 5 + .../ignite/examples/datastructures/package.html | 24 - .../ignite/examples/events/package-info.java| 5 + .../apache/ignite/examples/events/package.html | 24 - .../ignite/examples/igfs/package-info.java | 5 + .../apache/ignite/examples/igfs/package.html| 24 - .../ignite/examples/messaging/package-info.java | 5 + .../ignite/examples/messaging/package.html | 24 - .../misc/client/memcache/package-info.java | 5 + .../examples/misc/client/memcache/package.html | 24 - .../examples/misc/client/package-info.java | 5 + .../ignite/examples/misc/client/package.html| 24 - .../examples/misc/deployment/package-info.java | 5 + .../examples/misc/deployment/package.html | 24 - .../examples/misc/lifecycle/package-info.java | 5 + .../ignite/examples/misc/lifecycle/package.html | 24 - .../ignite/examples/misc/package-info.java | 5 + .../apache/ignite/examples/misc/package.html| 24 - .../examples/misc/springbean/package-info.java | 5 + .../examples/misc/springbean/package.html | 24 - .../apache/ignite/examples/package-info.java| 5 + .../org/apache/ignite/examples/package.html | 24 - .../ignite/examples/streaming/package-info.java | 5 + .../ignite/examples/streaming/package.html | 24 - .../gridify/aop/aspectj/package-info.java | 5 + .../compute/gridify/aop/aspectj/package.html| 24 - .../gridify/aop/spring/package-info.java| 5 + .../compute/gridify/aop/spring/package.html | 25 - .../ignite/gridify/hierarchy/package-info.java | 5 + .../ignite/gridify/hierarchy/package.html | 25 - .../org/apache/ignite/gridify/package-info.java | 5 + .../java/org/apache/ignite/gridify/package.html | 25 - .../direct/singlesplit/package-info.java| 5 + .../loadtests/direct/singlesplit/package.html | 24 - .../java/org/test/gridify/package-info.java | 5 + .../src/test/java/org/test/gridify/package.html | 24 - .../ignite/spi/checkpoint/s3/package-info.java | 5 + .../ignite/spi/checkpoint/s3/package.html | 24 - .../discovery/tcp/ipfinder/s3/package-info.java | 5 + .../spi/discovery/tcp/ipfinder/s3/package.html | 24 - .../ignite/spi/checkpoint/s3/package-info.java | 5 + .../ignite/spi/checkpoint/s3/package.html | 24 - .../discovery/tcp/ipfinder/s3/package-info.java | 5 + .../spi/discovery/tcp/ipfinder/s3/package.html | 24 - .../scala/collection/concurrent/TrieMap.java| 4 +- .../java/org/apache/ignite/IgniteCache.java | 14 +- .../java/org/apache/ignite/IgniteCompute.java | 4 - .../java/org/apache/ignite/IgniteQueue.java | 4 +- .../main/java/org/apache/ignite/IgniteSet.java | 2 +- .../cache/affinity/CacheAffinityKeyMapped.java | 44 -- .../cache/affinity/fair/package-info.java | 4 + .../ignite/cache/affinity/fair/package.html | 24 - .../ignite/cache/affinity/package-info.java | 4 + .../apache/ignite/cache/affinity/pac
[25/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-432' and 'ignite-sprint-2' of github.com:ggprivate/ggprivate into ignite-432
Merge branches 'ignite-432' and 'ignite-sprint-2' of
github.com:ggprivate/ggprivate into ignite-432
Conflicts:
modules/core/src/main/java/org/gridgain/grid/internal/interop/GridInteropCache.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/291f3bae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/291f3bae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/291f3bae
Branch: refs/heads/ignite-454
Commit: 291f3bae60f2dc3ad75a64bf5c78be2569804ca8
Parents: 7a274d3
Author: Yakov Zhdanov
Authored: Wed Mar 18 16:58:07 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Mar 18 16:58:07 2015 +0300
--
.../ignite/cache/query/ContinuousQuery.java | 4 +---
.../ignite/internal/util/lang/GridFunc.java | 23
2 files changed, 24 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/291f3bae/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
index 2f0642e..169c4be 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
@@ -37,8 +37,6 @@ import javax.cache.event.*;
* Note that in case query is distributed and a new node joins, it will get
the remote
* filter for the query during discovery process before it actually joins
topology,
* so no updates will be missed.
- *
- * To create a new instance of continuous query use {@link Query#continuous()}
factory method.
* Example
* As an example, suppose we have cache with {@code 'Person'} objects and we
need
* to query all persons with salary above 1000.
@@ -59,7 +57,7 @@ import javax.cache.event.*;
* You can create and execute continuous query like so:
*
* // Create new continuous query.
- * ContinuousQuery qry = Query.continuous();
+ * ContinuousQuery qry = new ContinuousQuery<>();
*
* // Initial iteration query will return all persons with salary above 1000.
* qry.setInitialQuery(Query.scan(new IgniteBiPredicate() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/291f3bae/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index a33bf2c..e25448f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -333,6 +333,17 @@ public class GridFunc {
};
/** */
+private static final IgniteClosure MAP_ENTRY_KEY = new IgniteClosure() {
+@Override public Object apply(Object o) {
+return ((Map.Entry)o).getKey();
+}
+
+@Override public String toString() {
+return "Map entry to key transformer closure.";
+}
+};
+
+/** */
private static final IgniteClosure CACHE_ENTRY_KEY = new IgniteClosure() {
@Override public Object apply(Object o) {
return ((Cache.Entry)o).getKey();
@@ -7656,6 +7667,18 @@ public class GridFunc {
}
/**
+ * Gets closure that returns key for an entry. The closure internally
+ * delegates to {@link Map.Entry#getKey()} method.
+ *
+ * @param Key type.
+ * @return Closure that returns key for an entry.
+ */
+@SuppressWarnings({"unchecked"})
+public static IgniteClosure, K> mapEntry2Key() {
+return (IgniteClosure, K>)MAP_ENTRY_KEY;
+}
+
+/**
* Gets closure that returns key for cache entry. The closure internally
* delegates to {@link javax.cache.Cache.Entry#getKey()} method.
*
[20/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-432
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-432
Conflicts:
modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.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/7a274d38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7a274d38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7a274d38
Branch: refs/heads/ignite-454
Commit: 7a274d38c2c3e49b8408ddbd544a0d5b7dcc
Parents: 4ce78a0
Author: avinogradov
Authored: Wed Mar 18 16:36:00 2015 +0300
Committer: avinogradov
Committed: Wed Mar 18 16:36:00 2015 +0300
--
.../core/src/main/java/org/apache/ignite/cache/query/Query.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a274d38/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
index 29c7bfb..227a755 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java
@@ -36,6 +36,9 @@ public abstract class Query implements
Serializable {
/** */
private static final long serialVersionUID = 0L;
+/** Default query page size. */
+public static final int DFLT_PAGE_SIZE = 1024;
+
/** Page size. */
private int pageSize;
[47/50] [abbrv] incubator-ignite git commit: ignite-454 jdk8 compatibility fixes
ignite-454 jdk8 compatibility 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/3fa658fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3fa658fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3fa658fb
Branch: refs/heads/ignite-454
Commit: 3fa658fbe228fba6889920c28acc4179c19b5808
Parents: d50065b
Author: avinogradov
Authored: Thu Mar 19 15:21:51 2015 +0300
Committer: avinogradov
Committed: Thu Mar 19 15:21:51 2015 +0300
--
.../ignite/examples8/computegrid/ComputeClosureExample.java | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3fa658fb/examples/src/main/java8/org/apache/ignite/examples8/computegrid/ComputeClosureExample.java
--
diff --git
a/examples/src/main/java8/org/apache/ignite/examples8/computegrid/ComputeClosureExample.java
b/examples/src/main/java8/org/apache/ignite/examples8/computegrid/ComputeClosureExample.java
index 54efcb9..a1b5650 100644
---
a/examples/src/main/java8/org/apache/ignite/examples8/computegrid/ComputeClosureExample.java
+++
b/examples/src/main/java8/org/apache/ignite/examples8/computegrid/ComputeClosureExample.java
@@ -47,17 +47,14 @@ public class ComputeClosureExample {
System.out.println(">>> Compute closure example started.");
// Execute closure on all cluster nodes.
-Collection res = ignite.compute().apply(
-new IgniteClosure() {
-@Override public Integer apply(String word) {
+Collection res = ignite.compute().apply((word) -> {
System.out.println();
System.out.println(">>> Printing '" + word + "' on
this node from ignite job.");
// Return number of letters in the word.
return word.length();
}
-},
-
+,
// Job parameters. Ignite will create as many jobs as there
are parameters.
Arrays.asList("Count characters using closure".split(" "))
);
[08/50] [abbrv] incubator-ignite git commit: #sprint-2: add licence to ExcludeList file.
#sprint-2: add licence to ExcludeList file. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7eb269d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7eb269d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7eb269d6 Branch: refs/heads/ignite-454 Commit: 7eb269d61c84fdcfbfb383974acef8d6ad920507 Parents: 3eca5e7 Author: ivasilinets Authored: Wed Mar 18 15:52:13 2015 +0300 Committer: ivasilinets Committed: Wed Mar 18 15:52:13 2015 +0300 -- modules/core/src/test/java/ExcludeList | 16 1 file changed, 16 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7eb269d6/modules/core/src/test/java/ExcludeList -- diff --git a/modules/core/src/test/java/ExcludeList b/modules/core/src/test/java/ExcludeList index 9af6366..2c3e722 100644 --- a/modules/core/src/test/java/ExcludeList +++ b/modules/core/src/test/java/ExcludeList @@ -1,3 +1,19 @@ +# +# 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. + # List of excluded TCK tests. # This is a dummy test that fails if not in the exclude list.
[02/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/07866c48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07866c48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07866c48 Branch: refs/heads/ignite-454 Commit: 07866c4810ecbdbd339208514e1ccf0ddec0bea5 Parents: b10ae79 3fe4a98 Author: S.Vladykin Authored: Tue Mar 17 21:34:42 2015 +0300 Committer: S.Vladykin Committed: Tue Mar 17 21:34:42 2015 +0300 -- .../apache/ignite/gridify/AbstractAopTest.java | 6 +- .../rest/AbstractRestProcessorSelfTest.java | 2 +- modules/core/pom.xml| 105 .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 38 +-- .../ignite/cache/CacheEntryProcessor.java | 28 ++ .../java/org/apache/ignite/cache/GridCache.java | 221 --- .../ignite/cache/IgniteEntryProcessor.java | 28 -- .../apache/ignite/cache/IgniteImmutable.java| 45 .../cache/affinity/CacheAffinityKeyMapped.java | 12 +- .../ignite/cache/query/SqlFieldsQuery.java | 7 + .../org/apache/ignite/cache/query/SqlQuery.java | 7 + .../apache/ignite/cache/query/TextQuery.java| 7 + .../cache/store/CacheLoadOnlyStoreAdapter.java | 6 +- .../configuration/CacheConfiguration.java | 3 +- .../ignite/internal/GridKernalContextImpl.java | 7 +- .../org/apache/ignite/internal/IgniteEx.java| 10 +- .../apache/ignite/internal/IgniteKernal.java| 4 +- .../ignite/internal/MarshallerContextImpl.java | 30 ++- .../internal/managers/GridManagerAdapter.java | 6 - .../processors/cache/CacheObjectImpl.java | 6 + .../internal/processors/cache/GridCache.java| 222 +++ .../processors/cache/GridCacheAdapter.java | 6 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheStoreManager.java | 30 ++- .../cache/GridCacheWriteBehindStore.java| 69 +++-- .../processors/cache/IgniteCacheProxy.java | 4 +- .../cache/query/GridCacheQueryManager.java | 1 - .../processors/cache/query/QueryCursorEx.java | 46 .../processors/cache/query/QueryCursorImpl.java | 14 +- .../continuous/CacheContinuousQueryHandler.java | 3 + .../continuous/CacheContinuousQueryManager.java | 11 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java| 2 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../cacheobject/IgniteCacheObjectProcessor.java | 2 +- .../IgniteCacheObjectProcessorImpl.java | 85 +++--- .../datastreamer/DataStreamerCacheUpdaters.java | 12 +- .../datastructures/DataStructuresProcessor.java | 1 - .../datastructures/GridCacheSetImpl.java| 1 - .../processors/task/GridTaskProcessor.java | 2 +- .../apache/ignite/internal/util/GridTimer.java | 2 +- .../internal/util/IgniteExceptionRegistry.java | 164 +-- .../internal/util/io/GridFilenameUtils.java | 1 - .../apache/ignite/internal/visor/VisorJob.java | 3 + .../internal/visor/VisorMultiNodeTask.java | 1 + .../visor/cache/VisorCacheMetadataTask.java | 1 + .../internal/visor/cache/VisorCacheMetrics.java | 1 + .../cache/VisorCacheMetricsCollectorTask.java | 1 + .../visor/cache/VisorCachePreloadTask.java | 1 + .../visor/cache/VisorCacheResetMetricsTask.java | 1 + .../visor/cache/VisorCacheSwapBackupsTask.java | 1 + .../compute/VisorComputeMonitoringHolder.java | 10 +- .../visor/node/VisorNodeDataCollectorJob.java | 7 +- .../node/VisorNodeDataCollectorJobResult.java | 17 ++ .../visor/node/VisorNodeDataCollectorTask.java | 2 + .../node/VisorNodeDataCollectorTaskResult.java | 10 + .../node/VisorNodeSuppressedErrorsTask.java | 99 +++ .../internal/visor/query/VisorQueryTask.java| 4 +- .../org/apache/ignite/lang/IgniteImmutable.java | 49 .../org/apache/ignite/lang/IgnitePredicate.java | 4 +- .../optimized/OptimizedMarshallerUtils.java | 16 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 8 - .../TcpDiscoveryMulticastIpFinder.java | 4 +- .../ignite/startup/BasicWarmupClosure.java | 1 + .../StreamerCacheAffinityEventRouter.java | 2 +- .../TransactionSynchronization.java | 2 +- .../resources/META-INF/classnames.properties| 44 +-- modules/core/src/test/java/ExcludeList | 4 + .../GridCacheAffinityBackupsSelfTest.java | 2 + .../ignite/igfs/IgfsFragmentizerSelfTest.java | 1 + .../cache/GridCacheAbstractFullApiSelfTest.java | 8 +- .../cache/GridCacheClearLocalySelfTest.java | 19 +- ...CacheFullTextQuer
[28/50] [abbrv] incubator-ignite git commit: rat settings updated
rat settings updated Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45e2b8f0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45e2b8f0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45e2b8f0 Branch: refs/heads/ignite-454 Commit: 45e2b8f01ec05efb885e85129ffb9a190355038a Parents: 1e2845c Author: avinogradov Authored: Wed Mar 18 17:28:54 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 17:28:54 2015 +0300 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45e2b8f0/pom.xml -- diff --git a/pom.xml b/pom.xml index d2e42eb..8bf07a1 100644 --- a/pom.xml +++ b/pom.xml @@ -580,6 +580,7 @@ **/keystore/*.pem **/keystore/*.pfx +**/package-info.java DEVNOTES.txt src/main/java/com/romix/scala/** src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java
[44/50] [abbrv] incubator-ignite git commit: ignite-454 jdk8 compatibility fixes
ignite-454 jdk8 compatibility 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/796ff52e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/796ff52e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/796ff52e
Branch: refs/heads/ignite-454
Commit: 796ff52e9f6de8a8cb1ae300e38fb3dad650f984
Parents: 591b365
Author: avinogradov
Authored: Wed Mar 18 19:44:43 2015 +0300
Committer: avinogradov
Committed: Wed Mar 18 19:44:43 2015 +0300
--
...cheAbstractFullApiMultithreadedSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-
modules/schema-import/pom.xml | 44 ++--
3 files changed, 34 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/796ff52e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
index 3a105cc..15be61e 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java
@@ -188,7 +188,7 @@ public abstract class
GridCacheAbstractFullApiMultithreadedSelfTest extends Grid
cacheAsync.get("key" + rnd);
-assert cacheAsync.future().get() == rnd;
+assert (Integer)cacheAsync.future().get() == rnd;
cache.get("wrongKey");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/796ff52e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 181d3e2..57d3560 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -2031,7 +2031,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
cacheAsync.getAndReplace("key", 2);
-assert cacheAsync.future().get() == 1;
+assert (Integer)cacheAsync.future().get() == 1;
assert cache.get("key") == 2;
@@ -2264,7 +2264,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
cacheAsync.getAndRemove("key2");
-assert cacheAsync.future().get() == 2;
+assert (Integer)cacheAsync.future().get() == 2;
assert cache.get("key2") == null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/796ff52e/modules/schema-import/pom.xml
--
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 802fc4c..fff562d 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -82,20 +82,38 @@
jfxrt.jar
-
-java.vendor
-Oracle Corporation
-
+false
+
+[1.7,1.8)
+
-
-
-
-
-
-
-
-
-
+
+
+javafx
+jfxrt
+${java.version}
+system
+${java.home}/lib/jfxrt.jar
+
+
+
+
+jfxrt8.jar
+
+false
+
+[1.8,)
+
+
+
+
+javafx
+jfxrt
+${java.version}
+system
+${java.home}/lib/ext/jfxrt.jar
+
+
[34/50] [abbrv] incubator-ignite git commit: rat settings updated
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/core/src/main/java/org/apache/ignite/spi/collision/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/package-info.java index a40e7a4..0587369 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/package-info.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains APIs for collision SPI. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/package-info.java index 8c4a3c5..f8f74b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/package-info.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains priority based collision SPI implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/core/src/main/java/org/apache/ignite/spi/communication/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/package-info.java index 152ce3d..b31b798 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/package-info.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains APIs for grid communication SPI. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package-info.java index a821cbe..76fb782 100644 --- a/modules
[24/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/013b4bac Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/013b4bac Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/013b4bac Branch: refs/heads/ignite-454 Commit: 013b4bac275a6c5c98ac5da28b0c54e96591e336 Parents: a6f75cd 3236419 Author: ivasilinets Authored: Wed Mar 18 16:50:01 2015 +0300 Committer: ivasilinets Committed: Wed Mar 18 16:50:01 2015 +0300 -- ...GridCacheLoadingConcurrentGridStartTest.java | 154 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + 2 files changed, 155 insertions(+) --
[07/50] [abbrv] incubator-ignite git commit: # sprint-2: Fixed NPE and changes for Visor after SQL rework.
# sprint-2: Fixed NPE and changes for Visor after SQL rework.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3eca5e70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3eca5e70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3eca5e70
Branch: refs/heads/ignite-454
Commit: 3eca5e705599033d1e395ed0e5f438dfcdcf681a
Parents: 7deceb2
Author: AKuznetsov
Authored: Wed Mar 18 09:44:48 2015 +0700
Committer: AKuznetsov
Committed: Wed Mar 18 09:44:48 2015 +0700
--
.../visor/cache/VisorCacheConfiguration.java| 21
.../cache/VisorCacheQueryConfiguration.java | 5 +
.../commands/cache/VisorCacheCommand.scala | 14 +++--
3 files changed, 9 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3eca5e70/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 30e9f46..7206853 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -21,7 +21,6 @@ import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.internal.visor.node.*;
import org.jetbrains.annotations.*;
import java.io.*;
@@ -60,9 +59,6 @@ public class VisorCacheConfiguration implements Serializable {
/** Swap enabled flag. */
private boolean swapEnabled;
-/** Flag indicating whether Ignite should attempt to index value and/or
key instances stored in cache. */
-private boolean qryIdxEnabled;
-
/** Invalidate. */
private boolean invalidate;
@@ -75,9 +71,6 @@ public class VisorCacheConfiguration implements Serializable {
/** Off-heap max memory. */
private long offHeapMaxMemory;
-/** Max query iterator count */
-private int maxQryIterCnt;
-
/** Max concurrent async operations */
private int maxConcurrentAsyncOps;
@@ -241,13 +234,6 @@ public class VisorCacheConfiguration implements
Serializable {
}
/**
- * @return Flag indicating whether Ignite should attempt to index value
and/or key instances stored in cache.
- */
-public boolean queryIndexEnabled() {
-return qryIdxEnabled;
-}
-
-/**
* @return Invalidate.
*/
public boolean invalidate() {
@@ -276,13 +262,6 @@ public class VisorCacheConfiguration implements
Serializable {
}
/**
- * @return Max query iterator count
- */
-public int maxQueryIteratorCount() {
-return maxQryIterCnt;
-}
-
-/**
* @return Max concurrent async operations
*/
public int maxConcurrentAsyncOperations() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3eca5e70/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
index 5b39182..53f0ae5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
@@ -39,9 +39,6 @@ public class VisorCacheQueryConfiguration implements
Serializable {
private static final long serialVersionUID = 0L;
/** */
-private static final String[] EMPTY_STR_ARR = new String[0];
-
-/** */
private String[] sqlFuncClss;
/** */
@@ -61,7 +58,7 @@ public class VisorCacheQueryConfiguration implements
Serializable {
*/
private static String[] compactClasses(Class[] clss) {
if (clss == null)
-return EMPTY_STR_ARR;
+return null;
int len = clss.length;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3eca5e70/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
[49/50] [abbrv] incubator-ignite git commit: ignite-454 jdk8 compatibility fixes
ignite-454 jdk8 compatibility 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/1c72f34b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1c72f34b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1c72f34b
Branch: refs/heads/ignite-454
Commit: 1c72f34bcc42bf989dc4fc23f3d6a45785ae92e4
Parents: bbcf98c
Author: avinogradov
Authored: Thu Mar 19 17:55:42 2015 +0300
Committer: avinogradov
Committed: Thu Mar 19 17:55:42 2015 +0300
--
.../datagrid/CacheContinuousQueryExample.java | 3 ++-
.../cache/IgniteCacheEntryEventFilter.java | 27
.../ignite/cache/query/ContinuousQuery.java | 7 ++---
.../ignite/events/CacheQueryExecutedEvent.java | 7 ++---
.../ignite/events/CacheQueryReadEvent.java | 10 +++-
.../CacheDataStructuresManager.java | 2 +-
.../CacheContinuousQueryFilterEx.java | 4 +--
.../continuous/CacheContinuousQueryHandler.java | 10 +++-
.../continuous/CacheContinuousQueryManager.java | 18 ++---
.../IgniteCacheEntryListenerAbstractTest.java | 13 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +--
.../GridContinuousOperationsLoadTest.java | 3 ++-
12 files changed, 68 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
index d1db86b..dd13769 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
@@ -18,6 +18,7 @@
package org.apache.ignite.examples.datagrid;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.lang.*;
@@ -78,7 +79,7 @@ public class CacheContinuousQueryExample {
// This filter will be evaluated remotely on all nodes.
// Entry that pass this filter will be sent to the caller.
-qry.setRemoteFilter(new CacheEntryEventFilter() {
+qry.setRemoteFilter(new IgniteCacheEntryEventFilter() {
@Override public boolean evaluate(CacheEntryEvent e) {
return e.getKey() > 10;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java
b/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java
new file mode 100644
index 000..67a8f3c
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.cache;
+
+import javax.cache.event.*;
+import java.io.*;
+
+/**
+ * This filter adds {@link Serializable} interface to {@link
javax.cache.event.CacheEntryEventFilter} object.
+ */
+public interface IgniteCacheEntryEventFilter extends
CacheEntryEventFilter, Serializable {
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
index 169c4be..aebe5a4 100644
---
a/modules/core/src/m
[23/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/3236419c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3236419c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3236419c Branch: refs/heads/ignite-454 Commit: 3236419c00ed4d9cf8d34cbc1e4cf384fddc743b Parents: ae11c58 6657fc3 Author: Andrey Gura Authored: Wed Mar 18 16:47:11 2015 +0300 Committer: Andrey Gura Committed: Wed Mar 18 16:47:11 2015 +0300 -- modules/core/src/test/java/ExcludeList | 16 .../cache/GridCacheQuerySimpleBenchmark.java| 16 2 files changed, 32 insertions(+) --
[41/50] [abbrv] incubator-ignite git commit: ignite-432 javadoc fix
ignite-432 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/f16407dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f16407dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f16407dc
Branch: refs/heads/ignite-454
Commit: f16407dcb258918847621f90cc063d863af97f28
Parents: b92a429
Author: avinogradov
Authored: Wed Mar 18 19:17:53 2015 +0300
Committer: avinogradov
Committed: Wed Mar 18 19:17:53 2015 +0300
--
.../main/java/org/apache/ignite/internal/util/lang/GridFunc.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f16407dc/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index e25448f..4cbb40c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -7668,7 +7668,7 @@ public class GridFunc {
/**
* Gets closure that returns key for an entry. The closure internally
- * delegates to {@link Map.Entry#getKey()} method.
+ * delegates to {@link java.util.Map.Entry#getKey()} method.
*
* @param Key type.
* @return Closure that returns key for an entry.
[45/50] [abbrv] incubator-ignite git commit: ignite-454 jdk8 compatibility fixes
ignite-454 jdk8 compatibility 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/c300f6e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c300f6e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c300f6e4 Branch: refs/heads/ignite-454 Commit: c300f6e4acd0318f3326eb62a75994b33cd6abf8 Parents: 796ff52 Author: avinogradov Authored: Wed Mar 18 20:50:17 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 20:50:17 2015 +0300 -- modules/core/pom.xml | 1 - pom.xml | 4 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c300f6e4/modules/core/pom.xml -- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index bd374fd..8bfe5b2 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -162,7 +162,6 @@ org.apache.maven.plugins maven-jar-plugin -2.2 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c300f6e4/pom.xml -- diff --git a/pom.xml b/pom.xml index 6dc573e..213e3c1 100644 --- a/pom.xml +++ b/pom.xml @@ -752,6 +752,8 @@ false false 1.7 + + -Xdoclint:none http://docs.oracle.com/javase/7/docs/api/ http://hadoop.apache.org/docs/current/api/ @@ -946,6 +948,8 @@ false false 1.7 + + -Xdoclint:none http://docs.oracle.com/javase/7/docs/api/ http://hadoop.apache.org/docs/current/api/
[37/50] [abbrv] incubator-ignite git commit: rat settings updated
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69865a9/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/package-info.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/package-info.java b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/package-info.java index 8fd49eb..954b919 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/package-info.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains internal tests or test related classes and interfaces. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69865a9/modules/core/src/test/java/org/apache/ignite/spi/failover/always/package-info.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/always/package-info.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/always/package-info.java index 87103f5..b3dcb25 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/failover/always/package-info.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/always/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains internal tests or test related classes and interfaces. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69865a9/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package-info.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package-info.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package-info.java index 583f268..e68cca7 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package-info.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains internal tests or test related classes and interfaces. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f69865a9/modules/core/src/test/java/org/apache/ignite/spi/failover/never/package-info.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/never/package-info.java b/modules/core/src/test/java
[03/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-sql-tests' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Merge branches 'ignite-sql-tests' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/85d444ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/85d444ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/85d444ab Branch: refs/heads/ignite-454 Commit: 85d444abf12d4c47661e008f54ca654037778a0c Parents: e35da91 07866c4 Author: S.Vladykin Authored: Tue Mar 17 22:28:58 2015 +0300 Committer: S.Vladykin Committed: Tue Mar 17 22:28:58 2015 +0300 -- .../cache/GridCacheQuerySimpleBenchmark.java| 200 +++ 1 file changed, 200 insertions(+) --
[29/50] [abbrv] incubator-ignite git commit: sp-2 minor
sp-2 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/a7d9a106
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7d9a106
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7d9a106
Branch: refs/heads/ignite-454
Commit: a7d9a1067f475646e6be2d064193f057190403ee
Parents: 6657fc3
Author: Yakov Zhdanov
Authored: Wed Mar 18 17:53:00 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Mar 18 17:53:00 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7d9a106/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 a110af2..4b2cbc3 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
@@ -1232,8 +1232,8 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx {
taskName);
}
-if (cctx.isLocal() || cctx.isReplicated() || (tx != null &&
tx.local() && !isNear()))
-cctx.continuousQueries().onEntryUpdated(this, key, null,
old, false);
+if (cctx.isLocal() || cctx.isReplicated() || (tx != null &&
tx.local() && !isNear()))
+cctx.continuousQueries().onEntryUpdated(this, key, null, old,
false);
cctx.dataStructures().onEntryUpdated(key, true);
}
[48/50] [abbrv] incubator-ignite git commit: ignite-454 jdk8 compatibility fixes
ignite-454 jdk8 compatibility 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/bbcf98cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bbcf98cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bbcf98cd
Branch: refs/heads/ignite-454
Commit: bbcf98cd29f3184769ad9011859302c1ca2f8585
Parents: 3fa658f
Author: avinogradov
Authored: Thu Mar 19 15:55:10 2015 +0300
Committer: avinogradov
Committed: Thu Mar 19 15:55:10 2015 +0300
--
.../ignite/internal/processors/job/GridJobProcessor.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbcf98cd/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index 49f8998..02e5bfd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -101,19 +101,19 @@ public class GridJobProcessor extends
GridProcessorAdapter {
private final GridLocalEventListener discoLsnr;
/** Needed for statistics. */
-private final LongAdder canceledJobsCnt = new LongAdder();
+private final LongAdder8 canceledJobsCnt = new LongAdder8();
/** Needed for statistics. */
-private final LongAdder finishedJobsCnt = new LongAdder();
+private final LongAdder8 finishedJobsCnt = new LongAdder8();
/** Needed for statistics. */
-private final LongAdder startedJobsCnt = new LongAdder();
+private final LongAdder8 startedJobsCnt = new LongAdder8();
/** Needed for statistics. */
-private final LongAdder rejectedJobsCnt = new LongAdder();
+private final LongAdder8 rejectedJobsCnt = new LongAdder8();
/** Total job execution time (unaccounted for in metrics). */
-private final LongAdder finishedJobsTime = new LongAdder();
+private final LongAdder8 finishedJobsTime = new LongAdder8();
/** Maximum job execution time for finished jobs. */
private final GridAtomicLong maxFinishedJobsTime = new GridAtomicLong();
[06/50] [abbrv] incubator-ignite git commit: # sprint-2: Cleanup unused imports.
# sprint-2: Cleanup unused imports.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7deceb2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7deceb2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7deceb2a
Branch: refs/heads/ignite-454
Commit: 7deceb2ab433b443a65837c7b0fcbdd762b3acec
Parents: 7972da9
Author: AKuznetsov
Authored: Wed Mar 18 08:54:14 2015 +0700
Committer: AKuznetsov
Committed: Wed Mar 18 08:54:14 2015 +0700
--
.../ignite/internal/visor/cache/VisorCacheMetadataTask.java | 1 -
.../internal/visor/cache/VisorCacheMetricsCollectorTask.java | 1 -
.../ignite/internal/visor/cache/VisorCachePreloadTask.java | 1 -
.../internal/visor/cache/VisorCacheQueryConfiguration.java | 8 +++-
.../internal/visor/cache/VisorCacheResetMetricsTask.java | 1 -
.../internal/visor/cache/VisorCacheSwapBackupsTask.java | 1 -
6 files changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7deceb2a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
index 708a9d3..de67b83 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.visor.cache;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.processors.task.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7deceb2a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
index 060d1e5..de232f7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.visor.cache;
-import org.apache.ignite.cache.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.task.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7deceb2a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
index 85e3342..2632bb5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadTask.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.visor.cache;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.task.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7deceb2a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
index d7fbce3..5b39182 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java
@@ -39,6 +39,9 @@ public class VisorCacheQueryConfiguration implements
Serializable {
private static final long serialVersionUID = 0L;
/** */
+private static final String[] EMPTY_STR_ARR = new String[0];
+
+/**
[50/50] [abbrv] incubator-ignite git commit: ignite-454 closures becomes lambdas
ignite-454 closures becomes lambdas
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/073db0ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/073db0ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/073db0ce
Branch: refs/heads/ignite-454
Commit: 073db0ceb03ef03e51fd160920fbd2420c67e5a9
Parents: 1c72f34
Author: avinogradov
Authored: Thu Mar 19 18:31:35 2015 +0300
Committer: avinogradov
Committed: Thu Mar 19 18:31:35 2015 +0300
--
.../examples8/computegrid/ComputeBroadcastExample.java | 2 +-
.../apache/ignite/examples8/datagrid/CacheApiExample.java| 8 +++-
2 files changed, 4 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/073db0ce/examples/src/main/java8/org/apache/ignite/examples8/computegrid/ComputeBroadcastExample.java
--
diff --git
a/examples/src/main/java8/org/apache/ignite/examples8/computegrid/ComputeBroadcastExample.java
b/examples/src/main/java8/org/apache/ignite/examples8/computegrid/ComputeBroadcastExample.java
index abac58a..d2c88fa 100644
---
a/examples/src/main/java8/org/apache/ignite/examples8/computegrid/ComputeBroadcastExample.java
+++
b/examples/src/main/java8/org/apache/ignite/examples8/computegrid/ComputeBroadcastExample.java
@@ -79,7 +79,7 @@ public class ComputeBroadcastExample {
*/
private static void gatherSystemInfo(Ignite ignite) throws IgniteException
{
// Gather system info from all nodes.
-Collection res = ignite.compute().broadcast(
+Collection res = ignite.compute().broadcast(//Todo:fix
IGNITE-10 before converting to lambda
new IgniteCallable() {
// Automatically inject ignite instance.
@IgniteInstanceResource
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/073db0ce/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CacheApiExample.java
--
diff --git
a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CacheApiExample.java
b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CacheApiExample.java
index 9f4fb2a..7511f52 100644
---
a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CacheApiExample.java
+++
b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CacheApiExample.java
@@ -85,17 +85,15 @@ public class CacheApiExample {
IgniteFuture fut = asyncCache.future();
//Asynchronously wait for result.
-fut.listen(new IgniteInClosure>() {
-@Override
-public void apply(IgniteFuture fut) {
+fut.listen((future) -> {
try {
-System.out.println("Put operation completed
[previous-value=" + fut.get() + ']');
+System.out.println("Put operation completed
[previous-value=" + future.get() + ']');
}
catch (IgniteException e) {
e.printStackTrace();
}
}
-});
+);
// Put-if-absent.
boolean b1 = cache.putIfAbsent(4, "4");
[27/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-432' and 'ignite-sprint-2' of github.com:ggprivate/ggprivate into ignite-432
Merge branches 'ignite-432' and 'ignite-sprint-2' of
github.com:ggprivate/ggprivate into ignite-432
Conflicts:
modules/core/src/main/java/org/gridgain/grid/internal/interop/GridInteropCache.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/52e0ec67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52e0ec67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52e0ec67
Branch: refs/heads/ignite-454
Commit: 52e0ec678b9407c99870ca89a637f2eb8f2199bf
Parents: 291f3ba
Author: Yakov Zhdanov
Authored: Wed Mar 18 17:24:41 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Mar 18 17:24:41 2015 +0300
--
.../apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e0ec67/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
index 1987e47..4acb81c 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
@@ -31,7 +31,7 @@ import java.util.concurrent.*;
import static java.util.concurrent.TimeUnit.*;
/**
- * This adepter designed to support stores with bulk loading from stream-like
source.
+ * This adapter designed to support stores with bulk loading from stream-like
source.
*
* This class processes input data in the following way:
*
@@ -100,7 +100,7 @@ public abstract class CacheLoadOnlyStoreAdapter
implements CacheStore
implements CacheStore parse(I rec, @Nullable
Object... args);
@@ -275,7 +275,7 @@ public abstract class CacheLoadOnlyStoreAdapter
implements CacheStore c, Collection buf, Object[] args) {
this.c = c;
[18/50] [abbrv] incubator-ignite git commit: #sprint-2-tests: remove tests for query index enable from IgfsProcessorValidationSelfTest.
#sprint-2-tests: remove tests for query index enable from
IgfsProcessorValidationSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1401330b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1401330b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1401330b
Branch: refs/heads/ignite-454
Commit: 1401330bd972be5ce4a39304f96ef8d2b0a3f850
Parents: 6657fc3
Author: ivasilinets
Authored: Wed Mar 18 16:32:36 2015 +0300
Committer: ivasilinets
Committed: Wed Mar 18 16:32:36 2015 +0300
--
.../igfs/IgfsProcessorValidationSelfTest.java | 23
1 file changed, 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1401330b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
index 7e13835..82633d6 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
@@ -181,29 +181,6 @@ public class IgfsProcessorValidationSelfTest extends
IgfsCommonAbstractTest {
/**
* @throws Exception If failed.
*/
-public void testLocalIfQueryIndexingEnabledForDataCache() throws Exception
{
-CacheConfiguration[] dataCaches = dataCaches(1024);
-
-
-g1Cfg.setCacheConfiguration(concat(dataCaches, metaCaches(),
CacheConfiguration.class));
-
-checkGridStartFails(g1Cfg, "IGFS data cache cannot start with enabled
query indexing", true);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testLocalIfQueryIndexingEnabledForMetaCache() throws Exception
{
-CacheConfiguration[] metaCaches = metaCaches();
-
-g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches,
CacheConfiguration.class));
-
-checkGridStartFails(g1Cfg, "IGFS metadata cache cannot start with
enabled query indexing", true);
-}
-
-/**
- * @throws Exception If failed.
- */
@SuppressWarnings("NullableProblems")
public void testLocalNullIgfsNameIsSupported() throws Exception {
g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(),
CacheConfiguration.class));
[43/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-454
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-454
Conflicts:
examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.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/591b3656
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/591b3656
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/591b3656
Branch: refs/heads/ignite-454
Commit: 591b365638309a57e52a06a67328c7d4f6c5b3b8
Parents: 503faef
Author: avinogradov
Authored: Wed Mar 18 19:29:05 2015 +0300
Committer: avinogradov
Committed: Wed Mar 18 19:29:05 2015 +0300
--
.../internal/processors/query/h2/sql/GridSqlQueryParser.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/591b3656/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index 2e2f9c3..a72ddf4 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -495,8 +495,8 @@ public class GridSqlQueryParser {
return res;
}
-if (expression instanceof Parameter)
-return new GridSqlParameter(((Parameter)expression).getIndex());
+if (expression instanceof org.h2.expression.Parameter)
+return new
GridSqlParameter(((org.h2.expression.Parameter)expression).getIndex());
if (expression instanceof Aggregate) {
GridSqlAggregateFunction res = new
GridSqlAggregateFunction(DISTINCT.get((Aggregate)expression),
[40/50] [abbrv] incubator-ignite git commit: ignite-432 package.html becomes package-info.java
ignite-432 package.html becomes package-info.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/b92a4299 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b92a4299 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b92a4299 Branch: refs/heads/ignite-454 Commit: b92a4299ebc8868d2cf340bbeffcd83fbb9039da Parents: 5183626 Author: avinogradov Authored: Wed Mar 18 19:16:20 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 19:16:20 2015 +0300 -- .../ignite/spi/indexing/noop/package-info.java | 22 ++ .../ignite/spi/indexing/noop/package.html | 24 2 files changed, 22 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b92a4299/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package-info.java new file mode 100644 index 000..75d40e9 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package-info.java @@ -0,0 +1,22 @@ +/* + * 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. + */ + +/** + * + * Contains default no-op indexing SPI implementation. + */ +package org.apache.ignite.spi.indexing.noop; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b92a4299/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package.html b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package.html deleted file mode 100644 index 8faf421..000 --- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains default no-op indexing SPI implementation. - -
[09/50] [abbrv] incubator-ignite git commit: ignite-432 package.html becomes package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/package.html -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/package.html b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/package.html deleted file mode 100644 index 7e7ebfd..000 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains default H2-based indexing SPI implementation. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/package-info.java -- diff --git a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/package-info.java b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/package-info.java new file mode 100644 index 000..246552e --- /dev/null +++ b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains Jakarta commons logging implementation for logging. + */ +package org.apache.ignite.logger.jcl; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/package.html -- diff --git a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/package.html b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/package.html deleted file mode 100644 index 261d13d..000 --- a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains Jakarta commons logging implementation for logging. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/package-info.java -- diff --git a/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/package-info.java b/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/package-info.java new file mode 100644 index 000..0dd3328 --- /dev/null +++ b/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains internal tests or test related classes and interfaces. + */ +package org.apache.ignite.logger.jcl; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/package.html -- diff --git a/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/package.html b/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/package.html deleted file mode 100644 index 6556981..000 --- a/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains internal tests or test related classes and interfaces. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/package-info.java -- diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/package-info.java b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/package-info.java new file mode 100644 index 000..10289a5 --- /dev/null +++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains JNDI-based transaction manager lookup. + */ +package org.apache.ignite.cache.jta.jndi; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/package.html -- diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/package.html b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/package.html deleted file mode 100644 index ce83ef8..000 --- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains JNDI-based transaction manager lookup. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/jta/src/main/java/org/apache/ignite/cache/jta/package-info.java -- diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/package-info.ja
[05/50] [abbrv] incubator-ignite git commit: #IGNITE-SQL - Minor
#IGNITE-SQL - 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/7972da93 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7972da93 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7972da93 Branch: refs/heads/ignite-454 Commit: 7972da93f7ca851642fe1fb52723b661e3c3933b Parents: 2ee7327 Author: Alexey Goncharuk Authored: Tue Mar 17 16:55:19 2015 -0700 Committer: Alexey Goncharuk Committed: Tue Mar 17 16:55:19 2015 -0700 -- .../java/org/apache/ignite/configuration/CacheConfiguration.java | 1 + .../java/org/apache/ignite/events/CacheQueryExecutedEvent.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7972da93/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 5a51497..dfa58d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -25,6 +25,7 @@ import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; import javax.cache.configuration.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7972da93/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java index 544305f..397ae8c 100644 --- a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java @@ -20,10 +20,8 @@ package org.apache.ignite.events; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.lang.*; -import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; import javax.cache.event.*;
[19/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-432
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-432 Conflicts: modules/core/src/main/java/org/apache/ignite/cache/query/Query.java modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlElement.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/4ce78a06 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4ce78a06 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4ce78a06 Branch: refs/heads/ignite-454 Commit: 4ce78a061ffcb74d75fd84e863f7f68c37a02ce2 Parents: 2ae6d27 7eb269d Author: avinogradov Authored: Wed Mar 18 16:34:40 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 16:34:40 2015 +0300 -- examples/config/example-cache.xml | 42 +- examples/config/filesystem/example-igfs.xml | 11 +- .../failover/ComputeFailoverExample.java|1 + .../datagrid/CachePopularNumbersExample.java|6 +- .../examples/datagrid/CacheQueryExample.java| 73 +- .../starschema/CacheStarSchemaExample.java | 17 +- .../datagrid/starschema/DimProduct.java |3 +- .../examples/datagrid/starschema/DimStore.java |3 +- .../datagrid/starschema/FactPurchase.java |2 + .../store/CacheNodeWithStoreStartup.java|3 - .../store/dummy/CacheDummyPersonStore.java |1 + .../MemcacheRestExampleNodeStartup.java |7 - .../apache/ignite/examples/ComputeExample.java |2 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java |8 +- .../ignite/jdbc/JdbcEmptyCacheSelfTest.java |5 +- .../ignite/jdbc/JdbcLocalCachesSelfTest.java| 16 +- .../ignite/jdbc/JdbcMetadataSelfTest.java |6 +- .../jdbc/JdbcPreparedStatementSelfTest.java |5 +- .../ignite/jdbc/JdbcResultSetSelfTest.java |7 +- .../ignite/jdbc/JdbcStatementSelfTest.java |7 +- .../clients/src/test/resources/spring-cache.xml | 15 - .../src/test/resources/spring-server-node.xml |7 - .../test/resources/spring-server-ssl-node.xml |4 - modules/codegen/pom.xml |6 + .../ignite/codegen/MessageCodeGenerator.java|8 + modules/core/pom.xml| 105 + .../java/org/apache/ignite/IgniteCache.java | 17 +- .../org/apache/ignite/cache/query/Query.java| 74 +- .../apache/ignite/cache/query/QueryMetrics.java |4 +- .../ignite/cache/query/QueryTypeResolver.java | 32 - .../org/apache/ignite/cache/query/SqlQuery.java | 16 +- .../query/annotations/QuerySqlFunction.java |4 +- .../configuration/CacheConfiguration.java | 284 +-- .../configuration/CacheQueryConfiguration.java | 182 -- .../configuration/IgniteConfiguration.java | 20 +- .../configuration/QueryConfiguration.java | 227 -- .../ignite/events/CacheQueryExecutedEvent.java |2 +- .../ignite/events/CacheQueryReadEvent.java |2 + .../org/apache/ignite/internal/IgnitionEx.java |3 - .../managers/communication/GridIoManager.java |8 +- .../communication/GridIoMessageFactory.java | 26 + .../processors/cache/CacheProjection.java |5 +- .../cache/CacheWeakQueryIteratorsHolder.java|2 +- .../processors/cache/GridCacheAttributes.java | 27 - .../cache/GridCacheClearAllRunnable.java|5 +- .../processors/cache/GridCacheContext.java |2 + .../processors/cache/GridCacheProcessor.java| 22 +- .../processors/cache/GridCacheSwapListener.java |5 +- .../processors/cache/GridCacheSwapManager.java | 29 +- .../processors/cache/GridCacheUtils.java|1 - .../processors/cache/IgniteCacheProxy.java | 145 +- .../processors/cache/QueryCursorImpl.java | 116 + .../processors/cache/query/CacheQuery.java |2 +- .../query/GridCacheDistributedQueryManager.java |2 + .../cache/query/GridCacheQueriesEx.java |9 +- .../cache/query/GridCacheQueriesImpl.java | 11 +- .../cache/query/GridCacheQueriesProxy.java |4 +- .../cache/query/GridCacheQueryAdapter.java |3 +- .../cache/query/GridCacheQueryManager.java | 16 +- .../cache/query/GridCacheSqlQuery.java |2 +- .../cache/query/GridCacheSqlResult.java | 29 - .../cache/query/GridCacheTwoStepQuery.java |2 +- .../processors/cache/query/QueryCursorImpl.java | 97 - .../continuous/CacheContinuousQueryHandler.java |3 + .../query/jdbc/GridCacheQueryJdbcTask.java | 241 +- .../IgniteCacheObjectProcessorImpl.java | 86 +- .../internal/processors/igfs/IgfsProcessor.java |6 - .../processors/query/GridQueryIndexing.java | 34 +- .../processors/query/
[33/50] [abbrv] incubator-ignite git commit: rat settings updated
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/package-info.java -- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/package-info.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/package-info.java index 418f17d..ec5b0b9 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/package-info.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains URI-based deployment SPI implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/package-info.java -- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/package-info.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/package-info.java index afc6e4d..c6e61b4 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/package-info.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/file/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains directory scanner for URI deployer SPI. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/package-info.java -- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/package-info.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/package-info.java index 08b2b87..ca29005 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/package-info.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/package-info.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * * Contains FTP scanner for URI deployer SPI. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54672e89/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/http/package-info.java -- diff --
[22/50] [abbrv] incubator-ignite git commit: #sprint-2-tests: Revert check for query index enable in IgfsProcessor.
#sprint-2-tests: Revert check for query index enable in IgfsProcessor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a6f75cdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a6f75cdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a6f75cdc
Branch: refs/heads/ignite-454
Commit: a6f75cdc09d0cc19f56a77bb9dd7002af36b6788
Parents: 1401330
Author: ivasilinets
Authored: Wed Mar 18 16:41:55 2015 +0300
Committer: ivasilinets
Committed: Wed Mar 18 16:41:55 2015 +0300
--
.../internal/processors/igfs/IgfsProcessor.java | 7 ++
.../igfs/IgfsProcessorValidationSelfTest.java | 26
2 files changed, 33 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f75cdc/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
index db550c3..f1e5918 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
@@ -267,11 +267,18 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
if (dataCache == null)
throw new IgniteCheckedException("Data cache is not configured
locally for IGFS: " + cfg);
+if (dataCache.configuration().getIndexedTypes() != null)
+throw new IgniteCheckedException("IGFS data cache cannot start
with enabled query indexing.");
+
GridCache metaCache =
ctx.cache().cache(cfg.getMetaCacheName());
if (metaCache == null)
throw new IgniteCheckedException("Metadata cache is not
configured locally for IGFS: " + cfg);
+if (metaCache.configuration().getIndexedTypes() != null)
+throw new IgniteCheckedException("IGFS metadata cache cannot
start with enabled query indexing.");
+
+
if (F.eq(cfg.getDataCacheName(), cfg.getMetaCacheName()))
throw new IgniteCheckedException("Cannot use same cache as
both data and meta cache: " + cfg.getName());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6f75cdc/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
index 82633d6..099f681 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java
@@ -181,6 +181,32 @@ public class IgfsProcessorValidationSelfTest extends
IgfsCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+public void testLocalIfQueryIndexingEnabledForDataCache() throws Exception
{
+CacheConfiguration[] dataCaches = dataCaches(1024);
+
+dataCaches[0].setIndexedTypes(Integer.class, String.class);
+
+g1Cfg.setCacheConfiguration(concat(dataCaches, metaCaches(),
CacheConfiguration.class));
+
+checkGridStartFails(g1Cfg, "IGFS data cache cannot start with enabled
query indexing", true);
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testLocalIfQueryIndexingEnabledForMetaCache() throws Exception
{
+CacheConfiguration[] metaCaches = metaCaches();
+
+metaCaches[0].setIndexedTypes(Integer.class, String.class);
+
+g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches,
CacheConfiguration.class));
+
+checkGridStartFails(g1Cfg, "IGFS metadata cache cannot start with
enabled query indexing", true);
+}
+
+/**
+ * @throws Exception If failed.
+ */
@SuppressWarnings("NullableProblems")
public void testLocalNullIgfsNameIsSupported() throws Exception {
g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(),
CacheConfiguration.class));
[15/50] [abbrv] incubator-ignite git commit: ignite-432 package.html becomes package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/package.html -- diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/package.html b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/package.html deleted file mode 100644 index 3926e06..000 --- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains all classes used by AspectJ AOP implementation. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/package-info.java -- diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/package-info.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/package-info.java new file mode 100644 index 000..2c9bac4 --- /dev/null +++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains all classes used by Spring AOP implementation. + */ +package org.apache.ignite.compute.gridify.aop.spring; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/package.html -- diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/package.html b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/package.html deleted file mode 100644 index d65f78f..000 --- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/package.html +++ /dev/null @@ -1,25 +0,0 @@ -http://www.w3.org/TR/html4/loose.dtd";> - - - - - - -Contains all classes used by Spring AOP implementation. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/package-info.java -- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/package-info.java b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/package-info.java new file mode 100644 index 000..a9387c1 --- /dev/null +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains internal tests or test related classes and interfaces. + */ +package org.apache.ignite.gridify.hierarchy; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/package.html -- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/package.html b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/package.html deleted file mode 100644 index 0b8c602..000 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/package.html +++ /dev/null @@ -1,25 +0,0 @@ -http://www.w3.org/TR/html4/loose.dtd";> - - - - - - -Contains internal tests or test related classes and interfaces. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/aop/src/test/java/org/apache/ignite/gridify/package-info.java -- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/package-info.java b/modules/aop/src/test/java/org/apache/ignite/gridify/package-info.java new file mode 100644 index 000..d29c47f --- /dev/null +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains internal tests or test related classes and interfaces. + */ +package org.apache.ignite.gridify; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/aop/src/test/java/org/apache/ignite/gridify/package.html -- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/package.html b/modules/aop/src/test/java/org/apache/ignite/gridify/package.html deleted file mode 100644 index 0b8c602..000 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/package.html +++ /dev/null @@ -1,25 +0,0 @@ -http://www.w3.org/TR/html4/loose.dtd";> - - - - - - -Contains internal tests or test related classes and interfaces. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/packag
[36/50] [abbrv] incubator-ignite git commit: rat settings updated
rat settings updated Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/54672e89 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/54672e89 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/54672e89 Branch: refs/heads/ignite-454 Commit: 54672e896b709f528f505a557b1e0156681a3d8d Parents: d683fbe Author: avinogradov Authored: Wed Mar 18 18:43:47 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 19:02:15 2015 +0300 -- .../compute/gridify/aop/aspectj/package-info.java | 17 + .../compute/gridify/aop/spring/package-info.java | 17 + .../ignite/spi/checkpoint/s3/package-info.java | 17 + .../discovery/tcp/ipfinder/s3/package-info.java| 17 + .../ignite/cache/affinity/fair/package-info.java | 17 + .../apache/ignite/cache/affinity/package-info.java | 17 + .../cache/affinity/rendezvous/package-info.java| 17 + .../ignite/cache/eviction/fifo/package-info.java | 17 + .../ignite/cache/eviction/igfs/package-info.java | 17 + .../ignite/cache/eviction/lru/package-info.java| 17 + .../apache/ignite/cache/eviction/package-info.java | 17 + .../ignite/cache/eviction/random/package-info.java | 17 + .../java/org/apache/ignite/cache/package-info.java | 17 + .../apache/ignite/cache/query/package-info.java| 17 + .../cache/store/jdbc/dialect/package-info.java | 17 + .../ignite/cache/store/jdbc/package-info.java | 17 + .../apache/ignite/cache/store/package-info.java| 17 + .../ignite/compute/gridify/aop/package-info.java | 17 + .../ignite/compute/gridify/package-info.java | 17 + .../org/apache/ignite/compute/package-info.java| 17 + .../org/apache/ignite/events/package-info.java | 17 + .../apache/ignite/igfs/mapreduce/package-info.java | 17 + .../igfs/mapreduce/records/package-info.java | 17 + .../java/org/apache/ignite/igfs/package-info.java | 17 + .../apache/ignite/igfs/secondary/package-info.java | 17 + .../ignite/internal/executor/package-info.java | 17 + .../ignite/internal/igfs/common/package-info.java | 17 + .../internal/managers/checkpoint/package-info.java | 17 + .../internal/managers/collision/package-info.java | 17 + .../managers/communication/package-info.java | 17 + .../internal/managers/deployment/package-info.java | 17 + .../deployment/protocol/gg/package-info.java | 17 + .../internal/managers/discovery/package-info.java | 17 + .../managers/eventstorage/package-info.java| 17 + .../internal/managers/failover/package-info.java | 17 + .../internal/managers/indexing/package-info.java | 17 + .../managers/loadbalancer/package-info.java| 17 + .../ignite/internal/managers/package-info.java | 17 + .../internal/managers/swapspace/package-info.java | 17 + .../ignite/internal/mxbean/package-info.java | 17 + .../org/apache/ignite/internal/package-info.java | 17 + .../internal/processors/affinity/package-info.java | 17 + .../processors/cacheobject/package-info.java | 17 + .../internal/processors/closure/package-info.java | 17 + .../processors/datastreamer/package-info.java | 17 + .../internal/processors/dr/package-info.java | 17 + .../internal/processors/hadoop/package-info.java | 17 + .../internal/processors/igfs/package-info.java | 17 + .../internal/processors/job/package-info.java | 17 + .../processors/jobmetrics/package-info.java| 17 + .../ignite/internal/processors/package-info.java | 17 + .../internal/processors/port/package-info.java | 17 + .../internal/processors/portable/package-info.java | 17 + .../internal/processors/resource/package-info.java | 17 + .../rest/client/message/package-info.java | 17 + .../rest/handlers/cache/package-info.java | 17 + .../processors/rest/handlers/package-info.java | 17 + .../processors/rest/handlers/top/package-info.java | 17 + .../rest/handlers/version/
[01/50] [abbrv] incubator-ignite git commit: ignite-sql-tests - bench
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-454 1adfd6157 -> 073db0ceb
ignite-sql-tests - bench
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b10ae795
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b10ae795
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b10ae795
Branch: refs/heads/ignite-454
Commit: b10ae795e1c3760aeb5763fa23c7f929f240b98a
Parents: 52ee235
Author: S.Vladykin
Authored: Tue Mar 17 21:34:30 2015 +0300
Committer: S.Vladykin
Committed: Tue Mar 17 21:34:30 2015 +0300
--
.../cache/GridCacheQuerySimpleBenchmark.java| 200 +++
1 file changed, 200 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b10ae795/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
new file mode 100644
index 000..54f9f93
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
@@ -0,0 +1,200 @@
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.cache.query.annotations.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+import org.jdk8.backport.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+/**
+ *
+ */
+public class GridCacheQuerySimpleBenchmark extends GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
+/** */
+private Ignite ignite;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration c = super.getConfiguration(gridName);
+
+TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+disco.setIpFinder(ipFinder);
+
+c.setDiscoverySpi(disco);
+
+CacheConfiguration ccfg = new CacheConfiguration<>();
+
+ccfg.setName("offheap-cache");
+ccfg.setCacheMode(CacheMode.PARTITIONED);
+ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
+ccfg.setSwapEnabled(false);
+ccfg.setQueryIndexEnabled(true);
+
+ccfg.setMemoryMode(CacheMemoryMode.OFFHEAP_TIERED);
+
+c.setCacheConfiguration(ccfg);
+
+QueryConfiguration qcfg = new QueryConfiguration();
+
+qcfg.setMaxOffHeapMemory(0);
+
+c.setQueryConfiguration(qcfg);
+
+return c;
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTest() throws Exception {
+ignite = startGridsMultiThreaded(3);
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+stopAllGrids();
+
+ignite = null;
+}
+
+/** {@inheritDoc} */
+@Override protected long getTestTimeout() {
+return 15 * 60 * 1000;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testPerformance() throws Exception {
+Random rnd = new GridRandom();
+
+final IgniteCache c = ignite.jcache("offheap-cache");
+
+X.println("___ PUT start");
+
+final int cnt = 100_000;
+final int maxSalary = cnt / 10;
+
+for (long i = 0; i < cnt; i++)
+c.put(i, new Person(rnd.nextInt(maxSalary), "Vasya " + i));
+
+X.println("___ PUT end");
+
+final AtomicBoolean end = new AtomicBoolean();
+
+final LongAdder puts = new LongAdder();
+
+IgniteInternalFuture fut0 = multithreadedAsync(new Callable()
{
+@Override public Void call() throws Exception {
+Random rnd = new GridRandom();
+
+while (!end.get()) {
+long i = rnd.nextInt(cnt);
+
+c.put(i, new Person(rnd.nextInt(maxSalary), "Vasya " + i));
+
+puts.increment();
+}
+
+return null;
+}
[13/50] [abbrv] incubator-ignite git commit: ignite-432 package.html becomes package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/package-info.java new file mode 100644 index 000..6a50661 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Loopback IPC utility classes. + */ +package org.apache.ignite.internal.util.ipc.loopback; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/package.html b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/package.html deleted file mode 100644 index 840f0c0..000 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/loopback/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Loopback IPC utility classes. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/package-info.java new file mode 100644 index 000..a68dbee --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/package-info.java @@ -0,0 +1,5 @@ +/** + * + * IPC utility classes. + */ +package org.apache.ignite.internal.util.ipc; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/package.html b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/package.html deleted file mode 100644 index a4111af..000 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -IPC utility classes. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/package-info.java new file mode 100644 index 000..1b9aa57 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Shared memory IPC utility classes. + */ +package org.apache.ignite.internal.util.ipc.shmem; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/package.html b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/package.html deleted file mode 100644 index 02c5ae1..000 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Shared memory IPC utility classes. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/util/nio/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/package-info.java new file mode 100644 index 000..d8ac79d --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/package-info.java @@ -0,0 +1,5 @@ +/** + * + * NIO server interfaces and common utility classes for NIO. + */ +package org.apache.ignite.internal.util.nio; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/internal/util/nio/package.html ---
[04/50] [abbrv] incubator-ignite git commit: ignite-sql-tests - bench fix
ignite-sql-tests - bench 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/2ee73270
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ee73270
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ee73270
Branch: refs/heads/ignite-454
Commit: 2ee732701fad3366f9d9f0f0e914b63ae778defe
Parents: 85d444a
Author: S.Vladykin
Authored: Tue Mar 17 22:44:48 2015 +0300
Committer: S.Vladykin
Committed: Tue Mar 17 22:44:48 2015 +0300
--
.../processors/cache/GridCacheQuerySimpleBenchmark.java | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ee73270/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
index 54f9f93..e2be751 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
@@ -46,18 +46,14 @@ public class GridCacheQuerySimpleBenchmark extends
GridCommonAbstractTest {
ccfg.setCacheMode(CacheMode.PARTITIONED);
ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
ccfg.setSwapEnabled(false);
-ccfg.setQueryIndexEnabled(true);
+ccfg.setIndexedTypes(
+Long.class, Person.class
+);
ccfg.setMemoryMode(CacheMemoryMode.OFFHEAP_TIERED);
c.setCacheConfiguration(ccfg);
-QueryConfiguration qcfg = new QueryConfiguration();
-
-qcfg.setMaxOffHeapMemory(0);
-
-c.setQueryConfiguration(qcfg);
-
return c;
}
[46/50] [abbrv] incubator-ignite git commit: ignite-454 jdk8 compatibility fixes
ignite-454 jdk8 compatibility 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/d50065b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d50065b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d50065b1
Branch: refs/heads/ignite-454
Commit: d50065b144cead7cddfdec50e5e3ea6450749300
Parents: c300f6e
Author: avinogradov
Authored: Thu Mar 19 13:30:23 2015 +0300
Committer: avinogradov
Committed: Thu Mar 19 13:30:23 2015 +0300
--
examples/pom.xml| 22 --
.../datagrid/CachePopularNumbersExample.java| 20 +++---
.../examples8/datagrid/CacheQueryExample.java | 75 ++--
.../starschema/CacheStarSchemaExample.java | 4 +-
.../store/CacheNodeWithStoreStartup.java| 17 ++---
.../MemcacheRestExampleNodeStartup.java | 7 --
.../integration/ClientAbstractSelfTest.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java| 2 +-
.../rest/TaskCommandHandlerSelfTest.java| 2 +-
...titionedAtomicSequenceMultiThreadedTest.java | 48 ++---
.../DataStreamProcessorSelfTest.java| 2 +-
.../lang/GridMetadataAwareAdapterSelfTest.java | 14 ++--
.../OptimizedObjectStreamSelfTest.java | 14 ++--
.../hadoop/v1/HadoopV1ReduceTask.java | 5 +-
.../hadoop/v2/HadoopV2ReduceTask.java | 5 +-
.../processors/cache/GridCacheSwapSelfTest.java | 2 +-
16 files changed, 144 insertions(+), 99 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/examples/pom.xml
--
diff --git a/examples/pom.xml b/examples/pom.xml
index 9657dba..3508df9 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,9 +18,9 @@
-->
http://maven.apache.org/POM/4.0.0";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+xmlns="http://maven.apache.org/POM/4.0.0";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0
@@ -249,11 +249,25 @@
1.9.1
+add-sources
generate-sources
-add-source
+
+add-source
+
src/main/java8
+
+
+
+
+add-tests
+generate-test-sources
+
+add-test-source
+
+
+
src/test/java8
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CachePopularNumbersExample.java
--
diff --git
a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CachePopularNumbersExample.java
b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CachePopularNumbersExample.java
index 6c37c57..0fadd92 100644
---
a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CachePopularNumbersExample.java
+++
b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CachePopularNumbersExample.java
@@ -18,13 +18,12 @@
package org.apache.ignite.examples8.datagrid;
import org.apache.ignite.*;
+import org.apache.ignite.cache.query.*;
import org.apache.ignite.cluster.*;
import javax.cache.processor.*;
import java.util.*;
-import static org.apache.ignite.cache.query.Query.*;
-
/**
* Real time popular numbers counter.
*
@@ -54,7 +53,7 @@ public class CachePopularNumbersExample {
* Executes example.
*
* @param args Command line arguments, none required.
- * @throws org.apache.ignite.IgniteException If example execution failed.
+ * @throws IgniteException If example execution failed.
*/
public static void main(String[] args) throws IgniteException {
Timer popularNumbersQryTimer = new Timer("numbers-query-worker");
@@ -89,7 +88,7 @@ public
[38/50] [abbrv] incubator-ignite git commit: rat settings updated
rat settings updated Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f69865a9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f69865a9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f69865a9 Branch: refs/heads/ignite-454 Commit: f69865a93cb02f2140142573e33cbf268fa2dff3 Parents: 54672e8 Author: avinogradov Authored: Wed Mar 18 18:50:23 2015 +0300 Committer: avinogradov Committed: Wed Mar 18 19:02:15 2015 +0300 -- .../ignite/gridify/hierarchy/package-info.java | 17 + .../org/apache/ignite/gridify/package-info.java| 17 + .../loadtests/direct/singlesplit/package-info.java | 17 + .../test/java/org/test/gridify/package-info.java | 17 + .../ignite/spi/checkpoint/s3/package-info.java | 17 + .../discovery/tcp/ipfinder/s3/package-info.java| 17 + .../cache/store/jdbc/model/package-info.java | 17 + .../ignite/cache/store/jdbc/package-info.java | 17 + .../apache/ignite/cache/store/package-info.java| 17 + .../internal/managers/checkpoint/package-info.java | 17 + .../managers/communication/package-info.java | 17 + .../internal/managers/deployment/package-info.java | 17 + .../ignite/internal/managers/package-info.java | 17 + .../internal/managers/swapspace/package-info.java | 17 + .../org/apache/ignite/internal/package-info.java | 17 + .../internal/processors/closure/package-info.java | 17 + .../internal/processors/igfs/package-info.java | 17 + .../ignite/internal/util/nio/package-info.java | 17 + .../internal/util/tostring/package-info.java | 17 + .../java/org/apache/ignite/lang/package-info.java | 17 + .../org/apache/ignite/lang/utils/package-info.java | 17 + .../org/apache/ignite/loadtest/package-info.java | 17 + .../loadtests/direct/multisplit/package-info.java | 17 + .../loadtests/direct/newnodes/package-info.java| 17 + .../loadtests/direct/redeploy/package-info.java| 17 + .../loadtests/direct/session/package-info.java | 17 + .../loadtests/direct/stealing/package-info.java| 17 + .../apache/ignite/loadtests/dsi/package-info.java | 17 + .../apache/ignite/loadtests/job/package-info.java | 17 + .../apache/ignite/logger/java/package-info.java| 17 + .../apache/ignite/marshaller/jdk/package-info.java | 17 + .../ignite/marshaller/optimized/package-info.java | 17 + .../org/apache/ignite/marshaller/package-info.java | 17 + .../java/org/apache/ignite/p2p/package-info.java | 17 + .../test/java/org/apache/ignite/package-info.java | 17 + .../org/apache/ignite/session/package-info.java| 17 + .../ignite/spi/checkpoint/cache/package-info.java | 17 + .../ignite/spi/checkpoint/jdbc/package-info.java | 17 + .../apache/ignite/spi/checkpoint/package-info.java | 17 + .../spi/checkpoint/sharedfs/package-info.java | 17 + .../spi/collision/fifoqueue/package-info.java | 17 + .../spi/collision/jobstealing/package-info.java| 17 + .../apache/ignite/spi/collision/package-info.java | 17 + .../spi/collision/priorityqueue/package-info.java | 17 + .../ignite/spi/communication/package-info.java | 17 + .../ignite/spi/communication/tcp/package-info.java | 17 + .../ignite/spi/deployment/local/package-info.java | 17 + .../apache/ignite/spi/discovery/package-info.java | 17 + .../discovery/tcp/ipfinder/jdbc/package-info.java | 17 + .../spi/discovery/tcp/ipfinder/package-info.java | 17 + .../tcp/ipfinder/sharedfs/package-info.java| 17 + .../discovery/tcp/ipfinder/vm/package-info.java| 17 + .../ignite/spi/discovery/tcp/package-info.java | 17 + .../spi/eventstorage/memory/package-info.java | 17 + .../ignite/spi/failover/always/package-info.java | 17 + .../spi/failover/jobstealing/package-info.java | 17 + .../ignite/spi/failover/never/package-info.java| 17 + .../apache/ignite/spi/failover/package-info.java | 17 + .../spi/loadbalancing/adap
[12/50] [abbrv] incubator-ignite git commit: ignite-432 package.html becomes package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/spi/communication/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/package.html b/modules/core/src/main/java/org/apache/ignite/spi/communication/package.html deleted file mode 100644 index 919f8d8..000 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains APIs for grid communication SPI. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package-info.java new file mode 100644 index 000..a821cbe --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains default TCP/IP-based implementation for communication SPI. + */ +package org.apache.ignite.spi.communication.tcp; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package.html b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package.html deleted file mode 100644 index 4a43a62..000 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains default TCP/IP-based implementation for communication SPI. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/package-info.java new file mode 100644 index 000..23eb05f --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains default local deployment SPI implementation. + */ +package org.apache.ignite.spi.deployment.local; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/package.html b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/package.html deleted file mode 100644 index c008fa0..000 --- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains default local deployment SPI implementation. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/spi/deployment/package-info.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/package-info.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/package-info.java new file mode 100644 index 000..b7eb33f --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains APIs for deployment SPI. + */ +package org.apache.ignite.spi.deployment; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/spi/deployment/package.html -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/package.html b/modules/core/src/main/java/org/apache/ignite/spi/deployment/package.html deleted file mode 100644 index cf88d15..000 --- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains APIs for deployment SPI. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/main/java/org/apache/ignite/spi/discovery/package-info.java
[10/50] [abbrv] incubator-ignite git commit: ignite-432 package.html becomes package-info.java
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/test/java/org/apache/ignite/spi/discovery/package.html -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/package.html b/modules/core/src/test/java/org/apache/ignite/spi/discovery/package.html deleted file mode 100644 index 6556981..000 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains internal tests or test related classes and interfaces. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/package-info.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/package-info.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/package-info.java new file mode 100644 index 000..f7326c3 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains internal tests or test related classes and interfaces. + */ +package org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/package.html -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/package.html b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/package.html deleted file mode 100644 index 6556981..000 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains internal tests or test related classes and interfaces. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/package-info.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/package-info.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/package-info.java new file mode 100644 index 000..c533795 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains internal tests or test related classes and interfaces. + */ +package org.apache.ignite.spi.discovery.tcp.ipfinder; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/package.html -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/package.html b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/package.html deleted file mode 100644 index 6556981..000 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - -http://www.w3.org/TR/html4/loose.dtd";> - - - -Contains internal tests or test related classes and interfaces. - - http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/package-info.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/package-info.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/package-info.java new file mode 100644 index 000..a09cfd4 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/package-info.java @@ -0,0 +1,5 @@ +/** + * + * Contains internal tests or test related classes and interfaces. + */ +package org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ae6d273/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/package.html -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/package.html b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/package.html deleted file mode 100644 index 6556981..000 --- a/modules/core/src/test/ja
