IGNITE-20478 Sql. Get rid of UNSPECIFIED_VALUE_PLACEHOLDER

modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSecondaryIndexTest.java

@@ -51,7 +51,7 @@ public class ItSecondaryIndexTest extends ClusterPerClassIntegrationTest {
      * Before all.
      */
     @BeforeAll
-    static void initTestData() throws InterruptedException {
+    static void initTestData() {
         sql("CREATE TABLE developer (id INT PRIMARY KEY, name VARCHAR, depid INT, city VARCHAR, age INT)");
         sql("CREATE INDEX " + DEPID_IDX + " ON developer (depid)");
         sql("CREATE INDEX " + NAME_CITY_IDX + " ON developer (name DESC, city DESC)");

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/RowConverter.java

@@ -17,8 +17,6 @@
 
 package org.apache.ignite.internal.sql.engine.exec;
 
-import static org.apache.ignite.internal.sql.engine.exec.exp.ExpressionFactoryImpl.UNSPECIFIED_VALUE_PLACEHOLDER;
-
 import java.nio.ByteBuffer;
 import java.util.List;
 import org.apache.ignite.internal.binarytuple.BinaryTupleBuilder;
@@ -31,7 +29,6 @@
 import org.apache.ignite.internal.sql.engine.schema.TableDescriptor;
 import org.apache.ignite.internal.sql.engine.util.TypeUtils;
 import org.apache.ignite.internal.type.NativeTypeSpec;
-import org.apache.ignite.internal.util.IgniteUtils;
 
 /**
  * Helper class provides method to convert binary tuple to rows and vice-versa.
@@ -59,7 +56,7 @@ public static BinaryTupleSchema createIndexRowSchema(List<String> indexedColumns
      * @param <RowT> Row type.
      * @return Binary tuple.
      */
-    public static <RowT> BinaryTuplePrefix toBinaryTuplePrefix(
+    static <RowT> BinaryTuplePrefix toBinaryTuplePrefix(
             ExecutionContext<RowT> ectx,
             BinaryTupleSchema binarySchema,
             RowHandler.RowFactory<RowT> factory,
@@ -70,20 +67,11 @@ public static <RowT> BinaryTuplePrefix toBinaryTuplePrefix(
         int indexedColumnsCount = binarySchema.elementCount();
         int prefixColumnsCount = handler.columnCount(searchRow);
 
-        assert prefixColumnsCount == indexedColumnsCount : "Invalid range condition";
-
-        int specifiedCols = 0;
-        for (int i = 0; i < prefixColumnsCount; i++) {
-            if (handler.get(i, searchRow) == UNSPECIFIED_VALUE_PLACEHOLDER) {
-                break;
-            }
-
-            specifiedCols++;
-        }
+        assert binarySchema.elementCount() >= prefixColumnsCount : "Invalid range condition";
 
-        BinaryTuplePrefixBuilder tupleBuilder = new BinaryTuplePrefixBuilder(specifiedCols, indexedColumnsCount);
+        BinaryTuplePrefixBuilder tupleBuilder = new BinaryTuplePrefixBuilder(prefixColumnsCount, indexedColumnsCount);
 
-        return new BinaryTuplePrefix(indexedColumnsCount, toByteBuffer(ectx, binarySchema, handler, tupleBuilder, searchRow));
+        return new BinaryTuplePrefix(indexedColumnsCount, toByteBuffer(binarySchema, handler, tupleBuilder, searchRow));
     }
 
     /**
@@ -108,21 +96,12 @@ public static <RowT> BinaryTuple toBinaryTuple(
 
         assert rowColumnsCount == binarySchema.elementCount() : "Invalid lookup key.";
 
-        if (IgniteUtils.assertionsEnabled()) {
-            for (int i = 0; i < rowColumnsCount; i++) {
-                if (handler.get(i, searchRow) == UNSPECIFIED_VALUE_PLACEHOLDER) {
-                    throw new AssertionError("Invalid lookup key.");
-                }
-            }
-        }
-
         BinaryTupleBuilder tupleBuilder = new BinaryTupleBuilder(rowColumnsCount);
 
-        return new BinaryTuple(rowColumnsCount, toByteBuffer(ectx, binarySchema, handler, tupleBuilder, searchRow));
+        return new BinaryTuple(rowColumnsCount, toByteBuffer(binarySchema, handler, tupleBuilder, searchRow));
     }
 
     private static <RowT> ByteBuffer toByteBuffer(
-            ExecutionContext<RowT> ectx,
             BinaryTupleSchema binarySchema,
             RowHandler<RowT> handler,
             BinaryTupleBuilder tupleBuilder,
@@ -133,10 +112,6 @@ private static <RowT> ByteBuffer toByteBuffer(
         for (int i = 0; i < columnsCount; i++) {
             Object val = handler.get(i, searchRow);
 
-            if (val == UNSPECIFIED_VALUE_PLACEHOLDER) {
-                break; // No more columns in prefix.
-            }
-
             Element element = binarySchema.element(i);
 
             val = TypeUtils.fromInternal(val, NativeTypeSpec.toClass(element.typeSpec(), element.nullable()));

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ScannableTableImpl.java

@@ -183,18 +183,20 @@ public <RowT> Publisher<RowT> indexLookup(
         return new TransformingPublisher<>(pub, item -> rowConverter.toRow(ctx, item, rowFactory));
     }
 
-    private <RowT> @Nullable BinaryTuplePrefix toBinaryTuplePrefix(ExecutionContext<RowT> ctx,
+    private static <RowT> @Nullable BinaryTuplePrefix toBinaryTuplePrefix(
+            ExecutionContext<RowT> ctx,
             BinaryTupleSchema indexRowSchema,
-            @Nullable RowT condition, RowFactory<RowT> factory) {
-
+            @Nullable RowT condition,
+            RowFactory<RowT> factory
+    ) {
         if (condition == null) {
             return null;
         }
 
         return RowConverter.toBinaryTuplePrefix(ctx, indexRowSchema, factory, condition);
     }
 
-    private <RowT> @Nullable BinaryTuple toBinaryTuple(ExecutionContext<RowT> ctx, BinaryTupleSchema indexRowSchema,
+    private static <RowT> @Nullable BinaryTuple toBinaryTuple(ExecutionContext<RowT> ctx, BinaryTupleSchema indexRowSchema,
             @Nullable RowT condition, RowFactory<RowT> factory) {
         if (condition == null) {
             return null;

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/SqlRowHandler.java

@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.sql.engine.exec;
 
 import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
-import static org.apache.ignite.internal.sql.engine.exec.exp.ExpressionFactoryImpl.UNSPECIFIED_VALUE_PLACEHOLDER;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -233,8 +232,6 @@ ByteBuffer toByteBuffer() {
             for (int i = 0; i < row.length; i++) {
                 Object value = row[i];
 
-                assert value != UNSPECIFIED_VALUE_PLACEHOLDER : "Invalid row value.";
-
                 appendValue(tupleBuilder, rowSchema.fields().get(i), value);
             }