Skip to content

Revert " PT-FIXES: DOS-1370 generate deterministic model names to prevent conflicts in chained operations" #4743

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
Nauna merged 2 commits into from
Jan 20, 2026
Merged

Revert " PT-FIXES: DOS-1370 generate deterministic model names to prevent conflicts in chained operations" #4743

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5961a1a
Revert " PT-FIXES: DOS-1370 generate deterministic model names to pre…
abdelaziz-mahdy Jan 20, 2026
7935f78
fix conflicts
abdelaziz-mahdy Jan 20, 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
10 changes: 1 addition & 9 deletions src/foam/mlang/sink/GroupBy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,28 +258,20 @@ for (Object key : getGroups().keySet()) {
} else {
// No explicit output type - traverse to find underlying property
var expr = this.arg1;
var sourceClass = 'Unknown';
while ( expr ) {
if ( foam.lang.Property.isInstance(expr) ) {
exprClass = expr.cls_?.id || 'String';
// Get the source class name from the property's forClass_
sourceClass = expr.forClass_ || sourceClass;
break;
}
// Try delegate, then arg1, then stop
expr = expr.delegate || expr.arg1;
}
}

// Generate deterministic name based on source class, property name, and sink type
// This prevents conflicts in chained GroupBy operations
var sinkName = this.arg2.cls_?.name || 'Count';
var sourceClassName = sourceClass.split('.').pop(); // Get last part of class name
var modelName = 'GroupBy_' + sourceClassName + '_' + exprName + '_' + sinkName;

const model = {
package: 'foam.tmp',
name: modelName,
name: 'GroupBy' + foam.next$UID(),
ids: [ 'row' ],
properties: [
{ class: 'Long', name: 'row' },
Expand Down