HPCC-21643 Remove unnecessary parameter to queryNormalizedSelector()

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

ecl/hql/hqlexpr.cpp

@@ -6149,7 +6149,7 @@ void CHqlSelectBaseExpression::gatherTablesUsed(HqlExprCopyArray & inScope)
 
 //==============================================================================================================
 
-IHqlExpression * CHqlNormalizedSelectExpression::queryNormalizedSelector(bool skipIndex)
+IHqlExpression * CHqlNormalizedSelectExpression::queryNormalizedSelector()
 {
     return this;
 }
@@ -6162,7 +6162,7 @@ void CHqlNormalizedSelectExpression::calcNormalized()
 #endif
 }
 
-IHqlExpression * CHqlSelectExpression::queryNormalizedSelector(bool skipIndex)
+IHqlExpression * CHqlSelectExpression::queryNormalizedSelector()
 {
     if (normalized)
         return normalized;
@@ -6386,11 +6386,9 @@ IAtom * CHqlRow::queryName() const
     return NULL;
 }
 
-IHqlExpression *CHqlRow::queryNormalizedSelector(bool skipIndex)
+IHqlExpression *CHqlRow::queryNormalizedSelector()
 {
-    if (!skipIndex || (op != no_selectnth))
-        return normalized.get() ? normalized.get() : this;
-    return queryChild(0)->queryNormalizedSelector(skipIndex);
+    return normalized.get() ? normalized.get() : this;
 }
 
 IHqlSimpleScope *CHqlRow::querySimpleScope()
@@ -6565,13 +6563,11 @@ IHqlExpression *CHqlDictionary::clone(HqlExprArray &newkids)
     return createDictionary(op, newkids);
 }
 
-IHqlExpression * CHqlDictionary::queryNormalizedSelector(bool skipIndex)
+IHqlExpression * CHqlDictionary::queryNormalizedSelector()
 {
     if (!normalized)
         return this;
-    if (!skipIndex)
-        return normalized;
-    return normalized->queryNormalizedSelector(skipIndex);
+    return normalized;
 }
 
 
@@ -6800,7 +6796,7 @@ void CHqlDataset::cacheParent()
             rootTable = this;
             normalized.setown(calcNormalizedSelector());
             IHqlExpression * ds = queryChild(0);
-            container = LINK(queryDatasetCursor(ds)->queryNormalizedSelector(false));
+            container = LINK(queryDatasetCursor(ds)->queryNormalizedSelector());
 #ifdef _DEBUG
             assertex(!hasAttribute(newAtom) || !isAlwaysActiveRow(ds));
 #endif
@@ -6846,13 +6842,11 @@ bool CHqlDataset::isAggregate()
     return isAggregateDataset(this);
 }
 
-IHqlExpression * CHqlDataset::queryNormalizedSelector(bool skipIndex)
+IHqlExpression * CHqlDataset::queryNormalizedSelector()
 {
     if (!normalized)
         return this;
-    if (!skipIndex)
-        return normalized;
-    return normalized->queryNormalizedSelector(skipIndex);
+    return normalized;
 }
 
 
@@ -7244,9 +7238,9 @@ IHqlExpression * CHqlAnnotation::queryProperty(ExprPropKind kind)
     return body->queryProperty(kind);
 }
 
-IHqlExpression * CHqlAnnotation::queryNormalizedSelector(bool skipIndex)
+IHqlExpression * CHqlAnnotation::queryNormalizedSelector()
 {
-    return body->queryNormalizedSelector(skipIndex);
+    return body->queryNormalizedSelector();
 }
 
 IHqlExpression * CHqlAnnotation::queryExternalDefinition() const 

ecl/hql/hqlexpr.hpp

@@ -1192,7 +1192,7 @@ interface IHqlExpression : public IInterface
     virtual IHqlSimpleScope *querySimpleScope() = 0;
     virtual IHqlExpression *queryFunctionDefinition() const = 0;
     virtual IHqlExpression *queryExternalDefinition() const = 0;
-    virtual IHqlExpression *queryNormalizedSelector(bool skipIndex=false) = 0;
+    virtual IHqlExpression *queryNormalizedSelector() = 0;
 
     virtual IHqlExpression *queryAttribute(IAtom * propName) const = 0;
     virtual IHqlExpression *queryProperty(ExprPropKind kind) = 0;

ecl/hql/hqlexpr.ipp

@@ -262,7 +262,7 @@ public:
     virtual annotate_kind getAnnotationKind() const override { return annotate_none; }
     virtual IHqlAnnotation * queryAnnotation() override { return NULL; }
     virtual bool isAttribute() const override { return false; }
-    virtual IHqlExpression *queryNormalizedSelector(bool skipIndex) override { return this; }
+    virtual IHqlExpression *queryNormalizedSelector() override { return this; }
 
     virtual int  getStartLine() const override { throwUnexpected(); }
     virtual int  getStartColumn() const override { throwUnexpected(); }
