Repository: ignite Updated Branches: refs/heads/ignite-1816 8e32a7151 -> 02b118055
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/GridCachePortableObjectsAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicSelfTest.java deleted file mode 100644 index 106e59b..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsAtomicSelfTest.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 GridCachePortableObjectsAtomicSelfTest extends GridCachePortableObjectsAbstractSelfTest { - /** {@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/GridCachePortableObjectsPartitionedNearDisabledOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedNearDisabledOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedNearDisabledOffheapTieredSelfTest.java deleted file mode 100644 index 5bc4672..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedNearDisabledOffheapTieredSelfTest.java +++ /dev/null @@ -1,30 +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 GridCachePortableObjectsPartitionedNearDisabledOffheapTieredSelfTest - extends GridCachePortableObjectsPartitionedNearDisabledSelfTest{ - /** {@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/GridCachePortableObjectsPartitionedNearDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedNearDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedNearDisabledSelfTest.java deleted file mode 100644 index df55de7..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedNearDisabledSelfTest.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.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMode.PARTITIONED; - -/** - * Test for portable objects stored in cache. - */ -public class GridCachePortableObjectsPartitionedNearDisabledSelfTest extends GridCachePortableObjectsAbstractSelfTest { - /** {@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/GridCachePortableObjectsPartitionedOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedOffheapTieredSelfTest.java deleted file mode 100644 index a6bc0b4..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedOffheapTieredSelfTest.java +++ /dev/null @@ -1,30 +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 GridCachePortableObjectsPartitionedOffheapTieredSelfTest - extends GridCachePortableObjectsPartitionedSelfTest { - /** {@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/GridCachePortableObjectsPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedSelfTest.java deleted file mode 100644 index 8c248be..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePortableObjectsPartitionedSelfTest.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.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMode.PARTITIONED; - -/** - * Test for portable objects stored in cache. - */ -public class GridCachePortableObjectsPartitionedSelfTest extends GridCachePortableObjectsAbstractSelfTest { - /** {@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/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java new file mode 100644 index 0000000..0c2734e --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.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.replicated; + +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.REPLICATED; + +/** + * Test for portable objects stored in cache. + */ +public class GridCacheBinaryObjectsReplicatedSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMode cacheMode() { + return REPLICATED; + } + + /** {@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/replicated/GridCachePortableObjectsReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCachePortableObjectsReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCachePortableObjectsReplicatedSelfTest.java deleted file mode 100644 index 953fbfa..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCachePortableObjectsReplicatedSelfTest.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.replicated; - -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.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMode.REPLICATED; - -/** - * Test for portable objects stored in cache. - */ -public class GridCachePortableObjectsReplicatedSelfTest extends GridCachePortableObjectsAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMode cacheMode() { - return REPLICATED; - } - - /** {@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/local/GridCacheBinaryObjectsAtomicLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheBinaryObjectsAtomicLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheBinaryObjectsAtomicLocalSelfTest.java new file mode 100644 index 0000000..19321fb --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheBinaryObjectsAtomicLocalSelfTest.java @@ -0,0 +1,32 @@ +/* + * 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.local; + +import org.apache.ignite.cache.CacheAtomicityMode; + +import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; + +/** + * + */ +public class GridCacheBinaryObjectsAtomicLocalSelfTest extends GridCacheBinaryObjectsLocalSelfTest { + /** {@inheritDoc} */ + @Override protected CacheAtomicityMode atomicityMode() { + return ATOMIC; + } +} \ 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/local/GridCacheBinaryObjectsLocalOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheBinaryObjectsLocalOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheBinaryObjectsLocalOffheapTieredSelfTest.java new file mode 100644 index 0000000..4801fa5 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheBinaryObjectsLocalOffheapTieredSelfTest.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.local; + +/** + * + */ +public class GridCacheBinaryObjectsLocalOffheapTieredSelfTest extends GridCacheBinaryObjectsLocalSelfTest { + /** {@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/local/GridCacheBinaryObjectsLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheBinaryObjectsLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheBinaryObjectsLocalSelfTest.java new file mode 100644 index 0000000..21053d7 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheBinaryObjectsLocalSelfTest.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.local; + +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.LOCAL; + +/** + * Test for portable objects stored in cache. + */ +public class GridCacheBinaryObjectsLocalSelfTest extends GridCacheBinaryObjectsAbstractSelfTest { + /** {@inheritDoc} */ + @Override protected CacheMode cacheMode() { + return LOCAL; + } + + /** {@inheritDoc} */ + @Override protected CacheAtomicityMode atomicityMode() { + return TRANSACTIONAL; + } + + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearConfiguration() { + return null; + } + + /** {@inheritDoc} */ + @Override protected int gridCount() { + return 1; + } +} \ 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/local/GridCachePortableObjectsAtomicLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCachePortableObjectsAtomicLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCachePortableObjectsAtomicLocalSelfTest.java deleted file mode 100644 index 3f3a350..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCachePortableObjectsAtomicLocalSelfTest.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.internal.processors.cache.portable.local; - -import org.apache.ignite.cache.CacheAtomicityMode; - -import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; - -/** - * - */ -public class GridCachePortableObjectsAtomicLocalSelfTest extends GridCachePortableObjectsLocalSelfTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicityMode atomicityMode() { - return ATOMIC; - } -} \ 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/local/GridCachePortableObjectsLocalOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCachePortableObjectsLocalOffheapTieredSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCachePortableObjectsLocalOffheapTieredSelfTest.java deleted file mode 100644 index 53713ce..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCachePortableObjectsLocalOffheapTieredSelfTest.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.local; - -/** - * - */ -public class GridCachePortableObjectsLocalOffheapTieredSelfTest extends GridCachePortableObjectsLocalSelfTest { - /** {@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/local/GridCachePortableObjectsLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCachePortableObjectsLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCachePortableObjectsLocalSelfTest.java deleted file mode 100644 index 1a87865..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCachePortableObjectsLocalSelfTest.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.local; - -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.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMode.LOCAL; - -/** - * Test for portable objects stored in cache. - */ -public class GridCachePortableObjectsLocalSelfTest extends GridCachePortableObjectsAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMode cacheMode() { - return LOCAL; - } - - /** {@inheritDoc} */ - @Override protected CacheAtomicityMode atomicityMode() { - return TRANSACTIONAL; - } - - /** {@inheritDoc} */ - @Override protected NearCacheConfiguration nearConfiguration() { - return null; - } - - /** {@inheritDoc} */ - @Override protected int gridCount() { - return 1; - } -} \ 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/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 b6b3d70..65dd690 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 @@ -149,6 +149,13 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { } /** + * @return {@code True} if custom stream receiver should use keepBinary flag. + */ + protected boolean customKeepBinary() { + return false; + } + + /** * @throws Exception If failed. */ public void testPartitioned() throws Exception { @@ -914,6 +921,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { try (IgniteDataStreamer<String, TestObject> ldr = ignite.dataStreamer(null)) { ldr.allowOverwrite(true); + ldr.keepBinary(customKeepBinary()); ldr.receiver(getStreamReceiver()); http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java index a6dfc9c..a41f6c8 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java @@ -85,7 +85,8 @@ public class GridHashMapLoadTest extends GridCommonAbstractTest { @Override public boolean tmLock(IgniteInternalTx tx, long timeout, @Nullable GridCacheVersion serOrder, - GridCacheVersion serReadVer) { + GridCacheVersion serReadVer, + boolean keepBinary) { return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java index 0e8b825..1e3c499 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java @@ -25,8 +25,8 @@ import org.apache.ignite.compute.ComputeJobAdapter; import org.apache.ignite.compute.ComputeJobResult; import org.apache.ignite.compute.ComputeTaskAdapter; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.portable.PortableMetadata; -import org.apache.ignite.portable.PortableObject; +import org.apache.ignite.binary.BinaryType; +import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.resources.IgniteInstanceResource; import org.jetbrains.annotations.Nullable; @@ -87,9 +87,9 @@ public class PlatformComputePortableArgTask extends ComputeTaskAdapter<Object, I /** {@inheritDoc} */ @Nullable @Override public Object execute() { - PortableObject arg0 = ((PortableObject)arg); + BinaryObject arg0 = ((BinaryObject)arg); - PortableMetadata meta = ignite.portables().metadata(arg0.typeId()); + BinaryType meta = ignite.binary().metadata(arg0.typeId()); if (meta == null) throw new IgniteException("Metadata doesn't exist."); http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java index d9dee9d..84c3584 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformEventsWriteEventTask.java @@ -32,7 +32,7 @@ import org.apache.ignite.events.DiscoveryEvent; import org.apache.ignite.events.JobEvent; import org.apache.ignite.events.SwapSpaceEvent; import org.apache.ignite.events.TaskEvent; -import org.apache.ignite.internal.portable.PortableRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream; @@ -41,8 +41,6 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.events.*; -import org.apache.ignite.plugin.security.SecurityPermission; -import org.apache.ignite.plugin.security.SecuritySubjectType; import org.apache.ignite.resources.IgniteInstanceResource; import org.jetbrains.annotations.Nullable; @@ -97,7 +95,7 @@ public class PlatformEventsWriteEventTask extends ComputeTaskAdapter<Long, Objec try (PlatformMemory mem = ctx.memory().get(ptr)) { PlatformOutputStream out = mem.output(); - PortableRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); int evtType = EventType.EVT_SWAP_SPACE_CLEARED; String msg = "msg"; http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java index c7d6899..64652b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java @@ -28,6 +28,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.processors.cache.KeyCacheObject; +import org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl; import org.apache.ignite.internal.util.typedef.CIX1; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiInClosure; @@ -111,7 +113,7 @@ public class GridFileSwapSpaceSpiSelfTest extends GridSwapSpaceSpiAbstractSelfTe * @return Swap key. */ private SwapKey key(int i) { - return new SwapKey(i, i % 11, U.intToBytes(i)); + return new SwapKey(new KeyCacheObjectImpl(i, U.intToBytes(i)), i % 11, U.intToBytes(i)); } /** @@ -354,8 +356,11 @@ public class GridFileSwapSpaceSpiSelfTest extends GridSwapSpaceSpiAbstractSelfTe assertEquals(cnt, spi.count(space)); - for (Map.Entry<SwapKey, byte[]> entry : map.entrySet()) - hash1 += (Integer)entry.getKey().key() * Arrays.hashCode(entry.getValue()); + for (Map.Entry<SwapKey, byte[]> entry : map.entrySet()) { + KeyCacheObject key = (KeyCacheObject)entry.getKey().key(); + + hash1 += (Integer)key.value(null, false) * Arrays.hashCode(entry.getValue()); + } assertEquals(hash0, hash1); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java index 23f702c..4b17c2e 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java @@ -35,7 +35,7 @@ import org.apache.ignite.IgniteEvents; import org.apache.ignite.IgniteFileSystem; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteMessaging; -import org.apache.ignite.IgnitePortables; +import org.apache.ignite.IgniteBinary; import org.apache.ignite.IgniteQueue; import org.apache.ignite.IgniteScheduler; import org.apache.ignite.IgniteServices; @@ -276,7 +276,7 @@ public class IgniteMock implements Ignite { } /** {@inheritDoc} */ - @Override public IgnitePortables portables() { + @Override public IgniteBinary binary() { return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java index 6a71f97..d2e17d8 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java @@ -129,7 +129,7 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ - @Override public void loadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args) + @Override public void loadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args) throws CacheException { throw new UnsupportedOperationException("Method should be supported."); } @@ -424,7 +424,7 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ - @Override public <K1, V1> IgniteCache<K1, V1> withKeepPortable() { + @Override public <K1, V1> IgniteCache<K1, V1> withKeepBinary() { throw new UnsupportedOperationException("Method should be supported."); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java index 536f283..7d28150 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java @@ -41,7 +41,7 @@ import org.apache.ignite.IgniteFileSystem; import org.apache.ignite.IgniteIllegalStateException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteMessaging; -import org.apache.ignite.IgnitePortables; +import org.apache.ignite.IgniteBinary; import org.apache.ignite.IgniteQueue; import org.apache.ignite.IgniteScheduler; import org.apache.ignite.IgniteServices; @@ -551,7 +551,7 @@ public class IgniteProcessProxy implements IgniteEx { } /** {@inheritDoc} */ - @Override public IgnitePortables portables() { + @Override public IgniteBinary binary() { throw new UnsupportedOperationException("Operation isn't supported yet."); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableObjectsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableObjectsTestSuite.java index 6d8e12d..c6b1fbc 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableObjectsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableObjectsTestSuite.java @@ -19,10 +19,10 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.portable.GridPortableAffinityKeySelfTest; -import org.apache.ignite.internal.portable.GridPortableBuilderAdditionalSelfTest; -import org.apache.ignite.internal.portable.GridPortableBuilderSelfTest; -import org.apache.ignite.internal.portable.GridPortableBuilderStringAsCharsAdditionalSelfTest; -import org.apache.ignite.internal.portable.GridPortableBuilderStringAsCharsSelfTest; +import org.apache.ignite.internal.portable.GridBinaryObjectBuilderAdditionalSelfTest; +import org.apache.ignite.internal.portable.GridBinaryObjectBuilderSelfTest; +import org.apache.ignite.internal.portable.GridBinaryObjectBuilderStringAsCharsAdditionalSelfTest; +import org.apache.ignite.internal.portable.GridBinaryObjectBuilderStringAsCharsSelfTest; import org.apache.ignite.internal.portable.GridPortableMarshallerCtxDisabledSelfTest; import org.apache.ignite.internal.portable.GridPortableMarshallerSelfTest; import org.apache.ignite.internal.portable.GridPortableMetaDataDisabledSelfTest; @@ -30,24 +30,24 @@ import org.apache.ignite.internal.portable.GridPortableMetaDataSelfTest; import org.apache.ignite.internal.portable.GridPortableWildcardsSelfTest; import org.apache.ignite.internal.portable.PortableCompactOffsetsHeapSelfTest; import org.apache.ignite.internal.portable.PortableCompactOffsetsOffheapSelfTest; -import org.apache.ignite.internal.portable.PortableFieldsHeapSelfTest; -import org.apache.ignite.internal.portable.PortableFieldsOffheapSelfTest; -import org.apache.ignite.internal.processors.cache.portable.GridCacheClientNodePortableMetadataMultinodeTest; -import org.apache.ignite.internal.processors.cache.portable.GridCacheClientNodePortableMetadataTest; +import org.apache.ignite.internal.portable.BinaryFieldsHeapSelfTest; +import org.apache.ignite.internal.portable.BinaryFieldsOffheapSelfTest; +import org.apache.ignite.internal.processors.cache.portable.GridCacheClientNodeBinaryObjectMetadataMultinodeTest; +import org.apache.ignite.internal.processors.cache.portable.GridCacheClientNodeBinaryObjectMetadataTest; import org.apache.ignite.internal.processors.cache.portable.GridCachePortableStoreObjectsSelfTest; import org.apache.ignite.internal.processors.cache.portable.GridCachePortableStorePortablesSelfTest; -import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortableObjectsAtomicNearDisabledOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortableObjectsAtomicNearDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortableObjectsAtomicOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortableObjectsAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortableObjectsPartitionedNearDisabledOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortableObjectsPartitionedNearDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortableObjectsPartitionedOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortableObjectsPartitionedSelfTest; -import org.apache.ignite.internal.processors.cache.portable.distributed.replicated.GridCachePortableObjectsReplicatedSelfTest; -import org.apache.ignite.internal.processors.cache.portable.local.GridCachePortableObjectsAtomicLocalSelfTest; -import org.apache.ignite.internal.processors.cache.portable.local.GridCachePortableObjectsLocalOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.portable.local.GridCachePortableObjectsLocalSelfTest; +import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest; +import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCacheBinaryObjectsAtomicOffheapTieredSelfTest; +import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCacheBinaryObjectsAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest; +import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest; +import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCacheBinaryObjectsPartitionedSelfTest; +import org.apache.ignite.internal.processors.cache.portable.distributed.replicated.GridCacheBinaryObjectsReplicatedSelfTest; +import org.apache.ignite.internal.processors.cache.portable.local.GridCacheBinaryObjectsAtomicLocalSelfTest; +import org.apache.ignite.internal.processors.cache.portable.local.GridCacheBinaryObjectsLocalOffheapTieredSelfTest; +import org.apache.ignite.internal.processors.cache.portable.local.GridCacheBinaryObjectsLocalSelfTest; /** * Test for portable objects stored in cache. @@ -62,12 +62,12 @@ public class IgnitePortableObjectsTestSuite extends TestSuite { suite.addTestSuite(GridPortableMarshallerSelfTest.class); suite.addTestSuite(GridPortableMarshallerCtxDisabledSelfTest.class); - suite.addTestSuite(GridPortableBuilderSelfTest.class); - suite.addTestSuite(GridPortableBuilderStringAsCharsSelfTest.class); - suite.addTestSuite(GridPortableBuilderAdditionalSelfTest.class); - suite.addTestSuite(GridPortableBuilderStringAsCharsAdditionalSelfTest.class); - suite.addTestSuite(PortableFieldsHeapSelfTest.class); - suite.addTestSuite(PortableFieldsOffheapSelfTest.class); + suite.addTestSuite(GridBinaryObjectBuilderSelfTest.class); + suite.addTestSuite(GridBinaryObjectBuilderStringAsCharsSelfTest.class); + suite.addTestSuite(GridBinaryObjectBuilderAdditionalSelfTest.class); + suite.addTestSuite(GridBinaryObjectBuilderStringAsCharsAdditionalSelfTest.class); + suite.addTestSuite(BinaryFieldsHeapSelfTest.class); + suite.addTestSuite(BinaryFieldsOffheapSelfTest.class); suite.addTestSuite(PortableCompactOffsetsHeapSelfTest.class); suite.addTestSuite(PortableCompactOffsetsOffheapSelfTest.class); suite.addTestSuite(GridPortableMetaDataSelfTest.class); @@ -75,25 +75,25 @@ public class IgnitePortableObjectsTestSuite extends TestSuite { suite.addTestSuite(GridPortableAffinityKeySelfTest.class); suite.addTestSuite(GridPortableWildcardsSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsLocalSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsAtomicLocalSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsReplicatedSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsPartitionedSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsPartitionedNearDisabledSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsAtomicSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsAtomicNearDisabledSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsLocalSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsAtomicLocalSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsReplicatedSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsPartitionedSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsAtomicSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsAtomicNearDisabledSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsLocalOffheapTieredSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsAtomicOffheapTieredSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsAtomicNearDisabledOffheapTieredSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsPartitionedOffheapTieredSelfTest.class); - suite.addTestSuite(GridCachePortableObjectsPartitionedNearDisabledOffheapTieredSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsLocalOffheapTieredSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsAtomicOffheapTieredSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest.class); suite.addTestSuite(GridCachePortableStoreObjectsSelfTest.class); suite.addTestSuite(GridCachePortableStorePortablesSelfTest.class); - suite.addTestSuite(GridCacheClientNodePortableMetadataTest.class); - suite.addTestSuite(GridCacheClientNodePortableMetadataMultinodeTest.class); + suite.addTestSuite(GridCacheClientNodeBinaryObjectMetadataTest.class); + suite.addTestSuite(GridCacheClientNodeBinaryObjectMetadataMultinodeTest.class); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 4c07132..d5efebf 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -1079,7 +1079,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { throw new IgniteCheckedException("Found duplicated properties with the same name [keyType=" + type.keyClass().getName() + ", valueType=" + type.valueClass().getName() + "]"); - String ptrn = "Name ''{0}'' is reserved and cannot be used as a field name [class=" + type + "]"; + String ptrn = "Name ''{0}'' is reserved and cannot be used as a field name [type=" + type.name() + "]"; for (String name : names) { if (name.equals(KEY_FIELD_NAME) || name.equals(VAL_FIELD_NAME)) @@ -1585,23 +1585,6 @@ public class IgniteH2Indexing implements GridQueryIndexing { } } - /** {@inheritDoc} */ - @Override public boolean isSqlType(Class<?> cls) { - switch (DBTypeEnum.fromClass(cls)) { - case OTHER: - case ARRAY: - return false; - - default: - return true; - } - } - - /** {@inheritDoc} */ - @Override public boolean isGeometryClass(Class<?> cls) { - return DataType.isGeometryClass(cls); - } - /** * Enum that helps to map java types to database types. */ @@ -1686,8 +1669,6 @@ public class IgniteH2Indexing implements GridQueryIndexing { map.put(Timestamp.class, TIMESTAMP); map.put(java.util.Date.class, TIMESTAMP); map.put(java.sql.Date.class, DATE); - map.put(char.class, CHAR); - map.put(Character.class, CHAR); map.put(String.class, VARCHAR); map.put(UUID.class, UUID); map.put(byte[].class, BINARY); @@ -2272,7 +2253,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { if (v == null) return null; - return v.value(cctx.cacheObjectContext(), false); + return v; } /** {@inheritDoc} */ @@ -2318,4 +2299,4 @@ public class IgniteH2Indexing implements GridQueryIndexing { return preferSwapVal; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java index d790d34..fd0e6ed 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java @@ -104,7 +104,7 @@ public class GridH2ValueCacheObject extends Value { /** {@inheritDoc} */ @Override public byte[] getBytesNoCopy() { - if (obj.type() == CacheObject.TYPE_REGULAR) { + if (obj.cacheObjectType() == CacheObject.TYPE_REGULAR) { // Result must be the same as `marshaller.marshall(obj.value(coctx, false));` try { return obj.valueBytes(objectContext()); @@ -114,13 +114,13 @@ public class GridH2ValueCacheObject extends Value { } } - // For portables and byte array cache object types. - return Utils.serialize(obj.value(objectContext(), false), null); + // For user-provided and array types. + return Utils.serialize(obj, null); } /** {@inheritDoc} */ @Override public Object getObject() { - return obj.value(objectContext(), false); + return obj.isPlatformType() ? obj.value(objectContext(), false) : obj; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java index 85cf822..957e5f6 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java @@ -164,8 +164,8 @@ public class GridLuceneIndex implements Closeable { public void store(CacheObject k, CacheObject v, byte[] ver, long expires) throws IgniteCheckedException { CacheObjectContext coctx = objectContext(); - Object key = k.value(coctx, false); - Object val = v.value(coctx, false); + Object key = k.isPlatformType() ? k.value(coctx, false) : k; + Object val = v.isPlatformType() ? v.value(coctx, false) : v; Document doc = new Document(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java index 17f929a..9ccb893 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java @@ -143,7 +143,8 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA } } - cache.setIndexedTypes(indexedTypes.toArray(new Class[indexedTypes.size()])); + if (!indexedTypes.isEmpty()) + cache.setIndexedTypes(indexedTypes.toArray(new Class[indexedTypes.size()])); if (cacheMode() == PARTITIONED) cache.setBackups(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapTieredMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapTieredMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapTieredMultithreadedSelfTest.java index ecd7229..ab6af45 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapTieredMultithreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapTieredMultithreadedSelfTest.java @@ -17,10 +17,7 @@ package org.apache.ignite.internal.processors.cache; -import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; +import java.io.Serializable; import java.util.Collection; import java.util.concurrent.Callable; import java.util.concurrent.ThreadLocalRandom; @@ -155,7 +152,7 @@ public class IgniteCacheOffheapTieredMultithreadedSelfTest extends GridCommonAbs /** * Person record used for query test. */ - public static class Person implements Externalizable { + public static class Person implements Serializable { /** Person ID. */ @QuerySqlField(index = true) private int id; @@ -283,24 +280,6 @@ public class IgniteCacheOffheapTieredMultithreadedSelfTest extends GridCommonAbs } /** {@inheritDoc} */ - @Override public void writeExternal(ObjectOutput out) throws IOException { - out.writeInt(id); - out.writeInt(orgId); - out.writeUTF(firstName); - out.writeUTF(lastName); - out.writeDouble(salary); - } - - /** {@inheritDoc} */ - @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - id = in.readInt(); - orgId = in.readInt(); - firstName = in.readUTF(); - lastName = in.readUTF(); - salary = in.readDouble(); - } - - /** {@inheritDoc} */ @Override public boolean equals(Object o) { return this == o || (o instanceof Person) && id == ((Person)o).id; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java index 07fa2bc..01c2db2 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java @@ -23,6 +23,8 @@ import javax.cache.CacheException; import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.lang.IgniteBiPredicate; /** @@ -51,10 +53,10 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm try { jcache(0).query(new SqlQuery<TestKey, String>(String.class, "field like '" + key + "'")).getAll(); - fail("p2p marshalling failed, but error response was not sent"); + assertTrue("p2p marshalling failed, but error response was not sent", portableMarshaller()); } catch (CacheException e) { - // No-op + assertFalse("Unexpected exception: " + e, portableMarshaller()); } } @@ -77,10 +79,19 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm } })).getAll(); - fail("Request unmarshalling failed, but error response was not sent."); + assertTrue("Request unmarshalling failed, but error response was not sent.", portableMarshaller()); } catch (Exception e) { - // No-op. + assertFalse("Unexpected exception: " + e, portableMarshaller()); } } + + /** + * @return {@code True} if portable marshaller is configured. + */ + private boolean portableMarshaller() { + IgniteEx kernal = (IgniteKernal)ignite(0); + + return "PortableMarshaller".equals(kernal.context().config().getMarshaller().getClass().getSimpleName()); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java index 7324e62..42f4c6e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java @@ -18,9 +18,6 @@ package org.apache.ignite.internal.processors.cache; import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; @@ -43,7 +40,6 @@ import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.CAX; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; -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; @@ -220,7 +216,7 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon } /** Test class. */ - private static class PersonObj implements Externalizable { + private static class PersonObj { /** */ @GridToStringExclude private UUID id = UUID.randomUUID(); @@ -279,22 +275,6 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon } /** {@inheritDoc} */ - @Override public void writeExternal(ObjectOutput out) throws IOException { - U.writeUuid(out, id); - U.writeString(out, name); - out.writeInt(salary); - U.writeString(out, degree); - } - - /** {@inheritDoc} */ - @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - id = U.readUuid(in); - name = U.readString(in); - salary = in.readInt(); - degree = U.readString(in); - } - - /** {@inheritDoc} */ @Override public int hashCode() { return id.hashCode() + 31 * name.hashCode() + 31 * 31 * salary; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java index acfe3b6..194fb82 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java @@ -565,11 +565,16 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract } /** {@inheritDoc} */ - @Override public byte type() { + @Override public byte cacheObjectType() { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ + @Override public boolean isPlatformType() { + return true; + } + + /** {@inheritDoc} */ @Override public CacheObject prepareForCache(CacheObjectContext ctx) { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs index ca85a2a..26a142b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs @@ -342,7 +342,7 @@ namespace Apache.Ignite.Core.Tests.Cache [TearDown] public virtual void AfterTest() { for (int i = 0; i < GridCount(); i++) - Cache(i).RemoveAll(); + Cache(i).WithKeepPortable<object, object>().RemoveAll(); for (int i = 0; i < GridCount(); i++) { http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml index 183676b..0ad0070 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml @@ -72,13 +72,13 @@ <bean class="org.apache.ignite.marshaller.portable.PortableMarshaller"> <property name="typeConfigurations"> <list> - <bean class="org.apache.ignite.portable.PortableTypeConfiguration"> + <bean class="org.apache.ignite.binary.BinaryTypeConfiguration"> <property name="className" value="org.apache.ignite.platform.PlatformComputePortable"/> </bean> - <bean class="org.apache.ignite.portable.PortableTypeConfiguration"> + <bean class="org.apache.ignite.binary.BinaryTypeConfiguration"> <property name="className" value="org.apache.ignite.platform.PlatformComputeJavaPortable"/> </bean> - <bean class="org.apache.ignite.portable.PortableTypeConfiguration"> + <bean class="org.apache.ignite.binary.BinaryTypeConfiguration"> <property name="className" value="org.apache.ignite.platform.PlatformComputeEnum"/> </bean> </list> http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java index ad7de45..c7667d2 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java @@ -355,10 +355,10 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea } /** {@inheritDoc} */ - @Override public IgnitePortables portables() { + @Override public IgniteBinary binary() { assert g != null; - return g.portables(); + return g.binary(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java index efb71d6..f457e7e 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java @@ -21,16 +21,16 @@ import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryReader; +import org.apache.ignite.binary.BinaryWriter; +import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.cache.query.annotations.QuerySqlField; -import org.apache.ignite.portable.PortableException; -import org.apache.ignite.portable.PortableMarshalAware; -import org.apache.ignite.portable.PortableReader; -import org.apache.ignite.portable.PortableWriter; /** * Organization record used for query test. */ -public class Organization implements Externalizable, PortableMarshalAware { +public class Organization implements Externalizable, Binarylizable { /** Organization ID. */ @QuerySqlField(index = true) private int id; @@ -98,13 +98,13 @@ public class Organization implements Externalizable, PortableMarshalAware { } /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { writer.writeInt("id", id); writer.writeString("name", name); } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { id = reader.readInt("id"); name = reader.readString("name"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java index e826d65..e59ba19 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java @@ -21,16 +21,16 @@ import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryReader; +import org.apache.ignite.binary.BinaryWriter; +import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.cache.query.annotations.QuerySqlField; -import org.apache.ignite.portable.PortableException; -import org.apache.ignite.portable.PortableMarshalAware; -import org.apache.ignite.portable.PortableReader; -import org.apache.ignite.portable.PortableWriter; /** * Person record used for query test. */ -public class Person implements Externalizable, PortableMarshalAware { +public class Person implements Externalizable, Binarylizable { /** Person ID. */ @QuerySqlField(index = true) private int id; @@ -176,7 +176,7 @@ public class Person implements Externalizable, PortableMarshalAware { } /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { writer.writeInt("id", id); writer.writeInt("orgId", orgId); writer.writeString("firstName", firstName); @@ -185,7 +185,7 @@ public class Person implements Externalizable, PortableMarshalAware { } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { id = reader.readInt("id"); orgId = reader.readInt("orgId"); firstName = reader.readString("firstName"); http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/SampleKey.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/SampleKey.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/SampleKey.java index 5fa9dea..e089696 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/SampleKey.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/SampleKey.java @@ -21,15 +21,15 @@ import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import org.apache.ignite.portable.PortableException; -import org.apache.ignite.portable.PortableMarshalAware; -import org.apache.ignite.portable.PortableReader; -import org.apache.ignite.portable.PortableWriter; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryReader; +import org.apache.ignite.binary.BinaryWriter; +import org.apache.ignite.binary.Binarylizable; /** * Key class for benchmark. */ -public class SampleKey implements Externalizable, PortableMarshalAware { +public class SampleKey implements Externalizable, Binarylizable { /** */ private int id; @@ -70,12 +70,12 @@ public class SampleKey implements Externalizable, PortableMarshalAware { } /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { writer.writeInt("id", id); } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { id = reader.readInt("id"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/SampleValue.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/SampleValue.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/SampleValue.java index f15d671..b28862c 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/SampleValue.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/SampleValue.java @@ -21,15 +21,15 @@ import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import org.apache.ignite.portable.PortableException; -import org.apache.ignite.portable.PortableMarshalAware; -import org.apache.ignite.portable.PortableReader; -import org.apache.ignite.portable.PortableWriter; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryReader; +import org.apache.ignite.binary.BinaryWriter; +import org.apache.ignite.binary.Binarylizable; /** * Entity class for benchmark. */ -public class SampleValue implements Externalizable, PortableMarshalAware { +public class SampleValue implements Externalizable, Binarylizable { /** */ private int id; @@ -70,12 +70,12 @@ public class SampleValue implements Externalizable, PortableMarshalAware { } /** {@inheritDoc} */ - @Override public void writePortable(PortableWriter writer) throws PortableException { + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { writer.writeInt("id", id); } /** {@inheritDoc} */ - @Override public void readPortable(PortableReader reader) throws PortableException { + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { id = reader.readInt("id"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b783d2b7/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 06dfd70..07c1847 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -320,8 +320,8 @@ <packages>org.apache.ignite.marshaller*</packages> </group> <group> - <title>Portable Objects API</title> - <packages>org.apache.ignite.portable*</packages> + <title>Ignite Binary Objects API</title> + <packages>org.apache.ignite.binary*</packages> </group> <group> <title>Visor Plugins</title> @@ -749,7 +749,8 @@ <exclude>**/configure.ac</exclude> <exclude>**/*.pc.in</exclude> <exclude>**/*.sln</exclude> - <exclude>**/*.slnrel</exclude> + <exclude>**/*.snk</exclude> + <exclude>**/*.slnrel</exclude> <exclude>**/*.sln.DotSettings</exclude> <exclude>**/*.FxCop</exclude> <exclude>**/*.csproj</exclude>
