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 2019/12/10 04:24:01 UTC
[geode] branch develop updated: GEODE-7498: update index type name
from FUNCTIONAL to RANGE (#4445)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 4c1c223 GEODE-7498: update index type name from FUNCTIONAL to RANGE (#4445)
4c1c223 is described below
commit 4c1c22364b21916add773f2c0ec130f5807285ef
Author: Jinmei Liao <ji...@pivotal.io>
AuthorDate: Mon Dec 9 20:23:30 2019 -0800
GEODE-7498: update index type name from FUNCTIONAL to RANGE (#4445)
* rename FUNCTIONAL to RANGE
* rename LEGACY TO DEPRECATED
---
.../internal/configuration/converters/IndexConverter.java | 6 +++---
.../configuration/converters/IndexConverterTest.java | 12 ++++++------
.../org/apache/geode/management/configuration/IndexType.java | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/converters/IndexConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/converters/IndexConverter.java
index 300fd2d..d226e20 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/converters/IndexConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/converters/IndexConverter.java
@@ -48,11 +48,11 @@ public class IndexConverter extends ConfigurationConverter<Index, RegionConfig.I
if (keyIndex != null && keyIndex) {
index.setIndexType(IndexType.KEY);
} else if (HASH.equalsIgnoreCase(regionConfigIndex.getType())) {
- index.setIndexType(IndexType.HASH_LEGACY);
+ index.setIndexType(IndexType.HASH_DEPRECATED);
}
// functional is the default type
else {
- index.setIndexType(IndexType.FUNCTIONAL);
+ index.setIndexType(IndexType.RANGE);
}
return index;
@@ -67,7 +67,7 @@ public class IndexConverter extends ConfigurationConverter<Index, RegionConfig.I
if (index.getIndexType() == IndexType.KEY) {
regionConfigIndex.setKeyIndex(true);
- } else if (index.getIndexType() == IndexType.HASH_LEGACY) {
+ } else if (index.getIndexType() == IndexType.HASH_DEPRECATED) {
regionConfigIndex.setType(HASH);
} else {
regionConfigIndex.setType(RANGE);
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/converters/IndexConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/converters/IndexConverterTest.java
index aa5b409..7ebf5f6 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/converters/IndexConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/converters/IndexConverterTest.java
@@ -15,9 +15,9 @@
package org.apache.geode.management.internal.configuration.converters;
-import static org.apache.geode.management.configuration.IndexType.FUNCTIONAL;
-import static org.apache.geode.management.configuration.IndexType.HASH_LEGACY;
+import static org.apache.geode.management.configuration.IndexType.HASH_DEPRECATED;
import static org.apache.geode.management.configuration.IndexType.KEY;
+import static org.apache.geode.management.configuration.IndexType.RANGE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.SoftAssertions.assertSoftly;
@@ -51,7 +51,7 @@ public class IndexConverterTest {
@Test
public void fromNonNullConfigObject_mapsFunctionalIndexTypeToRangeIndexType() {
Index index = new Index();
- index.setIndexType(FUNCTIONAL);
+ index.setIndexType(RANGE);
RegionConfig.Index regionConfigIndex = indexConverter.fromNonNullConfigObject(index);
@@ -86,7 +86,7 @@ public class IndexConverterTest {
@Test
public void fromNonNullConfigObject_mapsHashDeprecatedIndexTypeToHashIndexType() {
Index index = new Index();
- index.setIndexType(HASH_LEGACY);
+ index.setIndexType(HASH_DEPRECATED);
RegionConfig.Index regionConfigIndex = indexConverter.fromNonNullConfigObject(index);
@@ -128,7 +128,7 @@ public class IndexConverterTest {
assertThat(index.getIndexType())
.as("type")
- .isEqualTo(HASH_LEGACY);
+ .isEqualTo(HASH_DEPRECATED);
}
@Test
@@ -140,7 +140,7 @@ public class IndexConverterTest {
assertThat(index.getIndexType())
.as("type")
- .isEqualTo(FUNCTIONAL);
+ .isEqualTo(RANGE);
}
@Test
diff --git a/geode-management/src/main/java/org/apache/geode/management/configuration/IndexType.java b/geode-management/src/main/java/org/apache/geode/management/configuration/IndexType.java
index dcc9175..043e7d2 100644
--- a/geode-management/src/main/java/org/apache/geode/management/configuration/IndexType.java
+++ b/geode-management/src/main/java/org/apache/geode/management/configuration/IndexType.java
@@ -24,8 +24,8 @@ package org.apache.geode.management.configuration;
*/
public enum IndexType {
KEY,
- FUNCTIONAL,
+ RANGE,
// this is used to represent deprecated index types not supported by the management API.
@Deprecated
- HASH_LEGACY;
+ HASH_DEPRECATED;
}