Merge remote-tracking branch 'upstream/gridgain-7.6.1' into gridgain-7.6.1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ca0bc87 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ca0bc87 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ca0bc87 Branch: refs/heads/ignite-1232 Commit: 3ca0bc877bf356eca93c9c9a5e225362c2b58769 Parents: 68b25df 482015e Author: vozerov-gridgain <[email protected]> Authored: Tue Jun 21 17:11:37 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Jun 21 17:11:37 2016 +0300 ---------------------------------------------------------------------- modules/clients/pom.xml | 8 - .../client/ClientDefaultCacheSelfTest.java | 119 +- .../ignite/internal/client/ClientHttpTask.java | 33 +- .../ignite/internal/client/ClientTcpTask.java | 10 +- .../integration/ClientAbstractSelfTest.java | 92 +- .../JettyRestProcessorAbstractSelfTest.java | 1018 ++++++++---------- .../internal/processors/rest/SimplePerson.java | 74 ++ modules/core/pom.xml | 15 +- .../apache/ignite/internal/LessNamingBean.java | 28 + .../ignite/internal/MarshallerContextImpl.java | 29 +- .../cache/query/GridCacheSqlIndexMetadata.java | 3 +- .../cache/query/GridCacheSqlMetadata.java | 3 +- .../internal/util/IgniteExceptionRegistry.java | 5 +- .../ignite/internal/visor/cache/VisorCache.java | 4 +- .../cache/VisorCacheAffinityConfiguration.java | 5 +- .../cache/VisorCacheAggregatedMetrics.java | 3 +- .../visor/cache/VisorCacheConfiguration.java | 3 +- .../cache/VisorCacheDefaultConfiguration.java | 5 +- .../cache/VisorCacheEvictionConfiguration.java | 5 +- .../internal/visor/cache/VisorCacheMetrics.java | 3 +- .../cache/VisorCacheNearConfiguration.java | 5 +- .../visor/cache/VisorCachePartition.java | 3 +- .../visor/cache/VisorCachePartitions.java | 3 +- .../cache/VisorCacheQueryConfiguration.java | 3 +- .../visor/cache/VisorCacheQueryMetrics.java | 5 +- .../cache/VisorCacheRebalanceConfiguration.java | 5 +- .../cache/VisorCacheStoreConfiguration.java | 3 +- .../cache/VisorCacheTypeFieldMetadata.java | 3 +- .../visor/cache/VisorCacheTypeMetadata.java | 3 +- .../internal/visor/cache/VisorCacheV4.java | 124 +++ .../internal/visor/debug/VisorThreadInfo.java | 5 +- .../visor/debug/VisorThreadLockInfo.java | 5 +- .../internal/visor/event/VisorGridEvent.java | 5 +- .../internal/visor/file/VisorFileBlock.java | 5 +- .../ignite/internal/visor/igfs/VisorIgfs.java | 5 +- .../internal/visor/igfs/VisorIgfsEndpoint.java | 5 +- .../internal/visor/igfs/VisorIgfsMetrics.java | 5 +- .../visor/igfs/VisorIgfsProfilerEntry.java | 5 +- .../VisorIgfsProfilerUniformityCounters.java | 5 +- .../visor/log/VisorLogSearchResult.java | 5 +- .../visor/node/VisorAtomicConfiguration.java | 5 +- .../visor/node/VisorBasicConfiguration.java | 5 +- .../node/VisorExecutorServiceConfiguration.java | 5 +- .../visor/node/VisorGridConfiguration.java | 5 +- .../visor/node/VisorIgfsConfiguration.java | 3 +- .../visor/node/VisorLifecycleConfiguration.java | 5 +- .../visor/node/VisorMetricsConfiguration.java | 5 +- .../visor/node/VisorNodeDataCollectorJob.java | 26 +- .../node/VisorNodeDataCollectorTaskResult.java | 5 +- .../node/VisorPeerToPeerConfiguration.java | 5 +- .../visor/node/VisorRestConfiguration.java | 5 +- .../node/VisorSegmentationConfiguration.java | 5 +- .../visor/node/VisorSpisConfiguration.java | 5 +- .../node/VisorTransactionConfiguration.java | 5 +- .../internal/visor/query/VisorQueryField.java | 5 +- .../internal/visor/query/VisorQueryResult.java | 5 +- .../plugin/security/SecurityPermissionSet.java | 5 +- .../ignite/plugin/security/SecuritySubject.java | 5 +- modules/rest-http/pom.xml | 25 +- .../http/jetty/GridJettyJsonConfig.java | 317 ------ .../http/jetty/GridJettyObjectMapper.java | 274 +++++ .../http/jetty/GridJettyRestHandler.java | 127 +-- .../IgniteCacheRandomOperationBenchmark.java | 539 +++++----- .../cache/load/model/key/Identifier.java | 6 + .../yardstick/cache/load/model/key/Mark.java | 7 + .../yardstick/cache/load/model/value/Car.java | 6 + .../yardstick/cache/load/model/value/Truck.java | 12 +- .../ignite/yardstick/cache/model/Account.java | 6 + .../ignite/yardstick/cache/model/Person1.java | 2 +- .../ignite/yardstick/cache/model/Person2.java | 2 +- .../ignite/yardstick/cache/model/SampleKey.java | 2 +- .../yardstick/cache/model/SampleValue.java | 2 +- .../zk/TcpDiscoveryZookeeperIpFinder.java | 19 +- parent/pom.xml | 1 + 74 files changed, 1673 insertions(+), 1455 deletions(-) ----------------------------------------------------------------------
