Explorar o código

Remove Block#nullValuesCount (#108916)

This change removes Block#nullValuesCount. While there is no practical 
usage for this method, exposing it would add burden to the
implementation of new blocks.
Nhat Nguyen hai 1 ano
pai
achega
ff73076e91

+ 1 - 2
x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/AbstractArrayBlock.java

@@ -113,8 +113,7 @@ abstract class AbstractArrayBlock extends AbstractNonThreadSafeRefCounted implem
         return nullsMask != null;
     }
 
-    @Override
-    public final int nullValuesCount() {
+    final int nullValuesCount() {
         return mayHaveNulls() ? nullsMask.cardinality() : 0;
     }
 

+ 0 - 5
x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/AbstractVectorBlock.java

@@ -31,11 +31,6 @@ abstract class AbstractVectorBlock extends AbstractNonThreadSafeRefCounted imple
         return false;
     }
 
-    @Override
-    public final int nullValuesCount() {
-        return 0;
-    }
-
     @Override
     public final boolean mayHaveNulls() {
         return false;

+ 0 - 5
x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/Block.java

@@ -104,11 +104,6 @@ public interface Block extends Accountable, BlockLoader.Block, NamedWriteable, R
      */
     boolean isNull(int position);
 
-    /**
-     * @return the number of null values in this block.
-     */
-    int nullValuesCount();
-
     /**
      * @return true if some values might be null. False, if all values are guaranteed to be not null.
      */

+ 0 - 5
x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/ConstantNullBlock.java

@@ -52,11 +52,6 @@ final class ConstantNullBlock extends AbstractNonThreadSafeRefCounted
         return true;
     }
 
-    @Override
-    public int nullValuesCount() {
-        return getPositionCount();
-    }
-
     @Override
     public boolean areAllValuesNull() {
         return true;

+ 0 - 5
x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/OrdinalBytesRefBlock.java

@@ -176,11 +176,6 @@ public final class OrdinalBytesRefBlock extends AbstractNonThreadSafeRefCounted
         return ordinals.isNull(position);
     }
 
-    @Override
-    public int nullValuesCount() {
-        return ordinals.nullValuesCount();
-    }
-
     @Override
     public boolean mayHaveNulls() {
         return ordinals.mayHaveNulls();

+ 3 - 1
x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/blockhash/BlockHashTests.java

@@ -1305,7 +1305,9 @@ public class BlockHashTests extends ESTestCase {
             try (ReleasableIterator<IntBlock> lookup = blockHash.lookup(new Page(keys), ByteSizeValue.ofKb(between(1, 100)))) {
                 while (lookup.hasNext()) {
                     try (IntBlock ords = lookup.next()) {
-                        assertThat(ords.nullValuesCount(), equalTo(0));
+                        for (int p = 0; p < ords.getPositionCount(); p++) {
+                            assertFalse(ords.isNull(p));
+                        }
                     }
                 }
             } finally {

+ 0 - 5
x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BasicBlockTests.java

@@ -166,7 +166,6 @@ public class BasicBlockTests extends ESTestCase {
             assertThat(block.asVector().getPositionCount(), is(positionCount));
             assertThat(block.asVector().asBlock().getTotalValueCount(), is(positionCount));
             assertThat(block.asVector().asBlock().getPositionCount(), is(positionCount));
-            assertThat(block.nullValuesCount(), is(0));
             assertThat(block.mayHaveNulls(), is(false));
             assertThat(block.areAllValuesNull(), is(false));
             assertThat(block.mayHaveMultivaluedFields(), is(false));
@@ -823,7 +822,6 @@ public class BasicBlockTests extends ESTestCase {
                     assertThat(block.getInt(i), is(values[i]));
                 }
             }
-            assertThat(block.nullValuesCount(), is(nullCount));
             assertThat(block.asVector(), nullCount > 0 ? is(nullValue()) : is(notNullValue()));
             block.close();
         }
@@ -857,7 +855,6 @@ public class BasicBlockTests extends ESTestCase {
                     assertThat(block.getLong(i), is(values[i]));
                 }
             }
-            assertThat(block.nullValuesCount(), is(nullCount));
             assertThat(block.asVector(), nullCount > 0 ? is(nullValue()) : is(notNullValue()));
             block.close();
         }
@@ -891,7 +888,6 @@ public class BasicBlockTests extends ESTestCase {
                     assertThat(block.getDouble(i), is(values[i]));
                 }
             }
-            assertThat(block.nullValuesCount(), is(nullCount));
             assertThat(block.asVector(), nullCount > 0 ? is(nullValue()) : is(notNullValue()));
             block.close();
         }
@@ -925,7 +921,6 @@ public class BasicBlockTests extends ESTestCase {
                     assertThat(block.getBoolean(i), is(values[i]));
                 }
             }
-            assertThat(block.nullValuesCount(), is(nullCount));
             assertThat(block.asVector(), nullCount > 0 ? is(nullValue()) : is(notNullValue()));
             block.close();
         }

+ 0 - 1
x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockMultiValuedTests.java

@@ -169,7 +169,6 @@ public class BlockMultiValuedTests extends ESTestCase {
 
     private void assertExpanded(Block orig) {
         try (orig; Block expanded = orig.expand()) {
-            assertThat(expanded.getPositionCount(), equalTo(orig.getTotalValueCount() + orig.nullValuesCount()));
             assertThat(expanded.getTotalValueCount(), equalTo(orig.getTotalValueCount()));
 
             int np = 0;

+ 0 - 3
x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/FilteredBlockTests.java

@@ -133,7 +133,6 @@ public class FilteredBlockTests extends ESTestCase {
         assertTrue(filtered.isNull(0));
         assertTrue(filtered.mayHaveNulls());
         assertFalse(filtered.areAllValuesNull());
-        assertEquals(1, filtered.nullValuesCount());
         assertEquals(2, filtered.getTotalValueCount());
         assertFalse(filtered.isNull(1));
         assertEquals(30, filtered.getInt(filtered.getFirstValueIndex(1)));
@@ -161,7 +160,6 @@ public class FilteredBlockTests extends ESTestCase {
         assertTrue(filtered.isNull(0));
         assertTrue(filtered.mayHaveNulls());
         assertTrue(filtered.areAllValuesNull());
-        assertEquals(3, filtered.nullValuesCount());
         assertEquals(0, filtered.getTotalValueCount());
         block.close();
         releaseAndAssertBreaker(filtered);
@@ -184,7 +182,6 @@ public class FilteredBlockTests extends ESTestCase {
         assertFalse(filtered.isNull(0));
         assertFalse(filtered.mayHaveNulls());
         assertFalse(filtered.areAllValuesNull());
-        assertEquals(0, filtered.nullValuesCount());
         assertEquals(3, filtered.getTotalValueCount());
 
         assertEquals(20, filtered.asVector().getInt(0));