updated storage, localhost and tests

chillaq · chillaq · commit cfd6febe1aea · 2025-04-24T16:15:38.000-07:00
diff --git a/client/src/main/java/io/split/client/HttpSplitChangeFetcher.java b/client/src/main/java/io/split/client/HttpSplitChangeFetcher.java
@@ -78,6 +78,8 @@ public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
             if (SPEC_VERSION.equals(SPEC_1_1) && (System.currentTimeMillis() - _lastProxyCheckTimestamp >= PROXY_CHECK_INTERVAL_MILLISECONDS_SS)) {
                 _log.info("Switching to new Feature flag spec ({}) and fetching.", SPEC_1_3);
                 SPEC_VERSION = SPEC_1_3;
+                since = -1;
+                sinceRBS = -1;
             }
             URI uri = buildURL(options, since, sinceRBS);
             response = _client.get(uri, options, null);
@@ -109,38 +111,27 @@ public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
         SplitChange splitChange = new SplitChange();
         if (SPEC_VERSION.equals(Spec.SPEC_1_1)) {
             splitChange.featureFlags = convertBodyToOldSpec(response.body());
-            splitChange.ruleBasedSegments = createEmptyDTO();
+            splitChange.ruleBasedSegments = ChangeDto.createEmptyDto();
         } else {
             splitChange = Json.fromJson(response.body(), SplitChange.class);
+            if (SPEC_VERSION.equals(Spec.SPEC_1_3) && _lastProxyCheckTimestamp != 0) {
+                splitChange.clearCache = true;
+                _lastProxyCheckTimestamp = 0L;
+            }
         }
         return splitChange;
     }
 
