This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch release/1.7.0 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9175e34fc07a01064d32ee598b7e493341f95734 Author: nabarun <[email protected]> AuthorDate: Tue Sep 4 11:16:42 2018 -0700 Changing all Version.GEODE_180 to Version_170 --- .../main/java/org/apache/geode/internal/cache/TXCommitMessage.java | 2 +- .../apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java | 4 ++-- .../geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java index 9a3a1e4..5ff142b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java @@ -927,7 +927,7 @@ public class TXCommitMessage extends PooledDistributionMessage } private boolean hasFlagsField(final Version version) { - return version.compareTo(Version.GEODE_180) >= 0; + return version.compareTo(Version.GEODE_170) >= 0; } private boolean useShadowKey() { diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java index 69f0d89..6e3e8a0 100755 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java @@ -290,11 +290,11 @@ public class LuceneIndexCommands extends InternalGfshCommand { // Get members >= Geode 1.8 (when the new destroy code path went into the product) Set<DistributedMember> validVersionMembers = - getNormalMembersWithSameOrNewerVersion(Version.GEODE_180); + getNormalMembersWithSameOrNewerVersion(Version.GEODE_170); if (validVersionMembers.isEmpty()) { return ResultBuilder.createInfoResult(CliStrings.format( LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0, - Version.GEODE_180)); + Version.GEODE_170)); } // Execute the destroy index function diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java index e9129f5..b0e4db8 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java @@ -434,7 +434,7 @@ public class LuceneIndexCommandsJUnitTest { final List<CliFunctionResult> cliFunctionResults = new ArrayList<>(); String expectedStatus = CliStrings.format( LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0, - new Object[] {Version.GEODE_180}) + LINE_SEPARATOR; + new Object[] {Version.GEODE_170}) + LINE_SEPARATOR; cliFunctionResults.add(new CliFunctionResult("member0")); doReturn(Collections.emptySet()).when(commands).getNormalMembersWithSameOrNewerVersion(any()); CommandResult result = (CommandResult) commands.destroyIndex("index", "regionPath"); @@ -484,7 +484,7 @@ public class LuceneIndexCommandsJUnitTest { final List<CliFunctionResult> cliFunctionResults = new ArrayList<>(); String expectedStatus = CliStrings.format( LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0, - new Object[] {Version.GEODE_180}) + LINE_SEPARATOR; + new Object[] {Version.GEODE_170}) + LINE_SEPARATOR; cliFunctionResults.add(new CliFunctionResult("member0")); CommandResult result = (CommandResult) commands.destroyIndex(null, "regionPath"); verifyDestroyIndexCommandResult(result, cliFunctionResults, expectedStatus);
