Merge branch 'ignite-1.7.5' # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java # modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java # modules/core/src/main/resources/META-INF/classnames.properties # modules/platforms/cpp/configure.ac # modules/platforms/cpp/configure.acrel # modules/platforms/cpp/examples/configure.ac # modules/platforms/cpp/odbc/install/ignite-odbc-amd64.wxs # modules/platforms/cpp/odbc/install/ignite-odbc-x86.wxs # modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesCodeConfigurationTest.cs # modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Linq/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.Log4Net/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite.NLog/Properties/AssemblyInfo.cs # modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs # modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs # modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs # modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/beb242bc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/beb242bc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/beb242bc Branch: refs/heads/ignite-gg-11810-1 Commit: beb242bc22aa7ca6c068fd59a09965fa5967177e Parents: d62542b 6c38eb2 Author: devozerov <voze...@gridgain.com> Authored: Thu Jan 5 11:44:55 2017 +0300 Committer: devozerov <voze...@gridgain.com> Committed: Thu Jan 5 11:44:55 2017 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteLogger.java | 4 +- .../apache/ignite/IgniteSystemProperties.java | 13 + .../ignite/cache/affinity/AffinityKey.java | 4 +- .../org/apache/ignite/events/CacheEvent.java | 6 +- .../ignite/events/CacheQueryReadEvent.java | 8 +- .../ignite/internal/binary/BinaryContext.java | 4 +- .../internal/binary/BinaryEnumObjectImpl.java | 10 +- .../ignite/internal/binary/BinaryMetadata.java | 5 +- .../internal/binary/BinaryObjectExImpl.java | 8 +- .../ignite/internal/binary/BinaryTypeProxy.java | 15 +- .../ignite/internal/binary/BinaryUtils.java | 4 +- .../cache/CacheInvokeDirectResult.java | 2 +- .../processors/cache/CacheInvokeResult.java | 2 +- .../processors/cache/CacheLazyEntry.java | 4 +- .../processors/cache/CacheObjectAdapter.java | 7 +- .../processors/cache/GridCacheAdapter.java | 5 +- .../cache/GridCacheMvccCandidate.java | 9 +- .../processors/cache/GridCacheReturn.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 2 +- .../distributed/near/GridNearLockFuture.java | 2 +- .../cache/query/GridCacheQueryAdapter.java | 4 +- .../cache/query/GridCacheQueryManager.java | 13 +- .../cache/query/GridCacheQueryRequest.java | 2 + .../cache/query/GridCacheSqlQuery.java | 4 +- .../continuous/CacheContinuousQueryEvent.java | 8 +- .../continuous/CacheContinuousQueryManager.java | 4 +- .../store/GridCacheStoreManagerAdapter.java | 30 +- .../cache/store/GridCacheWriteBehindStore.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 11 +- .../GridCacheVersionConflictContext.java | 2 +- .../closure/GridClosureProcessor.java | 4 +- .../continuous/GridContinuousMessage.java | 2 +- .../datastructures/CollocatedSetItemKey.java | 2 +- .../GridCacheAtomicLongValue.java | 2 + .../GridCacheAtomicSequenceImpl.java | 2 + .../GridCacheAtomicSequenceValue.java | 2 + .../GridCacheCountDownLatchValue.java | 3 + .../datastructures/GridCacheSetItemKey.java | 2 +- .../internal/processors/job/GridJobWorker.java | 7 +- .../odbc/OdbcQueryExecuteRequest.java | 6 +- .../platform/PlatformNativeException.java | 3 +- .../processors/query/GridQueryProcessor.java | 35 +- .../processors/rest/GridRestResponse.java | 2 +- .../internal/util/future/GridFutureAdapter.java | 2 +- .../util/lang/GridMetadataAwareAdapter.java | 2 +- .../util/tostring/GridToStringBuilder.java | 656 +++++++++++++++++-- .../util/tostring/GridToStringInclude.java | 12 +- .../util/tostring/GridToStringThreadLocal.java | 12 +- .../query/VisorQueryScanSubstringFilter.java | 5 +- .../internal/visor/query/VisorQueryUtils.java | 60 ++ .../apache/ignite/spi/indexing/IndexingSpi.java | 3 + .../resources/META-INF/classnames.properties | 1 + .../internal/binary/BinaryEnumsSelfTest.java | 18 + .../GridCacheBinaryObjectsAbstractSelfTest.java | 7 +- .../cache/query/IndexingSpiQuerySelfTest.java | 199 +++++- .../tostring/GridToStringBuilderSelfTest.java | 33 +- .../hadoop/impl/igfs/HadoopIgfsJclLogger.java | 9 +- .../org/apache/ignite/logger/jcl/JclLogger.java | 9 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Query/CacheQueriesCodeConfigurationTest.cs | 4 +- .../Properties/AssemblyInfo.cs | 2 +- .../apache/ignite/logger/slf4j/Slf4jLogger.java | 11 +- 64 files changed, 1145 insertions(+), 174 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java index 4d85c54,0da0f49..083bb72 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@@ -500,17 -502,17 +505,25 @@@ public final class IgniteSystemProperti * <p> * Defaults to {@code} false, meaning that unaligned access will be performed only on x86 architecture. */ - public static final String IGNITE_UNALIGNED_MEMORY_ACCESS = "IGNITE_UNALIGNED_MEMORY_ACCESS"; + public static final String IGNITE_MEMORY_UNALIGNED_ACCESS = "IGNITE_MEMORY_UNALIGNED_ACCESS"; + + /** + * When unsafe memory copy if performed below this threshold, Ignite will do it on per-byte basis instead of + * calling to Unsafe.copyMemory(). + * <p> + * Defaults to 0, meaning that threshold is disabled. + */ + public static final String IGNITE_MEMORY_PER_BYTE_COPY_THRESHOLD = "IGNITE_MEMORY_PER_BYTE_COPY_THRESHOLD"; /** + * When set to {@code true} BinaryObject will be unwrapped before passing to IndexingSpi to preserve + * old behavior query processor with IndexingSpi. + * <p> + * @deprecated Should be removed in Apache Ignite 2.0. + */ + public static final String IGNITE_UNWRAP_BINARY_FOR_INDEXING_SPI = "IGNITE_UNWRAP_BINARY_FOR_INDEXING_SPI"; + + /** * Enforces singleton. */ private IgniteSystemProperties() { http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java index b80f573,5f1e3e9..5b5aeba --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java @@@ -27,9 -26,10 +27,10 @@@ import org.apache.ignite.binary.BinaryA import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryIdentityResolver; import org.apache.ignite.binary.BinaryType; import org.apache.ignite.internal.binary.builder.BinaryObjectBuilderImpl; -import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory; + import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.SB; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 1594cee,6c093ee..58f94f4 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@@ -44,9 -44,9 +44,10 @@@ import javax.cache.Cache import javax.cache.CacheException; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; + import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.binary.BinaryField; import org.apache.ignite.binary.BinaryObject; +import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.binary.BinaryType; import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.cache.CacheTypeMetadata; http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- diff --cc modules/core/src/main/resources/META-INF/classnames.properties index 4d0b931,8a6dc66..212e94a --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@@ -724,11 -719,9 +724,12 @@@ org.apache.ignite.internal.processors.c org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysResponse org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandMessage org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$1 +org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$1$1 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$2 +org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$3 + org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$3$1 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$4$1 +org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$5$1 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$DemandWorker$1 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemander$DemandWorker$2 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java index 2a177ff,bf72782..c9f50d1 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java @@@ -65,10 -58,9 +65,11 @@@ import org.apache.ignite.binary.BinaryF import org.apache.ignite.internal.processors.cache.GridCacheAdapter; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; +import org.apache.ignite.internal.processors.cache.MapCacheStoreStrategy; +import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.P2; import org.apache.ignite.internal.util.typedef.internal.CU; + import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs index 1bca0e8,d6cb3df..f5fa618 --- a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * 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. http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs index 0926a46,9bd5c47..d72c9db --- a/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs @@@ -1,4 -1,4 +1,4 @@@ --/* ++/* * 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. http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesCodeConfigurationTest.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb242bc/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs index 1fc6c59,7bf322f..cc833ea --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs @@@ -1,19 -1,19 +1,19 @@@ - /* -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ++/* +* 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. +*/ using System.Reflection; using System.Runtime.InteropServices;