-    public Long getLastProxyCheckTimestamp() {
-        return _lastProxyCheckTimestamp;
-    }
-
-    public void setLastProxyCheckTimestamp(long lastProxyCheckTimestamp) {
-        synchronized (_lock) {
-            _lastProxyCheckTimestamp = lastProxyCheckTimestamp;
-        }
-    }
-
-    private ChangeDto<RuleBasedSegment> createEmptyDTO() {
-        ChangeDto<RuleBasedSegment> dto = new ChangeDto<>();
-        dto.d = new ArrayList<>();
-        dto.t = -1;
-        dto.s = -1;
-        return dto;
-    }
     private ChangeDto<Split> convertBodyToOldSpec(String body) {
         return Json.fromJson(body, SplitChangesOldPayloadDto.class).toChangeDTO();
     }
 
     private URI buildURL(FetchOptions options, long since, long sinceRBS) throws URISyntaxException {
         URIBuilder uriBuilder = new URIBuilder(_target).addParameter(SPEC, "" + SPEC_VERSION);
         uriBuilder.addParameter(SINCE, "" + since);
-        uriBuilder.addParameter(RB_SINCE, "" + sinceRBS);
+        if (SPEC_VERSION.equals(SPEC_1_3)) {
+            uriBuilder.addParameter(RB_SINCE, "" + sinceRBS);
+        }
         if (!options.flagSetsFilter().isEmpty()) {
             uriBuilder.addParameter(SETS, "" + options.flagSetsFilter());
         }
diff --git a/client/src/main/java/io/split/client/JsonLocalhostSplitChangeFetcher.java b/client/src/main/java/io/split/client/JsonLocalhostSplitChangeFetcher.java
@@ -1,8 +1,10 @@
 package io.split.client;
 
+import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonReader;
 import io.split.client.dtos.ChangeDto;
 import io.split.client.dtos.SplitChange;
+import io.split.client.dtos.SplitChangesOldPayloadDto;
 import io.split.client.utils.InputStreamProvider;
 import io.split.client.utils.Json;
 import io.split.client.utils.LocalhostSanitizer;
@@ -20,6 +22,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import static io.split.client.utils.Json.fromJson;
+
 public class JsonLocalhostSplitChangeFetcher implements SplitChangeFetcher {
 
     private static final Logger _log = LoggerFactory.getLogger(JsonLocalhostSplitChangeFetcher.class);
@@ -37,13 +41,23 @@ public JsonLocalhostSplitChangeFetcher(InputStreamProvider inputStreamProvider)
     public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
         try {
             JsonReader jsonReader = new JsonReader(new BufferedReader(new InputStreamReader(_inputStreamProvider.get(), StandardCharsets.UTF_8)));
-            SplitChange splitChange = Json.fromJson(jsonReader, SplitChange.class);
+            if (checkOldSpec(new JsonReader(new BufferedReader(new InputStreamReader(_inputStreamProvider.get(), StandardCharsets.UTF_8))))) {
+                SplitChange splitChange = new SplitChange();
+                splitChange.featureFlags = Json.fromJson(jsonReader, SplitChangesOldPayloadDto.class).toChangeDTO();
+                splitChange.ruleBasedSegments = ChangeDto.createEmptyDto();
+                return splitChange;
+            }
+            SplitChange splitChange = fromJson(jsonReader, SplitChange.class);
             return processSplitChange(splitChange, since, sinceRBS);
         } catch (Exception e) {
             throw new IllegalStateException("Problem fetching splitChanges: " + e.getMessage(), e);
         }
     }
 
+    private boolean checkOldSpec(JsonReader jsonReader) {
+        return Json.fromJson(jsonReader, JsonObject.class).has("splits");
+    }
+
     private SplitChange processSplitChange(SplitChange splitChange, long changeNumber, long changeNumberRBS) throws NoSuchAlgorithmException {
         SplitChange splitChangeToProcess = LocalhostSanitizer.sanitization(splitChange);
         // if the till is less than storage CN and different from the default till ignore the change
diff --git a/client/src/main/java/io/split/client/SplitClientConfig.java b/client/src/main/java/io/split/client/SplitClientConfig.java
@@ -413,7 +413,7 @@ public CustomHeaderDecorator customHeaderDecorator() {
     }
 
     public boolean isRootURIOverriden() {
-        return _endpoint == SDK_ENDPOINT;
+        return _endpoint != SDK_ENDPOINT;
     }
 
     public CustomHttpModule alternativeHTTPModule() { return _alternativeHTTPModule; }
diff --git a/client/src/main/java/io/split/client/dtos/ChangeDto.java b/client/src/main/java/io/split/client/dtos/ChangeDto.java
@@ -1,9 +1,18 @@
 package io.split.client.dtos;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class ChangeDto<T> {
     public long s;
     public long t;
     public List<T> d;
+
+    public static ChangeDto createEmptyDto() {
+        ChangeDto dto = new ChangeDto<>();
+        dto.d = new ArrayList<>();
+        dto.t = -1;
+        dto.s = -1;
+        return dto;
+    }
 }
diff --git a/client/src/main/java/io/split/client/dtos/SplitChange.java b/client/src/main/java/io/split/client/dtos/SplitChange.java
@@ -7,4 +7,5 @@ public class SplitChange {
     public ChangeDto<Split> featureFlags;
     @SerializedName("rbs")
     public ChangeDto<RuleBasedSegment> ruleBasedSegments;
+    public boolean clearCache;
 }
diff --git a/client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java b/client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java
@@ -1,5 +1,6 @@
 package io.split.engine.experiments;
 
+import io.split.Spec;
 import io.split.client.dtos.ChangeDto;
 import io.split.client.dtos.RuleBasedSegment;
 import io.split.client.dtos.Split;
@@ -20,6 +21,7 @@
 import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static io.split.Spec.SPEC_VERSION;
 import static io.split.client.utils.FeatureFlagProcessor.processFeatureFlagChanges;
 import static io.split.client.utils.RuleBasedSegmentProcessor.processRuleBasedSegmentChanges;
 
@@ -124,6 +126,11 @@ private Set<String> runWithoutExceptionHandling(FetchOptions options) throws Int
             throw new IllegalStateException("SplitChange was null");
         }
 
+        if (change.clearCache) {
+            _splitCacheProducer.clear();
+            _ruleBasedSegmentCacheProducer.clear();
+        }
+
         if (checkExitConditions(change.featureFlags, _splitCacheProducer.getChangeNumber()) ||
             checkExitConditions(change.ruleBasedSegments, _ruleBasedSegmentCacheProducer.getChangeNumber())) {
             return segments;
@@ -149,6 +156,7 @@ private Set<String> runWithoutExceptionHandling(FetchOptions options) throws Int
                 // some other thread may have updated the shared state. exit
                 return segments;
             }
+
             FeatureFlagsToUpdate featureFlagsToUpdate = processFeatureFlagChanges(_parser, change.featureFlags.d, _flagSetsFilter);
             segments = featureFlagsToUpdate.getSegments();
             _splitCacheProducer.update(featureFlagsToUpdate.getToAdd(), featureFlagsToUpdate.getToRemove(), change.featureFlags.t);
diff --git a/client/src/main/java/io/split/storages/RuleBasedSegmentCacheProducer.java b/client/src/main/java/io/split/storages/RuleBasedSegmentCacheProducer.java
@@ -8,4 +8,5 @@ public interface RuleBasedSegmentCacheProducer extends  RuleBasedSegmentCacheCom
     boolean remove(String name);
     void setChangeNumber(long changeNumber);
     void update(List<ParsedRuleBasedSegment> toAdd, List<String> toRemove, long changeNumber);
+    void clear();
 }
