rename RANDOM_SAMPLE -> SAMPLE

Author: jan-elastic

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/RandomSampleOperator.java renamed to x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/SampleOperator.java

@@ -25,7 +25,7 @@
 import java.util.Objects;
 import java.util.SplittableRandom;
 
-public class RandomSampleOperator implements Operator {
+public class SampleOperator implements Operator {
 
     private boolean finished;
     private final Deque<Page> outputPages;
@@ -39,7 +39,7 @@ public class RandomSampleOperator implements Operator {
     private long collectNanos;
     private long emitNanos;
 
-    public RandomSampleOperator(double probability, int seed) {
+    public SampleOperator(double probability, int seed) {
         finished = false;
         outputPages = new LinkedList<>();
         SplittableRandom random = new SplittableRandom(seed);
@@ -50,13 +50,13 @@ public RandomSampleOperator(double probability, int seed) {
     public record Factory(double probability, int seed) implements OperatorFactory {
 
         @Override
-        public RandomSampleOperator get(DriverContext driverContext) {
-            return new RandomSampleOperator(probability, seed);
+        public SampleOperator get(DriverContext driverContext) {
+            return new SampleOperator(probability, seed);
         }
 
         @Override
         public String describe() {
-            return "RandomSampleOperator[probability = " + probability + ", seed = " + seed + "]";
+            return "SampleOperator[probability = " + probability + ", seed = " + seed + "]";
         }
     }
 
@@ -139,7 +139,7 @@ public void close() {
 
     @Override
     public String toString() {
-        return "RandomSampleOperator[sampled = " + rowsEmitted + "/" + rowsCollected + "]";
+        return "SampleOperator[sampled = " + rowsEmitted + "/" + rowsCollected + "]";
     }
 
     @Override
@@ -153,7 +153,7 @@ private record Status(long collectNanos, long emitNanos, int pagesCollected, int
 
         public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
             Operator.Status.class,
-            "random_sample",
+            "sample",
             Status::new
         );
 

x-pack/plugin/esql/qa/testFixtures/src/main/resources/random_sample.csv-spec renamed to x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample.csv-spec

@@ -1,21 +1,21 @@
-// Tests focused on the RANDOM_SAMPLE command
+// Tests focused on the SAMPLE command
 
 row
-required_capability: random_sample
+required_capability: sample
 
 ROW x = 1
-| RANDOM_SAMPLE .99 9
+| SAMPLE .99 9
 ;
 
 x:integer
 1
 ;
 
 topN_PushedDown
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
-| RANDOM_SAMPLE .5 0
+| SAMPLE .5 0
 | SORT emp_no
 | LIMIT 5
 | STATS empNoMax = MAX(emp_no)
@@ -28,11 +28,11 @@ true
 ;
 
 topN_Operator
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
 | WHERE LENGTH(CONCAT(last_name, "foo")) > 3
-| RANDOM_SAMPLE .5 0
+| SAMPLE .5 0
 | SORT emp_no
 | LIMIT 5
 | STATS empNoMax = MAX(emp_no)
@@ -45,10 +45,10 @@ true
 ;
 
 aggCount_PushedDown
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
-| RANDOM_SAMPLE .5 123
+| SAMPLE .5 123
 | STATS count = COUNT(*)
 | EVAL correct = count > 50 AND count < 150
 | KEEP correct
@@ -59,11 +59,11 @@ true
 ;
 
 aggCount_Operator
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
 | WHERE LENGTH(CONCAT(last_name, "foo")) > 3
-| RANDOM_SAMPLE .5 123
+| SAMPLE .5 123
 | STATS count = COUNT(*)
 | EVAL correct = count > 50 AND count < 150
 | KEEP correct
@@ -74,10 +74,10 @@ true
 ;
 
 aggCountNoSeed_PushedDown
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
-| RANDOM_SAMPLE .5
+| SAMPLE .5
 | STATS count = COUNT(*)
 | EVAL correct = count > 50 AND count < 150
 | KEEP correct
@@ -88,11 +88,11 @@ true
 ;
 
 aggCountNoSeed_Operator
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
 | WHERE LENGTH(CONCAT(last_name, "foo")) > 3
-| RANDOM_SAMPLE .5
+| SAMPLE .5
 | STATS count = COUNT(*)
 | EVAL inRange = count > 50 AND count < 150
 | KEEP inRange
@@ -103,10 +103,10 @@ true
 ;
 
 withPostFilter_PushDown
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
-| RANDOM_SAMPLE .5 0
+| SAMPLE .5 0
 | WHERE emp_no > 10050
 | STATS count = COUNT(*)
 | EVAL correct = count > 20 AND count < 80
@@ -118,11 +118,11 @@ true
 ;
 
 withPostFilter_Operator
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
 | WHERE LENGTH(CONCAT(last_name, "foo")) > 3
-| RANDOM_SAMPLE .5 0
+| SAMPLE .5 0
 | WHERE emp_no > 10050
 | STATS count = COUNT(*)
 | EVAL correct = count > 20 AND count < 80
@@ -134,12 +134,12 @@ true
 ;
 
 combined_PushDown
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
-| RANDOM_SAMPLE .6 11
+| SAMPLE .6 11
 | EVAL e1 = emp_no + 1
-| RANDOM_SAMPLE .7 11111
+| SAMPLE .7 11111
 | STATS count = COUNT(e1)
 | EVAL correct = count > 50 AND count < 150
 | KEEP correct
@@ -150,13 +150,13 @@ true
 ;
 
 combined_Operator
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
 | WHERE LENGTH(CONCAT(last_name, "foo")) > 3
-| RANDOM_SAMPLE .6 11
+| SAMPLE .6 11
 | EVAL e1 = emp_no + 1
-| RANDOM_SAMPLE .7 11111
+| SAMPLE .7 11111
 | STATS count = COUNT(e1)
 | EVAL correct = count > 50 AND count < 150
 | KEEP correct
@@ -167,14 +167,14 @@ true
 ;
 
 combined2_PushDown
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
-| RANDOM_SAMPLE .6 11
+| SAMPLE .6 11
 | EVAL e1 = emp_no + 1
-| RANDOM_SAMPLE .7 11111
+| SAMPLE .7 11111
 | EVAL e1s = e1::KEYWORD
-| RANDOM_SAMPLE .1
+| SAMPLE .1
 | STATS count = COUNT(e1s)
 | EVAL correct = count > 0 AND count < 250
 | KEEP correct
@@ -185,15 +185,15 @@ true
 ;
 
 combined2_Operator
-required_capability: random_sample
+required_capability: sample
 
 FROM employees
 | WHERE LENGTH(CONCAT(last_name, "foo")) > 3
-| RANDOM_SAMPLE .6 11
+| SAMPLE .6 11
 | EVAL e1 = emp_no + 1
-| RANDOM_SAMPLE .7 11111
+| SAMPLE .7 11111
 | EVAL e1s = e1::KEYWORD
-| RANDOM_SAMPLE .1
+| SAMPLE .1
 | STATS count = COUNT(e1s)
 | EVAL correct = count > 0 AND count < 250
 | KEEP correct

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens

@@ -62,7 +62,7 @@ processingCommand
     | {this.isDevVersion()}? insistCommand
     | {this.isDevVersion()}? forkCommand
     | {this.isDevVersion()}? rrfCommand
-    | {this.isDevVersion()}? randomSampleCommand
+    | {this.isDevVersion()}? sampleCommand
     ;
 
 whereCommand
@@ -290,6 +290,6 @@ rrfCommand
    : DEV_RRF
    ;
 
-randomSampleCommand
-    : DEV_RANDOM_SAMPLE probability=decimalValue seed=integerValue?
+sampleCommand
+    : DEV_SAMPLE probability=decimalValue seed=integerValue?
     ;

x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4

@@ -19,7 +19,7 @@ STATS : 'stats'               -> pushMode(EXPRESSION_MODE);
 WHERE : 'where'               -> pushMode(EXPRESSION_MODE);
 
 DEV_INLINESTATS : {this.isDevVersion()}? 'inlinestats'   -> pushMode(EXPRESSION_MODE);
-DEV_RANDOM_SAMPLE : {this.isDevVersion()}? 'random_sample' -> pushMode(EXPRESSION_MODE);
+DEV_SAMPLE : {this.isDevVersion()}? 'sample' -> pushMode(EXPRESSION_MODE);
 
 
 mode EXPRESSION_MODE;

x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.tokens

@@ -940,9 +940,9 @@ public enum Cap {
         MAKE_NUMBER_OF_CHANNELS_CONSISTENT_WITH_LAYOUT,
 
         /**
-         * Support for the RANDOM_SAMPLE command
+         * Support for the SAMPLE command
          */
-        RANDOM_SAMPLE(Build.current().isSnapshot());
+        SAMPLE(Build.current().isSnapshot());
 
         private final boolean enabled;
 

x-pack/plugin/esql/src/main/antlr/lexer/Expression.g4

@@ -13,7 +13,7 @@
 import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.InsertFieldExtraction;
 import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.PushFiltersToSource;
 import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.PushLimitToSource;
-import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.PushRandomSampleToSource;
+import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.PushSampleToSource;
 import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.PushStatsToSource;
 import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.PushTopNToSource;
 import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.ReplaceSourceAttributes;
@@ -66,7 +66,7 @@ protected List<Batch<PhysicalPlan>> rules(boolean optimizeForEsSource) {
             esSourceRules.add(new PushTopNToSource());
             esSourceRules.add(new PushLimitToSource());
             esSourceRules.add(new PushFiltersToSource());
-            esSourceRules.add(new PushRandomSampleToSource());
+            esSourceRules.add(new PushSampleToSource());
             esSourceRules.add(new PushStatsToSource());
             esSourceRules.add(new EnableSpatialDistancePushdown());
         }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

@@ -39,7 +39,7 @@
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownAndCombineFilters;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownAndCombineLimits;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownAndCombineOrderBy;
-import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownAndCombineRandomSample;
+import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownAndCombineSample;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownEnrich;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownEval;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownRegexExtract;
@@ -191,7 +191,7 @@ protected static Batch<LogicalPlan> operators() {
             new PruneLiteralsInOrderBy(),
             new PushDownAndCombineLimits(),
             new PushDownAndCombineFilters(),
-            new PushDownAndCombineRandomSample(),
+            new PushDownAndCombineSample(),
             new PushDownEval(),
             new PushDownRegexExtract(),
             new PushDownEnrich(),

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizer.java

@@ -12,7 +12,7 @@
 import org.elasticsearch.xpack.esql.expression.function.aggregate.HasSampleCorrection;
 import org.elasticsearch.xpack.esql.plan.logical.Aggregate;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
-import org.elasticsearch.xpack.esql.plan.logical.RandomSample;
+import org.elasticsearch.xpack.esql.plan.logical.Sample;
 import org.elasticsearch.xpack.esql.rule.Rule;
 
 public class ApplySampleCorrections extends Rule<LogicalPlan, LogicalPlan> {
@@ -21,8 +21,8 @@ public class ApplySampleCorrections extends Rule<LogicalPlan, LogicalPlan> {
     public LogicalPlan apply(LogicalPlan logicalPlan) {
         Holder<Expression> sampleProbability = new Holder<>(null);
         return logicalPlan.transformUp(plan -> {
-            if (plan instanceof RandomSample randomSample) {
-                sampleProbability.set(randomSample.probability());
+            if (plan instanceof Sample sample) {
+                sampleProbability.set(sample.probability());
             }
             if (plan instanceof Aggregate && sampleProbability.get() != null) {
                 plan = plan.transformExpressionsOnly(