http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableObjectsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableObjectsAbstractSelfTest.java deleted file mode 100644 index 7ac8712..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableObjectsAbstractSelfTest.java +++ /dev/null @@ -1,978 +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.portable; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import javax.cache.Cache; -import javax.cache.processor.EntryProcessor; -import javax.cache.processor.MutableEntry; -import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteCache; -import org.apache.ignite.IgnitePortables; -import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.cache.CachePeekMode; -import org.apache.ignite.cache.store.CacheStoreAdapter; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.NearCacheConfiguration; -import org.apache.ignite.internal.IgniteKernal; -import org.apache.ignite.internal.portable.PortableObjectImpl; -import org.apache.ignite.internal.processors.cache.GridCacheAdapter; -import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; -import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; -import org.apache.ignite.internal.util.typedef.P2; -import org.apache.ignite.internal.util.typedef.internal.CU; -import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.lang.IgniteBiInClosure; -import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableBuilder; -import org.apache.ignite.portable.PortableException; -import org.apache.ignite.portable.PortableMarshalAware; -import org.apache.ignite.portable.PortableObject; -import org.apache.ignite.portable.PortableReader; -import org.apache.ignite.portable.PortableWriter; -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 org.apache.ignite.transactions.Transaction; -import org.jetbrains.annotations.Nullable; - -import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED; -import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; -import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; -import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED; -import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; - -/** - * Test for portable objects stored in cache. - */ -public abstract class GridCachePortableObjectsAbstractSelfTest extends GridCommonAbstractTest { - /** */ - public static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - - /** */ - private static final int ENTRY_CNT = 100; - - /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - - CacheConfiguration cacheCfg = new CacheConfiguration(); - - cacheCfg.setCacheMode(cacheMode()); - cacheCfg.setAtomicityMode(atomicityMode()); - cacheCfg.setNearConfiguration(nearConfiguration()); - cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - cacheCfg.setCacheStoreFactory(singletonFactory(new TestStore())); - cacheCfg.setReadThrough(true); - cacheCfg.setWriteThrough(true); - cacheCfg.setLoadPreviousValue(true); - cacheCfg.setBackups(1); - - if (offheapTiered()) { - cacheCfg.setMemoryMode(OFFHEAP_TIERED); - cacheCfg.setOffHeapMaxMemory(0); - } - - cfg.setCacheConfiguration(cacheCfg); - - cfg.setMarshaller(new PortableMarshaller()); - - return cfg; - } - - /** - * @return {@code True} if should use OFFHEAP_TIERED mode. - */ - protected boolean offheapTiered() { - return false; - } - - /** {@inheritDoc} */ - @Override protected void beforeTestsStarted() throws Exception { - startGridsMultiThreaded(gridCount()); - } - - /** {@inheritDoc} */ - @Override protected void afterTestsStopped() throws Exception { - stopAllGrids(); - } - - /** {@inheritDoc} */ - @Override protected void afterTest() throws Exception { - for (int i = 0; i < gridCount(); i++) { - GridCacheAdapter<Object, Object> c = ((IgniteKernal)grid(i)).internalCache(); - - for (GridCacheEntryEx e : c.map().entries0()) { - Object key = e.key().value(c.context().cacheObjectContext(), false); - Object val = CU.value(e.rawGet(), c.context(), false); - - if (key instanceof PortableObject) - assert ((PortableObjectImpl)key).detached() : val; - - if (val instanceof PortableObject) - assert ((PortableObjectImpl)val).detached() : val; - } - } - - IgniteCache<Object, Object> c = jcache(0); - - for (int i = 0; i < ENTRY_CNT; i++) - c.remove(i); - - if (offheapTiered()) { - for (int k = 0; k < 100; k++) - c.remove(k); - } - - assertEquals(0, c.size()); - } - - /** - * @return Cache mode. - */ - protected abstract CacheMode cacheMode(); - - /** - * @return Atomicity mode. - */ - protected abstract CacheAtomicityMode atomicityMode(); - - /** - * @return Distribution mode. - */ - protected abstract NearCacheConfiguration nearConfiguration(); - - /** - * @return Grid count. - */ - protected abstract int gridCount(); - - /** - * @throws Exception If failed. - */ - @SuppressWarnings("unchecked") - public void testCircularReference() throws Exception { - IgniteCache c = keepPortableCache(); - - TestReferenceObject obj1 = new TestReferenceObject(); - - obj1.obj = new TestReferenceObject(obj1); - - c.put(1, obj1); - - PortableObject po = (PortableObject)c.get(1); - - String str = po.toString(); - - log.info("toString: " + str); - - assertNotNull(str); - - assertTrue("Unexpected toString: " + str, - str.startsWith("TestReferenceObject") && str.contains("obj=TestReferenceObject [")); - - TestReferenceObject obj1_r = po.deserialize(); - - assertNotNull(obj1_r); - - TestReferenceObject obj2_r = obj1_r.obj; - - assertNotNull(obj2_r); - - assertSame(obj1_r, obj2_r.obj); - } - - /** - * @throws Exception If failed. - */ - public void testGet() throws Exception { - IgniteCache<Integer, TestObject> c = jcache(0); - - for (int i = 0; i < ENTRY_CNT; i++) - c.put(i, new TestObject(i)); - - for (int i = 0; i < ENTRY_CNT; i++) { - TestObject obj = c.get(i); - - assertEquals(i, obj.val); - } - - IgniteCache<Integer, PortableObject> kpc = keepPortableCache(); - - for (int i = 0; i < ENTRY_CNT; i++) { - PortableObject po = kpc.get(i); - - assertEquals(i, (int)po.field("val")); - } - } - - /** - * @throws Exception If failed. - */ - public void testIterator() throws Exception { - IgniteCache<Integer, TestObject> c = jcache(0); - - Map<Integer, TestObject> entries = new HashMap<>(); - - for (int i = 0; i < ENTRY_CNT; i++) { - TestObject val = new TestObject(i); - - c.put(i, val); - - entries.put(i, val); - } - - IgniteCache<Integer, PortableObject> prj = ((IgniteCacheProxy)c).keepPortable(); - - Iterator<Cache.Entry<Integer, PortableObject>> it = prj.iterator(); - - assertTrue(it.hasNext()); - - while (it.hasNext()) { - Cache.Entry<Integer, PortableObject> entry = it.next(); - - assertTrue(entries.containsKey(entry.getKey())); - - TestObject o = entries.get(entry.getKey()); - - PortableObject po = entry.getValue(); - - assertEquals(o.val, (int)po.field("val")); - - entries.remove(entry.getKey()); - } - - assertEquals(0, entries.size()); - } - - /** - * @throws Exception If failed. - */ - public void testCollection() throws Exception { - IgniteCache<Integer, Collection<TestObject>> c = jcache(0); - - for (int i = 0; i < ENTRY_CNT; i++) { - Collection<TestObject> col = new ArrayList<>(3); - - for (int j = 0; j < 3; j++) - col.add(new TestObject(i * 10 + j)); - - c.put(i, col); - } - - for (int i = 0; i < ENTRY_CNT; i++) { - Collection<TestObject> col = c.get(i); - - assertEquals(3, col.size()); - - Iterator<TestObject> it = col.iterator(); - - for (int j = 0; j < 3; j++) { - assertTrue(it.hasNext()); - - assertEquals(i * 10 + j, it.next().val); - } - } - - IgniteCache<Integer, Collection<PortableObject>> kpc = keepPortableCache(); - - for (int i = 0; i < ENTRY_CNT; i++) { - Collection<PortableObject> col = kpc.get(i); - - assertEquals(3, col.size()); - - Iterator<PortableObject> it = col.iterator(); - - for (int j = 0; j < 3; j++) { - assertTrue(it.hasNext()); - - assertEquals(i * 10 + j, (int)it.next().field("val")); - } - } - } - - /** - * @throws Exception If failed. - */ - public void testMap() throws Exception { - IgniteCache<Integer, Map<Integer, TestObject>> c = jcache(0); - - for (int i = 0; i < ENTRY_CNT; i++) { - Map<Integer, TestObject> map = U.newHashMap(3); - - for (int j = 0; j < 3; j++) { - int idx = i * 10 + j; - - map.put(idx, new TestObject(idx)); - } - - c.put(i, map); - } - - for (int i = 0; i < ENTRY_CNT; i++) { - Map<Integer, TestObject> map = c.get(i); - - assertEquals(3, map.size()); - - for (int j = 0; j < 3; j++) { - int idx = i * 10 + j; - - assertEquals(idx, map.get(idx).val); - } - } - - IgniteCache<Integer, Map<Integer, PortableObject>> kpc = keepPortableCache(); - - for (int i = 0; i < ENTRY_CNT; i++) { - Map<Integer, PortableObject> map = kpc.get(i); - - assertEquals(3, map.size()); - - for (int j = 0; j < 3; j++) { - int idx = i * 10 + j; - - assertEquals(idx, (int)map.get(idx).field("val")); - } - } - } - - /** - * @throws Exception If failed. - */ - public void testGetAsync() throws Exception { - IgniteCache<Integer, TestObject> c = jcache(0); - - IgniteCache<Integer, TestObject> cacheAsync = c.withAsync(); - - for (int i = 0; i < ENTRY_CNT; i++) - c.put(i, new TestObject(i)); - - for (int i = 0; i < ENTRY_CNT; i++) { - cacheAsync.get(i); - TestObject obj = cacheAsync.<TestObject>future().get(); - - assertEquals(i, obj.val); - } - - IgniteCache<Integer, PortableObject> kpc = keepPortableCache(); - - IgniteCache<Integer, PortableObject> cachePortableAsync = kpc.withAsync(); - - for (int i = 0; i < ENTRY_CNT; i++) { - cachePortableAsync.get(i); - - PortableObject po = cachePortableAsync.<PortableObject>future().get(); - - assertEquals(i, (int)po.field("val")); - } - } - - /** - * @throws Exception If failed. - */ - public void testGetTx() throws Exception { - if (atomicityMode() != TRANSACTIONAL) - return; - - IgniteCache<Integer, TestObject> c = jcache(0); - - for (int i = 0; i < ENTRY_CNT; i++) - c.put(i, new TestObject(i)); - - for (int i = 0; i < ENTRY_CNT; i++) { - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - TestObject obj = c.get(i); - - assertEquals(i, obj.val); - - tx.commit(); - } - } - - for (int i = 0; i < ENTRY_CNT; i++) { - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, READ_COMMITTED)) { - TestObject obj = c.get(i); - - assertEquals(i, obj.val); - - tx.commit(); - } - } - - IgniteCache<Integer, PortableObject> kpc = keepPortableCache(); - - for (int i = 0; i < ENTRY_CNT; i++) { - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - PortableObject po = kpc.get(i); - - assertEquals(i, (int)po.field("val")); - - tx.commit(); - } - } - - for (int i = 0; i < ENTRY_CNT; i++) { - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, READ_COMMITTED)) { - PortableObject po = kpc.get(i); - - assertEquals(i, (int)po.field("val")); - - tx.commit(); - } - } - } - - /** - * @throws Exception If failed. - */ - public void testGetAsyncTx() throws Exception { - if (atomicityMode() != TRANSACTIONAL) - return; - - IgniteCache<Integer, TestObject> c = jcache(0); - - IgniteCache<Integer, TestObject> cacheAsync = c.withAsync(); - - for (int i = 0; i < ENTRY_CNT; i++) - c.put(i, new TestObject(i)); - - for (int i = 0; i < ENTRY_CNT; i++) { - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - cacheAsync.get(i); - - TestObject obj = cacheAsync.<TestObject>future().get(); - - assertEquals(i, obj.val); - - tx.commit(); - } - } - - IgniteCache<Integer, PortableObject> kpc = keepPortableCache(); - IgniteCache<Integer, PortableObject> cachePortableAsync = kpc.withAsync(); - - for (int i = 0; i < ENTRY_CNT; i++) { - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - cachePortableAsync.get(i); - - PortableObject po = cachePortableAsync.<PortableObject>future().get(); - - assertEquals(i, (int)po.field("val")); - - tx.commit(); - } - } - } - - /** - * @throws Exception If failed. - */ - public void testGetAll() throws Exception { - IgniteCache<Integer, TestObject> c = jcache(0); - - for (int i = 0; i < ENTRY_CNT; i++) - c.put(i, new TestObject(i)); - - for (int i = 0; i < ENTRY_CNT; ) { - Set<Integer> keys = new HashSet<>(); - - for (int j = 0; j < 10; j++) - keys.add(i++); - - Map<Integer, TestObject> objs = c.getAll(keys); - - assertEquals(10, objs.size()); - - for (Map.Entry<Integer, TestObject> e : objs.entrySet()) - assertEquals(e.getKey().intValue(), e.getValue().val); - } - - IgniteCache<Integer, PortableObject> kpc = keepPortableCache(); - - for (int i = 0; i < ENTRY_CNT; ) { - Set<Integer> keys = new HashSet<>(); - - for (int j = 0; j < 10; j++) - keys.add(i++); - - Map<Integer, PortableObject> objs = kpc.getAll(keys); - - assertEquals(10, objs.size()); - - for (Map.Entry<Integer, PortableObject> e : objs.entrySet()) - assertEquals(new Integer(e.getKey().intValue()), e.getValue().field("val")); - } - } - - /** - * @throws Exception If failed. - */ - public void testGetAllAsync() throws Exception { - IgniteCache<Integer, TestObject> c = jcache(0); - - IgniteCache<Integer, TestObject> cacheAsync = c.withAsync(); - - for (int i = 0; i < ENTRY_CNT; i++) - c.put(i, new TestObject(i)); - - for (int i = 0; i < ENTRY_CNT; ) { - Set<Integer> keys = new HashSet<>(); - - for (int j = 0; j < 10; j++) - keys.add(i++); - - cacheAsync.getAll(keys); - - Map<Integer, TestObject> objs = cacheAsync.<Map<Integer, TestObject>>future().get(); - - assertEquals(10, objs.size()); - - for (Map.Entry<Integer, TestObject> e : objs.entrySet()) - assertEquals(e.getKey().intValue(), e.getValue().val); - } - - IgniteCache<Integer, PortableObject> kpc = keepPortableCache(); - IgniteCache<Integer, PortableObject> cachePortableAsync = kpc.withAsync(); - - for (int i = 0; i < ENTRY_CNT; ) { - Set<Integer> keys = new HashSet<>(); - - for (int j = 0; j < 10; j++) - keys.add(i++); - - - cachePortableAsync.getAll(keys); - - Map<Integer, PortableObject> objs = cachePortableAsync.<Map<Integer, PortableObject>>future().get(); - - assertEquals(10, objs.size()); - - for (Map.Entry<Integer, PortableObject> e : objs.entrySet()) - assertEquals(new Integer(e.getKey().intValue()), e.getValue().field("val")); - } - } - - /** - * @throws Exception If failed. - */ - public void testGetAllTx() throws Exception { - if (atomicityMode() != TRANSACTIONAL) - return; - - IgniteCache<Integer, TestObject> c = jcache(0); - - for (int i = 0; i < ENTRY_CNT; i++) - c.put(i, new TestObject(i)); - - for (int i = 0; i < ENTRY_CNT; ) { - Set<Integer> keys = new HashSet<>(); - - for (int j = 0; j < 10; j++) - keys.add(i++); - - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - Map<Integer, TestObject> objs = c.getAll(keys); - - assertEquals(10, objs.size()); - - for (Map.Entry<Integer, TestObject> e : objs.entrySet()) - assertEquals(e.getKey().intValue(), e.getValue().val); - - tx.commit(); - } - - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, READ_COMMITTED)) { - Map<Integer, TestObject> objs = c.getAll(keys); - - assertEquals(10, objs.size()); - - for (Map.Entry<Integer, TestObject> e : objs.entrySet()) - assertEquals(e.getKey().intValue(), e.getValue().val); - - tx.commit(); - } - } - - IgniteCache<Integer, PortableObject> kpc = keepPortableCache(); - - for (int i = 0; i < ENTRY_CNT; ) { - Set<Integer> keys = new HashSet<>(); - - for (int j = 0; j < 10; j++) - keys.add(i++); - - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - Map<Integer, PortableObject> objs = kpc.getAll(keys); - - assertEquals(10, objs.size()); - - for (Map.Entry<Integer, PortableObject> e : objs.entrySet()) - assertEquals(new Integer(e.getKey().intValue()), e.getValue().field("val")); - - tx.commit(); - } - - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, READ_COMMITTED)) { - Map<Integer, PortableObject> objs = kpc.getAll(keys); - - assertEquals(10, objs.size()); - - for (Map.Entry<Integer, PortableObject> e : objs.entrySet()) - assertEquals(new Integer(e.getKey().intValue()), e.getValue().field("val")); - - tx.commit(); - } - } - } - - /** - * @throws Exception If failed. - */ - public void testGetAllAsyncTx() throws Exception { - if (atomicityMode() != TRANSACTIONAL) - return; - - IgniteCache<Integer, TestObject> c = jcache(0); - IgniteCache<Integer, TestObject> cacheAsync = c.withAsync(); - - for (int i = 0; i < ENTRY_CNT; i++) - c.put(i, new TestObject(i)); - - for (int i = 0; i < ENTRY_CNT; ) { - Set<Integer> keys = new HashSet<>(); - - for (int j = 0; j < 10; j++) - keys.add(i++); - - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - cacheAsync.getAll(keys); - - Map<Integer, TestObject> objs = cacheAsync.<Map<Integer, TestObject>>future().get(); - - assertEquals(10, objs.size()); - - for (Map.Entry<Integer, TestObject> e : objs.entrySet()) - assertEquals(e.getKey().intValue(), e.getValue().val); - - tx.commit(); - } - } - - IgniteCache<Integer, PortableObject> cache = keepPortableCache(); - - for (int i = 0; i < ENTRY_CNT; ) { - Set<Integer> keys = new HashSet<>(); - - for (int j = 0; j < 10; j++) - keys.add(i++); - - IgniteCache<Integer, PortableObject> asyncCache = cache.withAsync(); - - try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - asyncCache.getAll(keys); - - Map<Integer, PortableObject> objs = asyncCache.<Map<Integer, PortableObject>>future().get(); - - assertEquals(10, objs.size()); - - for (Map.Entry<Integer, PortableObject> e : objs.entrySet()) - assertEquals(new Integer(e.getKey().intValue()), e.getValue().field("val")); - - tx.commit(); - } - } - } - - /** - * @throws Exception If failed. - */ - public void testLoadCache() throws Exception { - for (int i = 0; i < gridCount(); i++) - jcache(i).localLoadCache(null); - - IgniteCache<Integer, TestObject> cache = jcache(0); - - assertEquals(3, cache.size(CachePeekMode.PRIMARY)); - - assertEquals(1, cache.get(1).val); - assertEquals(2, cache.get(2).val); - assertEquals(3, cache.get(3).val); - } - - /** - * @throws Exception If failed. - */ - public void testLoadCacheAsync() throws Exception { - for (int i = 0; i < gridCount(); i++) { - IgniteCache<Object, Object> jcache = jcache(i).withAsync(); - - jcache.loadCache(null); - - jcache.future().get(); - } - - IgniteCache<Integer, TestObject> cache = jcache(0); - - assertEquals(3, cache.size(CachePeekMode.PRIMARY)); - - assertEquals(1, cache.get(1).val); - assertEquals(2, cache.get(2).val); - assertEquals(3, cache.get(3).val); - } - - /** - * @throws Exception If failed. - */ - public void testLoadCacheFilteredAsync() throws Exception { - for (int i = 0; i < gridCount(); i++) { - IgniteCache<Integer, TestObject> c = this.<Integer, TestObject>jcache(i).withAsync(); - - c.loadCache(new P2<Integer, TestObject>() { - @Override public boolean apply(Integer key, TestObject val) { - return val.val < 3; - } - }); - - c.future().get(); - } - - IgniteCache<Integer, TestObject> cache = jcache(0); - - assertEquals(2, cache.size(CachePeekMode.PRIMARY)); - - assertEquals(1, cache.get(1).val); - assertEquals(2, cache.get(2).val); - - assertNull(cache.get(3)); - } - - /** - * @throws Exception If failed. - */ - public void testTransform() throws Exception { - IgniteCache<Integer, PortableObject> c = keepPortableCache(); - - checkTransform(primaryKey(c)); - - if (cacheMode() != CacheMode.LOCAL) { - checkTransform(backupKey(c)); - - if (nearConfiguration() != null) - checkTransform(nearKey(c)); - } - } - - /** - * @return Cache with keep portable flag. - */ - private <K, V> IgniteCache<K, V> keepPortableCache() { - return ignite(0).cache(null).withKeepPortable(); - } - - /** - * @param key Key. - * @throws Exception If failed. - */ - private void checkTransform(Integer key) throws Exception { - log.info("Transform: " + key); - - IgniteCache<Integer, PortableObject> c = keepPortableCache(); - - try { - c.invoke(key, new EntryProcessor<Integer, PortableObject, Void>() { - @Override public Void process(MutableEntry<Integer, PortableObject> e, Object... args) { - PortableObject val = e.getValue(); - - assertNull("Unexpected value: " + val, val); - - return null; - } - }); - - jcache(0).put(key, new TestObject(1)); - - c.invoke(key, new EntryProcessor<Integer, PortableObject, Void>() { - @Override public Void process(MutableEntry<Integer, PortableObject> e, Object... args) { - PortableObject val = e.getValue(); - - assertNotNull("Unexpected value: " + val, val); - - assertEquals(new Integer(1), val.field("val")); - - Ignite ignite = e.unwrap(Ignite.class); - - IgnitePortables portables = ignite.portables(); - - PortableBuilder builder = portables.builder(val); - - builder.setField("val", 2); - - e.setValue(builder.build()); - - return null; - } - }); - - PortableObject obj = c.get(key); - - assertEquals(new Integer(2), obj.field("val")); - - c.invoke(key, new EntryProcessor<Integer, PortableObject, Void>() { - @Override public Void process(MutableEntry<Integer, PortableObject> e, Object... args) { - PortableObject val = e.getValue(); - - assertNotNull("Unexpected value: " + val, val); - - assertEquals(new Integer(2), val.field("val")); - - e.setValue(val); - - return null; - } - }); - - obj = c.get(key); - - assertEquals(new Integer(2), obj.field("val")); - - c.invoke(key, new EntryProcessor<Integer, PortableObject, Void>() { - @Override public Void process(MutableEntry<Integer, PortableObject> e, Object... args) { - PortableObject val = e.getValue(); - - assertNotNull("Unexpected value: " + val, val); - - assertEquals(new Integer(2), val.field("val")); - - e.remove(); - - return null; - } - }); - - assertNull(c.get(key)); - } - finally { - c.remove(key); - } - } - - /** - * - */ - private static class TestObject implements PortableMarshalAware { - /** */ - private int val; - - /** - */ - private TestObject() { - // No-op. - } - - /** - * @param val Value. - */ - private TestObject(int val) { - this.val = val; - } - - /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { - writer.writeInt("val", val); - } - - /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { - val = reader.readInt("val"); - } - } - - /** - * - */ - private static class TestReferenceObject implements PortableMarshalAware { - /** */ - private TestReferenceObject obj; - - /** - */ - private TestReferenceObject() { - // No-op. - } - - /** - * @param obj Object. - */ - private TestReferenceObject(TestReferenceObject obj) { - this.obj = obj; - } - - /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { - writer.writeObject("obj", obj); - } - - /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { - obj = reader.readObject("obj"); - } - } - - /** - * - */ - private static class TestStore extends CacheStoreAdapter<Integer, Object> { - /** {@inheritDoc} */ - @Override public void loadCache(IgniteBiInClosure<Integer, Object> clo, Object... args) { - for (int i = 1; i <= 3; i++) - clo.apply(i, new TestObject(i)); - } - - /** {@inheritDoc} */ - @Nullable @Override public Object load(Integer key) { - return null; - } - - /** {@inheritDoc} */ - @Override public void write(Cache.Entry<? extends Integer, ?> e) { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void delete(Object key) { - // No-op. - } - } -} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java index 7c605b5..1c842e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java @@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; /** - * Tests for cache store with portables. + * Tests for cache store with binary. */ public abstract class GridCachePortableStoreAbstractSelfTest extends GridCommonAbstractTest { /** */ @@ -76,7 +76,7 @@ public abstract class GridCachePortableStoreAbstractSelfTest extends GridCommonA } /** - * @return Keep portables in store flag. + * @return Keep binary in store flag. */ protected abstract boolean keepPortableInStore(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreObjectsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreObjectsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreObjectsSelfTest.java index 1c1c99e..8f81572 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreObjectsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreObjectsSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.portable; import java.util.Map; /** - * Tests for cache store with portables. + * Tests for cache store with binary. */ public class GridCachePortableStoreObjectsSelfTest extends GridCachePortableStoreAbstractSelfTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStorePortablesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStorePortablesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStorePortablesSelfTest.java index 5c0fc8e..95101df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStorePortablesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStorePortablesSelfTest.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.processors.cache.portable; import java.util.Map; -import org.apache.ignite.portable.PortableObject; +import org.apache.ignite.binary.BinaryObject; /** - * Tests for cache store with portables. + * Tests for cache store with binary. */ public class GridCachePortableStorePortablesSelfTest extends GridCachePortableStoreAbstractSelfTest { /** {@inheritDoc} */ @@ -47,11 +47,11 @@ public class GridCachePortableStorePortablesSelfTest extends GridCachePortableSt for (int idx : idxs) { Object val = map.get(portable(new Key(idx))); - assertTrue(String.valueOf(val), val instanceof PortableObject); + assertTrue(String.valueOf(val), val instanceof BinaryObject); - PortableObject po = (PortableObject)val; + BinaryObject po = (BinaryObject)val; - assertEquals("Value", po.metaData().typeName()); + assertEquals("Value", po.type().typeName()); assertEquals(new Integer(idx), po.field("idx")); } } @@ -61,6 +61,6 @@ public class GridCachePortableStorePortablesSelfTest extends GridCachePortableSt * @return Portable object. */ private Object portable(Object obj) { - return grid().portables().toPortable(obj); + return grid().binary().toBinary(obj); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java index 0db650e..d277801 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.portable; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.portable.PortableContext; import org.apache.ignite.internal.portable.PortableMetaDataHandler; import org.apache.ignite.internal.processors.cache.GridCacheEntryMemorySizeSelfTest; @@ -25,8 +26,8 @@ import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.MarshallerContextTestImpl; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableException; -import org.apache.ignite.portable.PortableMetadata; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryType; /** * @@ -39,14 +40,14 @@ public class GridPortableCacheEntryMemorySizeSelfTest extends GridCacheEntryMemo marsh.setContext(new MarshallerContextTestImpl(null)); PortableContext pCtx = new PortableContext(new PortableMetaDataHandler() { - @Override public void addMeta(int typeId, PortableMetadata meta) throws PortableException { + @Override public void addMeta(int typeId, BinaryType meta) throws BinaryObjectException { // No-op } - @Override public PortableMetadata metadata(int typeId) throws PortableException { + @Override public BinaryType metadata(int typeId) throws BinaryObjectException { return null; } - }, null); + }, new IgniteConfiguration()); IgniteUtils.invoke(PortableMarshaller.class, marsh, "setPortableContext", pCtx); http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableDuplicateIndexObjectsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableDuplicateIndexObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableDuplicateIndexObjectsAbstractSelfTest.java index a1a623b..4b7286a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableDuplicateIndexObjectsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableDuplicateIndexObjectsAbstractSelfTest.java @@ -31,7 +31,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableObject; +import org.apache.ignite.binary.BinaryObject; /** * Tests that portable object is the same in cache entry and in index. @@ -96,9 +96,9 @@ public abstract class GridPortableDuplicateIndexObjectsAbstractSelfTest extends cache.put(key, new TestPortable(fieldOneVal, fieldTwoVal)); - IgniteCache<Integer, PortableObject> prj = grid(0).cache(null).withKeepPortable(); + IgniteCache<Integer, BinaryObject> prj = grid(0).cache(null).withKeepBinary(); - PortableObject cacheVal = prj.get(key); + BinaryObject cacheVal = prj.get(key); assertEquals(fieldOneVal, cacheVal.field("fieldOne")); assertEquals(new Integer(fieldTwoVal), cacheVal.field("fieldTwo")); @@ -108,7 +108,7 @@ public abstract class GridPortableDuplicateIndexObjectsAbstractSelfTest extends assertEquals(1, row.size()); - PortableObject qryVal = (PortableObject)row.get(0); + BinaryObject qryVal = (BinaryObject)row.get(0); assertEquals(fieldOneVal, qryVal.field("fieldOne")); assertEquals(new Integer(fieldTwoVal), qryVal.field("fieldTwo")); http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/DataStreamProcessorPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/DataStreamProcessorPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/DataStreamProcessorPortableSelfTest.java index 836440a..58adfe3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/DataStreamProcessorPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/DataStreamProcessorPortableSelfTest.java @@ -20,10 +20,10 @@ package org.apache.ignite.internal.processors.cache.portable.datastreaming; import java.util.Collection; import java.util.Map; import org.apache.ignite.IgniteCache; +import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorSelfTest; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableObject; import org.apache.ignite.stream.StreamReceiver; /** @@ -46,6 +46,11 @@ public class DataStreamProcessorPortableSelfTest extends DataStreamProcessorSelf return new TestDataReceiver(); } + /** {@inheritDoc} */ + @Override protected boolean customKeepBinary() { + return true; + } + /** * */ @@ -55,9 +60,9 @@ public class DataStreamProcessorPortableSelfTest extends DataStreamProcessorSelf Collection<Map.Entry<String, TestObject>> entries) { for (Map.Entry<String, TestObject> e : entries) { assertTrue(e.getKey() instanceof String); - assertTrue(e.getValue() instanceof PortableObject); + assertTrue(String.valueOf(e.getValue()), e.getValue() instanceof BinaryObject); - TestObject obj = ((PortableObject)e.getValue()).deserialize(); + TestObject obj = ((BinaryObject)e.getValue()).deserialize(); cache.put(e.getKey(), new TestObject(obj.val + 1)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/GridDataStreamerImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/GridDataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/GridDataStreamerImplSelfTest.java index 2f7bdb0..3bc3575 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/GridDataStreamerImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/datastreaming/GridDataStreamerImplSelfTest.java @@ -31,11 +31,11 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableException; -import org.apache.ignite.portable.PortableMarshalAware; -import org.apache.ignite.portable.PortableObject; -import org.apache.ignite.portable.PortableReader; -import org.apache.ignite.portable.PortableWriter; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.Binarylizable; +import org.apache.ignite.binary.BinaryObject; +import org.apache.ignite.binary.BinaryReader; +import org.apache.ignite.binary.BinaryWriter; 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; @@ -54,7 +54,7 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest { /** Number of keys to load via data streamer. */ private static final int KEYS_COUNT = 1000; - /** Flag indicating should be cache configured with portables or not. */ + /** Flag indicating should be cache configured with binary or not. */ private static boolean portables; /** {@inheritDoc} */ @@ -221,12 +221,12 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest { } // Read random keys. Take values as PortableObject. - IgniteCache<Integer, PortableObject> c2 = ((IgniteCacheProxy)c).keepPortable(); + IgniteCache<Integer, BinaryObject> c2 = ((IgniteCacheProxy)c).keepPortable(); for (int i = 0; i < 100; i ++) { Integer k = rnd.nextInt(KEYS_COUNT); - PortableObject v = c2.get(k); + BinaryObject v = c2.get(k); assertEquals(k, v.field("val")); } @@ -256,7 +256,7 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest { /** */ - private static class TestObject implements PortableMarshalAware, Serializable { + private static class TestObject implements Binarylizable, Serializable { /** */ private int val; @@ -289,19 +289,19 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { writer.writeInt("val", val); } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { val = reader.readInt("val"); } } /** */ - private static class TestObject2 implements PortableMarshalAware, Serializable { + private static class TestObject2 implements Binarylizable, Serializable { /** */ private int val; @@ -333,12 +333,12 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { writer.writeInt("val", val); } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { val = reader.readInt("val"); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java index 155ba48..d5639fd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java @@ -18,10 +18,11 @@ package org.apache.ignite.internal.processors.cache.portable.distributed.dht; import java.util.Collections; +import org.apache.ignite.cache.CacheKeyConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAffinityRoutingSelfTest; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableTypeConfiguration; +import org.apache.ignite.binary.BinaryTypeConfiguration; /** * @@ -31,10 +32,13 @@ public class GridCacheAffinityRoutingPortableSelfTest extends GridCacheAffinityR @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(); + BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration(); typeCfg.setClassName(AffinityTestKey.class.getName()); - typeCfg.setAffinityKeyFieldName("affKey"); + + CacheKeyConfiguration keyCfg = new CacheKeyConfiguration(AffinityTestKey.class.getName(), "affKey"); + + cfg.setCacheKeyCfg(keyCfg); PortableMarshaller marsh = new PortableMarshaller(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPartitionedOnlyPortableDataStreamerMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPartitionedOnlyPortableDataStreamerMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPartitionedOnlyPortableDataStreamerMultithreadedSelfTest.java index 3f8cd1c..ee95194 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPartitionedOnlyPortableDataStreamerMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPartitionedOnlyPortableDataStreamerMultithreadedSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.portable.distributed.dht; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import org.apache.ignite.internal.processors.cache.portable.GridCachePortableObjectsAbstractDataStreamerSelfTest; +import org.apache.ignite.internal.processors.cache.portable.GridCacheBinaryObjectsAbstractDataStreamerSelfTest; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -29,7 +29,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED; * */ public class GridCacheAtomicPartitionedOnlyPortableDataStreamerMultithreadedSelfTest extends - GridCachePortableObjectsAbstractDataStreamerSelfTest { + GridCacheBinaryObjectsAbstractDataStreamerSelfTest { /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { return PARTITIONED; http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPartitionedOnlyPortableMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPartitionedOnlyPortableMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPartitionedOnlyPortableMultithreadedSelfTest.java index 8f3a05f..7fb63db 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPartitionedOnlyPortableMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPartitionedOnlyPortableMultithreadedSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.portable.distributed.dht; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; -import org.apache.ignite.internal.processors.cache.portable.GridCachePortableObjectsAbstractMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.portable.GridCacheBinaryObjectsAbstractMultiThreadedSelfTest; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -29,7 +29,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED; * */ public class GridCacheAtomicPartitionedOnlyPortableMultithreadedSelfTest extends - GridCachePortableObjectsAbstractMultiThreadedSelfTest { + GridCacheBinaryObjectsAbstractMultiThreadedSelfTest { /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { return PARTITIONED; http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest.java new file mode 100644 index 0000000..79c69c4 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest.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.portable.distributed.dht; + +/** + * + */ +public class GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest + extends GridCacheBinaryObjectsAtomicNearDisabledSelfTest { + /** {@inheritDoc} */ + @Override protected boolean offheapTiered() { + return true; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java new file mode 100644 index 0000000..fe46dea --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java @@ -0,0 +1,51 @@ +/* + * 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.portable.distributed.dht; + +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.processors.cache.portable.GridCacheBinaryObjectsAbstractSelfTest; + +import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; + +/** + * Test for portable objects stored in cache. + */ +public class GridCacheBinaryObjectsAtomicNearDisabledSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMode cacheMode() { + return PARTITIONED; + } + + /** {@inheritDoc} */ + @Override protected CacheAtomicityMode atomicityMode() { + return ATOMIC; + } + + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearConfiguration() { + return null; + } + + /** {@inheritDoc} */ + @Override protected int gridCount() { + return 3; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicOffheapTieredSelfTest.java new file mode 100644 index 0000000..d692624 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicOffheapTieredSelfTest.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.portable.distributed.dht; + +/** + * + */ +public class GridCacheBinaryObjectsAtomicOffheapTieredSelfTest extends GridCacheBinaryObjectsAtomicSelfTest { + /** {@inheritDoc} */ + @Override protected boolean offheapTiered() { + return true; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java new file mode 100644 index 0000000..097d51b --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java @@ -0,0 +1,51 @@ +/* + * 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.portable.distributed.dht; + +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.processors.cache.portable.GridCacheBinaryObjectsAbstractSelfTest; + +import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; + +/** + * Test for portable objects stored in cache. + */ +public class GridCacheBinaryObjectsAtomicSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMode cacheMode() { + return PARTITIONED; + } + + /** {@inheritDoc} */ + @Override protected CacheAtomicityMode atomicityMode() { + return ATOMIC; + } + + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearConfiguration() { + return new NearCacheConfiguration(); + } + + /** {@inheritDoc} */ + @Override protected int gridCount() { + return 3; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest.java new file mode 100644 index 0000000..fde8233 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest.java @@ -0,0 +1,30 @@ +/* + * 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.portable.distributed.dht; + +/** + * + */ +public class GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest + extends GridCacheBinaryObjectsPartitionedNearDisabledSelfTest { + /** {@inheritDoc} */ + @Override protected boolean offheapTiered() { + return true; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java new file mode 100644 index 0000000..e916a55 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java @@ -0,0 +1,51 @@ +/* + * 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.portable.distributed.dht; + +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.processors.cache.portable.GridCacheBinaryObjectsAbstractSelfTest; + +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; + +/** + * Test for portable objects stored in cache. + */ +public class GridCacheBinaryObjectsPartitionedNearDisabledSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMode cacheMode() { + return PARTITIONED; + } + + /** {@inheritDoc} */ + @Override protected CacheAtomicityMode atomicityMode() { + return TRANSACTIONAL; + } + + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearConfiguration() { + return null; + } + + /** {@inheritDoc} */ + @Override protected int gridCount() { + return 3; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest.java new file mode 100644 index 0000000..c6684d8 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest.java @@ -0,0 +1,30 @@ +/* + * 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.portable.distributed.dht; + +/** + * + */ +public class GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest + extends GridCacheBinaryObjectsPartitionedSelfTest { + /** {@inheritDoc} */ + @Override protected boolean offheapTiered() { + return true; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java new file mode 100644 index 0000000..80a13ec --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java @@ -0,0 +1,51 @@ +/* + * 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.portable.distributed.dht; + +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.processors.cache.portable.GridCacheBinaryObjectsAbstractSelfTest; + +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; + +/** + * Test for portable objects stored in cache. + */ +public class GridCacheBinaryObjectsPartitionedSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMode cacheMode() { + return PARTITIONED; + } + + /** {@inheritDoc} */ + @Override protected CacheAtomicityMode atomicityMode() { + return TRANSACTIONAL; + } + + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearConfiguration() { + return new NearCacheConfiguration(); + } + + /** {@inheritDoc} */ + @Override protected int gridCount() { + return 3; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableSelfTest.java index c845257..0c6b77c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableSelfTest.java @@ -33,7 +33,7 @@ public class GridCacheOffHeapTieredAtomicPortableSelfTest extends GridCacheOffHe /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - // Enable portables. + // Enable binary. IgniteConfiguration cfg = super.getConfiguration(gridName); PortableMarshaller marsh = new PortableMarshaller(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.java index 1a0d601..215567c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.java @@ -21,7 +21,7 @@ import java.util.Arrays; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionAtomicSelfTest; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableObject; +import org.apache.ignite.binary.BinaryObject; /** * @@ -29,7 +29,7 @@ import org.apache.ignite.portable.PortableObject; public class GridCacheOffHeapTieredEvictionAtomicPortableSelfTest extends GridCacheOffHeapTieredEvictionAtomicSelfTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - // Enable portables. + // Enable binary. IgniteConfiguration cfg = super.getConfiguration(gridName); PortableMarshaller marsh = new PortableMarshaller(); @@ -66,7 +66,7 @@ public class GridCacheOffHeapTieredEvictionAtomicPortableSelfTest extends GridCa /** {@inheritDoc} */ @Override public void checkValue(Object val) { - PortableObject obj = (PortableObject)val; + BinaryObject obj = (BinaryObject)val; assertEquals(expVal, obj.field("val")); } @@ -87,7 +87,7 @@ public class GridCacheOffHeapTieredEvictionAtomicPortableSelfTest extends GridCa /** {@inheritDoc} */ @Override public void checkValue(Object val) { - PortableObject obj = (PortableObject)val; + BinaryObject obj = (BinaryObject)val; assertEquals(expVal, obj.field("val")); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionPortableSelfTest.java index 60eed45..674e17a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredEvictionPortableSelfTest.java @@ -21,7 +21,7 @@ import java.util.Arrays; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionSelfTest; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.portable.PortableObject; +import org.apache.ignite.binary.BinaryObject; /** * @@ -29,7 +29,7 @@ import org.apache.ignite.portable.PortableObject; public class GridCacheOffHeapTieredEvictionPortableSelfTest extends GridCacheOffHeapTieredEvictionSelfTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - // Enable portables. + // Enable binary. IgniteConfiguration cfg = super.getConfiguration(gridName); PortableMarshaller marsh = new PortableMarshaller(); @@ -66,7 +66,7 @@ public class GridCacheOffHeapTieredEvictionPortableSelfTest extends GridCacheOff /** {@inheritDoc} */ @Override public void checkValue(Object val) { - PortableObject obj = (PortableObject)val; + BinaryObject obj = (BinaryObject)val; assertEquals(expVal, obj.field("val")); } @@ -87,7 +87,7 @@ public class GridCacheOffHeapTieredEvictionPortableSelfTest extends GridCacheOff /** {@inheritDoc} */ @Override public void checkValue(Object val) { - PortableObject obj = (PortableObject)val; + BinaryObject obj = (BinaryObject)val; assertEquals(expVal, obj.field("val")); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPortableSelfTest.java index 6170e39..9f4e2c5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPortableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPortableSelfTest.java @@ -33,7 +33,7 @@ public class GridCacheOffHeapTieredPortableSelfTest extends GridCacheOffHeapTier /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - // Enable portables. + // Enable binary. IgniteConfiguration cfg = super.getConfiguration(gridName); PortableMarshaller marsh = new PortableMarshaller(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicNearDisabledOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicNearDisabledOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicNearDisabledOffheapTieredSelfTest.java deleted file mode 100644 index a5c28f3..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicNearDisabledOffheapTieredSelfTest.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.portable.distributed.dht; - -/** - * - */ -public class GridCachePortableObjectsAtomicNearDisabledOffheapTieredSelfTest - extends GridCachePortableObjectsAtomicNearDisabledSelfTest { - /** {@inheritDoc} */ - @Override protected boolean offheapTiered() { - return true; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicNearDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicNearDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicNearDisabledSelfTest.java deleted file mode 100644 index 696c3ed..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicNearDisabledSelfTest.java +++ /dev/null @@ -1,51 +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.portable.distributed.dht; - -import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.configuration.NearCacheConfiguration; -import org.apache.ignite.internal.processors.cache.portable.GridCachePortableObjectsAbstractSelfTest; - -import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; -import static org.apache.ignite.cache.CacheMode.PARTITIONED; - -/** - * Test for portable objects stored in cache. - */ -public class GridCachePortableObjectsAtomicNearDisabledSelfTest extends GridCachePortableObjectsAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMode cacheMode() { - return PARTITIONED; - } - - /** {@inheritDoc} */ - @Override protected CacheAtomicityMode atomicityMode() { - return ATOMIC; - } - - /** {@inheritDoc} */ - @Override protected NearCacheConfiguration nearConfiguration() { - return null; - } - - /** {@inheritDoc} */ - @Override protected int gridCount() { - return 3; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicOffheapTieredSelfTest.java deleted file mode 100644 index 8e04fa1..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicOffheapTieredSelfTest.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.portable.distributed.dht; - -/** - * - */ -public class GridCachePortableObjectsAtomicOffheapTieredSelfTest extends GridCachePortableObjectsAtomicSelfTest { - /** {@inheritDoc} */ - @Override protected boolean offheapTiered() { - return true; - } -} \ No newline at end of file
