Skip to content

Commit

Permalink
Added comparator-class-name to EvictionConfig object in both client…
Browse files Browse the repository at this point in the history 
… config xml and client yaml configs. (#14708)

fixes #14093
  • Loading branch information
@ihsandemir
ihsandemir committed Mar 18, 2019
1 parent a9c15ef commit dfb273d
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 8 deletions.
4 changes: 4 additions & 0 deletions ...ient/src/main/java/com/hazelcast/client/config/AbstractQueryCacheConfigBuilderHelper.java
View file
Expand Up @@ -92,6 +92,7 @@ private EvictionConfig getEvictionConfig(final Node node) {
final Node size = node.getAttributes().getNamedItem("size");
final Node maxSizePolicy = node.getAttributes().getNamedItem("max-size-policy");
final Node evictionPolicy = node.getAttributes().getNamedItem("eviction-policy");
Node comparatorClassName = node.getAttributes().getNamedItem("comparator-class-name");
if (size != null) {
evictionConfig.setSize(Integer.parseInt(getTextContent(size)));
}
Expand All @@ -107,6 +108,9 @@ private EvictionConfig getEvictionConfig(final Node node) {
upperCaseInternal(getTextContent(evictionPolicy)))
);
}
if (comparatorClassName != null) {
evictionConfig.setComparatorClassName(getTextContent(comparatorClassName));
}
return evictionConfig;
}

