You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by aa...@apache.org on 2022/07/15 05:09:55 UTC

[rocketmq-apis] branch java updated: Apply IDL update

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

aaronai pushed a commit to branch java
in repository https://gitbox.apache.org/repos/asf/rocketmq-apis.git


The following commit(s) were added to refs/heads/java by this push:
     new 0047e59  Apply IDL update
0047e59 is described below

commit 0047e595a2a05a099837c4c0b0108dfd795146da
Author: 凌楚 <ya...@alibaba-inc.com>
AuthorDate: Fri Jul 15 13:09:48 2022 +0800

    Apply IDL update
---
 .../java/apache/rocketmq/v2/CustomizedBackoff.java | 46 +++++++++++-----------
 .../rocketmq/v2/CustomizedBackoffOrBuilder.java    | 10 ++---
 src/main/java/apache/rocketmq/v2/Digest.java       |  6 ---
 src/main/java/apache/rocketmq/v2/Publishing.java   |  8 ++--
 .../apache/rocketmq/v2/PublishingOrBuilder.java    |  2 +-
 src/main/java/apache/rocketmq/v2/Settings.java     | 24 +++++------
 .../java/apache/rocketmq/v2/SettingsOrBuilder.java |  6 +--
 src/main/java/apache/rocketmq/v2/Subscription.java | 12 +++---
 .../apache/rocketmq/v2/SubscriptionOrBuilder.java  |  4 +-
 .../proto/apache/rocketmq/v2/definition.proto      | 12 ++----
 10 files changed, 60 insertions(+), 70 deletions(-)