@@ -469,7 +469,7 @@ class CHqlNormalizedSelectExpression : public CHqlSelectBaseExpression
 {
     friend class CHqlSelectBaseExpression;
 public:
-    virtual IHqlExpression *queryNormalizedSelector(bool skipIndex) override;
+    virtual IHqlExpression *queryNormalizedSelector() override;
     virtual void calcNormalized() override;
 
 protected:
@@ -480,7 +480,7 @@ class CHqlSelectExpression : public CHqlSelectBaseExpression
 {
     friend class CHqlSelectBaseExpression;
 public:
-    virtual IHqlExpression *queryNormalizedSelector(bool skipIndex) override;
+    virtual IHqlExpression *queryNormalizedSelector() override;
     virtual void calcNormalized() override;
 
 protected:
@@ -652,7 +652,7 @@ public:
     virtual IHqlSimpleScope *querySimpleScope() override;
     virtual IHqlExpression *queryFunctionDefinition() const override;
     virtual IHqlExpression *queryExternalDefinition() const override;
-    virtual IHqlExpression *queryNormalizedSelector(bool skipIndex=false) override;
+    virtual IHqlExpression *queryNormalizedSelector() override;
     virtual IHqlExpression *queryAttribute(IAtom * propName) const override;
     virtual IHqlExpression *queryProperty(ExprPropKind kind) override;
     virtual IHqlExpression * clone(HqlExprArray &) override;
@@ -899,7 +899,7 @@ public:
     virtual IHqlSimpleScope *querySimpleScope() override;
     virtual IHqlDataset *queryDataset() override;
     virtual IAtom * queryName() const override;
-    virtual IHqlExpression *queryNormalizedSelector(bool skipIndex) override;
+    virtual IHqlExpression *queryNormalizedSelector() override;
 };
 
 
@@ -1794,7 +1794,7 @@ public:
     ~CHqlDictionary();
 
     virtual IHqlExpression *clone(HqlExprArray &newkids) override;
-    virtual IHqlExpression *queryNormalizedSelector(bool skipIndex) override;
+    virtual IHqlExpression *queryNormalizedSelector() override;
     
 protected:
     OwnedHqlExpr normalized;
@@ -1811,7 +1811,7 @@ public:
     virtual IHqlExpression * queryExpression() override { return this; }
     virtual IHqlSimpleScope *querySimpleScope() override;
     virtual IHqlDataset* queryTable() override;
-    virtual IHqlExpression *queryNormalizedSelector(bool skipIndex) override;
+    virtual IHqlExpression *queryNormalizedSelector() override;
 
     virtual bool equals(const IHqlExpression & r) const override;
     virtual IHqlExpression *clone(HqlExprArray &newkids) override;

ecl/hql/hqlgram2.cpp

@@ -3713,7 +3713,7 @@ IHqlExpression *HqlGram::lookupSymbol(IIdAtom * searchName, const attribute& err
                         if (insideEvaluate)
                             return addDatasetSelector(getActiveTableSelector(), ret);
 
-                        IHqlExpression * topSelect = top->queryNormalizedSelector(true);
+                        IHqlExpression * topSelect = top->queryNormalizedSelector();
                         return addDatasetSelector(LINK(topSelect), ret);
                     }
                     else

ecl/hql/hqltrans.cpp

@@ -4335,7 +4335,7 @@ void ScopedTransformer::pushEvaluateScope(IHqlExpression * dataset, IHqlExpressi
     innerScope = new ScopeInfo(dataset);
     scopeStack.append(*innerScope);
 
-    innerScope->setDataset(dataset->queryNormalizedSelector(true), transformed);
+    innerScope->setDataset(dataset->queryNormalizedSelector(), transformed);
     //MORE: Need to correctly translate the dataset....  Not sure what we want to do really.
 //  innerScope->evaluateScope.setown(getEvaluateScope(dataset));
 }
@@ -4451,11 +4451,11 @@ bool ScopedTransformer::checkInScope(IHqlExpression * selector, bool allowCreate
     if (scopeStack.ordinality() == 0)
         return false;
 
-    IHqlExpression * normalized = selector->queryNormalizedSelector(false);
+    IHqlExpression * normalized = selector->queryNormalizedSelector();
     ForEachItemInRev(idx, scopeStack)
     {
         ScopeInfo & cur = scopeStack.item(idx);
-        if (cur.dataset && cur.dataset->queryNormalizedSelector(false) == normalized)
+        if (cur.dataset && cur.dataset->queryNormalizedSelector() == normalized)
             return true;
 
         if (isInImplictScope(cur.dataset, normalized))
@@ -4616,7 +4616,7 @@ bool ScopedDependentTransformer::setTopLeftRight(IHqlExpression * ds, IHqlExpres
 void ScopedDependentTransformer::pushEvaluateScope(IHqlExpression * scope, IHqlExpression * transformedScope)
 {
     ScopedTransformer::pushEvaluateScope(scope, transformedScope);
-    pushChildContext(scope->queryNormalizedSelector(true), transformedScope->queryNormalizedSelector(true));
+    pushChildContext(scope->queryNormalizedSelector(), transformedScope->queryNormalizedSelector());
 }
 
 void ScopedDependentTransformer::popEvaluateScope()
@@ -4645,7 +4645,7 @@ void ScopedDependentTransformer::noteTransformedOnce(IHqlExpression * expr)
 void ScopedDependentTransformer::pushChildContext(IHqlExpression * expr, IHqlExpression * transformed)
 {
     //NB: For this transformer it is the tables that are in scope that matter
-    IHqlExpression * scope = expr->queryNormalizedSelector(false);
+    IHqlExpression * scope = expr->queryNormalizedSelector();
     bool identical = false;
     if (childScope)
     {

ecl/hqlcpp/hqlhtcpp.cpp

@@ -18608,7 +18608,7 @@ ABoundActivity * HqlCppTranslator::doBuildActivitySetResult(BuildCtx & ctx, IHql
     if (expr->getOperator() == no_extractresult)
     {
         row.set(expr->queryChild(0));
-        dataset.set(row->queryNormalizedSelector(true));
+        dataset.set(row->queryNormalizedSelector());
         attribute.set(expr->queryChild(1));
     }
     else