You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2020/08/03 17:54:03 UTC

[geode] 01/01: Merge branch 'develop' into prClear

This is an automated email from the ASF dual-hosted git repository.

jinmeiliao pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 785ca1327017df34a20278445ad2b1db35d94ee4
Merge: b941d7f 54421c4
Author: Jinmei Liao <ji...@pivotal.io>
AuthorDate: Mon Aug 3 10:41:37 2020 -0700

    Merge branch 'develop' into prClear

 .gitignore                                         |   1 +
 ci/pipelines/geode-build/jinja.template.yml        |   5 +-
 ci/pipelines/images/jinja.template.yml             |  41 ++++
 ci/pipelines/mass-test-run/jinja.template.yml      |   1 +
 ci/pipelines/meta/deploy_meta.sh                   |  41 +++-
 ci/pipelines/meta/jinja.template.yml               |   2 +-
 ci/pipelines/shared/jinja.variables.yml            |   5 +-
 ci/scripts/run_benchmarks.sh                       |   9 +-
 .../catalina/Tomcat6DeltaSessionManager.java       |   4 +-
 geode-assembly/build.gradle                        |   5 +-
 geode-assembly/src/main/dist/LICENSE               |   4 +-
 .../management/OperationManagementUpgradeTest.java | 123 +++++++++++
 .../RollingUpgradeWithGfshDUnitTest.java           |   2 +-
 .../source/subnavs/geode-subnav.erb                |   3 -
 .../ClusterDistributionManagerDUnitTest.java       |  28 +++
 ...PartitioningWithTransactionDistributedTest.java |   4 +-
 .../geode/internal/AvailablePortJUnitTest.java     |  12 +-
 .../cache/query/internal/CompiledComparison.java   |  13 +-
 .../query/internal/index/CompactRangeIndex.java    |   2 +-
 .../geode/cache/wan/GatewaySenderFactory.java      |   7 +-
 .../internal/ClusterDistributionManager.java       |  76 +++----
 .../distributed/internal/StartupOperation.java     |   1 -
 .../apache/geode/internal/cache/DiskInitFile.java  |   4 +-
 .../org/apache/geode/internal/cache/Oplog.java     |   8 +-
 .../geode/internal/cache/PartitionedRegion.java    |   6 +-
 .../internal/cache/PrimaryBucketLockException.java |  31 +++
 .../tier/sockets/command/RegisterInterest.java     |  55 ++---
 .../tier/sockets/command/RegisterInterest61.java   |  60 ++----
 .../tier/sockets/command/RegisterInterestList.java |  82 +++-----
 .../sockets/command/RegisterInterestList61.java    |  79 +++----
 .../sockets/command/RegisterInterestList66.java    |  50 +++--
 .../tier/sockets/command/UnregisterInterest.java   |  69 ++----
 .../sockets/command/UnregisterInterestList.java    |  75 ++-----
 .../wan/parallel/ParallelGatewaySenderQueue.java   |  15 +-
 .../cache/wan/serial/SerialGatewaySenderQueue.java |  52 ++++-
 .../api/LocatorClusterManagementService.java       |   3 +-
 .../operation/OperationHistoryManager.java         |  35 +++-
 .../internal/operation/OperationManager.java       |   3 +-
 .../internal/operation/OperationState.java         |  17 +-
 .../internal/operation/OperationStateStore.java    |   2 +-
 .../operation/RegionOperationStateStore.java       |   4 +-
 .../sanctioned-geode-core-serializables.txt        |   3 +-
 .../query/internal/CompiledComparisonTest.java     |  24 +++
 .../api/LocatorClusterManagementServiceTest.java   |  32 +++
 .../operation/OperationHistoryManagerTest.java     |  35 +++-
 .../internal/operation/OperationManagerTest.java   |  30 ++-
 .../internal/operation/OperationStateTest.java     |   8 +
 .../operation/RegionOperationStateStoreTest.java   |   6 +-
 .../running/starting_up_shutting_down.html.md.erb  |   2 +-
 .../management/jmx_manager_node.html.md.erb        |   2 +
 .../system_member_performance.html.md.erb          |   4 -
 ...formance_connection_thread_settings.html.md.erb |  32 ---
 geode-docs/reference/topics/cache_xml.html.md.erb  |   2 +-
 .../topics/gemfire_properties.html.md.erb          |   2 +-
 .../rest_apps/put_update_cas_data.html.md.erb      |  78 +++----
 .../gfsh/command-pages/connect.html.md.erb         |   3 +
 .../gfsh/command-pages/create.html.md.erb          |   2 +-
 .../gfsh/command-pages/gc.html.md.erb              |   4 +
 .../gfsh/quick_ref_commands_by_area.html.md.erb    |   2 +-
 .../micrometer-configuration.html.md.erb           |   2 -
 .../micrometer/micrometer-overview.html.md.erb     |   3 +
 .../multisite_overview.html.md.erb                 |  11 +-
 geode-gfsh/build.gradle                            |   9 +
 .../geode/management/internal/cli/Launcher.java    |   2 +-
 .../internal/cli/commands/ConnectCommand.java      |  31 ++-
 .../cli/commands/CreateGatewaySenderCommand.java   |   8 +
 .../geode/management/internal/cli/help/Helper.java |  23 ++
 .../cli/remote/OnlineCommandProcessor.java         |   7 +-
 .../geode/management/internal/cli/shell/Gfsh.java  |   1 -
 .../internal/cli/shell/GfshExecutionStrategy.java  |  20 +-
 .../internal/cli/commands/ConnectCommandTest.java  |  50 ++---
 .../commands/CreateGatewaySenderCommandTest.java   |  33 ++-
 .../cli/remote/OnlineCommandProcessorTest.java     |   5 +-
 .../cli/shell/GfshExecutionStrategyTest.java       |  14 ++
 .../geode/management/GfshCompatibilityTest.java    |  89 ++++++++
 .../cache/PartitionedRegionTestHelper.java         |   7 +-
 ...tTemplateClusterManagementServiceTransport.java |  34 ++-
 ...plateClusterManagementServiceTransportTest.java |  28 +++
 .../internal/membership/gms/GMSMemberData.java     |   4 +-
 .../internal/membership/gms/GMSMembership.java     |   6 +-
 geode-pulse/src/main/webapp/scripts/lib/jit.js     |   2 +-
 .../webapp/scripts/lib/jquery.i18n.properties.js   |   4 +-
 .../main/webapp/scripts/lib/jquery.jqGrid.src.js   |  14 +-
 geode-pulse/src/main/webapp/scripts/lib/tooltip.js |   4 +-
 .../src/main/webapp/scripts/pulsescript/common.js  |   8 +-
 geode-redis/build.gradle                           |   6 +
 .../session/NativeRedisSessionAcceptanceTest.java  |  61 ++++++
 ...NativeRedisSessionExpirationAcceptanceTest.java |  56 +++++
 .../apache/geode/redis/GeodeRedisServerRule.java   |   3 +-
 .../test/dunit/rules/RedisClusterStartupRule.java  |   3 +-
 .../geode/redis/CheckPrimaryBucketFunction.java    |   8 +-
 .../geode/redis/internal/data/DeltaDUnitTest.java  | 231 +++++++++++++++++++++
 ...nitTest.java => CrashAndNoRepeatDUnitTest.java} | 188 ++++++++++-------
 .../executor/hash/HashesAndCrashesDUnitTest.java   |  52 ++++-
 .../internal/executor/pubsub/PubSubDUnitTest.java  |  21 +-
 ...stDUnitTest.java => RedisSessionDUnitTest.java} |  14 +-
 .../geode/redis/session/SessionDUnitTest.java      | 116 ++++++++---
 .../redis/session/SessionExpirationDUnitTest.java  |  89 +++++++-
 .../SessionController.java                         |   6 +
 ...ntegrationTest.java => GeodeServerRunTest.java} |  42 ++--
 .../executor/hash/HashesIntegrationTest.java       |  22 ++
 .../internal/executor/key/DelIntegrationTest.java  |  10 +
 .../executor/set/SDiffIntegrationTest.java         |  22 ++
 .../executor/set/SInterIntegrationTest.java        |  22 ++
 .../executor/set/SUnionIntegrationTest.java        |  22 ++
 .../internal/executor/set/SetsIntegrationTest.java |  28 ++-
 .../executor/string/AppendIntegrationTest.java     |  17 ++
 .../executor/string/SetEXIntegrationTest.java      |   7 +
 .../executor/string/SetIntegrationTest.java        |  14 ++
 .../executor/string/StrLenIntegrationTest.java     |   9 +
 .../geode/redis/internal/GeodeRedisServer.java     |   3 +-
 .../redis/internal/data/ByteArrayWrapper.java      |   6 +-
 .../geode/redis/internal/data/NullRedisSet.java    |  13 +-
 .../geode/redis/internal/data/RedisHash.java       |  12 +-
 .../apache/geode/redis/internal/data/RedisSet.java |   4 +-
 .../redis/internal/executor/CommandFunction.java   |  97 ++++-----
 .../executor/RedisCommandsFunctionInvoker.java     |  74 +++++++
 .../executor/SingleResultRedisFunction.java        |   2 +-
 .../hash/RedisHashCommandsFunctionInvoker.java     |  35 ++--
 .../key/RedisKeyCommandsFunctionInvoker.java       |  39 ++--
 .../internal/executor/key/RenameFunction.java      |   2 +-
 .../set/RedisSetCommandsFunctionInvoker.java       |  32 ++-
 .../string/RedisStringCommandsFunctionInvoker.java |  46 ++--
 .../internal/executor/string/SetEXExecutor.java    |   2 +-
 .../internal/netty/ExecutionHandlerContext.java    |  20 +-
 .../geode/internal/cache/wan/WANTestBase.java      |   8 +-
 .../parallel/ParallelWANPropagationDUnitTest.java  |  15 +-
 .../wan/parallel/ParallelWANStatsDUnitTest.java    |  12 +-
 ...lWANPropagation_PartitionedRegionDUnitTest.java |   2 +
 .../cache/wan/serial/SerialWANStatsDUnitTest.java  |   4 +
 .../cache/wan/misc/WANConfigurationJUnitTest.java  |  12 ++
 .../cache/wan/GatewaySenderFactoryImpl.java        |   6 +
 .../internal/rest/JsonSerializationTest.java       |   2 +
 .../controllers/ManagementControllerAdvice.java    |   3 +-
 .../CustomMappingJackson2HttpMessageConverter.java |  85 +-------
 .../rest/security/RestSecurityConfiguration.java   |   5 +-
 136 files changed, 2287 insertions(+), 1052 deletions(-)