From 6f3cbd81fecf3a6f15e556102ffd2d97aa5323e9 Mon Sep 17 00:00:00 2001 From: Ahmet Can KEPENEK Date: Sun, 10 Jul 2022 01:54:10 +0300 Subject: [PATCH] SOLR-9661 added missing operations[withField,withValue] for expression on stream operations (#934) * added missing operations[withField,withValue] to stream functions Co-authored-by: epugh@opensourceconnections.com --- solr/CHANGES.txt | 2 ++ solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java | 4 ++++ .../src/test/org/apache/solr/client/solrj/io/TestLang.java | 2 ++ 3 files changed, 8 insertions(+) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 491f3d4be85..e97299f7988 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -78,6 +78,8 @@ Bug Fixes * SOLR-16142: Fix Admin UI's spatial parameter generation. (Arsal Jalib, Christine Poerschke) +* SOLR-9661: Fix explanation of select() streaming expression that uses replace() operation (Ahmet Can Kepenek via Eric Pugh) + Other Changes --------------------- * SOLR-16245: Make DenseVectorField codec agnostic (Elia Porciani via Alessandro Benedetti) diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java index cafa390bad5..4fffe69d0be 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java @@ -28,6 +28,8 @@ import org.apache.solr.client.solrj.io.ops.DistinctOperation; import org.apache.solr.client.solrj.io.ops.GroupOperation; import org.apache.solr.client.solrj.io.ops.ReplaceOperation; +import org.apache.solr.client.solrj.io.ops.ReplaceWithFieldOperation; +import org.apache.solr.client.solrj.io.ops.ReplaceWithValueOperation; import org.apache.solr.client.solrj.io.stream.*; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Expressible; @@ -116,6 +118,8 @@ public static void register(StreamFactory streamFactory) { // tuple manipulation operations .withFunctionName("replace", ReplaceOperation.class) + .withFunctionName("withValue", ReplaceWithValueOperation.class) + .withFunctionName("withField", ReplaceWithFieldOperation.class) // stream reduction operations .withFunctionName("group", GroupOperation.class) diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java index 6b95f4663cf..0417a4721d5 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java @@ -103,6 +103,8 @@ public class TestLang extends SolrTestCase { "sum", "count", "replace", + "withValue", + "withField", "concat", "group", "distinct",