You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/10 15:55:08 UTC
[01/53] [abbrv] ignite git commit: ignite-4535 : Removing
CacheMemoryMode - WIP.
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master c56c4b8c6 -> baa3835ee
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
index 2a7c8ef..c41da80 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
@@ -31,7 +31,6 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
import org.apache.ignite.cache.query.ScanQuery;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCrossCachesJoinsQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCrossCachesJoinsQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCrossCachesJoinsQueryTest.java
index 5ae2fb9..cd35788 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCrossCachesJoinsQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCrossCachesJoinsQueryTest.java
@@ -35,7 +35,6 @@ import java.util.concurrent.Callable;
import javax.cache.CacheException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.QueryIndex;
@@ -56,7 +55,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -99,9 +97,6 @@ public class IgniteCrossCachesJoinsQueryTest extends AbstractH2CompareQueryTest
/** */
private static Random rnd;
- /** */
- private CacheMemoryMode memMode = ONHEAP_TIERED;
-
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
@@ -727,7 +722,6 @@ public class IgniteCrossCachesJoinsQueryTest extends AbstractH2CompareQueryTest
CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setName(cacheName);
- ccfg.setMemoryMode(memMode);
ccfg.setCacheMode(cacheMode);
if (cacheMode == PARTITIONED)
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
index 484c99b..4152179 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
@@ -31,7 +31,6 @@ import javax.cache.integration.CompletionListenerFuture;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
import org.apache.ignite.cache.query.SqlQuery;
@@ -78,7 +77,6 @@ public abstract class CacheTtlAbstractSelfTest extends GridCommonAbstractTest {
ccfg.setCacheMode(cacheMode());
ccfg.setAtomicityMode(atomicityMode());
- ccfg.setMemoryMode(memoryMode());
ccfg.setOffHeapMaxMemory(0);
LruEvictionPolicy plc = new LruEvictionPolicy();
@@ -125,11 +123,6 @@ public abstract class CacheTtlAbstractSelfTest extends GridCommonAbstractTest {
protected abstract CacheAtomicityMode atomicityMode();
/**
- * @return Memory mode.
- */
- protected abstract CacheMemoryMode memoryMode();
-
- /**
* @return Cache mode.
*/
protected abstract CacheMode cacheMode();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicAbstractSelfTest.java
new file mode 100644
index 0000000..51054c4
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicAbstractSelfTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.ttl;
+
+import org.apache.ignite.cache.CacheAtomicityMode;
+
+/**
+ * TTL test with offheap.
+ */
+public abstract class CacheTtlAtomicAbstractSelfTest extends CacheTtlAbstractSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return CacheAtomicityMode.ATOMIC;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicLocalSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicLocalSelfTest.java
new file mode 100644
index 0000000..3644636
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicLocalSelfTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.internal.processors.cache.ttl;
+
+import org.apache.ignite.cache.CacheMode;
+
+/**
+ * TTL test with offheap.
+ */
+public class CacheTtlAtomicLocalSelfTest extends CacheTtlAtomicAbstractSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheMode cacheMode() {
+ return CacheMode.LOCAL;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 1;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicPartitionedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicPartitionedSelfTest.java
new file mode 100644
index 0000000..5c1a484
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAtomicPartitionedSelfTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.internal.processors.cache.ttl;
+
+import org.apache.ignite.cache.*;
+
+/**
+ * TTL test with offheap.
+ */
+public class CacheTtlAtomicPartitionedSelfTest extends CacheTtlAtomicAbstractSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheMode cacheMode() {
+ return CacheMode.PARTITIONED;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 2;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAbstractSelfTest.java
deleted file mode 100644
index 7bce6d9..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAbstractSelfTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ignite.internal.processors.cache.ttl;
-
-import org.apache.ignite.cache.*;
-
-/**
- * TTL test with offheap.
- */
-public abstract class CacheTtlOnheapAbstractSelfTest extends CacheTtlAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicAbstractSelfTest.java
deleted file mode 100644
index 9365b8e..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicAbstractSelfTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ignite.internal.processors.cache.ttl;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-
-/**
- * TTL test with offheap.
- */
-public abstract class CacheTtlOnheapAtomicAbstractSelfTest extends CacheTtlOnheapAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicityMode atomicityMode() {
- return CacheAtomicityMode.ATOMIC;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicLocalSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicLocalSelfTest.java
deleted file mode 100644
index 7c4fe7a..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicLocalSelfTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ignite.internal.processors.cache.ttl;
-
-import org.apache.ignite.cache.CacheMode;
-
-/**
- * TTL test with offheap.
- */
-public class CacheTtlOnheapAtomicLocalSelfTest extends CacheTtlOnheapAtomicAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return CacheMode.LOCAL;
- }
-
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 1;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicPartitionedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicPartitionedSelfTest.java
deleted file mode 100644
index dc2dc95..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapAtomicPartitionedSelfTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ignite.internal.processors.cache.ttl;
-
-import org.apache.ignite.cache.*;
-
-/**
- * TTL test with offheap.
- */
-public class CacheTtlOnheapAtomicPartitionedSelfTest extends CacheTtlOnheapAtomicAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return CacheMode.PARTITIONED;
- }
-
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 2;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalAbstractSelfTest.java
deleted file mode 100644
index 2948b1b..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalAbstractSelfTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ignite.internal.processors.cache.ttl;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-
-/**
- * TTL test with offheap.
- */
-public abstract class CacheTtlOnheapTransactionalAbstractSelfTest extends CacheTtlOnheapAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheAtomicityMode atomicityMode() {
- return CacheAtomicityMode.TRANSACTIONAL;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalLocalSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalLocalSelfTest.java
deleted file mode 100644
index 4283e7a..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalLocalSelfTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ignite.internal.processors.cache.ttl;
-
-import org.apache.ignite.cache.CacheMode;
-
-/**
- * TTL test with offheap.
- */
-public class CacheTtlOnheapTransactionalLocalSelfTest extends CacheTtlOnheapTransactionalAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return CacheMode.LOCAL;
- }
-
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 1;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalPartitionedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalPartitionedSelfTest.java
deleted file mode 100644
index 70fbb72..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlOnheapTransactionalPartitionedSelfTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ignite.internal.processors.cache.ttl;
-
-import org.apache.ignite.cache.CacheMode;
-
-/**
- * TTL test with offheap.
- */
-public class CacheTtlOnheapTransactionalPartitionedSelfTest extends CacheTtlOnheapTransactionalAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return CacheMode.PARTITIONED;
- }
-
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 2;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalAbstractSelfTest.java
new file mode 100644
index 0000000..847ab34
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalAbstractSelfTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.ttl;
+
+import org.apache.ignite.cache.CacheAtomicityMode;
+
+/**
+ * TTL test with offheap.
+ */
+public abstract class CacheTtlTransactionalAbstractSelfTest extends CacheTtlAbstractSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return CacheAtomicityMode.TRANSACTIONAL;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalLocalSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalLocalSelfTest.java
new file mode 100644
index 0000000..4a8ea52
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalLocalSelfTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.internal.processors.cache.ttl;
+
+import org.apache.ignite.cache.CacheMode;
+
+/**
+ * TTL test with offheap.
+ */
+public class CacheTtlTransactionalLocalSelfTest extends CacheTtlTransactionalAbstractSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheMode cacheMode() {
+ return CacheMode.LOCAL;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 1;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalPartitionedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalPartitionedSelfTest.java
new file mode 100644
index 0000000..f31b823
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlTransactionalPartitionedSelfTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.internal.processors.cache.ttl;
+
+import org.apache.ignite.cache.CacheMode;
+
+/**
+ * TTL test with offheap.
+ */
+public class CacheTtlTransactionalPartitionedSelfTest extends CacheTtlTransactionalAbstractSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheMode cacheMode() {
+ return CacheMode.PARTITIONED;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 2;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
index c38d7e2..0f4a418 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java
@@ -32,10 +32,10 @@ import org.apache.ignite.internal.processors.cache.GridIndexingWithNoopSwapSelfT
import org.apache.ignite.internal.processors.cache.IgniteCacheConfigurationPrimitiveTypesSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheStarvationOnRebalanceTest;
import org.apache.ignite.internal.processors.cache.IgniteClientReconnectQueriesTest;
-import org.apache.ignite.internal.processors.cache.ttl.CacheTtlOnheapAtomicLocalSelfTest;
-import org.apache.ignite.internal.processors.cache.ttl.CacheTtlOnheapAtomicPartitionedSelfTest;
-import org.apache.ignite.internal.processors.cache.ttl.CacheTtlOnheapTransactionalLocalSelfTest;
-import org.apache.ignite.internal.processors.cache.ttl.CacheTtlOnheapTransactionalPartitionedSelfTest;
+import org.apache.ignite.internal.processors.cache.ttl.CacheTtlAtomicLocalSelfTest;
+import org.apache.ignite.internal.processors.cache.ttl.CacheTtlAtomicPartitionedSelfTest;
+import org.apache.ignite.internal.processors.cache.ttl.CacheTtlTransactionalLocalSelfTest;
+import org.apache.ignite.internal.processors.cache.ttl.CacheTtlTransactionalPartitionedSelfTest;
/**
* Cache tests using indexing.
@@ -51,10 +51,10 @@ public class IgniteCacheWithIndexingTestSuite extends TestSuite {
suite.addTestSuite(GridIndexingWithNoopSwapSelfTest.class);
suite.addTestSuite(GridCacheOffHeapSelfTest.class);
- suite.addTestSuite(CacheTtlOnheapTransactionalLocalSelfTest.class);
- suite.addTestSuite(CacheTtlOnheapTransactionalPartitionedSelfTest.class);
- suite.addTestSuite(CacheTtlOnheapAtomicLocalSelfTest.class);
- suite.addTestSuite(CacheTtlOnheapAtomicPartitionedSelfTest.class);
+ suite.addTestSuite(CacheTtlTransactionalLocalSelfTest.class);
+ suite.addTestSuite(CacheTtlTransactionalPartitionedSelfTest.class);
+ suite.addTestSuite(CacheTtlAtomicLocalSelfTest.class);
+ suite.addTestSuite(CacheTtlAtomicPartitionedSelfTest.class);
suite.addTestSuite(GridCacheOffheapIndexGetSelfTest.class);
suite.addTestSuite(GridCacheOffheapIndexEntryEvictTest.class);
[30/53] [abbrv] ignite git commit: ignite-4851 : Partition will be
reserved before new entry is created.
Posted by ag...@apache.org.
ignite-4851 : Partition will be reserved before new entry is created.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c61d1387
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c61d1387
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c61d1387
Branch: refs/heads/ignite-3477-master
Commit: c61d13875de9e199ebe68145dabd6a88544d7673
Parents: 17bc34d
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Wed Apr 5 13:39:58 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Wed Apr 5 13:39:58 2017 +0300
----------------------------------------------------------------------
.../cache/GridCacheConcurrentMap.java | 5 +-
.../cache/GridCacheConcurrentMapImpl.java | 192 +++++++++++--------
.../dht/GridCachePartitionedConcurrentMap.java | 15 +-
.../distributed/dht/GridDhtLocalPartition.java | 12 --
4 files changed, 130 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61d1387/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index debc65b..a6738f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -40,8 +40,9 @@ public interface GridCacheConcurrentMap {
* @param key Key.
* @param val Value.
* @param create Create flag.
- * @return Triple where the first element is current entry associated with the key,
- * the second is created entry and the third is doomed (all may be null).
+ * @return Existing or new GridCacheMapEntry. Will return {@code null} if entry is obsolete or absent and create
+ * flag is set to {@code false}. Will also return {@code null} if create flag is set to {@code true}, but entry
+ * couldn't be created.
*/
@Nullable public GridCacheMapEntry putEntryIfObsoleteOrAbsent(
AffinityTopologyVersion topVer,
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61d1387/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
index c1dbd0c..15a688b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
@@ -23,7 +23,6 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.lang.IgnitePredicate;
@@ -118,104 +117,145 @@ public abstract class GridCacheConcurrentMapImpl implements GridCacheConcurrentM
boolean done = false;
- while (!done) {
- GridCacheMapEntry entry = map.get(key);
- created = null;
- doomed = null;
+ boolean reserved = false;
- if (entry == null) {
- if (create) {
- if (created0 == null)
- created0 = factory.create(ctx, topVer, key, key.hashCode(), val);
+ try {
+ while (!done) {
+ GridCacheMapEntry entry = map.get(key);
+ created = null;
+ doomed = null;
- cur = created = created0;
+ if (entry == null) {
+ if (create) {
+ if (created0 == null) {
+ if (!reserved) {
+ if (!reserve())
+ return null;
- done = map.putIfAbsent(created.key(), created) == null;
- }
- else
- done = true;
- }
- else {
- if (entry.obsolete()) {
- doomed = entry;
+ reserved = true;
+ }
- if (create) {
- if (created0 == null)
created0 = factory.create(ctx, topVer, key, key.hashCode(), val);
+ }
cur = created = created0;
- done = map.replace(entry.key(), doomed, created);
+ done = map.putIfAbsent(created.key(), created) == null;
}
else
- done = map.remove(entry.key(), doomed);
+ done = true;
}
else {
- cur = entry;
+ if (entry.obsolete()) {
+ doomed = entry;
+
+ if (create) {
+ if (created0 == null) {
+ if (!reserved) {
+ if (!reserve())
+ return null;
+
+ reserved = true;
+ }
+
+ created0 = factory.create(ctx, topVer, key, key.hashCode(), val);
+ }
- done = true;
+ cur = created = created0;
+
+ done = map.replace(entry.key(), doomed, created);
+ }
+ else
+ done = map.remove(entry.key(), doomed);
+ }
+ else {
+ cur = entry;
+
+ done = true;
+ }
}
}
- }
- int sizeChange = 0;
+ int sizeChange = 0;
+
+ if (doomed != null) {
+ synchronized (doomed) {
+ if (!doomed.deleted())
+ sizeChange--;
+ }
- if (doomed != null) {
- synchronized (doomed) {
- if (!doomed.deleted())
- sizeChange--;
+ if (ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED))
+ ctx.events().addEvent(doomed.partition(),
+ doomed.key(),
+ ctx.localNodeId(),
+ (IgniteUuid)null,
+ null,
+ EVT_CACHE_ENTRY_DESTROYED,
+ null,
+ false,
+ null,
+ false,
+ null,
+ null,
+ null,
+ true);
}
- if (ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED))
- ctx.events().addEvent(doomed.partition(),
- doomed.key(),
- ctx.localNodeId(),
- (IgniteUuid)null,
- null,
- EVT_CACHE_ENTRY_DESTROYED,
- null,
- false,
- null,
- false,
- null,
- null,
- null,
- true);
- }
+ if (created != null) {
+ sizeChange++;
+
+ if (ctx.events().isRecordable(EVT_CACHE_ENTRY_CREATED))
+ ctx.events().addEvent(created.partition(),
+ created.key(),
+ ctx.localNodeId(),
+ (IgniteUuid)null,
+ null,
+ EVT_CACHE_ENTRY_CREATED,
+ null,
+ false,
+ null,
+ false,
+ null,
+ null,
+ null,
+ true);
+
+ if (touch)
+ ctx.evicts().touch(
+ cur,
+ topVer);
+ }
- if (created != null) {
- sizeChange++;
-
- if (ctx.events().isRecordable(EVT_CACHE_ENTRY_CREATED))
- ctx.events().addEvent(created.partition(),
- created.key(),
- ctx.localNodeId(),
- (IgniteUuid)null,
- null,
- EVT_CACHE_ENTRY_CREATED,
- null,
- false,
- null,
- false,
- null,
- null,
- null,
- true);
-
- if (touch)
- ctx.evicts().touch(
- cur,
- topVer);
- }
+ assert Math.abs(sizeChange) <= 1;
+
+ if (sizeChange == -1)
+ decrementPublicSize(cur);
+ else if (sizeChange == 1) {
+ assert reserved;
- assert Math.abs(sizeChange) <= 1;
+ incrementPublicSize(cur);
+ }
+
+ return cur;
+ }
+ finally {
+ if (reserved)
+ release();
+ }
+ }
- if (sizeChange == -1)
- decrementPublicSize(cur);
- else if (sizeChange == 1)
- incrementPublicSize(cur);
+ /**
+ *
+ */
+ protected boolean reserve() {
+ return true;
+ }
- return cur;
+ /**
+ *
+ */
+ protected void release() {
+ // No-op.
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61d1387/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
index cfbe9bb..6230c85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
@@ -81,12 +81,19 @@ public class GridCachePartitionedConcurrentMap implements GridCacheConcurrentMap
/** {@inheritDoc} */
@Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(AffinityTopologyVersion topVer, KeyCacheObject key,
@Nullable CacheObject val, boolean create, boolean touch) {
- GridDhtLocalPartition part = localPartition(key, topVer, create);
+ while (true) {
+ GridDhtLocalPartition part = localPartition(key, topVer, create);
- if (part == null)
- return null;
+ if (part == null)
+ return null;
+
+ GridCacheMapEntry res = part.putEntryIfObsoleteOrAbsent(topVer, key, val, create, touch);
- return part.putEntryIfObsoleteOrAbsent(topVer, key, val, create, touch);
+ if (res != null || !create)
+ return res;
+
+ // Otherwise parttion was concurrently evicted and should be re-created on next iteration.
+ }
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61d1387/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index d3ec2af..cd69494 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.ConcurrentNavigableMap;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -32,13 +31,9 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.NodeStoppingException;
import org.apache.ignite.internal.pagemem.wal.record.delta.PartitionMetaStateRecord;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
-import org.apache.ignite.internal.processors.cache.CacheObject;
-import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap;
import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapImpl;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
@@ -49,20 +44,15 @@ import org.apache.ignite.internal.processors.cache.database.CacheDataRow;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader;
import org.apache.ignite.internal.processors.cache.extras.GridCacheObsoleteEntryExtras;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
-import org.apache.ignite.internal.util.GridCircularBuffer;
import org.apache.ignite.internal.processors.query.QueryUtils;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.lang.GridIterator;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
-import org.apache.ignite.internal.util.typedef.CI1;
-import org.apache.ignite.internal.util.typedef.T2;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentLinkedDeque8;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE;
@@ -983,8 +973,6 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
while (true) {
long state = this.state.get();
- assert getPartState(state) != EVICTED;
-
if (this.state.compareAndSet(state, setSize(state, getSize(state) + 1)))
return;
}
[33/53] [abbrv] ignite git commit: ignite-4535 : Adapted tests to set
on-heap cache if they use eviction policy.
Posted by ag...@apache.org.
ignite-4535 : Adapted tests to set on-heap cache if they use eviction policy.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6ebddaeb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6ebddaeb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6ebddaeb
Branch: refs/heads/ignite-3477-master
Commit: 6ebddaebc020ccf5dd091f4ea2029395712c73fe
Parents: 0bad8c6
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Apr 6 16:54:45 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Apr 6 16:54:45 2017 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 1 +
.../processors/cache/GridCacheProcessor.java | 8 +-
.../utils/PlatformConfigurationUtils.java | 3 +
.../internal/ClusterNodeMetricsSelfTest.java | 1 +
.../cache/CacheConfigurationLeakTest.java | 1 +
.../CacheSerializableTransactionsTest.java | 2 +
.../GridCacheConcurrentTxMultiNodeTest.java | 2 +-
...idCacheConfigurationConsistencySelfTest.java | 41 +------
.../GridCacheEvictionEventAbstractTest.java | 1 +
.../cache/GridCacheLifecycleAwareSelfTest.java | 1 +
.../cache/GridCacheObjectToStringSelfTest.java | 1 +
.../cache/GridCacheReloadSelfTest.java | 1 +
.../GridCacheTtlManagerEvictionSelfTest.java | 1 +
...gniteCacheLoadRebalanceEvictionSelfTest.java | 1 +
...gniteCacheP2pUnmarshallingNearErrorTest.java | 1 +
.../cache/IgniteCachePeekModesAbstractTest.java | 1 +
.../IgniteCacheReadThroughEvictionSelfTest.java | 1 +
.../GridCacheAbstractNodeRestartSelfTest.java | 1 +
.../IgniteCacheTxIteratorSelfTest.java | 1 +
...GridCacheDhtEvictionNearReadersSelfTest.java | 1 +
.../dht/GridCacheDhtEvictionSelfTest.java | 1 +
.../dht/IgniteCacheMultiTxLockSelfTest.java | 1 +
.../IgniteCachePutRetryAbstractSelfTest.java | 2 +
.../GridCachePartitionedEvictionSelfTest.java | 1 +
...ePartitionedMultiThreadedPutGetSelfTest.java | 1 +
.../cache/eviction/EvictionAbstractTest.java | 1 +
...heConcurrentEvictionConsistencySelfTest.java | 1 +
.../GridCacheConcurrentEvictionsSelfTest.java | 1 +
.../GridCacheEmptyEntriesAbstractSelfTest.java | 3 +-
.../GridCacheEvictableEntryEqualsSelfTest.java | 1 +
.../GridCacheEvictionFilterSelfTest.java | 2 +-
.../GridCacheEvictionLockUnlockSelfTest.java | 1 +
.../GridCacheEvictionTouchSelfTest.java | 1 +
.../SortedEvictionPolicyPerformanceTest.java | 1 +
...sCachePerBlockLruEvictionPolicySelfTest.java | 1 +
.../loadtests/GridCacheMultiNodeLoadTest.java | 1 +
.../GridCachePartitionedAtomicLongLoadTest.java | 1 +
.../cache/CacheQueryEvictDataLostTest.java | 120 +++++++++++++++++++
.../CacheQueryOffheapEvictDataLostTest.java | 119 ------------------
.../CacheRandomOperationsMultithreadedTest.java | 1 +
.../cache/GridIndexingWithNoopSwapSelfTest.java | 1 +
.../IgniteCacheQueryMultiThreadedSelfTest.java | 1 +
.../cache/ttl/CacheTtlAbstractSelfTest.java | 1 +
.../query/IgniteSqlSegmentedIndexSelfTest.java | 2 +-
.../IgniteCacheQuerySelfTestSuite.java | 4 +-
45 files changed, 177 insertions(+), 164 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/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 f886dce..383a2a6 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
@@ -459,6 +459,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
name = cc.getName();
nearCfg = cc.getNearConfiguration();
nodeFilter = cc.getNodeFilter();
+ onheapCache = cc.isOnheapCacheEnabled();
partitionLossPolicy = cc.getPartitionLossPolicy();
pluginCfgs = cc.getPluginConfigurations();
qryEntities = cc.getQueryEntities() == Collections.<QueryEntity>emptyList() ? null : cc.getQueryEntities();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index df25e46..987c0c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -489,6 +489,10 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (cc.getAtomicityMode() == ATOMIC)
assertParameter(cc.getTransactionManagerLookupClassName() == null,
"transaction manager can not be used with ATOMIC cache");
+
+ if (cc.getEvictionPolicy() != null && !cc.isOnheapCacheEnabled())
+ throw new IgniteCheckedException("Onheap cache must be enabled if eviction policy is configured [cacheName="
+ + U.maskName(cc.getName()) + "]");
}
/**
@@ -1448,7 +1452,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
GridCacheAffinityManager affMgr = new GridCacheAffinityManager();
GridCacheEventManager evtMgr = new GridCacheEventManager();
- CacheEvictionManager evictMgr = (nearEnabled || cfg.getEvictionPolicy() != null) ? new GridCacheEvictionManager() : new CacheOffheapEvictionManager();
+ CacheEvictionManager evictMgr = (nearEnabled || cfg.isOnheapCacheEnabled()) ? new GridCacheEvictionManager() : new CacheOffheapEvictionManager();
GridCacheQueryManager qryMgr = queryManager(cfg);
CacheContinuousQueryManager contQryMgr = new CacheContinuousQueryManager();
CacheDataStructuresManager dataStructuresMgr = new CacheDataStructuresManager();
@@ -1595,7 +1599,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
* 7. GridCacheTtlManager.
* ===============================================
*/
- evictMgr = cfg.getEvictionPolicy() != null ? new GridCacheEvictionManager() : new CacheOffheapEvictionManager();
+ evictMgr = cfg.isOnheapCacheEnabled() ? new GridCacheEvictionManager() : new CacheOffheapEvictionManager();
evtMgr = new GridCacheEventManager();
pluginMgr = new CachePluginManager(ctx, cfg);
drMgr = pluginMgr.createComponent(GridCacheDrManager.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index 2f353af..f8709ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -196,6 +196,9 @@ public class PlatformConfigurationUtils {
ccfg.setNearConfiguration(readNearConfiguration(in));
ccfg.setEvictionPolicy(readEvictionPolicy(in));
+ if (ccfg.getEvictionPolicy() != null)
+ ccfg.setOnheapCacheEnabled(true);
+
ccfg.setAffinity(readAffinityFunction(in));
ccfg.setExpiryPolicyFactory(readExpiryPolicyFactory(in));
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/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 b43b1f7..2cb36f9 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
@@ -96,6 +96,7 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
plc.setMaxSize(0);
ccfg.setEvictionPolicy(plc);
+ ccfg.setOnheapCacheEnabled(true);
return cfg.setCacheConfiguration(ccfg);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java
index b51932f..4eef3cb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java
@@ -69,6 +69,7 @@ public class CacheConfigurationLeakTest extends GridCommonAbstractTest {
CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
ccfg.setName("cache-" + idx + "-" + i);
ccfg.setEvictionPolicy(new LruEvictionPolicy(1000));
+ ccfg.setOnheapCacheEnabled(true);
IgniteCache<Object, Object> cache = ignite.createCache(ccfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
index 3d29315..bfd7806 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
@@ -4345,6 +4345,8 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
ccfg.setEvictionPolicy(plc);
+ ccfg.setOnheapCacheEnabled(true);
+
srv.createCache(ccfg);
cacheNames.add(ccfg.getName());
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index 491abff..4776456 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -144,7 +144,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
plc.setMaxSize(1000);
cc.setEvictionPolicy(plc);
- cc.setEvictSynchronized(false);
+ cc.setOnheapCacheEnabled(true);
cc.setWriteSynchronizationMode(FULL_SYNC);
cc.setRebalanceMode(NONE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
index 74c5348..59a5ebb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
@@ -362,6 +362,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override public Void apply(CacheConfiguration cfg) {
cfg.setEvictionPolicy(new FifoEvictionPolicy());
+ cfg.setOnheapCacheEnabled(true);
return null;
}
},
@@ -383,6 +384,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override public Void apply(CacheConfiguration cfg) {
cfg.setEvictionPolicy(new SortedEvictionPolicy());
+ cfg.setOnheapCacheEnabled(true);
return null;
}
},
@@ -390,6 +392,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override public Void apply(CacheConfiguration cfg) {
cfg.setEvictionPolicy(new FifoEvictionPolicy());
+ cfg.setOnheapCacheEnabled(true);
return null;
}
}
@@ -443,42 +446,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
/**
* @throws Exception If failed.
*/
- public void testDifferentEvictSynchronized() throws Exception {
- cacheMode = PARTITIONED;
-
- checkSecondGridStartFails(
- new C1<CacheConfiguration, Void>() {
- /** {@inheritDoc} */
- @Override public Void apply(CacheConfiguration cfg) {
- cfg.setEvictSynchronized(true);
-
- FifoEvictionPolicy plc = new FifoEvictionPolicy();
-
- plc.setMaxSize(100);
-
- cfg.setEvictionPolicy(plc);
- return null;
- }
- },
- new C1<CacheConfiguration, Void>() {
- /** {@inheritDoc} */
- @Override public Void apply(CacheConfiguration cfg) {
- cfg.setEvictSynchronized(false);
-
- FifoEvictionPolicy plc = new FifoEvictionPolicy();
-
- plc.setMaxSize(100);
-
- cfg.setEvictionPolicy(plc);
- return null;
- }
- }
- );
- }
-
- /**
- * @throws Exception If failed.
- */
public void testDifferentAtomicity() throws Exception {
cacheMode = PARTITIONED;
@@ -672,6 +639,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
cfg.setAffinity(new TestRendezvousAffinityFunction());
cfg.setEvictionPolicy(new FifoEvictionPolicy());
+ cfg.setOnheapCacheEnabled(true);
cfg.setCacheStoreFactory(new IgniteCacheAbstractTest.TestStoreFactory());
cfg.setReadThrough(true);
@@ -690,6 +658,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
cfg.setAffinity(new RendezvousAffinityFunction());
cfg.setEvictionPolicy(new LruEvictionPolicy());
+ cfg.setOnheapCacheEnabled(true);
cfg.setCacheStoreFactory(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
index 55eae2b..793317d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
@@ -71,6 +71,7 @@ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstr
cc.setCacheMode(cacheMode());
cc.setAtomicityMode(atomicityMode());
cc.setEvictionPolicy(new FifoEvictionPolicy());
+ cc.setOnheapCacheEnabled(true);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
index 089e278..22d94fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
@@ -318,6 +318,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS
TestEvictionPolicy evictionPlc = new TestEvictionPolicy();
ccfg.setEvictionPolicy(evictionPlc);
+ ccfg.setOnheapCacheEnabled(true);
lifecycleAwares.add(evictionPlc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
index 98d5682..54a3aa9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java
@@ -68,6 +68,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(cacheMode);
cacheCfg.setEvictionPolicy(evictionPlc);
+ cacheCfg.setOnheapCacheEnabled(true);
cacheCfg.setNearConfiguration(nearEnabled ? new NearCacheConfiguration() : null);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java
index 8814aa5..f3340f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java
@@ -82,6 +82,7 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest {
plc.setMaxSize(MAX_CACHE_ENTRIES);
cacheCfg.setEvictionPolicy(plc);
+ cacheCfg.setOnheapCacheEnabled(true);
cacheCfg.setNearConfiguration(nearEnabled ? new NearCacheConfiguration() : null);
final CacheStore store = new CacheStoreAdapter<Integer, Integer>() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
index 57d5007..23f06c6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
@@ -63,6 +63,7 @@ public class GridCacheTtlManagerEvictionSelfTest extends GridCommonAbstractTest
ccfg.setCacheMode(cacheMode);
ccfg.setEagerTtl(true);
ccfg.setEvictionPolicy(new FifoEvictionPolicy(ENTRIES_LIMIT, 100));
+ ccfg.setOnheapCacheEnabled(true);
ccfg.setExpiryPolicyFactory(CreatedExpiryPolicy.factoryOf(new Duration(TimeUnit.HOURS, 12)));
cfg.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
index 6791172..bf8c416 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
@@ -80,6 +80,7 @@ public class IgniteCacheLoadRebalanceEvictionSelfTest extends GridCommonAbstract
cacheCfg.setBackups(1);
cacheCfg.setReadFromBackup(true);
cacheCfg.setEvictionPolicy(evictionPolicy);
+ cacheCfg.setOnheapCacheEnabled(true);
cacheCfg.setStatisticsEnabled(true);
cacheCfg.setWriteThrough(false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
index e020ae4..87d852f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
@@ -39,6 +39,7 @@ public class IgniteCacheP2pUnmarshallingNearErrorTest extends IgniteCacheP2pUnma
cfg.getCacheConfiguration()[0].setEvictSynchronized(true);
cfg.getCacheConfiguration()[0].setEvictSynchronizedKeyBufferSize(1);
cfg.getCacheConfiguration()[0].setEvictionPolicy(new FifoEvictionPolicy(1));
+ cfg.getCacheConfiguration()[0].setOnheapCacheEnabled(true);
}
return cfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
index d84c4a7..8681be2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
@@ -98,6 +98,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
plc.setMaxSize(HEAP_ENTRIES);
ccfg.setEvictionPolicy(plc);
+ ccfg.setOnheapCacheEnabled(true);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java
index 6debaa0..00431b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java
@@ -155,6 +155,7 @@ public class IgniteCacheReadThroughEvictionSelfTest extends IgniteCacheConfigVar
CacheConfiguration<Object, Object> cc = variationConfig("eviction");
cc.setEvictionPolicy(new FifoEvictionPolicy(1));
+ cc.setOnheapCacheEnabled(true);
final IgniteCache<Object, Object> cache = ig.createCache(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index 455fc21..d268e47 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -146,6 +146,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
plc.setMaxSize(100);
ccfg.setEvictionPolicy(plc);
+ ccfg.setOnheapCacheEnabled(true);
}
c.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
index ff9425e..cdf996d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
@@ -75,6 +75,7 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
if (useEvictPlc) {
ccfg.setEvictionPolicy(new FifoEvictionPolicy(50));
+ ccfg.setOnheapCacheEnabled(true);
}
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index 2d2ef41..834861e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@ -89,6 +89,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
plc.setMaxSize(10);
cacheCfg.setEvictionPolicy(plc);
+ cacheCfg.setOnheapCacheEnabled(true);
NearCacheConfiguration nearCfg = new NearCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
index 17c27a2..64baf84 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
@@ -97,6 +97,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
plc.setMaxSize(10000);
cacheCfg.setEvictionPolicy(plc);
+ cacheCfg.setOnheapCacheEnabled(true);
cfg.setCacheConfiguration(cacheCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
index b48f6f9..1b9b0d0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
@@ -86,6 +86,7 @@ public class IgniteCacheMultiTxLockSelfTest extends GridCommonAbstractTest {
plc.setMaxSize(100000);
ccfg.setEvictionPolicy(plc);
+ ccfg.setOnheapCacheEnabled(true);
c.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
index 5339516..ee83990 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
@@ -106,6 +106,8 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
plc.setMaxSize(100);
cfg.setEvictionPolicy(plc);
+
+ cfg.setOnheapCacheEnabled(true);
}
if (store) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
index 67422b7..f5ec2c2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
@@ -90,6 +90,7 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT
FifoEvictionPolicy plc = new FifoEvictionPolicy();
plc.setMaxSize(EVICT_CACHE_SIZE);
cc.setEvictionPolicy(plc);
+ cc.setOnheapCacheEnabled(true);
FifoEvictionPolicy nearPlc = new FifoEvictionPolicy();
nearPlc.setMaxSize(EVICT_CACHE_SIZE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
index beb9082..86b2217 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
@@ -77,6 +77,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA
plc.setMaxMemorySize(1000);
cc.setEvictionPolicy(plc);
+ cc.setOnheapCacheEnabled(true);
cc.setAtomicityMode(TRANSACTIONAL);
NearCacheConfiguration nearCfg = new NearCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
index 441afd1..dfb4c68 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
@@ -110,6 +110,7 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
cc.setCacheMode(mode);
cc.setEvictionPolicy(createPolicy(plcMax));
+ cc.setOnheapCacheEnabled(true);
cc.setEvictSynchronized(evictSync);
cc.setWriteSynchronizationMode(syncCommit ? FULL_SYNC : FULL_ASYNC);
cc.setStartSize(plcMax);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
index 0e91e30..e61bef6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
@@ -84,6 +84,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
cc.setNearConfiguration(null);
cc.setEvictionPolicy(plc);
+ cc.setOnheapCacheEnabled(true);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
index 8eb029e..31d7c26 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java
@@ -75,6 +75,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest
cc.setNearConfiguration(null);
cc.setEvictionPolicy(plc);
+ cc.setOnheapCacheEnabled(true);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
index 0c4ac3f..04fdf77 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
@@ -84,8 +84,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
cc.setEvictionPolicy(plc);
cc.setEvictSynchronizedKeyBufferSize(1);
-
- cc.setEvictSynchronized(true);
+ cc.setOnheapCacheEnabled(true);
if (testStore != null) {
cc.setCacheStoreFactory(singletonFactory(testStore));
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictableEntryEqualsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictableEntryEqualsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictableEntryEqualsSelfTest.java
index 2b40365..98c8b77 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictableEntryEqualsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictableEntryEqualsSelfTest.java
@@ -39,6 +39,7 @@ public class GridCacheEvictableEntryEqualsSelfTest extends GridCommonAbstractTes
CacheConfiguration<TestKey, String> cfg = new CacheConfiguration<>("test");
cfg.setEvictionPolicy(new TestEvictionPolicy());
+ cfg.setOnheapCacheEnabled(true);
IgniteCache<TestKey, String> cache = ignite.createCache(cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
index db23661..eb675ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
@@ -74,7 +74,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
cc.setCacheMode(mode);
cc.setEvictionPolicy(notSerializableProxy(plc, EvictionPolicy.class));
- cc.setEvictSynchronized(false);
+ cc.setOnheapCacheEnabled(true);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cc.setEvictionFilter(notSerializableProxy(filter, org.apache.ignite.cache.eviction.EvictionFilter.class));
cc.setRebalanceMode(SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
index ba9b2d7..55b7b63 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
@@ -73,6 +73,7 @@ public class GridCacheEvictionLockUnlockSelfTest extends GridCommonAbstractTest
cc.setCacheMode(mode);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cc.setEvictionPolicy(new EvictionPolicy());
+ cc.setOnheapCacheEnabled(true);
cc.setAtomicityMode(TRANSACTIONAL);
NearCacheConfiguration nearCfg = new NearCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
index 34bb2a8..396083e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
@@ -75,6 +75,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
cc.setWriteSynchronizationMode(FULL_SYNC);
cc.setEvictionPolicy(plc);
+ cc.setOnheapCacheEnabled(true);
CacheStore store = new GridCacheGenericTestStore<Object, Object>() {
@Override public Object load(Object key) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
index de41691..b583fb0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
@@ -80,6 +80,7 @@ public class SortedEvictionPolicyPerformanceTest extends GridCommonAbstractTest
plc.setMaxSize(MAX_SIZE);
ccfg.setEvictionPolicy(plc);
+ ccfg.setOnheapCacheEnabled(true);
ccfg.setEvictSynchronized(false);
cfg.setPeerClassLoadingEnabled(false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
index 32e7e17..9e24ba8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCachePerBlockLruEvictionPolicySelfTest.java
@@ -121,6 +121,7 @@ public class IgfsCachePerBlockLruEvictionPolicySelfTest extends IgfsCommonAbstra
evictPlc = new IgfsPerBlockLruEvictionPolicy();
dataCacheCfg.setEvictionPolicy(evictPlc);
+ dataCacheCfg.setOnheapCacheEnabled(true);
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
dataCacheCfg.setBackups(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
index e40ce76..ac98f9c 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
@@ -69,6 +69,7 @@ public class GridCacheMultiNodeLoadTest extends GridCommonAbstractTest {
plc.setMaxSize(100000);
cacheCfg.setEvictionPolicy(plc);
+ cacheCfg.setOnheapCacheEnabled(true);
cacheCfg.setBackups(1);
cacheCfg.setRebalanceMode(SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index 25b1059..6dfa609 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -79,6 +79,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
plc.setMaxSize(1000);
cc.setEvictionPolicy(plc);
+ cc.setOnheapCacheEnabled(true);
cc.setBackups(1);
cc.setAffinity(new RendezvousAffinityFunction(true));
cc.setEvictSynchronized(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java
new file mode 100644
index 0000000..7b79c72
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java
@@ -0,0 +1,120 @@
+/*
+ * 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 java.io.Serializable;
+import java.util.concurrent.ThreadLocalRandom;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
+import org.apache.ignite.cache.query.SqlQuery;
+import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteInClosure;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ *
+ */
+public class CacheQueryEvictDataLostTest extends GridCommonAbstractTest {
+ /** */
+ private static final int KEYS = 100_000;
+
+ /**
+ *
+ */
+ public CacheQueryEvictDataLostTest() {
+ super(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration() throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration();
+
+ CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
+
+ ccfg.setName("cache-1");
+ ccfg.setEvictionPolicy(new LruEvictionPolicy(10));
+ ccfg.setOnheapCacheEnabled(true);
+ ccfg.setIndexedTypes(Integer.class, TestData.class);
+
+ cfg.setCacheConfiguration(ccfg);
+
+ return cfg;
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testQueryDataLost() throws Exception {
+ final long stopTime = U.currentTimeMillis() + 30_000;
+
+ GridTestUtils.runMultiThreaded(new IgniteInClosure<Integer>() {
+ void putGet(IgniteCache<Object, Object> cache) {
+ ThreadLocalRandom rnd = ThreadLocalRandom.current();
+
+ for (int i = 0; i < KEYS; i++) {
+ cache.put(rnd.nextInt(KEYS), new TestData(i));
+
+ cache.get(rnd.nextInt(KEYS));
+ }
+ }
+
+ void query(IgniteCache<Object, Object> cache) {
+ SqlQuery<Object, Object> qry1 = new SqlQuery<>(TestData.class, "_key > ?");
+ qry1.setArgs(KEYS / 2);
+
+ cache.query(qry1).getAll();
+
+ SqlQuery<Object, Object> qry2 = new SqlQuery<>(TestData.class, "idxVal > ?");
+ qry2.setArgs(KEYS / 2);
+
+ cache.query(qry2).getAll();
+ }
+
+ @Override public void apply(Integer idx) {
+ IgniteCache<Object, Object> cache1 = grid().cache("cache-1");
+
+ while (U.currentTimeMillis() < stopTime) {
+ if (idx == 0)
+ putGet(cache1);
+ else
+ query(cache1);
+ }
+ }
+ }, 10, "test-thread");
+ }
+
+ /**
+ *
+ */
+ static class TestData implements Serializable {
+ /** */
+ @QuerySqlField(index = true)
+ private int idxVal;
+
+ /**
+ * @param idxVal Value.
+ */
+ public TestData(int idxVal) {
+ this.idxVal = idxVal;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
deleted file mode 100644
index 0d9948d..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import java.io.Serializable;
-import java.util.concurrent.ThreadLocalRandom;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
-import org.apache.ignite.cache.query.SqlQuery;
-import org.apache.ignite.cache.query.annotations.QuerySqlField;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteInClosure;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-
-/**
- *
- */
-public class CacheQueryOffheapEvictDataLostTest extends GridCommonAbstractTest {
- /** */
- private static final int KEYS = 100_000;
-
- /**
- *
- */
- public CacheQueryOffheapEvictDataLostTest() {
- super(true);
- }
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration() throws Exception {
- IgniteConfiguration cfg = super.getConfiguration();
-
- CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
-
- ccfg.setName("cache-1");
- ccfg.setEvictionPolicy(new LruEvictionPolicy(10));
- ccfg.setIndexedTypes(Integer.class, TestData.class);
-
- cfg.setCacheConfiguration(ccfg);
-
- return cfg;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testQueryDataLost() throws Exception {
- final long stopTime = U.currentTimeMillis() + 30_000;
-
- GridTestUtils.runMultiThreaded(new IgniteInClosure<Integer>() {
- void putGet(IgniteCache<Object, Object> cache) {
- ThreadLocalRandom rnd = ThreadLocalRandom.current();
-
- for (int i = 0; i < KEYS; i++) {
- cache.put(rnd.nextInt(KEYS), new TestData(i));
-
- cache.get(rnd.nextInt(KEYS));
- }
- }
-
- void query(IgniteCache<Object, Object> cache) {
- SqlQuery<Object, Object> qry1 = new SqlQuery<>(TestData.class, "_key > ?");
- qry1.setArgs(KEYS / 2);
-
- cache.query(qry1).getAll();
-
- SqlQuery<Object, Object> qry2 = new SqlQuery<>(TestData.class, "idxVal > ?");
- qry2.setArgs(KEYS / 2);
-
- cache.query(qry2).getAll();
- }
-
- @Override public void apply(Integer idx) {
- IgniteCache<Object, Object> cache1 = grid().cache("cache-1");
-
- while (U.currentTimeMillis() < stopTime) {
- if (idx == 0)
- putGet(cache1);
- else
- query(cache1);
- }
- }
- }, 10, "test-thread");
- }
-
- /**
- *
- */
- static class TestData implements Serializable {
- /** */
- @QuerySqlField(index = true)
- private int idxVal;
-
- /**
- * @param idxVal Value.
- */
- public TestData(int idxVal) {
- this.idxVal = idxVal;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
index 24308cf..9861153 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
@@ -348,6 +348,7 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setEvictionPolicy(evictionPlc);
+ ccfg.setOnheapCacheEnabled(evictionPlc != null);
if (cacheMode == PARTITIONED)
ccfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
index deeac51..d16e8bb 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
@@ -67,6 +67,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest {
plc.setMaxSize(1000);
cc.setEvictionPolicy(plc);
+ cc.setOnheapCacheEnabled(true);
cc.setBackups(1);
cc.setAtomicityMode(TRANSACTIONAL);
cc.setIndexedTypes(
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
index 382b1ed..1f2ec99 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
@@ -120,6 +120,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes
}
cacheCfg.setEvictionPolicy(plc);
+ cacheCfg.setOnheapCacheEnabled(plc != null);
return cacheCfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
index c07d7a5..02b6b3b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
@@ -82,6 +82,7 @@ public abstract class CacheTtlAbstractSelfTest extends GridCommonAbstractTest {
plc.setMaxSize(MAX_CACHE_SIZE);
ccfg.setEvictionPolicy(plc);
+ ccfg.setOnheapCacheEnabled(true);
ccfg.setIndexedTypes(Integer.class, Integer.class);
ccfg.setBackups(2);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
index ad3e320..8408ad0 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
@@ -112,7 +112,7 @@ public class IgniteSqlSegmentedIndexSelfTest extends GridCommonAbstractTest {
startGridsMultiThreaded(1, true);
final IgniteCache<Object, Object> cache = ignite(0).createCache(cacheConfig("org", true, Integer.class, Organization.class)
- .setEvictionPolicy(new FifoEvictionPolicy(10)));
+ .setEvictionPolicy(new FifoEvictionPolicy(10)).setOnheapCacheEnabled(true));
for (int i = 0; i < 20; i++)
cache.put(i, new Organization("org-" + i));
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ebddaeb/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 9da2247..f720b94 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -26,7 +26,7 @@ import org.apache.ignite.internal.processors.cache.CachePartitionedQueryDetailMe
import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsDistributedSelfTest;
import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsLocalSelfTest;
import org.apache.ignite.internal.processors.cache.CacheQueryNewClientSelfTest;
-import org.apache.ignite.internal.processors.cache.CacheQueryOffheapEvictDataLostTest;
+import org.apache.ignite.internal.processors.cache.CacheQueryEvictDataLostTest;
import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryDetailMetricsDistributedSelfTest;
import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryDetailMetricsLocalSelfTest;
import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsDistributedSelfTest;
@@ -197,7 +197,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
- suite.addTestSuite(CacheQueryOffheapEvictDataLostTest.class);
+ suite.addTestSuite(CacheQueryEvictDataLostTest.class);
// Ignite cache and H2 comparison.
suite.addTestSuite(BaseH2CompareQueryTest.class);
[32/53] [abbrv] ignite git commit: ignite-4535 : Tests.
Posted by ag...@apache.org.
ignite-4535 : Tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0bad8c67
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0bad8c67
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0bad8c67
Branch: refs/heads/ignite-3477-master
Commit: 0bad8c670b2b8fad7ba8318a4de908e3c61ceaa0
Parents: 05c48f2
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Apr 6 16:20:01 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Apr 6 16:20:01 2017 +0300
----------------------------------------------------------------------
.../cache/GridCacheAbstractSelfTest.java | 10 +++++-
.../cache/IgniteCacheAbstractTest.java | 6 ++--
.../cache/IgniteCachePeekModesAbstractTest.java | 5 ---
.../IgniteCacheStoreValueAbstractTest.java | 5 ---
...idCacheBinaryObjectsLocalOnheapSelfTest.java | 26 ++++++++++++++
.../dht/GridCacheDhtPreloadOnheapSelfTest.java | 26 ++++++++++++++
.../dht/GridCacheDhtPreloadSelfTest.java | 38 ++++++++++++--------
...NearDisabledAtomicOnheapFullApiSelfTest.java | 28 +++++++++++++++
...ledAtomicOnheapMultiNodeFullApiSelfTest.java | 28 +++++++++++++++
...tionedNearDisabledOnheapFullApiSelfTest.java | 27 ++++++++++++++
...rDisabledOnheapMultiNodeFullApiSelfTest.java | 27 ++++++++++++++
...ePartitionedAtomicOnheapFullApiSelfTest.java | 28 +++++++++++++++
...nedAtomicOnheapMultiNodeFullApiSelfTest.java | 28 +++++++++++++++
...idCachePartitionedOnheapFullApiSelfTest.java | 26 ++++++++++++++
...rtitionedOnheapMultiNodeFullApiSelfTest.java | 26 ++++++++++++++
...ridCacheReplicatedOnheapFullApiSelfTest.java | 26 ++++++++++++++
...eplicatedOnheapMultiNodeFullApiSelfTest.java | 26 ++++++++++++++
...eCacheAtomicLocalOnheapExpiryPolicyTest.java | 26 ++++++++++++++
...IgniteCacheAtomicOnheapExpiryPolicyTest.java | 26 ++++++++++++++
...acheAtomicOnheapMultiJvmFullApiSelfTest.java | 28 +++++++++++++++
...bledAtomicOnheapMultiJvmFullApiSelfTest.java | 28 +++++++++++++++
...arDisabledOnheapMultiJvmFullApiSelfTest.java | 28 +++++++++++++++
...artitionedOnheapMultiJvmFullApiSelfTest.java | 28 +++++++++++++++
...ReplicatedOnheapMultiJvmFullApiSelfTest.java | 28 +++++++++++++++
.../configvariations/ConfigVariations.java | 4 ---
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 11 ++++++
.../IgniteCacheFullApiSelfTestSuite.java | 18 ++++++++++
.../testsuites/IgniteCacheTestSuite2.java | 2 ++
28 files changed, 581 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index 88e38e2..95f8bb8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
@@ -142,7 +142,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
assertTrue(
"Cache is not empty: " + " localSize = " + jcache(fi).localSize(CachePeekMode.ALL)
- + ", local entries " + entrySet(jcache(fi).localEntries()),
+ + ", local entries " + entrySet(jcache(fi).localEntries()),
GridTestUtils.waitForCondition(
// Preloading may happen as nodes leave, so we need to wait.
new GridAbsPredicateX() {
@@ -250,6 +250,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
cfg.setAtomicityMode(atomicityMode());
cfg.setWriteSynchronizationMode(writeSynchronization());
cfg.setNearConfiguration(nearConfiguration());
+ cfg.setOnheapCacheEnabled(onheapCacheEnabled());
Class<?>[] idxTypes = indexedTypes();
@@ -334,6 +335,13 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
}
/**
+ * @return {@code True} if on-heap cache is enabled.
+ */
+ protected boolean onheapCacheEnabled() {
+ return false;
+ }
+
+ /**
* @return {@code True} for partitioned caches.
*/
protected final boolean partitionedMode() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
index 4b1268a..a43e85b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
@@ -156,6 +156,8 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest {
if (cacheMode() == PARTITIONED)
cfg.setBackups(1);
+ cfg.setOnheapCacheEnabled(onheapCacheEnabled());
+
return cfg;
}
@@ -210,9 +212,9 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest {
}
/**
- * @return {@code true} if swap should be enabled.
+ * @return {@code True} if on-heap cache is enabled.
*/
- protected boolean swapEnabled() {
+ protected boolean onheapCacheEnabled() {
return false;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
index c13e608..d84c4a7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
@@ -102,11 +102,6 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
return ccfg;
}
- /** {@inheritDoc} */
- @Override protected boolean swapEnabled() {
- return true;
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
index a6601b2..3a55f47 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java
@@ -101,11 +101,6 @@ public abstract class IgniteCacheStoreValueAbstractTest extends IgniteCacheAbstr
}
/** {@inheritDoc} */
- @Override protected boolean swapEnabled() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override protected long getTestTimeout() {
return 3 * 60_000;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalOnheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalOnheapSelfTest.java
new file mode 100644
index 0000000..bb44a4d
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalOnheapSelfTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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.binary.local;
+
+public class GridCacheBinaryObjectsLocalOnheapSelfTest extends GridCacheBinaryObjectsLocalSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOnheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOnheapSelfTest.java
new file mode 100644
index 0000000..07a858e
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadOnheapSelfTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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.dht;
+
+public class GridCacheDhtPreloadOnheapSelfTest extends GridCacheDhtPreloadSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
index 9987a8d..43aa10b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@ -136,6 +136,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
cacheCfg.setRebalanceMode(preloadMode);
cacheCfg.setAffinity(new RendezvousAffinityFunction(false, partitions));
cacheCfg.setBackups(backups);
+ cacheCfg.setOnheapCacheEnabled(onheapCacheEnabled());
return cacheCfg;
}
@@ -163,6 +164,13 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
}
/**
+ * @return {@code True} if on-heap cache is enabled.
+ */
+ protected boolean onheapCacheEnabled() {
+ return false;
+ }
+
+ /**
* @throws Exception If failed.
*/
public void testActivePartitionTransferSyncSameCoordinator() throws Exception {
@@ -344,7 +352,8 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
error("Test failed.", e);
throw e;
- } finally {
+ }
+ finally {
stopAllGrids();
}
}
@@ -432,7 +441,6 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
checkNodes(1000, 4, false, false);
}
-
/**
* @throws Exception If failed.
*/
@@ -549,17 +557,16 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
for (Ignite gg : ignites)
futs.add(waitForLocalEvent(gg.events(), new P1<Event>() {
- @Override public boolean apply(Event e) {
- CacheRebalancingEvent evt = (CacheRebalancingEvent)e;
+ @Override public boolean apply(Event e) {
+ CacheRebalancingEvent evt = (CacheRebalancingEvent)e;
- ClusterNode node = evt.discoveryNode();
+ ClusterNode node = evt.discoveryNode();
- return evt.type() == EVT_CACHE_REBALANCE_STOPPED && node.id().equals(nodeId) &&
- (evt.discoveryEventType() == EVT_NODE_LEFT ||
+ return evt.type() == EVT_CACHE_REBALANCE_STOPPED && node.id().equals(nodeId) &&
+ (evt.discoveryEventType() == EVT_NODE_LEFT ||
evt.discoveryEventType() == EVT_NODE_FAILED);
- }
- }, EVT_CACHE_REBALANCE_STOPPED));
-
+ }
+ }, EVT_CACHE_REBALANCE_STOPPED));
info("Before grid stop [name=" + g.name() + ", fullTop=" + top2string(ignites));
@@ -607,7 +614,8 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
error("Test failed.", e);
throw e;
- } finally {
+ }
+ finally {
stopAllGrids();
}
}
@@ -652,9 +660,9 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
boolean primary = primaryNode.equals(loc);
assertEquals("Key check failed [igniteInstanceName=" + ignite.name() +
- ", cache=" + cache.getName() + ", key=" + i + ", expected=" + i + ", actual=" + val +
- ", part=" + aff.partition(i) + ", primary=" + primary + ", affNodes=" + U.nodeIds(affNodes) +
- ", locId=" + loc.id() + ", allNodes=" + U.nodeIds(nodes) + ", allParts=" + top2string(grids) + ']',
+ ", cache=" + cache.getName() + ", key=" + i + ", expected=" + i + ", actual=" + val +
+ ", part=" + aff.partition(i) + ", primary=" + primary + ", affNodes=" + U.nodeIds(affNodes) +
+ ", locId=" + loc.id() + ", allNodes=" + U.nodeIds(nodes) + ", allParts=" + top2string(grids) + ']',
Integer.toString(i), val);
}
}
@@ -664,7 +672,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
* @param grids Grids
* @return String representation of all partitions and their state.
*/
- @SuppressWarnings( {"ConstantConditions"})
+ @SuppressWarnings({"ConstantConditions"})
private String top2string(Iterable<Ignite> grids) {
Map<String, String> map = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java
new file mode 100644
index 0000000..b1fb215
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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.dht;
+
+import org.apache.ignite.cache.CacheAtomicityMode;
+
+public class GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest extends GridCachePartitionedNearDisabledOnheapFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return CacheAtomicityMode.ATOMIC;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java
new file mode 100644
index 0000000..20e7b7a
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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.dht;
+
+import org.apache.ignite.cache.CacheAtomicityMode;
+
+public class GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest extends GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return CacheAtomicityMode.ATOMIC;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapFullApiSelfTest.java
new file mode 100644
index 0000000..620db8a
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapFullApiSelfTest.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.dht;
+
+public class GridCachePartitionedNearDisabledOnheapFullApiSelfTest
+ extends GridCachePartitionedNearDisabledFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.java
new file mode 100644
index 0000000..3769103
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.dht;
+
+public class GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest
+ extends GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java
new file mode 100644
index 0000000..c7d56e3
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import org.apache.ignite.cache.CacheAtomicityMode;
+
+public class GridCachePartitionedAtomicOnheapFullApiSelfTest extends GridCachePartitionedOnheapFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return CacheAtomicityMode.ATOMIC;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java
new file mode 100644
index 0000000..703d88c
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import org.apache.ignite.cache.CacheAtomicityMode;
+
+public class GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest extends GridCachePartitionedOnheapMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicityMode atomicityMode() {
+ return CacheAtomicityMode.ATOMIC;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapFullApiSelfTest.java
new file mode 100644
index 0000000..c9f29fe
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapFullApiSelfTest.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+public class GridCachePartitionedOnheapFullApiSelfTest extends GridCachePartitionedFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapMultiNodeFullApiSelfTest.java
new file mode 100644
index 0000000..14cc6cb
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOnheapMultiNodeFullApiSelfTest.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+public class GridCachePartitionedOnheapMultiNodeFullApiSelfTest extends GridCachePartitionedMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapFullApiSelfTest.java
new file mode 100644
index 0000000..4280277
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapFullApiSelfTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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.replicated;
+
+public class GridCacheReplicatedOnheapFullApiSelfTest extends GridCacheReplicatedFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.java
new file mode 100644
index 0000000..cd04b58
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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.replicated;
+
+public class GridCacheReplicatedOnheapMultiNodeFullApiSelfTest extends GridCacheReplicatedMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalOnheapExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalOnheapExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalOnheapExpiryPolicyTest.java
new file mode 100644
index 0000000..af178e5
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalOnheapExpiryPolicyTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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.expiry;
+
+public class IgniteCacheAtomicLocalOnheapExpiryPolicyTest extends IgniteCacheAtomicLocalExpiryPolicyTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicOnheapExpiryPolicyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicOnheapExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicOnheapExpiryPolicyTest.java
new file mode 100644
index 0000000..f71a4e3
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicOnheapExpiryPolicyTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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.expiry;
+
+public class IgniteCacheAtomicOnheapExpiryPolicyTest extends IgniteCacheAtomicExpiryPolicyTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
new file mode 100644
index 0000000..ac1faf8
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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.multijvm;
+
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest;
+
+public class GridCacheAtomicOnheapMultiJvmFullApiSelfTest extends GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean isMultiJvm() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java
new file mode 100644
index 0000000..0ce6ada
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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.multijvm;
+
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest;
+
+public class GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean isMultiJvm() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java
new file mode 100644
index 0000000..e2d716f
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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.multijvm;
+
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest;
+
+public class GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest extends GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean isMultiJvm() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java
new file mode 100644
index 0000000..bdde212
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCachePartitionedOnheapMultiJvmFullApiSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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.multijvm;
+
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOnheapMultiNodeFullApiSelfTest;
+
+public class GridCachePartitionedOnheapMultiJvmFullApiSelfTest extends GridCachePartitionedOnheapMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean isMultiJvm() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java
new file mode 100644
index 0000000..c609ce7
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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.multijvm;
+
+import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOnheapMultiNodeFullApiSelfTest;
+
+public class GridCacheReplicatedOnheapMultiJvmFullApiSelfTest extends GridCacheReplicatedOnheapMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean isMultiJvm() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
index 95cafd6..14cdc2a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
@@ -84,10 +84,6 @@ public class ConfigVariations {
);
/** */
- private static final ConfigParameter<Object> OFFHEAP_ENABLED =
- Parameters.parameter("setOffHeapMaxMemory", 10 * 1024 * 1024L);
-
- /** */
@SuppressWarnings("unchecked")
private static final ConfigParameter<IgniteConfiguration>[][] BASIC_IGNITE_SET = new ConfigParameter[][] {
Parameters.objectParameters("setMarshaller", Parameters.factory(BinaryMarshaller.class), optimizedMarshallerFactory()),
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
index 15f3beb..c822e1e 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
@@ -30,6 +30,7 @@ import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearE
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearEnabledPrimaryWriteOrderMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearOnlyMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicNearOnlyMultiJvmP2PDisabledFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicOnheapMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest;
@@ -40,14 +41,18 @@ import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitioned
import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedFairAffinityMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedMultiJvmP2PDisabledFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledFairAffinityMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledMultiJvmP2PDisabledFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedOnheapMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedAtomicMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedMultiJvmP2PDisabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.multijvm.GridCacheReplicatedOnheapMultiJvmFullApiSelfTest;
/**
* Multi-JVM test suite.
@@ -98,6 +103,12 @@ public class IgniteCacheFullApiMultiJvmSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicClientOnlyFairAffinityMultiJvmFullApiSelfTest.class);
+ suite.addTestSuite(GridCacheAtomicOnheapMultiJvmFullApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOnheapMultiJvmFullApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedOnheapMultiJvmFullApiSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.class);
+
return suite;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
index f7b8316..9eeae05 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
@@ -26,10 +26,14 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtom
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicReloadAllSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedReloadAllSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledFairAffinityMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledMultiNodeP2PDisabledFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOnheapFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.CachePartitionedMultiNodeLongTxTimeoutFullApiTest;
import org.apache.ignite.internal.processors.cache.distributed.near.CachePartitionedNearEnabledMultiNodeLongTxTimeoutFullApiTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicClientOnlyFairAffinityMultiNodeFullApiSelfTest;
@@ -53,6 +57,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNea
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearReloadAllSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearTxMultiNodeSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedAtomicOnheapFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedFilteredPutSelfTest;
@@ -63,6 +69,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOnheapFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOnheapMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.CacheReplicatedFairAffinityExcludeNeighborsMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.CacheReplicatedFairAffinityMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.CacheReplicatedRendezvousAffinityExcludeNeighborsMultiNodeFullApiSelfTest;
@@ -104,6 +112,11 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheAtomicNearEnabledFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedOnheapFullApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedAtomicOnheapFullApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedNearDisabledOnheapFullApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.class);
+
// No primary.
suite.addTestSuite(GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest.class);
@@ -159,6 +172,11 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheNearTxMultiNodeSelfTest.class);
suite.addTestSuite(GridCachePartitionedMultiNodeCounterSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedOnheapMultiNodeFullApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.class);
+
// Old affinity assignment mode.
suite.addTestSuite(GridCachePartitionedLateAffDisabledMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicLateAffDisabledPrimaryWriteOrderMultiNodeFullApiSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bad8c67/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index f99e2f7..6ffb135 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -65,6 +65,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtP
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadDelayedSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadDisabledSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadMultiThreadedSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadOnheapSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadPutGetSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadStartStopSelfTest;
@@ -203,6 +204,7 @@ public class IgniteCacheTestSuite2 extends TestSuite {
suite.addTest(new TestSuite(GridCachePartitionedTxMultiThreadedSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedNearDisabledTxMultiThreadedSelfTest.class));
suite.addTest(new TestSuite(GridCacheDhtPreloadSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtPreloadOnheapSelfTest.class));
suite.addTest(new TestSuite(GridCacheDhtPreloadBigDataSelfTest.class));
suite.addTest(new TestSuite(GridCacheDhtPreloadPutGetSelfTest.class));
suite.addTest(new TestSuite(GridCacheDhtPreloadDisabledSelfTest.class));
[44/53] [abbrv] ignite git commit: ignite-3477-master fix hibernate
cache proxy description
Posted by ag...@apache.org.
ignite-3477-master fix hibernate cache proxy description
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a7afb7f4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a7afb7f4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a7afb7f4
Branch: refs/heads/ignite-3477-master
Commit: a7afb7f496deac41a05deca39ed180a1d37afa4d
Parents: 782ff0a
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Mon Apr 10 13:07:24 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Mon Apr 10 13:07:24 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/cache/hibernate/HibernateCacheProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a7afb7f4/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
index 824cac4..69d9097 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
@@ -50,7 +50,7 @@ import org.apache.ignite.transactions.TransactionIsolation;
import org.jetbrains.annotations.Nullable;
/**
- *
+ * Hibernate cache proxy.
*/
public class HibernateCacheProxy implements IgniteInternalCache<Object, Object> {
/** Delegate. */
[34/53] [abbrv] ignite git commit: ignite-4535 : Removed cache
configuration properties related to synchronous eviction.
Posted by ag...@apache.org.
ignite-4535 : Removed cache configuration properties related to synchronous eviction.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ac872077
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ac872077
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ac872077
Branch: refs/heads/ignite-3477-master
Commit: ac8720779b44bf32310e1484d7ca91036c9d67ae
Parents: 6ebddae
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Apr 6 17:08:51 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Apr 6 17:08:51 2017 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 151 -------------------
.../configuration/NearCacheConfiguration.java | 1 -
.../processors/cache/GridCacheAttributes.java | 14 --
.../cache/GridCacheEvictionManager.java | 18 ---
.../processors/cache/GridCacheProcessor.java | 13 +-
.../utils/PlatformConfigurationUtils.java | 10 --
.../cache/VisorCacheEvictionConfiguration.java | 55 -------
.../cache/GridCachePartitionedGetSelfTest.java | 1 -
.../GridCachePreloadingEvictionsSelfTest.java | 3 -
...gniteCacheLoadRebalanceEvictionSelfTest.java | 1 -
...gniteCacheP2pUnmarshallingNearErrorTest.java | 3 -
...tractPartitionedByteArrayValuesSelfTest.java | 1 -
...eColocatedOptimisticTransactionSelfTest.java | 1 -
...GridCacheDhtEvictionNearReadersSelfTest.java | 5 -
.../dht/GridCacheDhtEvictionSelfTest.java | 5 -
.../near/GridCacheNearReadersSelfTest.java | 1 -
.../GridCachePartitionedFullApiSelfTest.java | 2 -
...stractReplicatedByteArrayValuesSelfTest.java | 1 -
.../GridCacheReplicatedEvictionSelfTest.java | 135 -----------------
.../cache/eviction/EvictionAbstractTest.java | 34 -----
.../GridCacheEmptyEntriesAbstractSelfTest.java | 1 -
.../SortedEvictionPolicyPerformanceTest.java | 1 -
.../GridCacheLocalByteArrayValuesSelfTest.java | 1 -
.../DataStreamProcessorSelfTest.java | 2 -
.../GridCachePartitionedAtomicLongLoadTest.java | 1 -
.../testsuites/IgniteCacheTestSuite2.java | 2 -
.../cache/GridCacheOffheapIndexGetSelfTest.java | 2 -
.../commands/cache/VisorCacheCommand.scala | 5 -
28 files changed, 1 insertion(+), 469 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/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 383a2a6..4f8f3cf 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
@@ -148,9 +148,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default maximum eviction queue ratio. */
public static final float DFLT_MAX_EVICTION_OVERFLOW_RATIO = 10;
- /** Default eviction key buffer size for batching synchronized evicts. */
- public static final int DFLT_EVICT_KEY_BUFFER_SIZE = 1024;
-
/** Default synchronous eviction timeout in milliseconds. */
public static final long DFLT_EVICT_SYNCHRONIZED_TIMEOUT = 10000;
@@ -234,21 +231,9 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** */
private boolean onheapCache;
- /** Eviction key buffer size. */
- private int evictKeyBufSize = DFLT_EVICT_KEY_BUFFER_SIZE;
-
- /** Synchronous eviction concurrency level. */
- private int evictSyncConcurrencyLvl = DFLT_EVICT_SYNCHRONIZED_CONCURRENCY_LEVEL;
-
- /** Synchronous eviction timeout. */
- private long evictSyncTimeout = DFLT_EVICT_SYNCHRONIZED_TIMEOUT;
-
/** Eviction filter. */
private EvictionFilter<?, ?> evictFilter;
- /** Maximum eviction overflow ratio. */
- private float evictMaxOverflowRatio = DFLT_MAX_EVICTION_OVERFLOW_RATIO;
-
/** Eager ttl flag. */
private boolean eagerTtl = DFLT_EAGER_TTL;
@@ -437,11 +422,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
dfltLockTimeout = cc.getDefaultLockTimeout();
eagerTtl = cc.isEagerTtl();
evictFilter = cc.getEvictionFilter();
- evictKeyBufSize = cc.getEvictSynchronizedKeyBufferSize();
- evictMaxOverflowRatio = cc.getEvictMaxOverflowRatio();
evictPlc = cc.getEvictionPolicy();
- evictSyncConcurrencyLvl = cc.getEvictSynchronizedConcurrencyLevel();
- evictSyncTimeout = cc.getEvictSynchronizedTimeout();
expiryPolicyFactory = cc.getExpiryPolicyFactory();
indexedTypes = cc.getIndexedTypes();
interceptor = cc.getInterceptor();
@@ -633,138 +614,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
return this;
}
- public boolean isEvictSynchronized() {
- return false;
- }
-
- /**
- * Sets flag indicating whether eviction is synchronized with backup nodes or near caches
- * (or the rest of the nodes for replicated cache).
- *
- * @param evictSync {@code true} if synchronized, {@code false} if not.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setEvictSynchronized(boolean evictSync) {
-// this.evictSync = evictSync;
-
- return this;
- }
-
- /**
- * Gets size of the key buffer for synchronized evictions.
- * <p>
- * Default value is defined by {@link #DFLT_EVICT_KEY_BUFFER_SIZE}.
- *
- * @return Eviction key buffer size.
- */
- public int getEvictSynchronizedKeyBufferSize() {
- return evictKeyBufSize;
- }
-
- /**
- * Sets eviction key buffer size.
- *
- * @param evictKeyBufSize Eviction key buffer size.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setEvictSynchronizedKeyBufferSize(int evictKeyBufSize) {
- this.evictKeyBufSize = evictKeyBufSize;
-
- return this;
- }
-
- /**
- * Gets concurrency level for synchronized evictions. This flag only makes sense
- * with {@link #isEvictSynchronized()} set
- * to {@code true}. When synchronized evictions are enabled, it is possible that
- * local eviction policy will try to evict entries faster than evictions can be
- * synchronized with backup or near nodes. This value specifies how many concurrent
- * synchronous eviction sessions should be allowed before the system is forced to
- * wait and let synchronous evictions catch up with the eviction policy.
- * <p>
- * Note that if synchronous evictions start lagging, it is possible that you have either
- * too big or too small eviction key buffer size or small eviction timeout. In that case
- * you will need to adjust {@link #getEvictSynchronizedKeyBufferSize} or
- * {@link #getEvictSynchronizedTimeout()} values as well.
- * <p>
- * Default value is defined by {@link #DFLT_EVICT_SYNCHRONIZED_CONCURRENCY_LEVEL}.
- *
- * @return Synchronous eviction concurrency level.
- */
- public int getEvictSynchronizedConcurrencyLevel() {
- return evictSyncConcurrencyLvl;
- }
-
- /**
- * Sets concurrency level for synchronized evictions.
- *
- * @param evictSyncConcurrencyLvl Concurrency level for synchronized evictions.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setEvictSynchronizedConcurrencyLevel(int evictSyncConcurrencyLvl) {
- this.evictSyncConcurrencyLvl = evictSyncConcurrencyLvl;
-
- return this;
- }
-
- /**
- * Gets timeout for synchronized evictions.
- * <p>
- * Node that initiates eviction waits for responses
- * from remote nodes within this timeout.
- * <p>
- * Default value is defined by {@link #DFLT_EVICT_SYNCHRONIZED_TIMEOUT}.
- *
- * @return Synchronous eviction timeout.
- */
- public long getEvictSynchronizedTimeout() {
- return evictSyncTimeout;
- }
-
- /**
- * Sets timeout for synchronized evictions.
- *
- * @param evictSyncTimeout Timeout for synchronized evictions.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setEvictSynchronizedTimeout(long evictSyncTimeout) {
- this.evictSyncTimeout = evictSyncTimeout;
-
- return this;
- }
-
- /**
- * This value denotes the maximum size of eviction queue in percents of cache
- * size in case of distributed cache (replicated and partitioned) and using
- * synchronized eviction (that is if {@link #isEvictSynchronized()} returns
- * {@code true}).
- * <p>
- * That queue is used internally as a buffer to decrease network costs for
- * synchronized eviction. Once queue size reaches specified value all required
- * requests for all entries in the queue are sent to remote nodes and the queue
- * is cleared.
- * <p>
- * Default value is defined by {@link #DFLT_MAX_EVICTION_OVERFLOW_RATIO} and
- * equals to {@code 10%}.
- *
- * @return Maximum size of eviction queue in percents of cache size.
- */
- public float getEvictMaxOverflowRatio() {
- return evictMaxOverflowRatio;
- }
-
- /**
- * Sets maximum eviction overflow ratio.
- *
- * @param evictMaxOverflowRatio Maximum eviction overflow ratio.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setEvictMaxOverflowRatio(float evictMaxOverflowRatio) {
- this.evictMaxOverflowRatio = evictMaxOverflowRatio;
-
- return this;
- }
-
/**
* Gets eviction filter to specify which entries should not be evicted
* (except explicit evict by calling {@link IgniteCache#localEvict(Collection)}).
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
index 7c948dc..0fc94655 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
@@ -71,7 +71,6 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> {
*
* @return Near eviction policy.
* @see CacheConfiguration#getEvictionPolicy()
- * @see CacheConfiguration#isEvictSynchronized()
*/
public EvictionPolicy<K, V> getNearEvictionPolicy() {
return nearEvictPlc;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index 42a9cfe..292ea4a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@ -205,20 +205,6 @@ public class GridCacheAttributes implements Serializable {
}
/**
- * @return Flag indicating whether eviction is synchronized.
- */
- public boolean evictSynchronized() {
- return ccfg.isEvictSynchronized();
- }
-
- /**
- * @return Maximum eviction overflow ratio.
- */
- public float evictMaxOverflowRatio() {
- return ccfg.getEvictMaxOverflowRatio();
- }
-
- /**
* @return Default lock timeout.
*/
public long defaultLockTimeout() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index 4294578..27d628b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -132,12 +132,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
filter = cfg.getEvictionFilter();
- if (cfg.getEvictMaxOverflowRatio() < 0)
- throw new IgniteCheckedException("Configuration parameter 'maxEvictOverflowRatio' cannot be negative.");
-
- if (cfg.getEvictSynchronizedKeyBufferSize() < 0)
- throw new IgniteCheckedException("Configuration parameter 'evictSynchronizedKeyBufferSize' cannot be negative.");
-
if (log.isDebugEnabled())
log.debug("Eviction manager started on node: " + cctx.nodeId());
}
@@ -559,18 +553,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/**
- * @return Max queue size.
- */
- private int maxQueueSize() {
- int size = (int)(cctx.cache().size() * cctx.config().getEvictMaxOverflowRatio()) / 100;
-
- if (size <= 0)
- size = 500;
-
- return Math.min(size, cctx.config().getEvictSynchronizedKeyBufferSize());
- }
-
- /**
* @param info Eviction info.
* @return Version aware filter.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 987c0c3..c771e54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -342,11 +342,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
String msg = "Disable eviction policy (remove from configuration)";
- if (cfg.getEvictionPolicy() != null) {
+ if (cfg.getEvictionPolicy() != null)
perf.add(msg, false);
-
- perf.add("Disable synchronized evictions (set 'evictSynchronized' to false)", !cfg.isEvictSynchronized());
- }
else
perf.add(msg, true);
@@ -3308,15 +3305,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
"Write behind flush thread count", locAttr.writeBehindFlushThreadCount(),
rmtAttr.writeBehindFlushThreadCount(), false);
- CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "evictMaxOverflowRatio",
- "Eviction max overflow ratio", locAttr.evictMaxOverflowRatio(),
- rmtAttr.evictMaxOverflowRatio(), true);
-
if (locAttr.cacheMode() == PARTITIONED) {
- CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "evictSynchronized",
- "Eviction synchronized", locAttr.evictSynchronized(), rmtAttr.evictSynchronized(),
- true);
-
CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "nearEvictionPolicy",
"Near eviction policy", locAttr.nearEvictionPolicyClassName(),
rmtAttr.nearEvictionPolicyClassName(), false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index f8709ed..c477e9f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -145,17 +145,12 @@ public class PlatformConfigurationUtils {
ccfg.setCacheMode(CacheMode.fromOrdinal(in.readInt()));
ccfg.setCopyOnRead(in.readBoolean());
ccfg.setEagerTtl(in.readBoolean());
- ccfg.setEvictSynchronized(in.readBoolean());
- ccfg.setEvictSynchronizedConcurrencyLevel(in.readInt());
- ccfg.setEvictSynchronizedKeyBufferSize(in.readInt());
- ccfg.setEvictSynchronizedTimeout(in.readLong());
ccfg.setInvalidate(in.readBoolean());
ccfg.setStoreKeepBinary(in.readBoolean());
ccfg.setLoadPreviousValue(in.readBoolean());
ccfg.setDefaultLockTimeout(in.readLong());
ccfg.setLongQueryWarningTimeout(in.readLong());
ccfg.setMaxConcurrentAsyncOperations(in.readInt());
- ccfg.setEvictMaxOverflowRatio(in.readFloat());
ccfg.setName(in.readString());
ccfg.setReadFromBackup(in.readBoolean());
ccfg.setRebalanceBatchSize(in.readInt());
@@ -774,17 +769,12 @@ public class PlatformConfigurationUtils {
writeEnumInt(writer, ccfg.getCacheMode(), CacheConfiguration.DFLT_CACHE_MODE);
writer.writeBoolean(ccfg.isCopyOnRead());
writer.writeBoolean(ccfg.isEagerTtl());
- writer.writeBoolean(ccfg.isEvictSynchronized());
- writer.writeInt(ccfg.getEvictSynchronizedConcurrencyLevel());
- writer.writeInt(ccfg.getEvictSynchronizedKeyBufferSize());
- writer.writeLong(ccfg.getEvictSynchronizedTimeout());
writer.writeBoolean(ccfg.isInvalidate());
writer.writeBoolean(ccfg.isStoreKeepBinary());
writer.writeBoolean(ccfg.isLoadPreviousValue());
writer.writeLong(ccfg.getDefaultLockTimeout());
writer.writeLong(ccfg.getLongQueryWarningTimeout());
writer.writeInt(ccfg.getMaxConcurrentAsyncOperations());
- writer.writeFloat(ccfg.getEvictMaxOverflowRatio());
writer.writeString(ccfg.getName());
writer.writeBoolean(ccfg.isReadFromBackup());
writer.writeInt(ccfg.getRebalanceBatchSize());
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
index 05d5c38..b6f72c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
@@ -43,21 +43,6 @@ public class VisorCacheEvictionConfiguration implements Serializable, LessNaming
/** Eviction filter to specify which entries should not be evicted. */
private String filter;
- /** Synchronous eviction concurrency level. */
- private int syncConcurrencyLvl;
-
- /** Synchronous eviction timeout. */
- private long syncTimeout;
-
- /** Synchronized key buffer size. */
- private int syncKeyBufSize;
-
- /** Synchronous evicts flag. */
- private boolean evictSynchronized;
-
- /** Eviction max overflow ratio. */
- private float maxOverflowRatio;
-
/**
* @param ccfg Cache configuration.
* @return Data transfer object for eviction configuration properties.
@@ -70,11 +55,6 @@ public class VisorCacheEvictionConfiguration implements Serializable, LessNaming
cfg.plc = compactClass(plc);
cfg.plcMaxSize = evictionPolicyMaxSize(plc);
cfg.filter = compactClass(ccfg.getEvictionFilter());
- cfg.syncConcurrencyLvl = ccfg.getEvictSynchronizedConcurrencyLevel();
- cfg.syncTimeout = ccfg.getEvictSynchronizedTimeout();
- cfg.syncKeyBufSize = ccfg.getEvictSynchronizedKeyBufferSize();
- cfg.evictSynchronized = ccfg.isEvictSynchronized();
- cfg.maxOverflowRatio = ccfg.getEvictMaxOverflowRatio();
return cfg;
}
@@ -100,41 +80,6 @@ public class VisorCacheEvictionConfiguration implements Serializable, LessNaming
return filter;
}
- /**
- * @return synchronized eviction concurrency level.
- */
- public int synchronizedConcurrencyLevel() {
- return syncConcurrencyLvl;
- }
-
- /**
- * @return synchronized eviction timeout.
- */
- public long synchronizedTimeout() {
- return syncTimeout;
- }
-
- /**
- * @return Synchronized key buffer size.
- */
- public int synchronizedKeyBufferSize() {
- return syncKeyBufSize;
- }
-
- /**
- * @return Synchronous evicts flag.
- */
- public boolean evictSynchronized() {
- return evictSynchronized;
- }
-
- /**
- * @return Eviction max overflow ratio.
- */
- public float maxOverflowRatio() {
- return maxOverflowRatio;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorCacheEvictionConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
index fab05df..81f22d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
@@ -90,7 +90,6 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest {
cc.setBackups(1);
cc.setRebalanceMode(SYNC);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setEvictSynchronized(false);
cc.setNearConfiguration(null);
return cc;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
index 78a92cb..82d9b41 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
@@ -81,10 +81,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
partCacheCfg.setAffinity(new GridCacheModuloAffinityFunction(1, 1));
partCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
partCacheCfg.setNearConfiguration(null);
- partCacheCfg.setEvictSynchronized(true);
partCacheCfg.setEvictionPolicy(null);
- partCacheCfg.setEvictSynchronizedKeyBufferSize(25);
- partCacheCfg.setEvictMaxOverflowRatio(0.99f);
partCacheCfg.setRebalanceMode(ASYNC);
partCacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
index bf8c416..3c50043 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
@@ -75,7 +75,6 @@ public class IgniteCacheLoadRebalanceEvictionSelfTest extends GridCommonAbstract
CacheConfiguration<String, byte[]> cacheCfg = new CacheConfiguration<>();
cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
- cacheCfg.setEvictSynchronized(false);
cacheCfg.setCacheMode(CacheMode.PARTITIONED);
cacheCfg.setBackups(1);
cacheCfg.setReadFromBackup(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
index 87d852f..a4a831f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
@@ -35,9 +35,6 @@ public class IgniteCacheP2pUnmarshallingNearErrorTest extends IgniteCacheP2pUnma
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
if (cfg.isClientMode() == null || !cfg.isClientMode()) {
- cfg.getCacheConfiguration()[0].setEvictMaxOverflowRatio(0);
- cfg.getCacheConfiguration()[0].setEvictSynchronized(true);
- cfg.getCacheConfiguration()[0].setEvictSynchronizedKeyBufferSize(1);
cfg.getCacheConfiguration()[0].setEvictionPolicy(new FifoEvictionPolicy(1));
cfg.getCacheConfiguration()[0].setOnheapCacheEnabled(true);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
index a1ee7cc..16ebf7e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
@@ -53,7 +53,6 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend
cfg.setNearConfiguration(nearConfiguration());
cfg.setBackups(1);
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setEvictSynchronized(false);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
index f056825..e32d4a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
@@ -77,7 +77,6 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA
cc.setNearConfiguration(null);
cc.setBackups(1);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setEvictSynchronized(false);
c.setDiscoverySpi(disco);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index 834861e..20162a7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@ -76,15 +76,10 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setEvictSynchronized(true);
cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(atomicityMode());
cacheCfg.setBackups(1);
- // Set eviction queue size explicitly.
- cacheCfg.setEvictSynchronizedKeyBufferSize(1);
- cacheCfg.setEvictMaxOverflowRatio(0);
-
FifoEvictionPolicy plc = new FifoEvictionPolicy();
plc.setMaxSize(10);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
index 64baf84..69aab3e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
@@ -77,7 +77,6 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setRebalanceMode(NONE);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setEvictSynchronized(true);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setBackups(1);
@@ -89,10 +88,6 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
nearCfg.setNearEvictionPolicy(nearPlc);
cacheCfg.setNearConfiguration(nearCfg);
- // Set eviction queue size explicitly.
- cacheCfg.setEvictMaxOverflowRatio(0);
- cacheCfg.setEvictSynchronizedKeyBufferSize(1);
-
FifoEvictionPolicy plc = new FifoEvictionPolicy();
plc.setMaxSize(10000);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index faf9ba2..6f7ff65 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -82,7 +82,6 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
cacheCfg.setRebalanceMode(NONE);
cacheCfg.setAffinity(aff);
- cacheCfg.setEvictSynchronized(true);
cacheCfg.setAtomicityMode(atomicityMode());
cacheCfg.setBackups(aff.backups());
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
index 5aad5a6..b790975 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
@@ -51,8 +51,6 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
@Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName);
- cfg.setEvictSynchronized(false);
-
cfg.setAtomicityMode(atomicityMode());
return cfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
index bbd5bf7..b4e58fc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
@@ -46,7 +46,6 @@ public abstract class GridCacheAbstractReplicatedByteArrayValuesSelfTest extends
cfg.setCacheMode(REPLICATED);
cfg.setAtomicityMode(TRANSACTIONAL);
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setEvictSynchronized(false);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
deleted file mode 100644
index 4233244..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.replicated;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.UUID;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.events.Event;
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
-import org.apache.ignite.internal.util.typedef.P1;
-import org.apache.ignite.internal.util.typedef.PA;
-import org.apache.ignite.lang.IgniteFuture;
-import org.apache.ignite.lang.IgnitePredicate;
-import org.apache.ignite.testframework.GridTestUtils;
-
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_EVICTED;
-
-/**
- * Tests synchronous eviction for replicated cache.
- */
-public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 4;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return REPLICATED;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
- CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
-
- ccfg.setEvictSynchronized(true);
- ccfg.setEvictSynchronizedKeyBufferSize(1);
-
- return ccfg;
- }
-
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearConfiguration() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override protected boolean swapEnabled() {
- return false;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testEvictSynchronized() throws Exception {
- final int KEYS = 10;
-
- for (int i = 0; i < KEYS; i++)
- jcache(0).put(String.valueOf(i), i);
-
- for (int g = 0 ; g < gridCount(); g++) {
- for (int i = 0; i < KEYS; i++)
- assertNotNull(jcache(g).localPeek(String.valueOf(i)));
- }
-
- Collection<IgniteFuture<Event>> futs = new ArrayList<>();
-
- for (int g = 0 ; g < gridCount(); g++)
- futs.add(waitForLocalEvent(grid(g).events(), nodeEvent(grid(g).localNode().id()), EVT_CACHE_ENTRY_EVICTED));
-
- for (int g = 0; g < gridCount(); g++) {
- for (int i = 0; i < KEYS; i++) {
- if (grid(g).affinity(null).isPrimary(grid(g).localNode(), String.valueOf(i)))
- jcache(g).localEvict(Collections.singleton(String.valueOf(i)));
- }
- }
-
- for (IgniteFuture<Event> fut : futs)
- fut.get(3000);
-
- boolean evicted = GridTestUtils.waitForCondition(new PA() {
- @Override public boolean apply() {
- for (int g = 0 ; g < gridCount(); g++) {
- for (int i = 0; i < KEYS; i++) {
- if (jcache(g).localPeek(String.valueOf(i)) != null) {
- log.info("Non-null value, will wait [grid=" + g + ", key=" + i + ']');
-
- return false;
- }
- }
- }
-
- return true;
- }
- }, 3000);
-
- assertTrue(evicted);
- }
-
- /**
- * @param nodeId Node id.
- * @return Predicate for events belonging to specified node.
- */
- private IgnitePredicate<Event> nodeEvent(final UUID nodeId) {
- assert nodeId != null;
-
- return new P1<Event>() {
- @Override public boolean apply(Event e) {
- info("Predicate called [e.nodeId()=" + e.node().id() + ", nodeId=" + nodeId + ']');
-
- return e.node().id().equals(nodeId);
- }
- };
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
index dfb4c68..b6fcebc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
@@ -75,12 +75,6 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
/** Near enabled flag. */
protected boolean nearEnabled;
- /** Evict backup sync. */
- protected boolean evictSync;
-
- /** Evict near sync. */
- protected boolean evictNearSync = true;
-
/** Policy max. */
protected int plcMax = 10;
@@ -111,7 +105,6 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
cc.setCacheMode(mode);
cc.setEvictionPolicy(createPolicy(plcMax));
cc.setOnheapCacheEnabled(true);
- cc.setEvictSynchronized(evictSync);
cc.setWriteSynchronizationMode(syncCommit ? FULL_SYNC : FULL_ASYNC);
cc.setStartSize(plcMax);
cc.setAtomicityMode(TRANSACTIONAL);
@@ -706,7 +699,6 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
nearEnabled = true;
nearMax = 3;
plcMax = 10;
- evictNearSync = true;
syncCommit = true;
gridCnt = 2;
@@ -719,19 +711,6 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
mode = PARTITIONED;
nearEnabled = false;
plcMax = 100;
- evictSync = false;
-
- gridCnt = 2;
-
- checkPartitionedMultiThreaded();
- }
-
- /** @throws Exception If failed. */
- public void testPartitionedNearDisabledBackupSyncMultiThreaded() throws Exception {
- mode = PARTITIONED;
- nearEnabled = false;
- plcMax = 100;
- evictSync = true;
gridCnt = 2;
@@ -743,19 +722,6 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
mode = PARTITIONED;
nearEnabled = true;
plcMax = 10;
- evictSync = false;
-
- gridCnt = 2;
-
- checkPartitionedMultiThreaded();
- }
-
- /** @throws Exception If failed. */
- public void testPartitionedNearEnabledBackupSyncMultiThreaded() throws Exception {
- mode = PARTITIONED;
- nearEnabled = true;
- plcMax = 10;
- evictSync = true;
gridCnt = 2;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
index 04fdf77..c97f2ca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
@@ -83,7 +83,6 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cc.setEvictionPolicy(plc);
- cc.setEvictSynchronizedKeyBufferSize(1);
cc.setOnheapCacheEnabled(true);
if (testStore != null) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
index b583fb0..a3a61a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
@@ -81,7 +81,6 @@ public class SortedEvictionPolicyPerformanceTest extends GridCommonAbstractTest
ccfg.setEvictionPolicy(plc);
ccfg.setOnheapCacheEnabled(true);
- ccfg.setEvictSynchronized(false);
cfg.setPeerClassLoadingEnabled(false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
index 4a1a3da..1ad8d75 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
@@ -59,7 +59,6 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setCacheMode(LOCAL);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setEvictSynchronized(false);
c.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index 080902c..ec2aa61 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -132,8 +132,6 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setEvictSynchronized(false);
-
if (store != null) {
cc.setCacheStoreFactory(new IgniteReflectionFactory<CacheStore>(TestStore.class));
cc.setReadThrough(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index 6dfa609..c5cea67 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -82,7 +82,6 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
cc.setOnheapCacheEnabled(true);
cc.setBackups(1);
cc.setAffinity(new RendezvousAffinityFunction(true));
- cc.setEvictSynchronized(true);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index 6ffb135..4152abf 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -116,7 +116,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCach
import org.apache.ignite.internal.processors.cache.distributed.near.GridPartitionedBackupLoadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.NearCacheSyncUpdateTest;
import org.apache.ignite.internal.processors.cache.distributed.near.NoneRebalanceModeSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEvictionSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedJobExecutionTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicBasicStoreSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicGetAndTransformStoreSelfTest;
@@ -228,7 +227,6 @@ public class IgniteCacheTestSuite2 extends TestSuite {
suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class));
suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class));
suite.addTest(new TestSuite(GridCacheDhtEvictionSelfTest.class));
- suite.addTest(new TestSuite(GridCacheReplicatedEvictionSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedPreloadEventsSelfTest.class));
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
index 60fe5bf..f9e555e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
@@ -75,8 +75,6 @@ public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(1);
- cacheCfg.setEvictSynchronized(true);
- cacheCfg.setEvictSynchronizedKeyBufferSize(1);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setEvictionPolicy(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index ce77ffe..6d49a3b 100755
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -869,11 +869,6 @@ object VisorCacheCommand {
cacheT += ("Eviction Policy", safe(evictCfg.policy()))
cacheT += ("Eviction Policy Max Size", safe(evictCfg.policyMaxSize()))
cacheT += ("Eviction Filter", safe(evictCfg.filter()))
- cacheT += ("Eviction Key Buffer Size", evictCfg.synchronizedKeyBufferSize())
- cacheT += ("Eviction Synchronized", bool2Str(evictCfg.evictSynchronized()))
- cacheT += ("Eviction Overflow Ratio", evictCfg.maxOverflowRatio())
- cacheT += ("Synchronous Eviction Timeout", evictCfg.synchronizedTimeout())
- cacheT += ("Synchronous Eviction Concurrency Level", evictCfg.synchronizedConcurrencyLevel())
cacheT += ("Near Cache Enabled", bool2Str(nearCfg.nearEnabled()))
cacheT += ("Near Start Size", nearCfg.nearStartSize())
[35/53] [abbrv] ignite git commit: ignite-4535 : Javadoc.
Posted by ag...@apache.org.
ignite-4535 : Javadoc.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3b5a7458
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3b5a7458
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3b5a7458
Branch: refs/heads/ignite-3477-master
Commit: 3b5a74585eb9e5f236fc09e89a2c9e014f4444e7
Parents: ac87207
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Apr 6 17:16:55 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Apr 6 17:16:55 2017 +0300
----------------------------------------------------------------------
.../ignite/configuration/CacheConfiguration.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3b5a7458/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 4f8f3cf..0a5cd3d 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
@@ -540,12 +540,21 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
return this;
}
+ /**
+ * @return On-heap cache enabled flag.
+ */
public boolean isOnheapCacheEnabled() {
return onheapCache;
}
- public CacheConfiguration<K, V> setOnheapCacheEnabled(boolean value) {
- this.onheapCache = value;
+ /**
+ * Configures on-heap cache.
+ *
+ * @param onheapCache {@code True} if on-heap cache should be enabled.
+ * @return {@code this} for chaining.
+ */
+ public CacheConfiguration<K, V> setOnheapCacheEnabled(boolean onheapCache) {
+ this.onheapCache = onheapCache;
return this;
}
[18/53] [abbrv] ignite git commit: ignite-4535 : Removed sync evicts.
Posted by ag...@apache.org.
ignite-4535 : Removed sync evicts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/65d816f3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/65d816f3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/65d816f3
Branch: refs/heads/ignite-3477-master
Commit: 65d816f39a6985c2cc2104960ec1f41574e4e3a6
Parents: f2df0a7
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Mar 31 17:20:27 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Mar 31 17:20:27 2017 +0300
----------------------------------------------------------------------
.../processors/cache/CacheEvictionManager.java | 15 -
.../processors/cache/CacheMetricsImpl.java | 9 +-
.../cache/CacheOffheapEvictionManager.java | 15 -
.../processors/cache/GridCacheAdapter.java | 35 +-
.../cache/GridCacheEvictionManager.java | 1474 +-----------------
.../processors/cache/GridCacheUtils.java | 8 -
6 files changed, 43 insertions(+), 1513 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d816f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionManager.java
index d536a98..b614728 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionManager.java
@@ -41,11 +41,6 @@ public interface CacheEvictionManager extends GridCacheManager {
public void touch(GridCacheEntryEx e, AffinityTopologyVersion topVer);
/**
- * Notifications.
- */
- public void unwind();
-
- /**
* @param entry Entry to attempt to evict.
* @param obsoleteVer Obsolete version.
* @param filter Optional entry filter.
@@ -60,19 +55,9 @@ public interface CacheEvictionManager extends GridCacheManager {
@Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException;
/**
- * @return Current size of evict queue.
- */
- public int evictQueueSize();
-
- /**
* @param keys Keys to evict.
* @param obsoleteVer Obsolete version.
* @throws IgniteCheckedException In case of error.
*/
public void batchEvict(Collection<?> keys, @Nullable GridCacheVersion obsoleteVer) throws IgniteCheckedException;
-
- /**
- * @return {@code True} if either evicts or near evicts are synchronized, {@code false} otherwise.
- */
- public boolean evictSyncOrNearSync();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d816f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
index 534b6b2..dbe53ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
@@ -322,14 +322,7 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public int getDhtEvictQueueCurrentSize() {
- GridCacheContext<?, ?> ctx = cctx.isNear() ? dhtCtx : cctx;
-
- if (ctx == null)
- return -1;
-
- CacheEvictionManager evictMgr = ctx.evicts();
-
- return evictMgr != null ? evictMgr.evictQueueSize() : -1;
+ return -1;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d816f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java
index 6c925ad..e242b73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java
@@ -61,11 +61,6 @@ public class CacheOffheapEvictionManager extends GridCacheManagerAdapter impleme
}
/** {@inheritDoc} */
- @Override public void unwind() {
- // No-op.
- }
-
- /** {@inheritDoc} */
@Override public boolean evict(@Nullable GridCacheEntryEx entry,
@Nullable GridCacheVersion obsoleteVer,
boolean explicit,
@@ -74,17 +69,7 @@ public class CacheOffheapEvictionManager extends GridCacheManagerAdapter impleme
}
/** {@inheritDoc} */
- @Override public int evictQueueSize() {
- return 0;
- }
-
- /** {@inheritDoc} */
@Override public void batchEvict(Collection<?> keys, @Nullable GridCacheVersion obsoleteVer) {
// No-op.
}
-
- /** {@inheritDoc} */
- @Override public boolean evictSyncOrNearSync() {
- return false;
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d816f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 4a51c53..6b54230 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2308,8 +2308,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
*/
public IgniteInternalFuture<V> getAndPutAsync0(final K key,
final V val,
- @Nullable final CacheEntryPredicate filter)
- {
+ @Nullable final CacheEntryPredicate filter) {
return asyncOp(new AsyncOp<V>() {
@Override public IgniteInternalFuture<V> op(GridNearTxLocal tx, AffinityTopologyVersion readyTopVer) {
return tx.putAsync(ctx, readyTopVer, key, val, true, filter)
@@ -2865,7 +2864,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
return syncOp(new SyncOp<V>(true) {
@Override public V op(GridNearTxLocal tx) throws IgniteCheckedException {
- K key0 = keepBinary ? (K) ctx.toCacheKeyObject(key) : key;
+ K key0 = keepBinary ? (K)ctx.toCacheKeyObject(key) : key;
V ret = tx.removeAllAsync(ctx,
null,
@@ -2875,9 +2874,9 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/*singleRmv*/false).get().value();
if (ctx.config().getInterceptor() != null) {
- K key = keepBinary ? (K) ctx.unwrapBinaryIfNeeded(key0, true, false) : key0;
+ K key = keepBinary ? (K)ctx.unwrapBinaryIfNeeded(key0, true, false) : key0;
- return (V) ctx.config().getInterceptor().onBeforeRemove(new CacheEntryImpl(key, ret)).get2();
+ return (V)ctx.config().getInterceptor().onBeforeRemove(new CacheEntryImpl(key, ret)).get2();
}
return ret;
@@ -3948,7 +3947,8 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
}
/** {@inheritDoc} */
- @Override public Iterator<Cache.Entry<K, V>> scanIterator(boolean keepBinary, @Nullable IgniteBiPredicate<Object, Object> p)
+ @Override public Iterator<Cache.Entry<K, V>> scanIterator(boolean keepBinary,
+ @Nullable IgniteBiPredicate<Object, Object> p)
throws IgniteCheckedException {
return igniteIterator(keepBinary, p);
}
@@ -3975,7 +3975,8 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
* @return Distributed ignite cache iterator.
* @throws IgniteCheckedException If failed.
*/
- private Iterator<Cache.Entry<K, V>> igniteIterator(boolean keepBinary, @Nullable IgniteBiPredicate<Object, Object> p)
+ private Iterator<Cache.Entry<K, V>> igniteIterator(boolean keepBinary,
+ @Nullable IgniteBiPredicate<Object, Object> p)
throws IgniteCheckedException {
GridCacheContext ctx0 = ctx.isNear() ? ctx.near().dht().context() : ctx;
@@ -4518,17 +4519,11 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
GridCacheVersion obsoleteVer = ctx.versions().next();
- if (!ctx.evicts().evictSyncOrNearSync()) {
- try {
- ctx.evicts().batchEvict(keys, obsoleteVer);
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to perform batch evict for keys: " + keys, e);
- }
+ try {
+ ctx.evicts().batchEvict(keys, obsoleteVer);
}
- else {
- for (K k : keys)
- evictx(k, obsoleteVer, CU.empty0());
+ catch (IgniteCheckedException e) {
+ U.error(log, "Failed to perform batch evict for keys: " + keys, e);
}
}
@@ -4547,7 +4542,8 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
* @return Cached value.
* @throws IgniteCheckedException If failed.
*/
- @Nullable public final V get(K key, boolean deserializeBinary, final boolean needVer) throws IgniteCheckedException {
+ @Nullable public final V get(K key, boolean deserializeBinary,
+ final boolean needVer) throws IgniteCheckedException {
String taskName = ctx.kernalContext().job().currentTaskName();
return get0(key, taskName, deserializeBinary, needVer);
@@ -5377,7 +5373,8 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
* @param peekModes Cache peek modes.
* @param partition partition.
*/
- private PartitionSizeLongJob(String cacheName, AffinityTopologyVersion topVer, CachePeekMode[] peekModes, int partition) {
+ private PartitionSizeLongJob(String cacheName, AffinityTopologyVersion topVer, CachePeekMode[] peekModes,
+ int partition) {
super(cacheName, topVer);
this.peekModes = peekModes;
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d816f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index d752b53..4294578 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -110,57 +110,15 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
/** Eviction filter. */
private EvictionFilter filter;
- /** Eviction buffer. */
- private final ConcurrentLinkedDeque8<EvictionInfo> bufEvictQ = new ConcurrentLinkedDeque8<>();
-
- /** Active eviction futures. */
- private final Map<Long, EvictionFuture> futs = new ConcurrentHashMap8<>();
-
- /** Futures count modification lock. */
- private final Lock futsCntLock = new ReentrantLock();
-
- /** Futures count condition. */
- private final Condition futsCntCond = futsCntLock.newCondition();
-
- /** Active futures count. */
- private volatile int activeFutsCnt;
-
- /** Max active futures count. */
- private int maxActiveFuts;
-
- /** Generator of future IDs. */
- private final AtomicLong idGen = new AtomicLong();
-
- /** Evict backup synchronized flag. */
- private boolean evictSync;
-
- /** Evict near synchronized flag. */
- private boolean nearSync;
-
- /** Flag to hold {@code evictSync || nearSync} result. */
- private boolean evictSyncAgr;
-
/** Policy enabled. */
private boolean plcEnabled;
- /** Backup entries worker. */
- private BackupWorker backupWorker;
-
- /** Backup entries worker thread. */
- private IgniteThread backupWorkerThread;
-
/** Busy lock. */
private final GridBusyLock busyLock = new GridBusyLock();
- /** Stopping flag. */
- private volatile boolean stopping;
-
/** Stopped flag. */
private boolean stopped;
- /** Current future. */
- private final AtomicReference<EvictionFuture> curEvictFut = new AtomicReference<>();
-
/** First eviction flag. */
private volatile boolean firstEvictWarn;
@@ -180,147 +138,17 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
if (cfg.getEvictSynchronizedKeyBufferSize() < 0)
throw new IgniteCheckedException("Configuration parameter 'evictSynchronizedKeyBufferSize' cannot be negative.");
- if (!cctx.isLocal()) {
- evictSync = cfg.isEvictSynchronized() && !cctx.isNear();
-
- nearSync = isNearEnabled(cctx) && !cctx.isNear() && cfg.isEvictSynchronized();
- }
- else {
- if (cfg.isEvictSynchronized())
- U.warn(log, "Ignored 'evictSynchronized' configuration property for LOCAL cache: " + cctx.namexx());
-
- if (cfg.getNearConfiguration() != null && cfg.isEvictSynchronized())
- U.warn(log, "Ignored 'evictNearSynchronized' configuration property for LOCAL cache: " + cctx.namexx());
- }
-
- if (cctx.isDht() && !nearSync && evictSync && isNearEnabled(cctx))
- throw new IgniteCheckedException("Illegal configuration (may lead to data inconsistency) " +
- "[evictSync=true, evictNearSync=false]");
-
- reportConfigurationProblems();
-
- evictSyncAgr = evictSync || nearSync;
-
- if (evictSync && !cctx.isNear() && plcEnabled) {
- backupWorker = new BackupWorker();
-
- cctx.events().addListener(
- new GridLocalEventListener() {
- @Override public void onEvent(Event evt) {
- assert evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT ||
- evt.type() == EVT_NODE_JOINED;
-
- DiscoveryEvent discoEvt = (DiscoveryEvent)evt;
-
- // Notify backup worker on each topology change.
- if (cctx.discovery().cacheAffinityNode(discoEvt.eventNode(), cctx.name()))
- backupWorker.addEvent(discoEvt);
- }
- },
- EVT_NODE_FAILED, EVT_NODE_LEFT, EVT_NODE_JOINED);
- }
-
- if (evictSyncAgr) {
- if (cfg.getEvictSynchronizedTimeout() <= 0)
- throw new IgniteCheckedException("Configuration parameter 'evictSynchronousTimeout' should be positive.");
-
- if (cfg.getEvictSynchronizedConcurrencyLevel() <= 0)
- throw new IgniteCheckedException("Configuration parameter 'evictSynchronousConcurrencyLevel' " +
- "should be positive.");
-
- maxActiveFuts = cfg.getEvictSynchronizedConcurrencyLevel();
-
- cctx.io().addHandler(cctx.cacheId(), GridCacheEvictionRequest.class, new CI2<UUID, GridCacheEvictionRequest>() {
- @Override public void apply(UUID nodeId, GridCacheEvictionRequest msg) {
- processEvictionRequest(nodeId, msg);
- }
- });
-
- cctx.io().addHandler(cctx.cacheId(), GridCacheEvictionResponse.class, new CI2<UUID, GridCacheEvictionResponse>() {
- @Override public void apply(UUID nodeId, GridCacheEvictionResponse msg) {
- processEvictionResponse(nodeId, msg);
- }
- });
-
- cctx.events().addListener(
- new GridLocalEventListener() {
- @Override public void onEvent(Event evt) {
- assert evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT;
-
- DiscoveryEvent discoEvt = (DiscoveryEvent)evt;
-
- for (EvictionFuture fut : futs.values())
- fut.onNodeLeft(discoEvt.eventNode().id());
- }
- },
- EVT_NODE_FAILED, EVT_NODE_LEFT);
- }
-
if (log.isDebugEnabled())
log.debug("Eviction manager started on node: " + cctx.nodeId());
}
- /**
- * Outputs warnings if potential configuration problems are detected.
- */
- private void reportConfigurationProblems() {
- CacheMode mode = cctx.config().getCacheMode();
-
- if (plcEnabled && !cctx.isNear() && mode == PARTITIONED) {
- if (!evictSync) {
- U.warn(log, "Evictions are not synchronized with other nodes in topology " +
- "which provides 2x-3x better performance but may cause data inconsistency if cache store " +
- "is not configured (consider changing 'evictSynchronized' configuration property).",
- "Evictions are not synchronized for cache: " + cctx.namexx());
- }
-
- if (!nearSync && isNearEnabled(cctx)) {
- U.warn(log, "Evictions on primary node are not synchronized with near caches on other nodes " +
- "which provides 2x-3x better performance but may cause data inconsistency (consider changing " +
- "'nearEvictSynchronized' configuration property).",
- "Evictions are not synchronized with near caches on other nodes for cache: " + cctx.namexx());
- }
- }
- }
-
- /** {@inheritDoc} */
- @Override protected void onKernalStart0() throws IgniteCheckedException {
- super.onKernalStart0();
-
- if (plcEnabled && evictSync && !cctx.isNear()) {
- // Add dummy event to worker.
- DiscoveryEvent evt = cctx.discovery().localJoinEvent();
-
- backupWorker.addEvent(evt);
-
- backupWorkerThread = new IgniteThread(backupWorker);
- backupWorkerThread.start();
- }
- }
-
/** {@inheritDoc} */
@Override protected void onKernalStop0(boolean cancel) {
super.onKernalStop0(cancel);
- // Change stopping first.
- stopping = true;
-
busyLock.block();
try {
- // Stop backup worker.
- if (evictSync && !cctx.isNear() && backupWorker != null) {
- backupWorker.cancel();
-
- U.join(
- backupWorkerThread,
- log);
- }
-
- // Cancel all active futures.
- for (EvictionFuture fut : futs.values())
- fut.cancel();
-
if (log.isDebugEnabled())
log.debug("Eviction manager stopped on node: " + cctx.nodeId());
}
@@ -332,42 +160,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/**
- * @return Current size of evict queue.
- */
- public int evictQueueSize() {
- return bufEvictQ.sizex();
- }
-
- /**
- * @param nodeId Sender node ID.
- * @param res Response.
- */
- private void processEvictionResponse(UUID nodeId, GridCacheEvictionResponse res) {
- assert nodeId != null;
- assert res != null;
-
- if (log.isDebugEnabled())
- log.debug("Processing eviction response [node=" + nodeId + ", localNode=" + cctx.nodeId() +
- ", res=" + res + ']');
-
- if (!enterBusy())
- return;
-
- try {
- EvictionFuture fut = futs.get(res.futureId());
-
- if (fut != null)
- fut.onResponse(nodeId, res);
- else if (log.isDebugEnabled())
- log.debug("Eviction future for response is not found [res=" + res + ", node=" + nodeId +
- ", localNode=" + cctx.nodeId() + ']');
- }
- finally {
- busyLock.leaveBusy();
- }
- }
-
- /**
* @return {@code True} if entered busy.
*/
private boolean enterBusy() {
@@ -384,143 +176,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/**
- * @param nodeId Sender node ID.
- * @param req Request.
- */
- private void processEvictionRequest(UUID nodeId, GridCacheEvictionRequest req) {
- assert nodeId != null;
- assert req != null;
-
- if (!enterBusy())
- return;
-
- try {
- if (req.classError() != null) {
- if (log.isDebugEnabled())
- log.debug("Class got undeployed during eviction: " + req.classError());
-
- sendEvictionResponse(nodeId, new GridCacheEvictionResponse(cctx.cacheId(), req.futureId(), true));
-
- return;
- }
-
- AffinityTopologyVersion topVer = lockTopology();
-
- try {
- if (!topVer.equals(req.topologyVersion())) {
- if (log.isDebugEnabled())
- log.debug("Topology version is different [locTopVer=" + topVer +
- ", rmtTopVer=" + req.topologyVersion() + ']');
-
- sendEvictionResponse(nodeId,
- new GridCacheEvictionResponse(cctx.cacheId(), req.futureId(), true));
-
- return;
- }
-
- processEvictionRequest0(nodeId, req);
- }
- finally {
- unlockTopology();
- }
- }
- finally {
- busyLock.leaveBusy();
- }
- }
-
- /**
- * @param nodeId Sender node ID.
- * @param req Request.
- */
- private void processEvictionRequest0(UUID nodeId, GridCacheEvictionRequest req) {
- if (log.isDebugEnabled())
- log.debug("Processing eviction request [node=" + nodeId + ", localNode=" + cctx.nodeId() +
- ", reqSize=" + req.entries().size() + ']');
-
- // Partition -> {{Key, Version}, ...}.
- // Group DHT and replicated cache entries by their partitions.
- Map<Integer, Collection<CacheEvictionEntry>> dhtEntries = new HashMap<>();
-
- Collection<CacheEvictionEntry> nearEntries = new LinkedList<>();
-
- for (CacheEvictionEntry e : req.entries()) {
- boolean near = e.near();
-
- if (!near) {
- // Lock is required.
- Collection<CacheEvictionEntry> col =
- F.addIfAbsent(dhtEntries, cctx.affinity().partition(e.key()),
- new LinkedList<CacheEvictionEntry>());
-
- assert col != null;
-
- col.add(e);
- }
- else
- nearEntries.add(e);
- }
-
- GridCacheEvictionResponse res = new GridCacheEvictionResponse(cctx.cacheId(), req.futureId());
-
- GridCacheVersion obsoleteVer = cctx.versions().next();
-
- // DHT and replicated cache entries.
- for (Map.Entry<Integer, Collection<CacheEvictionEntry>> e : dhtEntries.entrySet()) {
- int part = e.getKey();
-
- boolean locked = lockPartition(part); // Will return false if preloading is disabled.
-
- try {
- for (CacheEvictionEntry t : e.getValue()) {
- KeyCacheObject key = t.key();
- GridCacheVersion ver = t.version();
- boolean near = t.near();
-
- assert !near;
-
- boolean evicted = evictLocally(key, ver, near, obsoleteVer);
-
- if (log.isDebugEnabled())
- log.debug("Evicted key [key=" + key + ", ver=" + ver + ", near=" + near +
- ", evicted=" + evicted +']');
-
- if (locked && evicted)
- // Preloading is in progress, we need to save eviction info.
- saveEvictionInfo(key, ver, part);
-
- if (!evicted)
- res.addRejected(key);
- }
- }
- finally {
- if (locked)
- unlockPartition(part);
- }
- }
-
- // Near entries.
- for (CacheEvictionEntry t : nearEntries) {
- KeyCacheObject key = t.key();
- GridCacheVersion ver = t.version();
- boolean near = t.near();
-
- assert near;
-
- boolean evicted = evictLocally(key, ver, near, obsoleteVer);
-
- if (log.isDebugEnabled())
- log.debug("Evicted key [key=" + key + ", ver=" + ver + ", near=" + near +
- ", evicted=" + evicted +']');
-
- if (!evicted)
- res.addRejected(key);
- }
-
- sendEvictionResponse(nodeId, res);
- }
-
- /**
* @param nodeId Node ID.
* @param res Response.
*/
@@ -659,49 +314,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/**
- * @param key Key to evict.
- * @param ver Entry version on initial node.
- * @param near {@code true} if entry should be evicted from near cache.
- * @param obsoleteVer Obsolete version.
- * @return {@code true} if evicted successfully, {@code false} if could not be evicted.
- */
- private boolean evictLocally(KeyCacheObject key,
- final GridCacheVersion ver,
- boolean near,
- GridCacheVersion obsoleteVer)
- {
- assert key != null;
- assert ver != null;
- assert obsoleteVer != null;
- assert evictSyncAgr;
- assert !cctx.isNear() || cctx.isReplicated();
-
- if (log.isDebugEnabled())
- log.debug("Evicting key locally [key=" + key + ", ver=" + ver + ", obsoleteVer=" + obsoleteVer +
- ", localNode=" + cctx.localNode() + ']');
-
- GridCacheAdapter cache = near ? cctx.dht().near() : cctx.cache();
-
- GridCacheEntryEx entry = cache.peekEx(key);
-
- if (entry == null)
- return true;
-
- try {
- // If entry should be evicted from near cache it can be done safely
- // without any consistency risks. We don't use filter in this case.
- // If entry should be evicted from DHT cache, we do not compare versions
- // as well because versions may change outside the transaction.
- return evict0(cache, entry, obsoleteVer, null, false);
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to evict entry on remote node [key=" + key + ", localNode=" + cctx.nodeId() + ']', e);
-
- return false;
- }
- }
-
- /**
* @param cache Cache from which to evict entry.
* @param entry Entry to evict.
* @param obsoleteVer Obsolete version.
@@ -762,9 +374,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
if (!loc) {
if (cctx.isNear())
return;
-
- if (evictSync)
- return;
}
GridCacheEntryEx e = txEntry.cached();
@@ -781,13 +390,10 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
notifyPolicy(e);
-
- if (evictSyncAgr)
- waitForEvictionFutures();
}
/** {@inheritDoc} */
- @Override public void touch(GridCacheEntryEx e, AffinityTopologyVersion topVer) {
+ @Override public void touch(GridCacheEntryEx e, AffinityTopologyVersion topVer) {
if (e.detached() || e.isInternal())
return;
@@ -802,18 +408,10 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
if (!plcEnabled)
return;
- // Don't track non-primary entries if evicts are synchronized.
- if (!cctx.isNear() && evictSync && !cctx.affinity().primaryByPartition(cctx.localNode(), e.partition(), topVer))
- return;
-
if (!enterBusy())
return;
try {
- // Wait for futures to finish.
- if (evictSyncAgr)
- waitForEvictionFutures();
-
if (log.isDebugEnabled())
log.debug("Touching entry [entry=" + e + ", localNode=" + cctx.nodeId() + ']');
@@ -825,39 +423,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/**
- * @param e Entry for eviction policy notification.
- */
- private void touch0(GridCacheEntryEx e) {
- assert evictSyncAgr;
- assert plcEnabled;
-
- // Do not wait for futures here since only limited number
- // of entries can be passed to this method.
- notifyPolicy(e);
- }
-
- /**
- * @param entries Entries for eviction policy notification.
- */
- private void touchOnTopologyChange(Iterable<? extends GridCacheEntryEx> entries) {
- assert evictSync;
- assert plcEnabled;
-
- if (log.isDebugEnabled())
- log.debug("Touching entries [entries=" + entries + ", localNode=" + cctx.nodeId() + ']');
-
- for (GridCacheEntryEx e : entries) {
- if (e.key() instanceof GridCacheInternal)
- // Skip internal entry.
- continue;
-
- // Do not wait for futures here since only limited number
- // of entries can be passed to this method.
- notifyPolicy(e);
- }
- }
-
- /**
* Warns on first eviction.
*/
private void warnFirstEvict() {
@@ -870,16 +435,11 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
U.warn(log, "Evictions started (cache may have reached its capacity)." +
- " You may wish to increase 'maxSize' on eviction policy being used for cache: " + cctx.name(),
+ " You may wish to increase 'maxSize' on eviction policy being used for cache: " + cctx.name(),
"Evictions started (cache may have reached its capacity): " + cctx.name());
}
/** {@inheritDoc} */
- @Override public boolean evictSyncOrNearSync() {
- return evictSyncAgr;
- }
-
- /** {@inheritDoc} */
@Override public boolean evict(@Nullable GridCacheEntryEx entry, @Nullable GridCacheVersion obsoleteVer,
boolean explicit, @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException {
if (entry == null)
@@ -892,50 +452,18 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
if (!cctx.isNear() && !explicit && !firstEvictWarn)
warnFirstEvict();
- if (evictSyncAgr) {
- assert !cctx.isNear(); // Make sure cache is not NEAR.
-
- if (cctx.affinity().backupsByKey(
- entry.key(),
- cctx.topology().topologyVersion()).contains(cctx.localNode()) &&
- evictSync)
- // Do not track backups if evicts are synchronized.
- return !explicit;
-
- try {
- if (!cctx.isAll(entry, filter))
- return false;
-
- if (entry.lockedByAny())
- return false;
-
- // Add entry to eviction queue.
- enqueue(entry, filter);
- }
- catch (GridCacheEntryRemovedException ignored) {
- if (log.isDebugEnabled())
- log.debug("Entry got removed while evicting [entry=" + entry +
- ", localNode=" + cctx.nodeId() + ']');
- }
- }
- else {
- if (obsoleteVer == null)
- obsoleteVer = cctx.versions().next();
-
- // Do not touch entry if not evicted:
- // 1. If it is call from policy, policy tracks it on its own.
- // 2. If it is explicit call, entry is touched on tx commit.
- return evict0(cctx.cache(), entry, obsoleteVer, filter, explicit);
- }
+ if (obsoleteVer == null)
+ obsoleteVer = cctx.versions().next();
- return true;
+ // Do not touch entry if not evicted:
+ // 1. If it is call from policy, policy tracks it on its own.
+ // 2. If it is explicit call, entry is touched on tx commit.
+ return evict0(cctx.cache(), entry, obsoleteVer, filter, explicit);
}
/** {@inheritDoc} */
@Override public void batchEvict(Collection<?> keys, @Nullable GridCacheVersion obsoleteVer)
throws IgniteCheckedException {
- assert !evictSyncAgr;
-
List<GridCacheEntryEx> locked = new ArrayList<>(keys.size());
Set<GridCacheEntryEx> notRmv = null;
@@ -1005,7 +533,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
finally {
// Unlock entries in reverse order.
- for (ListIterator<GridCacheEntryEx> it = locked.listIterator(locked.size()); it.hasPrevious();) {
+ for (ListIterator<GridCacheEntryEx> it = locked.listIterator(locked.size()); it.hasPrevious(); ) {
GridCacheEntryEx e = it.previous();
GridUnsafe.monitorExit(e);
@@ -1031,56 +559,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/**
- * Enqueues entry for synchronized eviction.
- *
- * @param entry Entry.
- * @param filter Filter.
- * @throws GridCacheEntryRemovedException If entry got removed.
- */
- private void enqueue(GridCacheEntryEx entry, CacheEntryPredicate[] filter)
- throws GridCacheEntryRemovedException {
- Node<EvictionInfo> node = entry.meta(META_KEY);
-
- if (node == null) {
- node = bufEvictQ.addLastx(new EvictionInfo(entry, entry.version(), filter));
-
- if (entry.putMetaIfAbsent(META_KEY, node) != null)
- // Was concurrently added, need to clear it from queue.
- bufEvictQ.unlinkx(node);
- else if (log.isDebugEnabled())
- log.debug("Added entry to eviction queue: " + entry);
- }
- }
-
- /**
- * Checks eviction queue.
- */
- private void checkEvictionQueue() {
- int maxSize = maxQueueSize();
-
- int bufSize = bufEvictQ.sizex();
-
- if (bufSize >= maxSize) {
- if (log.isDebugEnabled())
- log.debug("Processing eviction queue: " + bufSize);
-
- Collection<EvictionInfo> evictInfos = new ArrayList<>(bufSize);
-
- for (int i = 0; i < bufSize; i++) {
- EvictionInfo info = bufEvictQ.poll();
-
- if (info == null)
- break;
-
- evictInfos.add(info);
- }
-
- if (!evictInfos.isEmpty())
- addToCurrentFuture(evictInfos);
- }
- }
-
- /**
* @return Max queue size.
*/
private int maxQueueSize() {
@@ -1093,271 +571,29 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/**
- * Processes eviction queue (sends required requests, etc.).
- *
- * @param evictInfos Eviction information to create future with.
+ * @param info Eviction info.
+ * @return Version aware filter.
*/
- private void addToCurrentFuture(Collection<EvictionInfo> evictInfos) {
- assert !evictInfos.isEmpty();
-
- while (true) {
- EvictionFuture fut = curEvictFut.get();
-
- if (fut == null) {
- curEvictFut.compareAndSet(null, new EvictionFuture());
-
- continue;
- }
-
- if (fut.prepareLock()) {
- boolean added;
-
- try {
- added = fut.add(evictInfos);
- }
- finally {
- fut.prepareUnlock();
- }
+ private CacheEntryPredicate[] versionFilter(final EvictionInfo info) {
+ // If version has changed since we started the whole process
+ // then we should not evict entry.
+ return new CacheEntryPredicate[] {
+ new CacheEntryPredicateAdapter() {
+ @Override public boolean apply(GridCacheEntryEx e) {
+ try {
+ GridCacheVersion ver = e.version();
- if (added) {
- if (fut.prepare()) {
- // Thread that prepares future should remove it and install listener.
- curEvictFut.compareAndSet(fut, null);
-
- fut.listen(new CI1<IgniteInternalFuture<?>>() {
- @Override public void apply(IgniteInternalFuture<?> f) {
- if (!enterBusy()) {
- if (log.isDebugEnabled())
- log.debug("Will not notify eviction future completion (grid is stopping): " +
- f);
-
- return;
- }
-
- try {
- AffinityTopologyVersion topVer = lockTopology();
-
- try {
- onFutureCompleted((EvictionFuture)f, topVer);
- }
- finally {
- unlockTopology();
- }
- }
- finally {
- busyLock.leaveBusy();
- }
- }
- });
+ return info.version().equals(ver) && F.isAll(info.filter());
+ }
+ catch (GridCacheEntryRemovedException ignored) {
+ return false;
}
-
- break;
}
- else
- // Infos were not added, create another future for next iteration.
- curEvictFut.compareAndSet(fut, new EvictionFuture());
- }
- else
- // Future has not been locked, create another future for next iteration.
- curEvictFut.compareAndSet(fut, new EvictionFuture());
- }
+ }};
}
/**
- * @param fut Completed eviction future.
- * @param topVer Topology version on future complete.
- */
- private void onFutureCompleted(EvictionFuture fut, AffinityTopologyVersion topVer) {
- if (!enterBusy())
- return;
-
- try {
- IgniteBiTuple<Collection<EvictionInfo>, Collection<EvictionInfo>> t;
-
- try {
- t = fut.get();
- }
- catch (IgniteFutureCancelledCheckedException ignored) {
- assert false : "Future has been cancelled, but manager is not stopping: " + fut;
-
- return;
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Eviction future finished with error (all entries will be touched): " + fut, e);
-
- if (plcEnabled) {
- for (EvictionInfo info : fut.entries())
- touch0(info.entry());
- }
-
- return;
- }
-
- // Check if topology version is different.
- if (!fut.topologyVersion().equals(topVer)) {
- if (log.isDebugEnabled())
- log.debug("Topology has changed, all entries will be touched: " + fut);
-
- if (plcEnabled) {
- for (EvictionInfo info : fut.entries())
- touch0(info.entry());
- }
-
- return;
- }
-
- // Evict remotely evicted entries.
- GridCacheVersion obsoleteVer = null;
-
- Collection<EvictionInfo> evictedEntries = t.get1();
-
- for (EvictionInfo info : evictedEntries) {
- GridCacheEntryEx entry = info.entry();
-
- try {
- // Remove readers on which the entry was evicted.
- for (IgniteBiTuple<ClusterNode, Long> r : fut.evictedReaders(entry.key())) {
- UUID readerId = r.get1().id();
- Long msgId = r.get2();
-
- ((GridDhtCacheEntry)entry).removeReader(readerId, msgId);
- }
-
- if (obsoleteVer == null)
- obsoleteVer = cctx.versions().next();
-
- // Do not touch primary entries, if not evicted.
- // They will be touched within updating transactions.
- evict0(cctx.cache(), entry, obsoleteVer, versionFilter(info), false);
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to evict entry [entry=" + entry +
- ", localNode=" + cctx.nodeId() + ']', e);
- }
- catch (GridCacheEntryRemovedException ignored) {
- if (log.isDebugEnabled())
- log.debug("Entry was concurrently removed while evicting [entry=" + entry +
- ", localNode=" + cctx.nodeId() + ']');
- }
- }
-
- Collection<EvictionInfo> rejectedEntries = t.get2();
-
- // Touch remotely rejected entries (only if policy is enabled).
- if (plcEnabled && !rejectedEntries.isEmpty()) {
- for (EvictionInfo info : rejectedEntries)
- touch0(info.entry());
- }
- }
- finally {
- busyLock.leaveBusy();
-
- // Signal on future completion.
- signal();
- }
- }
-
- /**
- * This method should be called when eviction future is processed
- * and unwind may continue.
- */
- private void signal() {
- futsCntLock.lock();
-
- try {
- // Avoid volatile read on assertion.
- int cnt = --activeFutsCnt;
-
- assert cnt >= 0 : "Invalid futures count: " + cnt;
-
- if (cnt < maxActiveFuts)
- futsCntCond.signalAll();
- }
- finally {
- futsCntLock.unlock();
- }
- }
-
- /**
- * @param info Eviction info.
- * @return Version aware filter.
- */
- private CacheEntryPredicate[] versionFilter(final EvictionInfo info) {
- // If version has changed since we started the whole process
- // then we should not evict entry.
- return new CacheEntryPredicate[]{new CacheEntryPredicateAdapter() {
- @Override public boolean apply(GridCacheEntryEx e) {
- try {
- GridCacheVersion ver = e.version();
-
- return info.version().equals(ver) && F.isAll(info.filter());
- }
- catch (GridCacheEntryRemovedException ignored) {
- return false;
- }
- }
- }};
- }
-
- /**
- * Gets a collection of nodes to send eviction requests to.
- *
- *
- * @param entry Entry.
- * @param topVer Topology version.
- * @return Tuple of two collections: dht (in case of partitioned cache) nodes
- * and readers (empty for replicated cache).
- * @throws GridCacheEntryRemovedException If entry got removed during method
- * execution.
- */
- @SuppressWarnings( {"IfMayBeConditional"})
- private IgniteBiTuple<Collection<ClusterNode>, Collection<ClusterNode>> remoteNodes(GridCacheEntryEx entry,
- AffinityTopologyVersion topVer)
- throws GridCacheEntryRemovedException {
- assert entry != null;
-
- assert cctx.config().getCacheMode() != LOCAL;
-
- Collection<ClusterNode> backups;
-
- if (evictSync)
- backups = F.view(cctx.dht().topology().nodes(entry.partition(), topVer), F0.notEqualTo(cctx.localNode()));
- else
- backups = Collections.emptySet();
-
- Collection<ClusterNode> readers;
-
- if (nearSync) {
- readers = F.transform(((GridDhtCacheEntry)entry).readers(), new C1<UUID, ClusterNode>() {
- @Nullable @Override public ClusterNode apply(UUID nodeId) {
- return cctx.node(nodeId);
- }
- });
- }
- else
- readers = Collections.emptySet();
-
- return new IgnitePair<>(backups, readers);
- }
-
- /** {@inheritDoc} */
- @Override public void unwind() {
- if (!evictSyncAgr)
- return;
-
- if (!enterBusy())
- return;
-
- try {
- checkEvictionQueue();
- }
- finally {
- busyLock.leaveBusy();
- }
- }
-
- /**
- * @param e Entry to notify eviction policy.
+ * @param e Entry to notify eviction policy.
*/
@SuppressWarnings({"IfMayBeConditional", "RedundantIfStatement"})
private void notifyPolicy(GridCacheEntryEx e) {
@@ -1373,40 +609,11 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/**
- *
- */
- @SuppressWarnings("TooBroadScope")
- private void waitForEvictionFutures() {
- if (activeFutsCnt >= maxActiveFuts) {
- boolean interrupted = false;
-
- futsCntLock.lock();
-
- try {
- while(!stopping && activeFutsCnt >= maxActiveFuts) {
- try {
- futsCntCond.await(2000, MILLISECONDS);
- }
- catch (InterruptedException ignored) {
- interrupted = true;
- }
- }
- }
- finally {
- futsCntLock.unlock();
-
- if (interrupted)
- Thread.currentThread().interrupt();
- }
- }
- }
-
- /**
* Prints out eviction stats.
*/
public void printStats() {
X.println("Eviction stats [igniteInstanceName=" + cctx.igniteInstanceName() +
- ", cache=" + cctx.cache().name() + ", buffEvictQ=" + bufEvictQ.sizex() + ']');
+ ", cache=" + cctx.cache().name() + ']');
}
/** {@inheritDoc} */
@@ -1414,99 +621,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
X.println(">>> ");
X.println(">>> Eviction manager memory stats [igniteInstanceName=" + cctx.igniteInstanceName() +
", cache=" + cctx.name() + ']');
- X.println(">>> buffEvictQ size: " + bufEvictQ.sizex());
- X.println(">>> futsSize: " + futs.size());
- X.println(">>> futsCreated: " + idGen.get());
- }
-
- /**
- *
- */
- private class BackupWorker extends GridWorker {
- /** */
- private final BlockingQueue<DiscoveryEvent> evts = new LinkedBlockingQueue<>();
-
- /** */
- private final Collection<Integer> primaryParts = new HashSet<>();
-
- /**
- *
- */
- private BackupWorker() {
- super(cctx.igniteInstanceName(), "cache-eviction-backup-worker", GridCacheEvictionManager.this.log);
-
- assert plcEnabled;
- }
-
- /**
- * @param evt New event.
- */
- void addEvent(DiscoveryEvent evt) {
- assert evt != null;
-
- evts.add(evt);
- }
-
- /** {@inheritDoc} */
- @Override protected void body() throws InterruptedException, IgniteInterruptedCheckedException {
- try {
- assert !cctx.isNear() && evictSync;
-
- ClusterNode loc = cctx.localNode();
-
- AffinityTopologyVersion initTopVer =
- new AffinityTopologyVersion(cctx.discovery().localJoinEvent().topologyVersion(), 0);
-
- AffinityTopologyVersion cacheStartVer = cctx.startTopologyVersion();
-
- if (cacheStartVer != null && cacheStartVer.compareTo(initTopVer) > 0)
- initTopVer = cacheStartVer;
-
- // Initialize.
- primaryParts.addAll(cctx.affinity().primaryPartitions(cctx.localNodeId(), initTopVer));
-
- while (!isCancelled()) {
- DiscoveryEvent evt = evts.take();
-
- if (log.isDebugEnabled())
- log.debug("Processing event: " + evt);
-
- AffinityTopologyVersion topVer = new AffinityTopologyVersion(evt.topologyVersion());
-
- // Remove partitions that are no longer primary.
- for (Iterator<Integer> it = primaryParts.iterator(); it.hasNext();) {
- if (!evts.isEmpty())
- break;
-
- if (!cctx.affinity().primaryByPartition(loc, it.next(), topVer))
- it.remove();
- }
-
- // Move on to next event.
- if (!evts.isEmpty())
- continue;
-
- for (GridDhtLocalPartition part : cctx.topology().localPartitions()) {
- if (!evts.isEmpty())
- break;
-
- if (part.primary(topVer) && primaryParts.add(part.id())) {
- if (log.isDebugEnabled())
- log.debug("Touching partition entries: " + part);
-
- touchOnTopologyChange(part.allEntries());
- }
- }
- }
- }
- catch (InterruptedException ignored) {
- // No-op.
- }
- catch (IgniteException e) {
- if (!e.hasCause(InterruptedException.class))
- throw e;
- }
- }
}
/**
@@ -1563,540 +677,4 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
return S.toString(EvictionInfo.class, this);
}
}
-
- /**
- * Future for synchronized eviction. Result is a tuple: {evicted entries, rejected entries}.
- */
- private class EvictionFuture extends GridFutureAdapter<IgniteBiTuple<Collection<EvictionInfo>,
- Collection<EvictionInfo>>> {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** */
- private final long id = idGen.incrementAndGet();
-
- /** */
- private ConcurrentLinkedDeque8<EvictionInfo> evictInfos = new ConcurrentLinkedDeque8<>();
-
- /** */
- private final ConcurrentMap<KeyCacheObject, EvictionInfo> entries = new ConcurrentHashMap8<>();
-
- /** */
- private final ConcurrentMap<KeyCacheObject, Collection<ClusterNode>> readers =
- new ConcurrentHashMap8<>();
-
- /** */
- private final Collection<EvictionInfo> evictedEntries = new GridConcurrentHashSet<>();
-
- /** */
- private final ConcurrentMap<KeyCacheObject, EvictionInfo> rejectedEntries = new ConcurrentHashMap8<>();
-
- /** Request map. */
- private final ConcurrentMap<UUID, GridCacheEvictionRequest> reqMap =
- new ConcurrentHashMap8<>();
-
- /** Response map. */
- private final ConcurrentMap<UUID, GridCacheEvictionResponse> resMap =
- new ConcurrentHashMap8<>();
-
- /** To make sure that future is completing within a single thread. */
- private final AtomicBoolean finishPrepare = new AtomicBoolean();
-
- /** Lock to use when future is being initialized. */
- @GridToStringExclude
- private final ReadWriteLock prepareLock = new ReentrantReadWriteLock();
-
- /** To make sure that future is completing within a single thread. */
- private final AtomicBoolean completing = new AtomicBoolean();
-
- /** Lock to use after future is initialized. */
- @GridToStringExclude
- private final ReadWriteLock lock = new ReentrantReadWriteLock();
-
- /** Object to force future completion on elapsing eviction timeout. */
- @GridToStringExclude
- private GridTimeoutObject timeoutObj;
-
- /** Topology version future is processed on. */
- private AffinityTopologyVersion topVer = AffinityTopologyVersion.ZERO;
-
- /**
- * @return {@code True} if prepare lock was acquired.
- */
- boolean prepareLock() {
- return prepareLock.readLock().tryLock();
- }
-
- /**
- *
- */
- void prepareUnlock() {
- prepareLock.readLock().unlock();
- }
-
- /**
- * @param infos Infos to add.
- * @return {@code False} if entries were not added due to capacity restrictions.
- */
- boolean add(Collection<EvictionInfo> infos) {
- assert infos != null && !infos.isEmpty();
-
- if (evictInfos.sizex() > maxQueueSize())
- return false;
-
- evictInfos.addAll(infos);
-
- return true;
- }
-
- /**
- * @return {@code True} if future has been prepared by this call.
- */
- @SuppressWarnings("LockAcquiredButNotSafelyReleased")
- boolean prepare() {
- if (evictInfos.sizex() >= maxQueueSize() && finishPrepare.compareAndSet(false, true)) {
- // Lock will never be released intentionally.
- prepareLock.writeLock().lock();
-
- futsCntLock.lock();
-
- try {
- activeFutsCnt++;
- }
- finally {
- futsCntLock.unlock();
- }
-
- // Put future in map.
- futs.put(id, this);
-
- prepare0();
-
- return true;
- }
-
- return false;
- }
-
- /**
- * Prepares future (sends all required requests).
- */
- private void prepare0() {
- if (log.isDebugEnabled())
- log.debug("Preparing eviction future [futId=" + id + ", localNode=" + cctx.nodeId() +
- ", infos=" + evictInfos + ']');
-
- assert evictInfos != null && !evictInfos.isEmpty();
-
- topVer = lockTopology();
-
- try {
- Collection<EvictionInfo> locals = null;
-
- for (EvictionInfo info : evictInfos) {
- // Queue node may have been stored in entry metadata concurrently, but we don't care
- // about it since we are currently processing this entry.
- Node<EvictionInfo> queueNode = info.entry().removeMeta(META_KEY);
-
- if (queueNode != null)
- bufEvictQ.unlinkx(queueNode);
-
- IgniteBiTuple<Collection<ClusterNode>, Collection<ClusterNode>> tup;
-
- try {
- tup = remoteNodes(info.entry(), topVer);
- }
- catch (GridCacheEntryRemovedException ignored) {
- if (log.isDebugEnabled())
- log.debug("Entry got removed while preparing eviction future (ignoring) [entry=" +
- info.entry() + ", nodeId=" + cctx.nodeId() + ']');
-
- continue;
- }
-
- Collection<ClusterNode> entryReaders =
- F.addIfAbsent(readers, info.entry().key(), new GridConcurrentHashSet<ClusterNode>());
-
- assert entryReaders != null;
-
- // Add entry readers so that we could remove them right before local eviction.
- entryReaders.addAll(tup.get2());
-
- Collection<ClusterNode> nodes = F.concat(true, tup.get1(), tup.get2());
-
- if (!nodes.isEmpty()) {
- entries.put(info.entry().key(), info);
-
- // There are remote participants.
- for (ClusterNode node : nodes) {
- GridCacheEvictionRequest req = F.addIfAbsent(reqMap, node.id(),
- new GridCacheEvictionRequest(cctx.cacheId(), id, evictInfos.size(), topVer,
- cctx.deploymentEnabled()));
-
- assert req != null;
-
- req.addKey(info.entry().key(), info.version(), entryReaders.contains(node));
- }
- }
- else {
- if (locals == null)
- locals = new HashSet<>(evictInfos.size(), 1.0f);
-
- // There are no remote participants, need to keep the entry as local.
- locals.add(info);
- }
- }
-
- if (locals != null) {
- // Evict entries without remote participant nodes immediately.
- GridCacheVersion obsoleteVer = cctx.versions().next();
-
- for (EvictionInfo info : locals) {
- if (log.isDebugEnabled())
- log.debug("Evicting key without remote participant nodes: " + info);
-
- try {
- // Touch primary entry (without backup nodes) if not evicted
- // to keep tracking.
- if (!evict0(cctx.cache(), info.entry(), obsoleteVer, versionFilter(info), false) &&
- plcEnabled)
- touch0(info.entry());
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to evict entry: " + info.entry(), e);
- }
- }
- }
-
- // If there were only local entries.
- if (entries.isEmpty()) {
- complete(false);
-
- return;
- }
- }
- finally {
- unlockTopology();
- }
-
- // Send eviction requests.
- for (Map.Entry<UUID, GridCacheEvictionRequest> e : reqMap.entrySet()) {
- UUID nodeId = e.getKey();
-
- GridCacheEvictionRequest req = e.getValue();
-
- if (log.isDebugEnabled())
- log.debug("Sending eviction request [node=" + nodeId + ", req=" + req + ']');
-
- try {
- cctx.io().send(nodeId, req, cctx.ioPolicy());
- }
- catch (ClusterTopologyCheckedException ignored) {
- // Node left the topology.
- onNodeLeft(nodeId);
- }
- catch (IgniteCheckedException ex) {
- U.error(log, "Failed to send eviction request to node [node=" + nodeId + ", req=" + req + ']', ex);
-
- rejectEntries(nodeId);
- }
- }
-
- registerTimeoutObject();
- }
-
- /**
- *
- */
- private void registerTimeoutObject() {
- // Check whether future has not been completed yet.
- if (lock.readLock().tryLock()) {
- try {
- timeoutObj = new GridTimeoutObjectAdapter(cctx.config().getEvictSynchronizedTimeout()) {
- @Override public void onTimeout() {
- complete(true);
- }
- };
-
- cctx.time().addTimeoutObject(timeoutObj);
- }
- finally {
- lock.readLock().unlock();
- }
- }
- }
-
- /**
- * @return Future ID.
- */
- long id() {
- return id;
- }
-
- /**
- * @return Topology version.
- */
- AffinityTopologyVersion topologyVersion() {
- return topVer;
- }
-
- /**
- * @return Keys to readers mapping.
- */
- Map<KeyCacheObject, Collection<ClusterNode>> readers() {
- return readers;
- }
-
- /**
- * @return All entries associated with future that should be evicted (or rejected).
- */
- Collection<EvictionInfo> entries() {
- return entries.values();
- }
-
- /**
- * Reject all entries on behalf of specified node.
- *
- * @param nodeId Node ID.
- */
- private void rejectEntries(UUID nodeId) {
- assert nodeId != null;
-
- if (lock.readLock().tryLock()) {
- try {
- if (log.isDebugEnabled())
- log.debug("Rejecting entries for node: " + nodeId);
-
- GridCacheEvictionRequest req = reqMap.remove(nodeId);
-
- for (CacheEvictionEntry t : req.entries()) {
- EvictionInfo info = entries.get(t.key());
-
- assert info != null;
-
- rejectedEntries.put(t.key(), info);
- }
- }
- finally {
- lock.readLock().unlock();
- }
- }
-
- checkDone();
- }
-
- /**
- * @param nodeId Node id that left the topology.
- */
- void onNodeLeft(UUID nodeId) {
- assert nodeId != null;
-
- if (lock.readLock().tryLock()) {
- try {
- // Stop waiting response from this node.
- reqMap.remove(nodeId);
-
- resMap.remove(nodeId);
- }
- finally {
- lock.readLock().unlock();
- }
-
- checkDone();
- }
- }
-
- /**
- * @param nodeId Sender node ID.
- * @param res Response.
- */
- void onResponse(UUID nodeId, GridCacheEvictionResponse res) {
- assert nodeId != null;
- assert res != null;
-
- if (lock.readLock().tryLock()) {
- try {
- if (log.isDebugEnabled())
- log.debug("Entered to eviction future onResponse() [fut=" + this + ", node=" + nodeId +
- ", res=" + res + ']');
-
- ClusterNode node = cctx.node(nodeId);
-
- if (node != null)
- resMap.put(nodeId, res);
- else
- // Sender node left grid.
- reqMap.remove(nodeId);
- }
- finally {
- lock.readLock().unlock();
- }
-
- if (res.evictError())
- // Complete future, since there was a class loading error on at least one node.
- complete(false);
- else
- checkDone();
- }
- else {
- if (log.isDebugEnabled())
- log.debug("Ignored eviction response [fut=" + this + ", node=" + nodeId + ", res=" + res + ']');
- }
- }
-
- /**
- *
- */
- private void checkDone() {
- if (reqMap.isEmpty() || resMap.keySet().containsAll(reqMap.keySet()))
- complete(false);
- }
-
- /**
- * Completes future.
- *
- * @param timedOut {@code True} if future is being forcibly completed on timeout.
- */
- @SuppressWarnings({"LockAcquiredButNotSafelyReleased"})
- private void complete(boolean timedOut) {
- if (completing.compareAndSet(false, true)) {
- // Lock will never be released intentionally.
- lock.writeLock().lock();
-
- futs.remove(id);
-
- if (timeoutObj != null && !timedOut)
- // If future is timed out, corresponding object is already removed.
- cctx.time().removeTimeoutObject(timeoutObj);
-
- if (log.isDebugEnabled())
- log.debug("Building eviction future result [fut=" + this + ", timedOut=" + timedOut + ']');
-
- boolean err = false;
-
- for (GridCacheEvictionResponse res : resMap.values()) {
- if (res.evictError()) {
- err = true;
-
- break;
- }
- }
-
- if (err) {
- Collection<UUID> ids = F.view(resMap.keySet(), new P1<UUID>() {
- @Override public boolean apply(UUID e) {
- return resMap.get(e).evictError();
- }
- });
-
- assert !ids.isEmpty();
-
- U.warn(log, "Remote node(s) failed to process eviction request " +
- "due to topology changes " +
- "(some backup or remote values maybe lost): " + ids);
- }
-
- if (timedOut)
- U.warn(log, "Timed out waiting for eviction future " +
- "(consider changing 'evictSynchronousTimeout' and 'evictSynchronousConcurrencyLevel' " +
- "configuration parameters).");
-
- if (err || timedOut) {
- // Future has not been completed successfully, all entries should be rejected.
- assert evictedEntries.isEmpty();
-
- rejectedEntries.putAll(entries);
- }
- else {
- // Copy map to filter remotely rejected entries,
- // as they will be touched within corresponding txs.
- Map<KeyCacheObject, EvictionInfo> rejectedEntries0 = new HashMap<>(rejectedEntries);
-
- // Future has been completed successfully - build result.
- for (EvictionInfo info : entries.values()) {
- KeyCacheObject key = info.entry().key();
-
- if (rejectedEntries0.containsKey(key))
- // Was already rejected.
- continue;
-
- boolean rejected = false;
-
- for (GridCacheEvictionResponse res : resMap.values()) {
- if (res.rejectedKeys().contains(key)) {
- // Modify copied map.
- rejectedEntries0.put(key, info);
-
- rejected = true;
-
- break;
- }
- }
-
- if (!rejected)
- evictedEntries.add(info);
- }
- }
-
- // Pass entries that were rejected due to topology changes
- // or due to timeout or class loading issues.
- // Remotely rejected entries will be touched within corresponding txs.
- onDone(F.t(evictedEntries, rejectedEntries.values()));
- }
- }
-
- /**
- * @param key Key.
- * @return Reader nodes on which given key was evicted.
- */
- Collection<IgniteBiTuple<ClusterNode, Long>> evictedReaders(KeyCacheObject key) {
- Collection<ClusterNode> mappedReaders = readers.get(key);
-
- if (mappedReaders == null)
- return Collections.emptyList();
-
- Collection<IgniteBiTuple<ClusterNode, Long>> col = new LinkedList<>();
-
- for (Map.Entry<UUID, GridCacheEvictionResponse> e : resMap.entrySet()) {
- ClusterNode node = cctx.node(e.getKey());
-
- // If node has left or response did not arrive from near node
- // then just skip it.
- if (node == null || !mappedReaders.contains(node))
- continue;
-
- GridCacheEvictionResponse res = e.getValue();
-
- if (!res.rejectedKeys().contains(key))
- col.add(F.t(node, res.messageId()));
- }
-
- return col;
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings("LockAcquiredButNotSafelyReleased")
- @Override public boolean cancel() {
- if (completing.compareAndSet(false, true)) {
- // Lock will never be released intentionally.
- lock.writeLock().lock();
-
- if (timeoutObj != null)
- cctx.time().removeTimeoutObject(timeoutObj);
-
- boolean b = onCancelled();
-
- assert b;
-
- return true;
- }
-
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(EvictionFuture.class, this);
- }
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d816f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 022117b..c82e864 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -920,14 +920,6 @@ public class GridCacheUtils {
public static void unwindEvicts(GridCacheContext ctx) {
assert ctx != null;
- ctx.evicts().unwind();
-
- if (ctx.isNear()) {
- GridCacheContext dhtCtx = ctx.near().dht().context();
-
- dhtCtx.evicts().unwind();
- }
-
ctx.ttl().expire();
}
[07/53] [abbrv] ignite git commit: ignite-4535 : Removing
CacheMemoryMode - done.
Posted by ag...@apache.org.
ignite-4535 : Removing CacheMemoryMode - done.
(cherry picked from commit 6b7472c)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ea0316e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ea0316e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ea0316e
Branch: refs/heads/ignite-3477-master
Commit: 4ea0316e7a2e04389e57efbfbbeaad77fa5bcb45
Parents: 7a49fa5
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Tue Mar 21 16:48:51 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Mar 30 16:20:13 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/cache/CacheMemoryMode.java | 63 -------------
.../configuration/CacheConfiguration.java | 23 -----
.../configuration/CollectionConfiguration.java | 14 ---
modules/yardstick/README.txt | 2 -
.../config/benchmark-atomic-win.properties | 8 +-
.../config/benchmark-atomic.properties | 12 +--
.../config/benchmark-client-mode.properties | 9 --
.../config/benchmark-multicast.properties | 9 --
.../config/benchmark-query-win.properties | 5 +-
.../yardstick/config/benchmark-query.properties | 3 -
.../config/benchmark-tx-win.properties | 6 +-
.../yardstick/config/benchmark-tx.properties | 4 -
modules/yardstick/config/benchmark.properties | 11 +--
modules/yardstick/config/ignite-base-config.xml | 63 -------------
.../config/ignite-base-load-config.xml | 63 -------------
.../config/ignite-cache-load-config.xml | 5 --
.../config/ignite-failover-base-config.xml | 41 ---------
.../ignite-int-max-values-offheap-config.xml | 89 -------------------
.../ignite-int-max-values-swap-config.xml | 93 --------------------
.../test-max-int-values-offheap.properties | 62 -------------
.../config/test-max-int-values-swap.properties | 61 -------------
.../yardstick/IgniteBenchmarkArguments.java | 29 ------
.../cache/IgniteGetOffHeapBenchmark.java | 32 -------
.../cache/IgniteGetOffHeapValuesBenchmark.java | 32 -------
.../cache/IgnitePutGetOffHeapBenchmark.java | 32 -------
.../IgnitePutGetOffHeapValuesBenchmark.java | 32 -------
.../cache/IgnitePutGetTxOffHeapBenchmark.java | 32 -------
.../IgnitePutGetTxOffHeapValuesBenchmark.java | 32 -------
.../cache/IgnitePutOffHeapBenchmark.java | 32 -------
.../cache/IgnitePutOffHeapValuesBenchmark.java | 32 -------
.../IgnitePutRandomValueSizeBenchmark.java | 2 +-
.../cache/IgnitePutTxOffHeapBenchmark.java | 32 -------
.../IgnitePutTxOffHeapValuesBenchmark.java | 32 -------
.../IgniteSqlQueryJoinOffHeapBenchmark.java | 32 -------
.../cache/IgniteSqlQueryOffHeapBenchmark.java | 32 -------
.../IgniteSqlQueryPutOffHeapBenchmark.java | 32 -------
...IgniteAtomicOffHeapInvokeRetryBenchmark.java | 31 -------
.../IgniteAtomicOffHeapRetriesBenchmark.java | 31 -------
...ransactionalOffHeapInvokeRetryBenchmark.java | 33 -------
...ransactionalOffHeapWriteInvokeBenchmark.java | 37 --------
...eTransactionalOffHeapWriteReadBenchmark.java | 32 -------
.../IgniteCacheRandomOperationBenchmark.java | 1 -
42 files changed, 8 insertions(+), 1250 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java
deleted file mode 100644
index 5c840cd..0000000
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache;
-
-import org.apache.ignite.cache.eviction.EvictionPolicy;
-
-/**
- * Defines set of memory modes. Memory modes help control whether cache entries are
- * stored on heap memory, offheap memory, or in swap space.
- */
-@Deprecated public enum CacheMemoryMode {
- /**
- * Entries will be stored on-heap first. The onheap tiered storage works as follows:
- * <nl>
- * <li>Entries are cached on heap memory first.</li>
- * <li>
- * If offheap memory is enabled and eviction policy evicts an entry from heap memory, entry will
- * be moved to offheap memory. If offheap memory is disabled, then entry is simply discarded.
- * </li>
- * <li>
- * If swap space is enabled and offheap memory fills up, then entry will be evicted into swap space.
- * If swap space is disabled, then entry will be discarded. If swap is enabled and offheap memory
- * is disabled, then entry will be evicted directly from heap memory into swap.
- * </li>
- * </nl>
- * <p>
- * <b>Note</b> that heap memory evictions are handled by configured {@link EvictionPolicy}
- * implementation. By default, no eviction policy is enabled, so entries never leave heap
- * memory space unless explicitly removed.
- */
- ONHEAP_TIERED,
-
- /**
- * Works the same as {@link #ONHEAP_TIERED}, except that entries never end up in heap memory and get
- * stored in offheap memory right away. Entries get cached in offheap memory first and then
- * get evicted to swap, if one is configured.
- */
- OFFHEAP_TIERED,
-
- /**
- * Entry keys will be stored on heap memory, and values will be stored in offheap memory. Note
- * that in this mode entries can be evicted only to swap. The evictions will happen according
- * to configured {@link EvictionPolicy}.
- * <p/>
- * Size returned by {@link CachePeekMode#OFFHEAP} is always zero, for this mode.
- */
- OFFHEAP_VALUES,
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/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 418c7fb..476b983 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
@@ -46,7 +46,6 @@ import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.CacheInterceptor;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheTypeMetadata;
@@ -1669,28 +1668,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Gets memory mode for cache. Memory mode helps control whether value is stored in on-heap memory,
- * off-heap memory, or swap space. Refer to {@link CacheMemoryMode} for more info.
- *
- * @return Memory mode.
- */
- @Deprecated public CacheMemoryMode getMemoryMode() {
- return null;
- }
-
- /**
- * Sets memory mode for cache.
- *
- * @param memMode Memory mode.
- * @return {@code this} for chaining.
- */
- @Deprecated public CacheConfiguration<K, V> setMemoryMode(CacheMemoryMode memMode) {
- //this.memMode = memMode;
-
- return this;
- }
-
- /**
* Gets cache interceptor.
*
* @return Cache interceptor.
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
index e92b8a7..2d3af8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.ignite.configuration;
import java.io.Serializable;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -98,19 +97,6 @@ public class CollectionConfiguration implements Serializable {
}
/**
- * @return Cache memory mode.
- */
- @Deprecated public CacheMemoryMode getMemoryMode() {
- return null;
- }
-
- /**
- * @param memoryMode Memory mode.
- */
- @Deprecated public void setMemoryMode(CacheMemoryMode memoryMode) {
- }
-
- /**
* @return Predicate specifying on which nodes the cache should be started.
*/
public IgnitePredicate<ClusterNode> getNodeFilter() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/README.txt
----------------------------------------------------------------------
diff --git a/modules/yardstick/README.txt b/modules/yardstick/README.txt
index 5903fd4..c21ed2a 100644
--- a/modules/yardstick/README.txt
+++ b/modules/yardstick/README.txt
@@ -120,8 +120,6 @@ would behave like a `servers`.
* `-nn <num>` or `--nodeNumber <num>` - Number of nodes (automatically set in `benchmark.properties`), used to wait for
the specified number of nodes to start
* `-sm <mode>` or `-syncMode <mode>` - Synchronization mode (defined in `CacheWriteSynchronizationMode`)
-* `-ot` or `--offheapTiered` - Flag indicating whether tiered off-heap mode is on
-* `-ov` or `--offheapValuesOnly` - Flag indicating whether off-heap mode is on and only cache values are stored off-heap
* `-r <num>` or `--range` - Range of keys that are randomly generated for cache operations
* `-rd or --restartdelay` - Restart delay in seconds
* `-rs or --restartsleep` - Restart sleep in seconds
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-atomic-win.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-atomic-win.properties b/modules/yardstick/config/benchmark-atomic-win.properties
index 202306e..be13d77 100644
--- a/modules/yardstick/config/benchmark-atomic-win.properties
+++ b/modules/yardstick/config/benchmark-atomic-win.properties
@@ -54,11 +54,5 @@ set DRIVER_HOSTS=localhost
:: Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
set CONFIGS=^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetOffHeapBenchmark -sn IgniteNode -ds atomic-get-offheap-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-get-offheap-val-1-backup,^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds atomic-put-get-offheap-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-get-offheap-val-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds atomic-put-offheap-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-offheap-val-1-backup
+-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-1-backup
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-atomic.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-atomic.properties b/modules/yardstick/config/benchmark-atomic.properties
index 967a603..beb3ec1 100644
--- a/modules/yardstick/config/benchmark-atomic.properties
+++ b/modules/yardstick/config/benchmark-atomic.properties
@@ -71,13 +71,7 @@ sm=PRIMARY_SYNC
# Run configuration.
# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetOffHeapBenchmark -sn IgniteNode -ds atomic-get-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-get-offheap-val-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds atomic-put-get-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-get-offheap-val-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds atomic-put-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-offheap-val-${b}-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-1-backup,\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-client-mode.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-client-mode.properties b/modules/yardstick/config/benchmark-client-mode.properties
index ad501f1..923c96a 100644
--- a/modules/yardstick/config/benchmark-client-mode.properties
+++ b/modules/yardstick/config/benchmark-client-mode.properties
@@ -95,13 +95,4 @@ CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-val-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-multicast.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-multicast.properties b/modules/yardstick/config/benchmark-multicast.properties
index 7f76495..3e89d8f 100644
--- a/modules/yardstick/config/benchmark-multicast.properties
+++ b/modules/yardstick/config/benchmark-multicast.properties
@@ -100,15 +100,6 @@ CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-val-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-putAll-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllSerializableTxBenchmark -sn IgniteNode -ds ${ver}tx-putAllSerializable-${b}-backup,\
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-query-win.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-query-win.properties b/modules/yardstick/config/benchmark-query-win.properties
index 6bd8fb9..0c410e3 100644
--- a/modules/yardstick/config/benchmark-query-win.properties
+++ b/modules/yardstick/config/benchmark-query-win.properties
@@ -54,8 +54,5 @@ set DRIVER_HOSTS=localhost
:: Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
set CONFIGS=^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds sql-query-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds sql-query-offheap-1-backup,^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds sql-query-join-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds sql-query-join-offheap-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds sql-query-put-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds sql-query-put-offheap-1-backup
+-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds sql-query-put-1-backup
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-query.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-query.properties b/modules/yardstick/config/benchmark-query.properties
index 9192512..447798c 100644
--- a/modules/yardstick/config/benchmark-query.properties
+++ b/modules/yardstick/config/benchmark-query.properties
@@ -72,11 +72,8 @@ sm=PRIMARY_SYNC
# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds sql-query-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds sql-query-offheap-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds sql-query-join-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds sql-query-join-offheap-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds sql-query-put-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds sql-query-put-offheap-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite://127.0.0.1/query -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite:cfg://cache=query@config/ignite-jdbc-config.xml -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-tx-win.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-tx-win.properties b/modules/yardstick/config/benchmark-tx-win.properties
index 490b9d7..ad9cc41 100644
--- a/modules/yardstick/config/benchmark-tx-win.properties
+++ b/modules/yardstick/config/benchmark-tx-win.properties
@@ -56,8 +56,4 @@ set CONFIGS=^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxBenchmark -sn IgniteNode -ds tx-put-1-backup,^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds tx-getAndPut-1-backup,^
-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds tx-invoke-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds tx-put-offheap-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-offheap-val-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds tx-put-get-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxOffHeapBenchmark -sn IgniteNode -ds tx-put-get-offheap-1-backup,^
--cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-get-offheap-val-1-backup
+-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds tx-put-get-1-backup
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-tx.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-tx.properties b/modules/yardstick/config/benchmark-tx.properties
index cc48c53..e579f76 100644
--- a/modules/yardstick/config/benchmark-tx.properties
+++ b/modules/yardstick/config/benchmark-tx.properties
@@ -74,9 +74,5 @@ CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode -ds tx-put-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds tx-getAndPut-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds tx-invoke-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds tx-put-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-offheap-val-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds tx-put-get-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxOffHeapBenchmark -sn IgniteNode -ds tx-put-get-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-get-offheap-val-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark.properties b/modules/yardstick/config/benchmark.properties
index cccbf2a..2dd51eb 100644
--- a/modules/yardstick/config/benchmark.properties
+++ b/modules/yardstick/config/benchmark.properties
@@ -95,16 +95,7 @@ CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteApplyBenchmark -sn IgniteNode -ds ${ver}apply-compute-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-val-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -sm PRIMARY_SYNC -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -col -sm PRIMARY_SYNC -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-collocated-putAll-${b}-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -sm PRIMARY_SYNC -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-tx-${b}-backup,\
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-base-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml
index 2ef3ba6..fe2c0e9 100644
--- a/modules/yardstick/config/ignite-base-config.xml
+++ b/modules/yardstick/config/ignite-base-config.xml
@@ -40,27 +40,6 @@
</bean>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="atomic-offheap"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="atomic-offheap-values"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="memoryMode" value="OFFHEAP_VALUES"/>
-
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
<property name="name" value="tx"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -70,28 +49,6 @@
</bean>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="tx-offheap"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="TRANSACTIONAL"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
-
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="tx-offheap-values"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="TRANSACTIONAL"/>
-
- <property name="memoryMode" value="OFFHEAP_VALUES"/>
-
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
<property name="name" value="atomic-index"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -190,26 +147,6 @@
</bean>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="query-offheap"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
-
- <property name="indexedTypes">
- <list>
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Organization</value>
-
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Person</value>
- </list>
- </property>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
<property name="name" value="compute"/>
<property name="cacheMode" value="PARTITIONED"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-base-load-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-base-load-config.xml b/modules/yardstick/config/ignite-base-load-config.xml
index dfa3304..cd9eb06 100644
--- a/modules/yardstick/config/ignite-base-load-config.xml
+++ b/modules/yardstick/config/ignite-base-load-config.xml
@@ -48,27 +48,6 @@
<property name="atomicityMode" value="ATOMIC"/>
</bean>
- <bean name="atomic-offheap" class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="atomic-offheap"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
- </bean>
-
- <bean name="atomic-offheap-values" class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="atomic-offheap-values"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="memoryMode" value="OFFHEAP_VALUES"/>
-
- </bean>
-
<bean name="tx" class="org.apache.ignite.configuration.CacheConfiguration">
<property name="name" value="tx-fat-values"/>
@@ -78,28 +57,6 @@
</bean>
- <bean name="tx-offheap" class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="tx-offheap"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="TRANSACTIONAL"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
-
- </bean>
-
- <bean name="tx-offheap-values" class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="tx-offheap-values"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="TRANSACTIONAL"/>
-
- <property name="memoryMode" value="OFFHEAP_VALUES"/>
-
- </bean>
-
<bean name="atomic-index" class="org.apache.ignite.configuration.CacheConfiguration">
<property name="name" value="atomic-index"/>
@@ -197,26 +154,6 @@
</property>
</bean>
- <bean name="query-offheap" class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="query-offheap"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
-
- <property name="indexedTypes">
- <list>
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Organization</value>
-
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Person</value>
- </list>
- </property>
- </bean>
-
<bean name="compute" class="org.apache.ignite.configuration.CacheConfiguration">
<property name="name" value="compute"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-cache-load-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-cache-load-config.xml b/modules/yardstick/config/ignite-cache-load-config.xml
index 6c6ac89..f58237f 100644
--- a/modules/yardstick/config/ignite-cache-load-config.xml
+++ b/modules/yardstick/config/ignite-cache-load-config.xml
@@ -32,15 +32,10 @@
<property name="cacheConfiguration">
<list>
<ref bean="atomic" />
- <ref bean="atomic-offheap" />
- <ref bean="atomic-offheap-values" />
<ref bean="tx" />
- <ref bean="tx-offheap" />
- <ref bean="tx-offheap-values" />
<ref bean="atomic-index" />
<ref bean="query" />
<ref bean="orgCache" />
- <!--<ref bean="query-offheap" />-->
<ref bean="compute" />
</list>
</property>
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-failover-base-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-failover-base-config.xml b/modules/yardstick/config/ignite-failover-base-config.xml
index 1e1dcff..3e40765 100644
--- a/modules/yardstick/config/ignite-failover-base-config.xml
+++ b/modules/yardstick/config/ignite-failover-base-config.xml
@@ -37,41 +37,21 @@
<property name="name" value="atomic-reties"/>
</bean>
- <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="atomic-offheap">
- <property name="name" value="atomic-offheap-reties"/>
- </bean>
-
<bean class="org.apache.ignite.configuration.CacheConfiguration" parent="atomic">
<property name="name" value="atomic-invoke-retry"/>
</bean>
- <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="atomic-offheap">
- <property name="name" value="atomic-offheap-invoke-retry"/>
- </bean>
-
<bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx">
<property name="name" value="tx-invoke-retry"/>
</bean>
- <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx-offheap">
- <property name="name" value="tx-offheap-invoke-retry"/>
- </bean>
-
<bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx">
<property name="name" value="tx-write-read"/>
</bean>
- <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx-offheap">
- <property name="name" value="tx-offheap-write-read"/>
- </bean>
-
<bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx">
<property name="name" value="tx-write-invoke"/>
</bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx-offheap">
- <property name="name" value="tx-offheap-write-invoke"/>
- </bean>
</list>
</property>
@@ -94,18 +74,6 @@
<property name="swapEnabled" value="false"/>
</bean>
- <bean id="atomic-offheap" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true">
- <property name="name" value="atomic-offheap"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="swapEnabled" value="false"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
- </bean>
-
<bean id="tx" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true">
<property name="cacheMode" value="PARTITIONED"/>
@@ -114,13 +82,4 @@
<property name="swapEnabled" value="false"/>
</bean>
- <bean id="tx-offheap" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true">
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="TRANSACTIONAL"/>
-
- <property name="swapEnabled" value="false"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
- </bean>
</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-int-max-values-offheap-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-int-max-values-offheap-config.xml b/modules/yardstick/config/ignite-int-max-values-offheap-config.xml
deleted file mode 100644
index 86e9656..0000000
--- a/modules/yardstick/config/ignite-int-max-values-offheap-config.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- 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.
--->
-
-<!--
- Ignite Spring configuration file.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
- <property name="peerClassLoadingEnabled" value="true"/>
-
- <property name="marshaller">
- <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
- <property name="requireSerializable" value="false"/>
- </bean>
- </property>
-
-<!--
- <property name="marshaller">
- <bean class="org.apache.ignite.internal.binary.BinaryMarshaller"/>
- </property>
--->
-
- <property name="networkTimeout" value="600000"/>
-
- <property name="discoverySpi">
- <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
- <property name="networkTimeout" value="600000"/>
-
- <property name="socketTimeout" value="600000"/>
-
- <property name="ackTimeout" value="60000"/>
-
- <property name="ipFinder">
- <!-- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> -->
- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">
- <!--
- <property name="addresses">
- <list>
- <!– In distributed environment, replace with actual host IP address. –>
- <value>127.0.0.1:47500..47509</value>
- </list>
- </property>
- -->
- </bean>
- </property>
- </bean>
- </property>
-
- <property name="cacheConfiguration">
- <list>
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="int-max-value-cache"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="backups" value="0"/>
- <property name="atomicityMode" value="ATOMIC"/>
- <property name="memoryMode" value="ONHEAP_TIERED"/>
- <property name="offHeapMaxMemory" value="#{32 * 1024 * 1024 * 1024L}"/>
- <property name="swapEnabled" value="false"/>
- <property name="evictionPolicy">
- <bean class="org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy">
- <property name="maxSize" value="4000000"/>
- <property name="batchSize" value="500000"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
- </bean>
-</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-int-max-values-swap-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-int-max-values-swap-config.xml b/modules/yardstick/config/ignite-int-max-values-swap-config.xml
deleted file mode 100644
index edb15d3..0000000
--- a/modules/yardstick/config/ignite-int-max-values-swap-config.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- 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.
--->
-
-<!--
- Ignite Spring configuration file.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
- <property name="peerClassLoadingEnabled" value="true"/>
-
- <property name="marshaller">
- <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
- <property name="requireSerializable" value="false"/>
- </bean>
- </property>
-
-<!--
- <property name="marshaller">
- <bean class="org.apache.ignite.internal.binary.BinaryMarshaller"/>
- </property>
--->
-
- <property name="networkTimeout" value="600000"/>
-
- <property name="discoverySpi">
- <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
- <property name="networkTimeout" value="600000"/>
-
- <property name="socketTimeout" value="600000"/>
-
- <property name="ackTimeout" value="60000"/>
-
- <property name="ipFinder">
- <!-- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> -->
- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">
- <!--
- <property name="addresses">
- <list>
- <!– In distributed environment, replace with actual host IP address. –>
- <value>127.0.0.1:47500..47509</value>
- </list>
- </property>
- -->
- </bean>
- </property>
- </bean>
- </property>
-
- <property name="cacheConfiguration">
- <list>
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="int-max-value-cache"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="backups" value="0"/>
- <property name="atomicityMode" value="ATOMIC"/>
- <property name="memoryMode" value="ONHEAP_TIERED"/>
- <property name="offHeapMaxMemory" value="#{32 * 1024 * 1024 * 1024L}"/>
- <property name="swapEnabled" value="true"/>
- <property name="evictionPolicy">
- <bean class="org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy">
- <property name="maxSize" value="4000000"/>
- <property name="batchSize" value="500000"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <property name="swapSpaceSpi">
- <bean class="org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi"/>
- </property>
- </bean>
-</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/test-max-int-values-offheap.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/test-max-int-values-offheap.properties b/modules/yardstick/config/test-max-int-values-offheap.properties
deleted file mode 100644
index 838986d..0000000
--- a/modules/yardstick/config/test-max-int-values-offheap.properties
+++ /dev/null
@@ -1,62 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Contains benchmarks for SQL queries.
-#
-
-# JVM options.
-# JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
-
-# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
-JVM_OPTS=${JVM_OPTS}" \
--Xms8g \
--Xmx8g \
--Xloggc:./gc${now0}.log \
--XX:+PrintGCDetails \
--verbose:gc \
--XX:+UseParNewGC \
--XX:+UseConcMarkSweepGC \
-"
-
-# List of default probes.
-# Add DStatProbe or VmStatProbe if your OS supports it (e.g. if running on Linux).
-# BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
-
-# Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
-
-# Probe point writer class name.
-# BENCHMARK_WRITER=
-
-# Comma-separated list of the hosts to run BenchmarkServers on. 2 nodes on local host are enabled by default.
-SERVER_HOSTS=fosters-215,fosters-216,fosters-217,fosters-226,fosters-219,fosters-221,fosters-222,fosters-223
-
-# Comma-separated list of the hosts to run BenchmarkDrivers on. 1 node on local host is enabled by default.
-DRIVER_HOSTS=fosters-218
-
-# Remote username.
-# REMOTE_USER=
-
-# Number of nodes, used to wait for the specified number of nodes to start.
-nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
-
-# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
-CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-int-max-values-offheap-config.xml -nn ${nodesNum} -b 0 -w 0 -d 9999999 -t 1 -sm PRIMARY_SYNC -dn IntMaxValueEntriesTest -sn IgniteNode -ds int-max-values-offheap\
-"
-
-
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/test-max-int-values-swap.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/test-max-int-values-swap.properties b/modules/yardstick/config/test-max-int-values-swap.properties
deleted file mode 100644
index c462ada..0000000
--- a/modules/yardstick/config/test-max-int-values-swap.properties
+++ /dev/null
@@ -1,61 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Contains benchmarks for SQL queries.
-#
-
-# JVM options.
-# JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false"
-
-# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
-JVM_OPTS=${JVM_OPTS}" \
--Xms8g \
--Xmx8g \
--Xloggc:./gc${now0}.log \
--XX:+PrintGCDetails \
--verbose:gc \
--XX:+UseParNewGC \
--XX:+UseConcMarkSweepGC \
-"
-
-# List of default probes.
-# Add DStatProbe or VmStatProbe if your OS supports it (e.g. if running on Linux).
-# BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe
-
-# Packages where the specified benchmark is searched by reflection mechanism.
-BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick
-
-# Probe point writer class name.
-# BENCHMARK_WRITER=
-
-# Comma-separated list of the hosts to run BenchmarkServers on. 2 nodes on local host are enabled by default.
-SERVER_HOSTS=fosters-215,fosters-216,fosters-217,fosters-226,fosters-219,fosters-221,fosters-222,fosters-223
-
-# Comma-separated list of the hosts to run BenchmarkDrivers on. 1 node on local host is enabled by default.
-DRIVER_HOSTS=fosters-218
-
-# Remote username.
-# REMOTE_USER=
-
-# Number of nodes, used to wait for the specified number of nodes to start.
-nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`))
-
-# Run configuration.
-# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
-CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-int-max-values-swap-config.xml -nn ${nodesNum} -b 0 -w 0 -d 9999999 -t 1 -sm PRIMARY_SYNC -dn IntMaxValueEntriesTest -sn IgniteNode -ds int-max-values-swap\
-"
-
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
index cef783e..e096caf 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
@@ -78,14 +78,6 @@ public class IgniteBenchmarkArguments {
private TransactionIsolation txIsolation = TransactionIsolation.REPEATABLE_READ;
/** */
- @Parameter(names = {"-ot", "--offheapTiered"}, description = "Tiered offheap")
- private boolean offheapTiered;
-
- /** */
- @Parameter(names = {"-ov", "--offheapValuesOnly"}, description = "Offheap values only")
- private boolean offheapVals;
-
- /** */
@Parameter(names = {"-rtp", "--restPort"}, description = "REST TCP port")
private int restTcpPort;
@@ -295,27 +287,6 @@ public class IgniteBenchmarkArguments {
}
/**
- * @return Offheap tiered.
- */
- public boolean isOffheapTiered() {
- return offheapTiered;
- }
-
- /**
- * @return Offheap values.
- */
- public boolean isOffheapValues() {
- return offheapVals;
- }
-
- /**
- * @return {@code True} if any offheap is enabled.
- */
- public boolean isOffHeap() {
- return offheapTiered || offheapVals;
- }
-
- /**
* @return Nodes.
*/
public int nodes() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java
deleted file mode 100644
index 4e1d9d9..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs get operations with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED}
- * memory mode.
- */
-public class IgniteGetOffHeapBenchmark extends IgniteGetBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("atomic-offheap");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java
deleted file mode 100644
index 4042abe..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs get operations with {@link CacheMemoryMode#OFFHEAP_VALUES OFFHEAP VALUES}
- * memory mode.
- */
-public class IgniteGetOffHeapValuesBenchmark extends IgniteGetBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("atomic-offheap-values");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java
deleted file mode 100644
index 1074a49..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs put and get operations with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIRED}
- * memory mode.
- */
-public class IgnitePutGetOffHeapBenchmark extends IgnitePutGetBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("atomic-offheap");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java
deleted file mode 100644
index 2ec457c..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs put and get operations
- * with {@link CacheMemoryMode#OFFHEAP_VALUES OFFHEAP VALUES} memory mode.
- */
-public class IgnitePutGetOffHeapValuesBenchmark extends IgnitePutGetBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("atomic-offheap-values");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java
deleted file mode 100644
index 3359a14..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs transactional put and get operations
- * with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED} memory mode.
- */
-public class IgnitePutGetTxOffHeapBenchmark extends IgnitePutGetTxBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("tx-offheap");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java
deleted file mode 100644
index b911051..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs transactional put and get operations
- * with {@link CacheMemoryMode#OFFHEAP_VALUES OFFHEAP VALUES} memory mode.
- */
-public class IgnitePutGetTxOffHeapValuesBenchmark extends IgnitePutGetTxBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("tx-offheap-values");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java
deleted file mode 100644
index 5271671..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs put operations with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED}
- * memory mode.
- */
-public class IgnitePutOffHeapBenchmark extends IgnitePutBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("atomic-offheap");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java
deleted file mode 100644
index 8db4429..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs put operations with {@link CacheMemoryMode#OFFHEAP_VALUES OFFHEAP VALUES}
- * memory mode.
- */
-public class IgnitePutOffHeapValuesBenchmark extends IgnitePutBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("atomic-offheap-values");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutRandomValueSizeBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutRandomValueSizeBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutRandomValueSizeBenchmark.java
index be85b9f..180b50e 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutRandomValueSizeBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutRandomValueSizeBenchmark.java
@@ -36,6 +36,6 @@ public class IgnitePutRandomValueSizeBenchmark extends IgniteCacheAbstractBenchm
/** {@inheritDoc} */
@Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("atomic-offheap");
+ return ignite().cache("atomic");
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java
deleted file mode 100644
index 03e6e42..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs transactional put operations
- * with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIRED} memory mode.
- */
-public class IgnitePutTxOffHeapBenchmark extends IgnitePutTxImplicitBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("tx-offheap");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java
deleted file mode 100644
index 1cf04d7..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs transactional put operations
- * with {@link CacheMemoryMode#OFFHEAP_VALUES OFFHEAP VALUES} memory mode.
- */
-public class IgnitePutTxOffHeapValuesBenchmark extends IgnitePutTxImplicitBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("tx-offheap-values");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java
deleted file mode 100644
index 3ea3d38..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs query operations with joins
- * and {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED} memory mode.
- */
-public class IgniteSqlQueryJoinOffHeapBenchmark extends IgniteSqlQueryJoinBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("query-offheap");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java
deleted file mode 100644
index 8ad10e7..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs query operations with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED}
- * memory mode.
- */
-public class IgniteSqlQueryOffHeapBenchmark extends IgniteSqlQueryBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("query-offheap");
- }
-}
\ No newline at end of file
[23/53] [abbrv] ignite git commit: ignite-4535 : Merge with
ignite-3477-master.
Posted by ag...@apache.org.
ignite-4535 : Merge with ignite-3477-master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2fb75c41
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2fb75c41
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2fb75c41
Branch: refs/heads/ignite-3477-master
Commit: 2fb75c41eda348ac9c7de770638d4810d394ae5e
Parents: 55b13c6 b6c1761
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 3 15:10:59 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 3 15:10:59 2017 +0300
----------------------------------------------------------------------
.../spi/checkpoint/s3/S3CheckpointSpi.java | 72 +-
.../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 27 +-
.../cloud/TcpDiscoveryCloudIpFinder.java | 51 +-
.../ignite/binary/BinaryBasicIdMapper.java | 5 +-
.../ignite/binary/BinaryBasicNameMapper.java | 5 +-
.../ignite/binary/BinaryTypeConfiguration.java | 30 +-
.../ignite/cache/CacheKeyConfiguration.java | 10 +-
.../org/apache/ignite/cache/QueryEntity.java | 35 +-
.../affinity/fair/FairAffinityFunction.java | 21 +-
.../rendezvous/RendezvousAffinityFunction.java | 27 +-
.../cache/eviction/AbstractEvictionPolicy.java | 15 +-
.../cache/eviction/fifo/FifoEvictionPolicy.java | 74 +-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 2 +
.../igfs/IgfsPerBlockLruEvictionPolicy.java | 131 +++-
.../cache/eviction/lru/LruEvictionPolicy.java | 74 +-
.../eviction/sorted/SortedEvictionPolicy.java | 74 +-
.../configuration/AtomicConfiguration.java | 15 +-
.../configuration/BinaryConfiguration.java | 30 +-
.../configuration/CacheConfiguration.java | 71 +-
.../configuration/CollectionConfiguration.java | 31 +-
.../configuration/ConnectorConfiguration.java | 100 ++-
.../configuration/FileSystemConfiguration.java | 151 +++-
.../configuration/HadoopConfiguration.java | 31 +-
.../configuration/NearCacheConfiguration.java | 50 ++
.../configuration/TransactionConfiguration.java | 45 +-
.../igfs/IgfsGroupDataBlocksKeyMapper.java | 5 +-
.../igfs/IgfsIpcEndpointConfiguration.java | 30 +-
.../ignite/internal/MarshallerPlatformIds.java | 3 +
.../ignite/internal/binary/BinaryUtils.java | 4 +
.../client/GridClientConfiguration.java | 100 ++-
.../client/GridClientDataConfiguration.java | 15 +-
.../client/GridClientPartitionAffinity.java | 15 +-
.../balancer/GridClientBalancerAdapter.java | 5 +-
.../router/GridTcpRouterConfiguration.java | 50 +-
.../internal/jdbc2/JdbcSqlFieldsQuery.java | 57 ++
.../processors/cache/GridCacheProcessor.java | 39 +-
.../cache/transactions/IgniteTxAdapter.java | 2 +
.../platform/PlatformContextImpl.java | 10 +-
.../binary/PlatformBinaryProcessor.java | 40 +-
.../dotnet/PlatformDotNetConfigurationEx.java | 21 +-
.../utils/PlatformConfigurationUtils.java | 3 +-
.../service/GridServiceProcessor.java | 12 +-
.../optimized/OptimizedMarshaller.java | 15 +-
.../apache/ignite/mxbean/IgniteMBeanAware.java | 28 +
.../dotnet/PlatformDotNetAffinityFunction.java | 10 +-
.../PlatformDotNetBinaryConfiguration.java | 31 +-
.../PlatformDotNetBinaryTypeConfiguration.java | 35 +-
.../dotnet/PlatformDotNetConfiguration.java | 10 +-
.../ignite/services/ServiceConfiguration.java | 35 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 50 +-
.../ignite/spi/IgniteSpiMBeanAdapter.java | 78 ++
.../checkpoint/cache/CacheCheckpointSpi.java | 40 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 219 +++++-
.../spi/checkpoint/noop/NoopCheckpointSpi.java | 7 +
.../sharedfs/SharedFsCheckpointSpi.java | 54 +-
.../fifoqueue/FifoQueueCollisionSpi.java | 134 +++-
.../fifoqueue/FifoQueueCollisionSpiMBean.java | 2 +-
.../jobstealing/JobStealingCollisionSpi.java | 281 ++++++-
.../JobStealingCollisionSpiMBean.java | 6 +-
.../spi/collision/noop/NoopCollisionSpi.java | 7 +
.../PriorityQueueCollisionSpi.java | 278 +++++--
.../PriorityQueueCollisionSpiMBean.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 637 +++++++++++++---
.../deployment/local/LocalDeploymentSpi.java | 24 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 438 +++++++++--
.../ipfinder/TcpDiscoveryIpFinderAdapter.java | 5 +-
.../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 17 +-
.../TcpDiscoveryMulticastIpFinder.java | 47 +-
.../sharedfs/TcpDiscoverySharedFsIpFinder.java | 12 +-
.../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 14 +-
.../memory/MemoryEventStorageSpi.java | 98 ++-
.../spi/failover/always/AlwaysFailoverSpi.java | 53 +-
.../jobstealing/JobStealingFailoverSpi.java | 68 +-
.../spi/failover/never/NeverFailoverSpi.java | 30 +-
.../spi/indexing/noop/NoopIndexingSpi.java | 7 +
.../adaptive/AdaptiveLoadBalancingSpi.java | 43 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 44 +-
.../WeightedRandomLoadBalancingSpi.java | 61 +-
.../gce/TcpDiscoveryGoogleStorageIpFinder.java | 33 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 10 +-
.../IgniteHadoopWeightedMapReducePlanner.java | 26 +-
.../ignite/impl/binary/binary_type_impl.h | 2 +-
.../common/include/ignite/common/concurrent.h | 30 +
.../cpp/common/include/ignite/reference.h | 14 +-
.../cpp/core-test/config/cache-test.xml | 2 +-
.../project/vs/core-test.vcxproj.filters | 3 +
.../cpp/core-test/src/cache_invoke_test.cpp | 6 +-
.../platforms/cpp/core-test/src/cache_test.cpp | 23 +-
.../cpp/core-test/src/continuous_query_test.cpp | 204 ++++-
.../cpp/core-test/src/reference_test.cpp | 12 +-
modules/platforms/cpp/core/Makefile.am | 1 +
modules/platforms/cpp/core/include/Makefile.am | 70 +-
.../cpp/core/include/ignite/cache/cache.h | 22 +-
.../ignite/cache/cache_entry_processor.h | 42 +-
.../cache/event/cache_entry_event_filter.h | 109 +++
.../cache/query/continuous/continuous_query.h | 35 +-
.../cpp/core/include/ignite/ignite_binding.h | 39 +-
.../include/ignite/ignite_binding_context.h | 2 +-
.../cpp/core/include/ignite/impl/bindings.h | 95 +++
.../impl/cache/cache_entry_processor_holder.h | 15 -
.../core/include/ignite/impl/cache/cache_impl.h | 81 +-
.../cache/event/cache_entry_event_filter_base.h | 66 ++
.../event/cache_entry_event_filter_holder.h | 185 +++++
.../continuous/continuous_query_handle_impl.h | 10 -
.../query/continuous/continuous_query_impl.h | 60 +-
.../include/ignite/impl/ignite_binding_impl.h | 101 +--
.../include/ignite/impl/ignite_environment.h | 37 +-
.../cpp/core/include/ignite/impl/ignite_impl.h | 10 +-
.../cpp/core/include/ignite/impl/operations.h | 2 +-
.../platforms/cpp/core/project/vs/core.vcxproj | 5 +
.../cpp/core/project/vs/core.vcxproj.filters | 18 +
.../cpp/core/src/impl/cache/cache_impl.cpp | 90 ++-
.../continuous/continuous_query_handle_impl.cpp | 5 -
.../cpp/core/src/impl/ignite_binding_impl.cpp | 88 +++
.../cpp/core/src/impl/ignite_environment.cpp | 124 ++-
.../platforms/cpp/core/src/impl/ignite_impl.cpp | 2 +-
.../Apache.Ignite.Core.Tests.csproj | 11 +-
.../Binary/BinaryBuilderSelfTest.cs | 112 +--
.../BinaryBuilderSelfTestDynamicRegistration.cs | 40 +
.../Binary/BinaryCompactFooterInteropTest.cs | 2 +-
.../Binary/BinaryDynamicRegistrationTest.cs | 441 +++++++++++
.../Binary/BinarySelfTest.cs | 197 +++--
.../Binary/BinarySelfTestFullFooter.cs | 5 +-
.../Binary/JavaBinaryInteropTest.cs | 182 +++++
.../Serializable/AdvancedSerializationTest.cs | 228 ++++++
.../BasicSerializableObjectsTest.cs | 124 +++
.../Binary/Serializable/CallbacksTest.cs | 369 +++++++++
.../Binary/Serializable/DelegatesTest.cs | 161 ++++
.../Binary/Serializable/ObjectReferenceTests.cs | 131 ++++
.../Binary/Serializable/PrimitivesTest.cs | 754 +++++++++++++++++++
.../Binary/Serializable/SqlDmlTest.cs | 277 +++++++
.../Cache/Affinity/AffinityFunctionTest.cs | 21 -
.../Cache/CacheAbstractTest.cs | 56 +-
.../Cache/Query/CacheLinqTest.cs | 2 +-
.../Cache/Query/CacheQueriesTest.cs | 15 +-
.../Continuous/ContinuousQueryAbstractTest.cs | 29 +-
.../Cache/Store/CacheStoreTest.cs | 5 +-
.../Compute/ComputeApiTest.cs | 28 +-
.../Compute/IgniteExceptionTaskSelfTest.cs | 40 +-
.../Compute/ResourceTaskTest.cs | 13 +-
.../Apache.Ignite.Core.Tests/DeploymentTest.cs | 15 +-
.../Examples/ExamplesTest.cs | 2 +-
.../Apache.Ignite.Core.Tests/ExecutableTest.cs | 28 +-
.../SerializationTest.cs | 240 ------
.../Services/ServiceProxyTest.cs | 40 +-
.../Apache.Ignite.Core.Tests/TestUtils.cs | 11 +
.../Apache.Ignite.Core.csproj | 7 +-
.../Cache/Configuration/CacheConfiguration.cs | 8 +-
.../Cache/Query/Continuous/ContinuousQuery.cs | 59 +-
.../Apache.Ignite.Core/Cache/Query/QueryBase.cs | 4 +-
.../Cache/Query/SqlFieldsQuery.cs | 6 +-
.../Apache.Ignite.Core/IgniteConfiguration.cs | 25 +-
.../dotnet/Apache.Ignite.Core/Ignition.cs | 4 +-
.../Impl/Binary/BinarizableSerializer.cs | 5 +-
.../Impl/Binary/BinaryFullTypeDescriptor.cs | 49 +-
.../Impl/Binary/BinaryObjectBuilder.cs | 27 +-
.../Impl/Binary/BinaryObjectHeader.cs | 13 +-
.../Impl/Binary/BinaryObjectSchemaSerializer.cs | 2 +
.../Impl/Binary/BinaryProcessor.cs | 38 +-
.../Impl/Binary/BinaryReader.cs | 39 +-
.../Impl/Binary/BinaryReflectiveActions.cs | 2 +-
.../BinaryReflectiveSerializerInternal.cs | 84 ++-
.../Binary/BinarySurrogateTypeDescriptor.cs | 13 +-
.../Impl/Binary/BinarySystemHandlers.cs | 96 +--
.../Impl/Binary/BinarySystemTypeSerializer.cs | 2 +-
.../Impl/Binary/BinaryUtils.cs | 54 +-
.../Impl/Binary/BinaryWriter.cs | 242 +++---
.../Impl/Binary/DateTimeHolder.cs | 101 ---
.../Impl/Binary/DateTimeSerializer.cs | 48 --
.../Binary/DeserializationCallbackProcessor.cs | 102 +++
.../Impl/Binary/IBinarySerializerInternal.cs | 4 +-
.../Impl/Binary/IBinaryTypeDescriptor.cs | 8 +
.../Impl/Binary/Io/BinaryStreamAdapter.cs | 119 ---
.../Impl/Binary/Marshaller.cs | 248 ++++--
.../Impl/Binary/ReflectionUtils.cs | 50 ++
.../Impl/Binary/SerializableObjectHolder.cs | 96 ---
.../Impl/Binary/SerializableSerializer.cs | 656 +++++++++++++++-
.../Impl/Binary/TypeResolver.cs | 7 +
.../Impl/Binary/UserSerializerProxy.cs | 5 +-
.../Affinity/AffinityFunctionSerializer.cs | 3 -
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 3 +-
.../Common/CopyOnWriteConcurrentDictionary.cs | 35 +
.../Impl/Common/DelegateConverter.cs | 90 ++-
.../Impl/Common/DelegateTypeDescriptor.cs | 3 +-
.../Impl/Common/SerializableTypeDescriptor.cs | 222 ++++++
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 13 +-
.../Impl/Services/ServiceProxySerializer.cs | 4 +-
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 8 +-
.../NuGet/LINQPad/ComputeExample.linq | 1 -
.../NuGet/LINQPad/PutGetExample.linq | 5 +-
.../NuGet/LINQPad/QueryExample.linq | 5 +-
.../NuGet/LINQPad/QueryExample.linq | 5 +-
.../dotnet/Apache.Ignite.Linq/QueryOptions.cs | 2 +-
.../examples/Apache.Ignite.Examples/App.config | 16 +-
.../Apache.Ignite.ExamplesDll/Binary/Address.cs | 2 -
.../Compute/CharacterCountClosure.cs | 1 -
.../Datagrid/ContinuousQueryFilter.cs | 2 -
.../Datagrid/EmployeeStorePredicate.cs | 2 -
.../Messaging/RemoteOrderedListener.cs | 1 -
.../Messaging/RemoteUnorderedListener.cs | 1 -
.../Services/MapService.cs | 1 -
.../spi/deployment/uri/UriDeploymentSpi.java | 80 +-
.../commands/cache/VisorCacheCommand.scala | 2 +-
.../helpers/jade/form/form-field-checkbox.pug | 14 +-
.../helpers/jade/form/form-field-datalist.pug | 2 +-
.../helpers/jade/form/form-field-dropdown.pug | 3 +-
.../app/helpers/jade/form/form-field-number.pug | 3 +-
.../helpers/jade/form/form-field-password.pug | 2 +-
.../app/helpers/jade/form/form-field-text.pug | 3 +-
.../frontend/app/helpers/jade/mixins.pug | 1 +
.../frontend/app/primitives/tooltip/index.pug | 25 +
.../views/configuration/domains-import.tpl.pug | 6 +
.../zk/TcpDiscoveryZookeeperIpFinder.java | 37 +-
214 files changed, 10250 insertions(+), 2348 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2fb75c41/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2fb75c41/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2fb75c41/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2fb75c41/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
[46/53] [abbrv] ignite git commit: Merge branches
'ignite-4535-master' and 'ignite-4851' of
https://github.com/gridgain/apache-ignite into ignite-4851
Posted by ag...@apache.org.
Merge branches 'ignite-4535-master' and 'ignite-4851' of https://github.com/gridgain/apache-ignite into ignite-4851
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f15e9a50
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f15e9a50
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f15e9a50
Branch: refs/heads/ignite-3477-master
Commit: f15e9a5084eb8a9b291e207847b8dceb3fe65fe4
Parents: d79a40d 096d2c0
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 10 14:57:38 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 10 14:57:38 2017 +0300
----------------------------------------------------------------------
assembly/release-fabric-base.xml | 6 +
.../benchmarks/jmh/tree/BPlusTreeBenchmark.java | 2 +
.../internal/jdbc2/JdbcConnectionSelfTest.java | 34 +
.../src/test/resources/spring-server-node.xml | 71 +-
.../test/resources/spring-server-ssl-node.xml | 69 +-
.../src/main/java/org/apache/ignite/Ignite.java | 8 +
.../java/org/apache/ignite/IgniteBinary.java | 35 +-
.../org/apache/ignite/IgniteJdbcDriver.java | 11 +-
.../java/org/apache/ignite/MemoryMetrics.java | 95 ++
.../binary/BinaryAbstractIdentityResolver.java | 53 -
.../binary/BinaryArrayIdentityResolver.java | 224 -----
.../binary/BinaryFieldIdentityResolver.java | 307 ------
.../ignite/binary/BinaryIdentityResolver.java | 42 -
.../ignite/binary/BinaryTypeConfiguration.java | 25 -
.../org/apache/ignite/cache/CacheMetrics.java | 70 --
.../ignite/cache/CacheTypeFieldMetadata.java | 149 ---
.../apache/ignite/cache/CacheTypeMetadata.java | 379 -------
.../org/apache/ignite/cache/QueryEntity.java | 3 +
.../store/jdbc/CacheAbstractJdbcStore.java | 55 --
.../configuration/CacheConfiguration.java | 35 +-
.../configuration/IgniteConfiguration.java | 30 +
.../configuration/MemoryConfiguration.java | 22 +-
.../MemoryPolicyConfiguration.java | 12 +-
.../ignite/internal/GridKernalContext.java | 7 +
.../ignite/internal/GridKernalContextImpl.java | 11 +
.../apache/ignite/internal/IgniteKernal.java | 12 +-
.../org/apache/ignite/internal/IgnitionEx.java | 18 +-
.../ignite/internal/MarshallerContextImpl.java | 20 +-
.../binary/BinaryAbstractIdentityResolver.java | 56 ++
.../binary/BinaryArrayIdentityResolver.java | 222 +++++
.../ignite/internal/binary/BinaryContext.java | 4 +-
.../internal/binary/BinaryIdentityResolver.java | 43 +
.../internal/binary/BinaryObjectExImpl.java | 1 -
.../internal/binary/BinaryWriterExImpl.java | 1 -
.../ignite/internal/jdbc2/JdbcConnection.java | 50 +-
.../managers/communication/GridIoManager.java | 2 +
.../managers/communication/GridIoPolicy.java | 5 +-
.../apache/ignite/internal/pagemem/Page.java | 84 --
.../ignite/internal/pagemem/PageMemory.java | 20 +-
.../ignite/internal/pagemem/PageSupport.java | 104 ++
.../pagemem/impl/PageMemoryNoStoreImpl.java | 174 ++--
.../internal/pagemem/impl/PageNoStoreImpl.java | 141 ---
.../cache/CacheClusterMetricsMXBeanImpl.java | 50 -
.../cache/CacheLocalMetricsMXBeanImpl.java | 50 -
.../processors/cache/CacheMetricsImpl.java | 125 +--
.../processors/cache/CacheMetricsSnapshot.java | 120 ---
.../cache/CacheOffheapEvictionManager.java | 3 +-
.../processors/cache/GridCacheProcessor.java | 28 +
.../cache/IgniteCacheOffheapManagerImpl.java | 24 +-
.../cache/database/CacheDataRowAdapter.java | 26 +-
.../cache/database/DataStructure.java | 243 ++++-
.../IgniteCacheDatabaseSharedManager.java | 104 +-
.../cache/database/IgniteMemoryPoolMetrics.java | 33 -
.../cache/database/MemoryMetricsImpl.java | 314 ++++++
.../processors/cache/database/MemoryPolicy.java | 18 +-
.../processors/cache/database/RowStore.java | 10 -
.../cache/database/freelist/FreeListImpl.java | 180 ++--
.../cache/database/freelist/PagesList.java | 637 ++++++------
.../cache/database/tree/BPlusTree.java | 979 +++++++++++--------
.../cache/database/tree/io/PageIO.java | 3 +-
.../database/tree/reuse/ReuseListImpl.java | 2 +-
.../cache/database/tree/util/PageHandler.java | 381 ++++++--
.../database/tree/util/PageLockListener.java | 42 +-
.../dht/atomic/GridDhtAtomicCache.java | 18 +-
.../dht/preloader/GridDhtPartitionMap.java | 13 +-
.../cache/version/GridCacheVersionManager.java | 3 +
.../clock/GridClockDeltaSnapshot.java | 2 +-
.../continuous/GridContinuousProcessor.java | 3 +-
.../platform/cache/PlatformCache.java | 10 -
.../utils/PlatformConfigurationUtils.java | 64 +-
.../internal/processors/pool/PoolProcessor.java | 10 +-
.../processors/query/GridQueryProcessor.java | 10 -
.../internal/processors/query/QueryUtils.java | 328 +------
.../processors/service/GridServiceProxy.java | 10 +
.../task/GridTaskThreadContextKey.java | 7 +-
.../processors/task/GridTaskWorker.java | 16 +-
.../apache/ignite/internal/util/IgniteTree.java | 14 +
.../visor/cache/VisorCacheConfiguration.java | 2 +-
.../cache/VisorCacheTypeFieldMetadata.java | 14 +-
.../visor/cache/VisorCacheTypeMetadata.java | 91 +-
.../visor/node/VisorMemoryConfiguration.java | 1 -
.../ignite/mxbean/CacheMetricsMXBean.java | 40 -
.../ignite/mxbean/MemoryMetricsMXBean.java | 89 ++
.../ignite/spi/collision/CollisionSpi.java | 11 +-
.../communication/tcp/TcpCommunicationSpi.java | 4 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 3 +-
.../resources/META-INF/classnames.properties | 1 -
.../test/config/store/jdbc/ignite-jdbc-type.xml | 279 ++++++
.../config/store/jdbc/ignite-type-metadata.xml | 276 ------
.../config/websession/example-cache-client.xml | 4 +
...eJdbcStoreAbstractMultithreadedSelfTest.java | 71 +-
.../ignite/custom/DummyEventFilterFactory.java | 47 +
.../BinaryArrayIdentityResolverSelfTest.java | 4 -
.../BinaryFieldIdentityResolverSelfTest.java | 333 -------
...ryIdentityResolverConfigurationSelfTest.java | 138 ---
.../BinaryObjectBuilderAdditionalSelfTest.java | 1 -
...naryObjectBuilderDefaultMappersSelfTest.java | 1 -
.../pagemem/impl/PageMemoryNoLoadSelfTest.java | 119 ++-
.../cache/CacheClientStoreSelfTest.java | 4 +
.../cache/CacheConfigurationLeakTest.java | 3 +-
.../cache/CacheStopAndDestroySelfTest.java | 48 +-
.../cache/ClusterStateAbstractTest.java | 5 +-
.../GridCacheConditionalDeploymentSelfTest.java | 19 +-
.../cache/GridCacheReloadSelfTest.java | 3 +-
.../GridCacheTtlManagerEvictionSelfTest.java | 7 +-
.../processors/cache/H2CacheStoreStrategy.java | 2 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 58 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 122 ---
...acheAtomicExpiredEntriesPreloadSelfTest.java | 46 -
...idCacheDhtExpiredEntriesPreloadSelfTest.java | 39 -
...dCacheNearExpiredEntriesPreloadSelfTest.java | 33 -
...eCacheExpiryPolicyWithStoreAbstractTest.java | 3 -
.../ContinuousQueryPeerClassLoadingTest.java | 142 +++
.../IgniteCacheContinuousQueryClientTest.java | 23 +-
.../database/BPlusTreeReuseSelfTest.java | 29 +-
.../processors/database/BPlusTreeSelfTest.java | 123 ++-
.../database/FreeListImplSelfTest.java | 5 +-
.../database/MemoryMetricsSelfTest.java | 313 ++++++
.../database/MetadataStorageSelfTest.java | 3 +-
.../processors/igfs/IgfsIgniteMock.java | 8 +
.../marshaller/MarshallerContextSelfTest.java | 80 +-
.../platform/PlatformCacheWriteMetricsTask.java | 126 +--
.../ignite/platform/PlatformStopIgniteTask.java | 11 +-
.../services/ServiceThreadPoolSelfTest.java | 133 +++
.../junits/GridTestKernalContext.java | 1 +
.../ignite/testframework/junits/IgniteMock.java | 6 +
.../junits/multijvm/IgniteProcessProxy.java | 6 +
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +
.../IgniteBinaryObjectsTestSuite.java | 4 -
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 2 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +-
.../testsuites/IgniteCacheTestSuite2.java | 14 +-
.../testsuites/IgniteCacheTestSuite3.java | 8 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
.../hadoop/impl/v2/HadoopV2Context.java | 6 +-
.../HibernateAccessStrategyAdapter.java | 8 +-
.../cache/hibernate/HibernateCacheProxy.java | 811 +++++++++++++++
.../hibernate/HibernateCollectionRegion.java | 3 +-
.../cache/hibernate/HibernateEntityRegion.java | 3 +-
.../hibernate/HibernateGeneralDataRegion.java | 3 +-
.../hibernate/HibernateKeyTransformer.java | 28 +
.../cache/hibernate/HibernateKeyWrapper.java | 62 ++
.../hibernate/HibernateNaturalIdRegion.java | 3 +-
.../HibernateNonStrictAccessStrategy.java | 5 +-
.../hibernate/HibernateQueryResultsRegion.java | 3 +-
.../HibernateReadOnlyAccessStrategy.java | 3 +-
.../HibernateReadWriteAccessStrategy.java | 3 +-
.../ignite/cache/hibernate/HibernateRegion.java | 6 +-
.../cache/hibernate/HibernateRegionFactory.java | 29 +-
.../hibernate/HibernateTimestampsRegion.java | 3 +-
.../HibernateTransactionalAccessStrategy.java | 2 +-
.../HibernateTransactionalDataRegion.java | 3 +-
.../IgniteBinaryHibernateTestSuite.java | 37 +
.../processors/query/h2/database/H2Tree.java | 14 +-
.../query/h2/database/H2TreeIndex.java | 16 +-
.../query/h2/opt/GridH2TreeIndex.java | 29 +-
.../query/h2/sql/GridSqlOperationType.java | 23 +-
.../query/h2/sql/GridSqlQueryParser.java | 19 +-
.../cache/BinarySerializationQuerySelfTest.java | 30 +-
...ryDuplicateIndexObjectsAbstractSelfTest.java | 159 +++
...niteCacheAbstractInsertSqlQuerySelfTest.java | 129 ---
.../IgniteCacheInsertSqlQuerySelfTest.java | 40 -
.../cache/IgniteCacheMergeSqlQuerySelfTest.java | 38 -
.../IgniteCacheObjectKeyIndexingSelfTest.java | 124 +++
.../cache/IncorrectCacheTypeMetadataTest.java | 76 --
.../cache/IncorrectQueryEntityTest.java | 3 +
...ateIndexObjectPartitionedAtomicSelfTest.java | 38 +
...xObjectPartitionedTransactionalSelfTest.java | 41 +
.../query/IgniteSqlSplitterSelfTest.java | 43 +
.../query/h2/IgniteSqlQueryMinMaxTest.java | 376 +++++++
.../h2/database/InlineIndexHelperTest.java | 48 +-
.../query/h2/opt/GridH2TableSelfTest.java | 50 +
.../query/h2/sql/GridQueryParsingTest.java | 27 +-
.../IgniteBinaryCacheQueryTestSuite.java | 5 +
.../IgniteCacheQuerySelfTestSuite.java | 4 +-
.../IgniteCacheQuerySelfTestSuite2.java | 3 +-
.../IgniteCacheQuerySelfTestSuite3.java | 2 +
modules/platforms/cpp/binary/Makefile.am | 1 -
.../platforms/cpp/binary/include/Makefile.am | 3 -
.../binary/binary_array_identity_resolver.h | 64 --
.../include/ignite/binary/binary_containers.h | 2 +-
.../ignite/binary/binary_identity_resolver.h | 61 --
.../include/ignite/binary/binary_object.h | 12 +-
.../include/ignite/binary/binary_raw_writer.h | 4 +-
.../binary/include/ignite/binary/binary_type.h | 10 -
.../include/ignite/binary/binary_writer.h | 4 +-
.../ignite/impl/binary/binary_reader_impl.h | 6 +-
.../ignite/impl/binary/binary_type_impl.h | 149 ---
.../include/ignite/impl/binary/binary_utils.h | 13 +-
.../ignite/impl/binary/binary_writer_impl.h | 9 +-
.../cpp/binary/project/vs/binary.vcxproj | 4 -
.../binary/project/vs/binary.vcxproj.filters | 12 -
.../binary/binary_array_identity_resolver.cpp | 42 -
.../core-test/config/cache-query-default.xml | 70 +-
.../cpp/core-test/config/cache-test.xml | 2 +-
.../core-test/include/ignite/binary_test_defs.h | 25 -
.../cpp/core-test/include/ignite/complex_type.h | 2 -
.../cpp/core-test/include/ignite/test_type.h | 1 -
.../cpp/core-test/include/ignite/test_utils.h | 11 +
.../src/binary_identity_resolver_test.cpp | 254 -----
.../src/binary_reader_writer_raw_test.cpp | 12 +-
.../core-test/src/binary_reader_writer_test.cpp | 12 +-
.../cpp/core-test/src/cache_invoke_test.cpp | 3 -
.../cpp/core-test/src/cache_query_test.cpp | 227 +++--
.../platforms/cpp/core-test/src/cache_test.cpp | 207 +++-
.../cpp/core-test/src/cluster_test.cpp | 4 +-
.../cpp/core-test/src/continuous_query_test.cpp | 6 -
.../cpp/core-test/src/ignition_test.cpp | 12 +-
.../cpp/core/include/ignite/cache/cache.h | 161 +++
.../cpp/core/include/ignite/cache/cache_entry.h | 15 +
.../include/ignite/cache/query/query_cursor.h | 28 +-
.../platforms/cpp/core/include/ignite/ignite.h | 18 +-
.../cpp/core/include/ignite/ignition.h | 14 +-
.../ignite/impl/cache/query/query_impl.h | 7 +
.../cpp/core/include/ignite/impl/helpers.h | 57 ++
.../cpp/core/include/ignite/impl/operations.h | 136 ++-
.../platforms/cpp/core/project/vs/core.vcxproj | 1 +
.../cpp/core/project/vs/core.vcxproj.filters | 3 +
modules/platforms/cpp/core/src/ignition.cpp | 62 +-
.../core/src/impl/cache/query/query_impl.cpp | 39 +-
.../cpp/core/src/impl/ignite_environment.cpp | 2 +-
.../cpp/odbc-test/include/complex_type.h | 2 -
.../platforms/cpp/odbc-test/include/test_type.h | 1 -
.../ExpiryCacheHolderTest.cs | 12 +-
.../Binary/BinaryDynamicRegistrationTest.cs | 50 +-
.../Binary/BinaryEqualityComparerTest.cs | 217 +---
.../BinaryConfigurationTest.cs | 43 +
.../Cache/CacheAbstractTest.cs | 18 +-
.../Cache/CacheTestAsyncWrapper.cs | 12 +-
.../Cache/Query/CacheDmlQueriesTest.cs | 13 +-
.../Cache/Query/CacheLinqTest.cs | 36 +-
.../Cache/Store/CacheStoreTest.cs | 2 +-
.../Compute/AbstractTaskTest.cs | 28 +-
.../Compute/MixedClusterTest.cs | 33 +-
.../Config/cache-query-continuous.xml | 118 ++-
.../Apache.Ignite.Core.Tests/DeploymentTest.cs | 10 +
.../Examples/ExamplesTest.cs | 22 +-
.../Apache.Ignite.Core.Tests/ExecutableTest.cs | 5 +-
.../IgniteConfigurationSectionTest.cs | 7 +-
.../IgniteConfigurationSerializerTest.cs | 9 +-
.../IgniteConfigurationTest.cs | 7 +-
.../Plugin/PluginTest.cs | 16 +-
.../Apache.Ignite.Core.csproj | 5 +-
.../Binary/BinaryArrayEqualityComparer.cs | 160 ---
.../Binary/BinaryTypeConfiguration.cs | 13 -
.../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 16 +-
.../Cache/ICacheEntryProcessorResult.cs | 12 +-
.../Apache.Ignite.Core/IgniteConfiguration.cs | 43 -
.../IgniteConfigurationSection.xsd | 14 -
.../dotnet/Apache.Ignite.Core/Ignition.cs | 28 +-
.../Impl/Binary/BinaryArrayEqualityComparer.cs | 159 +++
.../Binary/BinaryEqualityComparerSerializer.cs | 100 +-
.../Impl/Binary/BinaryFieldEqualityComparer.cs | 138 ---
.../Impl/Binary/BinaryFullTypeDescriptor.cs | 20 -
.../Impl/Binary/BinaryObject.cs | 2 +-
.../Impl/Binary/BinaryObjectBuilder.cs | 7 +-
.../Binary/BinarySurrogateTypeDescriptor.cs | 6 -
.../Impl/Binary/BinaryUtils.cs | 10 -
.../Impl/Binary/BinaryWriter.cs | 6 +-
.../Impl/Binary/IBinaryEqualityComparer.cs | 63 --
.../Impl/Binary/IBinaryTypeDescriptor.cs | 5 -
.../Impl/Binary/Marshaller.cs | 51 +-
.../Impl/Cache/CacheEntryProcessorResult.cs | 27 +-
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 28 +-
.../Impl/Common/IgniteHome.cs | 21 +-
.../Apache.Ignite.Core/Impl/PlatformTarget.cs | 17 +-
.../Impl/DbCache.cs | 2 +-
.../Impl/CacheQueryExpressionVisitor.cs | 14 +-
.../Apache.Ignite.Linq/Impl/CacheQueryParser.cs | 25 +-
.../Apache.Ignite.Linq/Impl/MethodVisitor.cs | 72 +-
.../examples/Apache.Ignite.Examples/App.config | 4 +-
.../Datagrid/MultiTieredCacheExample.cs | 2 +-
.../Datagrid/PutGetExample.cs | 13 +-
.../Misc/ClientReconnectExample.cs | 38 +-
modules/schema-import/README.txt | 4 +-
modules/spring/pom.xml | 6 +
.../org/apache/ignite/IgniteSpringBean.java | 7 +
.../apache/ignite/cache/spring/SpringCache.java | 4 +-
.../ignite/cache/spring/SpringCacheTest.java | 177 ++++
.../IgniteExcludeInConfigurationTest.java | 14 +-
.../org/apache/ignite/spring/sprint-exclude.xml | 19 +-
.../testsuites/IgniteSpringTestSuite.java | 3 +
.../ant/beautifier/GridJavadocAntTask.java | 18 +-
.../modules/configuration/Version.service.js | 2 +-
.../states/configuration/clusters/general.pug | 2 +-
modules/web-console/web-agent/README.txt | 2 +-
.../config/benchmark-atomic.properties | 9 +-
.../config/benchmark-cache-load.properties | 7 +-
.../config/benchmark-compute.properties | 13 +-
.../config/benchmark-failover.properties | 4 +-
.../config/benchmark-multicast.properties | 4 +-
.../config/benchmark-put-indexed-val.properties | 9 +-
.../yardstick/config/benchmark-query.properties | 13 +-
.../config/benchmark-remote-sample.properties | 5 +-
.../config/benchmark-sample.properties | 5 +-
.../config/benchmark-sql-dml.properties | 19 +-
.../yardstick/config/benchmark-store.properties | 30 +-
.../yardstick/config/benchmark-tx.properties | 11 +-
modules/yardstick/config/ignite-base-config.xml | 2 -
.../config/ignite-failover-base-config.xml | 2 -
.../ignite-int-max-values-onheap-config.xml | 1 -
.../yardstick/config/ignite-store-config.xml | 2 -
.../test-max-int-values-onheap.properties | 5 +-
.../IgniteCacheRandomOperationBenchmark.java | 25 +-
304 files changed, 8560 insertions(+), 7349 deletions(-)
----------------------------------------------------------------------
[16/53] [abbrv] ignite git commit: Removed getOrCreateEntry(...).
Posted by ag...@apache.org.
Removed getOrCreateEntry(...).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d7b2837
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d7b2837
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d7b2837
Branch: refs/heads/ignite-3477-master
Commit: 7d7b28377c0f53037e5207a18a109ad22c8954aa
Parents: ecfc45e
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Mar 31 16:41:15 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Mar 31 16:41:15 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/GridCacheConcurrentMap.java | 2 --
.../cache/GridCacheConcurrentMapImpl.java | 16 ----------------
.../processors/cache/GridNoStorageCacheMap.java | 5 -----
.../dht/GridCachePartitionedConcurrentMap.java | 9 ---------
.../distributed/dht/GridDhtLocalPartition.java | 14 +++-----------
6 files changed, 4 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d7b2837/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 93cfe2f..4a51c53 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -954,7 +954,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
* @return Entry (never {@code null}).
*/
public GridCacheEntryEx entryEx(KeyCacheObject key, AffinityTopologyVersion topVer) {
- GridCacheEntryEx e = map.getOrCreateEntry(key, topVer);
+ GridCacheEntryEx e = map.putEntryIfObsoleteOrAbsent(topVer, key, null, true, false);
assert e != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d7b2837/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index cd7c031..debc65b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -35,8 +35,6 @@ public interface GridCacheConcurrentMap {
*/
@Nullable public GridCacheMapEntry getEntry(KeyCacheObject key);
- public GridCacheMapEntry getOrCreateEntry(KeyCacheObject key, AffinityTopologyVersion topVer);
-
/**
* @param topVer Topology version.
* @param key Key.
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d7b2837/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
index 79b9361..10f5ca3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
@@ -109,22 +109,6 @@ public class GridCacheConcurrentMapImpl implements GridCacheConcurrentMap {
}
/** {@inheritDoc} */
- @Override public GridCacheMapEntry getOrCreateEntry(KeyCacheObject key, AffinityTopologyVersion topVer) {
- GridCacheMapEntry cur = getEntry(key);
-
- if (cur == null || cur.obsolete()) {
- cur = putEntryIfObsoleteOrAbsent(
- topVer,
- key,
- null,
- true,
- false);
- }
-
- return cur;
- }
-
- /** {@inheritDoc} */
@Nullable @Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(final AffinityTopologyVersion topVer,
KeyCacheObject key,
@Nullable final CacheObject val,
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d7b2837/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
index 0f5097a..db3533d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
@@ -45,11 +45,6 @@ public class GridNoStorageCacheMap implements GridCacheConcurrentMap {
}
/** {@inheritDoc} */
- @Override public GridCacheMapEntry getOrCreateEntry(KeyCacheObject key, AffinityTopologyVersion topVer) {
- return new GridDhtCacheEntry(ctx, topVer, key, key.hashCode(), null);
- }
-
- /** {@inheritDoc} */
@Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(AffinityTopologyVersion topVer, KeyCacheObject key,
@Nullable CacheObject val, boolean create, boolean touch) {
if (create)
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d7b2837/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
index f8574e7..cfbe9bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
@@ -79,15 +79,6 @@ public class GridCachePartitionedConcurrentMap implements GridCacheConcurrentMap
}
/** {@inheritDoc} */
- @Override public GridCacheMapEntry getOrCreateEntry(KeyCacheObject key, AffinityTopologyVersion topVer) {
- GridDhtLocalPartition part = localPartition(key, topVer, true);
-
- assert part != null;
-
- return part.getOrCreateEntry(key, topVer);
- }
-
- /** {@inheritDoc} */
@Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(AffinityTopologyVersion topVer, KeyCacheObject key,
@Nullable CacheObject val, boolean create, boolean touch) {
GridDhtLocalPartition part = localPartition(key, topVer, create);
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d7b2837/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index cff533e..9389afd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -329,15 +329,6 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
}
/** {@inheritDoc} */
- @Override public GridDhtCacheEntry getOrCreateEntry(KeyCacheObject key, AffinityTopologyVersion topVer) {
- GridCacheMapEntry entry = map.getOrCreateEntry(key, topVer);
-
- assert entry instanceof GridDhtCacheEntry;
-
- return (GridDhtCacheEntry)entry;
- }
-
- /** {@inheritDoc} */
@Override public boolean removeEntry(GridCacheEntryEx entry) {
return map.removeEntry(entry);
}
@@ -970,9 +961,10 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
try {
CacheDataRow row = it0.next();
- GridDhtCacheEntry cached = getOrCreateEntry(row.key(), cctx.affinity().affinityTopologyVersion());
+ GridCacheMapEntry cached = putEntryIfObsoleteOrAbsent(cctx.affinity().affinityTopologyVersion(),
+ row.key(), null, true, false);
- if (cached.clearInternal(clearVer, extras)) {
+ if (cached instanceof GridDhtCacheEntry && ((GridDhtCacheEntry)cached).clearInternal(clearVer, extras)) {
if (rec) {
cctx.events().addEvent(cached.partition(),
cached.key(),
[49/53] [abbrv] ignite git commit: Merge branch 'ignite-3477-master'
of https://github.com/gridgain/apache-ignite into ignite-3477-master
Posted by ag...@apache.org.
Merge branch 'ignite-3477-master' of https://github.com/gridgain/apache-ignite into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f59a7f6a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f59a7f6a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f59a7f6a
Branch: refs/heads/ignite-3477-master
Commit: f59a7f6ae8a3b27a6ed4f8ea175362a634fd88bc
Parents: fb63d25 a1919d1
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 10 17:11:34 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 10 17:11:34 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/near/GridCacheNearReadersSelfTest.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[08/53] [abbrv] ignite git commit: ignite-4535 : Removed redundant
test.
Posted by ag...@apache.org.
ignite-4535 : Removed redundant test.
(cherry picked from commit 3cfea91)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c89c563b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c89c563b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c89c563b
Branch: refs/heads/ignite-3477-master
Commit: c89c563b573d57f5138ab61bd9a161a2d8c8866b
Parents: 4ea0316
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Tue Mar 21 16:52:43 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Mar 30 16:20:23 2017 +0300
----------------------------------------------------------------------
.../dht/IgniteCachePutRetryAbstractSelfTest.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c89c563b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
index a98b3a0..e9a4936 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
@@ -233,14 +233,7 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
/**
* @throws Exception If failed.
*/
- public void testInvokeAllOffheapSwap() throws Exception {
- checkRetry(Test.INVOKE_ALL, true, false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testInvokeAllOffheapTiered() throws Exception {
+ public void testInvokeAllEvict() throws Exception {
checkRetry(Test.INVOKE_ALL, true, false);
}
[45/53] [abbrv] ignite git commit: ignite-4535 : Merge with
ignite-3477-master.
Posted by ag...@apache.org.
ignite-4535 : Merge with ignite-3477-master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/096d2c06
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/096d2c06
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/096d2c06
Branch: refs/heads/ignite-3477-master
Commit: 096d2c063ec6aab35537d835451e9f3fcdcbc2aa
Parents: bc571fc a7afb7f
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 10 14:34:35 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 10 14:34:35 2017 +0300
----------------------------------------------------------------------
assembly/release-fabric-base.xml | 6 +
.../benchmarks/jmh/tree/BPlusTreeBenchmark.java | 2 +
.../internal/jdbc2/JdbcConnectionSelfTest.java | 34 +
.../src/test/resources/spring-server-node.xml | 71 +-
.../test/resources/spring-server-ssl-node.xml | 69 +-
.../src/main/java/org/apache/ignite/Ignite.java | 8 +
.../java/org/apache/ignite/IgniteBinary.java | 35 +-
.../org/apache/ignite/IgniteJdbcDriver.java | 11 +-
.../java/org/apache/ignite/MemoryMetrics.java | 95 ++
.../binary/BinaryAbstractIdentityResolver.java | 53 -
.../binary/BinaryArrayIdentityResolver.java | 224 -----
.../binary/BinaryFieldIdentityResolver.java | 307 ------
.../ignite/binary/BinaryIdentityResolver.java | 42 -
.../ignite/binary/BinaryTypeConfiguration.java | 25 -
.../org/apache/ignite/cache/CacheMetrics.java | 70 --
.../ignite/cache/CacheTypeFieldMetadata.java | 149 ---
.../apache/ignite/cache/CacheTypeMetadata.java | 379 -------
.../org/apache/ignite/cache/QueryEntity.java | 3 +
.../store/jdbc/CacheAbstractJdbcStore.java | 55 --
.../configuration/CacheConfiguration.java | 35 +-
.../configuration/IgniteConfiguration.java | 30 +
.../configuration/MemoryConfiguration.java | 22 +-
.../MemoryPolicyConfiguration.java | 12 +-
.../ignite/internal/GridKernalContext.java | 7 +
.../ignite/internal/GridKernalContextImpl.java | 11 +
.../apache/ignite/internal/IgniteKernal.java | 12 +-
.../org/apache/ignite/internal/IgnitionEx.java | 18 +-
.../ignite/internal/MarshallerContextImpl.java | 20 +-
.../binary/BinaryAbstractIdentityResolver.java | 56 ++
.../binary/BinaryArrayIdentityResolver.java | 222 +++++
.../ignite/internal/binary/BinaryContext.java | 4 +-
.../internal/binary/BinaryIdentityResolver.java | 43 +
.../internal/binary/BinaryObjectExImpl.java | 1 -
.../internal/binary/BinaryWriterExImpl.java | 1 -
.../ignite/internal/jdbc2/JdbcConnection.java | 50 +-
.../managers/communication/GridIoManager.java | 2 +
.../managers/communication/GridIoPolicy.java | 5 +-
.../apache/ignite/internal/pagemem/Page.java | 84 --
.../ignite/internal/pagemem/PageMemory.java | 20 +-
.../ignite/internal/pagemem/PageSupport.java | 104 ++
.../pagemem/impl/PageMemoryNoStoreImpl.java | 174 ++--
.../internal/pagemem/impl/PageNoStoreImpl.java | 141 ---
.../cache/CacheClusterMetricsMXBeanImpl.java | 50 -
.../cache/CacheLocalMetricsMXBeanImpl.java | 50 -
.../processors/cache/CacheMetricsImpl.java | 125 +--
.../processors/cache/CacheMetricsSnapshot.java | 120 ---
.../cache/CacheOffheapEvictionManager.java | 3 +-
.../processors/cache/GridCacheProcessor.java | 28 +
.../cache/IgniteCacheOffheapManagerImpl.java | 24 +-
.../cache/database/CacheDataRowAdapter.java | 26 +-
.../cache/database/DataStructure.java | 243 ++++-
.../IgniteCacheDatabaseSharedManager.java | 104 +-
.../cache/database/IgniteMemoryPoolMetrics.java | 33 -
.../cache/database/MemoryMetricsImpl.java | 314 ++++++
.../processors/cache/database/MemoryPolicy.java | 18 +-
.../processors/cache/database/RowStore.java | 10 -
.../cache/database/freelist/FreeListImpl.java | 180 ++--
.../cache/database/freelist/PagesList.java | 637 ++++++------
.../cache/database/tree/BPlusTree.java | 979 +++++++++++--------
.../cache/database/tree/io/PageIO.java | 3 +-
.../database/tree/reuse/ReuseListImpl.java | 2 +-
.../cache/database/tree/util/PageHandler.java | 381 ++++++--
.../database/tree/util/PageLockListener.java | 42 +-
.../dht/atomic/GridDhtAtomicCache.java | 18 +-
.../dht/preloader/GridDhtPartitionMap.java | 13 +-
.../cache/version/GridCacheVersionManager.java | 3 +
.../clock/GridClockDeltaSnapshot.java | 2 +-
.../continuous/GridContinuousProcessor.java | 3 +-
.../platform/cache/PlatformCache.java | 10 -
.../utils/PlatformConfigurationUtils.java | 64 +-
.../internal/processors/pool/PoolProcessor.java | 10 +-
.../processors/query/GridQueryProcessor.java | 10 -
.../internal/processors/query/QueryUtils.java | 328 +------
.../processors/service/GridServiceProxy.java | 10 +
.../task/GridTaskThreadContextKey.java | 7 +-
.../processors/task/GridTaskWorker.java | 16 +-
.../apache/ignite/internal/util/IgniteTree.java | 14 +
.../visor/cache/VisorCacheConfiguration.java | 2 +-
.../cache/VisorCacheTypeFieldMetadata.java | 14 +-
.../visor/cache/VisorCacheTypeMetadata.java | 91 +-
.../visor/node/VisorMemoryConfiguration.java | 1 -
.../ignite/mxbean/CacheMetricsMXBean.java | 40 -
.../ignite/mxbean/MemoryMetricsMXBean.java | 89 ++
.../ignite/spi/collision/CollisionSpi.java | 11 +-
.../communication/tcp/TcpCommunicationSpi.java | 4 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 3 +-
.../resources/META-INF/classnames.properties | 1 -
.../test/config/store/jdbc/ignite-jdbc-type.xml | 279 ++++++
.../config/store/jdbc/ignite-type-metadata.xml | 276 ------
.../config/websession/example-cache-client.xml | 4 +
...eJdbcStoreAbstractMultithreadedSelfTest.java | 71 +-
.../ignite/custom/DummyEventFilterFactory.java | 47 +
.../BinaryArrayIdentityResolverSelfTest.java | 4 -
.../BinaryFieldIdentityResolverSelfTest.java | 333 -------
...ryIdentityResolverConfigurationSelfTest.java | 138 ---
.../BinaryObjectBuilderAdditionalSelfTest.java | 1 -
...naryObjectBuilderDefaultMappersSelfTest.java | 1 -
.../pagemem/impl/PageMemoryNoLoadSelfTest.java | 119 ++-
.../cache/CacheClientStoreSelfTest.java | 4 +
.../cache/CacheConfigurationLeakTest.java | 3 +-
.../cache/CacheStopAndDestroySelfTest.java | 48 +-
.../cache/ClusterStateAbstractTest.java | 5 +-
.../GridCacheConditionalDeploymentSelfTest.java | 19 +-
.../processors/cache/H2CacheStoreStrategy.java | 2 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 58 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 122 ---
...acheAtomicExpiredEntriesPreloadSelfTest.java | 46 -
...idCacheDhtExpiredEntriesPreloadSelfTest.java | 39 -
...dCacheNearExpiredEntriesPreloadSelfTest.java | 33 -
...eCacheExpiryPolicyWithStoreAbstractTest.java | 3 -
.../ContinuousQueryPeerClassLoadingTest.java | 142 +++
.../IgniteCacheContinuousQueryClientTest.java | 23 +-
.../database/BPlusTreeReuseSelfTest.java | 29 +-
.../processors/database/BPlusTreeSelfTest.java | 123 ++-
.../database/FreeListImplSelfTest.java | 5 +-
.../database/MemoryMetricsSelfTest.java | 313 ++++++
.../database/MetadataStorageSelfTest.java | 3 +-
.../processors/igfs/IgfsIgniteMock.java | 8 +
.../marshaller/MarshallerContextSelfTest.java | 80 +-
.../platform/PlatformCacheWriteMetricsTask.java | 126 +--
.../ignite/platform/PlatformStopIgniteTask.java | 11 +-
.../services/ServiceThreadPoolSelfTest.java | 133 +++
.../junits/GridTestKernalContext.java | 1 +
.../ignite/testframework/junits/IgniteMock.java | 6 +
.../junits/multijvm/IgniteProcessProxy.java | 6 +
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +
.../IgniteBinaryObjectsTestSuite.java | 4 -
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 9 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
.../hadoop/impl/v2/HadoopV2Context.java | 6 +-
.../HibernateAccessStrategyAdapter.java | 8 +-
.../cache/hibernate/HibernateCacheProxy.java | 811 +++++++++++++++
.../hibernate/HibernateCollectionRegion.java | 3 +-
.../cache/hibernate/HibernateEntityRegion.java | 3 +-
.../hibernate/HibernateGeneralDataRegion.java | 3 +-
.../hibernate/HibernateKeyTransformer.java | 28 +
.../cache/hibernate/HibernateKeyWrapper.java | 62 ++
.../hibernate/HibernateNaturalIdRegion.java | 3 +-
.../HibernateNonStrictAccessStrategy.java | 5 +-
.../hibernate/HibernateQueryResultsRegion.java | 3 +-
.../HibernateReadOnlyAccessStrategy.java | 3 +-
.../HibernateReadWriteAccessStrategy.java | 3 +-
.../ignite/cache/hibernate/HibernateRegion.java | 6 +-
.../cache/hibernate/HibernateRegionFactory.java | 29 +-
.../hibernate/HibernateTimestampsRegion.java | 3 +-
.../HibernateTransactionalAccessStrategy.java | 2 +-
.../HibernateTransactionalDataRegion.java | 3 +-
.../IgniteBinaryHibernateTestSuite.java | 37 +
.../processors/query/h2/database/H2Tree.java | 14 +-
.../query/h2/database/H2TreeIndex.java | 16 +-
.../query/h2/opt/GridH2TreeIndex.java | 29 +-
.../query/h2/sql/GridSqlOperationType.java | 23 +-
.../query/h2/sql/GridSqlQueryParser.java | 19 +-
.../cache/BinarySerializationQuerySelfTest.java | 30 +-
...ryDuplicateIndexObjectsAbstractSelfTest.java | 159 +++
...niteCacheAbstractInsertSqlQuerySelfTest.java | 129 ---
.../IgniteCacheInsertSqlQuerySelfTest.java | 40 -
.../cache/IgniteCacheMergeSqlQuerySelfTest.java | 38 -
.../IgniteCacheObjectKeyIndexingSelfTest.java | 124 +++
.../cache/IncorrectCacheTypeMetadataTest.java | 76 --
.../cache/IncorrectQueryEntityTest.java | 3 +
...ateIndexObjectPartitionedAtomicSelfTest.java | 38 +
...xObjectPartitionedTransactionalSelfTest.java | 41 +
.../query/IgniteSqlSplitterSelfTest.java | 43 +
.../query/h2/IgniteSqlQueryMinMaxTest.java | 376 +++++++
.../h2/database/InlineIndexHelperTest.java | 48 +-
.../query/h2/opt/GridH2TableSelfTest.java | 50 +
.../query/h2/sql/GridQueryParsingTest.java | 27 +-
.../IgniteBinaryCacheQueryTestSuite.java | 5 +
.../IgniteCacheQuerySelfTestSuite.java | 4 +-
.../IgniteCacheQuerySelfTestSuite2.java | 2 +
.../IgniteCacheQuerySelfTestSuite3.java | 2 +
modules/platforms/cpp/binary/Makefile.am | 1 -
.../platforms/cpp/binary/include/Makefile.am | 3 -
.../binary/binary_array_identity_resolver.h | 64 --
.../include/ignite/binary/binary_containers.h | 2 +-
.../ignite/binary/binary_identity_resolver.h | 61 --
.../include/ignite/binary/binary_object.h | 12 +-
.../include/ignite/binary/binary_raw_writer.h | 4 +-
.../binary/include/ignite/binary/binary_type.h | 10 -
.../include/ignite/binary/binary_writer.h | 4 +-
.../ignite/impl/binary/binary_reader_impl.h | 6 +-
.../ignite/impl/binary/binary_type_impl.h | 149 ---
.../include/ignite/impl/binary/binary_utils.h | 13 +-
.../ignite/impl/binary/binary_writer_impl.h | 9 +-
.../cpp/binary/project/vs/binary.vcxproj | 4 -
.../binary/project/vs/binary.vcxproj.filters | 12 -
.../binary/binary_array_identity_resolver.cpp | 42 -
.../core-test/config/cache-query-default.xml | 70 +-
.../cpp/core-test/config/cache-test.xml | 2 +-
.../core-test/include/ignite/binary_test_defs.h | 25 -
.../cpp/core-test/include/ignite/complex_type.h | 2 -
.../cpp/core-test/include/ignite/test_type.h | 1 -
.../cpp/core-test/include/ignite/test_utils.h | 11 +
.../src/binary_identity_resolver_test.cpp | 254 -----
.../src/binary_reader_writer_raw_test.cpp | 12 +-
.../core-test/src/binary_reader_writer_test.cpp | 12 +-
.../cpp/core-test/src/cache_invoke_test.cpp | 3 -
.../cpp/core-test/src/cache_query_test.cpp | 227 +++--
.../platforms/cpp/core-test/src/cache_test.cpp | 207 +++-
.../cpp/core-test/src/cluster_test.cpp | 4 +-
.../cpp/core-test/src/continuous_query_test.cpp | 6 -
.../cpp/core-test/src/ignition_test.cpp | 12 +-
.../cpp/core/include/ignite/cache/cache.h | 161 +++
.../cpp/core/include/ignite/cache/cache_entry.h | 15 +
.../include/ignite/cache/query/query_cursor.h | 28 +-
.../platforms/cpp/core/include/ignite/ignite.h | 18 +-
.../cpp/core/include/ignite/ignition.h | 14 +-
.../ignite/impl/cache/query/query_impl.h | 7 +
.../cpp/core/include/ignite/impl/helpers.h | 57 ++
.../cpp/core/include/ignite/impl/operations.h | 136 ++-
.../platforms/cpp/core/project/vs/core.vcxproj | 1 +
.../cpp/core/project/vs/core.vcxproj.filters | 3 +
modules/platforms/cpp/core/src/ignition.cpp | 62 +-
.../core/src/impl/cache/query/query_impl.cpp | 39 +-
.../cpp/core/src/impl/ignite_environment.cpp | 2 +-
.../cpp/odbc-test/include/complex_type.h | 2 -
.../platforms/cpp/odbc-test/include/test_type.h | 1 -
.../ExpiryCacheHolderTest.cs | 12 +-
.../Binary/BinaryDynamicRegistrationTest.cs | 50 +-
.../Binary/BinaryEqualityComparerTest.cs | 217 +---
.../BinaryConfigurationTest.cs | 43 +
.../Cache/CacheAbstractTest.cs | 18 +-
.../Cache/CacheTestAsyncWrapper.cs | 12 +-
.../Cache/Query/CacheDmlQueriesTest.cs | 13 +-
.../Cache/Query/CacheLinqTest.cs | 36 +-
.../Cache/Store/CacheStoreTest.cs | 2 +-
.../Compute/AbstractTaskTest.cs | 28 +-
.../Compute/MixedClusterTest.cs | 33 +-
.../Config/cache-query-continuous.xml | 118 ++-
.../Apache.Ignite.Core.Tests/DeploymentTest.cs | 10 +
.../Examples/ExamplesTest.cs | 22 +-
.../Apache.Ignite.Core.Tests/ExecutableTest.cs | 5 +-
.../IgniteConfigurationSectionTest.cs | 7 +-
.../IgniteConfigurationSerializerTest.cs | 9 +-
.../IgniteConfigurationTest.cs | 7 +-
.../Plugin/PluginTest.cs | 16 +-
.../Apache.Ignite.Core.csproj | 5 +-
.../Binary/BinaryArrayEqualityComparer.cs | 160 ---
.../Binary/BinaryTypeConfiguration.cs | 13 -
.../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 16 +-
.../Cache/ICacheEntryProcessorResult.cs | 12 +-
.../Apache.Ignite.Core/IgniteConfiguration.cs | 43 -
.../IgniteConfigurationSection.xsd | 14 -
.../dotnet/Apache.Ignite.Core/Ignition.cs | 28 +-
.../Impl/Binary/BinaryArrayEqualityComparer.cs | 159 +++
.../Binary/BinaryEqualityComparerSerializer.cs | 100 +-
.../Impl/Binary/BinaryFieldEqualityComparer.cs | 138 ---
.../Impl/Binary/BinaryFullTypeDescriptor.cs | 20 -
.../Impl/Binary/BinaryObject.cs | 2 +-
.../Impl/Binary/BinaryObjectBuilder.cs | 7 +-
.../Binary/BinarySurrogateTypeDescriptor.cs | 6 -
.../Impl/Binary/BinaryUtils.cs | 10 -
.../Impl/Binary/BinaryWriter.cs | 6 +-
.../Impl/Binary/IBinaryEqualityComparer.cs | 63 --
.../Impl/Binary/IBinaryTypeDescriptor.cs | 5 -
.../Impl/Binary/Marshaller.cs | 51 +-
.../Impl/Cache/CacheEntryProcessorResult.cs | 27 +-
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 28 +-
.../Impl/Common/IgniteHome.cs | 21 +-
.../Apache.Ignite.Core/Impl/PlatformTarget.cs | 17 +-
.../Impl/DbCache.cs | 2 +-
.../Impl/CacheQueryExpressionVisitor.cs | 14 +-
.../Apache.Ignite.Linq/Impl/CacheQueryParser.cs | 25 +-
.../Apache.Ignite.Linq/Impl/MethodVisitor.cs | 72 +-
.../examples/Apache.Ignite.Examples/App.config | 4 +-
.../Datagrid/MultiTieredCacheExample.cs | 2 +-
.../Datagrid/PutGetExample.cs | 13 +-
.../Misc/ClientReconnectExample.cs | 38 +-
modules/schema-import/README.txt | 4 +-
modules/spring/pom.xml | 6 +
.../org/apache/ignite/IgniteSpringBean.java | 7 +
.../apache/ignite/cache/spring/SpringCache.java | 4 +-
.../ignite/cache/spring/SpringCacheTest.java | 177 ++++
.../IgniteExcludeInConfigurationTest.java | 14 +-
.../org/apache/ignite/spring/sprint-exclude.xml | 19 +-
.../testsuites/IgniteSpringTestSuite.java | 3 +
.../ant/beautifier/GridJavadocAntTask.java | 18 +-
.../modules/configuration/Version.service.js | 2 +-
.../states/configuration/clusters/general.pug | 2 +-
modules/web-console/web-agent/README.txt | 2 +-
.../config/benchmark-atomic.properties | 9 +-
.../config/benchmark-cache-load.properties | 7 +-
.../config/benchmark-compute.properties | 13 +-
.../config/benchmark-failover.properties | 4 +-
.../config/benchmark-multicast.properties | 4 +-
.../config/benchmark-put-indexed-val.properties | 9 +-
.../yardstick/config/benchmark-query.properties | 13 +-
.../config/benchmark-remote-sample.properties | 5 +-
.../config/benchmark-sample.properties | 5 +-
.../config/benchmark-sql-dml.properties | 19 +-
.../yardstick/config/benchmark-store.properties | 30 +-
.../yardstick/config/benchmark-tx.properties | 11 +-
modules/yardstick/config/ignite-base-config.xml | 2 -
.../config/ignite-failover-base-config.xml | 2 -
.../ignite-int-max-values-onheap-config.xml | 1 -
.../yardstick/config/ignite-store-config.xml | 2 -
.../test-max-int-values-onheap.properties | 5 +-
.../IgniteCacheRandomOperationBenchmark.java | 25 +-
300 files changed, 8546 insertions(+), 7335 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 0a5cd3d,a9cb38e..cfdfed8
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@@ -48,9 -48,9 +48,8 @@@ import org.apache.ignite.cache.CacheAto
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.CacheInterceptor;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
- import org.apache.ignite.cache.CacheTypeMetadata;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.PartitionLossPolicy;
import org.apache.ignite.cache.QueryEntity;
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index e3ed666,0f5cd46..e087881
--- 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
@@@ -127,9 -127,10 +127,9 @@@ public class VisorCacheConfiguration im
writeSynchronizationMode = ccfg.getWriteSynchronizationMode();
invalidate = ccfg.isInvalidate();
startSize = ccfg.getStartSize();
- offHeapMaxMemory = ccfg.getOffHeapMaxMemory();
maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations();
interceptor = compactClass(ccfg.getInterceptor());
- typeMeta = VisorCacheTypeMetadata.list(ccfg.getQueryEntities(), ccfg.getCacheStoreFactory(), ccfg.getTypeMetadata());
+ typeMeta = VisorCacheTypeMetadata.list(ccfg.getQueryEntities(), ccfg.getCacheStoreFactory());
statisticsEnabled = ccfg.isStatisticsEnabled();
mgmtEnabled = ccfg.isManagementEnabled();
ldrFactory = compactClass(ccfg.getCacheLoaderFactory());
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationLeakTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index c2fd382,a9df142..1c50908
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@@ -50,8 -50,8 +50,7 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.cache.distributed.GridCacheTransformEventSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodeChangingTopologyTest;
import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodePartitionsExchangeTest;
-import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheNearOffheapGetSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheServerNodeConcurrentStart;
- import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicExpiredEntriesPreloadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedOptimisticTransactionSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPreloadRestartSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPrimarySyncSelfTest;
@@@ -74,11 -73,8 +72,10 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedTopologyChangeSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedUnloadEventsSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePartitionedBackupNodeFailureRecoveryTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEvictionEventSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearMultiNodeSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearReadersSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearEvictionEventSelfTest;
- import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearExpiredEntriesPreloadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearJobExecutionSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearMultiGetSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearMultiNodeSelfTest;
@@@ -232,11 -233,8 +229,7 @@@ public class IgniteCacheTestSuite2 exte
suite.addTest(new TestSuite(GridCacheColocatedOptimisticTransactionSelfTest.class));
suite.addTestSuite(GridCacheAtomicMessageCountSelfTest.class);
suite.addTest(new TestSuite(GridCacheNearPartitionedClearSelfTest.class));
- suite.addTest(new TestSuite(IgniteCacheNearOffheapGetSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtExpiredEntriesPreloadSelfTest.class));
- suite.addTest(new TestSuite(GridCacheNearExpiredEntriesPreloadSelfTest.class));
- suite.addTest(new TestSuite(GridCacheAtomicExpiredEntriesPreloadSelfTest.class));
-
suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class));
suite.addTest(new TestSuite(GridCacheNearPrimarySyncSelfTest.class));
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
index 0e68385,5b05aba..416f150
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
@@@ -20,9 -20,14 +20,10 @@@ package org.apache.ignite.testsuites
import junit.framework.TestSuite;
import org.apache.ignite.internal.processors.cache.CacheScanPartitionQueryFallbackSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheCrossCacheJoinRandomTest;
+ import org.apache.ignite.internal.processors.cache.IgniteCacheObjectKeyIndexingSelfTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapTieredMultithreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCachePartitionedQueryMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheQueryEvictsMultiThreadedSelfTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedOffHeapTieredSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedSelfTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheSqlQueryMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheClientQueryReplicatedNodeRestartSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest;
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java
index fd57f86,e4ca29f..8dd273a
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java
@@@ -34,8 -34,11 +34,9 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.cache.query.continuous.CacheKeepBinaryIterationTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheKeepBinaryIterationStoreEnabledTest;
import org.apache.ignite.internal.processors.cache.query.continuous.ClientReconnectContinuousQueryTest;
+ import org.apache.ignite.internal.processors.cache.query.continuous.ContinuousQueryPeerClassLoadingTest;
import org.apache.ignite.internal.processors.cache.query.continuous.ContinuousQueryRemoteFilterMissingInClassPathSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicNearEnabledSelfTest;
-import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicOffheapTieredTest;
-import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicOffheapValuesTest;
import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicP2PDisabledSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryConcurrentTest;
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/benchmark-atomic.properties
----------------------------------------------------------------------
diff --cc modules/yardstick/config/benchmark-atomic.properties
index aab4a6b,f296041..8e2413b
--- a/modules/yardstick/config/benchmark-atomic.properties
+++ b/modules/yardstick/config/benchmark-atomic.properties
@@@ -71,7 -74,13 +74,7 @@@ sm=PRIMARY_SYN
# Run configuration.
# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-${b}-backup,\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-${b}-backup,\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-${b}-backup,\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetBenchmark -sn IgniteNode -ds ${ver}atomic-get-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-get-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-get-offheap-val-${b}-backup,\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds ${ver}atomic-put-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/benchmark-multicast.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/benchmark-query.properties
----------------------------------------------------------------------
diff --cc modules/yardstick/config/benchmark-query.properties
index 447798c,c364cfd..2612ec9
--- a/modules/yardstick/config/benchmark-query.properties
+++ b/modules/yardstick/config/benchmark-query.properties
@@@ -71,9 -74,12 +74,9 @@@ sm=PRIMARY_SYN
# Run configuration.
# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds sql-query-${b}-backup,\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds sql-query-join-${b}-backup,\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds sql-query-put-${b}-backup,\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite://127.0.0.1/query -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-${b}-backup,\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite:cfg://cache=query@config/ignite-jdbc-config.xml -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-${b}-backup\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds ${ver}sql-query-join-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds ${ver}sql-query-put-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup,\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite://127.0.0.1/query -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-jdbc-${b}-backup,\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite:cfg://cache=query@config/ignite-jdbc-config.xml -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds ${ver}sql-query-jdbc-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/benchmark-tx.properties
----------------------------------------------------------------------
diff --cc modules/yardstick/config/benchmark-tx.properties
index e579f76,8a75bf5..8926578
--- a/modules/yardstick/config/benchmark-tx.properties
+++ b/modules/yardstick/config/benchmark-tx.properties
@@@ -71,8 -74,12 +74,8 @@@ sm=PRIMARY_SYN
# Run configuration.
# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode -ds tx-put-${b}-backup,\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds tx-getAndPut-${b}-backup,\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds tx-invoke-${b}-backup,\
- -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds tx-put-get-${b}-backup,\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode -ds ${ver}tx-put-${b}-backup,\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds ${ver}tx-getAndPut-${b}-backup,\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds ${ver}tx-invoke-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-val-${b}-backup,\
+ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds ${ver}tx-put-get-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-get-offheap-${b}-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-get-offheap-val-${b}-backup\
"
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/ignite-base-config.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/config/ignite-failover-base-config.xml
----------------------------------------------------------------------
diff --cc modules/yardstick/config/ignite-failover-base-config.xml
index 3e40765,0a3bd88..8de4142
--- a/modules/yardstick/config/ignite-failover-base-config.xml
+++ b/modules/yardstick/config/ignite-failover-base-config.xml
@@@ -70,10 -90,18 +70,8 @@@
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="ATOMIC"/>
-
- <property name="swapEnabled" value="false"/>
</bean>
- <bean id="atomic-offheap" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true">
- <property name="name" value="atomic-offheap"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
- </bean>
-
<bean id="tx" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true">
<property name="cacheMode" value="PARTITIONED"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/096d2c06/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
----------------------------------------------------------------------
diff --cc modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
index 07b65d9,437d309..4010f5e
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
@@@ -47,8 -47,8 +47,7 @@@ import org.apache.ignite.IgniteDataStre
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
- import org.apache.ignite.cache.CacheTypeMetadata;
import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.QueryIndex;
import org.apache.ignite.cache.affinity.Affinity;
[06/53] [abbrv] ignite git commit: ignite-4535 : Removing
CacheMemoryMode - done.
Posted by ag...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java
deleted file mode 100644
index c820db7..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
-
-/**
- * Ignite benchmark that performs put and query operations
- * with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED} memory mode.
- */
-public class IgniteSqlQueryPutOffHeapBenchmark extends IgniteSqlQueryPutBenchmark {
- /** {@inheritDoc} */
- @Override protected IgniteCache<Integer, Object> cache() {
- return ignite().cache("query-offheap");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapInvokeRetryBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapInvokeRetryBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapInvokeRetryBenchmark.java
deleted file mode 100644
index c8b0b1d..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapInvokeRetryBenchmark.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache.failover;
-
-/**
- * Invoke retry failover benchmark. <p> Each client maintains a local map that it updates together with cache. Client
- * invokes an increment closure for all generated keys and atomically increments value for corresponding keys in the
- * local map. To validate cache contents, all writes from the client are stopped, values in the local map are compared
- * to the values in the cache.
- */
-public class IgniteAtomicOffHeapInvokeRetryBenchmark extends IgniteAtomicInvokeRetryBenchmark {
- /** {@inheritDoc} */
- @Override protected String cacheName() {
- return "atomic-offheap-invoke-retry";
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapRetriesBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapRetriesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapRetriesBenchmark.java
deleted file mode 100644
index ebb9eac..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapRetriesBenchmark.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache.failover;
-
-/**
- * Atomic retries failover benchmark.
- * <p>
- * Client generates continuous load to the cluster (random get, put, invoke, remove
- * operations).
- */
-public class IgniteAtomicOffHeapRetriesBenchmark extends IgniteAtomicRetriesBenchmark {
- /** {@inheritDoc} */
- @Override protected String cacheName() {
- return "atomic-offheap-reties";
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapInvokeRetryBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapInvokeRetryBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapInvokeRetryBenchmark.java
deleted file mode 100644
index 4cbcf67..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapInvokeRetryBenchmark.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache.failover;
-
-/**
- * Invoke retry failover benchmark.
- * <p>
- * Each client maintains a local map that it updates together with cache.
- * Client invokes an increment closure for all generated keys and atomically increments value for corresponding
- * keys in the local map. To validate cache contents, all writes from the client are stopped, values in
- * the local map are compared to the values in the cache.
- */
-public class IgniteTransactionalOffHeapInvokeRetryBenchmark extends IgniteTransactionalInvokeRetryBenchmark {
- /** {@inheritDoc} */
- @Override protected String cacheName() {
- return "tx-offheap-invoke-retry";
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteInvokeBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteInvokeBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteInvokeBenchmark.java
deleted file mode 100644
index 7fa2d1a..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteInvokeBenchmark.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache.failover;
-
-/**
- * Transactional write invoke failover benchmark.
- * <p>
- * Each client generates a random integer K in a limited range and creates keys in the form 'key-' + K + 'master',
- * 'key-' + K + '-1', 'key-' + K + '-2', ... Then client starts a pessimistic repeatable read transaction
- * and randomly chooses between read and write scenarios:
- * <ul>
- * <li>Reads value associated with the master key and child keys. Values must be equal.</li>
- * <li>Reads value associated with the master key, increments it by 1 and puts the value, then invokes increment
- * closure on child keys. No validation is performed.</li>
- * </ul>
- */
-public class IgniteTransactionalOffHeapWriteInvokeBenchmark extends IgniteTransactionalWriteInvokeBenchmark {
- /** {@inheritDoc} */
- @Override protected String cacheName() {
- return "tx-offheap-write-invoke";
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteReadBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteReadBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteReadBenchmark.java
deleted file mode 100644
index bdecca7..0000000
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteReadBenchmark.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.yardstick.cache.failover;
-
-/**
- * Transactional write read failover benchmark.
- * <p>
- * Each client generates a random integer K in a limited range and creates keys in the form 'key-' + K + '-1',
- * 'key-' + K + '-2', ... Then client starts a pessimistic repeatable read transaction, reads value associated with
- * each key. Values must be equal. Client increments value by 1, commits the transaction.
- */
-public class IgniteTransactionalOffHeapWriteReadBenchmark extends IgniteTransactionalWriteReadBenchmark {
- /** {@inheritDoc} */
- @Override protected String cacheName() {
- return "tx-offheap-write-read";
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
index dcbc681..07b65d9 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java
@@ -47,7 +47,6 @@ import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheTypeMetadata;
import org.apache.ignite.cache.QueryEntity;
[27/53] [abbrv] ignite git commit: ignite-4851 : Made partition state
change atomic with size check.
Posted by ag...@apache.org.
ignite-4851 : Made partition state change atomic with size check.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/89c2ebb6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/89c2ebb6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/89c2ebb6
Branch: refs/heads/ignite-3477-master
Commit: 89c2ebb6d5a28d715b2352553409ab0001cb9563
Parents: 07ecddc
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 3 18:57:01 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 3 18:57:01 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 2 +-
.../cache/GridCacheConcurrentMapImpl.java | 28 +++-------
.../cache/GridCacheLocalConcurrentMap.java | 54 ++++++++++++++++++++
.../distributed/dht/GridDhtLocalPartition.java | 47 ++++++++++++++---
.../distributed/near/GridNearCacheAdapter.java | 3 +-
5 files changed, 104 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/89c2ebb6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 93daeda..9a6ff11 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -563,7 +563,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
if (!isLocal())
initSize /= ctx.affinity().partitions();
- map = new GridCacheConcurrentMapImpl(ctx, entryFactory(), initSize);
+ map = new GridCacheLocalConcurrentMap(ctx, entryFactory(), initSize);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89c2ebb6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
index 10f5ca3..c1dbd0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
@@ -37,7 +37,7 @@ import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_DESTROYED;
/**
* Implementation of concurrent cache map.
*/
-public class GridCacheConcurrentMapImpl implements GridCacheConcurrentMap {
+public abstract class GridCacheConcurrentMapImpl implements GridCacheConcurrentMap {
/** Default load factor. */
private static final float DFLT_LOAD_FACTOR = 0.75f;
@@ -53,9 +53,6 @@ public class GridCacheConcurrentMapImpl implements GridCacheConcurrentMap {
/** Cache context. */
private final GridCacheContext ctx;
- /** Public size counter. */
- private final AtomicInteger pubSize = new AtomicInteger();
-
/**
* Creates a new, empty map with the specified initial
* capacity.
@@ -211,8 +208,12 @@ public class GridCacheConcurrentMapImpl implements GridCacheConcurrentMap {
topVer);
}
- if (sizeChange != 0)
- pubSize.addAndGet(sizeChange);
+ assert Math.abs(sizeChange) <= 1;
+
+ if (sizeChange == -1)
+ decrementPublicSize(cur);
+ else if (sizeChange == 1)
+ incrementPublicSize(cur);
return cur;
}
@@ -242,21 +243,6 @@ public class GridCacheConcurrentMapImpl implements GridCacheConcurrentMap {
}
/** {@inheritDoc} */
- @Override public int publicSize() {
- return pubSize.get();
- }
-
- /** {@inheritDoc} */
- @Override public void incrementPublicSize(GridCacheEntryEx e) {
- pubSize.incrementAndGet();
- }
-
- /** {@inheritDoc} */
- @Override public void decrementPublicSize(GridCacheEntryEx e) {
- pubSize.decrementAndGet();
- }
-
- /** {@inheritDoc} */
@Override public Set<KeyCacheObject> keySet(final CacheEntryPredicate... filter) {
final IgnitePredicate<KeyCacheObject> p = new IgnitePredicate<KeyCacheObject>() {
@Override public boolean apply(KeyCacheObject key) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/89c2ebb6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java
new file mode 100644
index 0000000..db99272
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java
@@ -0,0 +1,54 @@
+/*
+ * 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 java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * GridCacheConcurrentMap implementation for local and near caches.
+ */
+public class GridCacheLocalConcurrentMap extends GridCacheConcurrentMapImpl {
+ /** */
+ private final AtomicInteger pubSize = new AtomicInteger();
+
+ public GridCacheLocalConcurrentMap(GridCacheContext ctx,
+ GridCacheMapEntryFactory factory, int initialCapacity) {
+ super(ctx, factory, initialCapacity);
+ }
+
+ public GridCacheLocalConcurrentMap(GridCacheContext ctx,
+ GridCacheMapEntryFactory factory, int initialCapacity, float loadFactor, int concurrencyLevel) {
+ super(ctx, factory, initialCapacity, loadFactor, concurrencyLevel);
+ }
+
+ /** {@inheritDoc} */
+ @Override public int publicSize() {
+ return pubSize.get();
+ }
+
+ /** {@inheritDoc} */
+ @Override public void incrementPublicSize(GridCacheEntryEx e) {
+ pubSize.incrementAndGet();
+ }
+
+ /** {@inheritDoc} */
+ @Override public void decrementPublicSize(GridCacheEntryEx e) {
+ pubSize.decrementAndGet();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/89c2ebb6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 1c7db68..d3ec2af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -512,7 +512,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
if (partState == OWNING)
return true;
- assert partState== MOVING || partState == LOST;
+ assert partState == MOVING || partState == LOST;
if (casState(state, OWNING)) {
if (log.isDebugEnabled())
@@ -608,7 +608,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
GridDhtPartitionState partState = getPartState(state);
- if (isEmpty() && !QueryUtils.isEnabled(cctx.config()) &&
+ if (isEmpty() && !QueryUtils.isEnabled(cctx.config()) && getSize(state) == 0 &&
partState == RENTING && getReservations(state) == 0 && !groupReserved() &&
casState(state, EVICTED)) {
if (log.isDebugEnabled())
@@ -652,7 +652,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
*
*/
private void clearEvicting() {
- boolean free;
+ boolean free;
while (true) {
int cnt = evictGuard.get();
@@ -726,7 +726,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
// Attempt to evict partition entries from cache.
clearAll();
- if (isEmpty() && casState(state, EVICTED)) {
+ if (isEmpty() && getSize(state) == 0 && casState(state, EVICTED)) {
if (log.isDebugEnabled())
log.debug("Evicted partition: " + this);
// finishDestroy() will be initiated by clearEvicting().
@@ -808,6 +808,9 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
store.updateCounter(val);
}
+ /**
+ * @param val Initial update index value.
+ */
public void initialUpdateCounter(long val) {
store.updateInitialCounter(val);
}
@@ -970,8 +973,38 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
"createTime", U.format(createTime));
}
+ /** {@inheritDoc} */
+ @Override public int publicSize() {
+ return getSize(state.get());
+ }
+
+ /** {@inheritDoc} */
+ @Override public void incrementPublicSize(GridCacheEntryEx e) {
+ while (true) {
+ long state = this.state.get();
+
+ assert getPartState(state) != EVICTED;
+
+ if (this.state.compareAndSet(state, setSize(state, getSize(state) + 1)))
+ return;
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void decrementPublicSize(GridCacheEntryEx e) {
+ while (true) {
+ long state = this.state.get();
+
+ assert getPartState(state) != EVICTED;
+ assert getSize(state) > 0;
+
+ if (this.state.compareAndSet(state, setSize(state, getSize(state) - 1)))
+ return;
+ }
+ }
+
private static GridDhtPartitionState getPartState(long state) {
- return GridDhtPartitionState.fromOrdinal((int) (state & (0x0000000000000007L)));
+ return GridDhtPartitionState.fromOrdinal((int)(state & (0x0000000000000007L)));
}
private static long setPartState(long state, GridDhtPartitionState partState) {
@@ -979,7 +1012,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
}
private static int getReservations(long state) {
- return (int) ((state & 0x00000000FFFF0000L) >> 16);
+ return (int)((state & 0x00000000FFFF0000L) >> 16);
}
private static long setReservations(long state, int reservations) {
@@ -991,7 +1024,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
}
private static long setSize(long state, int size) {
- return (state & (~0xFFFFFFFF00000000L)) | ((long) size << 32);
+ return (state & (~0xFFFFFFFF00000000L)) | ((long)size << 32);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/89c2ebb6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 7c1c38b..0d62985 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -43,6 +43,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheConcurrentMapImpl;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheLocalConcurrentMap;
import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
import org.apache.ignite.internal.processors.cache.GridCacheMapEntryFactory;
import org.apache.ignite.internal.processors.cache.GridCachePreloader;
@@ -118,7 +119,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
/** {@inheritDoc} */
@Override public void onReconnected() {
- map = new GridCacheConcurrentMapImpl(
+ map = new GridCacheLocalConcurrentMap(
ctx,
entryFactory(),
ctx.config().getNearConfiguration().getNearStartSize());
[15/53] [abbrv] ignite git commit: Removed properties specific for
old OFFHEAP modes: offheapMaxMemory and sqlOnheapRowCacheSize.
Posted by ag...@apache.org.
Removed properties specific for old OFFHEAP modes: offheapMaxMemory and sqlOnheapRowCacheSize.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ecfc45e2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ecfc45e2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ecfc45e2
Branch: refs/heads/ignite-3477-master
Commit: ecfc45e23bcbc5e440a74c594c21455bdd8b935e
Parents: 4ad8974
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Mar 31 16:14:42 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Mar 31 16:14:42 2017 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 86 --------------------
.../processors/cache/CacheMetricsImpl.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 1 -
.../utils/PlatformConfigurationUtils.java | 4 -
.../visor/cache/VisorCacheConfiguration.java | 1 -
.../cache/VisorCacheQueryConfiguration.java | 1 -
.../internal/ClusterNodeMetricsSelfTest.java | 1 -
.../cache/CacheNearReaderUpdateTest.java | 1 -
.../CacheSerializableTransactionsTest.java | 1 -
.../GridCacheAbstractLocalStoreSelfTest.java | 1 -
...HeapMultiThreadedUpdateAbstractSelfTest.java | 1 -
.../cache/GridCacheOffheapUpdateSelfTest.java | 1 -
.../GridCacheValueBytesPreloadingSelfTest.java | 1 -
.../IgniteCacheConfigVariationsFullApiTest.java | 2 +-
...gniteCacheLoadRebalanceEvictionSelfTest.java | 1 -
.../cache/IgniteCachePeekModesAbstractTest.java | 2 -
...heapCacheMetricsForClusterGroupSelfTest.java | 1 -
.../igfs/IgfsAbstractBaseSelfTest.java | 1 -
.../processors/igfs/IgfsMaxSizeSelfTest.java | 1 -
...gniteClientReconnectMassiveShutdownTest.java | 1 -
...IgniteCacheConfigVariationsAbstractTest.java | 7 --
.../impl/HadoopAbstractMapReduceTest.java | 1 -
.../igfs/HadoopFIleSystemFactorySelfTest.java | 1 -
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 1 -
.../CacheOffheapBatchIndexingBaseTest.java | 4 +-
.../CacheOffheapBatchIndexingMultiTypeTest.java | 17 +---
...CacheOffheapBatchIndexingSingleTypeTest.java | 20 +----
.../CacheOperationsWithExpirationTest.java | 1 -
.../CacheQueryOffheapEvictDataLostTest.java | 1 -
.../CacheRandomOperationsMultithreadedTest.java | 1 -
.../cache/GridCacheOffHeapSelfTest.java | 1 -
.../GridCacheOffheapIndexEntryEvictTest.java | 2 -
.../cache/GridCacheOffheapIndexGetSelfTest.java | 4 -
.../cache/IgniteCacheOffheapEvictQueryTest.java | 4 -
.../cache/IgniteCacheOffheapIndexScanTest.java | 1 -
.../IgniteCacheQueryMultiThreadedSelfTest.java | 10 ---
...QueryOffheapEvictsMultiThreadedSelfTest.java | 28 -------
...eCacheQueryOffheapMultiThreadedSelfTest.java | 28 -------
.../cache/ttl/CacheTtlAbstractSelfTest.java | 1 -
.../IgniteCacheQuerySelfTestSuite2.java | 4 -
.../org/apache/ignite/yardstick/IgniteNode.java | 6 --
41 files changed, 7 insertions(+), 247 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/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 476b983..271490b 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
@@ -161,9 +161,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default value for eager ttl flag. */
public static final boolean DFLT_EAGER_TTL = true;
- /** Default off-heap storage size is {@code -1} which means that off-heap storage is disabled. */
- public static final long DFLT_OFFHEAP_MEMORY = -1;
-
/** Default value for 'maxConcurrentAsyncOps'. */
public static final int DFLT_MAX_CONCURRENT_ASYNC_OPS = 500;
@@ -203,9 +200,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default number of queries detail metrics to collect. */
public static final int DFLT_QRY_DETAIL_METRICS_SIZE = 0;
- /** Default size for onheap SQL row cache size. */
- public static final int DFLT_SQL_ONHEAP_ROW_CACHE_SIZE = 10 * 1024;
-
/** Default value for keep binary in store behavior . */
@SuppressWarnings({"UnnecessaryBoxing", "BooleanConstructorCall"})
public static final Boolean DFLT_STORE_KEEP_BINARY = new Boolean(false);
@@ -313,9 +307,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Rebalance batches prefetch count. */
private long rebalanceBatchesPrefetchCount = DFLT_REBALANCE_BATCHES_PREFETCH_COUNT;
- /** Off-heap memory size. */
- private long offHeapMaxMem = DFLT_OFFHEAP_MEMORY;
-
/** Maximum number of concurrent asynchronous operations. */
private int maxConcurrentAsyncOps = DFLT_MAX_CONCURRENT_ASYNC_OPS;
@@ -380,9 +371,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
private boolean sqlEscapeAll;
/** */
- private int sqlOnheapRowCacheSize = DFLT_SQL_ONHEAP_ROW_CACHE_SIZE;
-
- /** */
private transient Class<?>[] indexedTypes;
/** Copy on read flag. */
@@ -464,7 +452,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
listenerConfigurations = cc.listenerConfigurations;
loadPrevVal = cc.isLoadPreviousValue();
longQryWarnTimeout = cc.getLongQueryWarningTimeout();
- offHeapMaxMem = cc.getOffHeapMaxMemory();
maxConcurrentAsyncOps = cc.getMaxConcurrentAsyncOperations();
sqlIndexMaxInlineSize = cc.getSqlIndexMaxInlineSize();
name = cc.getName();
@@ -486,7 +473,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
sqlSchema = cc.getSqlSchema();
sqlEscapeAll = cc.isSqlEscapeAll();
sqlFuncCls = cc.getSqlFunctionClasses();
- sqlOnheapRowCacheSize = cc.getSqlOnheapRowCacheSize();
startSize = cc.getStartSize();
storeFactory = cc.getCacheStoreFactory();
storeSesLsnrs = cc.getCacheStoreSessionListenerFactories();
@@ -1596,53 +1582,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Gets maximum amount of memory available to off-heap storage. Possible values are
- * <ul>
- * <li>{@code -1} - Means that off-heap storage is disabled.</li>
- * <li>
- * {@code 0} - Ignite will not limit off-heap storage (it's up to user to properly
- * add and remove entries from cache to ensure that off-heap storage does not grow
- * indefinitely.
- * </li>
- * <li>Any positive value specifies the limit of off-heap storage in bytes.</li>
- * </ul>
- * Default value is {@code -1}, specified by {@link #DFLT_OFFHEAP_MEMORY} constant
- * which means that off-heap storage is disabled by default.
- * <p>
- * Use off-heap storage to load gigabytes of data in memory without slowing down
- * Garbage Collection. Essentially in this case you should allocate very small amount
- * of memory to JVM and Ignite will cache most of the data in off-heap space
- * without affecting JVM performance at all.
- * <p>
- * Note that Ignite will throw an exception if max memory is set to {@code -1} and
- * {@code offHeapValuesOnly} flag is set to {@code true}.
- *
- * @return Maximum memory in bytes available to off-heap memory space.
- */
- public long getOffHeapMaxMemory() {
- return offHeapMaxMem;
- }
-
- /**
- * Sets maximum amount of memory available to off-heap storage. Possible values are <ul> <li>{@code -1} - Means that
- * off-heap storage is disabled.</li> <li> {@code 0} - Ignite will not limit off-heap storage (it's up to user to
- * properly add and remove entries from cache to ensure that off-heap storage does not grow infinitely. </li>
- * <li>Any positive value specifies the limit of off-heap storage in bytes.</li> </ul> Default value is {@code -1},
- * specified by {@link #DFLT_OFFHEAP_MEMORY} constant which means that off-heap storage is disabled by default. <p>
- * Use off-heap storage to load gigabytes of data in memory without slowing down Garbage Collection. Essentially in
- * this case you should allocate very small amount of memory to JVM and Ignite will cache most of the data in
- * off-heap space without affecting JVM performance at all.
- *
- * @param offHeapMaxMem Maximum memory in bytes available to off-heap memory space.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setOffHeapMaxMemory(long offHeapMaxMem) {
- this.offHeapMaxMem = offHeapMaxMem;
-
- return this;
- }
-
- /**
* Gets maximum number of query iterators that can be stored. Iterators are stored to
* support query pagination when each page of data is sent to user's node only on demand.
* Increase this property if you are running and processing lots of queries in parallel.
@@ -1970,31 +1909,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access.
- * This setting only makes sense when offheap is enabled for this cache.
- *
- * @return Cache size.
- * @see #setOffHeapMaxMemory(long)
- */
- public int getSqlOnheapRowCacheSize() {
- return sqlOnheapRowCacheSize;
- }
-
- /**
- * Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access.
- * This setting only makes sense when offheap is enabled for this cache.
- *
- * @param size Cache size.
- * @see #setOffHeapMaxMemory(long)
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setSqlOnheapRowCacheSize(int size) {
- this.sqlOnheapRowCacheSize = size;
-
- return this;
- }
-
- /**
* Gets array of cache plugin configurations.
*
* @return Cache plugin configurations.
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
index 1613af7..534b6b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
@@ -241,7 +241,7 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public long getOffHeapMaxSize() {
- return cctx.config().getOffHeapMaxMemory();
+ return 0;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index c29e01e..b72a7fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -973,7 +973,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen
ccfg.setBackups(cfg.getBackups());
ccfg.setCacheMode(cfg.getCacheMode());
ccfg.setAtomicityMode(cfg.getAtomicityMode());
- ccfg.setOffHeapMaxMemory(cfg.getOffHeapMaxMemory());
ccfg.setNodeFilter(cfg.getNodeFilter());
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index e137d75..4f7ee5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -158,7 +158,6 @@ public class PlatformConfigurationUtils {
ccfg.setMaxConcurrentAsyncOperations(in.readInt());
ccfg.setEvictMaxOverflowRatio(in.readFloat());
ccfg.setName(in.readString());
- ccfg.setOffHeapMaxMemory(in.readLong());
ccfg.setReadFromBackup(in.readBoolean());
ccfg.setRebalanceBatchSize(in.readInt());
ccfg.setRebalanceDelay(in.readLong());
@@ -166,7 +165,6 @@ public class PlatformConfigurationUtils {
ccfg.setRebalanceThrottle(in.readLong());
ccfg.setRebalanceTimeout(in.readLong());
ccfg.setSqlEscapeAll(in.readBoolean());
- ccfg.setSqlOnheapRowCacheSize(in.readInt());
ccfg.setStartSize(in.readInt());
ccfg.setWriteBehindBatchSize(in.readInt());
ccfg.setWriteBehindEnabled(in.readBoolean());
@@ -785,7 +783,6 @@ public class PlatformConfigurationUtils {
writer.writeInt(ccfg.getMaxConcurrentAsyncOperations());
writer.writeFloat(ccfg.getEvictMaxOverflowRatio());
writer.writeString(ccfg.getName());
- writer.writeLong(ccfg.getOffHeapMaxMemory());
writer.writeBoolean(ccfg.isReadFromBackup());
writer.writeInt(ccfg.getRebalanceBatchSize());
writer.writeLong(ccfg.getRebalanceDelay());
@@ -793,7 +790,6 @@ public class PlatformConfigurationUtils {
writer.writeLong(ccfg.getRebalanceThrottle());
writer.writeLong(ccfg.getRebalanceTimeout());
writer.writeBoolean(ccfg.isSqlEscapeAll());
- writer.writeInt(ccfg.getSqlOnheapRowCacheSize());
writer.writeInt(ccfg.getStartSize());
writer.writeInt(ccfg.getWriteBehindBatchSize());
writer.writeBoolean(ccfg.isWriteBehindEnabled());
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/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 e5325e2..e3ed666 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
@@ -127,7 +127,6 @@ public class VisorCacheConfiguration implements Serializable, LessNamingBean {
writeSynchronizationMode = ccfg.getWriteSynchronizationMode();
invalidate = ccfg.isInvalidate();
startSize = ccfg.getStartSize();
- offHeapMaxMemory = ccfg.getOffHeapMaxMemory();
maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations();
interceptor = compactClass(ccfg.getInterceptor());
typeMeta = VisorCacheTypeMetadata.list(ccfg.getQueryEntities(), ccfg.getCacheStoreFactory(), ccfg.getTypeMetadata());
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/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 d753b76..a21cf43 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
@@ -73,7 +73,6 @@ public class VisorCacheQueryConfiguration implements Serializable, LessNamingBea
longQryWarnTimeout = ccfg.getLongQueryWarningTimeout();
sqlEscapeAll = ccfg.isSqlEscapeAll();
indexedTypes = compactClasses(ccfg.getIndexedTypes());
- sqlOnheapRowCacheSize = ccfg.getSqlOnheapRowCacheSize();
sqlSchema = ccfg.getSqlSchema();
return this;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/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 35b3def..b43b1f7 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
@@ -90,7 +90,6 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
CacheConfiguration<Integer, Object> ccfg = defaultCacheConfiguration();
ccfg.setName(CACHE_NAME);
ccfg.setStatisticsEnabled(true);
- ccfg.setOffHeapMaxMemory(MAX_VALS_AMOUNT * VAL_SIZE);
FifoEvictionPolicy plc = new FifoEvictionPolicy();
plc.setMaxMemorySize(MAX_VALS_AMOUNT * VAL_SIZE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
index 5dd2e2a..9bd7a8c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
@@ -316,7 +316,6 @@ public class CacheNearReaderUpdateTest extends GridCommonAbstractTest {
", near=" + (ccfg.getNearConfiguration() != null) +
", store=" + ccfg.isWriteThrough() +
", evictPlc=" + (ccfg.getEvictionPolicy() != null) +
- ", maxOffheap=" + ccfg.getOffHeapMaxMemory() +
']');
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
index f3a39c3..3d29315 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
@@ -4886,7 +4886,6 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
", near=" + (ccfg.getNearConfiguration() != null) +
", store=" + ccfg.isWriteThrough() +
", evictPlc=" + (ccfg.getEvictionPolicy() != null) +
- ", maxOffheap=" + ccfg.getOffHeapMaxMemory() +
']');
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index 489a77d..64c60fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
@@ -192,7 +192,6 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
cacheCfg.setWriteThrough(true);
cacheCfg.setReadThrough(true);
cacheCfg.setBackups(backups);
- cacheCfg.setOffHeapMaxMemory(0);
return cacheCfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
index 28f0ac5..a806b7f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java
@@ -52,7 +52,6 @@ public abstract class GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest extend
ccfg.setAtomicityMode(atomicityMode());
ccfg.setCacheMode(PARTITIONED);
ccfg.setBackups(1);
- ccfg.setOffHeapMaxMemory(1024 * 1024);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
index 3693b33..2b82407 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
@@ -47,7 +47,6 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest {
ccfg.setCacheMode(CacheMode.PARTITIONED);
ccfg.setNearConfiguration(null);
ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
- ccfg.setOffHeapMaxMemory(0);
cfg.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
index 9d03e83..44adc84 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
@@ -53,7 +53,6 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes
ccfg.setAtomicityMode(ATOMIC);
ccfg.setNearConfiguration(null);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setOffHeapMaxMemory(1024 * 1024 * 1024);
ccfg.setRebalanceMode(CacheRebalanceMode.SYNC);
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
index 083cdf3..6b1eb08 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
@@ -3758,7 +3758,7 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
*/
private void checkKeyAfterLocalEvict(IgniteCache<String, Integer> cache, String k) {
assertNull(cache.localPeek(k, ONHEAP));
- assertEquals(offheapEnabled(), cache.localPeek(k, OFFHEAP) != null);
+ assertNotNull(cache.localPeek(k, OFFHEAP));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
index 007515b..6791172 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
@@ -80,7 +80,6 @@ public class IgniteCacheLoadRebalanceEvictionSelfTest extends GridCommonAbstract
cacheCfg.setBackups(1);
cacheCfg.setReadFromBackup(true);
cacheCfg.setEvictionPolicy(evictionPolicy);
- cacheCfg.setOffHeapMaxMemory(1024 * 1024 * 1024L);
cacheCfg.setStatisticsEnabled(true);
cacheCfg.setWriteThrough(false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
index ce6d2fa..025abf7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
@@ -89,8 +89,6 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
@Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
- ccfg.setOffHeapMaxMemory(512);
-
ccfg.setBackups(1);
if (hasNearCache())
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
index 254cb9b..a3d3130 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
@@ -133,7 +133,6 @@ public class OffheapCacheMetricsForClusterGroupSelfTest extends GridCommonAbstra
cfg.setBackups(1);
cfg.setStatisticsEnabled(true);
- cfg.setOffHeapMaxMemory(1024 * 1024 * 1024);
return cfg;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
index 4143029..55e1905 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
@@ -380,7 +380,6 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
index bfba10a..2e0be3f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMaxSizeSelfTest.java
@@ -55,7 +55,6 @@ public class IgfsMaxSizeSelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
- dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
index ae223b0..50e5093 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
@@ -138,7 +138,6 @@ public class IgniteClientReconnectMassiveShutdownTest extends GridCommonAbstract
cfg.setCacheMode(PARTITIONED);
cfg.setAtomicityMode(TRANSACTIONAL);
cfg.setBackups(2);
- cfg.setOffHeapMaxMemory(0);
IgniteCache<String, Integer> cache = client.getOrCreateCache(cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
index b915f97..fa287bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
@@ -389,13 +389,6 @@ public abstract class IgniteCacheConfigVariationsAbstractTest extends IgniteConf
}
/**
- * @return {@code True} if offheap memory is enabled.
- */
- protected boolean offheapEnabled() {
- return cacheConfiguration().getOffHeapMaxMemory() >= 0;
- }
-
- /**
* @return {@code True} if swap is enabled.
*/
protected boolean swapEnabled() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
index 12e1257..4928e3d 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractMapReduceTest.java
@@ -376,7 +376,6 @@ public class HadoopAbstractMapReduceTest extends HadoopAbstractWordCountTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
index 2e3a2a3..6b5690c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopFIleSystemFactorySelfTest.java
@@ -235,7 +235,6 @@ public class HadoopFIleSystemFactorySelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
index ad6a9f4..3ffdf23 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsDualAbstractSelfTest.java
@@ -169,7 +169,6 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
index b457db8..41b6c83 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
@@ -86,16 +86,14 @@ public abstract class CacheOffheapBatchIndexingBaseTest extends GridCommonAbstra
}
/**
- * @param onHeapRowCacheSize on heap row cache size.
* @param indexedTypes indexed types for cache.
* @return Cache configuration.
*/
- protected CacheConfiguration<Object, Object> cacheConfiguration(int onHeapRowCacheSize, Class<?>[] indexedTypes) {
+ protected CacheConfiguration<Object, Object> cacheConfiguration(Class<?>[] indexedTypes) {
CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
ccfg.setAtomicityMode(ATOMIC);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setSqlOnheapRowCacheSize(onHeapRowCacheSize);
ccfg.setIndexedTypes(indexedTypes);
return ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java
index 602fc1c..87d10a1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java
@@ -35,18 +35,6 @@ public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchInd
doStreamerBatchTest(50, 1_000, new Class<?>[] {
Integer.class, CacheOffheapBatchIndexingBaseTest.Person.class,
Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- 1,
- true);
- }
-
- /**
- * Tests putAll with multiple indexed entities and streamer preloading with default off-heap cache size.
- */
- public void testPutAllMultupleEntitiesAndStreamerDfltOffHeapRowCacheSize() {
- doStreamerBatchTest(50, 1_000, new Class<?>[] {
- Integer.class, CacheOffheapBatchIndexingBaseTest.Person.class,
- Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- CacheConfiguration.DFLT_SQL_ONHEAP_ROW_CACHE_SIZE,
true);
}
@@ -57,7 +45,6 @@ public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchInd
doStreamerBatchTest(50,
1_000,
new Class<?>[] {Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- 1,
false);
}
@@ -65,18 +52,16 @@ public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchInd
* @param iterations Number of iterations.
* @param entitiesCnt Number of entities to put.
* @param entityClasses Entity classes.
- * @param onHeapRowCacheSize Cache size.
* @param preloadInStreamer Data preload flag.
*/
private void doStreamerBatchTest(int iterations,
int entitiesCnt,
Class<?>[] entityClasses,
- int onHeapRowCacheSize,
boolean preloadInStreamer) {
Ignite ignite = grid(0);
final IgniteCache<Object, Object> cache =
- ignite.createCache(cacheConfiguration(onHeapRowCacheSize, entityClasses));
+ ignite.createCache(cacheConfiguration(entityClasses));
try {
if (preloadInStreamer)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java
index c59e5fe..acf33dc 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java
@@ -41,7 +41,7 @@ public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIn
public void testBatchRemove() throws Exception {
Ignite ignite = grid(0);
- CacheConfiguration<Object, Object> ccfg = cacheConfiguration(1,
+ CacheConfiguration<Object, Object> ccfg = cacheConfiguration(
new Class<?>[] {Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class});
final IgniteCache<Object, Object> cache = ignite.createCache(ccfg);
@@ -88,18 +88,6 @@ public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIn
doStreamerBatchTest(50,
1_000,
new Class<?>[] {Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- 1,
- true);
- }
-
- /**
- *
- */
- public void testPutAllAndStreamerDfltOffHeapRowCacheSize() {
- doStreamerBatchTest(50,
- 1_000,
- new Class<?>[] {Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- CacheConfiguration.DFLT_SQL_ONHEAP_ROW_CACHE_SIZE,
true);
}
@@ -110,7 +98,6 @@ public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIn
doStreamerBatchTest(50,
1_000,
new Class<?>[] {Integer.class, CacheOffheapBatchIndexingBaseTest.Organization.class},
- 1,
false);
}
@@ -118,18 +105,17 @@ public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIn
* @param iterations Number of iterations.
* @param entitiesCnt Number of entities to put.
* @param entityClasses Entity classes.
- * @param onHeapRowCacheSize Cache size.
+
* @param preloadInStreamer Data preload flag.
*/
private void doStreamerBatchTest(int iterations,
int entitiesCnt,
Class<?>[] entityClasses,
- int onHeapRowCacheSize,
boolean preloadInStreamer) {
Ignite ignite = grid(0);
final IgniteCache<Object, Object> cache =
- ignite.createCache(cacheConfiguration(onHeapRowCacheSize, entityClasses));
+ ignite.createCache(cacheConfiguration(entityClasses));
try {
if (preloadInStreamer)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
index 7706884..33c82b7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
@@ -61,7 +61,6 @@ public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest {
CacheConfiguration<String, TestIndexedType> ccfg = new CacheConfiguration<>();
ccfg.setAtomicityMode(atomicityMode);
- ccfg.setOffHeapMaxMemory(offheapMem);
ccfg.setBackups(1);
ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setWriteSynchronizationMode(PRIMARY_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
index 690fff8..0d9948d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
@@ -52,7 +52,6 @@ public class CacheQueryOffheapEvictDataLostTest extends GridCommonAbstractTest {
ccfg.setName("cache-1");
ccfg.setEvictionPolicy(new LruEvictionPolicy(10));
- ccfg.setOffHeapMaxMemory(1024);
ccfg.setIndexedTypes(Integer.class, TestData.class);
cfg.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
index 5fb0fb8..24308cf 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
@@ -348,7 +348,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setEvictionPolicy(evictionPlc);
- ccfg.setOffHeapMaxMemory(0);
if (cacheMode == PARTITIONED)
ccfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
index 2c083fb..148ce74 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
@@ -87,7 +87,6 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setCacheMode(REPLICATED);
- cacheCfg.setOffHeapMaxMemory(1024L * 1024L * 1024L);
cacheCfg.setIndexedTypes(Integer.class, CacheValue.class);
cfg.setCacheConfiguration(cacheCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
index efa14c1..d64aa7c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
@@ -62,10 +62,8 @@ public class GridCacheOffheapIndexEntryEvictTest extends GridCommonAbstractTest
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(1);
- cacheCfg.setOffHeapMaxMemory(0);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setEvictionPolicy(null);
- cacheCfg.setSqlOnheapRowCacheSize(10);
cacheCfg.setIndexedTypes(Integer.class, TestValue.class);
cacheCfg.setNearConfiguration(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
index 1463134..60fe5bf 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
@@ -47,9 +47,6 @@ import static org.apache.ignite.configuration.DeploymentMode.SHARED;
*/
public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest {
/** */
- private static final long OFFHEAP_MEM = 10L * 1024L;
-
- /** */
private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** {@inheritDoc} */
@@ -78,7 +75,6 @@ public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(1);
- cacheCfg.setOffHeapMaxMemory(OFFHEAP_MEM);
cacheCfg.setEvictSynchronized(true);
cacheCfg.setEvictSynchronizedKeyBufferSize(1);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
index 57a8669..22856b5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
@@ -68,14 +68,10 @@ public class IgniteCacheOffheapEvictQueryTest extends GridCommonAbstractTest {
cacheCfg.setEvictionPolicy(null);
cacheCfg.setNearConfiguration(null);
- cacheCfg.setSqlOnheapRowCacheSize(128);
-
cacheCfg.setIndexedTypes(
Integer.class, Integer.class
);
- cacheCfg.setOffHeapMaxMemory(2000); // Small offheap for evictions from offheap to swap.
-
cfg.setCacheConfiguration(cacheCfg);
return cfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
index 6b4a546..6f46d33 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
@@ -56,7 +56,6 @@ public class IgniteCacheOffheapIndexScanTest extends GridCommonAbstractTest {
CacheConfiguration<?,?> cacheCfg = new CacheConfiguration<>();
cacheCfg.setCacheMode(LOCAL);
- cacheCfg.setSqlOnheapRowCacheSize(256);
cacheCfg.setIndexedTypes(
Integer.class, Person.class
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
index c41da80..382b1ed 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
@@ -121,11 +121,6 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes
cacheCfg.setEvictionPolicy(plc);
- cacheCfg.setSqlOnheapRowCacheSize(128);
-
- if (offheapEnabled())
- cacheCfg.setOffHeapMaxMemory(evictsEnabled() ? 1000 : 0); // Small offheap for evictions.
-
return cacheCfg;
}
@@ -162,11 +157,6 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes
}
}
- /** @return {@code true} If offheap enabled. */
- protected boolean offheapEnabled() {
- return false;
- }
-
/** @return {@code true} If evictions enabled. */
protected boolean evictsEnabled() {
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java
deleted file mode 100644
index d7d2b5a..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-/**
- * Multi-threaded tests for cache queries.
- */
-public class IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest extends IgniteCacheQueryOffheapMultiThreadedSelfTest {
- /** {@inheritDoc} */
- @Override protected boolean evictsEnabled() {
- return true;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapMultiThreadedSelfTest.java
deleted file mode 100644
index db132b8..0000000
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapMultiThreadedSelfTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-/**
- * Queries over off-heap indexes.
- */
-public class IgniteCacheQueryOffheapMultiThreadedSelfTest extends IgniteCacheQueryMultiThreadedSelfTest {
- /** {@inheritDoc} */
- @Override protected boolean offheapEnabled() {
- return true;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
index 4152179..c07d7a5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
@@ -77,7 +77,6 @@ public abstract class CacheTtlAbstractSelfTest extends GridCommonAbstractTest {
ccfg.setCacheMode(cacheMode());
ccfg.setAtomicityMode(atomicityMode());
- ccfg.setOffHeapMaxMemory(0);
LruEvictionPolicy plc = new LruEvictionPolicy();
plc.setMaxSize(MAX_CACHE_SIZE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
index eab5c7a..2d48411 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
@@ -23,8 +23,6 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheCrossCacheJoinRand
import org.apache.ignite.internal.processors.cache.IgniteCachePartitionedQueryMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheQueryEvictsMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedSelfTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.IgniteCacheSqlQueryMultiThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheClientQueryReplicatedNodeRestartSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest;
@@ -45,11 +43,9 @@ public class IgniteCacheQuerySelfTestSuite2 extends TestSuite {
TestSuite suite = new IgniteTestSuite("Ignite Cache Queries Test Suite 2");
suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class);
// TODO GG-11140.
suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheCrossCacheJoinRandomTest.class);
suite.addTestSuite(IgniteCacheClientQueryReplicatedNodeRestartSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecfc45e2/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
index ff193b7..59b31f9 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -125,12 +125,6 @@ public class IgniteNode implements BenchmarkServer {
c.setConnectorConfiguration(ccc);
}
- if (args.isOffHeap()) {
- cc.setOffHeapMaxMemory(0);
-
- cc.setEvictionPolicy(new LruEvictionPolicy(50000));
- }
-
cc.setReadThrough(args.isStoreEnabled());
cc.setWriteThrough(args.isStoreEnabled());
[19/53] [abbrv] ignite git commit: ignite-4535 : Adjusted tests for
eviction.
Posted by ag...@apache.org.
ignite-4535 : Adjusted tests for eviction.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/51b0d007
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/51b0d007
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/51b0d007
Branch: refs/heads/ignite-3477-master
Commit: 51b0d0079bab80fc78115d0db40c8569f41894de
Parents: 65d816f
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Mar 31 18:15:57 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Mar 31 18:15:57 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/near/GridNearTxLocal.java | 1 -
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 199 ----------------
...heConcurrentEvictionConsistencySelfTest.java | 5 +-
.../GridCacheDistributedEvictionsSelfTest.java | 235 -------------------
.../GridCacheEvictionTouchSelfTest.java | 11 +-
...cheSynchronousEvictionsFailoverSelfTest.java | 166 -------------
.../IgniteCacheEvictionSelfTestSuite.java | 6 -
.../testsuites/IgniteCacheTestSuite3.java | 1 -
9 files changed, 10 insertions(+), 618 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/51b0d007/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 750a99d..c257154 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -1567,7 +1567,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements AutoClosea
{
if (log.isDebugEnabled())
log.debug("Acquired transaction lock for remove on keys: " + enlisted);
- U.debug(log, "Acquired transaction lock for remove on keys: " + enlisted);
postLockWrite(cacheCtx,
enlisted,
http://git-wip-us.apache.org/repos/asf/ignite/blob/51b0d007/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
index c46f6bf..78a92cb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
@@ -199,8 +199,8 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
assertTrue(GridTestUtils.waitForCondition(new PA() {
@Override public boolean apply() {
- int size1 = ignite1.cache(null).localSize(CachePeekMode.ALL);
- return size1 != oldSize && size1 == ignite2.cache(null).localSize(CachePeekMode.ALL);
+ int size1 = ignite1.cache(null).localSize(CachePeekMode.ONHEAP);
+ return size1 != oldSize && size1 == ignite2.cache(null).localSize(CachePeekMode.ONHEAP);
}
}, getTestTimeout()));
http://git-wip-us.apache.org/repos/asf/ignite/blob/51b0d007/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
deleted file mode 100644
index 67700b6..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.eviction;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
-import org.apache.ignite.cache.store.CacheStore;
-import org.apache.ignite.cache.store.CacheStoreAdapter;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
-import org.apache.ignite.lang.IgniteBiInClosure;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Swap benchmark.
- */
-@SuppressWarnings("BusyWait")
-public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest {
- /** Eviction policy size. */
- public static final int EVICT_PLC_SIZE = 100000;
-
- /** Keys count. */
- public static final int KEYS_CNT = 100000;
-
- /** Batch size. */
- private static final int BATCH_SIZE = 200;
-
- /** Number of threads for concurrent benchmark + concurrency level. */
- private static final int N_THREADS = 8;
-
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 1;
- }
-
- /** {@inheritDoc} */
- @Override protected long getTestTimeout() {
- // Let this test run 2 minutes as it runs for 20 seconds locally.
- return 2 * 60 * 1000;
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings("unchecked")
- @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
- CacheConfiguration cacheCfg = super.cacheConfiguration(igniteInstanceName);
-
- cacheCfg.setCacheMode(CacheMode.PARTITIONED);
-
- CacheStore store = new CacheStoreAdapter<Long, String>() {
- @Nullable @Override public String load(Long key) {
- return null;
- }
-
- @Override public void loadCache(final IgniteBiInClosure<Long, String> c,
- @Nullable Object... args) {
- for (int i = 0; i < KEYS_CNT; i++)
- c.apply((long)i, String.valueOf(i));
- }
-
- @Override public void write(javax.cache.Cache.Entry<? extends Long, ? extends String> val) {
- // No-op.
- }
-
- @Override public void delete(Object key) {
- // No-op.
- }
- };
-
- cacheCfg.setCacheStoreFactory(singletonFactory(store));
- cacheCfg.setReadThrough(true);
- cacheCfg.setWriteThrough(true);
- cacheCfg.setLoadPreviousValue(true);
-
- FifoEvictionPolicy plc = new FifoEvictionPolicy();
- plc.setMaxSize(EVICT_PLC_SIZE);
-
- cacheCfg.setEvictionPolicy(plc);
- cacheCfg.setEvictSynchronized(false);
- cacheCfg.setNearConfiguration(null);
-
- return cacheCfg;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testConcurrentEvictions() throws Exception {
- runConcurrentTest(grid(0), KEYS_CNT, BATCH_SIZE);
- }
-
- /**
- * @param g Grid instance.
- * @param keysCnt Number of keys to swap and promote.
- * @param batchSize Size of batch to swap/promote.
- * @throws Exception If failed.
- */
- private void runConcurrentTest(Ignite g, final int keysCnt, final int batchSize) throws Exception {
- assert keysCnt % batchSize == 0;
-
- final AtomicInteger evictedKeysCnt = new AtomicInteger();
-
- final IgniteCache<Object, Object> cache = g.cache(null);
-
- cache.loadCache(null, 0);
-
- info("Finished load cache.");
-
- IgniteInternalFuture<?> evictFut = multithreadedAsync(new Runnable() {
- @Override public void run() {
- Collection<Long> keys = new ArrayList<>(batchSize);
-
- int evictedBatches = 0;
-
- for (long i = 0; i < keysCnt; i++) {
- keys.add(i);
-
- if (keys.size() == batchSize) {
- for (Long key : keys)
- cache.localEvict(Collections.<Object>singleton(key));
-
- evictedKeysCnt.addAndGet(batchSize);
-
- keys.clear();
-
- evictedBatches++;
-
- if (evictedBatches % 100 == 0 && evictedBatches > 0)
- info("Evicted " + (evictedBatches * batchSize) + " entries.");
- }
- }
- }
- }, N_THREADS, "evict");
-
- final AtomicInteger unswappedKeys = new AtomicInteger();
-
- IgniteInternalFuture<?> unswapFut = multithreadedAsync(new Runnable() {
- @Override public void run() {
- try {
- Collection<Long> keys = new ArrayList<>(batchSize);
-
- int unswappedBatches = 0;
-
- for (long i = 0; i < keysCnt; i++) {
- keys.add(i);
-
- if (keys.size() == batchSize) {
- for (Long key : keys)
- cache.localPromote(Collections.singleton(key));
-
- unswappedKeys.addAndGet(batchSize);
-
- keys.clear();
-
- unswappedBatches++;
-
- if (unswappedBatches % 100 == 0 && unswappedBatches > 0)
- info("Unswapped " + (unswappedBatches * batchSize) + " entries.");
- }
- }
- }
- catch (IgniteException e) {
- e.printStackTrace();
- }
- }
- }, N_THREADS, "promote");
-
- evictFut.get();
-
- unswapFut.get();
-
- info("Clearing cache.");
-
- for (long i = 0; i < KEYS_CNT; i++)
- cache.remove(i);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/51b0d007/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
index f7ef897..0e91e30 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.Callable;
import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.eviction.EvictableEntry;
import org.apache.ignite.cache.eviction.EvictionPolicy;
import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
@@ -295,10 +296,10 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
if (detached)
fail("Eviction policy contains keys that are not present in cache");
- if (!(cache.localSize() == 0)) {
+ if (!(cache.localSize(CachePeekMode.ONHEAP) == 0)) {
boolean zombies = false;
- for (Cache.Entry<Integer, Integer> e : cache) {
+ for (Cache.Entry<Integer, Integer> e : cache.localEntries(CachePeekMode.ONHEAP)) {
U.warn(log, "Zombie entry: " + e);
zombies = true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/51b0d007/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
deleted file mode 100644
index 7621897..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.eviction;
-
-import java.util.TreeSet;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cache.CacheWriteSynchronizationMode;
-import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.configuration.TransactionConfiguration;
-import org.apache.ignite.internal.processors.cache.distributed.GridCacheModuloAffinityFunction;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.LOCAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
-import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
-
-/**
- *
- */
-public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTest {
- /** IP finder. */
- private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
-
- /** */
- private int gridCnt = 2;
-
- /** */
- private CacheMode mode;
-
- /** */
- private boolean nearEnabled;
-
- /** */
- private boolean evictSync;
-
- /** */
- private final AtomicInteger idxGen = new AtomicInteger();
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
- IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
-
- TransactionConfiguration tCfg = new TransactionConfiguration();
-
- tCfg.setDefaultTxConcurrency(PESSIMISTIC);
- tCfg.setDefaultTxIsolation(READ_COMMITTED);
-
- c.setTransactionConfiguration(tCfg);
-
- CacheConfiguration cc = defaultCacheConfiguration();
-
- cc.setCacheMode(mode);
- cc.setAtomicityMode(TRANSACTIONAL);
-
- if (nearEnabled) {
- NearCacheConfiguration nearCfg = new NearCacheConfiguration();
-
- cc.setNearConfiguration(nearCfg);
- }
-
- cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
-
- // Set only DHT policy, leave default near policy.
- FifoEvictionPolicy plc = new FifoEvictionPolicy();
- plc.setMaxSize(10);
-
- cc.setEvictionPolicy(plc);
- cc.setEvictSynchronized(evictSync);
- cc.setEvictSynchronizedKeyBufferSize(1);
-
- cc.setAffinity(new GridCacheModuloAffinityFunction(gridCnt, 1));
-
- c.setCacheConfiguration(cc);
-
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
- disco.setIpFinder(ipFinder);
-
- c.setDiscoverySpi(disco);
-
- c.setUserAttributes(F.asMap(GridCacheModuloAffinityFunction.IDX_ATTR, idxGen.getAndIncrement()));
-
- return c;
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- stopAllGrids();
-
- super.afterTest();
- }
-
- /** @throws Throwable If failed. */
- public void testNearSyncBackupSync() throws Throwable {
- gridCnt = 3;
- mode = PARTITIONED;
- evictSync = true;
- nearEnabled = true;
-
- checkEvictions();
- }
-
- /**
- * @throws Throwable If failed.
- */
- public void testLocalSync() throws Throwable {
- gridCnt = 1;
- mode = LOCAL;
- evictSync = true;
- nearEnabled = true;
-
- Ignite g = startGrid(0);
-
- final IgniteCache<Integer, Integer> cache = g.cache(null);
-
- for (int i = 1; i < 20; i++) {
- cache.put(i * gridCnt, i * gridCnt);
-
- info("Put to cache: " + i * gridCnt);
- }
- }
-
- /** @throws Throwable If failed. */
- private void checkEvictions() throws Throwable {
- try {
- startGrids(gridCnt);
-
- Ignite ignite = grid(0);
-
- final IgniteCache<Integer, Integer> cache = ignite.cache(null);
-
- // Put 1 entry to primary node.
- cache.put(0, 0);
-
- Integer nearVal = this.<Integer, Integer>jcache(2).get(0);
-
- assert nearVal == 0 : "Unexpected near value: " + nearVal;
-
- // Put several vals to primary node.
- for (int i = 1; i < 20; i++) {
- cache.put(i * gridCnt, i * gridCnt);
-
- info("Put to cache: " + i * gridCnt);
- }
-
- for (int i = 0; i < 3; i++) {
- try {
- assert jcache(2).get(0) == null : "Entry has not been evicted from near node for key: " + 0;
- assert jcache(1).get(0) == null : "Entry has not been evicted from backup node for key: " + 0;
- assert cache.get(0) == null : "Entry has not been evicted from primary node for key: " + 0;
- }
- catch (Throwable e) {
- if (i == 2)
- // No attempts left.
- throw e;
-
- U.warn(log, "Check failed (will retry in 2000 ms): " + e);
-
- // Unwind evicts?
- cache.get(0);
-
- U.sleep(2000);
- }
- }
-
- for (int i = 0; i < 3; i++) {
- info("Primary key set: " + new TreeSet<>(this.<Integer, Integer>dht(0).keySet()));
- info("Primary near key set: " + new TreeSet<>(this.<Integer, Integer>near(0).keySet()));
-
- info("Backup key set: " + new TreeSet<>(this.<Integer, Integer>dht(1).keySet()));
- info("Backup near key set: " + new TreeSet<>(this.<Integer, Integer>near(1).keySet()));
-
- info("Near key set: " + new TreeSet<>(this.<Integer, Integer>dht(2).keySet()));
- info("Near node near key set: " + new TreeSet<>(this.<Integer, Integer>near(2).keySet()));
-
- try {
- assert cache.localSize() == 10 : "Invalid cache size [size=" + cache.localSize() + ']';
- assert cache.localSize() == 10 : "Invalid key size [size=" + cache.localSize() + ']';
-
- assert jcache(2).localSize() == 0;
-
- break;
- }
- catch (Throwable e) {
- if (i == 2)
- // No attempts left.
- throw e;
-
- U.warn(log, "Check failed (will retry in 2000 ms): " + e);
-
- // Unwind evicts?
- cache.get(0);
-
- U.sleep(2000);
- }
- }
- }
- catch (Throwable t) {
- error("Test failed.", t);
-
- throw t;
- }
- finally {
- stopAllGrids();
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/51b0d007/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
index d8746c8..34bb2a8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
@@ -28,6 +28,7 @@ import java.util.TreeSet;
import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.eviction.EvictionPolicy;
import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
import org.apache.ignite.cache.store.CacheStore;
@@ -191,7 +192,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
cache.localEvict(Collections.singleton(i));
assertEquals(0, ((FifoEvictionPolicy)plc).queue().size());
- assertEquals(0, cache.size());
+ assertEquals(0, cache.size(CachePeekMode.ONHEAP));
}
finally {
stopAllGrids();
@@ -226,7 +227,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
cache.localEvict(Collections.singleton(key));
assertEquals(0, ((FifoEvictionPolicy)plc).queue().size());
- assertEquals(0, cache.size());
+ assertEquals(0, cache.size(CachePeekMode.ONHEAP));
}
finally {
stopAllGrids();
@@ -250,8 +251,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < 10000; i++)
load(cache, i, true);
- assertEquals(100, cache.size());
- assertEquals(100, cache.size());
+ assertEquals(100, cache.size(CachePeekMode.ONHEAP));
assertEquals(100, ((FifoEvictionPolicy)plc).queue().size());
Set<Integer> keys = new TreeSet<>();
@@ -261,8 +261,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
loadAll(cache, keys, true);
- assertEquals(100, cache.size());
- assertEquals(100, cache.size());
+ assertEquals(100, cache.size(CachePeekMode.ONHEAP));
assertEquals(100, ((FifoEvictionPolicy)plc).queue().size());
}
finally {
http://git-wip-us.apache.org/repos/asf/ignite/blob/51b0d007/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
deleted file mode 100644
index 377afa0..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.eviction;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cache.affinity.Affinity;
-import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.testframework.GridTestUtils;
-
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-
-/**
- *
- */
-public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-804");
- }
-
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 3;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return PARTITIONED;
- }
-
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearConfiguration() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
- CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
-
- ccfg.setEvictSynchronized(true);
- ccfg.setEvictSynchronizedKeyBufferSize(10);
-
- ccfg.setBackups(2);
-
- ccfg.setAffinity(new RendezvousAffinityFunction(false, 500));
-
- return ccfg;
- }
-
- /** {@inheritDoc} */
- @Override protected long getTestTimeout() {
- return 60_000;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testSynchronousEvictions() throws Exception {
- IgniteCache<String, Integer> cache = jcache(0);
-
- final AtomicBoolean stop = new AtomicBoolean();
-
- IgniteInternalFuture<?> fut = null;
-
- try {
- Map<String, Integer> data = new HashMap<>();
-
- addKeysForNode(affinity(cache), grid(0).localNode(), data);
- addKeysForNode(affinity(cache), grid(1).localNode(), data);
- addKeysForNode(affinity(cache), grid(2).localNode(), data);
-
- fut = GridTestUtils.runAsync(new Callable<Void>() {
- @Override public Void call() throws Exception {
- Random rnd = new Random();
-
- while (!stop.get()) {
- int idx = rnd.nextBoolean() ? 1 : 2;
-
- log.info("Stopping grid: " + idx);
-
- stopGrid(idx);
-
- U.sleep(100);
-
- log.info("Starting grid: " + idx);
-
- startGrid(idx);
- }
-
- return null;
- }
- });
-
- for (int i = 0 ; i < 100; i++) {
- log.info("Iteration: " + i);
-
- try {
- cache.putAll(data);
- }
- catch (IgniteException ignore) {
- continue;
- }
-
- cache.localEvict(data.keySet());
- }
- }
- finally {
- stop.set(true);
-
- if (fut != null)
- fut.get();
- }
- }
-
- /**
- * @param aff Cache affinity.
- * @param node Primary node for keys.
- * @param data Map where keys/values should be put to.
- */
- private void addKeysForNode(Affinity<String> aff, ClusterNode node, Map<String, Integer> data) {
- int cntr = 0;
-
- for (int i = 0; i < 100_000; i++) {
- String key = String.valueOf(i);
-
- if (aff.isPrimary(node, key)) {
- data.put(key, i);
-
- cntr++;
-
- if (cntr == 500)
- break;
- }
- }
-
- assertEquals(500, cntr);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/51b0d007/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java
index 503fa7e..94e1447 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java
@@ -21,17 +21,14 @@ import junit.framework.TestSuite;
import org.apache.ignite.internal.processors.cache.GridCachePreloadingEvictionsSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEvictionSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearEvictionSelfTest;
-import org.apache.ignite.internal.processors.cache.eviction.GridCacheBatchEvictUnswapSelfTest;
import org.apache.ignite.internal.processors.cache.eviction.GridCacheConcurrentEvictionConsistencySelfTest;
import org.apache.ignite.internal.processors.cache.eviction.GridCacheConcurrentEvictionsSelfTest;
-import org.apache.ignite.internal.processors.cache.eviction.GridCacheDistributedEvictionsSelfTest;
import org.apache.ignite.internal.processors.cache.eviction.GridCacheEmptyEntriesLocalSelfTest;
import org.apache.ignite.internal.processors.cache.eviction.GridCacheEmptyEntriesPartitionedSelfTest;
import org.apache.ignite.internal.processors.cache.eviction.GridCacheEvictableEntryEqualsSelfTest;
import org.apache.ignite.internal.processors.cache.eviction.GridCacheEvictionFilterSelfTest;
import org.apache.ignite.internal.processors.cache.eviction.GridCacheEvictionLockUnlockSelfTest;
import org.apache.ignite.internal.processors.cache.eviction.GridCacheEvictionTouchSelfTest;
-import org.apache.ignite.internal.processors.cache.eviction.GridCacheSynchronousEvictionsFailoverSelfTest;
import org.apache.ignite.internal.processors.cache.eviction.fifo.FifoEvictionPolicySelfTest;
import org.apache.ignite.internal.processors.cache.eviction.lru.LruEvictionPolicySelfTest;
import org.apache.ignite.internal.processors.cache.eviction.lru.LruNearEvictionPolicySelfTest;
@@ -60,13 +57,10 @@ public class IgniteCacheEvictionSelfTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridCacheConcurrentEvictionsSelfTest.class));
suite.addTest(new TestSuite(GridCacheConcurrentEvictionConsistencySelfTest.class));
suite.addTest(new TestSuite(GridCacheEvictionTouchSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDistributedEvictionsSelfTest.class));
suite.addTest(new TestSuite(GridCacheEvictionLockUnlockSelfTest.class));
- suite.addTest(new TestSuite(GridCacheBatchEvictUnswapSelfTest.class));
suite.addTest(new TestSuite(GridCachePreloadingEvictionsSelfTest.class));
suite.addTest(new TestSuite(GridCacheEmptyEntriesPartitionedSelfTest.class));
suite.addTest(new TestSuite(GridCacheEmptyEntriesLocalSelfTest.class));
- suite.addTest(new TestSuite(GridCacheSynchronousEvictionsFailoverSelfTest.class));
suite.addTest(new TestSuite(GridCacheEvictableEntryEqualsSelfTest.class));
return suite;
http://git-wip-us.apache.org/repos/asf/ignite/blob/51b0d007/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
index d2b7da6..1c2f98b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
@@ -189,7 +189,6 @@ public class IgniteCacheTestSuite3 extends TestSuite {
suite.addTest(IgniteTopologyValidatorTestSuit.suite());
// Eviction.
- // TODO GG-11140.
suite.addTest(IgniteCacheEvictionSelfTestSuite.suite());
// Iterators.
[03/53] [abbrv] ignite git commit: ignite-4535 : Removing
CacheMemoryMode - WIP.
Posted by ag...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java
index 989e5ac..8fd3758 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -40,69 +39,69 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou
* @throws Exception If failed.
*/
public void testInvokeReadThroughAtomic0() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, ONHEAP_TIERED, 0, false));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 0, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughAtomic1() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, ONHEAP_TIERED, 1, false));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 1, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughAtomic2() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, ONHEAP_TIERED, 2, false));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 2, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughAtomicNearCache() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, ONHEAP_TIERED, 1, true));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 1, true));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughAtomicReplicated() throws Exception {
- invokeReadThrough(cacheConfiguration(REPLICATED, ATOMIC, ONHEAP_TIERED, 0, false));
+ invokeReadThrough(cacheConfiguration(REPLICATED, ATOMIC, 0, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughTx0() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, ONHEAP_TIERED, 0, false));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 0, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughTx1() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, ONHEAP_TIERED, 1, false));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 1, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughTx2() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, ONHEAP_TIERED, 2, false));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 2, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughTxNearCache() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, ONHEAP_TIERED, 1, true));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 1, true));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughTxReplicated() throws Exception {
- invokeReadThrough(cacheConfiguration(REPLICATED, TRANSACTIONAL, ONHEAP_TIERED, 0, false));
+ invokeReadThrough(cacheConfiguration(REPLICATED, TRANSACTIONAL, 0, false));
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
index aaa3323..ce6d2fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
@@ -29,7 +29,6 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
@@ -90,8 +89,6 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra
@Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
- ccfg.setMemoryMode(CacheMemoryMode.ONHEAP_TIERED);
-
ccfg.setOffHeapMaxMemory(512);
ccfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java
index 7f5352b..6debaa0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
import org.apache.ignite.configuration.CacheConfiguration;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
index 5f5f903..254cb9b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.Event;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
index fa24af5..725b226 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteQueue;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CollectionConfiguration;
@@ -37,7 +36,6 @@ import org.apache.ignite.internal.util.typedef.PAX;
import org.apache.ignite.testframework.GridTestUtils;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
index 81781f9..a48c3e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteQueue;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CollectionConfiguration;
import org.apache.ignite.internal.IgniteKernal;
@@ -34,7 +33,6 @@ import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.resources.IgniteInstanceResource;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueMultiNodeAbstractSelfTest.AddAllJob;
import static org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueMultiNodeAbstractSelfTest.QUEUE_CAPACITY;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
index f3ddf68..769896f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.datastructures;
import org.apache.ignite.IgniteQueue;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.CollectionConfiguration;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
index 9cfe1b3..21c7690 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
@@ -35,7 +35,6 @@ import org.apache.ignite.IgniteLock;
import org.apache.ignite.IgniteSemaphore;
import org.apache.ignite.IgniteSet;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.AtomicConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -44,7 +43,6 @@ import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.testframework.GridTestUtils;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
index d783fc0..38af30e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicQueueApiSelfTest.java
@@ -18,10 +18,8 @@
package org.apache.ignite.internal.processors.cache.datastructures.local;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
/**
* Queue tests with local atomic cache.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
index 8130317..a1f045d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalAtomicSetSelfTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.local;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheSetAbstractSelfTest;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.LOCAL;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
index ef24586..780cb08 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalQueueApiSelfTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.local;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueApiSelfAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.LOCAL;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
index e9a7269..7c37360 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/GridCacheLocalSetSelfTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.local;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheSetAbstractSelfTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.LOCAL;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
index b19d140..690f6b3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueApiSelfTest.java
@@ -18,10 +18,8 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
/**
* Queue tests with partitioned atomic cache.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
index aa1b615..59d43a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.java
@@ -18,10 +18,8 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
/**
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
index 458f77f..5a67024 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.java
@@ -18,11 +18,9 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheAbstractQueueFailoverDataConsistencySelfTest;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
/**
* Queue failover test for atomic cache.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
index 176bbdd..37dbfa1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicQueueRotativeMultiNodeTest.java
@@ -18,10 +18,8 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
/**
* Sequence multi node tests.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
index 37ded21..c2af2b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
@@ -18,11 +18,9 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheSetFailoverAbstractSelfTest;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
/**
* Set failover tests.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
index a8c34a7..ecb2df9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedDataStructuresFailoverSelfTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheAbstractDataStructuresFailoverSelfTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
index d827008..3c14a88 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueApiSelfTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueApiSelfAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
index 114695b..cbfee5a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
@@ -26,7 +26,6 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteQueue;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -38,7 +37,6 @@ import org.apache.ignite.transactions.Transaction;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
index ef8ffb1..e9c1fd7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
@@ -26,7 +26,6 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteQueue;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.AffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
@@ -41,7 +40,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
index f3071cb..694dd0b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueFailoverDataConsistencySelfTest.java
@@ -18,11 +18,9 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheAbstractQueueFailoverDataConsistencySelfTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
/**
* Queue failover test for transactional cache.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
index 799d80e..5edf7ca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueJoinedNodeSelfTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueJoinedNodeSelfAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
index eeec4eb..82ef404 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueMultiNodeSelfTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueMultiNodeAbstractSelfTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
index 2dcf5fb..8b112c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueRotativeMultiNodeTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueRotativeMultiNodeAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
index 2c62124..ec57dea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
@@ -18,11 +18,9 @@
package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheSetFailoverAbstractSelfTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
/**
* Set failover tests.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
index efd9f91..67b7f8f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
import java.util.UUID;
import org.apache.ignite.IgniteQueue;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CollectionConfiguration;
import org.apache.ignite.internal.IgniteKernal;
@@ -30,7 +29,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
import org.apache.ignite.testframework.GridTestUtils;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
index 04f1052..b093d12 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.replicated;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheAbstractDataStructuresFailoverSelfTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
index 8ef0f6a..74c8af1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueMultiNodeSelfTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.replicated;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueMultiNodeAbstractSelfTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
index cbee206..934bbd2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedQueueRotativeMultiNodeTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.replicated;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueRotativeMultiNodeAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
index a780aa9..fe6fd3e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedSetSelfTest.java
@@ -18,12 +18,10 @@
package org.apache.ignite.internal.processors.cache.datastructures.replicated;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.datastructures.GridCacheSetAbstractSelfTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index e2cf734..455fc21 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
@@ -100,6 +101,9 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
protected CacheRebalanceMode rebalancMode = ASYNC;
/** */
+ protected boolean evict = false;
+
+ /** */
protected int rebalancBatchSize = DFLT_BATCH_SIZE;
/** Number of partitions. */
@@ -115,9 +119,6 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
private int retries = DFLT_RETRIES;
/** */
- private GridTestUtils.TestMemoryMode memMode = GridTestUtils.TestMemoryMode.HEAP;
-
- /** */
private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** {@inheritDoc} */
@@ -139,7 +140,13 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
CacheConfiguration ccfg = cacheConfiguration();
- GridTestUtils.setMemoryMode(c, ccfg, memMode, 100, 1024);
+ if (evict) {
+ LruEvictionPolicy plc = new LruEvictionPolicy();
+
+ plc.setMaxSize(100);
+
+ ccfg.setEvictionPolicy(plc);
+ }
c.setCacheConfiguration(ccfg);
@@ -166,6 +173,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
backups = DFLT_BACKUPS;
partitions = DFLT_PARTITIONS;
rebalancMode = ASYNC;
+ evict = false;
rebalancBatchSize = DFLT_BATCH_SIZE;
nodeCnt = DFLT_NODE_CNT;
keyCnt = DFLT_KEY_CNT;
@@ -188,7 +196,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
/**
* @throws Exception If failed.
*/
- private void startGrids() throws Exception {
+ private void startGrids() throws Exception {
for (int i = 0; i < nodeCnt; i++) {
startGrid(i);
@@ -282,6 +290,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 30000;
@@ -297,6 +306,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 30000;
@@ -312,6 +322,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 30000;
@@ -327,6 +338,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 30000;
@@ -342,6 +354,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 60000;
@@ -357,6 +370,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 60000;
@@ -372,6 +386,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 60000;
@@ -381,52 +396,15 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
/**
* @throws Exception If failed.
*/
- public void testRestartWithPutFourNodesOneBackupsSwap() throws Throwable {
- restartWithPutFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode.SWAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRestartWithPutFourNodesOneBackupsOffheapTiered() throws Throwable {
- restartWithPutFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode.OFFHEAP_TIERED);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRestartWithPutFourNodesOneBackupsOffheapTieredSwap() throws Throwable {
- restartWithPutFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode.OFFHEAP_TIERED_SWAP);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testRestartWithPutFourNodesOneBackupsOffheapEvict() throws Throwable {
- restartWithPutFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode.OFFHEAP_EVICT);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRestartWithPutFourNodesOneBackupsOffheapEvictSwap() throws Throwable {
- restartWithPutFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode.OFFHEAP_EVICT_SWAP);
- }
-
- /**
- * @param memMode Memory mode.
- * @throws Throwable If failed.
- */
- private void restartWithPutFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode memMode)
- throws Throwable {
backups = 1;
nodeCnt = 4;
- keyCnt = 100_000;
+ keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
- this.memMode = memMode;
+ evict = true;
- long duration = 30_000;
+ long duration = 60000;
checkRestartWithPut(duration, 2, 2);
}
@@ -440,6 +418,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 60000;
@@ -449,49 +428,13 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
/**
* @throws Exception If failed.
*/
- public void testRestartWithTxFourNodesOneBackupsSwap() throws Throwable {
- restartWithTxFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode.SWAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRestartWithTxFourNodesOneBackupsOffheapTiered() throws Throwable {
- restartWithTxFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode.OFFHEAP_TIERED);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRestartWithTxFourNodesOneBackupsOffheapTieredSwap() throws Throwable {
- restartWithTxFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode.OFFHEAP_TIERED_SWAP);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testRestartWithTxFourNodesOneBackupsOffheapEvict() throws Throwable {
- restartWithTxFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode.OFFHEAP_EVICT);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testRestartWithTxFourNodesOneBackupsOffheapEvictSwap() throws Throwable {
- restartWithTxFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode.OFFHEAP_EVICT_SWAP);
- }
-
- /**
- * @param memMode Memory mode.
- * @throws Throwable If failed.
- */
- private void restartWithTxFourNodesOneBackupsWithMemoryMode(GridTestUtils.TestMemoryMode memMode) throws Throwable {
backups = 1;
nodeCnt = 4;
keyCnt = 100_000;
partitions = 29;
rebalancMode = ASYNC;
- this.memMode = memMode;
+ evict = true;
long duration = 30_000;
@@ -507,6 +450,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 90000;
@@ -522,6 +466,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 90000;
@@ -537,6 +482,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 90000;
@@ -552,6 +498,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 90000;
@@ -567,6 +514,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 90000;
@@ -582,6 +530,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 90000;
@@ -597,6 +546,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 90000;
@@ -612,6 +562,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
keyCnt = 10;
partitions = 29;
rebalancMode = ASYNC;
+ evict = false;
long duration = 90000;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
index 37ed866..6b62912 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
@@ -35,9 +35,4 @@ public class IgniteCacheAtomicNodeRestartTest extends GridCachePartitionedNodeRe
@Override public void testRestartWithPutFourNodesNoBackups() {
fail("https://issues.apache.org/jira/browse/IGNITE-1587");
}
-
- /** {@inheritDoc} */
- @Override public void testRestartWithPutFourNodesOneBackupsOffheapTiered() {
- fail("https://issues.apache.org/jira/browse/IGNITE-1587");
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
index 2d9442c..ff9425e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
@@ -62,7 +61,6 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
private CacheConfiguration<String, TestClass> cacheConfiguration(
CacheMode mode,
CacheAtomicityMode atomMode,
- CacheMemoryMode memMode,
boolean nearEnabled,
boolean useEvictPlc
) {
@@ -70,14 +68,12 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
ccfg.setAtomicityMode(atomMode);
ccfg.setCacheMode(mode);
- ccfg.setMemoryMode(memMode);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
if (nearEnabled)
ccfg.setNearConfiguration(new NearCacheConfiguration<String, TestClass>());
- if (memMode == CacheMemoryMode.ONHEAP_TIERED && useEvictPlc) {
- ccfg.setOffHeapMaxMemory(10 * 1024 * 1024);
+ if (useEvictPlc) {
ccfg.setEvictionPolicy(new FifoEvictionPolicy(50));
}
@@ -107,17 +103,14 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
try {
for (CacheMode mode : CacheMode.values()) {
for (CacheAtomicityMode atomMode : CacheAtomicityMode.values()) {
- for (CacheMemoryMode memMode : CacheMemoryMode.values()) {
- if (mode == CacheMode.PARTITIONED) {
- // Near cache makes sense only for partitioned cache.
- checkTxCache(CacheMode.PARTITIONED, atomMode, memMode, true, false);
- }
+ if (mode == CacheMode.PARTITIONED) {
+ // Near cache makes sense only for partitioned cache.
+ checkTxCache(CacheMode.PARTITIONED, atomMode, true, false);
+ }
- if (memMode == CacheMemoryMode.ONHEAP_TIERED)
- checkTxCache(mode, atomMode, CacheMemoryMode.ONHEAP_TIERED, false, true);
+ checkTxCache(CacheMode.PARTITIONED, atomMode, false, true);
- checkTxCache(mode, atomMode, memMode, false, false);
- }
+ checkTxCache(CacheMode.PARTITIONED, atomMode, false, false);
}
}
}
@@ -132,7 +125,6 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
private void checkTxCache(
CacheMode mode,
CacheAtomicityMode atomMode,
- CacheMemoryMode memMode,
boolean nearEnabled,
boolean useEvicPlc
) throws Exception {
@@ -141,14 +133,13 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
final CacheConfiguration<String, TestClass> ccfg = cacheConfiguration(
mode,
atomMode,
- memMode,
nearEnabled,
useEvicPlc);
final IgniteCache<String, TestClass> cache = ignite.createCache(ccfg);
- info("Checking cache [mode=" + mode + ", atomMode=" + atomMode + ", memMode=" + memMode +
- ", near=" + nearEnabled + ']');
+ info("Checking cache [mode=" + mode + ", atomMode=" + atomMode + ", near=" + nearEnabled +
+ ", evict=" + useEvicPlc + ']');
try {
for (int i = 0; i < 30; i++) {
@@ -213,8 +204,10 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
*/
@Override
public boolean equals(final Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
final TestClass testCls = (TestClass)o;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
index f720db3..ca7b3ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
@@ -24,7 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -38,7 +37,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
/**
@@ -71,14 +69,14 @@ public class IgniteCacheConcurrentPutGetRemove extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testPutGetRemoveAtomic() throws Exception {
- putGetRemove(cacheConfiguration(ATOMIC, ONHEAP_TIERED, 1));
+ putGetRemove(cacheConfiguration(ATOMIC, 1));
}
/**
* @throws Exception If failed.
*/
public void testPutGetRemoveTx() throws Exception {
- putGetRemove(cacheConfiguration(TRANSACTIONAL, ONHEAP_TIERED, 1));
+ putGetRemove(cacheConfiguration(TRANSACTIONAL, 1));
}
/**
@@ -166,17 +164,13 @@ public class IgniteCacheConcurrentPutGetRemove extends GridCommonAbstractTest {
/**
* @param atomicityMode Cache atomicity mode.
- * @param memoryMode Cache memory mode.
* @param backups Backups number.
* @return Cache configuration.
*/
- private CacheConfiguration cacheConfiguration(CacheAtomicityMode atomicityMode,
- CacheMemoryMode memoryMode,
- int backups) {
+ private CacheConfiguration cacheConfiguration(CacheAtomicityMode atomicityMode, int backups) {
CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setAtomicityMode(atomicityMode);
- ccfg.setMemoryMode(memoryMode);
ccfg.setBackups(backups);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
index 9a1aaff..0831d1e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
@@ -53,9 +53,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-import static org.apache.ignite.testframework.GridTestUtils.TestMemoryMode;
import static org.apache.ignite.testframework.GridTestUtils.runMultiThreadedAsync;
-import static org.apache.ignite.testframework.GridTestUtils.setMemoryMode;
import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
@@ -115,13 +113,11 @@ public class IgniteCacheCrossCacheTxFailoverTest extends GridCommonAbstractTest
* @param name Cache name.
* @param cacheMode Cache mode.
* @param parts Number of partitions.
- * @param memMode Memory mode.
* @return Cache configuration.
*/
private CacheConfiguration cacheConfiguration(String name,
CacheMode cacheMode,
- int parts,
- TestMemoryMode memMode) {
+ int parts) {
CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setName(name);
@@ -134,8 +130,6 @@ public class IgniteCacheCrossCacheTxFailoverTest extends GridCommonAbstractTest
ccfg.setAffinity(new RendezvousAffinityFunction(false, parts));
- setMemoryMode(null, ccfg, memMode, 100, 1024);
-
return ccfg;
}
@@ -148,70 +142,56 @@ public class IgniteCacheCrossCacheTxFailoverTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
public void testCrossCachePessimisticTxFailover() throws Exception {
- crossCacheTxFailover(PARTITIONED, true, PESSIMISTIC, REPEATABLE_READ, TestMemoryMode.HEAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testCrossCachePessimisticTxFailoverOffheapSwap() throws Exception {
- crossCacheTxFailover(PARTITIONED, true, PESSIMISTIC, REPEATABLE_READ, TestMemoryMode.OFFHEAP_EVICT_SWAP);
+ crossCacheTxFailover(PARTITIONED, true, PESSIMISTIC, REPEATABLE_READ);
}
/**
* @throws Exception If failed.
*/
public void testCrossCachePessimisticTxFailoverDifferentAffinity() throws Exception {
- crossCacheTxFailover(PARTITIONED, false, PESSIMISTIC, REPEATABLE_READ, TestMemoryMode.HEAP);
+ crossCacheTxFailover(PARTITIONED, false, PESSIMISTIC, REPEATABLE_READ);
}
/**
* @throws Exception If failed.
*/
public void testCrossCacheOptimisticTxFailover() throws Exception {
- crossCacheTxFailover(PARTITIONED, true, OPTIMISTIC, REPEATABLE_READ, TestMemoryMode.HEAP);
+ crossCacheTxFailover(PARTITIONED, true, OPTIMISTIC, REPEATABLE_READ);
}
/**
* @throws Exception If failed.
*/
public void testCrossCacheOptimisticSerializableTxFailover() throws Exception {
- crossCacheTxFailover(PARTITIONED, true, OPTIMISTIC, SERIALIZABLE, TestMemoryMode.HEAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testCrossCacheOptimisticTxFailoverOffheapSwap() throws Exception {
- crossCacheTxFailover(PARTITIONED, true, OPTIMISTIC, REPEATABLE_READ, TestMemoryMode.OFFHEAP_EVICT_SWAP);
+ crossCacheTxFailover(PARTITIONED, true, OPTIMISTIC, SERIALIZABLE);
}
/**
* @throws Exception If failed.
*/
public void testCrossCacheOptimisticTxFailoverDifferentAffinity() throws Exception {
- crossCacheTxFailover(PARTITIONED, false, OPTIMISTIC, REPEATABLE_READ, TestMemoryMode.HEAP);
+ crossCacheTxFailover(PARTITIONED, false, OPTIMISTIC, REPEATABLE_READ);
}
/**
* @throws Exception If failed.
*/
public void testCrossCachePessimisticTxFailoverReplicated() throws Exception {
- crossCacheTxFailover(REPLICATED, true, PESSIMISTIC, REPEATABLE_READ, TestMemoryMode.HEAP);
+ crossCacheTxFailover(REPLICATED, true, PESSIMISTIC, REPEATABLE_READ);
}
/**
* @throws Exception If failed.
*/
public void testCrossCacheOptimisticTxFailoverReplicated() throws Exception {
- crossCacheTxFailover(REPLICATED, true, OPTIMISTIC, REPEATABLE_READ, TestMemoryMode.HEAP);
+ crossCacheTxFailover(REPLICATED, true, OPTIMISTIC, REPEATABLE_READ);
}
/**
* @throws Exception If failed.
*/
public void testCrossCachePessimisticTxFailoverDifferentAffinityReplicated() throws Exception {
- crossCacheTxFailover(PARTITIONED, false, PESSIMISTIC, REPEATABLE_READ, TestMemoryMode.HEAP);
+ crossCacheTxFailover(PARTITIONED, false, PESSIMISTIC, REPEATABLE_READ);
}
/**
@@ -219,21 +199,19 @@ public class IgniteCacheCrossCacheTxFailoverTest extends GridCommonAbstractTest
* @param sameAff If {@code false} uses different number of partitions for caches.
* @param concurrency Transaction concurrency.
* @param isolation Transaction isolation.
- * @param memMode Memory mode.
* @throws Exception If failed.
*/
private void crossCacheTxFailover(CacheMode cacheMode,
boolean sameAff,
final TransactionConcurrency concurrency,
- final TransactionIsolation isolation,
- TestMemoryMode memMode) throws Exception {
+ final TransactionIsolation isolation) throws Exception {
IgniteKernal ignite0 = (IgniteKernal)ignite(0);
final AtomicBoolean stop = new AtomicBoolean();
try {
- ignite0.createCache(cacheConfiguration(CACHE1, cacheMode, 256, memMode));
- ignite0.createCache(cacheConfiguration(CACHE2, cacheMode, sameAff ? 256 : 128, memMode));
+ ignite0.createCache(cacheConfiguration(CACHE1, cacheMode, 256));
+ ignite0.createCache(cacheConfiguration(CACHE2, cacheMode, sameAff ? 256 : 128));
final AtomicInteger threadIdx = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
index 84a7905..a98b3a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.CachePartialUpdateException;
+import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.cache.store.CacheStoreAdapter;
import org.apache.ignite.configuration.AtomicConfiguration;
@@ -53,7 +54,6 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
@@ -61,7 +61,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager.DEFERRED_ONE_PHASE_COMMIT_ACK_REQUEST_TIMEOUT;
-import static org.apache.ignite.testframework.GridTestUtils.TestMemoryMode;
import static org.apache.ignite.testframework.GridTestUtils.runAsync;
/**
@@ -85,13 +84,13 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
}
/**
- * @param memMode Memory mode.
+ * @param evict If {@code true} adds eviction policy.
* @param store If {@code true} adds cache store.
* @return Cache configuration.
* @throws Exception If failed.
*/
@SuppressWarnings("unchecked")
- protected CacheConfiguration cacheConfiguration(TestMemoryMode memMode, boolean store) throws Exception {
+ protected CacheConfiguration cacheConfiguration(boolean evict, boolean store) throws Exception {
CacheConfiguration cfg = new CacheConfiguration();
cfg.setAtomicityMode(atomicityMode());
@@ -100,13 +99,19 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
cfg.setBackups(1);
cfg.setRebalanceMode(SYNC);
+ if (evict) {
+ LruEvictionPolicy plc = new LruEvictionPolicy();
+
+ plc.setMaxSize(100);
+
+ cfg.setEvictionPolicy(plc);
+ }
+
if (store) {
cfg.setCacheStoreFactory(new TestStoreFactory());
cfg.setWriteThrough(true);
}
- GridTestUtils.setMemoryMode(null, cfg, memMode, 100, 1024);
-
return cfg;
}
@@ -173,80 +178,80 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
* @throws Exception If failed.
*/
public void testPut() throws Exception {
- checkRetry(Test.PUT, TestMemoryMode.HEAP, false);
+ checkRetry(Test.PUT, false, false);
}
/**
* @throws Exception If failed.
*/
public void testGetAndPut() throws Exception {
- checkRetry(Test.GET_AND_PUT, TestMemoryMode.HEAP, false);
+ checkRetry(Test.GET_AND_PUT, false, false);
}
/**
* @throws Exception If failed.
*/
public void testPutStoreEnabled() throws Exception {
- checkRetry(Test.PUT, TestMemoryMode.HEAP, true);
+ checkRetry(Test.PUT, false, true);
}
/**
* @throws Exception If failed.
*/
public void testPutAll() throws Exception {
- checkRetry(Test.PUT_ALL, TestMemoryMode.HEAP, false);
+ checkRetry(Test.PUT_ALL, false, false);
}
/**
* @throws Exception If failed.
*/
public void testPutAsync() throws Exception {
- checkRetry(Test.PUT_ASYNC, TestMemoryMode.HEAP, false);
+ checkRetry(Test.PUT_ASYNC, false, false);
}
/**
* @throws Exception If failed.
*/
public void testPutAsyncStoreEnabled() throws Exception {
- checkRetry(Test.PUT_ASYNC, TestMemoryMode.HEAP, true);
+ checkRetry(Test.PUT_ASYNC, false, true);
}
/**
* @throws Exception If failed.
*/
public void testInvoke() throws Exception {
- checkRetry(Test.INVOKE, TestMemoryMode.HEAP, false);
+ checkRetry(Test.INVOKE, false, false);
}
/**
* @throws Exception If failed.
*/
public void testInvokeAll() throws Exception {
- checkRetry(Test.INVOKE_ALL, TestMemoryMode.HEAP, false);
+ checkRetry(Test.INVOKE_ALL, false, false);
}
/**
* @throws Exception If failed.
*/
public void testInvokeAllOffheapSwap() throws Exception {
- checkRetry(Test.INVOKE_ALL, TestMemoryMode.OFFHEAP_EVICT_SWAP, false);
+ checkRetry(Test.INVOKE_ALL, true, false);
}
/**
* @throws Exception If failed.
*/
public void testInvokeAllOffheapTiered() throws Exception {
- checkRetry(Test.INVOKE_ALL, TestMemoryMode.OFFHEAP_TIERED, false);
+ checkRetry(Test.INVOKE_ALL, true, false);
}
/**
* @param test Test type.
- * @param memMode Memory mode.
+ * @param evict If {@code true} uses eviction policy
* @param store If {@code true} uses cache with store.
* @throws Exception If failed.
*/
- protected final void checkRetry(Test test, TestMemoryMode memMode, boolean store) throws Exception {
- ignite(0).createCache(cacheConfiguration(memMode, store));
+ protected final void checkRetry(Test test, boolean evict, boolean store) throws Exception {
+ ignite(0).createCache(cacheConfiguration(evict, store));
final AtomicBoolean finished = new AtomicBoolean();
@@ -528,7 +533,7 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
* @throws Exception If failed.
*/
private void checkFailsWithNoRetries(boolean async) throws Exception {
- ignite(0).createCache(cacheConfiguration(TestMemoryMode.HEAP, false));
+ ignite(0).createCache(cacheConfiguration(false, false));
final AtomicBoolean finished = new AtomicBoolean();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAtomicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAtomicSelfTest.java
index 3d7c7d7..8f5b88d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAtomicSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAtomicSelfTest.java
@@ -47,7 +47,7 @@ public class IgniteCachePutRetryAtomicSelfTest extends IgniteCachePutRetryAbstra
* @throws Exception If failed.
*/
public void testPutInsideTransaction() throws Exception {
- ignite(0).createCache(cacheConfiguration(GridTestUtils.TestMemoryMode.HEAP, false));
+ ignite(0).createCache(cacheConfiguration(false, false));
CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java
index 7460828..b439bcc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryTransactionalSelfTest.java
@@ -36,7 +36,6 @@ import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.util.typedef.internal.U;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.testframework.GridTestUtils.TestMemoryMode;
import static org.apache.ignite.testframework.GridTestUtils.runAsync;
import static org.apache.ignite.testframework.GridTestUtils.runMultiThreadedAsync;
@@ -93,52 +92,45 @@ public class IgniteCachePutRetryTransactionalSelfTest extends IgniteCachePutRetr
* @throws Exception If failed.
*/
public void testExplicitTransactionRetriesSingleValue() throws Exception {
- checkRetry(Test.TX_PUT, TestMemoryMode.HEAP, false);
+ checkRetry(Test.TX_PUT, false, false);
}
/**
* @throws Exception If failed.
*/
public void testExplicitTransactionRetriesSingleValueStoreEnabled() throws Exception {
- checkRetry(Test.TX_PUT, TestMemoryMode.HEAP, true);
+ checkRetry(Test.TX_PUT, false, true);
}
/**
* @throws Exception If failed.
*/
public void testExplicitTransactionRetries() throws Exception {
- explicitTransactionRetries(TestMemoryMode.HEAP, false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testExplicitTransactionRetriesSingleOperation() throws Exception {
- explicitTransactionRetries(TestMemoryMode.HEAP, false);
+ explicitTransactionRetries(false, false);
}
/**
* @throws Exception If failed.
*/
public void testExplicitTransactionRetriesStoreEnabled() throws Exception {
- explicitTransactionRetries(TestMemoryMode.HEAP, true);
+ explicitTransactionRetries(false, true);
}
/**
* @throws Exception If failed.
*/
- public void testExplicitTransactionRetriesOffheapSwap() throws Exception {
- explicitTransactionRetries(TestMemoryMode.OFFHEAP_EVICT_SWAP, false);
+ public void testExplicitTransactionRetriesEvictionEnabled() throws Exception {
+ explicitTransactionRetries(true, false);
}
/**
- * @param memMode Memory mode.
+ * @param evict If {@code true} uses cache with eviction policy.
* @param store If {@code true} uses cache with store.
* @throws Exception If failed.
*/
@SuppressWarnings("unchecked")
- public void explicitTransactionRetries(TestMemoryMode memMode, boolean store) throws Exception {
- ignite(0).createCache(cacheConfiguration(memMode, store));
+ public void explicitTransactionRetries(boolean evict, boolean store) throws Exception {
+ ignite(0).createCache(cacheConfiguration(evict, store));
final AtomicInteger idx = new AtomicInteger();
int threads = 8;
@@ -211,7 +203,7 @@ public class IgniteCachePutRetryTransactionalSelfTest extends IgniteCachePutRetr
* @throws Exception If failed.
*/
public void testOriginatingNodeFailureForcesOnePhaseCommitDataCleanup() throws Exception {
- ignite(0).createCache(cacheConfiguration(TestMemoryMode.HEAP, false));
+ ignite(0).createCache(cacheConfiguration(false, false));
final AtomicBoolean finished = new AtomicBoolean();
[10/53] [abbrv] ignite git commit: ignite-4535 : Redesigned semantics
of GridDhtLocalPartitions#size() and #publicSize() methods.
Posted by ag...@apache.org.
ignite-4535 : Redesigned semantics of GridDhtLocalPartitions#size() and #publicSize() methods.
(cherry picked from commit dd3884d)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5ccfe36
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5ccfe36
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5ccfe36
Branch: refs/heads/ignite-3477-master
Commit: b5ccfe365ff1a1f1ef949b7505f6058b772671c7
Parents: 141064e
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Tue Mar 21 17:42:06 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Mar 30 16:20:38 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheConcurrentMap.java | 2 ++
.../processors/cache/IgniteCacheOffheapManagerImpl.java | 6 +++---
.../cache/distributed/GridDistributedCacheAdapter.java | 2 +-
.../cache/distributed/dht/GridDhtLocalPartition.java | 6 +++---
.../cache/distributed/dht/GridDhtPartitionTopologyImpl.java | 2 +-
.../processors/cache/CacheDeferredDeleteQueueTest.java | 2 +-
.../cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java | 2 +-
7 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5ccfe36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index 408b64a..cd7c031 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -62,6 +62,7 @@ public interface GridCacheConcurrentMap {
/**
* Returns the number of key-value mappings in this map.
+ * It does not include entries from underlying data store.
*
* @return the number of key-value mappings in this map.
*/
@@ -70,6 +71,7 @@ public interface GridCacheConcurrentMap {
/**
* Returns the number of publicly available key-value mappings in this map.
* It excludes entries that are marked as deleted.
+ * It also does not include entries from underlying data store.
*
* @return the number of publicly available key-value mappings in this map.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5ccfe36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 156911b..ef086bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -262,7 +262,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
for (GridDhtLocalPartition locPart : cctx.topology().currentLocalPartitions()) {
if (primary) {
if (cctx.affinity().primaryByPartition(locNode, locPart.id(), topVer)) {
- cnt += locPart.size();
+ cnt += locPart.dataStore().size();
continue;
}
@@ -270,7 +270,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
if (backup) {
if (cctx.affinity().backupByPartition(locNode, locPart.id(), topVer))
- cnt += locPart.size();
+ cnt += locPart.dataStore().size();
}
}
@@ -288,7 +288,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
else {
GridDhtLocalPartition locPart = cctx.topology().localPartition(part, AffinityTopologyVersion.NONE, false);
- return locPart == null ? 0 : locPart.size();
+ return locPart == null ? 0 : locPart.dataStore().size();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5ccfe36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index dbe267d..096ca9f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -283,7 +283,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter
else if (modes.heap) {
for (GridDhtLocalPartition locPart : ctx.topology().currentLocalPartitions()) {
if ((modes.primary && locPart.primary(topVer)) || (modes.backup && locPart.backup(topVer)))
- size += locPart.entrySet().size();
+ size += locPart.publicSize();
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5ccfe36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 05bfdfe..cff533e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -253,7 +253,7 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
if (cctx.allowFastEviction())
return map.size() == 0;
- return size() == 0 && map.size() == 0;
+ return store.size() == 0 && map.size() == 0;
}
/**
@@ -296,12 +296,12 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
/** {@inheritDoc} */
@Override public int size() {
- return (int)store.size();
+ return map.size();
}
/** {@inheritDoc} */
@Override public int publicSize() {
- return (int)store.size();
+ return map.publicSize();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5ccfe36/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 38252ef..8c19e50 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -1960,7 +1960,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
if (part == null)
continue;
- int size = part.size();
+ int size = part.dataStore().size();
if (size >= threshold)
X.println(">>> Local partition [part=" + part.id() + ", size=" + size + ']');
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5ccfe36/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
index b764d5b..37d3f4d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
@@ -116,7 +116,7 @@ public class CacheDeferredDeleteQueueTest extends GridCommonAbstractTest {
for (GridDhtLocalPartition p : top.currentLocalPartitions()) {
Collection<Object> rmvQueue = GridTestUtils.getFieldValue(p, "rmvQueue");
- if (!rmvQueue.isEmpty() || p.size() != 0)
+ if (!rmvQueue.isEmpty() || p.dataStore().size() != 0)
return false;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5ccfe36/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
index 32c31d3..1da94d4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
@@ -76,7 +76,7 @@ public class CacheDhtLocalPartitionAfterRemoveSelfTest extends GridCommonAbstrac
cache = grid(g).cache(null);
for (GridDhtLocalPartition p : dht(cache).topology().localPartitions()) {
- int size = p.size();
+ int size = p.dataStore().size();
assertTrue("Unexpected size: " + size, size <= 32);
}
[29/53] [abbrv] ignite git commit: Merge branches
'ignite-4535-master' and 'ignite-4851' of
https://github.com/gridgain/apache-ignite into ignite-4851
Posted by ag...@apache.org.
Merge branches 'ignite-4535-master' and 'ignite-4851' of https://github.com/gridgain/apache-ignite into ignite-4851
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/17bc34d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/17bc34d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/17bc34d7
Branch: refs/heads/ignite-3477-master
Commit: 17bc34d7b5426388b9fed9b605b392afe9894ed7
Parents: 89c2ebb 0a39212
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Wed Apr 5 12:45:13 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Wed Apr 5 12:45:13 2017 +0300
----------------------------------------------------------------------
...ryDuplicateIndexObjectsAbstractSelfTest.java | 161 -------------------
...ateIndexObjectPartitionedAtomicSelfTest.java | 38 -----
...xObjectPartitionedTransactionalSelfTest.java | 41 -----
...eRebalancingUnmarshallingFailedSelfTest.java | 6 +-
.../processors/query/h2/IgniteH2Indexing.java | 8 +-
.../IgniteBinaryCacheQueryTestSuite.java | 5 -
.../Cache/CacheConfigurationTest.cs | 9 --
.../IgniteConfigurationSerializerTest.cs | 2 -
.../Cache/Configuration/CacheConfiguration.cs | 23 ---
9 files changed, 9 insertions(+), 284 deletions(-)
----------------------------------------------------------------------
[41/53] [abbrv] ignite git commit: Merge branches
'ignite-4535-master' and 'ignite-4851' of
https://github.com/gridgain/apache-ignite into ignite-4851
Posted by ag...@apache.org.
Merge branches 'ignite-4535-master' and 'ignite-4851' of https://github.com/gridgain/apache-ignite into ignite-4851
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d79a40d4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d79a40d4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d79a40d4
Branch: refs/heads/ignite-3477-master
Commit: d79a40d482b0270c3c5a737858991fc10dea674f
Parents: 2999d99 5157bc8
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Apr 7 15:50:07 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Apr 7 15:50:07 2017 +0300
----------------------------------------------------------------------
.../communication/GridIoMessageFactory.java | 12 -
.../cache/GridCacheEvictionManager.java | 226 ------------
.../cache/GridCacheEvictionRequest.java | 248 -------------
.../cache/GridCacheEvictionResponse.java | 225 ------------
.../processors/cache/GridCacheIoManager.java | 14 -
.../cache/GridCacheAbstractFullApiSelfTest.java | 1 +
.../GridCacheEvictionEventAbstractTest.java | 2 -
.../dht/GridCacheDhtEvictionSelfTest.java | 352 -------------------
...NearDisabledAtomicOnheapFullApiSelfTest.java | 10 +
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 4 -
.../GridCacheAtomicOnheapFullApiSelfTest.java | 28 ++
...cheAtomicOnheapMultiNodeFullApiSelfTest.java | 26 ++
...cPrimaryWriteOrderOnheapFullApiSelfTest.java | 28 ++
...riteOrderOnheapMultiNodeFullApiSelfTest.java | 29 ++
...ePartitionedAtomicOnheapFullApiSelfTest.java | 10 +
...acheAtomicOnheapMultiJvmFullApiSelfTest.java | 4 +-
...WriteOrderOnheapMultiJvmFullApiSelfTest.java | 29 ++
.../ConfigVariationsTestSuiteBuilderTest.java | 4 +-
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 2 +
.../IgniteCacheFullApiSelfTestSuite.java | 8 +
.../testsuites/IgniteCacheTestSuite2.java | 2 -
21 files changed, 175 insertions(+), 1089 deletions(-)
----------------------------------------------------------------------
[48/53] [abbrv] ignite git commit: ignite-3477 : Fixed incorrect
key.partition() values in SupplyMessage.
Posted by ag...@apache.org.
ignite-3477 : Fixed incorrect key.partition() values in SupplyMessage.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb63d253
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb63d253
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb63d253
Branch: refs/heads/ignite-3477-master
Commit: fb63d2538279c74f7ab2fc012e4d829fb1f912f0
Parents: 7102d53
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 10 17:07:26 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 10 17:07:26 2017 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheOffheapManagerImpl.java | 45 +++++++++++---------
1 file changed, 26 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fb63d253/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 9b10d71..4306703 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -268,7 +268,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
/** {@inheritDoc} */
@Override public long entriesCount(int part) {
- if (cctx.isLocal()){
+ if (cctx.isLocal()) {
assert part == 0;
return locCacheDataStore.size();
@@ -726,7 +726,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
throws IgniteCheckedException {
final long rootPage = allocateForTree();
- CacheDataRowStore rowStore = new CacheDataRowStore(cctx, cctx.freeList());
+ CacheDataRowStore rowStore = new CacheDataRowStore(cctx, cctx.freeList(), p);
String idxName = treeName(p);
@@ -965,8 +965,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
CacheObject val,
GridCacheVersion ver,
long expireTime,
- @Nullable CacheDataRow oldRow) throws IgniteCheckedException
- {
+ @Nullable CacheDataRow oldRow) throws IgniteCheckedException {
DataRow dataRow = new DataRow(key, val, ver, partId, expireTime);
if (canUpdateOldRow(oldRow, dataRow) && rowStore.updateRow(oldRow.link(), dataRow))
@@ -1234,7 +1233,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
KeyCacheObject key,
CacheObject oldVal,
CacheObject newVal
- ) throws IgniteCheckedException {
+ ) throws IgniteCheckedException {
// In case we deal with IGFS cache, count updated data
if (cctx.cache().isIgfsDataCache() &&
!cctx.isNear() &&
@@ -1310,7 +1309,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
*/
private class DataRow extends CacheDataRowAdapter {
/** */
- protected int part = -1;
+ protected int part;
/** */
protected int hash;
@@ -1320,12 +1319,12 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
* @param link Link.
* @param rowData Required row data.
*/
- DataRow(int hash, long link, CacheDataRowAdapter.RowData rowData) {
+ DataRow(int hash, long link, int part, CacheDataRowAdapter.RowData rowData) {
super(link);
this.hash = hash;
- part = PageIdUtils.partId(link);
+ this.part = part;
try {
// We can not init data row lazily because underlying buffer can be concurrently cleared.
@@ -1334,6 +1333,9 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
catch (IgniteCheckedException e) {
throw new IgniteException(e);
}
+
+ if (key != null)
+ key.partition(part);
}
/**
@@ -1398,14 +1400,14 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
boolean initNew
) throws IgniteCheckedException {
super(name,
- cctx.cacheId(),
- cctx.memoryPolicy().pageMemory(),
- cctx.shared().wal(),
- cctx.offheap().globalRemoveId(),
- metaPageId,
- reuseList,
- DataInnerIO.VERSIONS,
- DataLeafIO.VERSIONS);
+ cctx.cacheId(),
+ cctx.memoryPolicy().pageMemory(),
+ cctx.shared().wal(),
+ cctx.offheap().globalRemoveId(),
+ metaPageId,
+ reuseList,
+ DataInnerIO.VERSIONS,
+ DataLeafIO.VERSIONS);
assert rowStore != null;
@@ -1556,12 +1558,17 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
*
*/
protected class CacheDataRowStore extends RowStore {
+ /** */
+ private final int partId;
+
/**
* @param cctx Cache context.
* @param freeList Free list.
*/
- public CacheDataRowStore(GridCacheContext<?, ?> cctx, FreeList freeList) {
+ public CacheDataRowStore(GridCacheContext<?, ?> cctx, FreeList freeList, int partId) {
super(cctx, freeList);
+
+ this.partId = partId;
}
/**
@@ -1570,7 +1577,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
* @return Search row.
*/
private CacheSearchRow keySearchRow(int hash, long link) {
- return new DataRow(hash, link, CacheDataRowAdapter.RowData.KEY_ONLY);
+ return new DataRow(hash, link, partId, CacheDataRowAdapter.RowData.KEY_ONLY);
}
/**
@@ -1580,7 +1587,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
* @return Data row.
*/
private CacheDataRow dataRow(int hash, long link, CacheDataRowAdapter.RowData rowData) {
- return new DataRow(hash, link, rowData);
+ return new DataRow(hash, link, partId, rowData);
}
}
[43/53] [abbrv] ignite git commit: ignite-3477-master fix
GridCacheConditionalDeploymentSelfTest.testAddedDeploymentInfo
Posted by ag...@apache.org.
ignite-3477-master fix GridCacheConditionalDeploymentSelfTest.testAddedDeploymentInfo
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/782ff0a3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/782ff0a3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/782ff0a3
Branch: refs/heads/ignite-3477-master
Commit: 782ff0a39b154ab03b698155717a5cbaf6e3865b
Parents: 973f335
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Mon Apr 10 13:00:32 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Mon Apr 10 13:00:32 2017 +0300
----------------------------------------------------------------------
.../GridCacheConditionalDeploymentSelfTest.java | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/782ff0a3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
index 8fdd752..b26b582 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
@@ -29,6 +29,7 @@ import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.config.GridTestProperties;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -122,17 +123,23 @@ public class GridCacheConditionalDeploymentSelfTest extends GridCommonAbstractTe
* @throws Exception In case of error.
*/
public void testAddedDeploymentInfo() throws Exception {
- GridCacheIoManager ioMgr = cacheIoManager();
+ GridCacheContext ctx = cacheContext();
- TestMessage msg = new TestMessage();
+ if (grid(0).configuration().getMarshaller() instanceof BinaryMarshaller)
+ assertFalse(ctx.deploymentEnabled());
+ else {
+ GridCacheIoManager ioMgr = cacheIoManager();
- assertNull(msg.deployInfo());
+ TestMessage msg = new TestMessage();
- msg.addDepInfo = true;
+ assertNull(msg.deployInfo());
- IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, grid(1).cluster().localNode().id());
+ msg.addDepInfo = true;
- assertNotNull(msg.deployInfo());
+ IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, grid(1).cluster().localNode().id());
+
+ assertNotNull(msg.deployInfo());
+ }
}
/**
[47/53] [abbrv] ignite git commit:
GridCacheNearReadersSelfTest.testTwoNodesTwoKeysNoBackups fix
Posted by ag...@apache.org.
GridCacheNearReadersSelfTest.testTwoNodesTwoKeysNoBackups fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a1919d15
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a1919d15
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a1919d15
Branch: refs/heads/ignite-3477-master
Commit: a1919d154d0c7c23022b528afbbc525790964bf1
Parents: a7afb7f
Author: Konstantin Dudkov <kd...@ya.ru>
Authored: Mon Apr 10 17:02:55 2017 +0300
Committer: Konstantin Dudkov <kd...@ya.ru>
Committed: Mon Apr 10 17:02:55 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/near/GridCacheNearReadersSelfTest.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a1919d15/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index faf9ba2..07a406b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
+import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.internal.processors.cache.distributed.GridCacheModuloAffinityFunction;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
@@ -219,6 +220,9 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
try {
return !e1f.readers().contains(n2.id());
}
+ catch (GridCacheEntryRemovedException ignored) {
+ return true;
+ }
catch (Exception e) {
throw new RuntimeException(e);
}
@@ -226,7 +230,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
}, 5000);
// Node 1 still has node2 in readers map.
- assertFalse(e1.readers().contains(n2.id()));
+ assertFalse(((GridDhtCacheEntry)dht(cache1).entryEx(1)).readers().contains(n2.id()));
}
/** @throws Exception If failed. */
[53/53] [abbrv] ignite git commit: IGNITE-4851 - Fixed partition
destroy race
Posted by ag...@apache.org.
IGNITE-4851 - Fixed partition destroy race
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/baa3835e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/baa3835e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/baa3835e
Branch: refs/heads/ignite-3477-master
Commit: baa3835ee60f9c9a0c7229b78c4603504fb5e522
Parents: 54213d6 6e67866
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 10 18:55:00 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Apr 10 18:55:00 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 2 +-
.../cache/GridCacheConcurrentMap.java | 5 +-
.../cache/GridCacheConcurrentMapImpl.java | 218 +++++++++++--------
.../cache/GridCacheLocalConcurrentMap.java | 54 +++++
.../processors/cache/GridCacheMapEntry.java | 14 +-
.../dht/GridCachePartitionedConcurrentMap.java | 15 +-
.../distributed/dht/GridDhtLocalPartition.java | 204 ++++++++++++-----
.../distributed/near/GridNearCacheAdapter.java | 3 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 1 +
...ledAtomicOnheapMultiNodeFullApiSelfTest.java | 10 +
...nedAtomicOnheapMultiNodeFullApiSelfTest.java | 10 +
.../cache/hibernate/HibernateCacheProxy.java | 2 +-
.../cache/hibernate/HibernateCacheProxy.java | 2 +-
13 files changed, 380 insertions(+), 160 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/baa3835e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
index 10f5ca3,15a688b..0ef1fdb
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
@@@ -120,103 -116,148 +116,158 @@@ public abstract class GridCacheConcurre
GridCacheMapEntry doomed = null;
boolean done = false;
-
+ boolean reserved = false;
++ int sizeChange = 0;
- while (!done) {
- GridCacheMapEntry entry = map.get(key);
- created = null;
- doomed = null;
-
- if (entry == null) {
- if (create) {
- if (created0 == null)
- created0 = factory.create(ctx, topVer, key, key.hashCode(), val);
+ try {
+ while (!done) {
+ GridCacheMapEntry entry = map.get(key);
+ created = null;
+ doomed = null;
- cur = created = created0;
+ if (entry == null) {
+ if (create) {
+ if (created0 == null) {
+ if (!reserved) {
+ if (!reserve())
+ return null;
- done = map.putIfAbsent(created.key(), created) == null;
- }
- else
- done = true;
- }
- else {
- if (entry.obsolete()) {
- doomed = entry;
+ reserved = true;
+ }
- if (create) {
- if (created0 == null)
created0 = factory.create(ctx, topVer, key, key.hashCode(), val);
+ }
cur = created = created0;
- done = map.replace(entry.key(), doomed, created);
+ done = map.putIfAbsent(created.key(), created) == null;
}
else
- done = map.remove(entry.key(), doomed);
+ done = true;
}
else {
- cur = entry;
+ if (entry.obsolete()) {
+ doomed = entry;
+
+ if (create) {
+ if (created0 == null) {
+ if (!reserved) {
+ if (!reserve())
+ return null;
+
+ reserved = true;
+ }
+
+ created0 = factory.create(ctx, topVer, key, key.hashCode(), val);
+ }
+
+ cur = created = created0;
- done = true;
+ done = map.replace(entry.key(), doomed, created);
+ }
+ else
+ done = map.remove(entry.key(), doomed);
+ }
+ else {
+ cur = entry;
+
+ done = true;
+ }
}
}
- }
- int sizeChange = 0;
- int sizeChange = 0;
++ sizeChange = 0;
+
+ if (doomed != null) {
+ synchronized (doomed) {
+ if (!doomed.deleted())
+ sizeChange--;
+ }
- if (doomed != null) {
- synchronized (doomed) {
- if (!doomed.deleted())
- sizeChange--;
+ if (ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED))
+ ctx.events().addEvent(doomed.partition(),
+ doomed.key(),
+ ctx.localNodeId(),
+ (IgniteUuid)null,
+ null,
+ EVT_CACHE_ENTRY_DESTROYED,
+ null,
+ false,
+ null,
+ false,
+ null,
+ null,
+ null,
+ true);
}
- if (ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED))
- ctx.events().addEvent(doomed.partition(),
- doomed.key(),
- ctx.localNodeId(),
- (IgniteUuid)null,
- null,
- EVT_CACHE_ENTRY_DESTROYED,
- null,
- false,
- null,
- false,
- null,
- null,
- null,
- true);
+ if (created != null) {
+ sizeChange++;
+
+ if (ctx.events().isRecordable(EVT_CACHE_ENTRY_CREATED))
+ ctx.events().addEvent(created.partition(),
+ created.key(),
+ ctx.localNodeId(),
+ (IgniteUuid)null,
+ null,
+ EVT_CACHE_ENTRY_CREATED,
+ null,
+ false,
+ null,
+ false,
+ null,
+ null,
+ null,
+ true);
+
+ if (touch)
+ ctx.evicts().touch(
+ cur,
+ topVer);
+ }
+
+ assert Math.abs(sizeChange) <= 1;
+
- if (sizeChange == -1)
- decrementPublicSize(cur);
- else if (sizeChange == 1) {
- assert reserved;
-
- incrementPublicSize(cur);
- }
-
+ return cur;
}
+ finally {
+ if (reserved)
- release();
++ release(sizeChange, cur);
++ else {
++ if (sizeChange != 0) {
++ assert sizeChange == -1;
+
- if (created != null) {
- sizeChange++;
-
- if (ctx.events().isRecordable(EVT_CACHE_ENTRY_CREATED))
- ctx.events().addEvent(created.partition(),
- created.key(),
- ctx.localNodeId(),
- (IgniteUuid)null,
- null,
- EVT_CACHE_ENTRY_CREATED,
- null,
- false,
- null,
- false,
- null,
- null,
- null,
- true);
-
- if (touch)
- ctx.evicts().touch(
- cur,
- topVer);
++ decrementPublicSize(cur);
++ }
++ }
}
+ }
- if (sizeChange != 0)
- pubSize.addAndGet(sizeChange);
+ /**
+ *
+ */
+ protected boolean reserve() {
+ return true;
+ }
- return cur;
+ /**
+ *
+ */
+ protected void release() {
+ // No-op.
+ }
+
++ /**
++ * @param sizeChange Size delta.
++ * @param e Map entry.
++ */
++ protected void release(int sizeChange, GridCacheEntryEx e) {
++ if (sizeChange == 1)
++ incrementPublicSize(e);
++ else if (sizeChange == -1)
++ decrementPublicSize(e);
+ }
+
/** {@inheritDoc} */
@Override public boolean removeEntry(final GridCacheEntryEx entry) {
boolean removed = map.remove(entry.key(), entry);
http://git-wip-us.apache.org/repos/asf/ignite/blob/baa3835e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 46b2bf8,5c2445a..8566b35
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@@ -435,17 -426,21 +426,35 @@@ public class GridDhtLocalPartition exte
* Releases previously reserved partition.
*/
@Override public void release() {
++ release0(0);
++ }
++
++ @Override protected void release(int sizeChange, GridCacheEntryEx e) {
++ release0(sizeChange);
++ }
++
++ /**
++ * @param sizeChange Size change delta.
++ */
++ private void release0(int sizeChange) {
while (true) {
- long reservations = state.get();
+ long state = this.state.get();
- if ((int)(reservations & 0xFFFF) == 0)
+ int reservations = getReservations(state);
+
+ if (reservations == 0)
return;
- assert (int)(reservations >> 32) != EVICTED.ordinal();
+ assert getPartState(state) != EVICTED;
+
+ long newState = setReservations(state, --reservations);
++ newState = setSize(newState, getSize(newState) + sizeChange);
++
++ assert getSize(newState) == getSize(state) + sizeChange;
// Decrement reservations.
- if (state.compareAndSet(reservations, --reservations)) {
- if ((reservations & 0xFFFF) == 0 && shouldBeRenting)
+ if (this.state.compareAndSet(state, newState)) {
+ if (reservations == 0 && shouldBeRenting)
rent(true);
try {
@@@ -965,6 -963,57 +977,84 @@@
"createTime", U.format(createTime));
}
+ /** {@inheritDoc} */
+ @Override public int publicSize() {
+ return getSize(state.get());
+ }
+
+ /** {@inheritDoc} */
+ @Override public void incrementPublicSize(GridCacheEntryEx e) {
+ while (true) {
+ long state = this.state.get();
+
+ if (this.state.compareAndSet(state, setSize(state, getSize(state) + 1)))
+ return;
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void decrementPublicSize(GridCacheEntryEx e) {
+ while (true) {
+ long state = this.state.get();
+
+ assert getPartState(state) != EVICTED;
+
+ if (this.state.compareAndSet(state, setSize(state, getSize(state) - 1)))
+ return;
+ }
+ }
+
++ /**
++ * @param state Composite state.
++ * @return Partition state.
++ */
+ private static GridDhtPartitionState getPartState(long state) {
+ return GridDhtPartitionState.fromOrdinal((int)(state & (0x0000000000000007L)));
+ }
+
++ /**
++ * @param state Composite state to update.
++ * @param partState Partition state.
++ * @return Updated composite state.
++ */
+ private static long setPartState(long state, GridDhtPartitionState partState) {
+ return (state & (~0x0000000000000007L)) | partState.ordinal();
+ }
+
++ /**
++ * @param state Composite state.
++ * @return Reservations.
++ */
+ private static int getReservations(long state) {
+ return (int)((state & 0x00000000FFFF0000L) >> 16);
+ }
+
++ /**
++ * @param state Composite state to update.
++ * @param reservations Reservations to set.
++ * @return Updated composite state.
++ */
+ private static long setReservations(long state, int reservations) {
+ return (state & (~0x00000000FFFF0000L)) | (reservations << 16);
+ }
+
++ /**
++ * @param state Composite state.
++ * @return Size.
++ */
+ private static int getSize(long state) {
+ return (int)((state & 0xFFFFFFFF00000000L) >> 32);
+ }
+
++ /**
++ * @param state Composite state to update.
++ * @param size Size to set.
++ * @return Updated composite state.
++ */
+ private static long setSize(long state, int size) {
+ return (state & (~0xFFFFFFFF00000000L)) | ((long)size << 32);
+ }
+
/**
* Removed entry holder.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/baa3835e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index b70ca6a,b70ca6a..af80e00
--- 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
@@@ -400,6 -400,6 +400,7 @@@ public abstract class GridCacheAbstract
assertEquals(0, cache.localSize());
assertEquals(0, cache.size());
++ assertEquals(0, cache.size(ONHEAP));
dfltIgnite = null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/baa3835e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java
index 20e7b7a,20e7b7a..eb5a1dd
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.java
@@@ -25,4 -25,4 +25,14 @@@ public class GridCachePartitionedNearDi
@Override protected CacheAtomicityMode atomicityMode() {
return CacheAtomicityMode.ATOMIC;
}
++
++ /** {@inheritDoc} */
++ @Override protected boolean lockingEnabled() {
++ return false;
++ }
++
++ /** {@inheritDoc} */
++ @Override protected boolean txShouldBeUsed() {
++ return false;
++ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/baa3835e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java
index 703d88c,703d88c..573c5a4
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.java
@@@ -25,4 -25,4 +25,14 @@@ public class GridCachePartitionedAtomic
@Override protected CacheAtomicityMode atomicityMode() {
return CacheAtomicityMode.ATOMIC;
}
++
++ /** {@inheritDoc} */
++ @Override protected boolean lockingEnabled() {
++ return false;
++ }
++
++ /** {@inheritDoc} */
++ @Override protected boolean txShouldBeUsed() {
++ return false;
++ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/baa3835e/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
----------------------------------------------------------------------
diff --cc modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
index 69d9097,69d9097..c814f9a
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
@@@ -50,7 -50,7 +50,7 @@@ import org.apache.ignite.transactions.T
import org.jetbrains.annotations.Nullable;
/**
-- * Hibernate cache proxy.
++ * Hibernate cache proxy used to substitute hibernate keys with ignite keys.
*/
public class HibernateCacheProxy implements IgniteInternalCache<Object, Object> {
/** Delegate. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/baa3835e/modules/hibernate5/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
----------------------------------------------------------------------
diff --cc modules/hibernate5/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
index 69d9097,69d9097..c814f9a
--- a/modules/hibernate5/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
+++ b/modules/hibernate5/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
@@@ -50,7 -50,7 +50,7 @@@ import org.apache.ignite.transactions.T
import org.jetbrains.annotations.Nullable;
/**
-- * Hibernate cache proxy.
++ * Hibernate cache proxy used to substitute hibernate keys with ignite keys.
*/
public class HibernateCacheProxy implements IgniteInternalCache<Object, Object> {
/** Delegate. */
[17/53] [abbrv] ignite git commit: ignite-4535 :
GridDhtLocalPartition - replaced delegation to map with inheritance.
Posted by ag...@apache.org.
ignite-4535 : GridDhtLocalPartition - replaced delegation to map with inheritance.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f2df0a7c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f2df0a7c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f2df0a7c
Branch: refs/heads/ignite-3477-master
Commit: f2df0a7c7c11426bc83839cc903f10da18a0d677
Parents: 7d7b283
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Mar 31 16:50:06 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Mar 31 16:50:06 2017 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtLocalPartition.java | 98 ++------------------
1 file changed, 10 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f2df0a7c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 9389afd..46b2bf8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -78,7 +78,7 @@ import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDh
/**
* Key partition.
*/
-public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>, GridReservable, GridCacheConcurrentMap {
+public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements Comparable<GridDhtLocalPartition>, GridReservable {
/** Maximum size for delete queue. */
public static final int MAX_DELETE_QUEUE_SIZE = Integer.getInteger(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, 200_000);
@@ -109,9 +109,6 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
@GridToStringExclude
private final GridFutureAdapter<?> rent;
- /** Entries map. */
- private final GridCacheConcurrentMap map;
-
/** Context. */
private final GridCacheContext cctx;
@@ -151,7 +148,7 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
*/
@SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
GridDhtLocalPartition(GridCacheContext cctx, int id, GridCacheMapEntryFactory entryFactory) {
- assert cctx != null;
+ super(cctx, entryFactory, cctx.config().getStartSize() / cctx.affinity().partitions());
this.id = id;
this.cctx = cctx;
@@ -160,12 +157,10 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
rent = new GridFutureAdapter<Object>() {
@Override public String toString() {
- return "PartitionRentFuture [part=" + GridDhtLocalPartition.this + ", map=" + map + ']';
+ return "PartitionRentFuture [part=" + GridDhtLocalPartition.this + ']';
}
};
- map = new GridCacheConcurrentMapImpl(cctx, entryFactory, cctx.config().getStartSize() / cctx.affinity().partitions());
-
int delQueueSize = CU.isSystemCache(cctx.name()) ? 100 :
Math.max(MAX_DELETE_QUEUE_SIZE / cctx.affinity().partitions(), 20);
@@ -240,20 +235,13 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
}
/**
- * @return Keys belonging to partition.
- */
- public Set<KeyCacheObject> keySet() {
- return map.keySet();
- }
-
- /**
* @return {@code True} if partition is empty.
*/
public boolean isEmpty() {
if (cctx.allowFastEviction())
- return map.size() == 0;
+ return size() == 0;
- return store.size() == 0 && map.size() == 0;
+ return store.size() == 0 && size() == 0;
}
/**
@@ -294,26 +282,6 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
}
}
- /** {@inheritDoc} */
- @Override public int size() {
- return map.size();
- }
-
- /** {@inheritDoc} */
- @Override public int publicSize() {
- return map.publicSize();
- }
-
- /** {@inheritDoc} */
- @Override public void incrementPublicSize(GridCacheEntryEx e) {
- map.incrementPublicSize(e);
- }
-
- /** {@inheritDoc} */
- @Override public void decrementPublicSize(GridCacheEntryEx e) {
- map.decrementPublicSize(e);
- }
-
/**
* @return If partition is moving or owning or renting.
*/
@@ -323,52 +291,6 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
return state == MOVING || state == OWNING || state == RENTING;
}
- /** {@inheritDoc} */
- @Override @Nullable public GridCacheMapEntry getEntry(KeyCacheObject key) {
- return map.getEntry(key);
- }
-
- /** {@inheritDoc} */
- @Override public boolean removeEntry(GridCacheEntryEx entry) {
- return map.removeEntry(entry);
- }
-
- /** {@inheritDoc} */
- @Override public Iterable<GridCacheMapEntry> entries(
- CacheEntryPredicate... filter) {
- return map.entries(filter);
- }
-
- /** {@inheritDoc} */
- @Override public Iterable<GridCacheMapEntry> allEntries(CacheEntryPredicate... filter) {
- return map.allEntries(filter);
- }
-
- /** {@inheritDoc} */
- @Override public Set<GridCacheMapEntry> entrySet(CacheEntryPredicate... filter) {
- return map.entrySet(filter);
- }
-
- /** {@inheritDoc} */
- @Override @Nullable public GridCacheMapEntry randomEntry() {
- return map.randomEntry();
- }
-
- /** {@inheritDoc} */
- @Override public GridCacheMapEntry putEntryIfObsoleteOrAbsent(
- AffinityTopologyVersion topVer,
- KeyCacheObject key,
- @Nullable CacheObject val,
- boolean create,
- boolean touch) {
- return map.putEntryIfObsoleteOrAbsent(topVer, key, val, create, touch);
- }
-
- /** {@inheritDoc} */
- @Override public Set<KeyCacheObject> keySet(CacheEntryPredicate... filter) {
- return map.keySet(filter);
- }
-
/**
* @param entry Entry to remove.
*/
@@ -376,7 +298,7 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
assert entry.obsolete() : entry;
// Make sure to remove exactly this entry.
- map.removeEntry(entry);
+ removeEntry(entry);
// Attempt to evict.
try {
@@ -895,20 +817,20 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
boolean rec = cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_UNLOADED);
- Iterator<GridDhtCacheEntry> it = (Iterator)map.allEntries().iterator();
+ Iterator<GridCacheMapEntry> it = allEntries().iterator();
GridCacheObsoleteEntryExtras extras = new GridCacheObsoleteEntryExtras(clearVer);
while (it.hasNext()) {
- GridDhtCacheEntry cached = null;
+ GridCacheMapEntry cached = null;
cctx.shared().database().checkpointReadLock();
try {
cached = it.next();
- if (cached.clearInternal(clearVer, extras)) {
- map.removeEntry(cached);
+ if (cached instanceof GridDhtCacheEntry && ((GridDhtCacheEntry)cached).clearInternal(clearVer, extras)) {
+ removeEntry(cached);
if (!cached.isInternal()) {
if (rec) {
[52/53] [abbrv] ignite git commit: Merge branch 'ignite-3477-master'
of https://github.com/gridgain/apache-ignite into ignite-3477-master
Posted by ag...@apache.org.
Merge branch 'ignite-3477-master' of https://github.com/gridgain/apache-ignite into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/54213d63
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/54213d63
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/54213d63
Branch: refs/heads/ignite-3477-master
Commit: 54213d637b2f547856b736735b692ac672a023de
Parents: c56c4b8 f59a7f6
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Apr 10 18:08:47 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Apr 10 18:08:47 2017 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheOffheapManagerImpl.java | 45 +++++++++++---------
.../near/GridCacheNearReadersSelfTest.java | 6 ++-
2 files changed, 31 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/54213d63/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/54213d63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
[40/53] [abbrv] ignite git commit: ignite-4535 : Added more config
variations for Full API tests.
Posted by ag...@apache.org.
ignite-4535 : Added more config variations for Full API tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5157bc8e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5157bc8e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5157bc8e
Branch: refs/heads/ignite-3477-master
Commit: 5157bc8ec5907df1a24a2b2e1d20654d39bde417
Parents: ea64bdd
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Apr 7 15:42:48 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Apr 7 15:42:48 2017 +0300
----------------------------------------------------------------------
.../GridCacheAtomicOnheapFullApiSelfTest.java | 26 ------------------
...cheAtomicOnheapMultiNodeFullApiSelfTest.java | 26 ------------------
.../GridCacheAtomicOnheapFullApiSelfTest.java | 28 +++++++++++++++++++
...cheAtomicOnheapMultiNodeFullApiSelfTest.java | 26 ++++++++++++++++++
...cPrimaryWriteOrderOnheapFullApiSelfTest.java | 28 +++++++++++++++++++
...riteOrderOnheapMultiNodeFullApiSelfTest.java | 29 ++++++++++++++++++++
...acheAtomicOnheapMultiJvmFullApiSelfTest.java | 2 +-
...WriteOrderOnheapMultiJvmFullApiSelfTest.java | 29 ++++++++++++++++++++
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 2 ++
.../IgniteCacheFullApiSelfTestSuite.java | 8 ++++--
10 files changed, 149 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5157bc8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapFullApiSelfTest.java
deleted file mode 100644
index ea7cc61..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapFullApiSelfTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.dht;
-
-public class GridCacheAtomicOnheapFullApiSelfTest extends GridCacheAtomicFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected boolean onheapCacheEnabled() {
- return true;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5157bc8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
deleted file mode 100644
index 895699d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.dht;
-
-public class GridCacheAtomicOnheapMultiNodeFullApiSelfTest extends GridCacheAtomicOnheapFullApiSelfTest {
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 3;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5157bc8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapFullApiSelfTest.java
new file mode 100644
index 0000000..977fea4
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapFullApiSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicFullApiSelfTest;
+
+public class GridCacheAtomicOnheapFullApiSelfTest extends GridCacheAtomicFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5157bc8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
new file mode 100644
index 0000000..ddd8916
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+public class GridCacheAtomicOnheapMultiNodeFullApiSelfTest extends GridCacheAtomicOnheapFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 3;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5157bc8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOnheapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOnheapFullApiSelfTest.java
new file mode 100644
index 0000000..21ecf5e
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOnheapFullApiSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+
+public class GridCacheAtomicPrimaryWriteOrderOnheapFullApiSelfTest extends GridCacheAtomicOnheapFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
+ return CacheAtomicWriteOrderMode.PRIMARY;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5157bc8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest.java
new file mode 100644
index 0000000..99778c7
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+
+public class GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest
+ extends GridCacheAtomicOnheapMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
+ return CacheAtomicWriteOrderMode.PRIMARY;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5157bc8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
index 33b550b..2a5c2da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.processors.cache.multijvm;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicOnheapMultiNodeFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOnheapMultiNodeFullApiSelfTest;
public class GridCacheAtomicOnheapMultiJvmFullApiSelfTest extends GridCacheAtomicOnheapMultiNodeFullApiSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/5157bc8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest.java
new file mode 100644
index 0000000..af69e66
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.multijvm;
+
+import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest;
+
+public class GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest extends GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() {
+ return CacheAtomicWriteOrderMode.PRIMARY;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5157bc8e/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
index c822e1e..1598a6f 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiMultiJvmSelfTestSuite.java
@@ -34,6 +34,7 @@ import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicOnhea
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderFairAffinityMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderMultiJvmP2PDisabledFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheNearOnlyFairAffinityMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheNearOnlyMultiJvmFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.multijvm.GridCacheNearOnlyMultiJvmP2PDisabledFullApiSelfTest;
@@ -108,6 +109,7 @@ public class IgniteCacheFullApiMultiJvmSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCachePartitionedNearDisabledOnheapMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedOnheapMultiJvmFullApiSelfTest.class);
suite.addTestSuite(GridCacheReplicatedOnheapMultiJvmFullApiSelfTest.class);
+ suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderOnheapMultiJvmFullApiSelfTest.class);
return suite;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5157bc8e/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
index d255246..fa11f24 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
@@ -22,8 +22,8 @@ import org.apache.ignite.internal.processors.cache.GridCacheClearSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicNearEnabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicOnheapFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicOnheapMultiNodeFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOnheapFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicOnheapMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicPrimaryWriteOrderFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicReloadAllSelfTest;
@@ -54,6 +54,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAto
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderMultiNodeP2PDisabledFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderOnheapFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlyFairAffinityMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlyMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlyMultiNodeP2PDisabledFullApiSelfTest;
@@ -114,6 +116,7 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheAtomicNearEnabledFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicOnheapFullApiSelfTest.class);;
+ suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderOnheapFullApiSelfTest.class);;
suite.addTestSuite(GridCachePartitionedOnheapFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedAtomicOnheapFullApiSelfTest.class);
@@ -180,6 +183,7 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicOnheapMultiNodeFullApiSelfTest.class);;
+ suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderOnheapMultiNodeFullApiSelfTest.class);;
// Old affinity assignment mode.
suite.addTestSuite(GridCachePartitionedLateAffDisabledMultiNodeFullApiSelfTest.class);
[09/53] [abbrv] ignite git commit: ignite-4535 : Fixed size
calculation.
Posted by ag...@apache.org.
ignite-4535 : Fixed size calculation.
(cherry picked from commit 531a449)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/141064ed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/141064ed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/141064ed
Branch: refs/heads/ignite-3477-master
Commit: 141064ed9e0c392ca0c5bb51bf848945bec1c1d1
Parents: c89c563
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Tue Mar 21 17:29:05 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Mar 30 16:20:29 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/GridDistributedCacheAdapter.java | 2 +-
.../processors/cache/distributed/dht/GridDhtLocalPartition.java | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/141064ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index b1afc69..dbe267d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -283,7 +283,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter
else if (modes.heap) {
for (GridDhtLocalPartition locPart : ctx.topology().currentLocalPartitions()) {
if ((modes.primary && locPart.primary(topVer)) || (modes.backup && locPart.backup(topVer)))
- size += locPart.heapSize();
+ size += locPart.entrySet().size();
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/141064ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 4aff5f4..05bfdfe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -305,11 +305,6 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
}
/** {@inheritDoc} */
- public int heapSize() {
- return map.size();
- }
-
- /** {@inheritDoc} */
@Override public void incrementPublicSize(GridCacheEntryEx e) {
map.incrementPublicSize(e);
}
[24/53] [abbrv] ignite git commit: .NET: Remove
CacheConfiguration.OffheapMaxMemory, CacheConfiguration.SqlOnheapRowCacheSize
Posted by ag...@apache.org.
.NET: Remove CacheConfiguration.OffheapMaxMemory, CacheConfiguration.SqlOnheapRowCacheSize
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6dd29eef
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6dd29eef
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6dd29eef
Branch: refs/heads/ignite-3477-master
Commit: 6dd29eef599a95d0e3e905dba3aa9500ef994237
Parents: 2fb75c4
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Mon Apr 3 17:20:44 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Mon Apr 3 17:20:44 2017 +0300
----------------------------------------------------------------------
.../Cache/CacheConfigurationTest.cs | 9 --------
.../IgniteConfigurationSerializerTest.cs | 2 --
.../Cache/Configuration/CacheConfiguration.cs | 23 --------------------
3 files changed, 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6dd29eef/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
index 9ef1005..250177d 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs
@@ -29,7 +29,6 @@ namespace Apache.Ignite.Core.Tests.Cache
using Apache.Ignite.Core.Cache.Expiry;
using Apache.Ignite.Core.Cache.Store;
using Apache.Ignite.Core.Common;
- using Apache.Ignite.Core.Impl.Cache.Affinity;
using Apache.Ignite.Core.Tests.Plugin.Cache;
using NUnit.Framework;
@@ -198,13 +197,11 @@ namespace Apache.Ignite.Core.Tests.Cache
Assert.AreEqual(CacheConfiguration.DefaultLongQueryWarningTimeout, cfg.LongQueryWarningTimeout);
Assert.AreEqual(CacheConfiguration.DefaultMaxConcurrentAsyncOperations, cfg.MaxConcurrentAsyncOperations);
Assert.AreEqual(CacheConfiguration.DefaultMaxEvictionOverflowRatio, cfg.MaxEvictionOverflowRatio);
- Assert.AreEqual(CacheConfiguration.DefaultOffHeapMaxMemory, cfg.OffHeapMaxMemory);
Assert.AreEqual(CacheConfiguration.DefaultReadFromBackup, cfg.ReadFromBackup);
Assert.AreEqual(CacheConfiguration.DefaultRebalanceBatchSize, cfg.RebalanceBatchSize);
Assert.AreEqual(CacheConfiguration.DefaultRebalanceMode, cfg.RebalanceMode);
Assert.AreEqual(CacheConfiguration.DefaultRebalanceThrottle, cfg.RebalanceThrottle);
Assert.AreEqual(CacheConfiguration.DefaultRebalanceTimeout, cfg.RebalanceTimeout);
- Assert.AreEqual(CacheConfiguration.DefaultSqlOnheapRowCacheSize, cfg.SqlOnheapRowCacheSize);
Assert.AreEqual(CacheConfiguration.DefaultStartSize, cfg.StartSize);
Assert.AreEqual(CacheConfiguration.DefaultStartSize, cfg.StartSize);
Assert.AreEqual(CacheConfiguration.DefaultWriteBehindBatchSize, cfg.WriteBehindBatchSize);
@@ -235,13 +232,11 @@ namespace Apache.Ignite.Core.Tests.Cache
Assert.AreEqual(x.LongQueryWarningTimeout, y.LongQueryWarningTimeout);
Assert.AreEqual(x.MaxConcurrentAsyncOperations, y.MaxConcurrentAsyncOperations);
Assert.AreEqual(x.MaxEvictionOverflowRatio, y.MaxEvictionOverflowRatio);
- Assert.AreEqual(x.OffHeapMaxMemory, y.OffHeapMaxMemory);
Assert.AreEqual(x.ReadFromBackup, y.ReadFromBackup);
Assert.AreEqual(x.RebalanceBatchSize, y.RebalanceBatchSize);
Assert.AreEqual(x.RebalanceMode, y.RebalanceMode);
Assert.AreEqual(x.RebalanceThrottle, y.RebalanceThrottle);
Assert.AreEqual(x.RebalanceTimeout, y.RebalanceTimeout);
- Assert.AreEqual(x.SqlOnheapRowCacheSize, y.SqlOnheapRowCacheSize);
Assert.AreEqual(x.StartSize, y.StartSize);
Assert.AreEqual(x.StartSize, y.StartSize);
Assert.AreEqual(x.WriteBehindBatchSize, y.WriteBehindBatchSize);
@@ -487,7 +482,6 @@ namespace Apache.Ignite.Core.Tests.Cache
return new CacheConfiguration
{
Name = name ?? CacheName,
- OffHeapMaxMemory = 1,
StartSize = 2,
MaxConcurrentAsyncOperations = 3,
WriteBehindFlushThreadCount = 4,
@@ -516,7 +510,6 @@ namespace Apache.Ignite.Core.Tests.Cache
RebalanceThrottle = TimeSpan.FromSeconds(15),
RebalanceTimeout = TimeSpan.FromSeconds(16),
SqlEscapeAll = true,
- SqlOnheapRowCacheSize = 17,
WriteBehindBatchSize = 18,
WriteBehindEnabled = false,
WriteSynchronizationMode = CacheWriteSynchronizationMode.PrimarySync,
@@ -581,7 +574,6 @@ namespace Apache.Ignite.Core.Tests.Cache
return new CacheConfiguration
{
Name = name ?? CacheName2,
- OffHeapMaxMemory = 1,
StartSize = 2,
MaxConcurrentAsyncOperations = 3,
WriteBehindFlushThreadCount = 4,
@@ -610,7 +602,6 @@ namespace Apache.Ignite.Core.Tests.Cache
RebalanceThrottle = TimeSpan.FromSeconds(15),
RebalanceTimeout = TimeSpan.FromSeconds(16),
SqlEscapeAll = true,
- SqlOnheapRowCacheSize = 17,
WriteBehindBatchSize = 18,
WriteBehindEnabled = false,
WriteSynchronizationMode = CacheWriteSynchronizationMode.PrimarySync,
http://git-wip-us.apache.org/repos/asf/ignite/blob/6dd29eef/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
index 7e44a7a..e6e12c4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
@@ -626,7 +626,6 @@ namespace Apache.Ignite.Core.Tests
LongQueryWarningTimeout = TimeSpan.FromSeconds(99),
MaxConcurrentAsyncOperations = 24,
MaxEvictionOverflowRatio = 5.6F,
- OffHeapMaxMemory = 567,
QueryEntities = new[]
{
new QueryEntity
@@ -655,7 +654,6 @@ namespace Apache.Ignite.Core.Tests
RebalanceThrottle = TimeSpan.FromHours(44),
RebalanceTimeout = TimeSpan.FromMinutes(8),
SqlEscapeAll = true,
- SqlOnheapRowCacheSize = 679,
StartSize = 1023,
WriteBehindBatchSize = 45,
WriteBehindEnabled = true,
http://git-wip-us.apache.org/repos/asf/ignite/blob/6dd29eef/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
index 9ae3f6c..a5b9712 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
@@ -182,13 +182,11 @@ namespace Apache.Ignite.Core.Cache.Configuration
LongQueryWarningTimeout = DefaultLongQueryWarningTimeout;
MaxConcurrentAsyncOperations = DefaultMaxConcurrentAsyncOperations;
MaxEvictionOverflowRatio = DefaultMaxEvictionOverflowRatio;
- OffHeapMaxMemory = DefaultOffHeapMaxMemory;
ReadFromBackup = DefaultReadFromBackup;
RebalanceBatchSize = DefaultRebalanceBatchSize;
RebalanceMode = DefaultRebalanceMode;
RebalanceThrottle = DefaultRebalanceThrottle;
RebalanceTimeout = DefaultRebalanceTimeout;
- SqlOnheapRowCacheSize = DefaultSqlOnheapRowCacheSize;
StartSize = DefaultStartSize;
WriteBehindBatchSize = DefaultWriteBehindBatchSize;
WriteBehindEnabled = DefaultWriteBehindEnabled;
@@ -248,7 +246,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
MaxConcurrentAsyncOperations = reader.ReadInt();
MaxEvictionOverflowRatio = reader.ReadFloat();
Name = reader.ReadString();
- OffHeapMaxMemory = reader.ReadLong();
ReadFromBackup = reader.ReadBoolean();
RebalanceBatchSize = reader.ReadInt();
RebalanceDelay = reader.ReadLongAsTimespan();
@@ -256,7 +253,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
RebalanceThrottle = reader.ReadLongAsTimespan();
RebalanceTimeout = reader.ReadLongAsTimespan();
SqlEscapeAll = reader.ReadBoolean();
- SqlOnheapRowCacheSize = reader.ReadInt();
StartSize = reader.ReadInt();
WriteBehindBatchSize = reader.ReadInt();
WriteBehindEnabled = reader.ReadBoolean();
@@ -311,7 +307,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
writer.WriteInt(MaxConcurrentAsyncOperations);
writer.WriteFloat(MaxEvictionOverflowRatio);
writer.WriteString(Name);
- writer.WriteLong(OffHeapMaxMemory);
writer.WriteBoolean(ReadFromBackup);
writer.WriteInt(RebalanceBatchSize);
writer.WriteLong((long) RebalanceDelay.TotalMilliseconds);
@@ -319,7 +314,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
writer.WriteLong((long) RebalanceThrottle.TotalMilliseconds);
writer.WriteLong((long) RebalanceTimeout.TotalMilliseconds);
writer.WriteBoolean(SqlEscapeAll);
- writer.WriteInt(SqlOnheapRowCacheSize);
writer.WriteInt(StartSize);
writer.WriteInt(WriteBehindBatchSize);
writer.WriteBoolean(WriteBehindEnabled);
@@ -621,16 +615,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
public TimeSpan RebalanceThrottle { get; set; }
/// <summary>
- /// Gets or sets maximum amount of memory available to off-heap storage. Possible values are
- /// -1 means that off-heap storage is disabled. 0 means that Ignite will not limit off-heap storage
- /// (it's up to user to properly add and remove entries from cache to ensure that off-heap storage
- /// does not grow indefinitely.
- /// Any positive value specifies the limit of off-heap storage in bytes.
- /// </summary>
- [DefaultValue(DefaultOffHeapMaxMemory)]
- public long OffHeapMaxMemory { get; set; }
-
- /// <summary>
/// Gets or sets flag indicating whether data can be read from backup.
/// </summary>
[DefaultValue(DefaultReadFromBackup)]
@@ -657,13 +641,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
public bool SqlEscapeAll { get; set; }
/// <summary>
- /// Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access.
- /// This setting only makes sense when offheap is enabled for this cache.
- /// </summary>
- [DefaultValue(DefaultSqlOnheapRowCacheSize)]
- public int SqlOnheapRowCacheSize { get; set; }
-
- /// <summary>
/// Gets or sets the factory for underlying persistent storage for read-through and write-through operations.
/// <para />
/// See <see cref="ReadThrough"/> and <see cref="WriteThrough"/> properties to enable read-through and
[21/53] [abbrv] ignite git commit: ignite-4535 : Fixed
ignite-indexing.
Posted by ag...@apache.org.
ignite-4535 : Fixed ignite-indexing.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/be28dbf7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/be28dbf7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/be28dbf7
Branch: refs/heads/ignite-3477-master
Commit: be28dbf72c931ed52b04450dcc46141ed9dcb425
Parents: 48a8c40
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 3 15:08:39 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 3 15:08:39 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridIndexingWithNoopSwapSelfTest.java | 2 +-
.../internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/be28dbf7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
index 8f24670..deeac51 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
@@ -108,6 +108,6 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest {
SqlQuery<Integer, ObjectValue> qry =
new SqlQuery(ObjectValue.class, "intVal >= ? order by intVal");
- assertEquals(0, cache.query(qry.setArgs(0)).getAll().size());
+ assertEquals(10, cache.query(qry.setArgs(0)).getAll().size());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/be28dbf7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
index 47cd98b..ad3e320 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
@@ -112,7 +112,6 @@ public class IgniteSqlSegmentedIndexSelfTest extends GridCommonAbstractTest {
startGridsMultiThreaded(1, true);
final IgniteCache<Object, Object> cache = ignite(0).createCache(cacheConfig("org", true, Integer.class, Organization.class)
- .setOffHeapMaxMemory(-1)
.setEvictionPolicy(new FifoEvictionPolicy(10)));
for (int i = 0; i < 20; i++)
[05/53] [abbrv] ignite git commit: ignite-4535 : Conflicts.
Posted by ag...@apache.org.
ignite-4535 : Conflicts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a49fa5d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a49fa5d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a49fa5d
Branch: refs/heads/ignite-3477-master
Commit: 7a49fa5d4be9970af93ef662abc84d0538638717
Parents: 5ec807a
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Mar 30 16:10:26 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Mar 30 16:10:26 2017 +0300
----------------------------------------------------------------------
.../ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7a49fa5d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index 5b800f7..84e7953 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -24,7 +24,6 @@ import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDa
import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDiscoveryDataStructuresTest;
import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureUniqueNameTest;
import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureWithJobTest;
-import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicOffheapSetSelfTest;
import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicQueueApiSelfTest;
import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicSetSelfTest;
import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalQueueApiSelfTest;
[39/53] [abbrv] ignite git commit: ignite-4535 : Removed redundant
code related to synchronous evictions.
Posted by ag...@apache.org.
ignite-4535 : Removed redundant code related to synchronous evictions.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea64bdd8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea64bdd8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea64bdd8
Branch: refs/heads/ignite-3477-master
Commit: ea64bdd8ab4d87cad8c0c018bd9ea437a15e33a8
Parents: d433800
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Apr 7 15:33:42 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Apr 7 15:33:42 2017 +0300
----------------------------------------------------------------------
.../communication/GridIoMessageFactory.java | 12 -
.../cache/GridCacheEvictionManager.java | 226 -----------------
.../cache/GridCacheEvictionRequest.java | 248 -------------------
.../cache/GridCacheEvictionResponse.java | 225 -----------------
.../processors/cache/GridCacheIoManager.java | 14 --
5 files changed, 725 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea64bdd8/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index ac3858c..8488d70 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -45,8 +45,6 @@ import org.apache.ignite.internal.processors.cache.CacheInvokeDirectResult;
import org.apache.ignite.internal.processors.cache.CacheObjectByteArrayImpl;
import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
-import org.apache.ignite.internal.processors.cache.GridCacheEvictionRequest;
-import org.apache.ignite.internal.processors.cache.GridCacheEvictionResponse;
import org.apache.ignite.internal.processors.cache.GridCacheReturn;
import org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl;
import org.apache.ignite.internal.processors.cache.binary.MetadataRequestMessage;
@@ -371,16 +369,6 @@ public class GridIoMessageFactory implements MessageFactory {
break;
- case 14:
- msg = new GridCacheEvictionRequest();
-
- break;
-
- case 15:
- msg = new GridCacheEvictionResponse();
-
- break;
-
case 16:
msg = new GridCacheTxRecoveryRequest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea64bdd8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index 27d628b..b9b78cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -101,9 +101,6 @@ import static org.jsr166.ConcurrentLinkedDeque8.Node;
* TODO GG-11140 (old evictions implementation, now created for near cache, evictions to be reconsidered as part of GG-11140).
*/
public class GridCacheEvictionManager extends GridCacheManagerAdapter implements CacheEvictionManager {
- /** Attribute name used to queue node in entry metadata. */
- private static final int META_KEY = GridMetadataAwareAdapter.EntryKey.CACHE_EVICTION_MANAGER_KEY.key();
-
/** Eviction policy. */
private EvictionPolicy plc;
@@ -170,144 +167,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/**
- * @param nodeId Node ID.
- * @param res Response.
- */
- private void sendEvictionResponse(UUID nodeId, GridCacheEvictionResponse res) {
- try {
- cctx.io().send(nodeId, res, cctx.ioPolicy());
-
- if (log.isDebugEnabled())
- log.debug("Sent eviction response [node=" + nodeId + ", localNode=" + cctx.nodeId() +
- ", res" + res + ']');
- }
- catch (ClusterTopologyCheckedException ignored) {
- if (log.isDebugEnabled())
- log.debug("Failed to send eviction response since initiating node left grid " +
- "[node=" + nodeId + ", localNode=" + cctx.nodeId() + ']');
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to send eviction response to node [node=" + nodeId +
- ", localNode=" + cctx.nodeId() + ", res" + res + ']', e);
- }
- }
-
- /**
- * @param key Key.
- * @param ver Version.
- * @param p Partition ID.
- */
- private void saveEvictionInfo(KeyCacheObject key, GridCacheVersion ver, int p) {
- assert cctx.rebalanceEnabled();
-
- if (!cctx.isNear()) {
- try {
- GridDhtLocalPartition part = cctx.dht().topology().localPartition(p,
- AffinityTopologyVersion.NONE, false);
-
- assert part != null;
-
- part.onEntryEvicted(key, ver);
- }
- catch (GridDhtInvalidPartitionException ignored) {
- if (log.isDebugEnabled())
- log.debug("Partition does not belong to local node [part=" + p +
- ", nodeId" + cctx.localNode().id() + ']');
- }
- }
- else
- assert false : "Failed to save eviction info: " + cctx.namexx();
- }
-
- /**
- * @param p Partition ID.
- * @return {@code True} if partition has been actually locked,
- * {@code false} if preloading is finished or disabled and no lock is needed.
- */
- private boolean lockPartition(int p) {
- if (!cctx.rebalanceEnabled())
- return false;
-
- if (!cctx.isNear()) {
- try {
- GridDhtLocalPartition part = cctx.dht().topology().localPartition(p, AffinityTopologyVersion.NONE,
- false);
-
- if (part != null && part.reserve()) {
- part.lock();
-
- if (part.state() != MOVING) {
- part.unlock();
-
- part.release();
-
- return false;
- }
-
- return true;
- }
- }
- catch (GridDhtInvalidPartitionException ignored) {
- if (log.isDebugEnabled())
- log.debug("Partition does not belong to local node [part=" + p +
- ", nodeId" + cctx.localNode().id() + ']');
- }
- }
-
- // No lock is needed.
- return false;
- }
-
- /**
- * @param p Partition ID.
- */
- private void unlockPartition(int p) {
- if (!cctx.rebalanceEnabled())
- return;
-
- if (!cctx.isNear()) {
- try {
- GridDhtLocalPartition part = cctx.dht().topology().localPartition(p, AffinityTopologyVersion.NONE,
- false);
-
- if (part != null) {
- part.unlock();
-
- part.release();
- }
- }
- catch (GridDhtInvalidPartitionException ignored) {
- if (log.isDebugEnabled())
- log.debug("Partition does not belong to local node [part=" + p +
- ", nodeId" + cctx.localNode().id() + ']');
- }
- }
- }
-
- /**
- * Locks topology (for DHT cache only) and returns its version.
- *
- * @return Topology version after lock.
- */
- private AffinityTopologyVersion lockTopology() {
- if (!cctx.isNear()) {
- cctx.dht().topology().readLock();
-
- return cctx.dht().topology().topologyVersion();
- }
-
- return AffinityTopologyVersion.ZERO;
- }
-
- /**
- * Unlocks topology.
- */
- private void unlockTopology() {
- if (!cctx.isNear())
- cctx.dht().topology().readUnlock();
- }
-
- /**
* @param cache Cache from which to evict entry.
* @param entry Entry to evict.
* @param obsoleteVer Obsolete version.
@@ -553,28 +412,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/**
- * @param info Eviction info.
- * @return Version aware filter.
- */
- private CacheEntryPredicate[] versionFilter(final EvictionInfo info) {
- // If version has changed since we started the whole process
- // then we should not evict entry.
- return new CacheEntryPredicate[] {
- new CacheEntryPredicateAdapter() {
- @Override public boolean apply(GridCacheEntryEx e) {
- try {
- GridCacheVersion ver = e.version();
-
- return info.version().equals(ver) && F.isAll(info.filter());
- }
- catch (GridCacheEntryRemovedException ignored) {
- return false;
- }
- }
- }};
- }
-
- /**
* @param e Entry to notify eviction policy.
*/
@SuppressWarnings({"IfMayBeConditional", "RedundantIfStatement"})
@@ -590,73 +427,10 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
plc.onEntryAccessed(e.obsoleteOrDeleted(), e.wrapEviction());
}
- /**
- * Prints out eviction stats.
- */
- public void printStats() {
- X.println("Eviction stats [igniteInstanceName=" + cctx.igniteInstanceName() +
- ", cache=" + cctx.cache().name() + ']');
- }
-
/** {@inheritDoc} */
@Override public void printMemoryStats() {
X.println(">>> ");
X.println(">>> Eviction manager memory stats [igniteInstanceName=" + cctx.igniteInstanceName() +
", cache=" + cctx.name() + ']');
}
-
- /**
- * Wrapper around an entry to be put into queue.
- */
- private class EvictionInfo {
- /** Cache entry. */
- private GridCacheEntryEx entry;
-
- /** Start version. */
- private GridCacheVersion ver;
-
- /** Filter to pass before entry will be evicted. */
- private CacheEntryPredicate[] filter;
-
- /**
- * @param entry Entry.
- * @param ver Version.
- * @param filter Filter.
- */
- EvictionInfo(GridCacheEntryEx entry, GridCacheVersion ver,
- CacheEntryPredicate[] filter) {
- assert entry != null;
- assert ver != null;
-
- this.entry = entry;
- this.ver = ver;
- this.filter = filter;
- }
-
- /**
- * @return Entry.
- */
- GridCacheEntryEx entry() {
- return entry;
- }
-
- /**
- * @return Version.
- */
- GridCacheVersion version() {
- return ver;
- }
-
- /**
- * @return Filter.
- */
- CacheEntryPredicate[] filter() {
- return filter;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(EvictionInfo.class, this);
- }
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea64bdd8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
deleted file mode 100644
index cb454f8..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import java.io.Externalizable;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.GridDirectCollection;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Cache eviction request.
- */
-public class GridCacheEvictionRequest extends GridCacheMessage implements GridCacheDeployable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Future id. */
- private long futId;
-
- /** Entries to clear from near and backup nodes. */
- @GridToStringInclude
- @GridDirectCollection(CacheEvictionEntry.class)
- private Collection<CacheEvictionEntry> entries;
-
- /** Topology version. */
- private AffinityTopologyVersion topVer;
-
- /**
- * Required by {@link Externalizable}.
- */
- public GridCacheEvictionRequest() {
- // No-op.
- }
-
- /**
- * @param cacheId Cache ID.
- * @param futId Future id.
- * @param size Size.
- * @param topVer Topology version.
- * @param addDepInfo Deployment info flag.
- */
- GridCacheEvictionRequest(int cacheId, long futId, int size, @NotNull AffinityTopologyVersion topVer,
- boolean addDepInfo) {
- assert futId > 0;
- assert size > 0;
- assert topVer.topologyVersion() > 0;
-
- this.cacheId = cacheId;
- this.futId = futId;
- this.addDepInfo = addDepInfo;
-
- entries = new ArrayList<>(size);
-
- this.topVer = topVer;
- }
-
- /** {@inheritDoc}
- * @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException {
- super.prepareMarshal(ctx);
-
- if (entries != null) {
- GridCacheContext cctx = ctx.cacheContext(cacheId);
-
- for (CacheEvictionEntry e : entries) {
- e.prepareMarshal(cctx);
-
- if (addDepInfo)
- prepareObject(e.key().value(cctx.cacheObjectContext(), false), cctx);
- }
- }
- }
-
- /** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException {
- super.finishUnmarshal(ctx, ldr);
-
- if (entries != null) {
- GridCacheContext cctx = ctx.cacheContext(cacheId);
-
- for (CacheEvictionEntry e : entries)
- e.finishUnmarshal(cctx, ldr);
- }
- }
-
- /** {@inheritDoc} */
- @Override public boolean addDeploymentInfo() {
- return addDepInfo;
- }
-
- /**
- * @return Future id.
- */
- long futureId() {
- return futId;
- }
-
- /**
- * @return Entries - {{Key, Version, Boolean (near or not)}, ...}.
- */
- Collection<CacheEvictionEntry> entries() {
- return entries;
- }
-
- /**
- * @return Topology version.
- */
- @Override public AffinityTopologyVersion topologyVersion() {
- return topVer;
- }
-
- /**
- * Add key to request.
- *
- * @param key Key to evict.
- * @param ver Entry version.
- * @param near {@code true} if key should be evicted from near cache.
- */
- void addKey(KeyCacheObject key, GridCacheVersion ver, boolean near) {
- assert key != null;
- assert ver != null;
-
- entries.add(new CacheEvictionEntry(key, ver, near));
- }
-
- /** {@inheritDoc} */
- @Override public boolean ignoreClassErrors() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- writer.setBuffer(buf);
-
- if (!super.writeTo(buf, writer))
- return false;
-
- if (!writer.isHeaderWritten()) {
- if (!writer.writeHeader(directType(), fieldsCount()))
- return false;
-
- writer.onHeaderWritten();
- }
-
- switch (writer.state()) {
- case 3:
- if (!writer.writeCollection("entries", entries, MessageCollectionItemType.MSG))
- return false;
-
- writer.incrementState();
-
- case 4:
- if (!writer.writeLong("futId", futId))
- return false;
-
- writer.incrementState();
-
- case 5:
- if (!writer.writeMessage("topVer", topVer))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- if (!reader.beforeMessageRead())
- return false;
-
- if (!super.readFrom(buf, reader))
- return false;
-
- switch (reader.state()) {
- case 3:
- entries = reader.readCollection("entries", MessageCollectionItemType.MSG);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 4:
- futId = reader.readLong("futId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 5:
- topVer = reader.readMessage("topVer");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return reader.afterMessageRead(GridCacheEvictionRequest.class);
- }
-
- /** {@inheritDoc} */
- @Override public short directType() {
- return 14;
- }
-
- /** {@inheritDoc} */
- @Override public byte fieldsCount() {
- return 6;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridCacheEvictionRequest.class, this);
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea64bdd8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
deleted file mode 100644
index 69ec09f..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import java.io.Externalizable;
-import java.nio.ByteBuffer;
-import java.util.Collection;
-import java.util.HashSet;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.GridDirectCollection;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
-
-/**
- * Cache eviction response.
- */
-public class GridCacheEvictionResponse extends GridCacheMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Future ID. */
- private long futId;
-
- /** Rejected keys. */
- @GridToStringInclude
- @GridDirectCollection(KeyCacheObject.class)
- private Collection<KeyCacheObject> rejectedKeys = new HashSet<>();
-
- /** Flag to indicate whether request processing has finished with error. */
- private boolean err;
-
- /**
- * Required by {@link Externalizable}.
- */
- public GridCacheEvictionResponse() {
- // No-op.
- }
-
- /**
- * @param cacheId Cache ID.
- * @param futId Future ID.
- */
- GridCacheEvictionResponse(int cacheId, long futId) {
- this(cacheId, futId, false);
- }
-
- /**
- * @param cacheId Cache ID.
- * @param futId Future ID.
- * @param err {@code True} if request processing has finished with error.
- */
- GridCacheEvictionResponse(int cacheId, long futId, boolean err) {
- this.cacheId = cacheId;
- this.futId = futId;
- this.err = err;
- }
-
- /** {@inheritDoc}
- * @param ctx*/
- @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException {
- super.prepareMarshal(ctx);
-
- prepareMarshalCacheObjects(rejectedKeys, ctx.cacheContext(cacheId));
- }
-
- /** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException {
- super.finishUnmarshal(ctx, ldr);
-
- finishUnmarshalCacheObjects(rejectedKeys, ctx.cacheContext(cacheId), ldr);
- }
-
- /** {@inheritDoc} */
- @Override public boolean addDeploymentInfo() {
- return false;
- }
-
- /**
- * @return Future ID.
- */
- long futureId() {
- return futId;
- }
-
- /**
- * @return Rejected keys.
- */
- Collection<KeyCacheObject> rejectedKeys() {
- return rejectedKeys;
- }
-
- /**
- * Add rejected key to response.
- *
- * @param key Evicted key.
- */
- void addRejected(KeyCacheObject key) {
- assert key != null;
-
- rejectedKeys.add(key);
- }
-
- /**
- * @return {@code True} if request processing has finished with error.
- */
- boolean evictError() {
- return err;
- }
-
- /** {@inheritDoc} */
- @Override public boolean ignoreClassErrors() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- writer.setBuffer(buf);
-
- if (!super.writeTo(buf, writer))
- return false;
-
- if (!writer.isHeaderWritten()) {
- if (!writer.writeHeader(directType(), fieldsCount()))
- return false;
-
- writer.onHeaderWritten();
- }
-
- switch (writer.state()) {
- case 3:
- if (!writer.writeBoolean("err", err))
- return false;
-
- writer.incrementState();
-
- case 4:
- if (!writer.writeLong("futId", futId))
- return false;
-
- writer.incrementState();
-
- case 5:
- if (!writer.writeCollection("rejectedKeys", rejectedKeys, MessageCollectionItemType.MSG))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- if (!reader.beforeMessageRead())
- return false;
-
- if (!super.readFrom(buf, reader))
- return false;
-
- switch (reader.state()) {
- case 3:
- err = reader.readBoolean("err");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 4:
- futId = reader.readLong("futId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 5:
- rejectedKeys = reader.readCollection("rejectedKeys", MessageCollectionItemType.MSG);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return reader.afterMessageRead(GridCacheEvictionResponse.class);
- }
-
- /** {@inheritDoc} */
- @Override public short directType() {
- return 15;
- }
-
- /** {@inheritDoc} */
- @Override public byte fieldsCount() {
- return 6;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridCacheEvictionResponse.class, this);
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea64bdd8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 99878ec..fdd29e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -523,20 +523,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
GridCacheContext ctx = cctx.cacheContext(msg.cacheId());
switch (msg.directType()) {
- case 14: {
- GridCacheEvictionRequest req = (GridCacheEvictionRequest)msg;
-
- GridCacheEvictionResponse res = new GridCacheEvictionResponse(
- ctx.cacheId(),
- req.futureId(),
- req.classError() != null
- );
-
- sendResponseOnFailedMessage(nodeId, res, cctx, ctx.ioPolicy());
- }
-
- break;
-
case 30: {
GridDhtLockRequest req = (GridDhtLockRequest)msg;
[37/53] [abbrv] ignite git commit: ignite-4535 : Fixed new full API
tests.
Posted by ag...@apache.org.
ignite-4535 : Fixed new full API tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/99785f1f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/99785f1f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/99785f1f
Branch: refs/heads/ignite-3477-master
Commit: 99785f1f5219298bb0b64baa79b21ddd138f38da
Parents: 3b5a745
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Apr 6 19:00:42 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Apr 6 19:00:42 2017 +0300
----------------------------------------------------------------------
.../cache/GridCacheAbstractFullApiSelfTest.java | 1 +
.../GridCacheAtomicOnheapFullApiSelfTest.java | 26 ++++++++++++++++++++
...cheAtomicOnheapMultiNodeFullApiSelfTest.java | 26 ++++++++++++++++++++
...NearDisabledAtomicOnheapFullApiSelfTest.java | 10 ++++++++
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 4 ---
...acheAtomicOnheapMultiJvmFullApiSelfTest.java | 4 +--
.../IgniteCacheFullApiSelfTestSuite.java | 4 +++
7 files changed, 69 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/99785f1f/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 9dcb596..b70ca6a 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
@@ -111,6 +111,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CachePeekMode.ALL;
+import static org.apache.ignite.cache.CachePeekMode.OFFHEAP;
import static org.apache.ignite.cache.CachePeekMode.ONHEAP;
import static org.apache.ignite.cache.CachePeekMode.PRIMARY;
import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_LOCKED;
http://git-wip-us.apache.org/repos/asf/ignite/blob/99785f1f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapFullApiSelfTest.java
new file mode 100644
index 0000000..ea7cc61
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapFullApiSelfTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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.dht;
+
+public class GridCacheAtomicOnheapFullApiSelfTest extends GridCacheAtomicFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/99785f1f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
new file mode 100644
index 0000000..895699d
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicOnheapMultiNodeFullApiSelfTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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.dht;
+
+public class GridCacheAtomicOnheapMultiNodeFullApiSelfTest extends GridCacheAtomicOnheapFullApiSelfTest {
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 3;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/99785f1f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java
index b1fb215..14facae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest.java
@@ -25,4 +25,14 @@ public class GridCachePartitionedNearDisabledAtomicOnheapFullApiSelfTest extends
@Override protected CacheAtomicityMode atomicityMode() {
return CacheAtomicityMode.ATOMIC;
}
+
+ /** {@inheritDoc} */
+ @Override protected boolean txEnabled() {
+ return false;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected boolean lockingEnabled() {
+ return false;
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/99785f1f/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 f6b644e..0b8ccdf 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
@@ -224,10 +224,6 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache
assertNull(cache.localPeek(key, CachePeekMode.ONHEAP));
- cache.localPromote(Collections.singleton(key));
-
- assertNull(cache.localPeek(key, CachePeekMode.ONHEAP));
-
assertTrue(cache.localSize() == 0);
// Force reload on primary node.
http://git-wip-us.apache.org/repos/asf/ignite/blob/99785f1f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
index ac1faf8..33b550b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicOnheapMultiJvmFullApiSelfTest.java
@@ -18,9 +18,9 @@
package org.apache.ignite.internal.processors.cache.multijvm;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicOnheapMultiNodeFullApiSelfTest;
-public class GridCacheAtomicOnheapMultiJvmFullApiSelfTest extends GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest {
+public class GridCacheAtomicOnheapMultiJvmFullApiSelfTest extends GridCacheAtomicOnheapMultiNodeFullApiSelfTest {
/** {@inheritDoc} */
@Override protected boolean isMultiJvm() {
return true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/99785f1f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
index 9eeae05..d255246 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
@@ -22,6 +22,8 @@ import org.apache.ignite.internal.processors.cache.GridCacheClearSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicNearEnabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicOnheapFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicOnheapMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicPrimaryWriteOrderFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicPrimaryWriteOrderReloadAllSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicReloadAllSelfTest;
@@ -111,6 +113,7 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheReplicatedAtomicFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicNearEnabledFullApiSelfTest.class);
suite.addTestSuite(GridCacheAtomicNearEnabledPrimaryWriteOrderFullApiSelfTest.class);
+ suite.addTestSuite(GridCacheAtomicOnheapFullApiSelfTest.class);;
suite.addTestSuite(GridCachePartitionedOnheapFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedAtomicOnheapFullApiSelfTest.class);
@@ -176,6 +179,7 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCachePartitionedAtomicOnheapMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledOnheapMultiNodeFullApiSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOnheapMultiNodeFullApiSelfTest.class);
+ suite.addTestSuite(GridCacheAtomicOnheapMultiNodeFullApiSelfTest.class);;
// Old affinity assignment mode.
suite.addTestSuite(GridCachePartitionedLateAffDisabledMultiNodeFullApiSelfTest.class);
[13/53] [abbrv] ignite git commit: ignite-4535 : conflicts
Posted by ag...@apache.org.
ignite-4535 : conflicts
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/06d853d1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/06d853d1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/06d853d1
Branch: refs/heads/ignite-3477-master
Commit: 06d853d124c9cfc1cea5e13867edfa78c89a3d74
Parents: 952c0ef
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Mar 30 16:21:52 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Mar 30 16:21:52 2017 +0300
----------------------------------------------------------------------
modules/yardstick/config/benchmark-atomic.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/06d853d1/modules/yardstick/config/benchmark-atomic.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-atomic.properties b/modules/yardstick/config/benchmark-atomic.properties
index beb3ec1..aab4a6b 100644
--- a/modules/yardstick/config/benchmark-atomic.properties
+++ b/modules/yardstick/config/benchmark-atomic.properties
@@ -71,7 +71,7 @@ sm=PRIMARY_SYNC
# Run configuration.
# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-${b}-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-${b}-backup,\
"
[50/53] [abbrv] ignite git commit: ignite-4851 : Removed incorrect
assertion for publicSize.
Posted by ag...@apache.org.
ignite-4851 : Removed incorrect assertion for publicSize.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4e6e4a4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4e6e4a4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4e6e4a4
Branch: refs/heads/ignite-3477-master
Commit: b4e6e4a4abe0c3ca28ac58dccfc64c3682d69c36
Parents: f15e9a5
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 10 17:52:12 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 10 17:52:12 2017 +0300
----------------------------------------------------------------------
.../processors/cache/distributed/dht/GridDhtLocalPartition.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4e6e4a4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index cd69494..5c2445a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -984,7 +984,6 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
long state = this.state.get();
assert getPartState(state) != EVICTED;
- assert getSize(state) > 0;
if (this.state.compareAndSet(state, setSize(state, getSize(state) - 1)))
return;
[20/53] [abbrv] ignite git commit: ignite-4535 : Merge with
ignite-3477-master.
Posted by ag...@apache.org.
ignite-4535 : Merge with ignite-3477-master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48a8c40c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48a8c40c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48a8c40c
Branch: refs/heads/ignite-3477-master
Commit: 48a8c40cabb955749a261c412862a7fb67f44a8d
Parents: 51b0d00 fbc7315
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Mar 31 18:20:36 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Mar 31 18:20:36 2017 +0300
----------------------------------------------------------------------
.../computegrid/ComputeAsyncExample.java | 8 +-
.../ComputeFibonacciContinuationExample.java | 13 +-
.../examples/datagrid/CacheAsyncApiExample.java | 17 +-
.../datastructures/IgniteLockExample.java | 4 +-
.../datastructures/IgniteSemaphoreExample.java | 4 +-
.../examples/ScalarContinuationExample.scala | 10 +-
.../singlesplit/SingleSplitsLoadTest.java | 8 +-
.../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 6 +-
...3IpFinderAwsCredentialsProviderSelfTest.java | 2 +-
.../ignite/tests/utils/TestTransaction.java | 11 +
modules/clients/pom.xml | 7 +
.../src/test/config/jdbc-config-cache-store.xml | 124 +++
.../internal/client/ClientStartNodeTask.java | 10 +-
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 3 +
.../internal/jdbc2/JdbcConnectionSelfTest.java | 28 +-
.../internal/jdbc2/JdbcSpringSelfTest.java | 125 +++
.../JettyRestProcessorAbstractSelfTest.java | 3 +-
.../jdbc/AbstractJdbcPojoQuerySelfTest.java | 169 ++++
.../jdbc/JdbcPojoLegacyQuerySelfTest.java | 44 +
.../ignite/jdbc/JdbcPojoQuerySelfTest.java | 56 ++
.../jdbc/suite/IgniteJdbcDriverTestSuite.java | 5 +
.../java/org/apache/ignite/IgniteCache.java | 611 +++++++++++-
.../java/org/apache/ignite/IgniteCluster.java | 126 +++
.../java/org/apache/ignite/IgniteCompute.java | 262 ++++-
.../java/org/apache/ignite/IgniteEvents.java | 128 ++-
.../org/apache/ignite/IgniteFileSystem.java | 76 ++
.../java/org/apache/ignite/IgniteMessaging.java | 27 +
.../java/org/apache/ignite/IgniteServices.java | 221 ++++-
.../ignite/binary/BinaryObjectBuilder.java | 10 -
.../store/jdbc/CacheAbstractJdbcStore.java | 36 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java | 18 +-
.../configuration/CacheConfiguration.java | 25 +
.../configuration/MemoryConfiguration.java | 104 +-
.../MemoryPolicyConfiguration.java | 80 ++
.../apache/ignite/internal/GridComponent.java | 5 +-
.../ignite/internal/GridJobCancelRequest.java | 2 +-
.../ignite/internal/GridJobExecuteRequest.java | 2 +-
.../ignite/internal/GridJobExecuteResponse.java | 2 +-
.../ignite/internal/GridJobSiblingsRequest.java | 2 +-
.../internal/GridJobSiblingsResponse.java | 2 +-
.../ignite/internal/GridTaskCancelRequest.java | 2 +-
.../ignite/internal/GridTaskSessionRequest.java | 2 +-
.../org/apache/ignite/internal/GridTopic.java | 5 +-
.../ignite/internal/IgniteComputeImpl.java | 546 +++++++++--
.../ignite/internal/IgniteEventsImpl.java | 79 ++
.../apache/ignite/internal/IgniteKernal.java | 50 +-
.../ignite/internal/IgniteMessagingImpl.java | 65 +-
.../ignite/internal/IgniteServicesImpl.java | 108 +++
.../ignite/internal/MarshallerContextImpl.java | 4 +-
.../binary/BinaryCachingMetadataHandler.java | 6 +
.../internal/binary/BinaryClassDescriptor.java | 33 +-
.../ignite/internal/binary/BinaryContext.java | 29 +-
.../internal/binary/BinaryEnumObjectImpl.java | 2 +-
.../internal/binary/BinaryFieldMetadata.java | 127 +++
.../ignite/internal/binary/BinaryMetadata.java | 49 +-
.../binary/BinaryMetadataCollector.java | 17 +-
.../internal/binary/BinaryMetadataHandler.java | 18 +-
.../binary/BinaryNoopMetadataHandler.java | 5 +
.../internal/binary/BinaryObjectExImpl.java | 4 -
.../internal/binary/BinaryObjectImpl.java | 2 +-
.../binary/BinaryObjectOffheapImpl.java | 2 +-
.../internal/binary/BinaryReaderExImpl.java | 2 +-
.../ignite/internal/binary/BinaryUtils.java | 21 +-
.../internal/binary/BinaryWriterExImpl.java | 45 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 34 +-
.../internal/cluster/ClusterGroupAdapter.java | 2 +-
.../cluster/IgniteClusterAsyncImpl.java | 28 +-
.../internal/cluster/IgniteClusterImpl.java | 24 +-
.../internal/direct/DirectMessageWriter.java | 4 +-
.../stream/v1/DirectByteBufferStreamImplV1.java | 8 +-
.../stream/v2/DirectByteBufferStreamImplV2.java | 9 +-
.../ignite/internal/jdbc2/JdbcConnection.java | 19 +-
.../ignite/internal/jdbc2/JdbcQueryTask.java | 2 +-
.../ignite/internal/jdbc2/JdbcQueryTaskV2.java | 2 +-
.../checkpoint/GridCheckpointRequest.java | 2 +-
.../managers/communication/GridIoMessage.java | 2 +-
.../communication/GridIoMessageFactory.java | 23 +-
.../communication/GridIoUserMessage.java | 2 +-
.../communication/IgniteIoTestMessage.java | 2 +-
.../deployment/GridDeploymentInfoBean.java | 2 +-
.../deployment/GridDeploymentRequest.java | 2 +-
.../deployment/GridDeploymentResponse.java | 2 +-
.../discovery/DiscoveryCustomMessage.java | 48 +
.../discovery/GridDiscoveryManager.java | 38 +-
.../eventstorage/GridEventStorageManager.java | 6 +-
.../eventstorage/GridEventStorageMessage.java | 2 +-
.../snapshot/SnapshotFinishedMessage.java | 2 +-
.../snapshot/SnapshotProgressMessage.java | 2 +-
.../affinity/AffinityTopologyVersion.java | 2 +-
.../cache/CacheAffinitySharedManager.java | 4 -
.../cache/CacheEntryInfoCollection.java | 2 +-
.../cache/CacheEntryPredicateAdapter.java | 2 +-
.../cache/CacheEntryPredicateContainsValue.java | 2 +-
.../cache/CacheEntrySerializablePredicate.java | 2 +-
.../processors/cache/CacheEvictionEntry.java | 2 +-
.../cache/CacheInvokeDirectResult.java | 2 +-
.../cache/CacheObjectByteArrayImpl.java | 2 +-
.../processors/cache/CacheObjectImpl.java | 18 +-
.../processors/cache/GridCacheAdapter.java | 187 +---
.../processors/cache/GridCacheContext.java | 43 +
.../processors/cache/GridCacheEntryInfo.java | 2 +-
.../cache/GridCacheEvictionRequest.java | 2 +-
.../cache/GridCacheEvictionResponse.java | 2 +-
.../GridCachePartitionExchangeManager.java | 12 +-
.../processors/cache/GridCacheProcessor.java | 21 +-
.../processors/cache/GridCacheReturn.java | 2 +-
.../processors/cache/GridCacheUtils.java | 4 -
.../GridChangeGlobalStateMessageResponse.java | 2 +-
.../cache/IgniteCacheOffheapManagerImpl.java | 52 +-
.../processors/cache/IgniteCacheProxy.java | 580 ++++++++++-
.../processors/cache/KeyCacheObjectImpl.java | 2 +-
.../cache/binary/BinaryMetadataHolder.java | 73 ++
.../cache/binary/BinaryMetadataTransport.java | 641 ++++++++++++
.../binary/BinaryMetadataUpdatedListener.java | 29 +
.../binary/CacheObjectBinaryProcessor.java | 12 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 504 +++-------
.../binary/ClientMetadataRequestFuture.java | 161 ++++
.../cache/binary/MetadataRequestMessage.java | 122 +++
.../cache/binary/MetadataResponseMessage.java | 195 ++++
.../binary/MetadataUpdateAcceptedMessage.java | 96 ++
.../binary/MetadataUpdateProposedMessage.java | 224 +++++
.../cache/binary/MetadataUpdateResult.java | 96 ++
.../cache/database/CacheDataRowAdapter.java | 4 +-
.../IgniteCacheDatabaseSharedManager.java | 354 ++++++-
.../processors/cache/database/MemoryPolicy.java | 53 +
.../processors/cache/database/RowStore.java | 2 +-
.../cache/database/freelist/PagesList.java | 221 +++--
.../distributed/GridCacheTtlUpdateRequest.java | 2 +-
.../distributed/GridCacheTxRecoveryRequest.java | 2 +-
.../GridCacheTxRecoveryResponse.java | 2 +-
.../distributed/GridDistributedLockRequest.java | 2 +-
.../GridDistributedLockResponse.java | 2 +-
.../GridDistributedTxFinishRequest.java | 2 +-
.../GridDistributedTxFinishResponse.java | 2 +-
.../GridDistributedTxPrepareRequest.java | 2 +-
.../GridDistributedTxPrepareResponse.java | 2 +-
.../GridDistributedUnlockRequest.java | 2 +-
.../dht/GridClientPartitionTopology.java | 46 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 2 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 103 +-
.../distributed/dht/GridDhtLockRequest.java | 2 +-
.../distributed/dht/GridDhtLockResponse.java | 2 +-
.../dht/GridDhtPartitionTopology.java | 12 +-
.../dht/GridDhtPartitionTopologyImpl.java | 54 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 2 +-
.../dht/GridDhtTxFinishResponse.java | 2 +-
.../dht/GridDhtTxOnePhaseCommitAckRequest.java | 2 +-
.../dht/GridDhtTxPrepareRequest.java | 2 +-
.../dht/GridDhtTxPrepareResponse.java | 2 +-
.../distributed/dht/GridDhtUnlockRequest.java | 2 +-
.../dht/GridPartitionedGetFuture.java | 8 +-
.../dht/GridPartitionedSingleGetFuture.java | 56 +-
.../dht/atomic/GridDhtAtomicCache.java | 5 +
.../GridDhtAtomicDeferredUpdateResponse.java | 2 +-
.../dht/atomic/GridDhtAtomicNearResponse.java | 2 +-
.../GridDhtAtomicSingleUpdateRequest.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 2 +-
.../GridNearAtomicCheckUpdateRequest.java | 2 +-
.../atomic/GridNearAtomicFullUpdateRequest.java | 2 +-
...GridNearAtomicSingleUpdateFilterRequest.java | 2 +-
...GridNearAtomicSingleUpdateInvokeRequest.java | 2 +-
.../GridNearAtomicSingleUpdateRequest.java | 2 +-
.../atomic/GridNearAtomicUpdateResponse.java | 2 +-
.../dht/atomic/NearCacheUpdates.java | 2 +-
.../distributed/dht/atomic/UpdateErrors.java | 2 +-
.../colocated/GridDhtColocatedLockFuture.java | 1 +
.../dht/preloader/GridDhtForceKeysRequest.java | 2 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 2 +-
.../GridDhtPartitionDemandMessage.java | 2 +-
.../dht/preloader/GridDhtPartitionDemander.java | 501 +---------
.../preloader/GridDhtPartitionExchangeId.java | 2 +-
.../dht/preloader/GridDhtPartitionFullMap.java | 22 +-
.../dht/preloader/GridDhtPartitionMap.java | 325 +++++++
.../dht/preloader/GridDhtPartitionMap2.java | 327 -------
.../GridDhtPartitionSupplyMessage.java | 2 +-
.../GridDhtPartitionSupplyMessageV2.java | 2 +-
.../GridDhtPartitionsAbstractMessage.java | 4 -
.../GridDhtPartitionsExchangeFuture.java | 2 +-
.../preloader/GridDhtPartitionsFullMessage.java | 8 +-
.../GridDhtPartitionsSingleMessage.java | 12 +-
.../GridDhtPartitionsSingleRequest.java | 2 +-
.../dht/preloader/GridDhtPreloader.java | 18 +-
.../distributed/near/CacheVersionedValue.java | 2 +-
.../distributed/near/GridNearGetRequest.java | 2 +-
.../distributed/near/GridNearGetResponse.java | 2 +-
.../distributed/near/GridNearLockFuture.java | 1 +
.../distributed/near/GridNearLockRequest.java | 2 +-
.../distributed/near/GridNearLockResponse.java | 2 +-
.../near/GridNearSingleGetRequest.java | 2 +-
.../near/GridNearSingleGetResponse.java | 2 +-
.../near/GridNearTxFinishRequest.java | 2 +-
.../near/GridNearTxFinishResponse.java | 2 +-
.../near/GridNearTxPrepareRequest.java | 2 +-
.../near/GridNearTxPrepareResponse.java | 2 +-
.../distributed/near/GridNearUnlockRequest.java | 2 +-
.../query/GridCacheDistributedQueryManager.java | 7 +-
.../cache/query/GridCacheLocalQueryFuture.java | 3 +-
.../cache/query/GridCacheQueryManager.java | 3 +-
.../cache/query/GridCacheQueryRequest.java | 2 +-
.../cache/query/GridCacheQueryResponse.java | 2 +-
.../cache/query/GridCacheSqlQuery.java | 2 +-
.../CacheContinuousQueryBatchAck.java | 6 +-
.../continuous/CacheContinuousQueryEntry.java | 2 +-
.../continuous/CacheContinuousQueryHandler.java | 6 +-
.../continuous/CacheContinuousQueryManager.java | 87 +-
.../query/jdbc/GridCacheQueryJdbcTask.java | 4 +-
.../store/GridCacheStoreManagerAdapter.java | 35 +-
.../cache/transactions/IgniteTxEntry.java | 2 +-
.../cache/transactions/IgniteTxKey.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 2 +
.../transactions/TransactionProxyImpl.java | 39 +-
.../cache/transactions/TxEntryValueHolder.java | 2 +-
.../processors/cache/transactions/TxLock.java | 2 +-
.../cache/transactions/TxLockList.java | 2 +-
.../cache/transactions/TxLocksRequest.java | 2 +-
.../cache/transactions/TxLocksResponse.java | 2 +-
.../version/GridCacheRawVersionedEntry.java | 2 +-
.../cache/version/GridCacheVersion.java | 2 +-
.../cache/version/GridCacheVersionEx.java | 2 +-
.../clock/GridClockDeltaSnapshotMessage.java | 2 +-
.../processors/clock/GridClockDeltaVersion.java | 2 +-
.../closure/GridClosureProcessor.java | 398 +-------
.../continuous/GridContinuousMessage.java | 2 +-
.../continuous/GridContinuousProcessor.java | 3 -
.../datastreamer/DataStreamerEntry.java | 2 +-
.../datastreamer/DataStreamerRequest.java | 2 +-
.../datastreamer/DataStreamerResponse.java | 2 +-
.../internal/processors/hadoop/HadoopJobId.java | 2 +-
.../shuffle/HadoopDirectShuffleMessage.java | 2 +-
.../hadoop/shuffle/HadoopShuffleAck.java | 2 +-
.../shuffle/HadoopShuffleFinishRequest.java | 2 +-
.../shuffle/HadoopShuffleFinishResponse.java | 2 +-
.../hadoop/shuffle/HadoopShuffleMessage.java | 2 +-
.../processors/igfs/IgfsAckMessage.java | 2 +-
.../internal/processors/igfs/IgfsAsyncImpl.java | 43 +-
.../internal/processors/igfs/IgfsBlockKey.java | 3 +-
.../processors/igfs/IgfsBlocksMessage.java | 2 +-
.../processors/igfs/IgfsDeleteMessage.java | 2 +-
.../processors/igfs/IgfsFileAffinityRange.java | 2 +-
.../igfs/IgfsFragmentizerRequest.java | 2 +-
.../igfs/IgfsFragmentizerResponse.java | 2 +-
.../internal/processors/igfs/IgfsImpl.java | 62 +-
.../processors/igfs/IgfsSyncMessage.java | 2 +-
.../GridMarshallerMappingProcessor.java | 6 +-
.../MissingMappingRequestMessage.java | 2 +-
.../MissingMappingResponseMessage.java | 2 +-
.../platform/PlatformAbstractTarget.java | 24 +-
.../platform/PlatformAsyncTarget.java | 44 -
.../platform/PlatformContextImpl.java | 82 +-
.../platform/PlatformTargetProxy.java | 22 -
.../platform/PlatformTargetProxyImpl.java | 36 +-
.../platform/cache/PlatformCache.java | 218 +++--
.../platform/compute/PlatformCompute.java | 14 +-
.../dotnet/PlatformDotNetCacheStore.java | 12 +-
...formDotNetEntityFrameworkCacheExtension.java | 8 +-
.../platform/events/PlatformEvents.java | 70 +-
.../memory/PlatformOutputStreamImpl.java | 8 +-
.../platform/messaging/PlatformMessaging.java | 35 +-
.../platform/services/PlatformServices.java | 95 +-
.../transactions/PlatformTransactions.java | 9 +-
.../utils/PlatformConfigurationUtils.java | 2 +
.../processors/query/GridQueryProcessor.java | 10 +-
.../query/QueryTypeDescriptorImpl.java | 17 -
.../messages/GridQueryCancelRequest.java | 2 +-
.../twostep/messages/GridQueryFailResponse.java | 2 +-
.../messages/GridQueryNextPageRequest.java | 2 +-
.../messages/GridQueryNextPageResponse.java | 2 +-
.../h2/twostep/messages/GridQueryRequest.java | 368 -------
.../handlers/task/GridTaskResultRequest.java | 2 +-
.../handlers/task/GridTaskResultResponse.java | 2 +-
.../service/GridServiceProcessor.java | 139 +--
.../processors/task/GridTaskProcessor.java | 9 +-
.../ignite/internal/util/GridByteArrayList.java | 2 +-
.../ignite/internal/util/GridLongList.java | 2 +-
.../internal/util/GridMessageCollection.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 10 -
.../internal/util/UUIDCollectionMessage.java | 2 +-
.../internal/util/nio/GridDirectParser.java | 12 +-
.../ignite/internal/visor/cache/VisorCache.java | 13 +-
.../visor/cache/VisorCacheClearTask.java | 14 +-
.../visor/compute/VisorGatewayTask.java | 6 +-
.../visor/node/VisorGridConfiguration.java | 2 +-
.../visor/node/VisorMemoryConfiguration.java | 55 +-
.../node/VisorMemoryPolicyConfiguration.java | 72 ++
.../visor/node/VisorNodeDataCollectorJob.java | 15 +-
.../internal/visor/query/VisorQueryArg.java | 27 +-
.../internal/visor/query/VisorQueryJob.java | 6 +-
.../apache/ignite/lang/IgniteAsyncSupport.java | 52 +-
.../ignite/lang/IgniteAsyncSupported.java | 4 +-
.../extensions/communication/Message.java | 5 +-
.../communication/MessageFactory.java | 2 +-
.../extensions/communication/MessageWriter.java | 5 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../jobstealing/JobStealingRequest.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 148 +--
.../ignite/spi/discovery/tcp/ServerImpl.java | 104 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 -
.../messages/TcpDiscoveryClientAckResponse.java | 4 -
.../apache/ignite/transactions/Transaction.java | 22 +
.../resources/META-INF/classnames.properties | 142 +--
.../ignite/cache/LargeEntryUpdateTest.java | 176 ++++
.../IgniteCacheExpiryStoreLoadSelfTest.java | 18 +-
.../internal/ClusterGroupAbstractTest.java | 73 +-
.../ComputeJobCancelWithServiceSelfTest.java | 7 +-
.../internal/GridAffinityNoCacheSelfTest.java | 2 +-
.../internal/GridCancelOnGridStopSelfTest.java | 2 +-
.../GridCancelledJobsMetricsSelfTest.java | 11 +-
.../internal/GridContinuousTaskSelfTest.java | 21 +-
.../GridEventStorageCheckAllEventsSelfTest.java | 12 +-
.../GridFailoverCustomTopologySelfTest.java | 7 +-
.../GridJobMasterLeaveAwareSelfTest.java | 93 +-
.../internal/GridMultipleJobsSelfTest.java | 8 +-
.../ignite/internal/GridReduceSelfTest.java | 9 +-
.../GridTaskCancelSingleNodeSelfTest.java | 7 +-
.../internal/GridTaskExecutionSelfTest.java | 58 +-
...xecutionWithoutPeerClassLoadingSelfTest.java | 31 +
.../GridTaskFailoverAffinityRunTest.java | 7 +-
.../GridTaskInstanceExecutionSelfTest.java | 7 +-
.../internal/GridTaskJobRejectSelfTest.java | 7 +-
.../IgniteClientReconnectApiExceptionTest.java | 10 +-
.../IgniteComputeEmptyClusterGroupTest.java | 26 +-
.../binary/BinaryMarshallerSelfTest.java | 4 -
.../BinaryObjectBuilderAdditionalSelfTest.java | 9 +-
...naryObjectBuilderDefaultMappersSelfTest.java | 127 +--
.../binary/BinaryObjectExceptionSelfTest.java | 209 ----
.../binary/TestCachingMetadataHandler.java | 5 +
...ByteBufferStreamImplV2ByteOrderSelfTest.java | 2 +-
...GridManagerLocalMessageListenerSelfTest.java | 2 +-
.../GridCommunicationSendMessageSelfTest.java | 79 +-
.../communication/GridIoManagerSelfTest.java | 2 +-
.../cache/CacheConcurrentReadThroughTest.java | 8 +-
.../cache/CacheConfigurationLeakTest.java | 8 +-
...CacheExchangeMessageDuplicatedStateTest.java | 12 +-
.../cache/CacheFutureExceptionSelfTest.java | 6 +-
.../CacheMemoryPolicyConfigurationTest.java | 164 ++++
.../CachePutEventListenerErrorSelfTest.java | 7 +-
...idAbstractCacheInterceptorRebalanceTest.java | 3 +-
.../GridCacheAbstractFailoverSelfTest.java | 10 +-
...cheAbstractFullApiMultithreadedSelfTest.java | 105 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 876 ++++++++++++++---
.../cache/GridCacheAbstractMetricsSelfTest.java | 52 +-
.../GridCacheAsyncOperationsLimitSelfTest.java | 9 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 10 +-
.../GridCacheConditionalDeploymentSelfTest.java | 4 +-
.../GridCacheInterceptorAbstractSelfTest.java | 31 +-
.../GridCacheMissingCommitVersionSelfTest.java | 6 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 16 +-
.../GridCacheReferenceCleanupSelfTest.java | 15 +-
...ridCacheStoreManagerDeserializationTest.java | 1 -
.../cache/GridCacheUtilsSelfTest.java | 4 -
...calCacheStoreManagerDeserializationTest.java | 2 +-
.../IgniteCacheAbstractStopBusySelfTest.java | 7 +-
.../IgniteCacheBinaryObjectsScanSelfTest.java | 2 +-
.../IgniteCacheConfigVariationsFullApiTest.java | 965 +++++++++++++++++--
.../cache/IgniteCacheInvokeAbstractTest.java | 20 +-
.../IgniteCacheManyAsyncOperationsTest.java | 6 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 34 +-
.../IgniteIncompleteCacheObjectSelfTest.java | 2 +-
.../cache/MemoryPolicyConfigValidationTest.java | 241 +++++
.../cache/WithKeepBinaryCacheFullApiTest.java | 228 ++---
.../binary/BinaryMetadataUpdatesFlowTest.java | 592 ++++++++++++
.../CacheKeepBinaryWithInterceptorTest.java | 16 +-
...naryObjectMetadataExchangeMultinodeTest.java | 463 +++++++++
.../GridCacheBinaryObjectsAbstractSelfTest.java | 111 +--
...eAbstractDataStructuresFailoverSelfTest.java | 7 +-
...ridCacheQueueJoinedNodeSelfAbstractTest.java | 12 +-
.../IgniteCountDownLatchAbstractSelfTest.java | 7 +-
.../IgniteLockAbstractSelfTest.java | 7 +-
.../IgniteSemaphoreAbstractSelfTest.java | 7 +-
...acheAsyncOperationsFailoverAbstractTest.java | 12 +-
.../distributed/CacheAsyncOperationsTest.java | 32 +-
.../CachePutAllFailoverAbstractTest.java | 8 +-
.../GridCacheAbstractJobExecutionTest.java | 15 +-
.../GridCacheBasicOpAbstractTest.java | 38 +-
.../distributed/GridCacheEventAbstractTest.java | 80 +-
.../GridCacheMultiNodeAbstractTest.java | 25 +-
...yMetadataUpdateChangingTopologySelfTest.java | 13 +-
.../IgniteCacheConnectionRecoveryTest.java | 10 +-
...eCacheMessageRecoveryIdleConnectionTest.java | 6 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 6 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 12 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 4 +-
.../dht/GridCacheGlobalLoadTest.java | 21 +-
.../dht/GridCacheTxNodeFailureSelfTest.java | 12 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 26 +-
.../atomic/IgniteCacheAtomicProtocolTest.java | 34 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 11 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 9 +-
.../GridCacheRebalancingSyncSelfTest.java | 7 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 21 +-
.../cache/query/IndexingSpiQuerySelfTest.java | 3 +
.../CacheContinuousQueryVariationsTest.java | 5 +
.../GridCacheContinuousQueryConcurrentTest.java | 5 +-
.../closure/GridClosureProcessorSelfTest.java | 74 +-
...ComputeJobExecutionErrorToLogManualTest.java | 10 +-
...gniteComputeConfigVariationsFullApiTest.java | 533 +++++++++-
.../continuous/GridEventConsumeSelfTest.java | 196 +++-
.../database/FreeListImplSelfTest.java | 2 +-
.../database/IgniteDbAbstractTest.java | 367 +++++++
.../database/IgniteDbDynamicCacheSelfTest.java | 9 +-
.../IgniteDbMemoryLeakAbstractTest.java | 259 +++++
.../IgniteDbMemoryLeakLargeObjectsTest.java | 56 ++
.../IgniteDbMemoryLeakLargePagesTest.java | 33 +
.../IgniteDbMemoryLeakNonTransactionalTest.java | 31 +
.../database/IgniteDbMemoryLeakTest.java | 46 +
.../IgniteDbMemoryLeakWithExpirationTest.java | 44 +
.../database/IgniteDbPutGetAbstractTest.java | 331 +------
.../internal/processors/igfs/IgfsMock.java | 41 +
.../processors/igfs/IgfsTaskSelfTest.java | 19 +
...niteMessagingConfigVariationFullApiTest.java | 93 +-
.../GridServiceProcessorAbstractSelfTest.java | 291 +++++-
.../GridServiceProcessorMultiNodeSelfTest.java | 18 +-
.../GridServiceProcessorStopSelfTest.java | 7 +-
.../nio/IgniteExceptionInNioWorkerSelfTest.java | 2 +-
.../loadtest/GridSingleExecutionTest.java | 10 +-
.../loadtests/colocation/GridTestMain.java | 7 +-
.../communication/GridTestMessage.java | 2 +-
.../multisplit/GridMultiSplitsLoadTest.java | 7 +-
...ridSingleSplitsNewNodesAbstractLoadTest.java | 8 +-
.../ignite/loadtests/dsi/GridDsiClient.java | 12 +-
.../loadtests/hashmap/GridCacheTestContext.java | 3 +
...GridJobExecutionLoadTestClientSemaphore.java | 9 +-
...JobExecutionSingleNodeSemaphoreLoadTest.java | 10 +-
.../loadtests/job/GridJobLoadTestSubmitter.java | 7 +-
.../mergesort/GridMergeSortLoadTask.java | 7 +-
.../marshaller/MarshallerContextSelfTest.java | 10 +-
.../ignite/messaging/GridMessagingSelfTest.java | 73 +-
.../messaging/IgniteMessagingSendAsyncTest.java | 83 +-
...idSessionFutureWaitJobAttributeSelfTest.java | 7 +-
...GridSessionSetJobAttributeOrderSelfTest.java | 8 +-
...sionSetJobAttributeWaitListenerSelfTest.java | 7 +-
.../GridSessionSetTaskAttributeSelfTest.java | 7 +-
...GridSessionTaskWaitJobAttributeSelfTest.java | 7 +-
.../GridSessionWaitAttributeSelfTest.java | 9 +-
.../communication/GridCacheMessageSelfTest.java | 20 +-
.../spi/communication/GridTestMessage.java | 4 +-
.../TcpDiscoverySpiFailureTimeoutSelfTest.java | 60 --
.../ignite/testframework/GridTestUtils.java | 60 ++
.../testframework/junits/GridAbstractTest.java | 68 +-
.../cache/GridAbstractCacheStoreSelfTest.java | 11 +
.../junits/common/GridCommonAbstractTest.java | 30 +-
.../multijvm/IgniteCacheProcessProxy.java | 172 ++++
.../multijvm/IgniteClusterProcessProxy.java | 13 +
.../multijvm/IgniteEventsProcessProxy.java | 31 +
.../IgniteBinaryObjectsTestSuite.java | 6 +-
.../testsuites/IgniteCacheTestSuite2.java | 4 +
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
.../testsuites/IgniteDbMemoryLeakTestSuite.java | 49 +
.../ignite/util/GridMessageCollectionTest.java | 5 +-
.../query/h2/DmlStatementsProcessor.java | 35 -
.../processors/query/h2/IgniteH2Indexing.java | 28 +-
.../query/h2/database/H2TreeIndex.java | 23 +-
.../processors/query/h2/opt/GridH2Table.java | 25 +-
.../query/h2/opt/GridH2TreeIndex.java | 16 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 39 -
.../h2/twostep/GridReduceQueryExecutor.java | 61 +-
.../query/h2/twostep/msg/GridH2Array.java | 2 +-
.../query/h2/twostep/msg/GridH2Boolean.java | 2 +-
.../query/h2/twostep/msg/GridH2Byte.java | 2 +-
.../query/h2/twostep/msg/GridH2Bytes.java | 2 +-
.../query/h2/twostep/msg/GridH2CacheObject.java | 2 +-
.../query/h2/twostep/msg/GridH2Date.java | 2 +-
.../query/h2/twostep/msg/GridH2Decimal.java | 2 +-
.../query/h2/twostep/msg/GridH2Double.java | 2 +-
.../query/h2/twostep/msg/GridH2Float.java | 2 +-
.../query/h2/twostep/msg/GridH2Geometry.java | 2 +-
.../h2/twostep/msg/GridH2IndexRangeRequest.java | 2 +-
.../twostep/msg/GridH2IndexRangeResponse.java | 2 +-
.../query/h2/twostep/msg/GridH2Integer.java | 2 +-
.../query/h2/twostep/msg/GridH2JavaObject.java | 2 +-
.../query/h2/twostep/msg/GridH2Long.java | 2 +-
.../query/h2/twostep/msg/GridH2Null.java | 2 +-
.../h2/twostep/msg/GridH2QueryRequest.java | 2 +-
.../query/h2/twostep/msg/GridH2RowMessage.java | 2 +-
.../query/h2/twostep/msg/GridH2RowRange.java | 2 +-
.../h2/twostep/msg/GridH2RowRangeBounds.java | 2 +-
.../query/h2/twostep/msg/GridH2Short.java | 2 +-
.../query/h2/twostep/msg/GridH2String.java | 2 +-
.../query/h2/twostep/msg/GridH2Time.java | 2 +-
.../query/h2/twostep/msg/GridH2Timestamp.java | 2 +-
.../query/h2/twostep/msg/GridH2Uuid.java | 2 +-
.../twostep/msg/GridH2ValueMessageFactory.java | 2 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 13 +-
.../IgniteCacheInsertSqlQuerySelfTest.java | 4 +
...niteCacheLockPartitionOnAffinityRunTest.java | 6 +-
.../cache/IgniteCacheMergeSqlQuerySelfTest.java | 4 +
.../cache/IgniteCacheQueryLoadSelfTest.java | 20 +-
.../cache/IncorrectCacheTypeMetadataTest.java | 8 +-
.../cache/IncorrectQueryEntityTest.java | 8 +-
.../IgniteCachePartitionedQuerySelfTest.java | 2 +-
.../database/IgniteDbMemoryLeakIndexedTest.java | 33 +
.../IgniteDbMemoryLeakSqlQueryTest.java | 76 ++
.../query/IgniteQueryDedicatedPoolTest.java | 223 +++++
.../query/IgniteSqlQueryDedicatedPoolTest.java | 110 ---
.../query/IgniteSqlSegmentedIndexSelfTest.java | 26 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 198 ++--
.../query/h2/opt/GridH2TableSelfTest.java | 3 +-
.../query/h2/sql/GridQueryParsingTest.java | 112 +--
.../query/h2/sql/H2CompareBigQueryTest.java | 2 +-
.../IgniteCacheQuerySelfTestSuite.java | 4 +-
...IgniteDbMemoryLeakWithIndexingTestSuite.java | 40 +
modules/platforms/cpp/binary/Makefile.am | 2 +-
.../platforms/cpp/binary/include/Makefile.am | 1 +
.../include/ignite/binary/binary_object.h | 75 +-
.../ignite/impl/binary/binary_field_meta.h | 110 +++
.../ignite/impl/binary/binary_id_resolver.h | 96 +-
.../ignite/impl/binary/binary_object_header.h | 13 +
.../ignite/impl/binary/binary_object_impl.h | 124 ++-
.../include/ignite/impl/binary/binary_schema.h | 10 +-
.../ignite/impl/binary/binary_type_handler.h | 47 +-
.../ignite/impl/binary/binary_type_manager.h | 48 +-
.../ignite/impl/binary/binary_type_snapshot.h | 82 +-
.../ignite/impl/binary/binary_type_updater.h | 19 +-
.../ignite/impl/binary/binary_writer_impl.h | 17 +-
.../cpp/binary/project/vs/binary.vcxproj | 3 +-
.../binary/project/vs/binary.vcxproj.filters | 9 +-
.../src/impl/binary/binary_field_meta.cpp | 42 +
.../src/impl/binary/binary_object_impl.cpp | 139 ++-
.../src/impl/binary/binary_type_handler.cpp | 45 +-
.../src/impl/binary/binary_type_manager.cpp | 187 ++--
.../src/impl/binary/binary_type_snapshot.cpp | 50 +-
.../src/impl/binary/binary_type_updater.cpp | 32 -
.../cpp/core-test/config/cache-identity.xml | 33 +
.../cpp/core-test/config/cache-query-32.xml | 50 +
.../config/cache-query-continuous-32.xml | 46 +
.../config/cache-query-continuous-default.xml | 87 ++
.../core-test/config/cache-query-continuous.xml | 61 +-
.../core-test/config/cache-query-default.xml | 131 +++
.../cpp/core-test/config/cache-query.xml | 114 +--
.../cpp/core-test/config/cache-test-32.xml | 50 +
.../cpp/core-test/config/cache-test-default.xml | 135 +++
.../cpp/core-test/config/cache-test.xml | 105 +-
.../core-test/include/ignite/binary_test_defs.h | 5 +
.../cpp/core-test/project/vs/core-test.vcxproj | 7 +
.../project/vs/core-test.vcxproj.filters | 21 +
.../src/binary_identity_resolver_test.cpp | 91 +-
.../cpp/core-test/src/binary_object_test.cpp | 220 ++++-
.../cpp/core-test/src/cache_invoke_test.cpp | 2 +
.../cpp/core-test/src/cache_query_test.cpp | 4 +
.../platforms/cpp/core-test/src/cache_test.cpp | 5 +
.../cpp/core-test/src/cluster_test.cpp | 5 +-
.../cpp/core-test/src/continuous_query_test.cpp | 4 +
.../cpp/core-test/src/ignition_test.cpp | 4 +
.../cpp/core-test/src/interop_test.cpp | 4 +
.../cpp/core-test/src/transactions_test.cpp | 4 +
.../impl/binary/binary_type_updater_impl.h | 6 +-
.../cpp/core/include/ignite/impl/ignite_impl.h | 11 +
.../ignite/impl/interop/interop_target.h | 2 +-
.../impl/binary/binary_type_updater_impl.cpp | 101 +-
.../cpp/core/src/impl/ignite_environment.cpp | 4 +-
.../core/src/impl/interop/interop_target.cpp | 2 +-
.../cpp/jni/include/ignite/jni/exports.h | 2 -
.../platforms/cpp/jni/include/ignite/jni/java.h | 4 -
modules/platforms/cpp/jni/project/vs/module.def | 2 -
modules/platforms/cpp/jni/src/exports.cpp | 8 -
modules/platforms/cpp/jni/src/java.cpp | 20 -
.../cpp/odbc-test/config/queries-test-32.xml | 47 +
.../odbc-test/config/queries-test-default.xml | 38 +
.../odbc-test/config/queries-test-noodbc-32.xml | 47 +
.../cpp/odbc-test/config/queries-test.xml | 11 +-
.../cpp/odbc-test/project/vs/odbc-test.vcxproj | 3 +
.../project/vs/odbc-test.vcxproj.filters | 6 +
.../cpp/odbc-test/src/api_robustness_test.cpp | 20 +-
.../cpp/odbc-test/src/queries_test.cpp | 8 +
.../odbc-test/src/sql_test_suite_fixture.cpp | 6 +-
.../cpp/odbc/install/install_amd64.cmd | 4 +-
.../platforms/cpp/odbc/install/install_x86.cmd | 2 +-
.../Apache.Ignite.Core.Tests.csproj | 1 -
.../Binary/BinaryBuilderSelfTest.cs | 151 +--
.../BinaryBuilderSelfTestArrayIdentity.cs | 34 -
.../Binary/BinarySelfTest.cs | 8 -
.../Cache/CacheConfigurationTest.cs | 4 +-
.../Cache/Query/CacheDmlQueriesTest.cs | 5 +-
.../Cache/Query/CacheLinqTest.cs | 129 +--
.../Query/CacheQueriesCodeConfigurationTest.cs | 7 +
.../Cache/Store/CacheStoreAdapterTest.cs | 14 +-
.../Cache/Store/CacheStoreSessionTest.cs | 2 +-
.../Cache/Store/CacheTestParallelLoadStore.cs | 16 +-
.../Cache/Store/CacheTestStore.cs | 13 +-
.../Apache.Ignite.Core.Tests/EventsTest.cs | 1 -
.../IgniteConfigurationSerializerTest.cs | 6 +-
.../Apache.Ignite.Core.csproj | 8 +-
.../Binary/BinaryArrayEqualityComparer.cs | 8 +
.../Binary/IBinaryObjectBuilder.cs | 10 -
.../Cache/Affinity/AffinityFunctionBase.cs | 139 +++
.../Cache/Affinity/Fair/FairAffinityFunction.cs | 1 -
.../Rendezvous/RendezvousAffinityFunction.cs | 1 -
.../Cache/Configuration/CacheConfiguration.cs | 2 +-
.../Cache/Configuration/QueryEntity.cs | 8 +
.../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 12 +-
.../Store/CacheParallelLoadStoreAdapter.cs | 38 +-
.../Cache/Store/CacheStoreAdapter.cs | 30 +-
.../Cache/Store/ICacheStore.cs | 39 +-
.../Cache/Store/ICacheStoreSession.cs | 2 +-
.../Datastream/IDataStreamer.cs | 2 +-
.../Apache.Ignite.Core/Events/CacheEvent.cs | 8 -
.../IgniteConfigurationSection.xsd | 7 +
.../Impl/Binary/BinaryObject.cs | 72 +-
.../Impl/Binary/BinaryObjectBuilder.cs | 67 +-
.../Impl/Binary/BinaryProcessor.cs | 3 +-
.../Impl/Binary/BinaryUtils.cs | 10 +
.../Impl/Binary/BinaryWriter.cs | 10 +-
.../Impl/Binary/IBinaryEqualityComparer.cs | 10 +
.../Impl/Binary/Io/IBinaryStream.cs | 3 +-
.../Impl/Binary/Io/IBinaryStreamProcessor.cs | 5 +-
.../Impl/Binary/Marshaller.cs | 6 +-
.../Impl/Binary/Metadata/BinaryField.cs | 72 ++
.../Impl/Binary/Metadata/BinaryType.cs | 38 +-
.../Binary/Metadata/BinaryTypeHashsetHandler.cs | 10 +-
.../Impl/Binary/Metadata/BinaryTypeHolder.cs | 9 +-
.../Impl/Binary/Metadata/IBinaryTypeHandler.cs | 4 +-
.../Impl/Cache/Affinity/AffinityFunctionBase.cs | 140 ---
.../Impl/Cache/Store/CacheStore.cs | 233 +----
.../Impl/Cache/Store/CacheStoreInternal.cs | 285 ++++++
.../Impl/Cache/Store/ICacheStoreInternal.cs | 43 +
.../Impl/Collections/MultiValueDictionary.cs | 2 +-
.../Apache.Ignite.Core/Impl/Common/Future.cs | 3 +-
.../Impl/Common/IFutureConverter.cs | 4 +-
.../Impl/Common/IFutureInternal.cs | 3 +-
.../Impl/Common/LoadedAssembliesResolver.cs | 2 +-
.../Apache.Ignite.Core/Impl/Handle/Handle.cs | 2 +-
.../Impl/Handle/HandleRegistry.cs | 2 +-
.../Apache.Ignite.Core/Impl/Handle/IHandle.cs | 2 +-
.../Impl/Memory/IPlatformMemory.cs | 5 +-
.../Impl/Memory/PlatformMemory.cs | 3 +-
.../Impl/Memory/PlatformMemoryManager.cs | 4 +-
.../Impl/Memory/PlatformMemoryPool.cs | 3 +-
.../Impl/Memory/PlatformMemoryStream.cs | 3 +-
.../Impl/Memory/PlatformRawMemory.cs | 96 --
.../Apache.Ignite.Linq.csproj | 1 -
.../dotnet/Apache.Ignite.Linq/CompiledQuery.cs | 112 ++-
.../dotnet/Apache.Ignite.Linq/CompiledQuery2.cs | 257 -----
.../Impl/CacheFieldsQueryProvider.cs | 10 +-
.../Datagrid/LinqExample.cs | 2 +-
.../Datagrid/StoreExample.cs | 1 +
.../Datagrid/EmployeeStore.cs | 27 +-
.../scalar/pimps/ScalarProjectionPimp.scala | 24 +-
...gniteProjectionStartStopRestartSelfTest.java | 6 +-
.../commands/tasks/VisorTasksCommandSpec.scala | 22 +-
.../clusters/general/discovery/s3.pug | 2 +-
.../cache/IgniteBinaryIdentityBenchmark.java | 21 -
.../IgniteLegacyBinaryIdentityGetBenchmark.java | 30 -
.../IgniteLegacyBinaryIdentityPutBenchmark.java | 30 -
.../cache/WaitMapExchangeFinishCallable.java | 4 +-
.../IgniteAtomicInvokeRetryBenchmark.java | 12 +-
.../failover/IgniteAtomicRetriesBenchmark.java | 12 +-
.../IgniteFailoverAbstractBenchmark.java | 22 +-
...IgniteTransactionalInvokeRetryBenchmark.java | 10 +-
...IgniteTransactionalWriteInvokeBenchmark.java | 16 +-
.../IgniteTransactionalWriteReadBenchmark.java | 12 +-
.../apache/ignite/yarn/ClusterProperties.java | 1 +
.../yarn/IgniteApplicationMasterSelfTest.java | 13 +
scripts/git-remoteless-branches.sh | 16 +
654 files changed, 18195 insertions(+), 8985 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 271490b,84e1b01..325cab8
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@@ -452,7 -468,9 +455,8 @@@ public class CacheConfiguration<K, V> e
listenerConfigurations = cc.listenerConfigurations;
loadPrevVal = cc.isLoadPreviousValue();
longQryWarnTimeout = cc.getLongQueryWarningTimeout();
- offHeapMaxMem = cc.getOffHeapMaxMemory();
maxConcurrentAsyncOps = cc.getMaxConcurrentAsyncOperations();
+ memPlcName = cc.getMemoryPolicyName();
sqlIndexMaxInlineSize = cc.getSqlIndexMaxInlineSize();
name = cc.getName();
nearCfg = cc.getNearConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
index 4ad4b51,bd43956..f609af3
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
@@@ -133,13 -164,14 +134,13 @@@ public class CachePutEventListenerError
cfg.setName("cache");
cfg.setCacheMode(cacheMode);
cfg.setAtomicityMode(atomicityMode);
- cfg.setMemoryMode(memMode);
- IgniteCache<Integer, Integer> cache = ignite.createCache(cfg).withAsync();
+ IgniteCache<Integer, Integer> cache = ignite.createCache(cfg);
- cache.put(0, 0);
+ IgniteFuture f = cache.putAsync(0, 0);
try {
- cache.future().get(2000);
+ f.get(2000);
assert false : "Exception was not thrown";
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
index 5ac47c3,782c274..a67bf65
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
@@@ -53,6 -52,9 +52,8 @@@ import org.apache.ignite.internal.binar
import org.apache.ignite.internal.binary.noncompact.BinaryObjectBuilderNonCompactSimpleNameLowerCaseMappersSelfTest;
import org.apache.ignite.internal.binary.streams.BinaryHeapStreamByteOrderSelfTest;
import org.apache.ignite.internal.binary.streams.BinaryOffheapStreamByteOrderSelfTest;
-import org.apache.ignite.internal.processors.cache.BinaryObjectOffHeapUnswapTemporaryTest;
+ import org.apache.ignite.internal.processors.cache.binary.BinaryMetadataUpdatesFlowTest;
+ import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryObjectMetadataExchangeMultinodeTest;
import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryObjectUserClassloaderSelfTest;
import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreBinariesDefaultMappersSelfTest;
import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreBinariesSimpleNameMappersSelfTest;
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48a8c40c/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
[25/53] [abbrv] ignite git commit: ignite-4851 : redesigned
GridDhtLocalPartition.state format.
Posted by ag...@apache.org.
ignite-4851 : redesigned GridDhtLocalPartition.state format.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/abefb35a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/abefb35a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/abefb35a
Branch: refs/heads/ignite-3477-master
Commit: abefb35a38f8be7434bab8d3bb851df0f8c92d8f
Parents: 2fb75c4
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 3 17:24:39 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 3 17:24:39 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMapEntry.java | 14 ++-
.../distributed/dht/GridDhtLocalPartition.java | 119 ++++++++++++-------
2 files changed, 86 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/abefb35a/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 846c633..7fad9f5 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
@@ -3637,14 +3637,24 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
* Increments public size of map.
*/
protected void incrementMapPublicSize() {
- cctx.incrementPublicSize(this);
+ GridDhtLocalPartition locPart = localPartition();
+
+ if (locPart != null)
+ locPart.incrementPublicSize(this);
+ else
+ cctx.incrementPublicSize(this);
}
/**
* Decrements public size of map.
*/
protected void decrementMapPublicSize() {
- cctx.decrementPublicSize(this);
+ GridDhtLocalPartition locPart = localPartition();
+
+ if (locPart != null)
+ locPart.decrementPublicSize(this);
+ else
+ cctx.decrementPublicSize(this);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/abefb35a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 46b2bf8..0572fdd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -97,7 +97,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
/** Partition ID. */
private final int id;
- /** State. */
+ /** State. 32 bits - size, 16 bits - reservations, 13 bits - reserved, 3 bits - GridDhtPartitionState. */
@GridToStringExclude
private final AtomicLong state = new AtomicLong((long)MOVING.ordinal() << 32);
@@ -191,9 +191,8 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
* @return {@code false} If such reservation already added.
*/
public boolean addReservation(GridDhtPartitionsReservation r) {
- assert GridDhtPartitionState.fromOrdinal((int)(state.get() >> 32)) != EVICTED :
- "we can reserve only active partitions";
- assert (state.get() & 0xFFFF) != 0 : "partition must be already reserved before adding group reservation";
+ assert (getPartState(state.get())) != EVICTED : "we can reserve only active partitions";
+ assert (getReservations(state.get())) != 0 : "partition must be already reserved before adding group reservation";
return reservations.addIfAbsent(r);
}
@@ -224,14 +223,14 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
* @return Partition state.
*/
public GridDhtPartitionState state() {
- return GridDhtPartitionState.fromOrdinal((int)(state.get() >> 32));
+ return getPartState(state.get());
}
/**
* @return Reservations.
*/
public int reservations() {
- return (int)(state.get() & 0xFFFF);
+ return getReservations(state.get());
}
/**
@@ -421,12 +420,14 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
*/
@Override public boolean reserve() {
while (true) {
- long reservations = state.get();
+ long state = this.state.get();
- if ((int)(reservations >> 32) == EVICTED.ordinal())
+ if (getPartState(state) == EVICTED)
return false;
- if (state.compareAndSet(reservations, reservations + 1))
+ long newState = setReservations(state, getReservations(state) + 1);
+
+ if (this.state.compareAndSet(state, newState))
return true;
}
}
@@ -436,16 +437,20 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
*/
@Override public void release() {
while (true) {
- long reservations = state.get();
+ long state = this.state.get();
+
+ int reservations = getReservations(state);
- if ((int)(reservations & 0xFFFF) == 0)
+ if (reservations == 0)
return;
- assert (int)(reservations >> 32) != EVICTED.ordinal();
+ assert getPartState(state) != EVICTED;
+
+ long newState = setReservations(state, --reservations);
// Decrement reservations.
- if (state.compareAndSet(reservations, --reservations)) {
- if ((reservations & 0xFFFF) == 0 && shouldBeRenting)
+ if (this.state.compareAndSet(state, newState)) {
+ if (reservations == 0 && shouldBeRenting)
rent(true);
try {
@@ -464,18 +469,18 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
* @param stateToRestore State to restore.
*/
public void restoreState(GridDhtPartitionState stateToRestore) {
- state.set(((long)stateToRestore.ordinal()) << 32);
+ state.set(setPartState(state.get(), stateToRestore));
}
/**
- * @param reservations Current aggregated value.
+ * @param state Current aggregated value.
* @param toState State to switch to.
* @return {@code true} if cas succeeds.
*/
- private boolean casState(long reservations, GridDhtPartitionState toState) {
+ private boolean casState(long state, GridDhtPartitionState toState) {
if (cctx.shared().database().persistenceEnabled()) {
synchronized (this) {
- boolean update = state.compareAndSet(reservations, (reservations & 0xFFFF) | ((long)toState.ordinal() << 32));
+ boolean update = this.state.compareAndSet(state, setPartState(state, toState));
if (update)
try {
@@ -489,7 +494,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
}
}
else
- return state.compareAndSet(reservations, (reservations & 0xFFFF) | ((long)toState.ordinal() << 32));
+ return this.state.compareAndSet(state, setPartState(state, toState));
}
/**
@@ -497,19 +502,19 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
*/
boolean own() {
while (true) {
- long reservations = state.get();
+ long state = this.state.get();
- int ord = (int)(reservations >> 32);
+ GridDhtPartitionState partState = getPartState(state);
- if (ord == RENTING.ordinal() || ord == EVICTED.ordinal())
+ if (partState == RENTING || partState == EVICTED)
return false;
- if (ord == OWNING.ordinal())
+ if (partState == OWNING)
return true;
- assert ord == MOVING.ordinal() || ord == LOST.ordinal();
+ assert partState== MOVING || partState == LOST;
- if (casState(reservations, OWNING)) {
+ if (casState(state, OWNING)) {
if (log.isDebugEnabled())
log.debug("Owned partition: " + this);
@@ -526,13 +531,13 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
*/
void moving() {
while (true) {
- long reservations = state.get();
+ long state = this.state.get();
- int ord = (int)(reservations >> 32);
+ GridDhtPartitionState partState = getPartState(state);
- assert ord == OWNING.ordinal() : "Only OWNed partitions should be moved to MOVING state";
+ assert partState == OWNING : "Only OWNed partitions should be moved to MOVING state";
- if (casState(reservations, MOVING)) {
+ if (casState(state, MOVING)) {
if (log.isDebugEnabled())
log.debug("Forcibly moved partition to a MOVING state: " + this);
@@ -546,14 +551,14 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
*/
boolean markLost() {
while (true) {
- long reservations = state.get();
+ long state = this.state.get();
- int ord = (int)(reservations >> 32);
+ GridDhtPartitionState partState = getPartState(state);
- if (ord == LOST.ordinal())
+ if (partState == LOST)
return false;
- if (casState(reservations, LOST)) {
+ if (casState(state, LOST)) {
if (log.isDebugEnabled())
log.debug("Marked partition as LOST: " + this);
@@ -570,16 +575,16 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
* @return Future to signal that this node is no longer an owner or backup.
*/
IgniteInternalFuture<?> rent(boolean updateSeq) {
- long reservations = state.get();
+ long state = this.state.get();
- int ord = (int)(reservations >> 32);
+ GridDhtPartitionState partState = getPartState(state);
- if (ord == RENTING.ordinal() || ord == EVICTED.ordinal())
+ if (partState == RENTING || partState == EVICTED)
return rent;
shouldBeRenting = true;
- if ((reservations & 0xFFFF) == 0 && casState(reservations, RENTING)) {
+ if (getReservations(state) == 0 && casState(state, RENTING)) {
shouldBeRenting = false;
if (log.isDebugEnabled())
@@ -599,13 +604,13 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
void tryEvictAsync(boolean updateSeq) {
assert cctx.kernalContext().state().active();
- long reservations = state.get();
+ long state = this.state.get();
- int ord = (int)(reservations >> 32);
+ GridDhtPartitionState partState = getPartState(state);
if (isEmpty() && !QueryUtils.isEnabled(cctx.config()) &&
- ord == RENTING.ordinal() && (reservations & 0xFFFF) == 0 && !groupReserved() &&
- casState(reservations, EVICTED)) {
+ partState == RENTING && getReservations(state) == 0 && !groupReserved() &&
+ casState(state, EVICTED)) {
if (log.isDebugEnabled())
log.debug("Evicted partition: " + this);
@@ -709,11 +714,11 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
* @throws NodeStoppingException If node is stopping.
*/
public void tryEvict() throws NodeStoppingException {
- long reservations = state.get();
+ long state = this.state.get();
- int ord = (int)(reservations >> 32);
+ GridDhtPartitionState partState = getPartState(state);
- if (ord != RENTING.ordinal() || (reservations & 0xFFFF) != 0 || groupReserved())
+ if (partState != RENTING || getReservations(state) != 0 || groupReserved())
return;
if (addEvicting()) {
@@ -721,7 +726,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
// Attempt to evict partition entries from cache.
clearAll();
- if (isEmpty() && casState(reservations, EVICTED)) {
+ if (isEmpty() && casState(state, EVICTED)) {
if (log.isDebugEnabled())
log.debug("Evicted partition: " + this);
// finishDestroy() will be initiated by clearEvicting().
@@ -965,6 +970,30 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
"createTime", U.format(createTime));
}
+ private static GridDhtPartitionState getPartState(long state) {
+ return GridDhtPartitionState.fromOrdinal((int) (state & (0x0000000000000008L)));
+ }
+
+ private static long setPartState(long state, GridDhtPartitionState partState) {
+ return (state & (~0x0000000000000008L)) | partState.ordinal();
+ }
+
+ private static int getReservations(long state) {
+ return (int) ((state & 0x00000000FFFF0000L) >> 16);
+ }
+
+ private static long setReservations(long state, int reservations) {
+ return (state & (~0x00000000FFFF0000L)) | (reservations << 16);
+ }
+
+ private static int getSize(long state) {
+ return (int)((state & 0xFFFFFFFF00000000L) >> 32);
+ }
+
+ private static long setSize(long state, int size) {
+ return (state & (~0xFFFFFFFF00000000L)) | ((long) size << 32);
+ }
+
/**
* Removed entry holder.
*/
[38/53] [abbrv] ignite git commit: ignite-4535 : Minor fixes in tests.
Posted by ag...@apache.org.
ignite-4535 : Minor fixes in tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d433800f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d433800f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d433800f
Branch: refs/heads/ignite-3477-master
Commit: d433800fb3b6eb0a6b02757ff674e36dc374f55b
Parents: 99785f1
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Apr 6 19:35:29 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Apr 6 19:35:29 2017 +0300
----------------------------------------------------------------------
.../GridCacheEvictionEventAbstractTest.java | 2 -
.../dht/GridCacheDhtEvictionSelfTest.java | 352 -------------------
...ePartitionedAtomicOnheapFullApiSelfTest.java | 10 +
.../ConfigVariationsTestSuiteBuilderTest.java | 4 +-
.../testsuites/IgniteCacheTestSuite2.java | 2 -
5 files changed, 12 insertions(+), 358 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d433800f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
index 793317d..eae8dad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
@@ -119,7 +119,5 @@ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstr
c.localEvict(Collections.singleton("1"));
assertTrue("Failed to wait for eviction event", latch.await(10, TimeUnit.SECONDS));
-
- assertNotNull(oldVal.get());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/d433800f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
deleted file mode 100644
index 69aab3e..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.dht;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cache.CacheWriteSynchronizationMode;
-import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.events.Event;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.P1;
-import org.apache.ignite.lang.IgniteFuture;
-import org.apache.ignite.lang.IgnitePredicate;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheRebalanceMode.NONE;
-import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_EVICTED;
-
-/**
- * Tests for dht cache eviction.
- */
-public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
- /** */
- private static final int GRID_CNT = 2;
-
- /** */
- private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
-
- /** Default constructor. */
- public GridCacheDhtEvictionSelfTest() {
- super(false /* don't start grid. */);
- }
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
- disco.setIpFinder(ipFinder);
-
- cfg.setDiscoverySpi(disco);
-
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
-
- cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setRebalanceMode(NONE);
- cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
- cacheCfg.setBackups(1);
-
- NearCacheConfiguration nearCfg = new NearCacheConfiguration();
-
- FifoEvictionPolicy nearPlc = new FifoEvictionPolicy();
- nearPlc.setMaxSize(10000);
-
- nearCfg.setNearEvictionPolicy(nearPlc);
- cacheCfg.setNearConfiguration(nearCfg);
-
- FifoEvictionPolicy plc = new FifoEvictionPolicy();
- plc.setMaxSize(10000);
-
- cacheCfg.setEvictionPolicy(plc);
- cacheCfg.setOnheapCacheEnabled(true);
-
- cfg.setCacheConfiguration(cacheCfg);
-
- return cfg;
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"ConstantConditions"})
- @Override protected void beforeTestsStarted() throws Exception {
- super.beforeTestsStarted();
-
- if (GRID_CNT < 2)
- throw new IgniteCheckedException("GRID_CNT must not be less than 2.");
-
- startGrids(GRID_CNT);
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"SizeReplaceableByIsEmpty"})
- @Override protected void beforeTest() throws Exception {
- for (int i = 0; i < GRID_CNT; i++) {
- assert near(grid(i)).size() == 0;
- assert dht(grid(i)).size() == 0;
-
- assert near(grid(i)).isEmpty();
- assert dht(grid(i)).isEmpty();
- }
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"unchecked"})
- @Override protected void afterTest() throws Exception {
- for (int i = 0; i < GRID_CNT; i++) {
- near(grid(i)).removeAll();
-
- assert near(grid(i)).isEmpty() : "Near cache is not empty [idx=" + i + "]";
- assert dht(grid(i)).isEmpty() : "Dht cache is not empty [idx=" + i + "]";
- }
- }
-
- /**
- * @param g Grid.
- * @return Near cache.
- */
- @SuppressWarnings({"unchecked"})
- private GridNearCacheAdapter<Integer, String> near(Ignite g) {
- return (GridNearCacheAdapter)((IgniteKernal)g).internalCache();
- }
-
- /**
- * @param g Grid.
- * @return Dht cache.
- */
- @SuppressWarnings({"unchecked", "TypeMayBeWeakened"})
- private GridDhtCacheAdapter<Integer, String> dht(Ignite g) {
- return ((GridNearCacheAdapter)((IgniteKernal)g).internalCache()).dht();
- }
-
- /**
- * @param key Key.
- * @return Primary node for the given key.
- */
- private Collection<ClusterNode> keyNodes(Object key) {
- return grid(0).affinity(null).mapKeyToPrimaryAndBackups(key);
- }
-
- /**
- * @param nodeId Node id.
- * @return Predicate for events belonging to specified node.
- */
- private IgnitePredicate<Event> nodeEvent(final UUID nodeId) {
- assert nodeId != null;
-
- return new P1<Event>() {
- @Override public boolean apply(Event e) {
- info("Predicate called [e.nodeId()=" + e.node().id() + ", nodeId=" + nodeId + ']');
-
- return e.node().id().equals(nodeId);
- }
- };
- }
-
- /**
- * JUnit.
- *
- * @throws Exception If failed.
- */
- @SuppressWarnings("NullArgumentToVariableArgMethod")
- public void testSingleKey() throws Exception {
- Integer key = 1;
-
- Collection<ClusterNode> nodes = new ArrayList<>(keyNodes(key));
-
- ClusterNode primary = F.first(nodes);
-
- assert primary != null;
-
- nodes.remove(primary);
-
- ClusterNode backup = F.first(nodes);
-
- assert backup != null;
-
- assert !F.eqNodes(primary, backup);
-
- info("Key primary node: " + primary.id());
- info("Key backup node: " + backup.id());
-
- GridNearCacheAdapter<Integer, String> nearPrimary = near(grid(primary));
- GridDhtCacheAdapter<Integer, String> dhtPrimary = dht(grid(primary));
-
- GridNearCacheAdapter<Integer, String> nearBackup = near(grid(backup));
- GridDhtCacheAdapter<Integer, String> dhtBackup = dht(grid(backup));
-
- String val = "v1";
-
- // Put on primary node.
- nearPrimary.getAndPut(key, val, null);
-
- assertEquals(val, localPeek(nearPrimary, key));
- assertEquals(val, localPeek(dhtPrimary, key));
-
- assertEquals(val, localPeek(nearBackup, key));
- assertEquals(val, localPeek(dhtBackup, key));
-
- GridDhtCacheEntry entryPrimary = (GridDhtCacheEntry)dhtPrimary.peekEx(key);
- GridDhtCacheEntry entryBackup = (GridDhtCacheEntry)dhtBackup.peekEx(key);
-
- assert entryPrimary != null;
- assert entryBackup != null;
-
- assertTrue(entryPrimary.readers().isEmpty());
- assertTrue(entryBackup.readers().isEmpty());
-
- IgniteFuture<Event> futBackup =
- waitForLocalEvent(grid(backup).events(), nodeEvent(backup.id()), EVT_CACHE_ENTRY_EVICTED);
-
- IgniteFuture<Event> futPrimary =
- waitForLocalEvent(grid(primary).events(), nodeEvent(primary.id()), EVT_CACHE_ENTRY_EVICTED);
-
- // Evict on primary node.
- // It should trigger dht eviction and eviction on backup node.
- grid(primary).cache(null).localEvict(Collections.<Object>singleton(key));
-
- // Give some time for eviction event to occur on backup and primary node.
- futBackup.get(10_000);
- futPrimary.get(10_000);
-
- assertEquals(0, nearPrimary.map().size());
-
- assertNull(nearPrimary.peekEx(key));
- assertNull(dhtPrimary.peekEx(key));
-
- assertNull(nearBackup.peekEx(key));
- assertNull(dhtBackup.peekEx(key));
- }
-
- /**
- * JUnit.
- *
- * @throws Exception If failed.
- */
- @SuppressWarnings("NullArgumentToVariableArgMethod")
- public void testMultipleKeys() throws Exception {
- final int keyCnt = 1000;
-
- final Ignite primaryIgnite = grid(0);
- final Ignite backupIgnite = grid(1);
-
- GridNearCacheAdapter<Integer, String> nearPrimary = near(primaryIgnite);
- GridDhtCacheAdapter<Integer, String> dhtPrimary = dht(primaryIgnite);
-
- GridNearCacheAdapter<Integer, String> nearBackup = near(backupIgnite);
- GridDhtCacheAdapter<Integer, String> dhtBackup = dht(backupIgnite);
-
- Collection<Integer> keys = new ArrayList<>(keyCnt);
-
- for (int key = 0; keys.size() < keyCnt; key++) {
- if (F.eqNodes(primaryIgnite.cluster().localNode(), F.first(keyNodes(key))))
- keys.add(key++);
- }
-
- info("Test keys: " + keys);
-
- // Put on primary node.
- for (Integer key : keys)
- nearPrimary.getAndPut(key, "v" + key, null);
-
- for (Integer key : keys) {
- String val = "v" + key;
-
- assertEquals(val, localPeek(nearPrimary, key));
- assertEquals(val, localPeek(dhtPrimary, key));
-
- assertEquals(val, localPeek(nearBackup, key));
- assertEquals(val, localPeek(dhtBackup, key));
- }
-
- final AtomicInteger cntBackup = new AtomicInteger();
-
- IgniteFuture<Event> futBackup = waitForLocalEvent(backupIgnite.events(), new P1<Event>() {
- @Override public boolean apply(Event e) {
- return e.node().id().equals(backupIgnite.cluster().localNode().id()) &&
- cntBackup.incrementAndGet() == keyCnt;
- }
- }, EVT_CACHE_ENTRY_EVICTED);
-
- final AtomicInteger cntPrimary = new AtomicInteger();
-
- IgniteFuture<Event> futPrimary = waitForLocalEvent(primaryIgnite.events(), new P1<Event>() {
- @Override public boolean apply(Event e) {
- return e.node().id().equals(primaryIgnite.cluster().localNode().id()) &&
- cntPrimary.incrementAndGet() == keyCnt;
- }
- }, EVT_CACHE_ENTRY_EVICTED);
-
- // Evict on primary node.
- // Eviction of the last key should trigger queue processing.
- for (Integer key : keys)
- primaryIgnite.cache(null).localEvict(Collections.<Object>singleton(key));
-
- // Give some time for eviction events to occur on backup and primary node.
- futBackup.get(10_000);
- futPrimary.get(10_000);
-
- info("nearBackupSize: " + nearBackup.size());
- info("dhtBackupSize: " + dhtBackup.size());
- info("nearPrimarySize: " + nearPrimary.size());
- info("dhtPrimarySize: " + dhtPrimary.size());
-
- // Check backup node first.
- for (Integer key : keys) {
- String msg = "Failed key: " + key;
-
- assertNull(msg, localPeekOnHeap(nearBackup, key));
- assertNull(msg, localPeekOnHeap(dhtBackup, key));
- assertNull(msg, nearBackup.peekEx(key));
- assertNull(msg, dhtBackup.peekEx(key));
- }
-
- for (Integer key : keys) {
- String msg = "Failed key: " + key;
-
- assertNull(msg, localPeekOnHeap(nearPrimary, key));
- assertNull(msg, localPeekOnHeap(dhtPrimary, key));
- assertNull(msg, nearPrimary.peekEx(key));
- assertNull(dhtPrimary.peekEx(key));
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/d433800f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java
index c7d56e3..c05e6ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAtomicOnheapFullApiSelfTest.java
@@ -25,4 +25,14 @@ public class GridCachePartitionedAtomicOnheapFullApiSelfTest extends GridCachePa
@Override protected CacheAtomicityMode atomicityMode() {
return CacheAtomicityMode.ATOMIC;
}
+
+ /** {@inheritDoc} */
+ @Override protected boolean txEnabled() {
+ return false;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected boolean lockingEnabled() {
+ return false;
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d433800f/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
index 6ef9eb8..93f0168 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
@@ -41,7 +41,7 @@ public class ConfigVariationsTestSuiteBuilderTest extends TestCase {
TestSuite dfltCacheSuite = new ConfigVariationsTestSuiteBuilder("testSuite", NoopTest.class)
.withBasicCacheParams().build();
- assertEquals(4 * 4, dfltCacheSuite.countTestCases());
+ assertEquals(4 * 4 * 2, dfltCacheSuite.countTestCases());
// With clients.
dfltSuite = new ConfigVariationsTestSuiteBuilder("testSuite", NoopTest.class)
@@ -52,7 +52,7 @@ public class ConfigVariationsTestSuiteBuilderTest extends TestCase {
dfltCacheSuite = new ConfigVariationsTestSuiteBuilder("testSuite", NoopTest.class)
.withBasicCacheParams().testedNodesCount(3).withClients().build();
- assertEquals(4 * 4 * 3, dfltCacheSuite.countTestCases());
+ assertEquals(4 * 4 * 2 * 3, dfltCacheSuite.countTestCases());
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/d433800f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index 4152abf..17e8fe9 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -57,7 +57,6 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColo
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPrimarySyncSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedTxSingleThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEntrySelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEvictionSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEvictionsDisabledSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtExpiredEntriesPreloadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtMappingSelfTest;
@@ -226,7 +225,6 @@ public class IgniteCacheTestSuite2 extends TestSuite {
// TODO GG-11140.
suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class));
suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtEvictionSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedPreloadEventsSelfTest.class));
[26/53] [abbrv] ignite git commit: ignite-4851 : minor fix.
Posted by ag...@apache.org.
ignite-4851 : minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/07ecddc5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/07ecddc5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/07ecddc5
Branch: refs/heads/ignite-3477-master
Commit: 07ecddc5249594dfd70ffc083a3a9a01c802856c
Parents: abefb35
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 3 17:44:42 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 3 17:44:42 2017 +0300
----------------------------------------------------------------------
.../processors/cache/distributed/dht/GridDhtLocalPartition.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/07ecddc5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 0572fdd..1c7db68 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -971,11 +971,11 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
}
private static GridDhtPartitionState getPartState(long state) {
- return GridDhtPartitionState.fromOrdinal((int) (state & (0x0000000000000008L)));
+ return GridDhtPartitionState.fromOrdinal((int) (state & (0x0000000000000007L)));
}
private static long setPartState(long state, GridDhtPartitionState partState) {
- return (state & (~0x0000000000000008L)) | partState.ordinal();
+ return (state & (~0x0000000000000007L)) | partState.ordinal();
}
private static int getReservations(long state) {
[14/53] [abbrv] ignite git commit: ignite-4535 : Conflicts.
Posted by ag...@apache.org.
ignite-4535 : Conflicts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ad8974c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ad8974c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ad8974c
Branch: refs/heads/ignite-3477-master
Commit: 4ad8974c9f741ea33379ad4e323db9873cfda328
Parents: 06d853d
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Mar 30 16:31:03 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Mar 30 16:31:03 2017 +0300
----------------------------------------------------------------------
.../IgniteCachePutRetryAbstractSelfTest.java | 1 +
.../GridNearOffheapCacheStoreUpdateTest.java | 35 --------------------
.../IgniteCacheExpiryPolicyAbstractTest.java | 1 -
.../IgniteCacheQueryCacheDestroySelfTest.java | 2 --
.../IgniteCacheFullApiSelfTestSuite.java | 3 --
.../testsuites/IgniteCacheTestSuite2.java | 2 --
.../IgniteCacheQuerySelfTestSuite.java | 1 -
7 files changed, 1 insertion(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ad8974c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
index e9a4936..786628c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
@@ -54,6 +54,7 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ad8974c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOffheapCacheStoreUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOffheapCacheStoreUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOffheapCacheStoreUpdateTest.java
deleted file mode 100644
index ae3f695..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOffheapCacheStoreUpdateTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.near;
-
-import org.apache.ignite.cache.CacheMemoryMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-
-/**
- * Check that near cache is updated when entry loaded from store.
- */
-public class GridNearOffheapCacheStoreUpdateTest extends GridNearCacheStoreUpdateTest {
- /** {@inheritDoc} */
- @Override protected CacheConfiguration<String, String> cacheConfiguration() {
- final CacheConfiguration<String, String> ccfg = super.cacheConfiguration();
-
- ccfg.setMemoryMode(CacheMemoryMode.OFFHEAP_TIERED);
-
- return ccfg;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ad8974c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 482d275..a40c555 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -38,7 +38,6 @@ import javax.cache.processor.EntryProcessor;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ad8974c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java
index dc104ff..dea491c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java
@@ -25,7 +25,6 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
@@ -129,7 +128,6 @@ public class IgniteCacheQueryCacheDestroySelfTest extends GridCommonAbstractTest
cfg.setAtomicityMode(CacheAtomicityMode.ATOMIC)
.setCacheMode(CacheMode.PARTITIONED)
- .setMemoryMode(CacheMemoryMode.OFFHEAP_TIERED)
.setRebalanceMode(CacheRebalanceMode.SYNC)
.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC)
.setRebalanceThrottle(100)
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ad8974c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
index 962e695..f7b8316 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
@@ -63,9 +63,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNoStripedPoolMultiNodeFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOffHeapFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedOffHeapMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.CacheReplicatedFairAffinityExcludeNeighborsMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.CacheReplicatedFairAffinityMultiNodeFullApiSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.CacheReplicatedRendezvousAffinityExcludeNeighborsMultiNodeFullApiSelfTest;
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ad8974c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index eac5c0f..4cda3f5 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -107,7 +107,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxTimeoutSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheRendezvousAffinityClientSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheStoreUpdateTest;
-import org.apache.ignite.internal.processors.cache.distributed.near.GridNearOffheapCacheStoreUpdateTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridPartitionedBackupLoadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.NearCacheSyncUpdateTest;
import org.apache.ignite.internal.processors.cache.distributed.near.NoneRebalanceModeSelfTest;
@@ -265,7 +264,6 @@ public class IgniteCacheTestSuite2 extends TestSuite {
suite.addTest(new TestSuite(CacheConcurrentReadThroughTest.class));
suite.addTest(new TestSuite(GridNearCacheStoreUpdateTest.class));
- suite.addTest(new TestSuite(GridNearOffheapCacheStoreUpdateTest.class));
return suite;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ad8974c/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index 7cf1ecf..3e7e299 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -86,7 +86,6 @@ import org.apache.ignite.internal.processors.cache.local.IgniteCacheLocalFieldsQ
import org.apache.ignite.internal.processors.cache.local.IgniteCacheLocalQueryCancelOrTimeoutSelfTest;
import org.apache.ignite.internal.processors.cache.local.IgniteCacheLocalQuerySelfTest;
import org.apache.ignite.internal.processors.cache.query.GridCacheQueryTransformerSelfTest;
-import org.apache.ignite.internal.processors.cache.query.GridCacheSwapScanQuerySelfTest;
import org.apache.ignite.internal.processors.cache.query.IgniteCacheQueryCacheDestroySelfTest;
import org.apache.ignite.internal.processors.cache.query.IndexingSpiQuerySelfTest;
import org.apache.ignite.internal.processors.cache.query.IndexingSpiQueryTxSelfTest;
[31/53] [abbrv] ignite git commit: ignite-4535 : Added configuration
property to enable on-heap cache without eviction policy.
Posted by ag...@apache.org.
ignite-4535 : Added configuration property to enable on-heap cache without eviction policy.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/05c48f23
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/05c48f23
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/05c48f23
Branch: refs/heads/ignite-3477-master
Commit: 05c48f23648e82643bd69cb979a743ec2cab566a
Parents: 0a39212
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Apr 6 13:18:28 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Apr 6 13:18:28 2017 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 43 ++++++++------------
.../GridCacheEvictionEventAbstractTest.java | 2 +
.../cache/GridCacheSwapPreloadSelfTest.java | 1 -
.../GridCacheBinaryObjectsAbstractSelfTest.java | 8 ++++
...ObjectsAtomicNearDisabledOnheapSelfTest.java | 8 ++++
...dCacheBinaryObjectsAtomicOnheapSelfTest.java | 8 ++++
...tsPartitionedNearDisabledOnheapSelfTest.java | 8 ++++
...eBinaryObjectsPartitionedOnheapSelfTest.java | 8 ++++
...ePartitionedMultiThreadedPutGetSelfTest.java | 1 -
.../configvariations/ConfigVariations.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 15 ++++---
11 files changed, 70 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/05c48f23/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 80577f0..f886dce 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
@@ -148,9 +148,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default maximum eviction queue ratio. */
public static final float DFLT_MAX_EVICTION_OVERFLOW_RATIO = 10;
- /** Default eviction synchronized flag. */
- public static final boolean DFLT_EVICT_SYNCHRONIZED = false;
-
/** Default eviction key buffer size for batching synchronized evicts. */
public static final int DFLT_EVICT_KEY_BUFFER_SIZE = 1024;
@@ -234,8 +231,8 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Cache expiration policy. */
private EvictionPolicy evictPlc;
- /** Flag indicating whether eviction is synchronized. */
- private boolean evictSync = DFLT_EVICT_SYNCHRONIZED;
+ /** */
+ private boolean onheapCache;
/** Eviction key buffer size. */
private int evictKeyBufSize = DFLT_EVICT_KEY_BUFFER_SIZE;
@@ -443,7 +440,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
evictKeyBufSize = cc.getEvictSynchronizedKeyBufferSize();
evictMaxOverflowRatio = cc.getEvictMaxOverflowRatio();
evictPlc = cc.getEvictionPolicy();
- evictSync = cc.isEvictSynchronized();
evictSyncConcurrencyLvl = cc.getEvictSynchronizedConcurrencyLevel();
evictSyncTimeout = cc.getEvictSynchronizedTimeout();
expiryPolicyFactory = cc.getExpiryPolicyFactory();
@@ -562,6 +558,16 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
return this;
}
+ public boolean isOnheapCacheEnabled() {
+ return onheapCache;
+ }
+
+ public CacheConfiguration<K, V> setOnheapCacheEnabled(boolean value) {
+ this.onheapCache = value;
+
+ return this;
+ }
+
/**
* @return Near enabled flag.
*/
@@ -626,23 +632,8 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
return this;
}
- /**
- * Gets flag indicating whether eviction is synchronized between primary, backup and near nodes.
- * If this parameter is {@code true} and swap is disabled then {@link IgniteCache#localEvict(Collection)}
- * will involve all nodes where an entry is kept. If this property is set to {@code false} then
- * eviction is done independently on different cache nodes.
- * <p>
- * Default value is defined by {@link #DFLT_EVICT_SYNCHRONIZED}.
- * <p>
- * Note that it's not recommended to set this value to {@code true} if cache
- * store is configured since it will allow to significantly improve cache
- * performance.
- *
- * @return {@code true} If eviction is synchronized with backup nodes (or the
- * rest of the nodes in case of replicated cache), {@code false} if not.
- */
public boolean isEvictSynchronized() {
- return evictSync;
+ return false;
}
/**
@@ -653,7 +644,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
* @return {@code this} for chaining.
*/
public CacheConfiguration<K, V> setEvictSynchronized(boolean evictSync) {
- this.evictSync = evictSync;
+// this.evictSync = evictSync;
return this;
}
@@ -2046,7 +2037,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
* @see #getQueryParallelism()
* @return {@code this} for chaining.
*/
- public CacheConfiguration<K,V> setQueryParallelism(int qryParallelism) {
+ public CacheConfiguration<K, V> setQueryParallelism(int qryParallelism) {
this.qryParallelism = qryParallelism;
return this;
@@ -2456,7 +2447,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/**
* Filter that accepts all nodes.
*/
- public static class IgniteAllNodesPredicate implements IgnitePredicate<ClusterNode> {
+ public static class IgniteAllNodesPredicate implements IgnitePredicate<ClusterNode> {
/** */
private static final long serialVersionUID = 0L;
@@ -2713,7 +2704,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
if (descending) {
if (descendings == null)
- descendings = new HashSet<>();
+ descendings = new HashSet<>();
descendings.add(field);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/05c48f23/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
index 40de38c..55eae2b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEventAbstractTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.CacheEvent;
@@ -69,6 +70,7 @@ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstr
cc.setCacheMode(cacheMode());
cc.setAtomicityMode(atomicityMode());
+ cc.setEvictionPolicy(new FifoEvictionPolicy());
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/05c48f23/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
index 610392a..6979859 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
@@ -73,7 +73,6 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setCacheMode(cacheMode);
cacheCfg.setRebalanceMode(SYNC);
- cacheCfg.setEvictSynchronized(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
if (cacheMode == PARTITIONED)
http://git-wip-us.apache.org/repos/asf/ignite/blob/05c48f23/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
index 4ad0060..626886b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
@@ -189,6 +189,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
cacheCfg.setWriteThrough(true);
cacheCfg.setLoadPreviousValue(true);
cacheCfg.setBackups(1);
+ cacheCfg.setOnheapCacheEnabled(false);
return cacheCfg;
}
@@ -249,6 +250,13 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
protected abstract int gridCount();
/**
+ * @return {@code True} if on-heap cache is enabled.
+ */
+ protected boolean onheapCacheEnabled() {
+ return false;
+ }
+
+ /**
* @throws Exception If failed.
*/
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/ignite/blob/05c48f23/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest.java
new file mode 100644
index 0000000..9e690ae
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest.java
@@ -0,0 +1,8 @@
+package org.apache.ignite.internal.processors.cache.binary.distributed.dht;
+
+public class GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest extends GridCacheBinaryObjectsAtomicNearDisabledSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/05c48f23/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicOnheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicOnheapSelfTest.java
new file mode 100644
index 0000000..ad264cb
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicOnheapSelfTest.java
@@ -0,0 +1,8 @@
+package org.apache.ignite.internal.processors.cache.binary.distributed.dht;
+
+public class GridCacheBinaryObjectsAtomicOnheapSelfTest extends GridCacheBinaryObjectsAtomicSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/05c48f23/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest.java
new file mode 100644
index 0000000..ad9bda8
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest.java
@@ -0,0 +1,8 @@
+package org.apache.ignite.internal.processors.cache.binary.distributed.dht;
+
+public class GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest extends GridCacheBinaryObjectsPartitionedNearDisabledSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/05c48f23/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedOnheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedOnheapSelfTest.java
new file mode 100644
index 0000000..af2afd0
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedOnheapSelfTest.java
@@ -0,0 +1,8 @@
+package org.apache.ignite.internal.processors.cache.binary.distributed.dht;
+
+public class GridCacheBinaryObjectsPartitionedOnheapSelfTest extends GridCacheBinaryObjectsPartitionedSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean onheapCacheEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/05c48f23/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
index 77c4c56..beb9082 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
@@ -78,7 +78,6 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA
cc.setEvictionPolicy(plc);
cc.setAtomicityMode(TRANSACTIONAL);
- cc.setEvictSynchronized(false);
NearCacheConfiguration nearCfg = new NearCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/05c48f23/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
index 3368a83..95cafd6 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
@@ -105,6 +105,7 @@ public class ConfigVariations {
Parameters.objectParameters("setWriteSynchronizationMode", CacheWriteSynchronizationMode.FULL_SYNC),
Parameters.objectParameters("setAtomicWriteOrderMode", CacheAtomicWriteOrderMode.PRIMARY),
Parameters.objectParameters("setStartSize", 1024),
+ Parameters.booleanParameters("setOnheapCacheEnabled")
};
/** */
@@ -133,6 +134,7 @@ public class ConfigVariations {
Parameters.objectParameters("setWriteSynchronizationMode", CacheWriteSynchronizationMode.FULL_SYNC),
Parameters.objectParameters("setAtomicWriteOrderMode", CacheAtomicWriteOrderMode.PRIMARY),
Parameters.objectParameters("setStartSize", 1024),
+ Parameters.booleanParameters("setOnheapCacheEnabled")
};
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/05c48f23/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index e895b6f..f99e2f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -57,6 +57,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColo
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPrimarySyncSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedTxSingleThreadedSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEntrySelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEvictionSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEvictionsDisabledSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtExpiredEntriesPreloadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtMappingSelfTest;
@@ -73,8 +74,10 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePart
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedTopologyChangeSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedUnloadEventsSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePartitionedBackupNodeFailureRecoveryTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEvictionEventSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearMultiNodeSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearReadersSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearEvictionEventSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearExpiredEntriesPreloadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearJobExecutionSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearMultiGetSelfTest;
@@ -112,6 +115,7 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCach
import org.apache.ignite.internal.processors.cache.distributed.near.GridPartitionedBackupLoadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.NearCacheSyncUpdateTest;
import org.apache.ignite.internal.processors.cache.distributed.near.NoneRebalanceModeSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEvictionSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedJobExecutionTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicBasicStoreSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicGetAndTransformStoreSelfTest;
@@ -219,12 +223,11 @@ public class IgniteCacheTestSuite2 extends TestSuite {
suite.addTest(new TestSuite(GridCachePartitionNotLoadedEventSelfTest.class));
suite.addTest(new TestSuite(GridCacheDhtEvictionsDisabledSelfTest.class));
// TODO GG-11140.
- // suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class));
- // suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class));
- // suite.addTest(new TestSuite(GridCacheDhtEvictionSelfTest.class));
- // suite.addTest(new TestSuite(GridCacheReplicatedEvictionSelfTest.class));
- // suite.addTest(new TestSuite(GridCacheDhtEvictionNearReadersSelfTest.class));
- // suite.addTest(new TestSuite(GridCacheDhtAtomicEvictionNearReadersSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtEvictionSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheReplicatedEvictionSelfTest.class));
+
suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedPreloadEventsSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedUnloadEventsSelfTest.class));
[36/53] [abbrv] ignite git commit: Merge branches
'ignite-4535-master' and 'ignite-4851' of
https://github.com/gridgain/apache-ignite into ignite-4851
Posted by ag...@apache.org.
Merge branches 'ignite-4535-master' and 'ignite-4851' of https://github.com/gridgain/apache-ignite into ignite-4851
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2999d998
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2999d998
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2999d998
Branch: refs/heads/ignite-3477-master
Commit: 2999d99823dd888d17f5b66295a89f6a96f1d076
Parents: c61d138 3b5a745
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Apr 6 18:04:38 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Apr 6 18:04:38 2017 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 200 +++----------------
.../configuration/NearCacheConfiguration.java | 1 -
.../processors/cache/GridCacheAttributes.java | 14 --
.../cache/GridCacheEvictionManager.java | 18 --
.../processors/cache/GridCacheProcessor.java | 21 +-
.../utils/PlatformConfigurationUtils.java | 13 +-
.../cache/VisorCacheEvictionConfiguration.java | 55 -----
.../internal/ClusterNodeMetricsSelfTest.java | 1 +
.../cache/CacheConfigurationLeakTest.java | 1 +
.../CacheSerializableTransactionsTest.java | 2 +
.../cache/GridCacheAbstractSelfTest.java | 10 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 2 +-
...idCacheConfigurationConsistencySelfTest.java | 41 +---
.../GridCacheEvictionEventAbstractTest.java | 3 +
.../cache/GridCacheLifecycleAwareSelfTest.java | 1 +
.../cache/GridCacheObjectToStringSelfTest.java | 1 +
.../cache/GridCachePartitionedGetSelfTest.java | 1 -
.../GridCachePreloadingEvictionsSelfTest.java | 3 -
.../cache/GridCacheReloadSelfTest.java | 1 +
.../cache/GridCacheSwapPreloadSelfTest.java | 1 -
.../GridCacheTtlManagerEvictionSelfTest.java | 1 +
.../cache/IgniteCacheAbstractTest.java | 6 +-
...gniteCacheLoadRebalanceEvictionSelfTest.java | 2 +-
...gniteCacheP2pUnmarshallingNearErrorTest.java | 4 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 6 +-
.../IgniteCacheReadThroughEvictionSelfTest.java | 1 +
.../IgniteCacheStoreValueAbstractTest.java | 5 -
.../GridCacheBinaryObjectsAbstractSelfTest.java | 8 +
...ObjectsAtomicNearDisabledOnheapSelfTest.java | 8 +
...dCacheBinaryObjectsAtomicOnheapSelfTest.java | 8 +
...tsPartitionedNearDisabledOnheapSelfTest.java | 8 +
...eBinaryObjectsPartitionedOnheapSelfTest.java | 8 +
...idCacheBinaryObjectsLocalOnheapSelfTest.java | 26 +++
.../GridCacheAbstractNodeRestartSelfTest.java | 1 +
...tractPartitionedByteArrayValuesSelfTest.java | 1 -
.../IgniteCacheTxIteratorSelfTest.java | 1 +
...eColocatedOptimisticTransactionSelfTest.java | 1 -
...GridCacheDhtEvictionNearReadersSelfTest.java | 6 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 6 +-
.../dht/GridCacheDhtPreloadOnheapSelfTest.java | 26 +++
.../dht/GridCacheDhtPreloadSelfTest.java | 38 ++--
...NearDisabledAtomicOnheapFullApiSelfTest.java | 28 +++
...ledAtomicOnheapMultiNodeFullApiSelfTest.java | 28 +++
...tionedNearDisabledOnheapFullApiSelfTest.java | 27 +++
...rDisabledOnheapMultiNodeFullApiSelfTest.java | 27 +++
.../dht/IgniteCacheMultiTxLockSelfTest.java | 1 +
.../IgniteCachePutRetryAbstractSelfTest.java | 2 +
.../near/GridCacheNearReadersSelfTest.java | 1 -
...ePartitionedAtomicOnheapFullApiSelfTest.java | 28 +++
...nedAtomicOnheapMultiNodeFullApiSelfTest.java | 28 +++
.../GridCachePartitionedEvictionSelfTest.java | 1 +
.../GridCachePartitionedFullApiSelfTest.java | 2 -
...ePartitionedMultiThreadedPutGetSelfTest.java | 2 +-
...idCachePartitionedOnheapFullApiSelfTest.java | 26 +++
...rtitionedOnheapMultiNodeFullApiSelfTest.java | 26 +++
...stractReplicatedByteArrayValuesSelfTest.java | 1 -
.../GridCacheReplicatedEvictionSelfTest.java | 135 -------------
...ridCacheReplicatedOnheapFullApiSelfTest.java | 26 +++
...eplicatedOnheapMultiNodeFullApiSelfTest.java | 26 +++
.../cache/eviction/EvictionAbstractTest.java | 35 +---
...heConcurrentEvictionConsistencySelfTest.java | 1 +
.../GridCacheConcurrentEvictionsSelfTest.java | 1 +
.../GridCacheEmptyEntriesAbstractSelfTest.java | 4 +-
.../GridCacheEvictableEntryEqualsSelfTest.java | 1 +
.../GridCacheEvictionFilterSelfTest.java | 2 +-
.../GridCacheEvictionLockUnlockSelfTest.java | 1 +
.../GridCacheEvictionTouchSelfTest.java | 1 +
.../SortedEvictionPolicyPerformanceTest.java | 2 +-
...eCacheAtomicLocalOnheapExpiryPolicyTest.java | 26 +++
...IgniteCacheAtomicOnheapExpiryPolicyTest.java | 26 +++
.../GridCacheLocalByteArrayValuesSelfTest.java | 1 -
...acheAtomicOnheapMultiJvmFullApiSelfTest.java | 28 +++
...bledAtomicOnheapMultiJvmFullApiSelfTest.java | 28 +++
...arDisabledOnheapMultiJvmFullApiSelfTest.java | 28 +++
...artitionedOnheapMultiJvmFullApiSelfTest.java | 28 +++
...ReplicatedOnheapMultiJvmFullApiSelfTest.java | 28 +++
.../DataStreamProcessorSelfTest.java | 2 -
...sCachePerBlockLruEvictionPolicySelfTest.java | 1 +
.../loadtests/GridCacheMultiNodeLoadTest.java | 1 +
.../GridCachePartitionedAtomicLongLoadTest.java | 2 +-
.../configvariations/ConfigVariations.java | 6 +-
...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 11 +
.../IgniteCacheFullApiSelfTestSuite.java | 18 ++
.../testsuites/IgniteCacheTestSuite2.java | 15 +-
.../cache/CacheQueryEvictDataLostTest.java | 120 +++++++++++
.../CacheQueryOffheapEvictDataLostTest.java | 119 -----------
.../CacheRandomOperationsMultithreadedTest.java | 1 +
.../cache/GridCacheOffheapIndexGetSelfTest.java | 2 -
.../cache/GridIndexingWithNoopSwapSelfTest.java | 1 +
.../IgniteCacheQueryMultiThreadedSelfTest.java | 1 +
.../cache/ttl/CacheTtlAbstractSelfTest.java | 1 +
.../query/IgniteSqlSegmentedIndexSelfTest.java | 2 +-
.../IgniteCacheQuerySelfTestSuite.java | 4 +-
.../commands/cache/VisorCacheCommand.scala | 5 -
94 files changed, 834 insertions(+), 695 deletions(-)
----------------------------------------------------------------------
[42/53] [abbrv] ignite git commit: ignite-4535 : Added more config
variations for Full API tests.
Posted by ag...@apache.org.
ignite-4535 : Added more config variations for Full API tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc571fce
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc571fce
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc571fce
Branch: refs/heads/ignite-3477-master
Commit: bc571fce555689a59d575868b4bf4cb66ebba1af
Parents: 5157bc8
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Apr 7 17:05:27 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Apr 7 17:05:27 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheReloadSelfTest.java | 3 ++-
.../cache/GridCacheTtlManagerEvictionSelfTest.java | 7 ++++---
.../org/apache/ignite/testsuites/IgniteCacheTestSuite.java | 4 ++--
.../org/apache/ignite/testsuites/IgniteCacheTestSuite2.java | 5 ++---
.../org/apache/ignite/testsuites/IgniteCacheTestSuite3.java | 8 ++++----
.../ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java | 1 -
6 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java
index f3340f4..50bed2a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java
@@ -21,6 +21,7 @@ import java.util.Collections;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.cache.store.CacheStoreAdapter;
@@ -173,7 +174,7 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < N_ENTRIES; i++)
load(cache, i, true);
- assertEquals(MAX_CACHE_ENTRIES, cache.size());
+ assertEquals(MAX_CACHE_ENTRIES, cache.size(CachePeekMode.ONHEAP));
}
finally {
stopGrid();
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
index 23f06c6..29ffe87 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
@@ -23,6 +23,7 @@ import javax.cache.expiry.Duration;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -117,12 +118,12 @@ public class GridCacheTtlManagerEvictionSelfTest extends GridCommonAbstractTest
if (log.isTraceEnabled())
cctx.ttl().printMemoryStats();
- final String firstKey = "Some test entry key#0";
+ final String firstKey = "Some test entry key#1";
final String lastKey = "Some test entry key#" + ENTRIES_TO_PUT;
- assertFalse("first key should be evicted", cache.containsKey(firstKey));
+ assertNull("first key should be evicted", cache.localPeek(firstKey, CachePeekMode.ONHEAP));
- assertTrue("last key should NOT be evicted", cache.containsKey(lastKey));
+ assertNotNull("last key should NOT be evicted", cache.localPeek(lastKey, CachePeekMode.ONHEAP));
assertEquals("Ttl Manager should NOT track evicted entries", ENTRIES_LIMIT, cctx.ttl().pendingSize());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index eaa0701..5c1a879 100755
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -258,8 +258,8 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(GridCacheAsyncOperationsLimitSelfTest.class);
suite.addTestSuite(IgniteCacheManyAsyncOperationsTest.class);
suite.addTestSuite(GridCacheTtlManagerSelfTest.class);
- // TODO GG-11140.
- // suite.addTestSuite(GridCacheTtlManagerEvictionSelfTest.class);
+ // TODO: ignite-4534
+// suite.addTestSuite(GridCacheTtlManagerEvictionSelfTest.class);
suite.addTestSuite(GridCacheLifecycleAwareSelfTest.class);
suite.addTestSuite(IgniteCacheAtomicStopBusySelfTest.class);
suite.addTestSuite(IgniteCacheTransactionalStopBusySelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index 17e8fe9..c2fd382 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -121,6 +121,7 @@ import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicGet
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalBasicApiSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalBasicStoreSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalEventSelfTest;
+import org.apache.ignite.internal.processors.cache.local.GridCacheLocalEvictionEventSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalGetAndTransformStoreSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalIsolatedNodesSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalLoadAllSelfTest;
@@ -154,8 +155,7 @@ public class IgniteCacheTestSuite2 extends TestSuite {
suite.addTestSuite(GridCacheLocalTxSingleThreadedSelfTest.class);
suite.addTestSuite(GridCacheLocalTxTimeoutSelfTest.class);
suite.addTestSuite(GridCacheLocalEventSelfTest.class);
- // TODO TODO GG-11140.
- // suite.addTestSuite(GridCacheLocalEvictionEventSelfTest.class);
+ suite.addTestSuite(GridCacheLocalEvictionEventSelfTest.class);
suite.addTestSuite(GridCacheVariableTopologySelfTest.class);
suite.addTestSuite(GridCacheLocalTxMultiThreadedSelfTest.class);
suite.addTestSuite(GridCacheTransformEventSelfTest.class);
@@ -222,7 +222,6 @@ public class IgniteCacheTestSuite2 extends TestSuite {
suite.addTest(new TestSuite(GridCachePartitionedLoadCacheSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionNotLoadedEventSelfTest.class));
suite.addTest(new TestSuite(GridCacheDhtEvictionsDisabledSelfTest.class));
- // TODO GG-11140.
suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class));
suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class));
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
index 1c2f98b..caa18d0 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
@@ -24,6 +24,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheConditionalDeploymen
import org.apache.ignite.internal.processors.cache.GridCacheEntryVersionSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheOrderedPreloadingSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheReferenceCleanupSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheReloadSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheReplicatedSynchronousCommitTest;
import org.apache.ignite.internal.processors.cache.GridCacheTransactionalEntryProcessorDeploymentSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheValueBytesPreloadingSelfTest;
@@ -60,6 +61,7 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCa
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedBasicOpSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedBasicStoreSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEventSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEvictionEventSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedGetAndTransformStoreSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedLockSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeLockSelfTest;
@@ -131,8 +133,7 @@ public class IgniteCacheTestSuite3 extends TestSuite {
suite.addTestSuite(GridCachePutArrayValueSelfTest.class);
suite.addTestSuite(GridCacheReplicatedUnswapAdvancedSelfTest.class);
- // TODO TODO GG-11140.
- // suite.addTestSuite(GridCacheReplicatedEvictionEventSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedEvictionEventSelfTest.class);
suite.addTestSuite(GridCacheReplicatedTxMultiThreadedSelfTest.class);
suite.addTestSuite(GridCacheReplicatedPreloadEventsSelfTest.class);
suite.addTestSuite(GridCacheReplicatedPreloadStartStopEventsSelfTest.class);
@@ -177,8 +178,7 @@ public class IgniteCacheTestSuite3 extends TestSuite {
// Memory leak tests.
suite.addTestSuite(GridCacheReferenceCleanupSelfTest.class);
- // TODO GG-11140.
- // suite.addTestSuite(GridCacheReloadSelfTest.class);
+ suite.addTestSuite(GridCacheReloadSelfTest.class);
suite.addTestSuite(GridCacheMixedModeSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc571fce/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
index 2d48411..0e68385 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite2.java
@@ -44,7 +44,6 @@ public class IgniteCacheQuerySelfTestSuite2 extends TestSuite {
suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class);
- // TODO GG-11140.
suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheCrossCacheJoinRandomTest.class);
[28/53] [abbrv] ignite git commit: Merge branches
'ignite-3477-master' and 'ignite-4535-master' of
https://github.com/gridgain/apache-ignite into ignite-4535-master
Posted by ag...@apache.org.
Merge branches 'ignite-3477-master' and 'ignite-4535-master' of https://github.com/gridgain/apache-ignite into ignite-4535-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0a39212c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0a39212c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0a39212c
Branch: refs/heads/ignite-3477-master
Commit: 0a39212c92cbc5193cbb4531f08001b9eac9e6d3
Parents: 6dd29ee dce205f
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Wed Apr 5 12:03:40 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Wed Apr 5 12:03:40 2017 +0300
----------------------------------------------------------------------
...ryDuplicateIndexObjectsAbstractSelfTest.java | 161 -------------------
...ateIndexObjectPartitionedAtomicSelfTest.java | 38 -----
...xObjectPartitionedTransactionalSelfTest.java | 41 -----
...eRebalancingUnmarshallingFailedSelfTest.java | 6 +-
.../processors/query/h2/IgniteH2Indexing.java | 8 +-
.../IgniteBinaryCacheQueryTestSuite.java | 5 -
6 files changed, 9 insertions(+), 250 deletions(-)
----------------------------------------------------------------------
[02/53] [abbrv] ignite git commit: ignite-4535 : Removing
CacheMemoryMode - WIP.
Posted by ag...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 1514673..4d345c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -66,7 +66,6 @@ import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
-import static org.apache.ignite.testframework.GridTestUtils.TestMemoryMode;
/**
* Test GridDhtInvalidPartitionException handling in ATOMIC cache during restarts.
@@ -85,9 +84,6 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
/** Write sync. */
private CacheWriteSynchronizationMode writeSync;
- /** Memory mode. */
- private TestMemoryMode memMode;
-
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
@@ -107,8 +103,6 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
if (testClientNode() && getTestIgniteInstanceName(0).equals(igniteInstanceName))
cfg.setClientMode(true);
- GridTestUtils.setMemoryMode(cfg, ccfg, memMode, 100, 1024);
-
return cfg;
}
@@ -150,99 +144,54 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
* @throws Exception If failed.
*/
public void testClockFullSync() throws Exception {
- checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.HEAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testClockFullSyncSwap() throws Exception {
- checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.SWAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testClockFullSyncOffheapTiered() throws Exception {
- checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.OFFHEAP_TIERED);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testClockFullSyncOffheapSwap() throws Exception {
- checkRestarts(CLOCK, FULL_SYNC, TestMemoryMode.OFFHEAP_EVICT_SWAP);
+ checkRestarts(CLOCK, FULL_SYNC);
}
/**
* @throws Exception If failed.
*/
public void testClockPrimarySync() throws Exception {
- checkRestarts(CLOCK, PRIMARY_SYNC, TestMemoryMode.HEAP);
+ checkRestarts(CLOCK, PRIMARY_SYNC);
}
/**
* @throws Exception If failed.
*/
public void testClockFullAsync() throws Exception {
- checkRestarts(CLOCK, FULL_ASYNC, TestMemoryMode.HEAP);
+ checkRestarts(CLOCK, FULL_ASYNC);
}
/**
* @throws Exception If failed.
*/
public void testPrimaryFullSync() throws Exception {
- checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.HEAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testPrimaryFullSyncSwap() throws Exception {
- checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.SWAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testPrimaryFullSyncOffheapTiered() throws Exception {
- checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.OFFHEAP_TIERED);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testPrimaryFullSyncOffheapSwap() throws Exception {
- checkRestarts(PRIMARY, FULL_SYNC, TestMemoryMode.OFFHEAP_EVICT_SWAP);
+ checkRestarts(PRIMARY, FULL_SYNC);
}
/**
* @throws Exception If failed.
*/
public void testPrimaryPrimarySync() throws Exception {
- checkRestarts(PRIMARY, PRIMARY_SYNC, TestMemoryMode.HEAP);
+ checkRestarts(PRIMARY, PRIMARY_SYNC);
}
/**
* @throws Exception If failed.
*/
public void testPrimaryFullAsync() throws Exception {
- checkRestarts(PRIMARY, FULL_ASYNC, TestMemoryMode.HEAP);
+ checkRestarts(PRIMARY, FULL_ASYNC);
}
/**
* @param writeOrder Write order to check.
* @param writeSync Write synchronization mode to check.
- * @param memMode Memory mode.
* @throws Exception If failed.
*/
private void checkRestarts(CacheAtomicWriteOrderMode writeOrder,
- CacheWriteSynchronizationMode writeSync,
- TestMemoryMode memMode)
+ CacheWriteSynchronizationMode writeSync)
throws Exception {
this.writeOrder = writeOrder;
this.writeSync = writeSync;
- this.memMode = memMode;
final int gridCnt = 6;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
index 5c625aa..a546d89 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
@@ -29,7 +29,6 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteAtomicLong;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.affinity.AffinityKeyMapped;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java
index 144d362..0eb7a42 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java
@@ -21,7 +21,6 @@ import java.util.Random;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -33,7 +32,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
@@ -54,9 +52,6 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest {
/** Cache atomicity mode specified by test. */
private CacheAtomicityMode atomicityMode;
- /** Memory mode. */
- private CacheMemoryMode memMode;
-
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
@@ -65,7 +60,6 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest {
cc.setCacheMode(PARTITIONED);
cc.setAtomicityMode(atomicityMode);
- cc.setMemoryMode(memMode);
cc.setWriteSynchronizationMode(PRIMARY_SYNC);
cc.setRebalanceMode(SYNC);
cc.setStartSize(100);
@@ -95,7 +89,6 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest {
*/
public void testAtomicNearEvictionMaxSize() throws Exception {
atomicityMode = ATOMIC;
- memMode = ONHEAP_TIERED;
checkNearEvictionMaxSize();
}
@@ -105,7 +98,6 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest {
*/
public void testTransactionalNearEvictionMaxSize() throws Exception {
atomicityMode = TRANSACTIONAL;
- memMode = ONHEAP_TIERED;
checkNearEvictionMaxSize();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java
index a2f6f62..5b0a12c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.eviction.lru;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -33,7 +32,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -61,9 +59,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes
/** Cache atomicity mode specified by test. */
private CacheAtomicityMode atomicityMode;
- /** Memory mode. */
- private CacheMemoryMode memMode;
-
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
@@ -82,7 +77,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes
cc.setCacheMode(cacheMode);
cc.setAtomicityMode(atomicityMode);
- cc.setMemoryMode(memMode);
cc.setWriteSynchronizationMode(PRIMARY_SYNC);
cc.setRebalanceMode(SYNC);
cc.setStartSize(100);
@@ -104,7 +98,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes
public void testPartitionedAtomicNearEvictionMaxSize() throws Exception {
atomicityMode = ATOMIC;
cacheMode = PARTITIONED;
- memMode = ONHEAP_TIERED;
checkNearEvictionMaxSize();
}
@@ -115,7 +108,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes
public void testPartitionedTransactionalNearEvictionMaxSize() throws Exception {
atomicityMode = TRANSACTIONAL;
cacheMode = PARTITIONED;
- memMode = ONHEAP_TIERED;
checkNearEvictionMaxSize();
}
@@ -126,7 +118,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes
public void testReplicatedAtomicNearEvictionMaxSize() throws Exception {
atomicityMode = ATOMIC;
cacheMode = REPLICATED;
- memMode = ONHEAP_TIERED;
checkNearEvictionMaxSize();
}
@@ -137,7 +128,6 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes
public void testReplicatedTransactionalNearEvictionMaxSize() throws Exception {
atomicityMode = TRANSACTIONAL;
cacheMode = REPLICATED;
- memMode = ONHEAP_TIERED;
checkNearEvictionMaxSize();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 711908b..482d275 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -110,8 +110,6 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
cfg.setExpiryPolicyFactory(factory);
- cfg.setMemoryMode(memoryMode());
-
if (disableEagerTtl)
cfg.setEagerTtl(false);
@@ -119,13 +117,6 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs
}
/**
- * @return Cache memory mode.
- */
- protected CacheMemoryMode memoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
- }
-
- /**
* @throws Exception if failed.
*/
public void testCreateUpdate0() throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java
deleted file mode 100644
index 4a4981d..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java
+++ /dev/null
@@ -1,627 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.local;
-
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-
-/**
- *
- */
-public class LocalCacheOffHeapAndSwapMetricsSelfTest extends GridCommonAbstractTest {
- /** Grid count. */
- private static final int GRID_CNT = 1;
-
- /** Keys count. */
- private static final int KEYS_CNT = 1000;
-
- /** Max size. */
- private static final int MAX_SIZE = 100;
-
- /** Entry size. */
- private static final int ENTRY_SIZE = 86; // Calculated as allocated size divided on entries count.
-
- /** Offheap max count. */
- private static final int OFFHEAP_MAX_CNT = KEYS_CNT / 2;
-
- /** Offheap max size. */
- private static final int OFFHEAP_MAX_SIZE = ENTRY_SIZE * OFFHEAP_MAX_CNT;
-
- /** Cache. */
- private IgniteCache<Integer, Integer> cache;
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
- return cfg;
- }
-
- /**
- * @param memoryMode Cache memory mode.
- * @param offHeapSize Max off-heap size.
- * @param swapEnabled Swap enabled.
- */
- private void createCache(CacheMemoryMode memoryMode, int offHeapSize, boolean swapEnabled) {
- CacheConfiguration ccfg = defaultCacheConfiguration();
-
- ccfg.setStatisticsEnabled(true);
-
- ccfg.setCacheMode(CacheMode.LOCAL);
- ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
- ccfg.setMemoryMode(memoryMode);
-
- ccfg.setOffHeapMaxMemory(offHeapSize);
-
- ccfg.setEvictionPolicy(new FifoEvictionPolicy(MAX_SIZE));
-
- cache = grid(0).getOrCreateCache(ccfg);
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- super.beforeTestsStarted();
-
- startGrids(GRID_CNT);
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- if (cache != null)
- cache.destroy();
- }
-
- /**
- * @throws Exception if failed.
- */
- public void testOffHeapMetrics() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-4536");
-
- createCache(CacheMemoryMode.ONHEAP_TIERED, 0, false);
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.put(i, i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts());
- assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapGets());
- assertEquals(0, cache.localMetrics().getOffHeapHits());
- assertEquals(0f, cache.localMetrics().getOffHeapHitPercentage());
- assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapMisses());
- assertEquals(100f, cache.localMetrics().getOffHeapMissPercentage());
- assertEquals(0, cache.localMetrics().getOffHeapRemovals());
-
- assertEquals(0, cache.localMetrics().getOffHeapEvictions());
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapEntriesCount());
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount());
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.get(i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts());
- assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapGets());
- assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapHits());
- assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapMisses());
- assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapRemovals());
-
- assertEquals(0, cache.localMetrics().getOffHeapEvictions());
- assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapEntriesCount());
- assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount());
-
- for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++)
- cache.get(i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts());
- assertEquals(KEYS_CNT * 3, cache.localMetrics().getOffHeapGets());
- assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapHits());
- assertEquals(100 / 3.0, cache.localMetrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapMisses());
- assertEquals(100 - (100 / 3.0), cache.localMetrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapRemovals());
-
- assertEquals(0, cache.localMetrics().getOffHeapEvictions());
- assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapEntriesCount());
- assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount());
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.remove(i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts());
- assertEquals(KEYS_CNT * 4 - MAX_SIZE, cache.localMetrics().getOffHeapGets());
- assertEquals(KEYS_CNT * 2 - MAX_SIZE, cache.localMetrics().getOffHeapHits());
- assertEquals(100 * (KEYS_CNT * 2.0 - MAX_SIZE) / (KEYS_CNT * 4.0 - MAX_SIZE),
- cache.localMetrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapMisses());
- assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0 - MAX_SIZE),
- cache.localMetrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2 - MAX_SIZE, cache.localMetrics().getOffHeapRemovals());
-
- assertEquals(0, cache.localMetrics().getOffHeapEvictions());
- assertEquals(0, cache.localMetrics().getOffHeapEntriesCount());
- assertEquals(0, cache.localMetrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount());
- }
-
- /**
- * @throws Exception if failed.
- */
- public void testSwapMetrics() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-4536");
-
- createCache(CacheMemoryMode.ONHEAP_TIERED, -1, true);
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.put(i, i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getSwapPuts());
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapGets());
- assertEquals(0, cache.localMetrics().getSwapHits());
- assertEquals(0f, cache.localMetrics().getSwapHitPercentage());
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapMisses());
- assertEquals(100f, cache.localMetrics().getSwapMissPercentage());
- assertEquals(0, cache.localMetrics().getSwapRemovals());
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getSwapEntriesCount());
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.get(i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getSwapPuts());
- assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapGets());
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapHits());
- assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getSwapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapMisses());
- assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getSwapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapRemovals());
-
- assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getSwapEntriesCount());
-
- for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++)
- cache.get(i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getSwapPuts());
- assertEquals(KEYS_CNT * 3, cache.localMetrics().getSwapGets());
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapHits());
- assertEquals(100 / 3.0, cache.localMetrics().getSwapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapMisses());
- assertEquals(100 - (100 / 3.0), cache.localMetrics().getSwapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapRemovals());
-
- assertEquals(KEYS_CNT - MAX_SIZE, cache.localMetrics().getSwapEntriesCount());
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.remove(i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getSwapPuts());
- assertEquals(KEYS_CNT * 4 - MAX_SIZE, cache.localMetrics().getSwapGets());
- assertEquals(KEYS_CNT * 2 - MAX_SIZE, cache.localMetrics().getSwapHits());
- assertEquals(100 * (KEYS_CNT * 2.0 - MAX_SIZE) / (KEYS_CNT * 4.0 - MAX_SIZE),
- cache.localMetrics().getSwapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapMisses());
- assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0 - MAX_SIZE),
- cache.localMetrics().getSwapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2 - MAX_SIZE, cache.localMetrics().getSwapRemovals());
-
- assertEquals(0, cache.localMetrics().getSwapEntriesCount());
- }
-
- /**
- * @throws Exception if failed.
- */
- public void testOffHeapAndSwapMetrics() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-4536");
-
- createCache(CacheMemoryMode.ONHEAP_TIERED, OFFHEAP_MAX_SIZE, true);
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.put(i, i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts());
- assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapGets());
- assertEquals(0, cache.localMetrics().getOffHeapHits());
- assertEquals(0f, cache.localMetrics().getOffHeapHitPercentage());
- assertEquals(KEYS_CNT, cache.localMetrics().getOffHeapMisses());
- assertEquals(100f, cache.localMetrics().getOffHeapMissPercentage());
- assertEquals(0, cache.localMetrics().getOffHeapRemovals());
-
- assertEquals(KEYS_CNT - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions());
- assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEntriesCount());
- assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount());
-
- assertEquals(cache.localMetrics().getOffHeapEvictions(), cache.localMetrics().getSwapPuts());
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapGets());
- assertEquals(0, cache.localMetrics().getSwapHits());
- assertEquals(0f, cache.localMetrics().getSwapHitPercentage());
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapMisses());
- assertEquals(100f, cache.localMetrics().getSwapMissPercentage());
- assertEquals(0, cache.localMetrics().getSwapRemovals());
-
- assertEquals(cache.localMetrics().getOffHeapEvictions(), cache.localMetrics().getSwapEntriesCount());
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.get(i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts());
- assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapGets());
- assertEquals(0, cache.localMetrics().getOffHeapHits());
- assertEquals(0.0, cache.localMetrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.localMetrics().getOffHeapMisses());
- assertEquals(100.0, cache.localMetrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(0, cache.localMetrics().getOffHeapRemovals());
-
- assertEquals(cache.localMetrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions());
- assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEntriesCount());
- assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount());
-
- assertEquals(cache.localMetrics().getOffHeapEvictions(), cache.localMetrics().getSwapPuts());
- assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapGets());
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapHits());
- assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getSwapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapMisses());
- assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.localMetrics().getSwapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapRemovals());
-
- assertEquals(KEYS_CNT - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getSwapEntriesCount());
-
- for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++)
- cache.get(i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts());
- assertEquals(KEYS_CNT * 3, cache.localMetrics().getOffHeapGets());
- assertEquals(0, cache.localMetrics().getOffHeapHits());
- assertEquals(0.0, cache.localMetrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 3, cache.localMetrics().getOffHeapMisses());
- assertEquals(100.0, cache.localMetrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(0, cache.localMetrics().getOffHeapRemovals());
-
- assertEquals(cache.localMetrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions());
- assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEntriesCount());
- assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount());
-
- assertEquals(cache.localMetrics().getOffHeapEvictions(), cache.localMetrics().getSwapPuts());
- assertEquals(KEYS_CNT * 3, cache.localMetrics().getSwapGets());
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapHits());
- assertEquals(100 / 3.0, cache.localMetrics().getSwapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapMisses());
- assertEquals(100 - (100 / 3.0), cache.localMetrics().getSwapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.localMetrics().getSwapRemovals());
-
- assertEquals(KEYS_CNT - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getSwapEntriesCount());
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.remove(i);
-
- printStat();
-
- assertEquals(cache.localMetrics().getCacheEvictions(), cache.localMetrics().getOffHeapPuts());
- assertEquals(KEYS_CNT * 4 - MAX_SIZE, cache.localMetrics().getOffHeapGets());
- assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapHits());
- assertEquals(100 * OFFHEAP_MAX_CNT / (KEYS_CNT * 4.0 - MAX_SIZE),
- cache.localMetrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 4 - OFFHEAP_MAX_CNT - MAX_SIZE, cache.localMetrics().getOffHeapMisses());
- assertEquals(100 * (KEYS_CNT * 4 - OFFHEAP_MAX_CNT - MAX_SIZE) / (KEYS_CNT * 4.0 - MAX_SIZE),
- cache.localMetrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapRemovals());
-
- assertEquals(cache.localMetrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.localMetrics().getOffHeapEvictions());
- assertEquals(0, cache.localMetrics().getOffHeapEntriesCount());
- assertEquals(0, cache.localMetrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.localMetrics().getOffHeapBackupEntriesCount());
-
- assertEquals(cache.localMetrics().getOffHeapEvictions(), cache.localMetrics().getSwapPuts());
- assertEquals(KEYS_CNT * 4 - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getSwapGets());
- assertEquals(KEYS_CNT * 2 - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getSwapHits());
- assertEquals(100 * (KEYS_CNT * 2.0 - MAX_SIZE - OFFHEAP_MAX_CNT) / (KEYS_CNT * 4.0 - MAX_SIZE - OFFHEAP_MAX_CNT),
- cache.localMetrics().getSwapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.localMetrics().getSwapMisses());
- assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0 - MAX_SIZE - OFFHEAP_MAX_CNT),
- cache.localMetrics().getSwapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2 - MAX_SIZE - OFFHEAP_MAX_CNT, cache.localMetrics().getSwapRemovals());
-
- assertEquals(0, cache.localMetrics().getSwapEntriesCount());
- }
-
- /**
- * @throws Exception if failed.
- */
- public void testOffHeapMetricsInOffHeapTiered() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-4536");
-
-// createCache(CacheMemoryMode.OFFHEAP_TIERED, 0, false);
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.put(i, i);
-
- printStat();
-
- assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapPuts());
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapGets());
- assertEquals(0, cache.metrics().getOffHeapHits());
- assertEquals(0f, cache.metrics().getOffHeapHitPercentage());
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapMisses());
- assertEquals(100f, cache.metrics().getOffHeapMissPercentage());
- assertEquals(0, cache.metrics().getOffHeapRemovals());
-
- assertEquals(0, cache.metrics().getOffHeapEvictions());
- assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapEntriesCount());
- assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount());
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.get(i);
-
- printStat();
-
- assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets());
- assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapGets());
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapHits());
- assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.metrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapMisses());
- assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.metrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(0, cache.metrics().getOffHeapRemovals());
-
- assertEquals(0, cache.metrics().getOffHeapEvictions());
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapEntriesCount());
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount());
-
- for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++)
- cache.get(i);
-
- printStat();
-
- assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets());
- assertEquals(KEYS_CNT * 3, cache.metrics().getOffHeapGets());
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapHits());
- assertEquals(100 / 3.0, cache.metrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapMisses());
- assertEquals(100 - (100 / 3.0), cache.metrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(0, cache.metrics().getOffHeapRemovals());
-
- assertEquals(0, cache.metrics().getOffHeapEvictions());
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapEntriesCount());
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount());
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.remove(i);
-
- printStat();
-
- assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets());
- assertEquals(KEYS_CNT * 4, cache.metrics().getOffHeapGets());
- assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapHits());
- assertEquals(100 * (KEYS_CNT * 2.0) / (KEYS_CNT * 4.0),
- cache.metrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapMisses());
- assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0),
- cache.metrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapRemovals());
-
- assertEquals(0, cache.metrics().getOffHeapEvictions());
- assertEquals(0, cache.metrics().getOffHeapEntriesCount());
- assertEquals(0, cache.metrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount());
- }
-
- /**
- * @throws Exception if failed.
- */
- public void testOffHeapAndSwapMetricsInOffHeapTiered() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-4536");
-
-// createCache(CacheMemoryMode.OFFHEAP_TIERED, OFFHEAP_MAX_SIZE, true);
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.put(i, i);
-
- printStat();
-
- assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets());
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapGets());
- assertEquals(0, cache.metrics().getOffHeapHits());
- assertEquals(0f, cache.metrics().getOffHeapHitPercentage());
- assertEquals(KEYS_CNT, cache.metrics().getOffHeapMisses());
- assertEquals(100f, cache.metrics().getOffHeapMissPercentage());
- assertEquals(0, cache.metrics().getOffHeapRemovals());
-
- assertEquals(KEYS_CNT - OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEvictions());
- assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEntriesCount());
- assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount());
-
- assertEquals(cache.metrics().getOffHeapEvictions(), cache.metrics().getSwapPuts());
- assertEquals(KEYS_CNT, cache.metrics().getSwapGets());
- assertEquals(0, cache.metrics().getSwapHits());
- assertEquals(0f, cache.metrics().getSwapHitPercentage());
- assertEquals(KEYS_CNT, cache.metrics().getSwapMisses());
- assertEquals(100f, cache.metrics().getSwapMissPercentage());
- assertEquals(0, cache.metrics().getSwapRemovals());
-
- assertEquals(cache.metrics().getOffHeapEvictions(), cache.metrics().getSwapEntriesCount());
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.get(i);
-
- printStat();
-
- assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapPuts());
- assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapGets());
- assertEquals(0, cache.metrics().getOffHeapHits());
- assertEquals(0.0, cache.metrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.metrics().getOffHeapMisses());
- assertEquals(100.0, cache.metrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(0, cache.metrics().getOffHeapRemovals());
-
- assertEquals(cache.metrics().getCacheEvictions() - OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEvictions());
- assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEntriesCount());
- assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount());
-
- assertEquals(cache.metrics().getOffHeapEvictions(), cache.metrics().getSwapPuts());
- assertEquals(KEYS_CNT * 2, cache.metrics().getSwapGets());
- assertEquals(KEYS_CNT, cache.metrics().getSwapHits());
- assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.metrics().getSwapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.metrics().getSwapMisses());
- assertEquals(100 * KEYS_CNT / (KEYS_CNT * 2.0), cache.metrics().getSwapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.metrics().getSwapRemovals());
-
- assertEquals(KEYS_CNT - OFFHEAP_MAX_CNT, cache.metrics().getSwapEntriesCount());
-
- for (int i = KEYS_CNT; i < KEYS_CNT * 2; i++)
- cache.get(i);
-
- printStat();
-
- assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets());
- assertEquals(KEYS_CNT * 3, cache.metrics().getOffHeapGets());
- assertEquals(0, cache.metrics().getOffHeapHits());
- assertEquals(0.0, cache.metrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 3, cache.metrics().getOffHeapMisses());
- assertEquals(100.0, cache.metrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(0, cache.metrics().getOffHeapRemovals());
-
- assertEquals(cache.metrics().getCacheEvictions() - OFFHEAP_MAX_CNT - KEYS_CNT,
- cache.metrics().getOffHeapEvictions());
- assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapEntriesCount());
- assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount());
-
- assertEquals(cache.metrics().getOffHeapEvictions(), cache.metrics().getSwapPuts());
- assertEquals(KEYS_CNT * 3, cache.metrics().getSwapGets());
- assertEquals(KEYS_CNT, cache.metrics().getSwapHits());
- assertEquals(100 / 3.0, cache.metrics().getSwapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.metrics().getSwapMisses());
- assertEquals(100 - (100 / 3.0), cache.metrics().getSwapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT, cache.metrics().getSwapRemovals());
-
- assertEquals(KEYS_CNT - OFFHEAP_MAX_CNT, cache.metrics().getSwapEntriesCount());
-
- for (int i = 0; i < KEYS_CNT; i++)
- cache.remove(i);
-
- printStat();
-
- assertEquals(cache.metrics().getCacheEvictions(), cache.metrics().getOffHeapGets());
- assertEquals(KEYS_CNT * 4, cache.metrics().getOffHeapGets());
- assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapHits());
- assertEquals(100 * OFFHEAP_MAX_CNT / (KEYS_CNT * 4.0),
- cache.metrics().getOffHeapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 4 - OFFHEAP_MAX_CNT, cache.metrics().getOffHeapMisses());
- assertEquals(100 * (KEYS_CNT * 4 - OFFHEAP_MAX_CNT) / (KEYS_CNT * 4.0),
- cache.metrics().getOffHeapMissPercentage(), 0.1);
- assertEquals(OFFHEAP_MAX_CNT, cache.metrics().getOffHeapRemovals());
-
- assertEquals(cache.metrics().getCacheEvictions() - OFFHEAP_MAX_CNT - 2 * KEYS_CNT, cache.metrics().getOffHeapEvictions());
- assertEquals(0, cache.metrics().getOffHeapEntriesCount());
- assertEquals(0, cache.metrics().getOffHeapPrimaryEntriesCount());
- assertEquals(0, cache.metrics().getOffHeapBackupEntriesCount());
-
- assertEquals(cache.metrics().getOffHeapEvictions(), cache.metrics().getSwapPuts());
- assertEquals(KEYS_CNT * 4 - OFFHEAP_MAX_CNT, cache.metrics().getSwapGets());
- assertEquals(KEYS_CNT * 2 - OFFHEAP_MAX_CNT, cache.metrics().getSwapHits());
- assertEquals(100 * (KEYS_CNT * 2.0 - OFFHEAP_MAX_CNT) / (KEYS_CNT * 4.0 - OFFHEAP_MAX_CNT),
- cache.metrics().getSwapHitPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2, cache.metrics().getSwapMisses());
- assertEquals(100 * KEYS_CNT * 2.0 / (KEYS_CNT * 4.0 - OFFHEAP_MAX_CNT),
- cache.metrics().getSwapMissPercentage(), 0.1);
- assertEquals(KEYS_CNT * 2 - OFFHEAP_MAX_CNT, cache.metrics().getSwapRemovals());
-
- assertEquals(0, cache.metrics().getSwapEntriesCount());
- }
-
- /**
- * Prints stats.
- */
- protected void printStat() {
- System.out.println("!!! -------------------------------------------------------");
- System.out.println("!!! Puts: cache = " + cache.localMetrics().getCachePuts() +
- ", offheap = " + cache.localMetrics().getOffHeapPuts() +
- ", swap = " + cache.localMetrics().getSwapPuts());
- System.out.println("!!! Gets: cache = " + cache.localMetrics().getCacheGets() +
- ", offheap = " + cache.localMetrics().getOffHeapGets() +
- ", swap = " + cache.localMetrics().getSwapGets());
- System.out.println("!!! Removes: cache = " + cache.localMetrics().getCacheRemovals() +
- ", offheap = " + cache.localMetrics().getOffHeapRemovals() +
- ", swap = " + cache.localMetrics().getSwapRemovals());
- System.out.println("!!! Evictions: cache = " + cache.localMetrics().getCacheEvictions() +
- ", offheap = " + cache.localMetrics().getOffHeapEvictions() +
- ", swap = none" );
- System.out.println("!!! Hits: cache = " + cache.localMetrics().getCacheHits() +
- ", offheap = " + cache.localMetrics().getOffHeapHits() +
- ", swap = " + cache.localMetrics().getSwapHits());
- System.out.println("!!! Hit(%): cache = " + cache.localMetrics().getCacheHitPercentage() +
- ", offheap = " + cache.localMetrics().getOffHeapHitPercentage() +
- ", swap = " + cache.localMetrics().getSwapHitPercentage());
- System.out.println("!!! Misses: cache = " + cache.localMetrics().getCacheMisses() +
- ", offheap = " + cache.localMetrics().getOffHeapMisses() +
- ", swap = " + cache.localMetrics().getSwapMisses());
- System.out.println("!!! Miss(%): cache = " + cache.localMetrics().getCacheMissPercentage() +
- ", offheap = " + cache.localMetrics().getOffHeapMissPercentage() +
- ", swap = " + cache.localMetrics().getSwapMissPercentage());
- System.out.println("!!! Entries: cache = " + cache.localMetrics().getSize() +
- ", offheap = " + cache.localMetrics().getOffHeapEntriesCount() +
- ", swap = " + cache.localMetrics().getSwapEntriesCount());
- System.out.println("!!! Size: cache = none" +
- ", offheap = " + cache.localMetrics().getOffHeapAllocatedSize() +
- ", swap = " + cache.localMetrics().getSwapSize());
- System.out.println();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java
index 0b65ab3..612043f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java
@@ -24,7 +24,6 @@ import javax.cache.event.CacheEntryListenerException;
import javax.cache.event.CacheEntryUpdatedListener;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.query.ContinuousQuery;
import org.apache.ignite.cache.query.QueryCursor;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
index 45c1f78..22b8653 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
@@ -35,7 +35,6 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
import org.apache.ignite.cache.CacheEntryProcessor;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.query.ContinuousQuery;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
index 0b85375..9f5cfd5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
@@ -39,7 +39,6 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
import org.apache.ignite.cache.CacheEntryProcessor;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.query.ContinuousQuery;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java
index 02d72b8..9eb56dc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache.query.continuous;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
@@ -31,10 +30,9 @@ public class CacheKeepBinaryIterationNearEnabledTest extends CacheKeepBinaryIter
@Override protected CacheConfiguration<Object, Object> cacheConfiguration(
CacheMode cacheMode,
int backups,
- CacheAtomicityMode atomicityMode,
- CacheMemoryMode memoryMode) {
+ CacheAtomicityMode atomicityMode) {
CacheConfiguration<Object, Object> ccfg =
- super.cacheConfiguration(cacheMode, backups, atomicityMode, memoryMode);
+ super.cacheConfiguration(cacheMode, backups, atomicityMode);
ccfg.setNearConfiguration(new NearCacheConfiguration<>());
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java
index f345611..f98229d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.query.continuous;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.store.CacheStoreAdapter;
@@ -37,10 +36,9 @@ public class CacheKeepBinaryIterationStoreEnabledTest extends CacheKeepBinaryIte
@Override protected CacheConfiguration<Object, Object> cacheConfiguration(
CacheMode cacheMode,
int backups,
- CacheAtomicityMode atomicityMode,
- CacheMemoryMode memoryMode) {
+ CacheAtomicityMode atomicityMode) {
CacheConfiguration<Object, Object> ccfg =
- super.cacheConfiguration(cacheMode, backups, atomicityMode, memoryMode);
+ super.cacheConfiguration(cacheMode, backups, atomicityMode);
ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 3130b0c..abd7036 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -43,7 +43,6 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.query.ContinuousQuery;
@@ -79,7 +78,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.LOCAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -121,7 +119,6 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
cacheCfg.setReadThrough(true);
cacheCfg.setWriteThrough(true);
cacheCfg.setLoadPreviousValue(true);
- cacheCfg.setMemoryMode(memoryMode());
cfg.setCacheConfiguration(cacheCfg);
}
@@ -140,13 +137,6 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
}
/**
- * @return Cache memory mode.
- */
- protected CacheMemoryMode memoryMode() {
- return ONHEAP_TIERED;
- }
-
- /**
* @return Peer class loading enabled flag.
*/
protected boolean peerClassLoadingEnabled() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
index 38d6c7b..4143029 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
@@ -31,7 +31,6 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteFileSystem;
import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.FileSystemConfiguration;
@@ -61,7 +60,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC;
@@ -166,9 +164,6 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
/** Dual mode flag. */
protected final boolean dual;
- /** Memory mode. */
- protected final CacheMemoryMode memoryMode;
-
/** IP finder for primary topology. */
protected final TcpDiscoveryVmIpFinder primaryIpFinder = new TcpDiscoveryVmIpFinder(true);
@@ -196,18 +191,7 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
* @param mode IGFS mode.
*/
protected IgfsAbstractBaseSelfTest(IgfsMode mode) {
- this(mode, ONHEAP_TIERED);
- }
-
- /**
- * Constructor.
- *
- * @param mode IGFS mode.
- * @param memoryMode Memory mode.
- */
- protected IgfsAbstractBaseSelfTest(IgfsMode mode, CacheMemoryMode memoryMode) {
this.mode = mode;
- this.memoryMode = memoryMode;
dual = (mode == DUAL_SYNC || mode == DUAL_ASYNC);
}
@@ -396,7 +380,6 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
dataCacheCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(2));
dataCacheCfg.setBackups(0);
dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
- dataCacheCfg.setMemoryMode(memoryMode);
dataCacheCfg.setOffHeapMaxMemory(0);
CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
index 0e776b1..f3d6db6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.igfs;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.igfs.IgfsDirectoryNotEmptyException;
import org.apache.ignite.igfs.IgfsException;
@@ -79,16 +78,6 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
}
/**
- * Constructor.
- *
- * @param mode IGFS mode.
- * @param memoryMode Memory mode.
- */
- protected IgfsAbstractSelfTest(IgfsMode mode, CacheMemoryMode memoryMode) {
- super(mode, memoryMode);
- }
-
- /**
* Test existence check when the path exists both locally and remotely.
*
* @throws Exception If failed.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index dcf0bde..8d50653 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -66,11 +66,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.CacheMemoryMode;
-import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
@@ -1802,79 +1798,6 @@ public final class GridTestUtils {
}
/**
- * Sets cache configuration parameters according to test memory mode.
- *
- * @param cfg Ignite configuration.
- * @param ccfg Cache configuration.
- * @param testMode Test memory mode.
- * @param maxHeapCnt Maximum number of entries in heap (used if test mode involves eviction from heap).
- * @param maxOffheapSize Maximum offheap memory size (used if test mode involves eviction from offheap to swap).
- */
- public static void setMemoryMode(IgniteConfiguration cfg, CacheConfiguration ccfg,
- TestMemoryMode testMode,
- int maxHeapCnt,
- long maxOffheapSize) {
- assert testMode != null;
- assert ccfg != null;
-
- CacheMemoryMode memMode;
- boolean swap = false;
- boolean evictionPlc = false;
- long offheapMaxMem = -1L;
-
- switch (testMode) {
- case HEAP: {
- memMode = CacheMemoryMode.ONHEAP_TIERED;
- swap = false;
-
- break;
- }
-
- case SWAP: {
- memMode = CacheMemoryMode.ONHEAP_TIERED;
- evictionPlc = true;
- swap = true;
-
- break;
- }
-
- case OFFHEAP_EVICT: {
- memMode = CacheMemoryMode.ONHEAP_TIERED;
- evictionPlc = true;
- offheapMaxMem = 0;
-
- break;
- }
-
- case OFFHEAP_EVICT_SWAP: {
- assert maxOffheapSize > 0 : maxOffheapSize;
-
- memMode = CacheMemoryMode.ONHEAP_TIERED;
- swap = true;
- evictionPlc = true;
- offheapMaxMem = maxOffheapSize;
-
- break;
- }
-
- default:
- throw new IllegalArgumentException("Invalid mode: " + testMode);
- }
-
- ccfg.setMemoryMode(memMode);
-
- if (evictionPlc) {
- LruEvictionPolicy plc = new LruEvictionPolicy();
-
- plc.setMaxSize(maxHeapCnt);
-
- ccfg.setEvictionPolicy(plc);
- }
-
- ccfg.setOffHeapMaxMemory(offheapMaxMem);
- }
-
- /**
* Generate random alphabetical string.
*
* @param rnd Random object.
@@ -1891,23 +1814,4 @@ public final class GridTestUtils {
return b.toString();
}
-
-
- /**
- *
- */
- public enum TestMemoryMode {
- /** Heap only. */
- HEAP,
- /** Evict from heap to swap with eviction policy. */
- SWAP,
- /** Always evict to offheap, no swap. */
- OFFHEAP_TIERED,
- /** Always evict to offheap + evict from offheap to swap when max offheap memory limit is reached. */
- OFFHEAP_TIERED_SWAP,
- /** Evict to offheap with eviction policy, no swap. */
- OFFHEAP_EVICT,
- /** Evict to offheap with eviction policy + evict from offheap to swap when max offheap memory limit is reached. */
- OFFHEAP_EVICT_SWAP,
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
index 1d57898..3368a83 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
@@ -29,7 +29,6 @@ import javax.cache.event.CacheEntryListenerException;
import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheInterceptorAdapter;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
@@ -46,7 +45,6 @@ import org.apache.ignite.configuration.TopologyValidator;
import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.processors.cache.MapCacheStoreStrategy;
import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-import org.apache.ignite.testframework.junits.IgniteCacheConfigVariationsAbstractTest;
import static org.apache.ignite.internal.util.lang.GridFunc.asArray;
@@ -86,10 +84,6 @@ public class ConfigVariations {
);
/** */
- private static final ConfigParameter<Object> ONHEAP_TIERED_MEMORY_PARAM =
- Parameters.parameter("setMemoryMode", CacheMemoryMode.ONHEAP_TIERED);
-
- /** */
private static final ConfigParameter<Object> OFFHEAP_ENABLED =
Parameters.parameter("setOffHeapMaxMemory", 10 * 1024 * 1024L);
@@ -105,7 +99,6 @@ public class ConfigVariations {
private static final ConfigParameter<CacheConfiguration>[][] BASIC_CACHE_SET = new ConfigParameter[][] {
Parameters.objectParameters("setCacheMode", CacheMode.REPLICATED, CacheMode.PARTITIONED),
Parameters.enumParameters("setAtomicityMode", CacheAtomicityMode.class),
- Parameters.enumParameters("setMemoryMode", CacheMemoryMode.class),
// Set default parameters.
Parameters.objectParameters("setLoadPreviousValue", true),
asArray(SIMPLE_CACHE_STORE_PARAM),
@@ -119,9 +112,6 @@ public class ConfigVariations {
private static final ConfigParameter<CacheConfiguration>[][] FULL_CACHE_SET = new ConfigParameter[][] {
Parameters.enumParameters("setCacheMode", CacheMode.class),
Parameters.enumParameters("setAtomicityMode", CacheAtomicityMode.class),
- asArray(ONHEAP_TIERED_MEMORY_PARAM,
- Parameters.complexParameter(ONHEAP_TIERED_MEMORY_PARAM, OFFHEAP_ENABLED)
- ),
Parameters.booleanParameters("setLoadPreviousValue"),
Parameters.booleanParameters("setReadFromBackup"),
Parameters.booleanParameters("setStoreKeepBinary"),
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
index e0b24b2..b915f97 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteCacheConfigVariationsAbstractTest.java
@@ -24,7 +24,6 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.Ignition;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -383,13 +382,6 @@ public abstract class IgniteCacheConfigVariationsAbstractTest extends IgniteConf
}
/**
- * @return {@code True} if values should be stored off-heap.
- */
- protected CacheMemoryMode memoryMode() {
- return cacheConfiguration().getMemoryMode();
- }
-
- /**
* @return {@code True} if store is enabled.
*/
protected boolean storeEnabled() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java
index f3dd1c8..ebcf1df 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMetricsSelfTestSuite.java
@@ -27,7 +27,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMetricsSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheAtomicReplicatedMetricsSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMetricsSelfTest;
-import org.apache.ignite.internal.processors.cache.local.LocalCacheOffHeapAndSwapMetricsSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheAtomicLocalMetricsNoStoreSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheAtomicLocalMetricsSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheAtomicLocalTckMetricsSelfTestImpl;
@@ -49,7 +48,6 @@ public class IgniteCacheMetricsSelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheReplicatedMetricsSelfTest.class);
suite.addTestSuite(GridCachePartitionedMetricsSelfTest.class);
suite.addTestSuite(GridCachePartitionedHitsAndMissesSelfTest.class);
- suite.addTestSuite(LocalCacheOffHeapAndSwapMetricsSelfTest.class);
// Atomic cache.
suite.addTestSuite(GridCacheAtomicLocalMetricsSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
index bd41aeb..7706884 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
@@ -28,7 +28,6 @@ import javax.cache.expiry.ModifiedExpiryPolicy;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -41,7 +40,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
/**
@@ -53,19 +51,16 @@ public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest {
/**
* @param atomicityMode Atomicity mode.
- * @param memoryMode Memory mode.
* @param offheapMem Offheap memory size.
* @param idx Indexing enabled flag.
* @return Cache configuration.
*/
private CacheConfiguration<String, TestIndexedType> cacheConfiguration(CacheAtomicityMode atomicityMode,
- CacheMemoryMode memoryMode,
long offheapMem,
boolean idx) {
CacheConfiguration<String, TestIndexedType> ccfg = new CacheConfiguration<>();
ccfg.setAtomicityMode(atomicityMode);
- ccfg.setMemoryMode(memoryMode);
ccfg.setOffHeapMaxMemory(offheapMem);
ccfg.setBackups(1);
ccfg.setAtomicWriteOrderMode(PRIMARY);
@@ -96,14 +91,14 @@ public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAtomicIndexEnabled() throws Exception {
- concurrentPutGetRemoveExpireAndQuery(cacheConfiguration(ATOMIC, ONHEAP_TIERED, 0, true));
+ concurrentPutGetRemoveExpireAndQuery(cacheConfiguration(ATOMIC, 0, true));
}
/**
* @throws Exception If failed.
*/
public void testAtomic() throws Exception {
- concurrentPutGetRemoveExpireAndQuery(cacheConfiguration(ATOMIC, ONHEAP_TIERED, 0, false));
+ concurrentPutGetRemoveExpireAndQuery(cacheConfiguration(ATOMIC, 0, false));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
index b72345f..690fff8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryOffheapEvictDataLostTest.java
@@ -30,8 +30,6 @@ import org.apache.ignite.lang.IgniteInClosure;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
-
/**
*
*/
@@ -53,7 +51,6 @@ public class CacheQueryOffheapEvictDataLostTest extends GridCommonAbstractTest {
CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
ccfg.setName("cache-1");
- ccfg.setMemoryMode(ONHEAP_TIERED);
ccfg.setEvictionPolicy(new LruEvictionPolicy(10));
ccfg.setOffHeapMaxMemory(1024);
ccfg.setIndexedTypes(Integer.class, TestData.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
index d76bbf7..5fb0fb8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
@@ -28,7 +28,6 @@ import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.eviction.EvictionPolicy;
import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
@@ -51,7 +50,6 @@ import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -106,7 +104,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
public void testAtomicOffheapEviction() throws Exception {
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
ATOMIC,
- ONHEAP_TIERED,
new LruEvictionPolicy<>(10),
false);
@@ -119,7 +116,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
public void testAtomicOffheapEvictionIndexing() throws Exception {
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
ATOMIC,
- ONHEAP_TIERED,
new LruEvictionPolicy<>(10),
true);
@@ -132,7 +128,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
public void testTxOffheapEviction() throws Exception {
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
TRANSACTIONAL,
- ONHEAP_TIERED,
new LruEvictionPolicy<>(10),
false);
@@ -145,7 +140,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
public void testTxOffheapEvictionIndexing() throws Exception {
CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,
TRANSACTIONAL,
- ONHEAP_TIERED,
new LruEvictionPolicy<>(10),
true);
@@ -338,7 +332,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
/**
* @param cacheMode Cache mode.
* @param atomicityMode Cache atomicity mode.
- * @param memoryMode Cache memory mode.
* @param evictionPlc Eviction policy.
* @param indexing Indexing flag.
* @return Cache configuration.
@@ -346,14 +339,12 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
private CacheConfiguration<Object, Object> cacheConfiguration(
CacheMode cacheMode,
CacheAtomicityMode atomicityMode,
- CacheMemoryMode memoryMode,
@Nullable EvictionPolicy<Object, Object> evictionPlc,
boolean indexing) {
CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
ccfg.setAtomicityMode(atomicityMode);
ccfg.setCacheMode(cacheMode);
- ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
ccfg.setEvictionPolicy(evictionPlc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
index 820f223..392cdc7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
@@ -23,7 +23,6 @@ import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.QueryIndex;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/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 c61dc0d..17ee024 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
@@ -26,7 +26,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
index 390a090..9d18b62 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.ThreadLocalRandom;
import javax.cache.Cache;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.SqlQuery;
@@ -103,13 +102,6 @@ public class IgniteBinaryObjectQueryArgumentsTest extends GridCommonAbstractTest
}
/**
- * @return Memory mode.
- */
- protected CacheMemoryMode memoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
- }
-
- /**
* @param cacheName Cache name.
* @return Cache config.
*/
@@ -124,8 +116,6 @@ public class IgniteBinaryObjectQueryArgumentsTest extends GridCommonAbstractTest
ccfg.setQueryEntities(Collections.singletonList(person));
- ccfg.setMemoryMode(memoryMode());
-
ccfg.setName(cacheName);
return ccfg;
@@ -178,7 +168,6 @@ public class IgniteBinaryObjectQueryArgumentsTest extends GridCommonAbstractTest
cfg.setName(cacheName);
- cfg.setMemoryMode(memoryMode());
cfg.setIndexedTypes(key, val);
return cfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
index cb25c5f..57a8669 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.cache.CacheException;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteInterruptedException;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.query.SqlFieldsQuery;
@@ -66,7 +65,6 @@ public class IgniteCacheOffheapEvictQueryTest extends GridCommonAbstractTest {
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setBackups(0);
- cacheCfg.setMemoryMode(CacheMemoryMode.ONHEAP_TIERED);
cacheCfg.setEvictionPolicy(null);
cacheCfg.setNearConfiguration(null);
[04/53] [abbrv] ignite git commit: ignite-4535 : Removing
CacheMemoryMode - WIP.
Posted by ag...@apache.org.
ignite-4535 : Removing CacheMemoryMode - WIP.
(cherry picked from commit b3e1bc3)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5ec807a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5ec807a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5ec807a5
Branch: refs/heads/ignite-3477-master
Commit: 5ec807a53a812c47a5a8b22f98d57b25cccf0240
Parents: 3e71eda
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Tue Mar 21 16:27:18 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Mar 30 16:10:18 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/cache/CacheMemoryMode.java | 2 +-
.../configuration/CacheConfiguration.java | 4 +-
.../configuration/CollectionConfiguration.java | 4 +-
.../internal/ClusterNodeMetricsSelfTest.java | 30 +-
.../cache/CacheNearReaderUpdateTest.java | 11 -
.../cache/CacheOffheapMapEntrySelfTest.java | 32 +-
.../CachePutEventListenerErrorSelfTest.java | 13 +-
.../CacheSerializableTransactionsTest.java | 53 +-
.../cache/CacheSwapUnswapGetTest.java | 270 --------
...idAbstractCacheInterceptorRebalanceTest.java | 6 -
.../cache/GridCacheAbstractFullApiSelfTest.java | 9 -
.../GridCacheAbstractLocalStoreSelfTest.java | 1 -
.../GridCacheAbstractRemoveFailureTest.java | 26 +-
.../cache/GridCacheClearSelfTest.java | 29 +-
...GridCacheInterceptorAtomicRebalanceTest.java | 6 -
...heInterceptorTransactionalRebalanceTest.java | 6 -
.../cache/GridCacheOffheapUpdateSelfTest.java | 1 -
.../cache/GridCachePutAllFailoverSelfTest.java | 58 --
.../GridCacheTtlManagerEvictionSelfTest.java | 15 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 8 -
...IgniteCacheAtomicPutAllFailoverSelfTest.java | 5 -
.../IgniteCacheConfigVariationsFullApiTest.java | 11 +-
.../IgniteCacheEntryListenerAbstractTest.java | 11 -
...niteCacheEntryListenerExpiredEventsTest.java | 11 +-
...niteCacheExpireAndUpdateConsistencyTest.java | 20 +-
...gniteCacheInvokeReadThroughAbstractTest.java | 4 -
...iteCacheInvokeReadThroughSingleNodeTest.java | 17 +-
.../cache/IgniteCacheInvokeReadThroughTest.java | 21 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 3 -
.../IgniteCacheReadThroughEvictionSelfTest.java | 1 -
...heapCacheMetricsForClusterGroupSelfTest.java | 1 -
.../GridCacheQueueCleanupSelfTest.java | 2 -
...dCacheQueueMultiNodeConsistencySelfTest.java | 2 -
.../IgniteCollectionAbstractTest.java | 1 -
.../IgniteDataStructureUniqueNameTest.java | 2 -
.../GridCacheLocalAtomicQueueApiSelfTest.java | 2 -
.../local/GridCacheLocalAtomicSetSelfTest.java | 2 -
.../local/GridCacheLocalQueueApiSelfTest.java | 2 -
.../local/GridCacheLocalSetSelfTest.java | 2 -
...dCachePartitionedAtomicQueueApiSelfTest.java | 2 -
...ionedAtomicQueueCreateMultiNodeSelfTest.java | 2 -
...micQueueFailoverDataConsistencySelfTest.java | 2 -
...itionedAtomicQueueRotativeMultiNodeTest.java | 2 -
...chePartitionedAtomicSetFailoverSelfTest.java | 2 -
...rtitionedDataStructuresFailoverSelfTest.java | 2 -
.../GridCachePartitionedQueueApiSelfTest.java | 2 -
...PartitionedQueueCreateMultiNodeSelfTest.java | 2 -
...dCachePartitionedQueueEntryMoveSelfTest.java | 2 -
...nedQueueFailoverDataConsistencySelfTest.java | 2 -
...CachePartitionedQueueJoinedNodeSelfTest.java | 2 -
...dCachePartitionedQueueMultiNodeSelfTest.java | 2 -
...hePartitionedQueueRotativeMultiNodeTest.java | 2 -
...GridCachePartitionedSetFailoverSelfTest.java | 2 -
.../IgnitePartitionedQueueNoBackupsTest.java | 2 -
...eplicatedDataStructuresFailoverSelfTest.java | 2 -
...idCacheReplicatedQueueMultiNodeSelfTest.java | 2 -
...cheReplicatedQueueRotativeMultiNodeTest.java | 2 -
.../GridCacheReplicatedSetSelfTest.java | 2 -
.../GridCacheAbstractNodeRestartSelfTest.java | 115 +---
.../IgniteCacheAtomicNodeRestartTest.java | 5 -
.../IgniteCacheTxIteratorSelfTest.java | 33 +-
.../dht/IgniteCacheConcurrentPutGetRemove.java | 12 +-
.../IgniteCacheCrossCacheTxFailoverTest.java | 46 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 45 +-
.../dht/IgniteCachePutRetryAtomicSelfTest.java | 2 +-
...gniteCachePutRetryTransactionalSelfTest.java | 28 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 65 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 1 -
.../lru/LruNearEvictionPolicySelfTest.java | 8 -
.../LruNearOnlyNearEvictionPolicySelfTest.java | 10 -
.../IgniteCacheExpiryPolicyAbstractTest.java | 9 -
...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 627 -------------------
.../continuous/CacheContinuousBatchAckTest.java | 1 -
...eContinuousQueryAsyncFilterListenerTest.java | 1 -
.../CacheContinuousQueryOrderingEventTest.java | 1 -
...CacheKeepBinaryIterationNearEnabledTest.java | 6 +-
...acheKeepBinaryIterationStoreEnabledTest.java | 6 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 10 -
.../igfs/IgfsAbstractBaseSelfTest.java | 17 -
.../processors/igfs/IgfsAbstractSelfTest.java | 11 -
.../ignite/testframework/GridTestUtils.java | 96 ---
.../configvariations/ConfigVariations.java | 10 -
...IgniteCacheConfigVariationsAbstractTest.java | 8 -
.../IgniteCacheMetricsSelfTestSuite.java | 2 -
.../CacheOperationsWithExpirationTest.java | 9 +-
.../CacheQueryOffheapEvictDataLostTest.java | 3 -
.../CacheRandomOperationsMultithreadedTest.java | 9 -
.../ClientReconnectAfterClusterRestartTest.java | 1 -
.../cache/GridCacheQuerySimpleBenchmark.java | 1 -
.../IgniteBinaryObjectQueryArgumentsTest.java | 11 -
.../cache/IgniteCacheOffheapEvictQueryTest.java | 2 -
.../IgniteCacheQueryMultiThreadedSelfTest.java | 1 -
.../cache/IgniteCrossCachesJoinsQueryTest.java | 6 -
.../cache/ttl/CacheTtlAbstractSelfTest.java | 7 -
.../ttl/CacheTtlAtomicAbstractSelfTest.java | 29 +
.../cache/ttl/CacheTtlAtomicLocalSelfTest.java | 34 +
.../ttl/CacheTtlAtomicPartitionedSelfTest.java | 34 +
.../ttl/CacheTtlOnheapAbstractSelfTest.java | 29 -
.../CacheTtlOnheapAtomicAbstractSelfTest.java | 29 -
.../ttl/CacheTtlOnheapAtomicLocalSelfTest.java | 34 -
...CacheTtlOnheapAtomicPartitionedSelfTest.java | 34 -
...eTtlOnheapTransactionalAbstractSelfTest.java | 29 -
...acheTtlOnheapTransactionalLocalSelfTest.java | 34 -
...lOnheapTransactionalPartitionedSelfTest.java | 34 -
.../CacheTtlTransactionalAbstractSelfTest.java | 29 +
.../ttl/CacheTtlTransactionalLocalSelfTest.java | 34 +
...acheTtlTransactionalPartitionedSelfTest.java | 34 +
.../IgniteCacheWithIndexingTestSuite.java | 16 +-
108 files changed, 416 insertions(+), 1984 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java
index 0133327..5c840cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java
@@ -23,7 +23,7 @@ import org.apache.ignite.cache.eviction.EvictionPolicy;
* Defines set of memory modes. Memory modes help control whether cache entries are
* stored on heap memory, offheap memory, or in swap space.
*/
-public enum CacheMemoryMode {
+@Deprecated public enum CacheMemoryMode {
/**
* Entries will be stored on-heap first. The onheap tiered storage works as follows:
* <nl>
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/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 25398ca..418c7fb 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
@@ -1674,7 +1674,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
*
* @return Memory mode.
*/
- public CacheMemoryMode getMemoryMode() {
+ @Deprecated public CacheMemoryMode getMemoryMode() {
return null;
}
@@ -1684,7 +1684,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
* @param memMode Memory mode.
* @return {@code this} for chaining.
*/
- public CacheConfiguration<K, V> setMemoryMode(CacheMemoryMode memMode) {
+ @Deprecated public CacheConfiguration<K, V> setMemoryMode(CacheMemoryMode memMode) {
//this.memMode = memMode;
return this;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
index 4aa60a1..e92b8a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java
@@ -100,14 +100,14 @@ public class CollectionConfiguration implements Serializable {
/**
* @return Cache memory mode.
*/
- public CacheMemoryMode getMemoryMode() {
+ @Deprecated public CacheMemoryMode getMemoryMode() {
return null;
}
/**
* @param memoryMode Memory mode.
*/
- public void setMemoryMode(CacheMemoryMode memoryMode) {
+ @Deprecated public void setMemoryMode(CacheMemoryMode memoryMode) {
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/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 04b8985..35b3def 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
@@ -23,7 +23,6 @@ import java.util.concurrent.CountDownLatch;
import org.apache.ignite.GridTestTask;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
import org.apache.ignite.cluster.ClusterMetrics;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -62,8 +61,8 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
/** Amount of cache entries. */
private static final int MAX_VALS_AMOUNT = 400;
- /** With ONHEAP_TIERED policy. */
- private final String ON_HEAP_TIERED_NAME = "onHeapTieredCfg";
+ /** Cache name. */
+ private final String CACHE_NAME = "cache1";
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
@@ -88,19 +87,18 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
cfg.setCacheConfiguration();
cfg.setMetricsUpdateFrequency(0);
- CacheConfiguration<Integer, Object> onHeapTieredCfg = defaultCacheConfiguration();
- onHeapTieredCfg.setName(ON_HEAP_TIERED_NAME);
- onHeapTieredCfg.setStatisticsEnabled(true);
- onHeapTieredCfg.setMemoryMode(CacheMemoryMode.ONHEAP_TIERED);
- onHeapTieredCfg.setOffHeapMaxMemory(MAX_VALS_AMOUNT * VAL_SIZE);
+ CacheConfiguration<Integer, Object> ccfg = defaultCacheConfiguration();
+ ccfg.setName(CACHE_NAME);
+ ccfg.setStatisticsEnabled(true);
+ ccfg.setOffHeapMaxMemory(MAX_VALS_AMOUNT * VAL_SIZE);
FifoEvictionPolicy plc = new FifoEvictionPolicy();
plc.setMaxMemorySize(MAX_VALS_AMOUNT * VAL_SIZE);
plc.setMaxSize(0);
- onHeapTieredCfg.setEvictionPolicy(plc);
+ ccfg.setEvictionPolicy(plc);
- return cfg.setCacheConfiguration(onHeapTieredCfg);
+ return cfg.setCacheConfiguration(ccfg);
}
/**
@@ -111,25 +109,25 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
Ignite ignite = grid();
- final IgniteCache onHeapCache = ignite.getOrCreateCache(ON_HEAP_TIERED_NAME);
+ final IgniteCache cache = ignite.getOrCreateCache(CACHE_NAME);
- long prevTieredOffHeapSize = onHeapCache.metrics().getOffHeapAllocatedSize();
+ long prevTieredOffHeapSize = cache.metrics().getOffHeapAllocatedSize();
assertEquals(0, prevTieredOffHeapSize);
long prevClusterNonHeapMemoryUsed = ignite.cluster().metrics().getNonHeapMemoryUsed();
- fillCache(onHeapCache);
+ fillCache(cache);
- assertTrue(onHeapCache.metrics().getOffHeapAllocatedSize() > (MAX_VALS_AMOUNT - 5)
+ assertTrue(cache.metrics().getOffHeapAllocatedSize() > (MAX_VALS_AMOUNT - 5)
* VAL_SIZE + prevTieredOffHeapSize);
assertTrue(prevClusterNonHeapMemoryUsed < ignite.cluster().metrics().getNonHeapMemoryUsed());
prevClusterNonHeapMemoryUsed = ignite.cluster().metrics().getNonHeapMemoryUsed();
- prevTieredOffHeapSize = onHeapCache.metrics().getOffHeapAllocatedSize();
+ prevTieredOffHeapSize = cache.metrics().getOffHeapAllocatedSize();
- assertEquals(prevTieredOffHeapSize, onHeapCache.metrics().getOffHeapAllocatedSize());
+ assertEquals(prevTieredOffHeapSize, cache.metrics().getOffHeapAllocatedSize());
assertTrue((MAX_VALS_AMOUNT - 5) * VAL_SIZE + prevClusterNonHeapMemoryUsed <
ignite.cluster().metrics().getNonHeapMemoryUsed());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
index 4ea74ca..5dd2e2a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java
@@ -145,17 +145,6 @@ public class CacheNearReaderUpdateTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testOneBackupOffheap() throws Exception {
- CacheConfiguration<Integer, Integer> ccfg = cacheConfiguration(PARTITIONED, FULL_SYNC, 1, false, false);
-
- GridTestUtils.setMemoryMode(null, ccfg, GridTestUtils.TestMemoryMode.OFFHEAP_TIERED, 0, 0);
-
- testGetUpdateMultithreaded(ccfg);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testGetUpdateMultithreaded(CacheConfiguration<Integer, Integer> ccfg) throws Exception {
final List<Ignite> putNodes = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
index 0f09c56..06fafb3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteKernal;
@@ -30,7 +29,6 @@ import org.apache.ignite.internal.processors.cache.local.GridLocalCacheEntry;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.LOCAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -65,26 +63,23 @@ public class CacheOffheapMapEntrySelfTest extends GridCacheAbstractSelfTest {
}
/**
- * @param igniteInstanceName Ignite instance name.
- * @param memoryMode Memory mode.
+ * @param gridName Grid name.
* @param atomicityMode Atomicity mode.
* @param cacheMode Cache mode.
* @param cacheName Cache name.
* @return Cache configuration.
* @throws Exception If failed.
*/
- private CacheConfiguration cacheConfiguration(String igniteInstanceName,
- CacheMemoryMode memoryMode,
+ private CacheConfiguration cacheConfiguration(String gridName,
CacheAtomicityMode atomicityMode,
CacheMode cacheMode,
String cacheName)
throws Exception
{
- CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName);
+ CacheConfiguration cfg = super.cacheConfiguration(gridName);
cfg.setCacheMode(cacheMode);
cfg.setAtomicityMode(atomicityMode);
- cfg.setMemoryMode(memoryMode);
cfg.setName(cacheName);
return cfg;
@@ -94,38 +89,33 @@ public class CacheOffheapMapEntrySelfTest extends GridCacheAbstractSelfTest {
* @throws Exception If failed.
*/
public void testCacheMapEntry() throws Exception {
- checkCacheMapEntry(ONHEAP_TIERED, ATOMIC, LOCAL, GridLocalCacheEntry.class);
+ checkCacheMapEntry(ATOMIC, LOCAL, GridLocalCacheEntry.class);
- checkCacheMapEntry(ONHEAP_TIERED, TRANSACTIONAL, LOCAL, GridLocalCacheEntry.class);
+ checkCacheMapEntry(TRANSACTIONAL, LOCAL, GridLocalCacheEntry.class);
- checkCacheMapEntry(ONHEAP_TIERED, ATOMIC, PARTITIONED, GridNearCacheEntry.class);
+ checkCacheMapEntry(ATOMIC, PARTITIONED, GridNearCacheEntry.class);
- checkCacheMapEntry(ONHEAP_TIERED, TRANSACTIONAL, PARTITIONED, GridNearCacheEntry.class);
+ checkCacheMapEntry(TRANSACTIONAL, PARTITIONED, GridNearCacheEntry.class);
- checkCacheMapEntry(ONHEAP_TIERED, ATOMIC, REPLICATED, GridDhtAtomicCacheEntry.class);
+ checkCacheMapEntry(ATOMIC, REPLICATED, GridDhtAtomicCacheEntry.class);
- checkCacheMapEntry(ONHEAP_TIERED, TRANSACTIONAL, REPLICATED, GridDhtColocatedCacheEntry.class);
+ checkCacheMapEntry(TRANSACTIONAL, REPLICATED, GridDhtColocatedCacheEntry.class);
}
/**
- * @param memoryMode Cache memory mode.
* @param atomicityMode Cache atomicity mode.
* @param cacheMode Cache mode.
* @param entryCls Class of cache map entry.
* @throws Exception If failed.
*/
- private void checkCacheMapEntry(CacheMemoryMode memoryMode,
- CacheAtomicityMode atomicityMode,
+ private void checkCacheMapEntry(CacheAtomicityMode atomicityMode,
CacheMode cacheMode,
Class<?> entryCls)
throws Exception
{
- log.info("Test cache [memMode=" + memoryMode +
- ", atomicityMode=" + atomicityMode +
- ", cacheMode=" + cacheMode + ']');
+ log.info("Test cache [atomicityMode=" + atomicityMode + ", cacheMode=" + cacheMode + ']');
CacheConfiguration cfg = cacheConfiguration(grid(0).name(),
- memoryMode,
atomicityMode,
cacheMode,
"Cache");
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
index 272c3e4..4ad4b51 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
@@ -23,7 +23,6 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -95,37 +94,36 @@ public class CachePutEventListenerErrorSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testPartitionedAtomicOnHeap() throws Exception {
- doTest(CacheMode.PARTITIONED, CacheAtomicityMode.ATOMIC, CacheMemoryMode.ONHEAP_TIERED);
+ doTest(CacheMode.PARTITIONED, CacheAtomicityMode.ATOMIC);
}
/**
* @throws Exception If failed.
*/
public void testPartitionedTransactionalOnHeap() throws Exception {
- doTest(CacheMode.PARTITIONED, CacheAtomicityMode.TRANSACTIONAL, CacheMemoryMode.ONHEAP_TIERED);
+ doTest(CacheMode.PARTITIONED, CacheAtomicityMode.TRANSACTIONAL);
}
/**
* @throws Exception If failed.
*/
public void testReplicatedAtomicOnHeap() throws Exception {
- doTest(CacheMode.REPLICATED, CacheAtomicityMode.ATOMIC, CacheMemoryMode.ONHEAP_TIERED);
+ doTest(CacheMode.REPLICATED, CacheAtomicityMode.ATOMIC);
}
/**
* @throws Exception If failed.
*/
public void testReplicatedTransactionalOnHeap() throws Exception {
- doTest(CacheMode.REPLICATED, CacheAtomicityMode.TRANSACTIONAL, CacheMemoryMode.ONHEAP_TIERED);
+ doTest(CacheMode.REPLICATED, CacheAtomicityMode.TRANSACTIONAL);
}
/**
* @param cacheMode Cache mode.
* @param atomicityMode Atomicity mode.
- * @param memMode Memory mode.
* @throws Exception If failed.
*/
- private void doTest(CacheMode cacheMode, CacheAtomicityMode atomicityMode, CacheMemoryMode memMode)
+ private void doTest(CacheMode cacheMode, CacheAtomicityMode atomicityMode)
throws Exception {
Ignite ignite = grid("client");
@@ -135,7 +133,6 @@ public class CachePutEventListenerErrorSelfTest extends GridCommonAbstractTest {
cfg.setName("cache");
cfg.setCacheMode(cacheMode);
cfg.setAtomicityMode(atomicityMode);
- cfg.setMemoryMode(memMode);
IgniteCache<Integer, Integer> cache = ignite.createCache(cfg).withAsync();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
index 251e171..f3a39c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
@@ -51,6 +51,7 @@ import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.cache.CacheEntry;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.cache.store.CacheStoreAdapter;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -82,7 +83,6 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-import static org.apache.ignite.testframework.GridTestUtils.TestMemoryMode;
import static org.apache.ignite.testframework.GridTestUtils.runMultiThreadedAsync;
import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
@@ -2578,8 +2578,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
String readCacheName,
String writeCacheName,
final boolean entry,
- final AtomicInteger putKey) throws Exception
- {
+ final AtomicInteger putKey) throws Exception {
final int THREADS = 64;
final IgniteCache<Integer, Integer> readCache = ignite.cache(readCacheName);
@@ -3065,7 +3064,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
}
try (Transaction tx = client2.transactions().txStart(OPTIMISTIC, SERIALIZABLE)) {
- assertEquals(1, (Object) cache2.get(key));
+ assertEquals(1, (Object)cache2.get(key));
cache2.put(key, 2);
tx.commit();
@@ -3266,7 +3265,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
ignite0.createCache(ccfg1);
- CacheConfiguration<Integer, Integer> ccfg2=
+ CacheConfiguration<Integer, Integer> ccfg2 =
cacheConfiguration(PARTITIONED, FULL_SYNC, 1, false, false);
ccfg2.setName(CACHE2);
@@ -4008,42 +4007,35 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAccountTx1() throws Exception {
- accountTx(false, false, false, false, TestMemoryMode.HEAP);
+ accountTx(false, false, false, false);
}
/**
* @throws Exception If failed.
*/
public void testAccountTx2() throws Exception {
- accountTx(true, false, false, false, TestMemoryMode.HEAP);
+ accountTx(true, false, false, false);
}
/**
* @throws Exception If failed.
*/
public void testAccountTxWithNonSerializable() throws Exception {
- accountTx(false, false, true, false, TestMemoryMode.HEAP);
+ accountTx(false, false, true, false);
}
/**
* @throws Exception If failed.
*/
public void testAccountTxNearCache() throws Exception {
- accountTx(false, true, false, false, TestMemoryMode.HEAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testAccountTxOffheapTiered() throws Exception {
- accountTx(false, false, false, false, TestMemoryMode.OFFHEAP_TIERED);
+ accountTx(false, true, false, false);
}
/**
* @throws Exception If failed.
*/
public void testAccountTxNodeRestart() throws Exception {
- accountTx(false, false, false, true, TestMemoryMode.HEAP);
+ accountTx(false, false, false, true);
}
/**
@@ -4051,20 +4043,16 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
* @param nearCache If {@code true} near cache is enabled.
* @param nonSer If {@code true} starts threads executing non-serializable transactions.
* @param restart If {@code true} restarts one node.
- * @param memMode Test memory mode.
* @throws Exception If failed.
*/
private void accountTx(final boolean getAll,
final boolean nearCache,
final boolean nonSer,
- final boolean restart,
- TestMemoryMode memMode) throws Exception {
+ final boolean restart) throws Exception {
final Ignite srv = ignite(1);
CacheConfiguration<Integer, Integer> ccfg = cacheConfiguration(PARTITIONED, FULL_SYNC, 1, false, false);
- GridTestUtils.setMemoryMode(null, ccfg, memMode, 1, 64);
-
final String cacheName = srv.createCache(ccfg).getName();
try {
@@ -4346,12 +4334,16 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
}
{
- // Offheap.
+ // Eviction.
CacheConfiguration<Integer, Integer> ccfg = cacheConfiguration(PARTITIONED, FULL_SYNC, 1, false, false);
ccfg.setName("cache3");
ccfg.setRebalanceMode(SYNC);
- GridTestUtils.setMemoryMode(null, ccfg, TestMemoryMode.OFFHEAP_TIERED, 1, 64);
+ LruEvictionPolicy plc = new LruEvictionPolicy();
+
+ plc.setMaxSize(100);
+
+ ccfg.setEvictionPolicy(plc);
srv.createCache(ccfg);
@@ -4542,7 +4534,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
}
}
finally {
- destroyCache(cacheName);
+ destroyCache(cacheName);
}
}
@@ -4881,15 +4873,6 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
ccfgs.add(cacheConfiguration(PARTITIONED, FULL_SYNC, 1, true, true));
ccfgs.add(cacheConfiguration(PARTITIONED, FULL_SYNC, 2, true, true));
- // Swap and offheap enabled.
- for (GridTestUtils.TestMemoryMode memMode : GridTestUtils.TestMemoryMode.values()) {
- CacheConfiguration<Integer, Integer> ccfg = cacheConfiguration(PARTITIONED, FULL_SYNC, 1, false, false);
-
- GridTestUtils.setMemoryMode(null, ccfg, memMode, 1, 64);
-
- ccfgs.add(ccfg);
- }
-
return ccfgs;
}
@@ -4903,7 +4886,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
", near=" + (ccfg.getNearConfiguration() != null) +
", store=" + ccfg.isWriteThrough() +
", evictPlc=" + (ccfg.getEvictionPolicy() != null) +
- ", maxOffheap=" + ccfg.getOffHeapMaxMemory() +
+ ", maxOffheap=" + ccfg.getOffHeapMaxMemory() +
']');
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSwapUnswapGetTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSwapUnswapGetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSwapUnswapGetTest.java
deleted file mode 100644
index cb97fed..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSwapUnswapGetTest.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import java.util.Collections;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
-import org.apache.ignite.cache.CachePeekMode;
-import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.util.typedef.CAX;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.eclipse.jetty.util.ConcurrentHashSet;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-
-/**
- *
- */
-public class CacheSwapUnswapGetTest extends GridCommonAbstractTest {
- /** */
- private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
-
- /** */
- private static final long DURATION = 30_000;
-
- /** */
- private static final long OFFHEAP_MEM = 1000;
-
- /** */
- private static final int MAX_HEAP_SIZE = 100;
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
-
- return cfg;
- }
-
- /**
- * @param atomicityMode Cache atomicity mode.
- * @param memMode Cache memory mode.
- * @param swap {@code True} if swap enabled.
- * @return Cache configuration.
- */
- private CacheConfiguration<Integer, String> cacheConfiguration(CacheAtomicityMode atomicityMode,
- CacheMemoryMode memMode,
- boolean swap) {
- CacheConfiguration<Integer, String> ccfg = new CacheConfiguration<>();
-
- ccfg.setAtomicityMode(atomicityMode);
- ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setMemoryMode(memMode);
-
- if (memMode == CacheMemoryMode.ONHEAP_TIERED) {
- LruEvictionPolicy plc = new LruEvictionPolicy();
- plc.setMaxSize(MAX_HEAP_SIZE);
-
- ccfg.setEvictionPolicy(plc);
- }
-
- // TODO GG-11148.
-// if (swap) {
-// ccfg.setSwapEnabled(true);
-//
-// ccfg.setOffHeapMaxMemory(OFFHEAP_MEM);
-// }
-// else
-// ccfg.setOffHeapMaxMemory(0);
-
- return ccfg;
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- super.beforeTestsStarted();
-
- startGrid(0);
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
- @Override protected long getTestTimeout() {
- return DURATION + 60_000;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxCacheOffheapEvict() throws Exception {
- swapUnswap(TRANSACTIONAL, CacheMemoryMode.ONHEAP_TIERED, false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTxCacheOffheapSwapEvict() throws Exception {
- swapUnswap(TRANSACTIONAL, CacheMemoryMode.ONHEAP_TIERED, true);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testAtomicCacheOffheapEvict() throws Exception {
- swapUnswap(ATOMIC, CacheMemoryMode.ONHEAP_TIERED, false);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testAtomicCacheOffheapSwapEvict() throws Exception {
- swapUnswap(ATOMIC, CacheMemoryMode.ONHEAP_TIERED, true);
- }
-
- /**
- * @param atomicityMode Cache atomicity mode.
- * @param memMode Cache memory mode.
- * @param swap {@code True} if swap enabled.
- * @throws Exception If failed.
- */
- private void swapUnswap(CacheAtomicityMode atomicityMode, CacheMemoryMode memMode, boolean swap) throws Exception {
- log.info("Start test [mode=" + atomicityMode + ", swap=" + swap + ']');
-
- int threadCnt = 20;
- final int keyCnt = 1000;
- final int valCnt = 10000;
-
- final Ignite g = grid(0);
-
- final ConcurrentHashSet<Integer> keys = new ConcurrentHashSet<>();
-
- final AtomicBoolean done = new AtomicBoolean();
-
- g.destroyCache(null);
-
- final IgniteCache<Integer, String> cache = g.createCache(cacheConfiguration(atomicityMode, memMode, swap));
-
- try {
- IgniteInternalFuture<?> fut = multithreadedAsync(new CAX() {
- @Override public void applyx() throws IgniteCheckedException {
- ThreadLocalRandom rnd = ThreadLocalRandom.current();
-
- while (!done.get()) {
- Integer key = rnd.nextInt(keyCnt);
-
- switch (rnd.nextInt(3)) {
- case 0:
- cache.put(key, String.valueOf(rnd.nextInt(valCnt)));
-
- keys.add(key);
-
- break;
-
- case 1:
- cache.localEvict(Collections.singletonList(key));
-
- break;
-
- case 2:
- if (keys.contains(key)) {
- String val = cache.get(key);
-
- assertNotNull(val);
- }
-
- break;
-
- default:
- assert false;
- }
- }
- }
- }, threadCnt, "update-thread");
-
- IgniteInternalFuture<?> getFut = GridTestUtils.runAsync(new Callable<Void>() {
- @Override public Void call() throws Exception {
- Thread.currentThread().setName("get-thread");
-
- while (!done.get()) {
- for (Integer key : keys) {
- String val = cache.get(key);
-
- assertNotNull(val);
- }
- }
-
- return null;
- }
- });
-
- long endTime = System.currentTimeMillis() + DURATION;
-
- while (System.currentTimeMillis() < endTime) {
- Thread.sleep(5000);
-
- log.info("Cache size [heap=" + cache.localSize(CachePeekMode.ONHEAP) +
- ", offheap=" + cache.localSize(CachePeekMode.OFFHEAP) +
- ", total=" + cache.localSize() +
- ", offheapMem=" + cache.localMetrics().getOffHeapAllocatedSize() + ']');
- }
-
- done.set(true);
-
- fut.get();
- getFut.get();
-
- for (Integer key : keys) {
- String val = cache.get(key);
-
- assertNotNull(val);
- }
-
- int onheapSize = cache.localSize(CachePeekMode.ONHEAP);
- int offheapSize = cache.localSize(CachePeekMode.OFFHEAP);
- int total = cache.localSize();
- long offheapMem = cache.localMetrics().getOffHeapAllocatedSize();
-
- log.info("Cache size [heap=" + onheapSize +
- ", offheap=" + offheapSize +
- ", total=" + total +
- ", offheapMem=" + offheapMem + ']');
-
- assertTrue(total > 0);
-
- assertEquals(offheapSize, total);
-
- assertEquals(MAX_HEAP_SIZE, onheapSize);
- }
- finally {
- done.set(true);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
index b7d7170..3f9e531 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
@@ -28,7 +28,6 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheInterceptor;
import org.apache.ignite.cache.CacheInterceptorAdapter;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -101,11 +100,6 @@ public abstract class GridAbstractCacheInterceptorRebalanceTest extends GridComm
*/
protected abstract CacheAtomicityMode atomicityMode();
- /**
- * @return Cache memory mode;
- */
- protected abstract CacheMemoryMode memoryMode();
-
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/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 7b333ea..f58435a 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
@@ -59,7 +59,6 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.cache.CacheEntry;
import org.apache.ignite.cache.CacheEntryProcessor;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.query.QueryCursor;
@@ -108,7 +107,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.LOCAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -199,13 +197,6 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
return true;
}
- /**
- * @return {@code True} if values should be stored off-heap.
- */
- protected CacheMemoryMode memoryMode() {
- return ONHEAP_TIERED;
- }
-
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index 315e228..489a77d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
@@ -37,7 +37,6 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.Ignition;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index bda0606..8606f7c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -164,7 +164,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr
* @throws Exception If failed.
*/
public void testPutAndRemove() throws Exception {
- putAndRemove(DUR, null, null, GridTestUtils.TestMemoryMode.HEAP);
+ putAndRemove(DUR, null, null);
}
/**
@@ -174,7 +174,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr
if (atomicityMode() != CacheAtomicityMode.TRANSACTIONAL)
return;
- putAndRemove(30_000, PESSIMISTIC, REPEATABLE_READ, GridTestUtils.TestMemoryMode.HEAP);
+ putAndRemove(30_000, PESSIMISTIC, REPEATABLE_READ);
}
/**
@@ -184,34 +184,18 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr
if (atomicityMode() != CacheAtomicityMode.TRANSACTIONAL)
return;
- putAndRemove(30_000, OPTIMISTIC, SERIALIZABLE, GridTestUtils.TestMemoryMode.HEAP);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testPutAndRemoveOffheapEvict() throws Exception {
- putAndRemove(30_000, null, null, GridTestUtils.TestMemoryMode.OFFHEAP_EVICT);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testPutAndRemoveOffheapEvictSwap() throws Exception {
- putAndRemove(30_000, null, null, GridTestUtils.TestMemoryMode.OFFHEAP_EVICT_SWAP);
+ putAndRemove(30_000, OPTIMISTIC, SERIALIZABLE);
}
/**
* @param duration Test duration.
* @param txConcurrency Transaction concurrency if test explicit transaction.
* @param txIsolation Transaction isolation if test explicit transaction.
- * @param memMode Memory mode.
* @throws Exception If failed.
*/
private void putAndRemove(long duration,
final TransactionConcurrency txConcurrency,
- final TransactionIsolation txIsolation,
- GridTestUtils.TestMemoryMode memMode) throws Exception {
+ final TransactionIsolation txIsolation) throws Exception {
assertEquals(testClientNode(), (boolean) grid(0).configuration().isClientMode());
grid(0).destroyCache(null);
@@ -229,8 +213,6 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr
ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode());
ccfg.setNearConfiguration(nearCache());
- GridTestUtils.setMemoryMode(null, ccfg, memMode, 100, 1024);
-
final IgniteCache<Integer, Integer> sndCache0 = grid(0).createCache(ccfg);
final AtomicBoolean stop = new AtomicBoolean();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
index a7751d4..707e275 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
@@ -23,7 +23,6 @@ import java.util.UUID;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -80,93 +79,92 @@ public class GridCacheClearSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testClearPartitioned() throws Exception {
- testClear(CacheMode.PARTITIONED, CacheMemoryMode.ONHEAP_TIERED, false, null);
+ testClear(CacheMode.PARTITIONED, false, null);
}
/**
* @throws Exception If failed.
*/
public void testClearPartitionedNear() throws Exception {
- testClear(CacheMode.PARTITIONED, CacheMemoryMode.ONHEAP_TIERED, true, null);
+ testClear(CacheMode.PARTITIONED, true, null);
}
/**
* @throws Exception If failed.
*/
public void testClearReplicated() throws Exception {
- testClear(CacheMode.REPLICATED, CacheMemoryMode.ONHEAP_TIERED, false, null);
+ testClear(CacheMode.REPLICATED, false, null);
}
/**
* @throws Exception If failed.
*/
public void testClearReplicatedNear() throws Exception {
- testClear(CacheMode.REPLICATED, CacheMemoryMode.ONHEAP_TIERED, true, null);
+ testClear(CacheMode.REPLICATED, true, null);
}
/**
* @throws Exception If failed.
*/
public void testClearKeyPartitioned() throws Exception {
- testClear(CacheMode.PARTITIONED, CacheMemoryMode.ONHEAP_TIERED, false, Collections.singleton(3));
+ testClear(CacheMode.PARTITIONED, false, Collections.singleton(3));
}
/**
* @throws Exception If failed.
*/
public void testClearKeyPartitionedNear() throws Exception {
- testClear(CacheMode.PARTITIONED, CacheMemoryMode.ONHEAP_TIERED, true, Collections.singleton(3));
+ testClear(CacheMode.PARTITIONED, true, Collections.singleton(3));
}
/**
* @throws Exception If failed.
*/
public void testClearKeyReplicated() throws Exception {
- testClear(CacheMode.REPLICATED, CacheMemoryMode.ONHEAP_TIERED, false, Collections.singleton(3));
+ testClear(CacheMode.REPLICATED, false, Collections.singleton(3));
}
/**
* @throws Exception If failed.
*/
public void testClearKeyReplicatedNear() throws Exception {
- testClear(CacheMode.REPLICATED, CacheMemoryMode.ONHEAP_TIERED, true, Collections.singleton(3));
+ testClear(CacheMode.REPLICATED, true, Collections.singleton(3));
}
/**
* @throws Exception If failed.
*/
public void testClearKeysPartitioned() throws Exception {
- testClear(CacheMode.PARTITIONED, CacheMemoryMode.ONHEAP_TIERED, false, F.asSet(2, 6, 9));
+ testClear(CacheMode.PARTITIONED, false, F.asSet(2, 6, 9));
}
/**
* @throws Exception If failed.
*/
public void testClearKeysPartitionedNear() throws Exception {
- testClear(CacheMode.PARTITIONED, CacheMemoryMode.ONHEAP_TIERED, true, F.asSet(2, 6, 9));
+ testClear(CacheMode.PARTITIONED, true, F.asSet(2, 6, 9));
}
/**
* @throws Exception If failed.
*/
public void testClearKeysReplicated() throws Exception {
- testClear(CacheMode.REPLICATED, CacheMemoryMode.ONHEAP_TIERED, false, F.asSet(2, 6, 9));
+ testClear(CacheMode.REPLICATED, false, F.asSet(2, 6, 9));
}
/**
* @throws Exception If failed.
*/
public void testClearKeysReplicatedNear() throws Exception {
- testClear(CacheMode.REPLICATED, CacheMemoryMode.ONHEAP_TIERED, true, F.asSet(2, 6, 9));
+ testClear(CacheMode.REPLICATED, true, F.asSet(2, 6, 9));
}
/**
* @param cacheMode Cache mode.
- * @param memMode Memory mode.
* @param near Near cache flag.
* @param keys Keys to clear.
*/
- private void testClear(CacheMode cacheMode, CacheMemoryMode memMode, boolean near, @Nullable Set<Integer> keys) {
+ private void testClear(CacheMode cacheMode, boolean near, @Nullable Set<Integer> keys) {
Ignite client1 = client1();
Ignite client2 = client2();
@@ -177,7 +175,6 @@ public class GridCacheClearSelfTest extends GridCommonAbstractTest {
CacheConfiguration<Integer, Integer> cfg = new CacheConfiguration<>(cacheName);
cfg.setCacheMode(cacheMode);
- cfg.setMemoryMode(memMode);
IgniteCache<Integer, Integer> cache1 = near ?
client1.createCache(cfg, new NearCacheConfiguration<Integer, Integer>()) :
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicRebalanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicRebalanceTest.java
index aaeda4b..909810f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAtomicRebalanceTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
/**
*
@@ -28,9 +27,4 @@ public class GridCacheInterceptorAtomicRebalanceTest extends GridAbstractCacheIn
@Override protected CacheAtomicityMode atomicityMode() {
return CacheAtomicityMode.ATOMIC;
}
-
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorTransactionalRebalanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorTransactionalRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorTransactionalRebalanceTest.java
index bace87c..87c3f32 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorTransactionalRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorTransactionalRebalanceTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
/**
*
@@ -28,9 +27,4 @@ public class GridCacheInterceptorTransactionalRebalanceTest extends GridAbstract
@Override protected CacheAtomicityMode atomicityMode() {
return CacheAtomicityMode.TRANSACTIONAL;
}
-
- /** {@inheritDoc} */
- @Override protected CacheMemoryMode memoryMode() {
- return CacheMemoryMode.ONHEAP_TIERED;
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
index 08173c2..3693b33 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
index 406194c..9bce997 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -102,9 +102,6 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
/** Backups count. */
private int backups;
- /** */
- private GridTestUtils.TestMemoryMode memMode = GridTestUtils.TestMemoryMode.HEAP;
-
/** Filter to include only worker nodes. */
private static final IgnitePredicate<ClusterNode> workerNodesFilter = new PN() {
@SuppressWarnings("unchecked")
@@ -206,60 +203,6 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
checkPutAllFailoverColocated(false, 5, 2);
}
- /**
- * @throws Exception If failed.
- */
- public void testPutAllFailoverColocatedNearEnabledTwoBackupsSwap() throws Exception {
- memMode = GridTestUtils.TestMemoryMode.SWAP;
-
- checkPutAllFailoverColocated(true, 5, 2);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testPutAllFailoverColocatedTwoBackupsSwap() throws Exception {
- memMode = GridTestUtils.TestMemoryMode.SWAP;
-
- checkPutAllFailoverColocated(false, 5, 2);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testPutAllFailoverColocatedNearEnabledTwoBackupsOffheapTiered() throws Exception {
- memMode = GridTestUtils.TestMemoryMode.OFFHEAP_TIERED;
-
- checkPutAllFailoverColocated(true, 5, 2);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testPutAllFailoverColocatedNearEnabledTwoBackupsOffheapTieredSwap() throws Exception {
- memMode = GridTestUtils.TestMemoryMode.OFFHEAP_TIERED_SWAP;
-
- checkPutAllFailoverColocated(true, 5, 2);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testPutAllFailoverColocatedNearEnabledTwoBackupsOffheapEvict() throws Exception {
- memMode = GridTestUtils.TestMemoryMode.OFFHEAP_EVICT;
-
- checkPutAllFailoverColocated(true, 5, 2);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testPutAllFailoverColocatedNearEnabledTwoBackupsOffheapEvictSwap() throws Exception {
- memMode = GridTestUtils.TestMemoryMode.OFFHEAP_EVICT_SWAP;
-
- checkPutAllFailoverColocated(true, 5, 2);
- }
-
/** {@inheritDoc} */
@Override protected long getTestTimeout() {
return super.getTestTimeout() * 5;
@@ -754,7 +697,6 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- GridTestUtils.setMemoryMode(cfg, cacheCfg, memMode, 1000, 10 * 1024);
cfg.setCacheConfiguration(cacheCfg);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
index e55853c..57d5007 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
@@ -21,9 +21,7 @@ import java.util.concurrent.TimeUnit;
import javax.cache.expiry.CreatedExpiryPolicy;
import javax.cache.expiry.Duration;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteException;
import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -50,9 +48,6 @@ public class GridCacheTtlManagerEvictionSelfTest extends GridCommonAbstractTest
/** Cache mode. */
private volatile CacheMode cacheMode;
- /** Cache memory mode. */
- private volatile CacheMemoryMode cacheMemoryMode;
-
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
@@ -66,7 +61,6 @@ public class GridCacheTtlManagerEvictionSelfTest extends GridCommonAbstractTest
CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setCacheMode(cacheMode);
- ccfg.setMemoryMode(cacheMemoryMode);
ccfg.setEagerTtl(true);
ccfg.setEvictionPolicy(new FifoEvictionPolicy(ENTRIES_LIMIT, 100));
ccfg.setExpiryPolicyFactory(CreatedExpiryPolicy.factoryOf(new Duration(TimeUnit.HOURS, 12)));
@@ -80,21 +74,21 @@ public class GridCacheTtlManagerEvictionSelfTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
public void testLocalEviction() throws Exception {
- checkEviction(CacheMode.LOCAL, CacheMemoryMode.ONHEAP_TIERED);
+ checkEviction(CacheMode.LOCAL);
}
/**
* @throws Exception If failed.
*/
public void testPartitionedEviction() throws Exception {
- checkEviction(CacheMode.PARTITIONED, CacheMemoryMode.ONHEAP_TIERED);
+ checkEviction(CacheMode.PARTITIONED);
}
/**
* @throws Exception If failed.
*/
public void testReplicatedEviction() throws Exception {
- checkEviction(CacheMode.REPLICATED, CacheMemoryMode.ONHEAP_TIERED);
+ checkEviction(CacheMode.REPLICATED);
}
/**
@@ -102,9 +96,8 @@ public class GridCacheTtlManagerEvictionSelfTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
@SuppressWarnings("ConstantConditions")
- private void checkEviction(CacheMode mode, CacheMemoryMode memoryMode) throws Exception {
+ private void checkEviction(CacheMode mode) throws Exception {
cacheMode = mode;
- cacheMemoryMode = memoryMode;
final IgniteKernal g = (IgniteKernal)startGrid(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
index e51c5ef..9d03e83 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
@@ -18,14 +18,12 @@
package org.apache.ignite.internal.processors.cache;
import java.util.Arrays;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -33,9 +31,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
*
*/
public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTest {
- /** Memory mode. */
- private CacheMemoryMode memMode;
-
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
@@ -58,7 +53,6 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes
ccfg.setAtomicityMode(ATOMIC);
ccfg.setNearConfiguration(null);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setMemoryMode(memMode);
ccfg.setOffHeapMaxMemory(1024 * 1024 * 1024);
ccfg.setRebalanceMode(CacheRebalanceMode.SYNC);
@@ -69,8 +63,6 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes
* @throws Exception If failed.
*/
public void testOnHeapTiered() throws Exception {
- memMode = ONHEAP_TIERED;
-
startGrids(1);
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
index 3f9fc5c..1feafe4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
@@ -29,9 +29,4 @@ public class IgniteCacheAtomicPutAllFailoverSelfTest extends GridCachePutAllFail
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
-
- /** {@inheritDoc} */
- @Override public void testPutAllFailoverColocatedNearEnabledTwoBackupsOffheapTieredSwap(){
- fail("https://issues.apache.org/jira/browse/IGNITE-1584");
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
index c8904db..083cdf3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
@@ -3757,15 +3757,8 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
* @param k Key.
*/
private void checkKeyAfterLocalEvict(IgniteCache<String, Integer> cache, String k) {
- switch (memoryMode()) {
- case ONHEAP_TIERED:
- assertNull(cache.localPeek(k, ONHEAP));
- assertEquals(offheapEnabled(), cache.localPeek(k, OFFHEAP) != null);
-
- break;
- default:
- fail("Unexpected memory mode: " + memoryMode());
- }
+ assertNull(cache.localPeek(k, ONHEAP));
+ assertEquals(offheapEnabled(), cache.localPeek(k, OFFHEAP) != null);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
index dd27d72..e0e2771 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
@@ -58,7 +58,6 @@ import javax.cache.processor.MutableEntry;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteInternalFuture;
@@ -76,7 +75,6 @@ import static javax.cache.event.EventType.CREATED;
import static javax.cache.event.EventType.EXPIRED;
import static javax.cache.event.EventType.REMOVED;
import static javax.cache.event.EventType.UPDATED;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.LOCAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -116,8 +114,6 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb
cfg.setEagerTtl(eagerTtl());
- cfg.setMemoryMode(memoryMode());
-
return cfg;
}
@@ -133,13 +129,6 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb
return cfg;
}
- /**
- * @return Cache memory mode.
- */
- protected CacheMemoryMode memoryMode() {
- return ONHEAP_TIERED;
- }
-
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
index 60176d9..b0be14e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
@@ -28,7 +28,6 @@ import javax.cache.expiry.Duration;
import javax.cache.expiry.ModifiedExpiryPolicy;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -44,7 +43,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -85,14 +83,14 @@ public class IgniteCacheEntryListenerExpiredEventsTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testExpiredEventAtomic() throws Exception {
- checkExpiredEvents(cacheConfiguration(PARTITIONED, ATOMIC, ONHEAP_TIERED));
+ checkExpiredEvents(cacheConfiguration(PARTITIONED, ATOMIC));
}
/**
* @throws Exception If failed.
*/
public void testExpiredEventTx() throws Exception {
- checkExpiredEvents(cacheConfiguration(PARTITIONED, TRANSACTIONAL, ONHEAP_TIERED));
+ checkExpiredEvents(cacheConfiguration(PARTITIONED, TRANSACTIONAL));
}
/**
@@ -143,18 +141,15 @@ public class IgniteCacheEntryListenerExpiredEventsTest extends GridCommonAbstrac
*
* @param cacheMode Cache mode.
* @param atomicityMode Cache atomicity mode.
- * @param memoryMode Cache memory mode.
* @return Cache configuration.
*/
private CacheConfiguration<Object, Object> cacheConfiguration(
CacheMode cacheMode,
- CacheAtomicityMode atomicityMode,
- CacheMemoryMode memoryMode) {
+ CacheAtomicityMode atomicityMode) {
CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>();
ccfg.setAtomicityMode(atomicityMode);
ccfg.setCacheMode(cacheMode);
- ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setAtomicWriteOrderMode(PRIMARY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java
index 87d8a06..18570a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java
@@ -33,7 +33,6 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.query.ContinuousQuery;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -53,7 +52,6 @@ import org.apache.ignite.transactions.Transaction;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
@@ -107,42 +105,42 @@ public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testAtomic1() throws Exception {
- updateAndEventConsistencyTest(cacheConfiguration(ATOMIC, ONHEAP_TIERED, 0));
+ updateAndEventConsistencyTest(cacheConfiguration(ATOMIC, 0));
}
/**
* @throws Exception If failed.
*/
public void testAtomic2() throws Exception {
- updateAndEventConsistencyTest(cacheConfiguration(ATOMIC, ONHEAP_TIERED, 1));
+ updateAndEventConsistencyTest(cacheConfiguration(ATOMIC, 1));
}
/**
* @throws Exception If failed.
*/
public void testAtomic3() throws Exception {
- updateAndEventConsistencyTest(cacheConfiguration(ATOMIC, ONHEAP_TIERED, 2));
+ updateAndEventConsistencyTest(cacheConfiguration(ATOMIC, 2));
}
/**
* @throws Exception If failed.
*/
public void testTx1() throws Exception {
- updateAndEventConsistencyTest(cacheConfiguration(TRANSACTIONAL, ONHEAP_TIERED, 0));
+ updateAndEventConsistencyTest(cacheConfiguration(TRANSACTIONAL, 0));
}
/**
* @throws Exception If failed.
*/
public void testTx2() throws Exception {
- updateAndEventConsistencyTest(cacheConfiguration(TRANSACTIONAL, ONHEAP_TIERED, 1));
+ updateAndEventConsistencyTest(cacheConfiguration(TRANSACTIONAL, 1));
}
/**
* @throws Exception If failed.
*/
public void testTx3() throws Exception {
- updateAndEventConsistencyTest(cacheConfiguration(TRANSACTIONAL, ONHEAP_TIERED, 2));
+ updateAndEventConsistencyTest(cacheConfiguration(TRANSACTIONAL, 2));
}
/**
@@ -332,18 +330,14 @@ public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstrac
/**
* @param atomicityMode Cache atomicity mode.
- * @param memoryMode Cache memory mode.
* @param backups Number of backups.
* @return Cache configuration.
*/
- private CacheConfiguration<TestKey, TestValue> cacheConfiguration(CacheAtomicityMode atomicityMode,
- CacheMemoryMode memoryMode,
- int backups) {
+ private CacheConfiguration<TestKey, TestValue> cacheConfiguration(CacheAtomicityMode atomicityMode, int backups) {
CacheConfiguration<TestKey, TestValue> ccfg = new CacheConfiguration<>();
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(atomicityMode);
- ccfg.setMemoryMode(memoryMode);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
index f37fb54..8d2db44 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
@@ -28,7 +28,6 @@ import javax.cache.processor.MutableEntry;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.store.CacheStore;
@@ -322,7 +321,6 @@ public abstract class IgniteCacheInvokeReadThroughAbstractTest extends GridCommo
/**
* @param cacheMode Cache mode.
* @param atomicityMode Atomicity mode.
- * @param memoryMode Memory mode.
* @param backups Number of backups.
* @param nearCache Near cache flag.
* @return Cache configuration.
@@ -330,7 +328,6 @@ public abstract class IgniteCacheInvokeReadThroughAbstractTest extends GridCommo
@SuppressWarnings("unchecked")
protected CacheConfiguration cacheConfiguration(CacheMode cacheMode,
CacheAtomicityMode atomicityMode,
- CacheMemoryMode memoryMode,
int backups,
boolean nearCache) {
CacheConfiguration ccfg = new CacheConfiguration();
@@ -343,7 +340,6 @@ public abstract class IgniteCacheInvokeReadThroughAbstractTest extends GridCommo
ccfg.setCacheMode(cacheMode);
ccfg.setAffinity(new RendezvousAffinityFunction(false, 32));
ccfg.setAtomicWriteOrderMode(PRIMARY);
- ccfg.setMemoryMode(memoryMode);
if (nearCache)
ccfg.setNearConfiguration(new NearCacheConfiguration());
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ec807a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughSingleNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughSingleNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughSingleNodeTest.java
index 89efc92..406e5af 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughSingleNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughSingleNodeTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.LOCAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -37,55 +36,55 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok
* @throws Exception If failed.
*/
public void testInvokeReadThroughAtomic() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, ONHEAP_TIERED, 1, false));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 1, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughAtomicNearCache() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, ONHEAP_TIERED, 1, true));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 1, true));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughAtomicReplicated() throws Exception {
- invokeReadThrough(cacheConfiguration(REPLICATED, ATOMIC, ONHEAP_TIERED, 0, false));
+ invokeReadThrough(cacheConfiguration(REPLICATED, ATOMIC, 0, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughAtomicLocal() throws Exception {
- invokeReadThrough(cacheConfiguration(LOCAL, ATOMIC, ONHEAP_TIERED, 0, false));
+ invokeReadThrough(cacheConfiguration(LOCAL, ATOMIC, 0, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughTx() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, ONHEAP_TIERED, 1, false));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 1, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughTxNearCache() throws Exception {
- invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, ONHEAP_TIERED, 1, true));
+ invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 1, true));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughTxReplicated() throws Exception {
- invokeReadThrough(cacheConfiguration(REPLICATED, TRANSACTIONAL, ONHEAP_TIERED, 0, false));
+ invokeReadThrough(cacheConfiguration(REPLICATED, TRANSACTIONAL, 0, false));
}
/**
* @throws Exception If failed.
*/
public void testInvokeReadThroughTxLocal() throws Exception {
- invokeReadThrough(cacheConfiguration(LOCAL, TRANSACTIONAL, ONHEAP_TIERED, 0, false));
+ invokeReadThrough(cacheConfiguration(LOCAL, TRANSACTIONAL, 0, false));
}
}
[11/53] [abbrv] ignite git commit: ignite-4535 : Fixed test.
Posted by ag...@apache.org.
ignite-4535 : Fixed test.
(cherry picked from commit 1475ee3)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0756bb89
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0756bb89
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0756bb89
Branch: refs/heads/ignite-3477-master
Commit: 0756bb890c26d74a51e72268811048c485502aee
Parents: b5ccfe3
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Wed Mar 22 15:15:02 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Mar 30 16:20:45 2017 +0300
----------------------------------------------------------------------
.../testframework/test/ConfigVariationsTestSuiteBuilderTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0756bb89/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
index d237345..6ef9eb8 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/test/ConfigVariationsTestSuiteBuilderTest.java
@@ -41,7 +41,7 @@ public class ConfigVariationsTestSuiteBuilderTest extends TestCase {
TestSuite dfltCacheSuite = new ConfigVariationsTestSuiteBuilder("testSuite", NoopTest.class)
.withBasicCacheParams().build();
- assertEquals(4 * 12, dfltCacheSuite.countTestCases());
+ assertEquals(4 * 4, dfltCacheSuite.countTestCases());
// With clients.
dfltSuite = new ConfigVariationsTestSuiteBuilder("testSuite", NoopTest.class)
@@ -52,7 +52,7 @@ public class ConfigVariationsTestSuiteBuilderTest extends TestCase {
dfltCacheSuite = new ConfigVariationsTestSuiteBuilder("testSuite", NoopTest.class)
.withBasicCacheParams().testedNodesCount(3).withClients().build();
- assertEquals(4 * 12 * 3, dfltCacheSuite.countTestCases());
+ assertEquals(4 * 4 * 3, dfltCacheSuite.countTestCases());
}
/**
[51/53] [abbrv] ignite git commit: Merge branches
'ignite-3477-master' and 'ignite-4851' of
https://github.com/gridgain/apache-ignite into ignite-4851
Posted by ag...@apache.org.
Merge branches 'ignite-3477-master' and 'ignite-4851' of https://github.com/gridgain/apache-ignite into ignite-4851
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e678668
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e678668
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e678668
Branch: refs/heads/ignite-3477-master
Commit: 6e67866866ec834c62d98f62722cfdff6501e9e3
Parents: b4e6e4a f59a7f6
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 10 17:56:26 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 10 17:56:26 2017 +0300
----------------------------------------------------------------------
assembly/dependencies-fabric.xml | 1 +
assembly/libs/README.txt | 1 +
.../cache/IgniteCacheOffheapManagerImpl.java | 45 +-
.../MarshallerContextLockingSelfTest.java | 33 +-
.../near/GridCacheNearReadersSelfTest.java | 6 +-
.../hibernate/HibernateKeyTransformer.java | 2 +-
.../cache/hibernate/HibernateKeyWrapper.java | 36 +-
.../cache/hibernate/HibernateRegionFactory.java | 3 +-
.../hibernate/HibernateL2CacheSelfTest.java | 2 +-
modules/hibernate5/README.txt | 48 +
modules/hibernate5/licenses/apache-2.0.txt | 202 ++
modules/hibernate5/pom.xml | 146 ++
.../HibernateAbstractRegionAccessStrategy.java | 99 +
.../HibernateAccessStrategyAdapter.java | 379 ++++
.../cache/hibernate/HibernateCacheProxy.java | 811 ++++++++
.../hibernate/HibernateCollectionRegion.java | 114 +
.../cache/hibernate/HibernateEntityRegion.java | 129 ++
.../hibernate/HibernateGeneralDataRegion.java | 72 +
.../hibernate/HibernateKeyTransformer.java | 28 +
.../cache/hibernate/HibernateKeyWrapper.java | 108 +
.../hibernate/HibernateNaturalIdRegion.java | 113 +
.../HibernateNonStrictAccessStrategy.java | 222 ++
.../hibernate/HibernateQueryResultsRegion.java | 70 +
.../HibernateReadOnlyAccessStrategy.java | 107 +
.../HibernateReadWriteAccessStrategy.java | 328 +++
.../ignite/cache/hibernate/HibernateRegion.java | 99 +
.../cache/hibernate/HibernateRegionFactory.java | 255 +++
.../hibernate/HibernateTimestampsRegion.java | 39 +
.../HibernateTransactionalAccessStrategy.java | 141 ++
.../HibernateTransactionalDataRegion.java | 107 +
.../ignite/cache/hibernate/package-info.java | 24 +
.../hibernate/CacheHibernateBlobStore.java | 542 +++++
.../CacheHibernateBlobStoreEntry.hbm.xml | 31 +
.../hibernate/CacheHibernateBlobStoreEntry.java | 89 +
.../CacheHibernateBlobStoreFactory.java | 235 +++
.../CacheHibernateStoreSessionListener.java | 223 ++
.../cache/store/hibernate/package-info.java | 22 +
.../src/test/config/factory-cache.xml | 59 +
.../src/test/config/factory-cache1.xml | 61 +
.../config/factory-incorrect-store-cache.xml | 56 +
.../HibernateL2CacheConfigurationSelfTest.java | 409 ++++
.../hibernate/HibernateL2CacheSelfTest.java | 1948 ++++++++++++++++++
.../HibernateL2CacheTransactionalSelfTest.java | 154 ++
...nateL2CacheTransactionalUseSyncSelfTest.java | 31 +
.../CacheHibernateBlobStoreNodeRestartTest.java | 54 +
.../CacheHibernateBlobStoreSelfTest.java | 113 +
.../CacheHibernateStoreFactorySelfTest.java | 326 +++
...heHibernateStoreSessionListenerSelfTest.java | 241 +++
.../cache/store/hibernate/hibernate.cfg.xml | 42 +
.../cache/store/hibernate/package-info.java | 22 +
.../IgniteBinaryHibernate5TestSuite.java | 37 +
.../testsuites/IgniteHibernate5TestSuite.java | 57 +
.../query/h2/opt/GridH2TableSelfTest.java | 2 +
.../query/h2/sql/GridQueryParsingTest.java | 6 +-
pom.xml | 1 +
55 files changed, 8490 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6e678668/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6e678668/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
[22/53] [abbrv] ignite git commit: Merge branches
'ignite-3477-master' and 'ignite-4535-master' of
https://github.com/gridgain/apache-ignite into ignite-4535-master
Posted by ag...@apache.org.
Merge branches 'ignite-3477-master' and 'ignite-4535-master' of https://github.com/gridgain/apache-ignite into ignite-4535-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/55b13c6b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/55b13c6b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/55b13c6b
Branch: refs/heads/ignite-3477-master
Commit: 55b13c6be2c8d31c1800931417e900dd4079f9a4
Parents: be28dbf 481f021
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Apr 3 15:09:06 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Apr 3 15:09:06 2017 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheOffheapManagerImpl.java | 20 +++++---------------
.../cache/query/IndexingSpiQuerySelfTest.java | 3 ---
2 files changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/55b13c6b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
[12/53] [abbrv] ignite git commit: ignite-4535 : Fixed DHT cache size
calculation.
Posted by ag...@apache.org.
ignite-4535 : Fixed DHT cache size calculation.
(cherry picked from commit 06c845c)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/952c0efd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/952c0efd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/952c0efd
Branch: refs/heads/ignite-3477-master
Commit: 952c0efd12d2b90b3b519a999ae0fd6935b84274
Parents: 0756bb8
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Mar 24 14:30:00 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Mar 30 16:20:52 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtCacheAdapter.java | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/952c0efd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index e85dcf7..7e6ae81 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -569,6 +569,21 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
}
/** {@inheritDoc} */
+ @Override public int size() {
+ return (int)sizeLong();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long sizeLong() {
+ long sum = 0;
+
+ for (GridDhtLocalPartition p : topology().currentLocalPartitions())
+ sum += p.dataStore().size();
+
+ return sum;
+ }
+
+ /** {@inheritDoc} */
@Override public int primarySize() {
return (int)primarySizeLong();
}
@@ -581,7 +596,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
for (GridDhtLocalPartition p : topology().currentLocalPartitions()) {
if (p.primary(topVer))
- sum += p.publicSize();
+ sum += p.dataStore().size();
}
return sum;