HPCC-21262 Use a more consistent naming convention when regenerating records

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

ecl/hql/hqlthql.cpp

@@ -918,9 +918,9 @@ void HqltHql::toECL(IHqlExpression *expr, StringBuffer &s, bool paren, bool inTy
                     StringBuffer temp;
                     scope.append(NULL);
                     if (expr->isDataset())
-                        temp.appendf("dataset%p ", expr);
+                        temp.appendf("dataset%012" I64F "x ", (__uint64)(memsize_t)expr);
                     else
-                        temp.appendf("dictionary%p ", expr);
+                        temp.appendf("dictionary%012" I64F "x ", (__uint64)(memsize_t)expr);
 #ifdef SHOW_NORMALIZED
                     if (expandProcessed)
                         temp.appendf("[N%p] ", expr->queryNormalizedSelector());
@@ -936,9 +936,9 @@ void HqltHql::toECL(IHqlExpression *expr, StringBuffer &s, bool paren, bool inTy
                     expr->setTransformExtra(expr);
                 }   
                 if (expr->isDataset())
-                    s.appendf("dataset%p", expr);
+                    s.appendf("dataset%012" I64F "x", (__uint64)(memsize_t)expr);
                 else
-                    s.appendf("dictionary%p", expr);
+                    s.appendf("dictionary%012" I64F "x", (__uint64)(memsize_t)expr);
                 if (paren)
                     s.append(')');
                 return;
@@ -992,7 +992,7 @@ void HqltHql::toECL(IHqlExpression *expr, StringBuffer &s, bool paren, bool inTy
 
                     StringBuffer temp;
                     scope.append(NULL);
-                    temp.appendf("alias%p ", expr);
+                    temp.appendf("alias%012" I64F "x ", (__uint64)(memsize_t)expr);
                     temp.append(":= ");
 
                     toECL(expr, temp, false, false, 0, true);
@@ -1003,7 +1003,7 @@ void HqltHql::toECL(IHqlExpression *expr, StringBuffer &s, bool paren, bool inTy
                     insideNewTransform = wasInsideNewTransform;
                     expr->setTransformExtra(expr);
                 }
-                s.appendf("alias%p", expr);
+                s.appendf("alias%012" I64F "x", (__uint64)(memsize_t)expr);
                 if (paren)
                     s.append(')');
                 return;
@@ -1016,7 +1016,7 @@ void HqltHql::toECL(IHqlExpression *expr, StringBuffer &s, bool paren, bool inTy
             {
                 StringBuffer temp;
                 scope.append(NULL);
-                temp.appendf("record%p := ", expr);
+                temp.appendf("record%012" I64F "x := ", (__uint64)(memsize_t)expr);
 
                 toECL(expr, temp, false, false, 0, true);
                 temp.append(";").newline();
@@ -1025,7 +1025,7 @@ void HqltHql::toECL(IHqlExpression *expr, StringBuffer &s, bool paren, bool inTy
                 scope.pop();
                 expr->setTransformExtra(expr);
             }   
-            s.appendf("record%p", expr);
+            s.appendf("record%012" I64F "x", (__uint64)(memsize_t)expr);
             return;
         }
 
@@ -1046,7 +1046,7 @@ void HqltHql::toECL(IHqlExpression *expr, StringBuffer &s, bool paren, bool inTy
                     
                     StringBuffer temp;
                     scope.append(NULL);
-                    temp.appendf("pattern%p := ", expr);
+                    temp.appendf("pattern%012" I64F "x := ", (__uint64)(memsize_t)expr);
 
                     toECL(expr, temp, false, false, 0, true);
                     temp.append(";").newline();
@@ -1055,8 +1055,8 @@ void HqltHql::toECL(IHqlExpression *expr, StringBuffer &s, bool paren, bool inTy
                     scope.pop();
                     insideNewTransform = wasInsideNewTransform;
                     expr->setTransformExtra(expr);
-                }   
-                s.appendf("pattern%p", expr);
+                }
+                s.appendf("pattern%012" I64F "x", (__uint64)(memsize_t)expr);
                 return;
             }
             else if (expandProcessed)

ecl/hqlcpp/hqlstmt.cpp

@@ -784,54 +784,6 @@ HqlExprAssociation * BuildCtx::queryFirstAssociation(AssocKind searchKind)
 }
 
 
-//Search for an association, but don't allow it to be conditional, or be hidden by the definition of a cursor.
-HqlExprAssociation * BuildCtx::queryFirstCommonAssociation(AssocKind searchKind)
-{
-    HqlStmts * searchStmts = curStmts;
-    unsigned searchMask = searchKind|AssocCursor;
-
-    // search all statements in the tree before this one, to see
-    // if an expression already exists...  If so return the target
-    // of the assignment.
-    for (;;)
-    {
-        if (searchStmts->associationMask & searchMask)
-        {
-            CIArray & defs = searchStmts->defs;
-            ForEachItemInRev(idx, defs)
-            {
-                HqlExprAssociation & cur = (HqlExprAssociation &)defs.item(idx);
-                AssocKind kind = cur.getKind();
-                if (kind == searchKind)
-                    return &cur;
-                if (kind == AssocCursor)
-                    return NULL;
-            }
-        }
-
-        HqlStmt * limitStmt = searchStmts->queryStmt();
-        if (!limitStmt)
-            break;
-        switch (limitStmt->getStmt())
-        {
-        //case quote_compound_stmt:
-        //case quote_compoundopt_stmt,
-        case filter_stmt:
-        case label_stmt:
-        case switch_stmt:
-        case case_stmt:
-        case default_stmt:
-        case break_stmt:
-        case continue_stmt:
-            return NULL;
-        }
-
-        searchStmts = limitStmt->queryContainer();
-    }
-    return NULL;
-}
-
-
 void BuildCtx::walkAssociations(AssocKind searchMask, IAssociationVisitor & visitor)
 {
     HqlStmts * searchStmts = curStmts;

ecl/hqlcpp/hqlstmt.hpp

@@ -138,7 +138,6 @@ public:
     bool                        isSameLocation(const BuildCtx & other) const;
     HqlExprAssociation *        queryAssociation(IHqlExpression * dataset, AssocKind kind, HqlExprCopyArray * selectors);
     HqlExprAssociation *        queryFirstAssociation(AssocKind kind);
-    HqlExprAssociation *        queryFirstCommonAssociation(AssocKind kind);
     void                        walkAssociations(AssocKind searchMask, IAssociationVisitor & visitor); // Function to walk associations filtered by kind
     HqlExprAssociation *        queryMatchExpr(IHqlExpression * expr);
     bool                        getMatchExpr(IHqlExpression * expr, CHqlBoundExpr & bound);