Skip to content

Commit a563c91

Browse files
authored
License check for ES|QL categorize (#126595) (#126835)
1 parent ee60142 commit a563c91

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/grouping/Categorize.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
import org.elasticsearch.common.io.stream.StreamInput;
1212
import org.elasticsearch.common.io.stream.StreamOutput;
1313
import org.elasticsearch.compute.operator.EvalOperator.ExpressionEvaluator;
14+
import org.elasticsearch.license.XPackLicenseState;
15+
import org.elasticsearch.xpack.esql.LicenseAware;
1416
import org.elasticsearch.xpack.esql.core.expression.Expression;
1517
import org.elasticsearch.xpack.esql.core.expression.Nullability;
1618
import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
@@ -20,6 +22,7 @@
2022
import org.elasticsearch.xpack.esql.expression.function.FunctionInfo;
2123
import org.elasticsearch.xpack.esql.expression.function.Param;
2224
import org.elasticsearch.xpack.esql.io.stream.PlanStreamInput;
25+
import org.elasticsearch.xpack.ml.MachineLearning;
2326

2427
import java.io.IOException;
2528
import java.util.List;
@@ -36,7 +39,7 @@
3639
* For the implementation, see {@link org.elasticsearch.compute.aggregation.blockhash.CategorizeBlockHash}
3740
* </p>
3841
*/
39-
public class Categorize extends GroupingFunction {
42+
public class Categorize extends GroupingFunction implements LicenseAware {
4043
public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
4144
Expression.class,
4245
"Categorize",
@@ -132,4 +135,9 @@ public Expression field() {
132135
public String toString() {
133136
return "Categorize{field=" + field + "}";
134137
}
138+
139+
@Override
140+
public boolean licenseCheck(XPackLicenseState state) {
141+
return MachineLearning.CATEGORIZE_TEXT_AGG_FEATURE.check(state);
142+
}
135143
}

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ public class MachineLearning extends Plugin
526526
License.OperationMode.PLATINUM
527527
);
528528

529-
private static final LicensedFeature.Momentary CATEGORIZE_TEXT_AGG_FEATURE = LicensedFeature.momentary(
529+
public static final LicensedFeature.Momentary CATEGORIZE_TEXT_AGG_FEATURE = LicensedFeature.momentary(
530530
MachineLearningField.ML_FEATURE_FAMILY,
531531
"categorize-text-agg",
532532
License.OperationMode.PLATINUM

0 commit comments

Comments
 (0)