Skip to content

Commit

Permalink
Merge pull request #3149 from nadment/3141
Browse files Browse the repository at this point in the history 
Merge join transform: select key from incoming fields #3141
  • Loading branch information
@hansva
hansva committed Aug 9, 2023
2 parents 7c9e33b + 82b1fd0 commit 8fdfc13
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 12 deletions.
63 changes: 51 additions & 12 deletions ...mergejoin/src/main/java/org/apache/hop/pipeline/transforms/mergejoin/MergeJoinDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.hop.pipeline.transform.ITransformDialog;
import org.apache.hop.pipeline.transform.TransformMeta;
import org.apache.hop.pipeline.transform.stream.IStream;
import org.apache.hop.ui.core.ConstUi;
import org.apache.hop.ui.core.PropsUi;
import org.apache.hop.ui.core.dialog.BaseDialog;
import org.apache.hop.ui.core.dialog.ErrorDialog;
Expand All @@ -36,29 +37,28 @@
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;

import java.util.List;

public class MergeJoinDialog extends BaseTransformDialog implements ITransformDialog {
private static final Class<?> PKG = MergeJoinMeta.class; // For Translator

public static final String STRING_SORT_WARNING_PARAMETER = "MergeJoinSortWarning";

private CCombo wTransform1;
private Combo wTransform1;

private CCombo wTransform2;
private Combo wTransform2;

private CCombo wType;
private Combo wType;

private TableView wKeys1;

Expand Down Expand Up @@ -91,7 +91,7 @@ public String open() {
shell.setText(BaseMessages.getString(PKG, "MergeJoinDialog.Shell.Label"));

int middle = props.getMiddlePct();
int margin = props.getMargin();
int margin = PropsUi.getMargin();

// TransformName line
wlTransformName = new Label(shell, SWT.RIGHT);
Expand Down Expand Up @@ -124,7 +124,7 @@ public String open() {
fdlTransform1.right = new FormAttachment(middle, -margin);
fdlTransform1.top = new FormAttachment(wTransformName, margin);
wlTransform1.setLayoutData(fdlTransform1);
wTransform1 = new CCombo(shell, SWT.BORDER);
wTransform1 = new Combo(shell, SWT.BORDER);
PropsUi.setLook(wTransform1);

if (previousTransforms != null) {
Expand All @@ -147,7 +147,7 @@ public String open() {
fdlTransform2.right = new FormAttachment(middle, -margin);
fdlTransform2.top = new FormAttachment(wTransform1, margin);
wlTransform2.setLayoutData(fdlTransform2);
wTransform2 = new CCombo(shell, SWT.BORDER);
wTransform2 = new Combo(shell, SWT.BORDER);
PropsUi.setLook(wTransform2);

if (previousTransforms != null) {
Expand All @@ -170,7 +170,7 @@ public String open() {
fdlType.right = new FormAttachment(middle, -margin);
fdlType.top = new FormAttachment(wTransform2, margin);
wlType.setLayoutData(fdlType);
wType = new CCombo(shell, SWT.BORDER);
wType = new Combo(shell, SWT.BORDER);
PropsUi.setLook(wType);

wType.setItems(MergeJoinMeta.joinTypes);
Expand Down Expand Up @@ -228,7 +228,8 @@ public String open() {
new ColumnInfo[] {
new ColumnInfo(
BaseMessages.getString(PKG, "MergeJoinDialog.ColumnInfo.KeyField1"),
ColumnInfo.COLUMN_TYPE_TEXT,
ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {""},
false),
};

Expand Down Expand Up @@ -263,7 +264,8 @@ public String open() {
new ColumnInfo[] {
new ColumnInfo(
BaseMessages.getString(PKG, "MergeJoinDialog.ColumnInfo.KeyField2"),
ColumnInfo.COLUMN_TYPE_TEXT,
ColumnInfo.COLUMN_TYPE_CCOMBO,
new String[] {""},
false),
};

Expand All @@ -282,8 +284,12 @@ public String open() {
fdKeys2.bottom = new FormAttachment(wbKeys2, -2 * margin);
fdKeys2.right = new FormAttachment(100, 0);
wKeys2.setLayoutData(fdKeys2);

wTransform1.addListener(SWT.Modify, e -> updateFieldNames(ciKeys1[0], ciKeys2[0]));
wTransform2.addListener(SWT.Modify, e -> updateFieldNames(ciKeys1[0], ciKeys2[0]));

getData();
this.getData();
this.updateFieldNames(ciKeys1[0], ciKeys2[0]);
input.setChanged(backupChanged);

BaseDialog.defaultShellHandling(shell, c -> ok(), c -> cancel());
Expand Down Expand Up @@ -411,4 +417,37 @@ private void getKeys2() {
e);
}
}

// Search the fields in the background
//
private void updateFieldNames(ColumnInfo leftColumn, ColumnInfo rightColumn) {
final Runnable runnable =
() -> {
leftColumn.setComboValues(new String[] {""});
rightColumn.setComboValues(new String[] {""});

TransformMeta transformMeta = pipelineMeta.findTransform(wTransform1.getText());
if (transformMeta != null) {
try {
IRowMeta row = pipelineMeta.getTransformFields(variables, transformMeta);
String[] fieldNames = ConstUi.sortFieldNames(row.getFieldNames());
leftColumn.setComboValues(fieldNames);
} catch (HopException e) {
logError(BaseMessages.getString(PKG, "System.Dialog.GetFieldsFailed.Message"));
}
}

transformMeta = pipelineMeta.findTransform(wTransform2.getText());
if (transformMeta != null) {
try {
IRowMeta row = pipelineMeta.getTransformFields(variables, transformMeta);
String[] fieldNames = ConstUi.sortFieldNames(row.getFieldNames());
rightColumn.setComboValues(ConstUi.sortFieldNames(fieldNames));
} catch (HopException e) {
logError(BaseMessages.getString(PKG, "System.Dialog.GetFieldsFailed.Message"));
}
}
};
shell.getDisplay().asyncExec(runnable);
}
}
12 changes: 12 additions & 0 deletions ui/src/main/java/org/apache/hop/ui/core/ConstUi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,4 +239,16 @@ public static String[] sortFieldNames(List<String> names) {
}
return result;
}

/**
* Sort field names if options is enabled
*
* @param names
*/
public static String[] sortFieldNames(String[] names) {
if ( PropsUi.getInstance().isSortFieldByName() ) {
Arrays.sort(names);
}
return names;
}
}

0 comments on commit 8fdfc13

Please sign in to comment.