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

petrov-mg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new ab2d7250ec6 IGNITE-29190 Removed duplicated code from the feature gate 
code generator (#13724)
ab2d7250ec6 is described below

commit ab2d7250ec6f38127e8310c3f9e9f48a51aba8e0
Author: Mikhail Petrov <[email protected]>
AuthorDate: Thu Oct 22 13:24:10 2026 +0300

    IGNITE-29190 Removed duplicated code from the feature gate code generator 
(#13724)
---
 .../apache/ignite/internal/MessageProcessor.java   | 29 ++++++++++--------
 .../internal/MessageSerializerGenerator.java       | 18 +++---------
 .../direct/IgniteMessageSerializationContext.java  | 34 ++++++++++------------
 3 files changed, 36 insertions(+), 45 deletions(-)

diff --git 
a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java
 
b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java
index 5305e7b628f..dc467574880 100644
--- 
a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java
+++ 
b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java
@@ -223,11 +223,13 @@ public class MessageProcessor extends AbstractProcessor {
         Map<String, VariableElement> gatedFields = new HashMap<>();
 
         for (VariableElement field : fields) {
-            Order order = field.getAnnotation(Order.class);
+            String feature = gatingFeature(field);
 
-            if (order.introducedBy().isEmpty() && 
order.deprecatedBy().isEmpty())
+            if (feature == null)
                 continue;
 
+            Order order = field.getAnnotation(Order.class);
+
             if (isSchemaImmutable) {
                 printError(
                     processingEnv,
@@ -265,8 +267,6 @@ public class MessageProcessor extends AbstractProcessor {
                 return false;
             }
 
-            String feature = order.introducedBy().isEmpty() ? 
order.deprecatedBy() : order.introducedBy();
-
             VariableElement otherField = gatedFields.put(feature, field);
 
             if (otherField != null) {
@@ -517,21 +517,16 @@ public class MessageProcessor extends AbstractProcessor {
 
     /** */
     @Nullable public static FieldFeatureGate 
buildFieldFeatureGate(ProcessingEnvironment env, VariableElement field) {
-        Order ann = field.getAnnotation(Order.class);
-
-        String introducingFeature = ann.introducedBy();
-        String deprecatingFeature = ann.deprecatedBy();
+        String feature = gatingFeature(field);
 
-        if (introducingFeature.isEmpty() && deprecatingFeature.isEmpty())
+        if (feature == null)
             return null;
 
         String regCls = resolveFeatureRegistry(field.getEnclosingElement());
 
         String regName = regCls.substring(regCls.lastIndexOf('.') + 1);
 
-        boolean introduced = !introducingFeature.isEmpty();
-
-        String feature = introduced ? introducingFeature : deprecatingFeature;
+        boolean introduced = 
!field.getAnnotation(Order.class).introducedBy().isEmpty();
 
         validateFeature(env, field, feature, regCls);
 
@@ -540,6 +535,16 @@ public class MessageProcessor extends AbstractProcessor {
             (introduced ? "ctx.includeFieldIntroducedBy(" : 
"ctx.includeFieldDeprecatedBy(") + regName + '.' + feature + ')');
     }
 
+    /** */
+    @Nullable public static String gatingFeature(VariableElement field) {
+        Order order = field.getAnnotation(Order.class);
+
+        if (!order.introducedBy().isEmpty())
+            return order.introducedBy();
+
+        return order.deprecatedBy().isEmpty() ? null : order.deprecatedBy();
+    }
+
     /** */
     private static void validateFeature(ProcessingEnvironment env, 
VariableElement field, String featureName, String regCls) {
         TypeElement regElem = env.getElementUtils().getTypeElement(regCls);
diff --git 
a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
 
b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
index 3c9120bf00e..0b29dbf8da2 100644
--- 
a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
+++ 
b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
@@ -52,6 +52,7 @@ import static 
org.apache.ignite.internal.MessageProcessor.GRID_H2_NULL;
 import static org.apache.ignite.internal.MessageProcessor.KEY_CACHE_OBJECT_CLS;
 import static org.apache.ignite.internal.MessageProcessor.MESSAGE_INTERFACE;
 import static 
org.apache.ignite.internal.MessageProcessor.buildFieldFeatureGate;
+import static org.apache.ignite.internal.MessageProcessor.gatingFeature;
 import static org.apache.ignite.internal.MessageProcessor.isSchemaImmutable;
 import static 
org.apache.ignite.internal.MessageProcessor.resolveFeatureRegistry;
 
@@ -418,7 +419,7 @@ public class MessageSerializerGenerator extends 
MessageCompanionGenerator {
         indent++;
 
         for (VariableElement field : fields) {
-            if (!gatedByFeature(field))
+            if (gatingFeature(field) == null)
                 continue;
 
             rawFieldsConsumerCode.add(indentedLine("if (f.tag() == %s) {", 
tagExpression(field)));
@@ -446,14 +447,7 @@ public class MessageSerializerGenerator extends 
MessageCompanionGenerator {
 
     /** */
     private static boolean hasGatedFields(List<VariableElement> fields) {
-        return 
fields.stream().anyMatch(MessageSerializerGenerator::gatedByFeature);
-    }
-
-    /** */
-    private static boolean gatedByFeature(VariableElement field) {
-        Order order = field.getAnnotation(Order.class);
-
-        return !order.introducedBy().isEmpty() || 
!order.deprecatedBy().isEmpty();
+        return fields.stream().anyMatch(field -> gatingFeature(field) != null);
     }
 
     /** */
@@ -471,13 +465,9 @@ public class MessageSerializerGenerator extends 
MessageCompanionGenerator {
 
     /** */
     private static String tagExpression(VariableElement field) {
-        Order order = field.getAnnotation(Order.class);
-
         String reg = resolveFeatureRegistry(field.getEnclosingElement());
 
-        String feature = order.introducedBy().isEmpty() ? order.deprecatedBy() 
: order.introducedBy();
-
-        return reg.substring(reg.lastIndexOf('.') + 1) + '.' + feature + 
".id()";
+        return reg.substring(reg.lastIndexOf('.') + 1) + '.' + 
gatingFeature(field) + ".id()";
     }
 
     /** */
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/direct/IgniteMessageSerializationContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/direct/IgniteMessageSerializationContext.java
index dabd257a6fd..adead75efd6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/direct/IgniteMessageSerializationContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/direct/IgniteMessageSerializationContext.java
@@ -136,27 +136,23 @@ public class IgniteMessageSerializationContext implements 
MessageSerializationCo
 
         int c = locCmpFeatures.version().compareTo(rmtCmpFeatures.version());
 
-        if (c == 0) {
-            assert locCmpFeatures.features().equals(rmtCmpFeatures.features());
+        IgniteComponentFeatureSet src = c <= 0 ? locCmpFeatures : 
rmtCmpFeatures;
+        IgniteComponentFeatureSet target = c <= 0 ? rmtCmpFeatures : 
locCmpFeatures;
 
-            // Newly introduced fields are included. Deprecated fields are 
excluded. A deprecated field holding a
-            // non-default value is written to the raw-field suffix instead.
-            return new 
ComponentMessageSerializationContext(rmtCmpFeatures.features(), 
rmtCmpFeatures.features());
-        }
-        else {
-            IgniteComponentFeatureSet src = c < 0 ? locCmpFeatures : 
rmtCmpFeatures;
-            IgniteComponentFeatureSet target = c < 0 ? rmtCmpFeatures : 
locCmpFeatures;
-
-            if (!src.isUpgradableTo(target)) {
-                throw new UnsupportedNodeVersionException("Remote node 
component versions are not supported" +
-                    " [component=" + cmpName +
-                    ", locComponent=" + locCmpFeatures +
-                    ", rmtComponent=" + rmtCmpFeatures + ']');
-            }
-
-            // The old version dictates the serialization rules.
-            return new ComponentMessageSerializationContext(src.features(), 
src.features());
+        assert c != 0 || src.features().equals(target.features());
+
+        if (!src.isUpgradableTo(target)) {
+            throw new UnsupportedNodeVersionException("Remote node component 
versions are not supported" +
+                " [component=" + cmpName +
+                ", locComponent=" + locCmpFeatures +
+                ", rmtComponent=" + rmtCmpFeatures + ']');
         }
+
+        // The older version dictates the serialization rules, either one when 
the versions are equal. Fields introduced
+        // by its features are included in the positional part, fields 
deprecated by its features are excluded from it.
+        // If a field excluded from the positional part holds a non-default 
value, it is written to the raw-field suffix
+        // instead.
+        return new ComponentMessageSerializationContext(src.features(), 
src.features());
     }
 
     /** {@inheritDoc} */

Reply via email to