Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 71FD71832A for ; Wed, 21 Oct 2015 14:50:03 +0000 (UTC) Received: (qmail 96883 invoked by uid 500); 21 Oct 2015 14:49:53 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 96847 invoked by uid 500); 21 Oct 2015 14:49:53 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 96837 invoked by uid 99); 21 Oct 2015 14:49:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Oct 2015 14:49:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BDF3BE0451; Wed, 21 Oct 2015 14:49:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Wed, 21 Oct 2015 14:49:53 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/20] ignite git commit: Revert "ignite-1462: hid portable API in 1.4 release" This reverts commit 71379a8061f50f336adc31fa20cd593b659b050f. Repository: ignite Updated Branches: refs/heads/ignite-1651 82113575f -> 4f8236440 http://git-wip-us.apache.org/repos/asf/ignite/blob/e7eb2b37/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java new file mode 100644 index 0000000..27ac436 --- /dev/null +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java @@ -0,0 +1,117 @@ +/* + * 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.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest; +import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsDistributedSelfTest; +import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsLocalSelfTest; +import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsDistributedSelfTest; +import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsLocalSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheQueryIndexDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheQueryIndexingDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheReduceQueryMultithreadedSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheFieldsQueryNoDataSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheLargeResultSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapTieredMultithreadedSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheP2pUnmarshallingQueryErrorTest; +import org.apache.ignite.internal.processors.cache.IgniteCachePartitionedQueryMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheQueryEvictsMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortableDuplicateIndexObjectPartitionedAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.portable.distributed.dht.GridCachePortableDuplicateIndexObjectPartitionedTransactionalSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicNearEnabledSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicP2PDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryLocalAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryPartitionedOnlySelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedAtomicSelfTest; +import org.apache.ignite.internal.processors.query.h2.sql.BaseH2CompareQueryTest; +import org.apache.ignite.internal.processors.query.h2.sql.GridQueryParsingTest; +import org.apache.ignite.internal.processors.query.h2.sql.H2CompareBigQueryTest; +import org.apache.ignite.marshaller.portable.PortableMarshaller; +import org.apache.ignite.spi.communication.tcp.GridOrderedMessageCancelSelfTest; +import org.apache.ignite.testframework.config.GridTestProperties; + +/** + * Cache query suite with portable marshaller. + */ +public class IgnitePortableCacheQueryTestSuite extends TestSuite { + /** + * @return Suite. + * @throws Exception In case of error. + */ + public static TestSuite suite() throws Exception { + GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, PortableMarshaller.class.getName()); + + TestSuite suite = new TestSuite("Grid Cache Query Test Suite using PortableMarshaller"); + + // Parsing + suite.addTestSuite(GridQueryParsingTest.class); + + // Queries tests. + suite.addTestSuite(GridCacheQueryIndexDisabledSelfTest.class); + suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class); + suite.addTestSuite(IgniteCacheLargeResultSelfTest.class); + suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class); + suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class); + suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class); + + suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class); + suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class); + + + // Fields queries. + suite.addTestSuite(IgniteCacheFieldsQueryNoDataSelfTest.class); + + // Continuous queries. + suite.addTestSuite(GridCacheContinuousQueryLocalAtomicSelfTest.class); + suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicSelfTest.class); + suite.addTestSuite(GridCacheContinuousQueryPartitionedOnlySelfTest.class); + suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class); + suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class); + suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class); + + suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class); + + //Should be adjusted. Not ready to be used with PortableMarshaller. + //suite.addTestSuite(GridCachePortableSwapScanQuerySelfTest.class); + + suite.addTestSuite(GridOrderedMessageCancelSelfTest.class); + + // Ignite cache and H2 comparison. + suite.addTestSuite(BaseH2CompareQueryTest.class); + suite.addTestSuite(H2CompareBigQueryTest.class); + + // Metrics tests + suite.addTestSuite(CacheLocalQueryMetricsSelfTest.class); + suite.addTestSuite(CachePartitionedQueryMetricsDistributedSelfTest.class); + suite.addTestSuite(CachePartitionedQueryMetricsLocalSelfTest.class); + suite.addTestSuite(CacheReplicatedQueryMetricsDistributedSelfTest.class); + suite.addTestSuite(CacheReplicatedQueryMetricsLocalSelfTest.class); + + //Unmarshallig query test. + suite.addTestSuite(IgniteCacheP2pUnmarshallingQueryErrorTest.class); + + suite.addTestSuite(GridCachePortableDuplicateIndexObjectPartitionedAtomicSelfTest.class); + suite.addTestSuite(GridCachePortableDuplicateIndexObjectPartitionedTransactionalSelfTest.class); + + return suite; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/e7eb2b37/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java index 738f910..3895506 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java @@ -37,7 +37,6 @@ import org.apache.ignite.internal.portable.GridPortableMarshaller; import org.apache.ignite.internal.portable.PortableMetaDataImpl; import org.apache.ignite.internal.portable.PortableRawReaderEx; import org.apache.ignite.internal.portable.PortableRawWriterEx; -import org.apache.ignite.internal.portable.api.PortableMetadata; import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl; import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter; import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilterImpl; @@ -71,6 +70,7 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.T4; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.portable.PortableMetadata; import org.jetbrains.annotations.Nullable; import java.util.Collection; @@ -373,7 +373,7 @@ public class PlatformContextImpl implements PlatformContext { writer.writeInt(metas.size()); - for (PortableMetadata m : metas) + for (org.apache.ignite.portable.PortableMetadata m : metas) writeMetadata0(writer, cacheObjProc.typeId(m.typeName()), m); } http://git-wip-us.apache.org/repos/asf/ignite/blob/e7eb2b37/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java index 9e092c5..638b4b1 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java @@ -33,7 +33,7 @@ import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgniteInClosure; -import org.apache.ignite.internal.portable.api.PortableObject; +import org.apache.ignite.portable.PortableObject; import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBGRID; http://git-wip-us.apache.org/repos/asf/ignite/blob/e7eb2b37/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java index ee8f9a3..d95a82b 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.processors.platform.PlatformAbstractConfigurat import org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManagerImpl; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.internal.portable.api.PortableMarshaller; +import org.apache.ignite.marshaller.portable.PortableMarshaller; import org.apache.ignite.platform.cpp.PlatformCppConfiguration; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/ignite/blob/e7eb2b37/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java index 21cd01a..6e03dfe 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java @@ -36,10 +36,10 @@ import org.apache.ignite.internal.processors.platform.utils.PlatformUtils; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lifecycle.LifecycleBean; import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.internal.portable.api.PortableMarshaller; +import org.apache.ignite.marshaller.portable.PortableMarshaller; import org.apache.ignite.platform.dotnet.PlatformDotNetLifecycleBean; -import org.apache.ignite.internal.portable.api.PortableException; -import org.apache.ignite.internal.portable.api.PortableMetadata; +import org.apache.ignite.portable.PortableException; +import org.apache.ignite.portable.PortableMetadata; import java.util.ArrayList; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/ignite/blob/e7eb2b37/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml ---------------------------------------------------------------------- diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml index 6164ef3..183676b 100644 --- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml +++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml @@ -69,16 +69,16 @@ - + - + - + - + http://git-wip-us.apache.org/repos/asf/ignite/blob/e7eb2b37/modules/platform/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java b/modules/platform/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java index 9b90209..0e8b825 100644 --- a/modules/platform/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java +++ b/modules/platform/src/test/java/org/apache/ignite/platform/PlatformComputePortableArgTask.java @@ -24,10 +24,9 @@ import org.apache.ignite.compute.ComputeJob; import org.apache.ignite.compute.ComputeJobAdapter; import org.apache.ignite.compute.ComputeJobResult; import org.apache.ignite.compute.ComputeTaskAdapter; -import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.portable.api.PortableMetadata; -import org.apache.ignite.internal.portable.api.PortableObject; +import org.apache.ignite.portable.PortableMetadata; +import org.apache.ignite.portable.PortableObject; import org.apache.ignite.resources.IgniteInstanceResource; import org.jetbrains.annotations.Nullable; @@ -90,8 +89,7 @@ public class PlatformComputePortableArgTask extends ComputeTaskAdapterorg.apache.ignite.marshaller* + Portable Objects API + org.apache.ignite.portable* + + Visor Plugins org.apache.ignite.visor.plugin @@ -708,6 +712,10 @@ dev-tools/.gradle/**/* dev-tools/gradle/wrapper/**/* dev-tools/gradlew + src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.pom + src/test/portables/repo/org/apache/ignite/portable/test2/maven-metadata-local.xml + src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.pom + src/test/portables/repo/org/apache/ignite/portable/test1/maven-metadata-local.xml ipc/shmem/**/Makefile.in ipc/shmem/**/Makefile @@ -737,6 +745,8 @@ src/main/java/META-INF/services/org.apache.ignite.internal.processors.platform.PlatformBootstrapFactory src/main/resources/META-INF/services/org.apache.ignite.internal.processors.platform.PlatformBootstrapFactory src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj + src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.jar + src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.jar **/Makefile.am **/configure.ac **/*.pc.in