Skip to content

Fix Fuzzy Match algorithm dropdown and distance measure type #7842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hansva merged 2 commits into from
Aug 7, 2026
+36 −239
Merged

Fix Fuzzy Match algorithm dropdown and distance measure type #7842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e990b5
Fix Fuzzy Match algorithm dropdown and distance measure type
leehaut Aug 7, 2026
37fb4a7
Merge branch 'hotfix/lance-common-112' of https://github.com/leehaut/…
leehaut Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
250 changes: 11 additions & 239 deletions ...uzzymatch/src/main/java/org/apache/hop/pipeline/transforms/fuzzymatch/FuzzyMatchMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import static org.apache.hop.pipeline.transforms.fuzzymatch.FuzzyMatchMeta.Algorithm.SOUNDEX;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import lombok.Getter;
Expand Down Expand Up @@ -56,6 +57,8 @@
import org.apache.hop.pipeline.transform.stream.Stream;
import org.apache.hop.pipeline.transform.stream.StreamIcon;

@Getter
@Setter
@Transform(
id = "FuzzyMatch",
image = "fuzzymatch.svg",
Expand Down Expand Up @@ -176,7 +179,8 @@ public void getFields(
switch (getAlgorithm()) {
case NONE:
throw new HopTransformException("Please specify the matching algorithm to use");
case LEVENSHTEIN:
case LEVENSHTEIN, DAMERAU_LEVENSHTEIN, NEEDLEMAN_WUNSH:
// Distance algorithms return an integer measure
v = new ValueMetaInteger(mainField);
v.setLength(IValueMeta.DEFAULT_INTEGER_LENGTH);
break;
Expand Down Expand Up @@ -471,222 +475,7 @@ public ITransformIOMeta getTransformIOMeta() {
return ioMeta;
}

/**
* Gets algorithm
*
* @return value of algorithm
*/
public Algorithm getAlgorithm() {
return algorithm;
}

/**
* Sets algorithm
*
* @param algorithm value of algorithm
*/
public void setAlgorithm(Algorithm algorithm) {
this.algorithm = algorithm;
}

/**
* Gets lookupTransformName
*
* @return value of lookupTransformName
*/
public String getLookupTransformName() {
return lookupTransformName;
}

/**
* Sets lookupTransformName
*
* @param lookupTransformName value of lookupTransformName
*/
public void setLookupTransformName(String lookupTransformName) {
this.lookupTransformName = lookupTransformName;
}

/**
* Gets lookupField
*
* @return value of lookupField
*/
public String getLookupField() {
return lookupField;
}

/**
* Sets lookupField
*
* @param lookupField value of lookupField
*/
public void setLookupField(String lookupField) {
this.lookupField = lookupField;
}

/**
* Gets mainStreamField
*
* @return value of mainStreamField
*/
public String getMainStreamField() {
return mainStreamField;
}

/**
* Sets mainStreamField
*
* @param mainStreamField value of mainStreamField
*/
public void setMainStreamField(String mainStreamField) {
this.mainStreamField = mainStreamField;
}

/**
* Gets outputmatchfield
*
* @return value of outputmatchfield
*/
public String getOutputMatchField() {
return outputMatchField;
}

/**
* Sets outputmatchfield
*
* @param outputMatchField value of outputmatchfield
*/
public void setOutputMatchField(String outputMatchField) {
this.outputMatchField = outputMatchField;
}

/**
* Gets outputValueField
*
* @return value of outputValueField
*/
public String getOutputValueField() {
return outputValueField;
}

/**
* Sets outputValueField
*
* @param outputValueField value of outputValueField
*/
public void setOutputValueField(String outputValueField) {
this.outputValueField = outputValueField;
}

/**
* Gets caseSensitive
*
* @return value of caseSensitive
*/
public boolean isCaseSensitive() {
return caseSensitive;
}

/**
* Sets caseSensitive
*
* @param caseSensitive value of caseSensitive
*/
public void setCaseSensitive(boolean caseSensitive) {
this.caseSensitive = caseSensitive;
}

/**
* Gets minimalValue
*
* @return value of minimalValue
*/
public String getMinimalValue() {
return minimalValue;
}

/**
* Sets minimalValue
*
* @param minimalValue value of minimalValue
*/
public void setMinimalValue(String minimalValue) {
this.minimalValue = minimalValue;
}

/**
* Gets maximalValue
*
* @return value of maximalValue
*/
public String getMaximalValue() {
return maximalValue;
}

/**
* Sets maximalValue
*
* @param maximalValue value of maximalValue
*/
public void setMaximalValue(String maximalValue) {
this.maximalValue = maximalValue;
}

/**
* Gets separator
*
* @return value of separator
*/
public String getSeparator() {
return separator;
}

/**
* Sets separator
*
* @param separator value of separator
*/
public void setSeparator(String separator) {
this.separator = separator;
}

/**
* Gets closerValue
*
* @return value of closerValue
*/
public boolean isCloserValue() {
return closerValue;
}

/**
* Sets closerValue
*
* @param closerValue value of closerValue
*/
public void setCloserValue(boolean closerValue) {
this.closerValue = closerValue;
}

/**
* Gets lookupValues
*
* @return value of lookupValues
*/
public List<FMLookupValue> getLookupValues() {
return lookupValues;
}

/**
* Sets lookupValues
*
* @param lookupValues value of lookupValues
*/
public void setLookupValues(List<FMLookupValue> lookupValues) {
this.lookupValues = lookupValues;
}

@Getter
public enum Algorithm implements IEnumHasCodeAndDescription {
NONE("", ""),
LEVENSHTEIN("levenshtein", BaseMessages.getString(PKG, "FuzzyMatchMeta.algorithm.Levenshtein")),
Expand Down Expand Up @@ -716,7 +505,10 @@ public enum Algorithm implements IEnumHasCodeAndDescription {
}

public static String[] getDescriptions() {
return IEnumHasCodeAndDescription.getDescriptions(Algorithm.class);
return Arrays.stream(Algorithm.values())
.filter(t -> t != Algorithm.NONE)
.map(Algorithm::getDescription)
.toArray(String[]::new);
}

public static Algorithm lookupDescription(String description) {
Expand All @@ -726,30 +518,10 @@ public static Algorithm lookupDescription(String description) {
public static Algorithm lookupCode(String code) {
return IEnumHasCode.lookupCode(Algorithm.class, code, NONE);
}

/**
* Gets code
*
* @return value of code
*/
@Override
public String getCode() {
return code;
}

/**
* Gets description
*
* @return value of description
*/
@Override
public String getDescription() {
return description;
}
}

@Setter
@Getter
@Setter
public static final class FMLookupValue {
@HopMetadataProperty(key = "name")
private String name;
Expand Down
25 changes: 25 additions & 0 deletions ...match/src/test/java/org/apache/hop/pipeline/transforms/fuzzymatch/FuzzyMatchMetaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,31 @@ void testSerialization() throws Exception {
assertEquals("lookupName", meta.getLookupValues().get(0).getRename());
}

@Test
void testGetFieldsDistanceMeasureIsInteger() throws Exception {
for (FuzzyMatchMeta.Algorithm algorithm :
List.of(
FuzzyMatchMeta.Algorithm.LEVENSHTEIN,
FuzzyMatchMeta.Algorithm.DAMERAU_LEVENSHTEIN,
FuzzyMatchMeta.Algorithm.NEEDLEMAN_WUNSH)) {
FuzzyMatchMeta meta = new FuzzyMatchMeta();
meta.setCloserValue(true);
meta.setAlgorithm(algorithm);
meta.setOutputMatchField("match");
meta.setOutputValueField("measure value");

IRowMeta inputRowMeta = new RowMeta();
meta.getFields(inputRowMeta, "FuzzyMatch", null, null, new Variables(), null);

IValueMeta measure = inputRowMeta.searchValueMeta("measure value");
assertNotNull(measure);
assertEquals(
IValueMeta.TYPE_INTEGER,
measure.getType(),
"Algorithm " + algorithm + " should output Integer measure value");
}
}

@Test
void testGetFieldsRename() throws Exception {
FuzzyMatchMeta meta = new FuzzyMatchMeta();
Expand Down
Loading