diff --git a/src/main/java/apache/rocketmq/v2/CustomizedBackoff.java b/src/main/java/apache/rocketmq/v2/CustomizedBackoff.java
index 00ec61f..92695f4 100644
--- a/src/main/java/apache/rocketmq/v2/CustomizedBackoff.java
+++ b/src/main/java/apache/rocketmq/v2/CustomizedBackoff.java
@@ -100,7 +100,7 @@ private static final long serialVersionUID = 0L;
   private java.util.List<com.google.protobuf.Duration> next_;
   /**
    * <pre>
-   * To support classic backoff strategy which is arbitary defined by end users.
+   * To support classic backoff strategy which is arbitrary defined by end users.
    * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
    * </pre>
    *
@@ -112,7 +112,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * To support classic backoff strategy which is arbitary defined by end users.
+   * To support classic backoff strategy which is arbitrary defined by end users.
    * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
    * </pre>
    *
@@ -125,7 +125,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * To support classic backoff strategy which is arbitary defined by end users.
+   * To support classic backoff strategy which is arbitrary defined by end users.
    * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
    * </pre>
    *
@@ -137,7 +137,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * To support classic backoff strategy which is arbitary defined by end users.
+   * To support classic backoff strategy which is arbitrary defined by end users.
    * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
    * </pre>
    *
@@ -149,7 +149,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * To support classic backoff strategy which is arbitary defined by end users.
+   * To support classic backoff strategy which is arbitrary defined by end users.
    * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
    * </pre>
    *
@@ -517,7 +517,7 @@ private static final long serialVersionUID = 0L;
 
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -532,7 +532,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -547,7 +547,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -562,7 +562,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -584,7 +584,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -603,7 +603,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -624,7 +624,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -646,7 +646,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -665,7 +665,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -684,7 +684,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -704,7 +704,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -722,7 +722,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -740,7 +740,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -752,7 +752,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -767,7 +767,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -783,7 +783,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -795,7 +795,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
@@ -808,7 +808,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * To support classic backoff strategy which is arbitary defined by end users.
+     * To support classic backoff strategy which is arbitrary defined by end users.
      * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
      * </pre>
      *
diff --git a/src/main/java/apache/rocketmq/v2/CustomizedBackoffOrBuilder.java b/src/main/java/apache/rocketmq/v2/CustomizedBackoffOrBuilder.java
index eb65f62..8b882ae 100644
--- a/src/main/java/apache/rocketmq/v2/CustomizedBackoffOrBuilder.java
+++ b/src/main/java/apache/rocketmq/v2/CustomizedBackoffOrBuilder.java
@@ -9,7 +9,7 @@ public interface CustomizedBackoffOrBuilder extends
 
   /**
    * <pre>
-   * To support classic backoff strategy which is arbitary defined by end users.
+   * To support classic backoff strategy which is arbitrary defined by end users.
    * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
    * </pre>
    *
@@ -19,7 +19,7 @@ public interface CustomizedBackoffOrBuilder extends
       getNextList();
   /**
    * <pre>
-   * To support classic backoff strategy which is arbitary defined by end users.
+   * To support classic backoff strategy which is arbitrary defined by end users.
    * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
    * </pre>
    *
@@ -28,7 +28,7 @@ public interface CustomizedBackoffOrBuilder extends
   com.google.protobuf.Duration getNext(int index);
   /**
    * <pre>
-   * To support classic backoff strategy which is arbitary defined by end users.
+   * To support classic backoff strategy which is arbitrary defined by end users.
    * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
    * </pre>
    *
@@ -37,7 +37,7 @@ public interface CustomizedBackoffOrBuilder extends
   int getNextCount();
   /**
    * <pre>
-   * To support classic backoff strategy which is arbitary defined by end users.
+   * To support classic backoff strategy which is arbitrary defined by end users.
    * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
    * </pre>
    *
@@ -47,7 +47,7 @@ public interface CustomizedBackoffOrBuilder extends
       getNextOrBuilderList();
   /**
    * <pre>
-   * To support classic backoff strategy which is arbitary defined by end users.
+   * To support classic backoff strategy which is arbitrary defined by end users.
    * Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
    * </pre>
    *
diff --git a/src/main/java/apache/rocketmq/v2/Digest.java b/src/main/java/apache/rocketmq/v2/Digest.java
index 03056b0..39e36e6 100644
--- a/src/main/java/apache/rocketmq/v2/Digest.java
+++ b/src/main/java/apache/rocketmq/v2/Digest.java
@@ -14,9 +14,6 @@ package apache.rocketmq.v2;
  * 1) Standard messages should be negatively acknowledged instantly, causing
  * immediate re-delivery; 2) FIFO messages require special RPC, to re-fetch
  * previously acquired messages batch;
- * Message consumption model also affects how invalid digest are handled. When
- * messages are consumed in broadcasting way,
- * TODO: define semantics of invalid-digest-when-broadcasting.
  * </pre>
  *
  * Protobuf type {@code apache.rocketmq.v2.Digest}
@@ -343,9 +340,6 @@ private static final long serialVersionUID = 0L;
    * 1) Standard messages should be negatively acknowledged instantly, causing
    * immediate re-delivery; 2) FIFO messages require special RPC, to re-fetch
    * previously acquired messages batch;
-   * Message consumption model also affects how invalid digest are handled. When
-   * messages are consumed in broadcasting way,
-   * TODO: define semantics of invalid-digest-when-broadcasting.
    * </pre>
    *
    * Protobuf type {@code apache.rocketmq.v2.Digest}
diff --git a/src/main/java/apache/rocketmq/v2/Publishing.java b/src/main/java/apache/rocketmq/v2/Publishing.java
index 0c02272..d2c7c99 100644
--- a/src/main/java/apache/rocketmq/v2/Publishing.java
+++ b/src/main/java/apache/rocketmq/v2/Publishing.java
@@ -198,7 +198,7 @@ private static final long serialVersionUID = 0L;
   /**
    * <pre>
    * When `validate_message_type` flag set `false`, no need to validate message's type
-   * with messageQueue's `accept_message_types` before publising.
+   * with messageQueue's `accept_message_types` before publishing.
    * </pre>
    *
    * <code>bool validate_message_type = 3;</code>
@@ -987,7 +987,7 @@ private static final long serialVersionUID = 0L;
     /**
      * <pre>
      * When `validate_message_type` flag set `false`, no need to validate message's type
-     * with messageQueue's `accept_message_types` before publising.
+     * with messageQueue's `accept_message_types` before publishing.
      * </pre>
      *
      * <code>bool validate_message_type = 3;</code>
@@ -1000,7 +1000,7 @@ private static final long serialVersionUID = 0L;
     /**
      * <pre>
      * When `validate_message_type` flag set `false`, no need to validate message's type
-     * with messageQueue's `accept_message_types` before publising.
+     * with messageQueue's `accept_message_types` before publishing.
      * </pre>
      *
      * <code>bool validate_message_type = 3;</code>
@@ -1016,7 +1016,7 @@ private static final long serialVersionUID = 0L;
     /**
      * <pre>
      * When `validate_message_type` flag set `false`, no need to validate message's type
-     * with messageQueue's `accept_message_types` before publising.
+     * with messageQueue's `accept_message_types` before publishing.
      * </pre>
      *
      * <code>bool validate_message_type = 3;</code>
diff --git a/src/main/java/apache/rocketmq/v2/PublishingOrBuilder.java b/src/main/java/apache/rocketmq/v2/PublishingOrBuilder.java
index 21948d4..8cff4a4 100644
--- a/src/main/java/apache/rocketmq/v2/PublishingOrBuilder.java
+++ b/src/main/java/apache/rocketmq/v2/PublishingOrBuilder.java
@@ -76,7 +76,7 @@ public interface PublishingOrBuilder extends
   /**
    * <pre>
    * When `validate_message_type` flag set `false`, no need to validate message's type
-   * with messageQueue's `accept_message_types` before publising.
+   * with messageQueue's `accept_message_types` before publishing.
    * </pre>
    *
    * <code>bool validate_message_type = 3;</code>
diff --git a/src/main/java/apache/rocketmq/v2/Settings.java b/src/main/java/apache/rocketmq/v2/Settings.java
index 378e29a..28b05fd 100644
--- a/src/main/java/apache/rocketmq/v2/Settings.java
+++ b/src/main/java/apache/rocketmq/v2/Settings.java
@@ -299,7 +299,7 @@ private static final long serialVersionUID = 0L;
    * When processing message fails, `backoff_policy` describes an interval
    * after which the message should be available to consume again.
    * For FIFO messages, the interval should be relatively small because
-   * messages of the same message group would not be readily available utill
+   * messages of the same message group would not be readily available until
    * the prior one depletes its lifecycle.
    * </pre>
    *
@@ -318,7 +318,7 @@ private static final long serialVersionUID = 0L;
    * When processing message fails, `backoff_policy` describes an interval
    * after which the message should be available to consume again.
    * For FIFO messages, the interval should be relatively small because
-   * messages of the same message group would not be readily available utill
+   * messages of the same message group would not be readily available until
    * the prior one depletes its lifecycle.
    * </pre>
    *
@@ -337,7 +337,7 @@ private static final long serialVersionUID = 0L;
    * When processing message fails, `backoff_policy` describes an interval
    * after which the message should be available to consume again.
    * For FIFO messages, the interval should be relatively small because
-   * messages of the same message group would not be readily available utill
+   * messages of the same message group would not be readily available until
    * the prior one depletes its lifecycle.
    * </pre>
    *
@@ -1287,7 +1287,7 @@ private static final long serialVersionUID = 0L;
      * When processing message fails, `backoff_policy` describes an interval
      * after which the message should be available to consume again.
      * For FIFO messages, the interval should be relatively small because
-     * messages of the same message group would not be readily available utill
+     * messages of the same message group would not be readily available until
      * the prior one depletes its lifecycle.
      * </pre>
      *
@@ -1305,7 +1305,7 @@ private static final long serialVersionUID = 0L;
      * When processing message fails, `backoff_policy` describes an interval
      * after which the message should be available to consume again.
      * For FIFO messages, the interval should be relatively small because
-     * messages of the same message group would not be readily available utill
+     * messages of the same message group would not be readily available until
      * the prior one depletes its lifecycle.
      * </pre>
      *
@@ -1327,7 +1327,7 @@ private static final long serialVersionUID = 0L;
      * When processing message fails, `backoff_policy` describes an interval
      * after which the message should be available to consume again.
      * For FIFO messages, the interval should be relatively small because
-     * messages of the same message group would not be readily available utill
+     * messages of the same message group would not be readily available until
      * the prior one depletes its lifecycle.
      * </pre>
      *
@@ -1354,7 +1354,7 @@ private static final long serialVersionUID = 0L;
      * When processing message fails, `backoff_policy` describes an interval
      * after which the message should be available to consume again.
      * For FIFO messages, the interval should be relatively small because
-     * messages of the same message group would not be readily available utill
+     * messages of the same message group would not be readily available until
      * the prior one depletes its lifecycle.
      * </pre>
      *
@@ -1379,7 +1379,7 @@ private static final long serialVersionUID = 0L;
      * When processing message fails, `backoff_policy` describes an interval
      * after which the message should be available to consume again.
      * For FIFO messages, the interval should be relatively small because
-     * messages of the same message group would not be readily available utill
+     * messages of the same message group would not be readily available until
      * the prior one depletes its lifecycle.
      * </pre>
      *
@@ -1410,7 +1410,7 @@ private static final long serialVersionUID = 0L;
      * When processing message fails, `backoff_policy` describes an interval
      * after which the message should be available to consume again.
      * For FIFO messages, the interval should be relatively small because
-     * messages of the same message group would not be readily available utill
+     * messages of the same message group would not be readily available until
      * the prior one depletes its lifecycle.
      * </pre>
      *
@@ -1434,7 +1434,7 @@ private static final long serialVersionUID = 0L;
      * When processing message fails, `backoff_policy` describes an interval
      * after which the message should be available to consume again.
      * For FIFO messages, the interval should be relatively small because
-     * messages of the same message group would not be readily available utill
+     * messages of the same message group would not be readily available until
      * the prior one depletes its lifecycle.
      * </pre>
      *
@@ -1453,7 +1453,7 @@ private static final long serialVersionUID = 0L;
      * When processing message fails, `backoff_policy` describes an interval
      * after which the message should be available to consume again.
      * For FIFO messages, the interval should be relatively small because
-     * messages of the same message group would not be readily available utill
+     * messages of the same message group would not be readily available until
      * the prior one depletes its lifecycle.
      * </pre>
      *
@@ -1475,7 +1475,7 @@ private static final long serialVersionUID = 0L;
      * When processing message fails, `backoff_policy` describes an interval
      * after which the message should be available to consume again.
      * For FIFO messages, the interval should be relatively small because
-     * messages of the same message group would not be readily available utill
+     * messages of the same message group would not be readily available until
      * the prior one depletes its lifecycle.
      * </pre>
      *
diff --git a/src/main/java/apache/rocketmq/v2/SettingsOrBuilder.java b/src/main/java/apache/rocketmq/v2/SettingsOrBuilder.java
index 050e4f2..58b8cb9 100644
--- a/src/main/java/apache/rocketmq/v2/SettingsOrBuilder.java
+++ b/src/main/java/apache/rocketmq/v2/SettingsOrBuilder.java
@@ -58,7 +58,7 @@ public interface SettingsOrBuilder extends
    * When processing message fails, `backoff_policy` describes an interval
    * after which the message should be available to consume again.
    * For FIFO messages, the interval should be relatively small because
-   * messages of the same message group would not be readily available utill
+   * messages of the same message group would not be readily available until
    * the prior one depletes its lifecycle.
    * </pre>
    *
@@ -74,7 +74,7 @@ public interface SettingsOrBuilder extends
    * When processing message fails, `backoff_policy` describes an interval
    * after which the message should be available to consume again.
    * For FIFO messages, the interval should be relatively small because
-   * messages of the same message group would not be readily available utill
+   * messages of the same message group would not be readily available until
    * the prior one depletes its lifecycle.
    * </pre>
    *
@@ -90,7 +90,7 @@ public interface SettingsOrBuilder extends
    * When processing message fails, `backoff_policy` describes an interval
    * after which the message should be available to consume again.
    * For FIFO messages, the interval should be relatively small because
-   * messages of the same message group would not be readily available utill
+   * messages of the same message group would not be readily available until
    * the prior one depletes its lifecycle.
    * </pre>
    *
diff --git a/src/main/java/apache/rocketmq/v2/Subscription.java b/src/main/java/apache/rocketmq/v2/Subscription.java
index 91e2764..9005392 100644
--- a/src/main/java/apache/rocketmq/v2/Subscription.java
+++ b/src/main/java/apache/rocketmq/v2/Subscription.java
@@ -245,7 +245,7 @@ private static final long serialVersionUID = 0L;
    * server to push.
    * When FIFO flag is `true`, messages of the same message group are processed
    * in first-in-first-out manner.
-   * Brokers will not deliver further messages of the same group utill prior
+   * Brokers will not deliver further messages of the same group until prior
    * ones are completely acknowledged.
    * </pre>
    *
@@ -262,7 +262,7 @@ private static final long serialVersionUID = 0L;
    * server to push.
    * When FIFO flag is `true`, messages of the same message group are processed
    * in first-in-first-out manner.
-   * Brokers will not deliver further messages of the same group utill prior
+   * Brokers will not deliver further messages of the same group until prior
    * ones are completely acknowledged.
    * </pre>
    *
@@ -1298,7 +1298,7 @@ private static final long serialVersionUID = 0L;
      * server to push.
      * When FIFO flag is `true`, messages of the same message group are processed
      * in first-in-first-out manner.
-     * Brokers will not deliver further messages of the same group utill prior
+     * Brokers will not deliver further messages of the same group until prior
      * ones are completely acknowledged.
      * </pre>
      *
@@ -1315,7 +1315,7 @@ private static final long serialVersionUID = 0L;
      * server to push.
      * When FIFO flag is `true`, messages of the same message group are processed
      * in first-in-first-out manner.
-     * Brokers will not deliver further messages of the same group utill prior
+     * Brokers will not deliver further messages of the same group until prior
      * ones are completely acknowledged.
      * </pre>
      *
@@ -1332,7 +1332,7 @@ private static final long serialVersionUID = 0L;
      * server to push.
      * When FIFO flag is `true`, messages of the same message group are processed
      * in first-in-first-out manner.
-     * Brokers will not deliver further messages of the same group utill prior
+     * Brokers will not deliver further messages of the same group until prior
      * ones are completely acknowledged.
      * </pre>
      *
@@ -1352,7 +1352,7 @@ private static final long serialVersionUID = 0L;
      * server to push.
      * When FIFO flag is `true`, messages of the same message group are processed
      * in first-in-first-out manner.
-     * Brokers will not deliver further messages of the same group utill prior
+     * Brokers will not deliver further messages of the same group until prior
      * ones are completely acknowledged.
      * </pre>
      *
diff --git a/src/main/java/apache/rocketmq/v2/SubscriptionOrBuilder.java b/src/main/java/apache/rocketmq/v2/SubscriptionOrBuilder.java
index 41390a9..08ace14 100644
--- a/src/main/java/apache/rocketmq/v2/SubscriptionOrBuilder.java
+++ b/src/main/java/apache/rocketmq/v2/SubscriptionOrBuilder.java
@@ -90,7 +90,7 @@ public interface SubscriptionOrBuilder extends
    * server to push.
    * When FIFO flag is `true`, messages of the same message group are processed
    * in first-in-first-out manner.
-   * Brokers will not deliver further messages of the same group utill prior
+   * Brokers will not deliver further messages of the same group until prior
    * ones are completely acknowledged.
    * </pre>
    *
@@ -104,7 +104,7 @@ public interface SubscriptionOrBuilder extends
    * server to push.
    * When FIFO flag is `true`, messages of the same message group are processed
    * in first-in-first-out manner.
-   * Brokers will not deliver further messages of the same group utill prior
+   * Brokers will not deliver further messages of the same group until prior
    * ones are completely acknowledged.
    * </pre>
    *
diff --git a/src/main/resources/proto/apache/rocketmq/v2/definition.proto b/src/main/resources/proto/apache/rocketmq/v2/definition.proto
index 9d573f8..02b009a 100644
--- a/src/main/resources/proto/apache/rocketmq/v2/definition.proto
+++ b/src/main/resources/proto/apache/rocketmq/v2/definition.proto
@@ -74,7 +74,7 @@ message ExponentialBackoff {
 }
 
 message CustomizedBackoff {
-  // To support classic backoff strategy which is arbitary defined by end users.
+  // To support classic backoff strategy which is arbitrary defined by end users.
   // Typical values are: `1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h`
   repeated google.protobuf.Duration next = 1;
 }
@@ -175,10 +175,6 @@ enum DigestType {
 // 1) Standard messages should be negatively acknowledged instantly, causing
 // immediate re-delivery; 2) FIFO messages require special RPC, to re-fetch
 // previously acquired messages batch;
-//
-// Message consumption model also affects how invalid digest are handled. When
-// messages are consumed in broadcasting way,
-// TODO: define semantics of invalid-digest-when-broadcasting.
 message Digest {
   DigestType type = 1;
   string checksum = 2;
@@ -471,7 +467,7 @@ message Settings {
   // after which the message should be available to consume again.
   //
   // For FIFO messages, the interval should be relatively small because
-  // messages of the same message group would not be readily available utill
+  // messages of the same message group would not be readily available until
   // the prior one depletes its lifecycle.
   optional RetryPolicy backoff_policy = 3;
 
@@ -503,7 +499,7 @@ message Publishing {
   int32 max_body_size = 2;
 
   // When `validate_message_type` flag set `false`, no need to validate message's type
-  // with messageQueue's `accept_message_types` before publising.
+  // with messageQueue's `accept_message_types` before publishing.
   bool validate_message_type = 3;
 }
 
@@ -523,7 +519,7 @@ message Subscription {
   // When FIFO flag is `true`, messages of the same message group are processed
   // in first-in-first-out manner.
   //
-  // Brokers will not deliver further messages of the same group utill prior
+  // Brokers will not deliver further messages of the same group until prior
   // ones are completely acknowledged.
   optional bool fifo = 3;