Expand Down
5 changes: 3 additions & 2 deletions hazelcast-client/src/main/java/com/hazelcast/client/config/ClientConfigXmlGenerator.java
View file
Expand Up @@ -375,7 +375,8 @@ private static void queryCaches(XmlGenerator gen, Map<String, Map<String, QueryC
.node("buffer-size", queryCache.getBufferSize())
.node("eviction", null, "size", queryCache.getEvictionConfig().getSize(),
"max-size-policy", queryCache.getEvictionConfig().getMaximumSizePolicy(),
"eviction-policy", queryCache.getEvictionConfig().getEvictionPolicy());
"eviction-policy", queryCache.getEvictionConfig().getEvictionPolicy(),
"comparator-class-name", queryCache.getEvictionConfig().getComparatorClassName());
queryCachePredicate(gen, queryCache.getPredicateConfig());
entryListeners(gen, queryCache.getEntryListenerConfigs());
indexes(gen, queryCache.getIndexConfigs());
Expand Down Expand Up @@ -563,7 +564,7 @@ private static void nearCache(XmlGenerator gen, String name, NearCacheConfig nea
.node("local-update-policy", nearCache.getLocalUpdatePolicy())
.node("eviction", null, "size", eviction.getSize(),
"max-size-policy", eviction.getMaximumSizePolicy(),
"eviction-policy", eviction.getEvictionPolicy())
"eviction-policy", eviction.getEvictionPolicy(), "comparator-class-name", eviction.getComparatorClassName())
.node("preloader", null, "enabled", preloader.isEnabled(),
"directory", preloader.getDirectory(),
"store-initial-delay-seconds", preloader.getStoreInitialDelaySeconds(),
Expand Down
4 changes: 4 additions & 0 deletions hazelcast-client/src/main/java/com/hazelcast/client/config/ClientDomConfigProcessor.java
View file
Expand Up @@ -327,6 +327,7 @@ private EvictionConfig getEvictionConfig(Node node) {
Node size = node.getAttributes().getNamedItem("size");
Node maxSizePolicy = node.getAttributes().getNamedItem("max-size-policy");
Node evictionPolicy = node.getAttributes().getNamedItem("eviction-policy");
Node comparatorClassName = node.getAttributes().getNamedItem("comparator-class-name");
if (size != null) {
evictionConfig.setSize(Integer.parseInt(getTextContent(size)));
}
Expand All @@ -339,6 +340,9 @@ private EvictionConfig getEvictionConfig(Node node) {
evictionConfig.setEvictionPolicy(EvictionPolicy.valueOf(upperCaseInternal(getTextContent(evictionPolicy)))
);
}
if (comparatorClassName != null) {
evictionConfig.setComparatorClassName(getTextContent(comparatorClassName));
}
return evictionConfig;
}

Expand Down
1 change: 1 addition & 0 deletions hazelcast-client/src/main/resources/hazelcast-client-config-3.12.xsd
View file
Expand Up @@ -507,6 +507,7 @@
<xs:attribute name="size" type="xs:nonNegativeInteger" default="10000" use="optional"/>
<xs:attribute name="max-size-policy" type="max-size-policy" default="ENTRY_COUNT" use="optional"/>
<xs:attribute name="eviction-policy" type="eviction-policy" default="LRU" use="optional"/>
<xs:attribute name="comparator-class-name" type="xs:string" use="optional"/>
</xs:complexType>

<xs:complexType name="preloader">
Expand Down
8 changes: 7 additions & 1 deletion hazelcast-client/src/main/resources/hazelcast-client-full.xml
View file
Expand Up @@ -247,6 +247,11 @@
<local-update-policy>INVALIDATE</local-update-policy>
</near-cache>

<near-cache name="NearCacheEvictionConfigExample">
<eviction eviction-policy="LRU" max-size-policy="ENTRY_COUNT" size="10000"
comparator-class-name="com.hazelcast.examples.MyEvictionComparator"/>
</near-cache>

<flake-id-generator name="default">
<prefetch-count>100</prefetch-count>
<prefetch-validity-millis>600000</prefetch-validity-millis>
Expand All @@ -265,7 +270,8 @@
<in-memory-format>BINARY</in-memory-format>
<coalesce>false</coalesce>
<populate>true</populate>
<eviction eviction-policy="LRU" max-size-policy="ENTRY_COUNT" size="10000"/>
<eviction eviction-policy="LRU" max-size-policy="ENTRY_COUNT" size="10000"
comparator-class-name="com.hazelcast.examples.MyEvictionComparator"/>
<indexes>
<index ordered="false">name</index>
</indexes>
Expand Down
8 changes: 8 additions & 0 deletions hazelcast-client/src/main/resources/hazelcast-client-full.yaml
View file
Expand Up @@ -227,6 +227,13 @@ hazelcast-client:
serialize-keys: true
local-update-policy: INVALIDATE

NearCacheEvictionConfigExample:
eviction:
eviction-policy: LRU
max-size-policy: ENTRY_COUNT
size: 10000
comparator-class-name: com.hazelcast.examples.MyEvictionComparator

flake-id-generator:
default:
prefetch-count: 100
Expand All @@ -252,6 +259,7 @@ hazelcast-client:
eviction-policy: LRU
max-size-policy: ENTRY_COUNT
size: 10000
comparator-class-name: com.hazelcast.examples.MyEvictionComparator
indexes:
name:
ordered: false
Expand Down
18 changes: 13 additions & 5 deletions ...ast-client/src/test/java/com/hazelcast/client/config/AbstractClientConfigBuilderTest.java
View file
Expand Up @@ -156,7 +156,7 @@ public void testProxyFactories() {

@Test
public void testNearCacheConfigs() {
assertEquals(1, fullClientConfig.getNearCacheConfigMap().size());
assertEquals(2, fullClientConfig.getNearCacheConfigMap().size());
final NearCacheConfig nearCacheConfig = fullClientConfig.getNearCacheConfig("asd");

assertEquals(2000, nearCacheConfig.getMaxSize());
Expand All @@ -168,6 +168,13 @@ public void testNearCacheConfigs() {
assertTrue(nearCacheConfig.isInvalidateOnChange());
assertTrue(nearCacheConfig.isSerializeKeys());
assertEquals(InMemoryFormat.OBJECT, nearCacheConfig.getInMemoryFormat());

final NearCacheConfig evictableNearCacheConfig = fullClientConfig.getNearCacheConfig("NearCacheEvictionConfigExample");
EvictionConfig nearCacheEvictionConfig = evictableNearCacheConfig.getEvictionConfig();
assertEquals(EvictionPolicy.LRU, nearCacheEvictionConfig.getEvictionPolicy());
assertEquals(EvictionConfig.MaxSizePolicy.ENTRY_COUNT, nearCacheEvictionConfig.getMaximumSizePolicy());
assertEquals(10000, nearCacheEvictionConfig.getSize());
assertEquals("com.hazelcast.examples.MyEvictionComparator", nearCacheEvictionConfig.getComparatorClassName());
}

@Test
Expand Down Expand Up @@ -230,10 +237,11 @@ public void testQueryCacheFullConfig() throws Exception {
assertEquals(1, queryCacheClassPredicateConfig.getBatchSize());
assertEquals(16, queryCacheClassPredicateConfig.getBufferSize());
assertEquals(0, queryCacheClassPredicateConfig.getDelaySeconds());
assertEquals(EvictionPolicy.LRU, queryCacheClassPredicateConfig.getEvictionConfig().getEvictionPolicy());
assertEquals(EvictionConfig.MaxSizePolicy.ENTRY_COUNT,
queryCacheClassPredicateConfig.getEvictionConfig().getMaximumSizePolicy());
assertEquals(10000, queryCacheClassPredicateConfig.getEvictionConfig().getSize());
EvictionConfig evictionConfig = queryCacheClassPredicateConfig.getEvictionConfig();
assertEquals(EvictionPolicy.LRU, evictionConfig.getEvictionPolicy());
assertEquals(EvictionConfig.MaxSizePolicy.ENTRY_COUNT, evictionConfig.getMaximumSizePolicy());
assertEquals(10000, evictionConfig.getSize());
assertEquals("com.hazelcast.examples.MyEvictionComparator", evictionConfig.getComparatorClassName());
assertEquals(InMemoryFormat.BINARY, queryCacheClassPredicateConfig.getInMemoryFormat());
assertFalse(queryCacheClassPredicateConfig.isCoalesce());
assertTrue(queryCacheClassPredicateConfig.isPopulate());
Expand Down

0 comments on commit dfb273d

Please sign in to comment.