More cleanup

nik9000 · Oct 25, 2023 · f5fc4a2 · f5fc4a2
1 parent a42bf67
commit f5fc4a2
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 19 deletions.
diff --git a/...ugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanBlock.java b/...ugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanBlock.java
@@ -186,11 +186,14 @@ static BooleanBlock newConstantBlockWith(boolean value, int positions, BlockFact
         return blockFactory.newConstantBooleanBlockWith(value, positions);
     }
 
+    /**
+     * Builder for {@link BooleanBlock}
+     */
     sealed interface Builder extends Block.Builder, BlockLoader.BooleanBuilder permits BooleanBlockBuilder {
-
         /**
          * Appends a boolean to the current entry.
          */
+        @Override
         Builder appendBoolean(boolean value);
 
         /**
@@ -214,12 +217,11 @@ sealed interface Builder extends Block.Builder, BlockLoader.BooleanBuilder permi
         @Override
         Builder mvOrdering(Block.MvOrdering mvOrdering);
 
-        // TODO boolean containsMvDups();
-
         /**
          * Appends the all values of the given block into a the current position
          * in this builder.
          */
+        @Override
         Builder appendAllValuesToCurrentPosition(Block block);
 
         /**

diff --git a/...gin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefBlock.java b/...gin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefBlock.java
@@ -191,11 +191,14 @@ static BytesRefBlock newConstantBlockWith(BytesRef value, int positions, BlockFa
         return blockFactory.newConstantBytesRefBlockWith(value, positions);
     }
 
+    /**
+     * Builder for {@link BytesRefBlock}
+     */
     sealed interface Builder extends Block.Builder, BlockLoader.BytesRefBuilder permits BytesRefBlockBuilder {
-
         /**
          * Appends a BytesRef to the current entry.
          */
+        @Override
         Builder appendBytesRef(BytesRef value);
 
         /**
@@ -219,12 +222,11 @@ sealed interface Builder extends Block.Builder, BlockLoader.BytesRefBuilder perm
         @Override
         Builder mvOrdering(Block.MvOrdering mvOrdering);
 
-        // TODO boolean containsMvDups();
-
         /**
          * Appends the all values of the given block into a the current position
          * in this builder.
          */
+        @Override
         Builder appendAllValuesToCurrentPosition(Block block);
 
         /**

diff --git a/...lugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleBlock.java b/...lugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleBlock.java
@@ -187,11 +187,14 @@ static DoubleBlock newConstantBlockWith(double value, int positions, BlockFactor
         return blockFactory.newConstantDoubleBlockWith(value, positions);
     }
 
+    /**
+     * Builder for {@link DoubleBlock}
+     */
     sealed interface Builder extends Block.Builder, BlockLoader.DoubleBuilder permits DoubleBlockBuilder {
-
         /**
          * Appends a double to the current entry.
          */
+        @Override
         Builder appendDouble(double value);
 
         /**
@@ -215,12 +218,11 @@ sealed interface Builder extends Block.Builder, BlockLoader.DoubleBuilder permit
         @Override
         Builder mvOrdering(Block.MvOrdering mvOrdering);
 
-        // TODO boolean containsMvDups();
-
         /**
          * Appends the all values of the given block into a the current position
          * in this builder.
          */
+        @Override
         Builder appendAllValuesToCurrentPosition(Block block);
 
         /**

diff --git a/...k/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntBlock.java b/...k/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntBlock.java
@@ -186,11 +186,14 @@ static IntBlock newConstantBlockWith(int value, int positions, BlockFactory bloc
         return blockFactory.newConstantIntBlockWith(value, positions);
     }
 
+    /**
+     * Builder for {@link IntBlock}
+     */
     sealed interface Builder extends Block.Builder, BlockLoader.IntBuilder permits IntBlockBuilder {
-
         /**
          * Appends a int to the current entry.
          */
+        @Override
         Builder appendInt(int value);
 
         /**
@@ -214,12 +217,11 @@ sealed interface Builder extends Block.Builder, BlockLoader.IntBuilder permits I
         @Override
         Builder mvOrdering(Block.MvOrdering mvOrdering);
 
-        // TODO boolean containsMvDups();
-
         /**
          * Appends the all values of the given block into a the current position
          * in this builder.
          */
+        @Override
         Builder appendAllValuesToCurrentPosition(Block block);
 
         /**

diff --git a/.../plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongBlock.java b/.../plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongBlock.java
@@ -187,11 +187,14 @@ static LongBlock newConstantBlockWith(long value, int positions, BlockFactory bl
         return blockFactory.newConstantLongBlockWith(value, positions);
     }
 
+    /**
+     * Builder for {@link LongBlock}
+     */
     sealed interface Builder extends Block.Builder, BlockLoader.LongBuilder permits LongBlockBuilder {
-
         /**
          * Appends a long to the current entry.
          */
+        @Override
         Builder appendLong(long value);
 
         /**
@@ -215,12 +218,11 @@ sealed interface Builder extends Block.Builder, BlockLoader.LongBuilder permits
         @Override
         Builder mvOrdering(Block.MvOrdering mvOrdering);
 
-        // TODO boolean containsMvDups();
-
         /**
          * Appends the all values of the given block into a the current position
          * in this builder.
          */
+        @Override
         Builder appendAllValuesToCurrentPosition(Block block);
 
         /**

diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-Block.java.st b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-Block.java.st
@@ -223,11 +223,14 @@ $endif$
         return blockFactory.newConstant$Type$BlockWith(value, positions);
     }
 
+    /**
+     * Builder for {@link $Type$Block}
+     */
     sealed interface Builder extends Block.Builder, BlockLoader.$Type$Builder permits $Type$BlockBuilder {
-
         /**
          * Appends a $type$ to the current entry.
          */
+        @Override
         Builder append$Type$($type$ value);
 
         /**
@@ -251,12 +254,11 @@ $endif$
         @Override
         Builder mvOrdering(Block.MvOrdering mvOrdering);
 
-        // TODO boolean containsMvDups();
-
         /**
          * Appends the all values of the given block into a the current position
          * in this builder.
          */
+        @Override
         Builder appendAllValuesToCurrentPosition(Block block);
 
         /**

diff --git a/...ql/qa/server/single-node/src/yamlRestTest/resources/rest-api-spec/test/90_non_indexed.yml b/...ql/qa/server/single-node/src/yamlRestTest/resources/rest-api-spec/test/90_non_indexed.yml
@@ -85,7 +85,7 @@ setup:
           }
 
 ---
-unsupported:
+fetch:
   - do:
       allowed_warnings:
         - "Field [ip_noidx] cannot be retrieved, it is unsupported or not indexed; returning null"
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,7 +85,7 @@ setup: @@
               }
     ---
-    unsupported:
+    fetch:
       - do:
           allowed_warnings:
             - "Field [ip_noidx] cannot be retrieved, it is unsupported or not indexed; returning null"
@@ Expand Down @@