From 56f811c9c111e7be97da69ab3572f6504ae16bbc Mon Sep 17 00:00:00 2001
From: zstan <stanilovsky@gmail.com>
Date: Thu, 12 Oct 2023 14:55:59 +0300
Subject: [PATCH] fix after review

---
 .../internal/sql/engine/exec/RowConverter.java       | 12 ++++--------
 .../sql/engine/exec/exp/ExpressionFactoryImpl.java   |  5 -----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/RowConverter.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/RowConverter.java
index bb7834290783..9588a93c3110 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/RowConverter.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/RowConverter.java
@@ -73,14 +73,9 @@ static <RowT> BinaryTuplePrefix toBinaryTuplePrefix(
 
         assert prefixColumnsCount == indexedColumnsCount : "Invalid range condition";
 
-        int rowColumnsCount = 0;
-        for (int i = 0; i < prefixColumnsCount; i++) {
-            if (unspecified.get(i)) {
-                break;
-            }
+        int pos = unspecified.nextSetBit(0);
 
-            rowColumnsCount++;
-        }
+        int rowColumnsCount = pos == -1 ? prefixColumnsCount : pos;
 
         BinaryTuplePrefixBuilder tupleBuilder = new BinaryTuplePrefixBuilder(rowColumnsCount, indexedColumnsCount);
 
@@ -118,7 +113,8 @@ private static <RowT> ByteBuffer toByteBuffer(
             BinaryTupleSchema binarySchema,
             RowHandler<RowT> handler,
             BinaryTupleBuilder tupleBuilder,
-            RowT searchRow, int colCount
+            RowT searchRow,
+            int colCount
     ) {
         for (int i = 0; i < colCount; i++) {
             Object val = handler.get(i, searchRow);
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/ExpressionFactoryImpl.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/ExpressionFactoryImpl.java
index fa98b674e372..ef6d5fdc55eb 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/ExpressionFactoryImpl.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/ExpressionFactoryImpl.java
@@ -92,11 +92,6 @@
 public class ExpressionFactoryImpl<RowT> implements ExpressionFactory<RowT> {
     private static final int CACHE_SIZE = 1024;
 
-    // We use enums for placeholders because enum serialization/deserialization guarantees to preserve object's identity.
-    private enum Placeholder {
-        UNSPECIFIED_VALUE
-    }
-
     private static final ConcurrentMap<String, Scalar> SCALAR_CACHE = Caffeine.newBuilder()
             .maximumSize(CACHE_SIZE)
             .<String, Scalar>build()