diff --git a/client/src/main/java/io/split/storages/memory/InMemoryCacheImp.java b/client/src/main/java/io/split/storages/memory/InMemoryCacheImp.java
@@ -140,7 +140,9 @@ public void kill(String splitName, String defaultTreatment, long changeNumber) {
     @Override
     public void clear() {
         _concurrentMap.clear();
+        _changeNumber.set(-1);
         _concurrentTrafficTypeNameSet.clear();
+        _flagSets.clear();
     }
 
     @Override
diff --git a/client/src/main/java/io/split/storages/memory/RuleBasedSegmentCacheInMemoryImp.java b/client/src/main/java/io/split/storages/memory/RuleBasedSegmentCacheInMemoryImp.java
@@ -71,7 +71,9 @@ public List<String> ruleBasedSegmentNames() {
         return ruleBasedSegmentNamesList;
     }
 
+    @Override
     public void clear() {
+        _changeNumber.set(-1);
         _concurrentMap.clear();
     }
 
diff --git a/client/src/main/java/io/split/storages/pluggable/adapters/UserCustomRuleBasedSegmentAdapterProducer.java b/client/src/main/java/io/split/storages/pluggable/adapters/UserCustomRuleBasedSegmentAdapterProducer.java
@@ -44,6 +44,11 @@ public void setChangeNumber(long changeNumber) {
         //NoOp
     }
 
+    @Override
+    public void clear() {
+        //NoOp
+    }
+
     @Override
     public void update(List<ParsedRuleBasedSegment> toAdd, List<String> toRemove, long changeNumber) {
         //NoOp
diff --git a/client/src/test/java/io/split/client/HttpSplitChangeFetcherTest.java b/client/src/test/java/io/split/client/HttpSplitChangeFetcherTest.java
@@ -262,7 +262,6 @@ public void testSwitchingToOldSpec() throws URISyntaxException, InvocationTarget
         Assert.assertEquals(0, change.ruleBasedSegments.d.size());
         Assert.assertEquals(-1, change.ruleBasedSegments.s);
         Assert.assertEquals(-1, change.ruleBasedSegments.t);
-        Assert.assertTrue(fetcher.getLastProxyCheckTimestamp() > 0);
 
         // Set proxy interval to low number to force check for spec 1.3
         Field proxyInterval = fetcher.getClass().getDeclaredField("PROXY_CHECK_INTERVAL_MILLISECONDS_SS");
diff --git a/client/src/test/java/io/split/client/JsonLocalhostSplitChangeFetcherTest.java b/client/src/test/java/io/split/client/JsonLocalhostSplitChangeFetcherTest.java
@@ -201,4 +201,23 @@ public void processTestForException() {
 
         SplitChange splitChange = localhostSplitChangeFetcher.fetch(-1L, -1, fetchOptions);
     }
+
+    @Test
+    public void testParseOldSpec() throws FileNotFoundException {
+        InputStream inputStream = new FileInputStream("src/test/resources/split_old_spec.json");
+        InputStreamProvider inputStreamProvider = new StaticContentInputStreamProvider(inputStream);
+        JsonLocalhostSplitChangeFetcher localhostSplitChangeFetcher = new JsonLocalhostSplitChangeFetcher(inputStreamProvider);
+        FetchOptions fetchOptions = Mockito.mock(FetchOptions.class);
+
+        SplitChange splitChange = localhostSplitChangeFetcher.fetch(-1L, -1, fetchOptions);
+
+        List<Split> split = splitChange.featureFlags.d;
+        Assert.assertEquals(7, split.size());
+        Assert.assertEquals(1660326991072L, splitChange.featureFlags.t);
+        Assert.assertEquals(-1L, splitChange.featureFlags.s);
+
+        Assert.assertEquals(new ArrayList<>(), splitChange.ruleBasedSegments.d);
+        Assert.assertEquals(-1L, splitChange.ruleBasedSegments.t);
+        Assert.assertEquals(-1L, splitChange.ruleBasedSegments.s);
+    }
 }
diff --git a/client/src/test/java/io/split/client/JsonLocalhostSplitFactoryTest.java b/client/src/test/java/io/split/client/JsonLocalhostSplitFactoryTest.java
@@ -32,4 +32,21 @@ public void works() throws IOException, URISyntaxException, InterruptedException
         Assert.assertEquals("on_whitelist", client.getTreatment("admin", "push_test"));
         client.destroy();
     }
