This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6121 in repository https://gitbox.apache.org/repos/asf/geode.git.
discard 3aa2a89 GEODE-6121 Port SnappyData DirectChannel comms changes to Geode add 5820e9a GEODE-5971: Refactor export/import commands to extend GfshCommand and… (#2894) add 030fee3 GEODE-4883: Set server port correctly for an ephemeral port (#2912) add 348debe GEODE-5228: Stale status file is deleted before waiting for status response file (#2850) add b40303d GEODE-6013: Use expected initial image requester's rvv information (#2857) add 615e4ed GEODE-6068: change destroy jdbc-mapping to undo create (#2905) add 4bc1e65 GEODE-6105: convert geode-old-versions to xyzTestRuntime dependency (#2917) add f4651d9 GEODE-6067: add list data-source gfsh command (#2907) add c902f70 GEODE-6014: Removed unnecessary null checks. (#2906) add 944951f GEODE-6097: Using primitive instead of boxed variables (#2908) add 287114c GEODE-6094: Fixed string format arguments (#2909) add c62b7c6 GEODE-6098: LGTM fix for subtle call to inherited method. (#2910) add 0a628c9 GEODE-5342: Fix disk-store validation in commands (#2881) add f412744 GEODE-6113: Unable to run geode-web http-based dunit tests in IntelliJ (#2924) add 9918f9b GEODE-6096: Cleanup dunit internals (#2919) add 5344441 GEODE-6092: Delete unused test resource (#2916) add af51c95 GEODE-6113: Fix checkPom failures add 13ee457 GEODE-6111: Add gradle properties to extend http timeouts. (#2922) add 8698edc GEODE-5971: Refactor server status/stop commands to return ResultModel (#2887) add 0c8b101 GEODE-6110: Add .java-version to .gitignore and rat ignore list. (#2921) add 16dde1a GEODE-6108: Handle client putIfAbsent returns value due to retry (#2925) add 3c6a0d5 GEODE-6115: add log4j dependency to jmh compile add 4da0da1 Merge pull request #2929 from balesh2/GEODE-6115 add 276f8b4 GEODE-6121 Port SnappyData DirectChannel comms changes to Geode This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3aa2a89) \ N -- N -- N refs/heads/feature/GEODE-6121 (276f8b4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .gitignore | 1 + geode-assembly/build.gradle | 7 +- .../cli/commands/ConnectCommandAcceptanceTest.java | 2 +- .../geode/test/junit/rules/GfshRuleTest.java | 2 +- ...omcatSessionBackwardsCompatibilityTestBase.java | 2 +- geode-connectors/build.gradle | 1 + .../cli/DestroyMappingCommandDunitTest.java | 110 ++++++- .../cli/ListDataSourceCommandDUnitTest.java | 115 +++++++ .../cli/DestroyMappingCommandIntegrationTest.java | 83 ----- .../jdbc/internal/cli/DestroyMappingCommand.java | 113 ++++++- .../jdbc/internal/cli/DestroyMappingFunction.java | 42 ++- .../jdbc/internal/cli/ListDataSourceCommand.java | 114 +++++++ .../org.springframework.shell.core.CommandMarker | 1 + .../cli/DescribeDataSourceCommandTest.java | 2 +- .../cli/DestroyMappingCommandFunctionTest.java | 116 ++++++- .../internal/cli/DestroyMappingCommandTest.java | 237 ++++++++++++++ ...andTest.java => ListDataSourceCommandTest.java} | 215 +++++------- .../src/test/resources/expected-pom.xml | 4 + geode-core/build.gradle | 6 + .../distributed/DistributedLockBlackboardImpl.java | 2 +- .../apache/geode/distributed/LocatorDUnitTest.java | 2 +- .../distributed/ServerLauncherDUnitTestHelper.java | 10 +- .../geode/distributed/SystemAdminDUnitTest.java | 2 +- .../alerting/AlertingServiceDistributedTest.java | 2 +- ...rtingServiceWithoutListenerDistributedTest.java | 2 +- ...overWithMixedVersionServersDistributedTest.java | 2 +- .../cache/PersistentRegionRecoveryDUnitTest.java | 86 +++++ .../CompressionRegionConfigDUnitTest.java | 2 +- .../DistributedSystemMXBeanDistributedTest.java | 2 +- ...butedSystemMXBeanWithAlertsDistributedTest.java | 2 +- ...stemMXBeanWithNotificationsDistributedTest.java | 2 +- .../geode/management/ManagementTestRule.java | 2 +- .../cli/commands/DiskStoreCommandsDUnitTest.java | 107 +++--- .../apache/geode/security/ClientAuthDUnitTest.java | 2 +- .../security/ClientAuthenticationDUnitTest.java | 2 +- .../ClientAuthenticationPart2DUnitTest.java | 2 +- .../security/ClientAuthenticationTestCase.java | 2 +- ...tAuthorizationLegacyConfigurationDUnitTest.java | 2 +- ...aAuthorizationUsingLegacySecurityDUnitTest.java | 2 +- ...onUsingLegacySecurityWithFailoverDUnitTest.java | 2 +- ...t.java => DiskStoreFactoryIntegrationTest.java} | 304 ++++++++--------- .../FileProcessControllerIntegrationTest.java | 4 + .../DistributedSystemMXBeanIntegrationTest.java | 2 +- .../AlterDiskStoreCommandIntegrationTest.java} | 11 +- .../cli/commands/ExportDataIntegrationTest.java | 5 +- .../cli/commands/ImportDataIntegrationTest.java | 5 +- ...ntExecutorWithLoggingIntegrationTest_log4j2.xml | 38 --- .../asyncqueue/internal/AsyncEventQueueImpl.java | 2 + .../internal/InternalAsyncEventQueue.java | 4 + .../geode/cache/client/internal/PoolImpl.java | 7 - .../apache/geode/cache/client/internal/PutOp.java | 7 +- .../internal/pooling/ConnectionManagerImpl.java | 2 +- .../query/internal/index/CompactMapRangeIndex.java | 2 +- .../apache/geode/distributed/LocatorLauncher.java | 2 +- .../apache/geode/distributed/ServerLauncher.java | 2 +- .../internal/locks/DistributedMemberLock.java | 2 +- .../geode/internal/cache/DistributedRegion.java | 2 +- .../geode/internal/cache/EntryEventImpl.java | 10 + .../internal/cache/InitialImageOperation.java | 1 - .../apache/geode/internal/cache/LocalRegion.java | 27 +- .../geode/internal/cache/PartitionedRegion.java | 10 +- .../model/PartitionedRegionLoadModel.java | 2 +- .../tier/sockets/ClientProxyMembershipID.java | 4 +- .../internal/cache/versions/RVVExceptionB.java | 2 +- .../cache/versions/RegionVersionHolder.java | 2 +- .../cache/versions/RegionVersionVector.java | 25 +- .../memcached/commands/DecrementCommand.java | 2 +- .../memcached/commands/IncrementCommand.java | 2 +- .../internal/process/ControlFileWatchdog.java | 10 + .../internal/beans/DistributedSystemBridge.java | 8 +- .../cli/commands/AlterOfflineDiskStoreCommand.java | 11 +- .../commands/CompactOfflineDiskStoreCommand.java | 19 +- .../commands/DescribeOfflineDiskStoreCommand.java | 10 +- .../internal/cli/commands/ExportDataCommand.java | 33 +- .../internal/cli/commands/ImportDataCommand.java | 33 +- .../commands/UpgradeOfflineDiskStoreCommand.java | 17 +- .../cli/commands/ValidateDiskStoreCommand.java | 10 +- .../commands/lifecycle/StatusServerCommand.java | 23 +- .../cli/commands/lifecycle/StopServerCommand.java | 18 +- .../internal/cli/functions/ExportDataFunction.java | 46 +-- .../internal/cli/functions/ImportDataFunction.java | 11 +- .../apache/geode/redis/internal/DoubleWrapper.java | 2 +- .../executor/hash/HIncrByFloatExecutor.java | 2 +- .../internal/executor/list/LIndexExecutor.java | 2 +- .../internal/executor/string/DecrByExecutor.java | 4 +- .../internal/executor/string/DecrExecutor.java | 2 +- .../internal/executor/string/IncrByExecutor.java | 4 +- .../executor/string/IncrByFloatExecutor.java | 4 +- .../internal/executor/string/IncrExecutor.java | 2 +- .../geode/internal/cache/LocalRegionTest.java | 143 ++++++++ .../cache/versions/RegionVersionVectorTest.java | 161 +++++++++ geode-core/src/test/resources/expected-pom.xml | 4 + .../internal/cache/TxCommitMessageBCTestBase.java | 2 +- .../RollingUpgrade2DUnitTestBase.java | 4 +- .../rollingupgrade/RollingUpgradeDUnitTest.java | 2 +- ...gradeHARegionNameOnDifferentServerVersions.java | 2 +- .../RollingUpgradeNonHAFunction.java | 2 +- .../rollingupgrade/RollingUpgradeTracePRQuery.java | 2 +- .../RollingUpgradeVerifyXmlEntity.java | 2 +- geode-cq/build.gradle | 2 + .../tier/sockets/ClientServerMiscBCDUnitTest.java | 2 +- .../security/ClientAuthorizationCQDUnitTest.java | 2 +- geode-dunit/build.gradle | 4 + ...tartupRuleCanSpecifyOlderVersionsDUnitTest.java | 2 +- .../dunit/examples/BeforeClassExampleTest.java | 2 +- geode-dunit/src/main/java/hydra/MethExecutor.java | 363 --------------------- .../src/main/java/hydra/MethExecutorResult.java | 182 ----------- .../sockets/ClientServerMiscDUnitTestBase.java | 4 +- .../security/ClientAuthorizationTestCase.java | 2 +- .../java/org/apache/geode/test/dunit/DUnitEnv.java | 2 +- .../java/org/apache/geode/test/dunit/Host.java | 4 +- .../main/java/org/apache/geode/test/dunit/VM.java | 21 +- .../{standalone => internal}/BounceResult.java | 2 +- .../dunit/{standalone => internal}/ChildVM.java | 5 +- .../geode/test/dunit/internal/DUnitHost.java | 119 +++++++ .../{standalone => internal}/DUnitLauncher.java | 174 +--------- .../dunit/internal/InternalBlackboardImpl.java | 2 - .../dunit/internal/JUnit4DistributedTestCase.java | 1 - .../apache/geode/test/dunit/internal/Master.java | 71 ++++ .../MasterRemote.java} | 25 +- .../geode/test/dunit/internal/MethodInvoker.java | 255 +++++++++++++++ .../test/dunit/internal/MethodInvokerResult.java | 139 ++++++++ .../{standalone => internal}/ProcessHolder.java | 2 +- .../{standalone => internal}/ProcessManager.java | 3 +- .../{standalone => internal}/RemoteDUnitVM.java | 23 +- .../{standalone => internal}/RemoteDUnitVMIF.java | 11 +- .../StandAloneDUnitEnv.java | 4 +- .../test/dunit/rules/AbstractDistributedRule.java | 2 +- .../apache/geode/test/dunit/rules/CacheRule.java | 2 +- .../geode/test/dunit/rules/ClusterStartupRule.java | 6 +- .../test/dunit/rules/DistributedDiskDirRule.java | 2 +- .../geode/test/dunit/rules/DistributedRule.java | 2 +- .../DistributedUseJacksonForJsonPathRule.java | 2 +- .../geode/test}/greplogs/ExpectedStrings.java | 2 +- .../apache/geode/test}/greplogs/LogConsumer.java | 2 +- .../test/dunit/internal/MethodInvokerTest.java} | 31 +- geode-dunit/src/test/resources/expected-pom.xml | 4 + geode-junit/build.gradle | 2 +- .../geode/codeAnalysis/decode/CompiledClass.java | 4 - .../geode/test/junit/rules/gfsh/GfshRule.java | 2 +- .../standalone => version}/VersionManager.java | 2 +- .../java/parReg/query/unittest/NewPortfolio.java | 8 +- .../VersionManagerJUnitTest.java | 2 +- geode-junit/src/test/resources/expected-pom.xml | 6 - geode-lucene/build.gradle | 2 + .../LuceneSearchWithRollingUpgradeDUnit.java | 4 +- .../tools/pulse/internal/data/JMXDataUpdater.java | 4 +- .../internal/service/ClusterDetailsService.java | 4 +- .../service/ClusterMembersRGraphService.java | 6 +- .../internal/service/ClusterRegionService.java | 6 +- .../internal/service/ClusterRegionsService.java | 6 +- .../service/ClusterSelectedRegionService.java | 2 +- .../internal/service/MemberDetailsService.java | 4 +- .../internal/service/MemberRegionsService.java | 2 +- geode-wan/build.gradle | 1 + ...ateGatewaySenderMixedSiteOneCurrentSiteTwo.java | 2 +- .../cache/wan/WANRollingUpgradeDUnitTest.java | 4 +- ...eEventProcessingMixedSiteOneCurrentSiteTwo.java | 2 +- ...adeEventProcessingOldSiteOneCurrentSiteTwo.java | 2 +- ...ipleReceiversDefinedInClusterConfiguration.java | 2 +- ...tReprocessedAfterCurrentSiteMemberFailover.java | 2 +- ...fterCurrentSiteMemberFailoverWithOldClient.java | 2 +- ...tsNotReprocessedAfterOldSiteMemberFailover.java | 2 +- ...eCacheServerProfileToMembersOlderThan1dot5.java | 2 +- ...ANRollingUpgradeVerifyGatewaySenderProfile.java | 2 +- .../web/controllers/AbstractBaseController.java | 5 +- gradle.properties | 9 +- gradle/publish.gradle | 3 +- gradle/rat.gradle | 2 +- 169 files changed, 2532 insertions(+), 1554 deletions(-) create mode 100644 geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommandDUnitTest.java delete mode 100644 geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java create mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommand.java create mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandTest.java copy geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/{DescribeDataSourceCommandTest.java => ListDataSourceCommandTest.java} (51%) rename geode-core/src/integrationTest/java/org/apache/geode/internal/cache/{DiskStoreFactoryJUnitTest.java => DiskStoreFactoryIntegrationTest.java} (55%) rename geode-core/src/{test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java => integrationTest/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreCommandIntegrationTest.java} (87%) delete mode 100644 geode-core/src/integrationTest/resources/org/apache/geode/cache/client/internal/SingleHopClientExecutorWithLoggingIntegrationTest_log4j2.xml create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/LocalRegionTest.java delete mode 100644 geode-dunit/src/main/java/hydra/MethExecutor.java delete mode 100644 geode-dunit/src/main/java/hydra/MethExecutorResult.java copy geode-dunit/src/main/java/org/apache/geode/test/dunit/{standalone => internal}/BounceResult.java (95%) rename geode-dunit/src/main/java/org/apache/geode/test/dunit/{standalone => internal}/ChildVM.java (93%) create mode 100644 geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/DUnitHost.java rename geode-dunit/src/main/java/org/apache/geode/test/dunit/{standalone => internal}/DUnitLauncher.java (73%) create mode 100644 geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/Master.java rename geode-dunit/src/main/java/org/apache/geode/test/dunit/{standalone/BounceResult.java => internal/MasterRemote.java} (65%) create mode 100644 geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/MethodInvoker.java create mode 100644 geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/MethodInvokerResult.java rename geode-dunit/src/main/java/org/apache/geode/test/dunit/{standalone => internal}/ProcessHolder.java (96%) rename geode-dunit/src/main/java/org/apache/geode/test/dunit/{standalone => internal}/ProcessManager.java (99%) rename geode-dunit/src/main/java/org/apache/geode/test/dunit/{standalone => internal}/RemoteDUnitVM.java (82%) rename geode-dunit/src/main/java/org/apache/geode/test/dunit/{standalone => internal}/RemoteDUnitVMIF.java (73%) rename geode-dunit/src/main/java/org/apache/geode/test/dunit/{standalone => internal}/StandAloneDUnitEnv.java (94%) rename geode-dunit/src/main/java/{batterytest => org/apache/geode/test}/greplogs/ExpectedStrings.java (99%) rename geode-dunit/src/main/java/{batterytest => org/apache/geode/test}/greplogs/LogConsumer.java (99%) copy geode-dunit/src/{integrationTest/java/org/apache/geode/test/dunit/examples/BeforeClassExampleTest.java => test/java/org/apache/geode/test/dunit/internal/MethodInvokerTest.java} (51%) rename geode-junit/src/main/java/org/apache/geode/test/{dunit/standalone => version}/VersionManager.java (99%) rename geode-junit/src/test/java/org/apache/geode/test/{dunit/standalone => version}/VersionManagerJUnitTest.java (97%)