You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by db...@apache.org on 2022/06/02 17:55:24 UTC

[geode] branch develop updated: GEODE-10348: Fix documentation on conflation (#7746)

This is an automated email from the ASF dual-hosted git repository.

dbarnes 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 03875b8eac GEODE-10348: Fix documentation on conflation (#7746)
03875b8eac is described below

commit 03875b8eac351ee901377155fcb841bbd3c11b10
Author: Alberto Gomez <al...@est.tech>
AuthorDate: Thu Jun 2 19:55:19 2022 +0200

    GEODE-10348: Fix documentation on conflation (#7746)
    
    The Geode documentation states on conflation:
    "When an update is added to a queue that has conflation enabled,
    if there is already an update message in the queue for the
    entry key, then the existing message assumes the value of the
    new update and the new update is dropped, as shown here for key A."
    
    Nevertheless, that is not correct. The actual behavior is the following:
    "When an update is added to a queue that has conflation enabled,
    if there is already an update message in the queue for the
    entry key, then the existing message is removed and the new
    update is added to the end of the queue, as shown here for key A."
    
    The text has been updated as well as the the figure with the example.
---
 .../events/conflate_multisite_gateway_queue.html.md.erb  |   4 ++--
 geode-docs/images/MultiSite-4.gif                        | Bin 4991 -> 0 bytes
 geode-docs/images_svg/MultiSite-4.svg                    |   4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/geode-docs/developing/events/conflate_multisite_gateway_queue.html.md.erb b/geode-docs/developing/events/conflate_multisite_gateway_queue.html.md.erb
index 5fa8df905c..4d2ed5f0bc 100644
--- a/geode-docs/developing/events/conflate_multisite_gateway_queue.html.md.erb
+++ b/geode-docs/developing/events/conflate_multisite_gateway_queue.html.md.erb
@@ -25,9 +25,9 @@ Conflating a queue improves distribution performance. When conflation is enabled
 **Note:**
 Do not use conflation if your receiving applications depend on the specific ordering of entry modifications, or if they need to be notified of every change to an entry.
 
-Conflation is most useful when a single entry is updated frequently, but other sites only need to know the current value of the entry (rather than the value of each update). When an update is added to a queue that has conflation enabled, if there is already an update message in the queue for the entry key, then the existing message assumes the value of the new update and the new update is dropped, as shown here for key A.
+Conflation is most useful when a single entry is updated frequently, but other sites only need to know the current value of the entry (rather than the value of each update). When an update is added to a queue that has conflation enabled, if there is already an update message in the queue for the entry key, then the existing message is removed and the new update is added to the end of the queue, as shown here for key A.
 
-<img src="../../images/MultiSite-4.gif" id="conflate_multisite_gateway_queue__image_27219DAAB6D643348641389DBAEA1E94" class="image" />
+<img src="../../images_svg/MultiSite-4.svg" id="conflate_multisite_gateway_queue__image_27219DAAB6D643348641389DBAEA1E94" class="image" />
 
 **Note:**
 This method of conflation is different from the one used for server-to-client subscription queue conflation and peer-to-peer distribution within a cluster.
diff --git a/geode-docs/images/MultiSite-4.gif b/geode-docs/images/MultiSite-4.gif
deleted file mode 100644
index c4a4b7d16f..0000000000
Binary files a/geode-docs/images/MultiSite-4.gif and /dev/null differ
diff --git a/geode-docs/images_svg/MultiSite-4.svg b/geode-docs/images_svg/MultiSite-4.svg
new file mode 100644
index 0000000000..e58a4e6a02
--- /dev/null
+++ b/geode-docs/images_svg/MultiSite-4.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Do not edit this file with editors other than diagrams.net -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="624px" height="391px" viewBox="-0.5 -0.5 624 391" content="&lt;mxfile host=&quot;Electron&quot; modified=&quot;2022-06-01T08:05:30.280Z&quot; agent=&quot;5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/17.2.4 Chrome/96.0.4664.174 Electron/16.1.0 Safari/537.36&quot; etag=&quot;owQXNkmOwgtk-nMk95M2&quot; version=&quot;17.2.4&quot; type=&quot;device&quot;&gt;&lt;dia [...]
\ No newline at end of file