+
+    @Test
+    public void testOldSpec() throws IOException, URISyntaxException, InterruptedException, TimeoutException {
+        SplitClientConfig config = SplitClientConfig.builder()
+                .splitFile("src/test/resources/split_old_spec.json")
+                .segmentDirectory("src/test/resources")
+                .setBlockUntilReadyTimeout(10000)
+                .build();
+        SplitFactory splitFactory = SplitFactoryBuilder.build("localhost", config);
+        SplitClient client = splitFactory.client();
+        client.blockUntilReady();
+
+        Assert.assertEquals("on", client.getTreatment("bilal", "split_1"));
+        Assert.assertEquals("off", client.getTreatment("bilal", "split_2"));
+        Assert.assertEquals("v5", client.getTreatment("admin", "split_2"));
+        client.destroy();
+    }
 }
diff --git a/client/src/test/java/io/split/client/SplitClientIntegrationTest.java b/client/src/test/java/io/split/client/SplitClientIntegrationTest.java
diff --git a/client/src/test/resources/split_old_spec.json b/client/src/test/resources/split_old_spec.json

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ public CustomHeaderDecorator customHeaderDecorator() {`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`public boolean isRootURIOverriden() {`
`416`		`- return _endpoint == SDK_ENDPOINT;`
	`416`	`+ return _endpoint != SDK_ENDPOINT;`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`public CustomHttpModule alternativeHTTPModule() { return _alternativeHTTPModule; }`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,5 @@ public class SplitChange {`
`7`	`7`	`public ChangeDto<Split> featureFlags;`
`8`	`8`	`@SerializedName("rbs")`
`9`	`9`	`public ChangeDto<RuleBasedSegment> ruleBasedSegments;`
	`10`	`+ public boolean clearCache;`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,5 @@ public interface RuleBasedSegmentCacheProducer extends RuleBasedSegmentCacheCom`
`8`	`8`	`boolean remove(String name);`
`9`	`9`	`void setChangeNumber(long changeNumber);`
`10`	`10`	`void update(List<ParsedRuleBasedSegment> toAdd, List<String> toRemove, long changeNumber);`
	`11`	`+ void clear();`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,9 @@ public void kill(String splitName, String defaultTreatment, long changeNumber) {`
`140`	`140`	`@Override`
`141`	`141`	`public void clear() {`
`142`	`142`	`_concurrentMap.clear();`
	`143`	`+ _changeNumber.set(-1);`
`143`	`144`	`_concurrentTrafficTypeNameSet.clear();`
	`145`	`+ _flagSets.clear();`
`144`	`146`	`}`
`145`	`147`
`146`	`148`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,9 @@ public List<String> ruleBasedSegmentNames() {`
`71`	`71`	`return ruleBasedSegmentNamesList;`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ @Override`
`74`	`75`	`public void clear() {`
	`76`	`+ _changeNumber.set(-1);`
`75`	`77`	`_concurrentMap.clear();`
`76`	`78`	`}`
`77`	`79`