http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRDescriptor.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qmscommon/QRDescriptor.cpp b/core/sql/qmscommon/QRDescriptor.cpp index 1d2830f..eb51cea 100644 --- a/core/sql/qmscommon/QRDescriptor.cpp +++ b/core/sql/qmscommon/QRDescriptor.cpp @@ -136,7 +136,7 @@ QRElement::ExprResult QRElement::encodeResult(const char* resultString) if (!strcmp(resultString, ExprResultNames[i])) return (ExprResult)i; } - throw QRDescriptorException("Invalid value for 'result' attribute -- %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid value for 'result' attribute -- %s", resultString); } @@ -217,7 +217,7 @@ void QRElement::deserializeBoolAttr(const char* attrName, else if (!strcmp(attrVal, "1")) attr = TRUE; else - throw QRDescriptorException("Value of %s attribute must be either 0 or 1", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Value of %s attribute must be either 0 or 1", attrName); } @@ -289,7 +289,7 @@ void QRElementList::startItemExprElement(void *parser, const char *elementName, else if (!strcmp(elementName, QRExpr::elemName)) elem = new (XMLPARSEHEAP) QRExpr(this, atts, FALSE, ADD_MEMCHECK_ARGS(XMLPARSEHEAP)); else - throw QRDescriptorException("<%s> cannot contain <%s>", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("<%s> cannot contain <%s>", getElementName(), elementName); addElement(elem); @@ -374,16 +374,14 @@ NABoolean QRQueryMisc::treeWalk(VisitorPtr visitor) void QRQueryMisc::startElement(void *parser, const char *elementName, const char **atts) { - // LCOV_EXCL_START :cnu if (!strcmp(elementName, QRForcedMVs::elemName)) { forcedMVs_ = new (XMLPARSEHEAP) QRForcedMVs(CHILD_ELEM_ARGS(XMLPARSEHEAP)); XMLDocument::setCurrentElement(parser, forcedMVs_); } - // LCOV_EXCL_STOP else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } } @@ -484,7 +482,7 @@ void QRQueryDescriptor::startElement(void *parser, const char *elementName, cons } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } } @@ -571,7 +569,7 @@ QRJBB::QRJBB(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "ref")) ref_ = iter.getValue(); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -640,12 +638,11 @@ void QRJBB::startElement(void *parser, const char *elementName, const char **att } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } } -// LCOV_EXCL_START :cnu void QRJBB::createTableArray(CollIndex maxEntries) { assertLogAndThrow1(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL, @@ -654,7 +651,6 @@ void QRJBB::createTableArray(CollIndex maxEntries) maxTableEntries_ = maxEntries; tableArray_ = new QRTablePtr[maxEntries]; } -// LCOV_EXCL_STOP void QRJBB::addTable(QRTablePtr table) { @@ -699,7 +695,7 @@ void QRList<T>::startElement(void *parser, const char *elementName, const char * } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } } @@ -719,7 +715,7 @@ template<> void QRList<QRExpr>::startElement(void *parser, const char *elementNa } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } } @@ -766,7 +762,7 @@ QRHub::QRHub(XMLElementPtr parent, AttributeList atts, residualPredList_(NULL) { if (*atts) - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, *atts); } @@ -830,7 +826,7 @@ void QRHub::startElement(void *parser, const char *elementName, const char **att } else { - throw QRDescriptorException("<%s> cannot contain <%s>", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("<%s> cannot contain <%s>", elemName, elementName); } } @@ -843,7 +839,7 @@ QRJBBCList::QRJBBCList(XMLElementPtr parent, AttributeList atts, : QRElementList(ET_JBBCList, parent, NULL, ADD_MEMCHECK_ARGS_PASS(heap)) { if (*atts) - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, *atts); } @@ -858,7 +854,7 @@ void QRJBBCList::startElement(void *parser, const char *elementName, const char else if (!strcmp(elementName, QROperator::elemName)) elem = new (XMLPARSEHEAP) QROperator(CHILD_ELEM_ARGS(XMLPARSEHEAP)); else - throw QRDescriptorException("<%s> cannot contain <%s>", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("<%s> cannot contain <%s>", elemName, elementName); addElement(elem); @@ -1012,7 +1008,7 @@ void QRTable::startElement(void *parser, const char *elementName, const char **a elem = key; } else - throw QRDescriptorException("<%s> cannot contain <%s>", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("<%s> cannot contain <%s>", elemName, elementName); XMLDocument::setCurrentElement(parser, elem); @@ -1036,7 +1032,7 @@ QRKey::QRKey(XMLElementPtr parent, AttributeList atts, : QRElementList(ET_Key, parent, NULL, ADD_MEMCHECK_ARGS_PASS(heap)) { if (*atts) - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, *atts); } @@ -1047,7 +1043,7 @@ void QRKey::startElement(void *parser, const char *elementName, const char **att if (!strcmp(elementName, QRColumn::elemName)) elem = new (XMLPARSEHEAP) QRColumn(CHILD_ELEM_ARGS(XMLPARSEHEAP)); else - throw QRDescriptorException("<%s> cannot contain <%s>", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("<%s> cannot contain <%s>", elemName, elementName); addElement(elem); @@ -1058,7 +1054,6 @@ void QRKey::startElement(void *parser, const char *elementName, const char **att // QRForcedMVs // -// LCOV_EXCL_START :cnu Entire QRForcedMVs is currently not used. QRForcedMVs::~QRForcedMVs() { CollIndex i; @@ -1099,7 +1094,6 @@ void QRForcedMVs::serializeBody(XMLString& xml) for (i = 0; i < tableList_.entries(); i++) tableList_[i]->toXML(xml); } -// LCOV_EXCL_STOP // @@ -1145,7 +1139,7 @@ QRJoinPred::QRJoinPred(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "result")) result_ = encodeResult(iter.getValue()); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -1236,7 +1230,7 @@ QRRangePred::QRRangePred(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "mustMatch")) deserializeBoolAttr(attrName, iter.getValue(), mustMatch_); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -1356,7 +1350,7 @@ void QRRangePred::startElement(void *parser, const char *elementName, const char XMLDocument::setCurrentElement(parser, op); } else - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } // QRRangePred::startElement @@ -1446,7 +1440,7 @@ void QROpEQ::startElement(void *parser, const char *elementName, const char **at return; } else - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); if (valElem) { @@ -1512,7 +1506,7 @@ QROpInequality::QROpInequality(ElementType eType, QRElement *parent, if (!strcmp(attrName, "isNormalized")) deserializeBoolAttr(attrName, attrVal, isNormalized_); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -1556,7 +1550,7 @@ void QROpInequality::startElement(void *parser, const char *elementName, const c else if (!strcmp(elementName, QRFloatVal::elemName)) value_ = new (XMLPARSEHEAP) QRFloatVal(CHILD_ELEM_ARGS(XMLPARSEHEAP)); else - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", getElementName(), elementName); XMLDocument::setCurrentElement(parser, value_); } @@ -1592,7 +1586,7 @@ QROpBT::QROpBT(QRElement *parent, AttributeList atts, else if (!strcmp(attrName, "endIsIncluded")) deserializeBoolAttr(attrName, attrVal, endIsIncluded_); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -1635,7 +1629,7 @@ void QROpBT::startElement(void *parser, const char *elementName, const char **at { valueCount_++; if (valueCount_ > 2) - throw QRDescriptorException("Only 2 values can be contained in %s", elemName); // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Only 2 values can be contained in %s", elemName); //QRElementPtr& val = (valueCount_ == 1 ? startValue_ : endValue_); QRScalarValuePtr& val = (valueCount_ == 1 ? startValue_ : endValue_); @@ -1931,7 +1925,7 @@ QRGroupBy::QRGroupBy(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "result")) result_ = encodeResult(iter.getValue()); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -1994,7 +1988,6 @@ void QRGroupBy::startElement(void *parser, const char *elementName, const char * primary_ = new (XMLPARSEHEAP) QRPrimaryGroupBy(CHILD_ELEM_ARGS(XMLPARSEHEAP)); elem = primary_; } - // LCOV_EXCL_START :cnu Dependent/Minimal GB not implemented yet. else if (!strcmp(elementName, QRDependentGroupBy::elemName)) { dependent_ = new (XMLPARSEHEAP) QRDependentGroupBy(CHILD_ELEM_ARGS(XMLPARSEHEAP)); @@ -2005,7 +1998,6 @@ void QRGroupBy::startElement(void *parser, const char *elementName, const char * minimal_ = new (XMLPARSEHEAP) QRMinimalGroupBy(CHILD_ELEM_ARGS(XMLPARSEHEAP)); elem = minimal_; } - // LCOV_EXCL_STOP else if (!strcmp(elementName, QRList<QRTable>::elemName)) { tableList_ = new (XMLPARSEHEAP) QRList<QRTable>(CHILD_ELEM_ARGS(XMLPARSEHEAP)); @@ -2013,7 +2005,7 @@ void QRGroupBy::startElement(void *parser, const char *elementName, const char * } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } @@ -2029,7 +2021,7 @@ QRPrimaryGroupBy::QRPrimaryGroupBy(XMLElementPtr parent, AttributeList atts, : QRElementList(ET_PrimaryGroupBy, parent, NULL, ADD_MEMCHECK_ARGS_PASS(heap)) { if (*atts) - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, *atts); } @@ -2038,7 +2030,6 @@ void QRPrimaryGroupBy::startElement(void *parser, const char *elementName, const QRElementList::startItemExprElement(parser, elementName, atts); } -// LCOV_EXCL_START :cnu Dependent GB not implemented yet. // // QRDependentGroupBy // @@ -2055,9 +2046,7 @@ void QRDependentGroupBy::startElement(void *parser, const char *elementName, con { QRElementList::startItemExprElement(parser, elementName, atts); } -// LCOV_EXCL_STOP -// LCOV_EXCL_START :cnu Minimal GB not implemented yet. // // QRMinimalGroupBy // @@ -2074,7 +2063,6 @@ void QRMinimalGroupBy::startElement(void *parser, const char *elementName, const { QRElementList::startItemExprElement(parser, elementName, atts); } -// LCOV_EXCL_STOP @@ -2112,7 +2100,7 @@ QRColumn::QRColumn(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "isNullable")) deserializeBoolAttr(attrName, attrValue, isNullable_); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -2208,7 +2196,7 @@ QRExpr::QRExpr(XMLElementPtr parent, AttributeList atts, NABoolean isResidual, result_ = encodeResult(iter.getValue()); } else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", getElementName(), //@ZXresid -- virtual fn in ctor attrName); } @@ -2276,7 +2264,7 @@ void QRExpr::startElement(void *parser, const char *elementName, const char **at } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", getElementName(), elementName); } } @@ -2386,7 +2374,7 @@ QRExplicitExprPtr QRExplicitExpr::constructSubElement(void *parser, elem = new (XMLPARSEHEAP) QRNullVal(CHILD_ELEM_ARGS(XMLPARSEHEAP)); else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", getElementName(), elementName); } @@ -2431,7 +2419,7 @@ QRBinaryOper::QRBinaryOper(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "op")) operator_ = iter.getValue(); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -2482,7 +2470,7 @@ void QRBinaryOper::startElement(void* parser, const char* elementName, const cha else if (!secondOperand_) secondOperand_ = elem; else - throw QRDescriptorException("More than two operands given for binary operator " // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("More than two operands given for binary operator " "with id=%s", id_.data()); XMLDocument::setCurrentElement(parser, elem); @@ -2512,7 +2500,7 @@ QRUnaryOper::QRUnaryOper(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "op")) operator_ = iter.getValue(); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -2547,7 +2535,7 @@ void QRUnaryOper::startElement(void *parser, const char *elementName, const char if (!operand_) operand_ = elem; else - throw QRDescriptorException("More than one operand given for unary operator " // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("More than one operand given for unary operator " "with id=%s", id_.data()); XMLDocument::setCurrentElement(parser, elem); @@ -2573,7 +2561,7 @@ QRParameter::QRParameter(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "value")) paramValue_ = iter.getValue(); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -2619,7 +2607,7 @@ QRFunction::QRFunction(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "aggregateFunc")) aggregateFunc_ = (AggregateFunctionType)atoi(iter.getValue()); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", getElementName(), attrName); } } @@ -2929,7 +2917,7 @@ QROutput::QROutput(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "result")) result_ = encodeResult(iter.getValue()); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -2988,7 +2976,7 @@ void QRExtraHub::startElement(void *parser, const char *elementName, const char } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } } @@ -3024,7 +3012,7 @@ QRMVMisc::QRMVMisc(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "isUMV")) deserializeBoolAttr(attrName, iter.getValue(), isUMV_); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -3062,7 +3050,7 @@ QRMVDescriptor::QRMVDescriptor(AttributeList atts, // Set parent here so we don't have to use 'this' in initializer setParent(this); if (*atts) - throw QRDescriptorException("<%s> should have no attributes; attribute %s specified", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("<%s> should have no attributes; attribute %s specified", getElementName(), *atts); } @@ -3136,7 +3124,7 @@ void QRMVDescriptor::startElement(void *parser, const char *elementName, const c } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } } @@ -3163,7 +3151,7 @@ QRMVName::QRMVName(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "TS")) timestamp_ = iter.getValue(); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -3210,7 +3198,7 @@ QRCandidate::QRCandidate(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "isIndirectGroupBy")) deserializeBoolAttr(attrName, attrVal, isIndirectGroupBy_); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -3315,7 +3303,7 @@ void QRCandidate::startElement(void *parser, const char *elementName, const char } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } } // QRCandidate::startElement @@ -3345,7 +3333,7 @@ QRJbbSubset::QRJbbSubset(XMLElementPtr parent, AttributeList atts, else if (!strcmp(attrName, "ref")) ref_ = iter.getValue(); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -3391,7 +3379,7 @@ void QRJbbSubset::startElement(void *parser, const char *elementName, const char } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } } @@ -3416,7 +3404,7 @@ QRJbbResult::QRJbbResult(XMLElementPtr parent, AttributeList atts, if (!strcmp(attrName, "ref")) ref_ = iter.getValue(); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -3469,7 +3457,7 @@ void QRJbbResult::startElement(void *parser, const char *elementName, const char XMLDocument::setCurrentElement(parser, info); } else - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } @@ -3521,7 +3509,7 @@ void QRResultDescriptor::startElement(void *parser, const char *elementName, con } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } } @@ -3553,7 +3541,7 @@ QRPublishDescriptor::QRPublishDescriptor(AttributeList atts, if (!strcmp(attrName, "TS")) redefTimestamp_ = iter.getValue(); else - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, attrName); } } @@ -3618,7 +3606,7 @@ void QRPublishDescriptor::startElement(void *parser, } else { - throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Element %s cannot contain element %s", elemName, elementName); } } @@ -3713,7 +3701,7 @@ void QRPublishDescriptor::initialize(ComPublishMVOperationType opType, case COM_PUBLISH_MV_UNKNOWN: default: - assertLogAndThrow(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi + assertLogAndThrow(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL, FALSE, QRDescriptorException, "Unhandled MV operation type"); break;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRDescriptor.h ---------------------------------------------------------------------- diff --git a/core/sql/qmscommon/QRDescriptor.h b/core/sql/qmscommon/QRDescriptor.h index 0c8469e..b95bc1d 100644 --- a/core/sql/qmscommon/QRDescriptor.h +++ b/core/sql/qmscommon/QRDescriptor.h @@ -511,7 +511,6 @@ class QRElement : public XMLElement return this == &other; } - // LCOV_EXCL_START :rfi -- assertion failure if FALSE returned /** * Indicates whether this class can be a member of a JBBCList. * @@ -522,9 +521,7 @@ class QRElement : public XMLElement { return FALSE; // overridden to be TRUE for Table, JBB, Operator } - // LCOV_EXCL_STOP - // LCOV_EXCL_START :rfi -- assertion failure if FALSE returned /** * Indicates whether this class can be contained in a <JoinPred> element. * @@ -535,9 +532,7 @@ class QRElement : public XMLElement { return FALSE; // overridden to be TRUE for Column, MVColumn, Expr, JoinPred } - // LCOV_EXCL_STOP - // LCOV_EXCL_START :rfi -- assertion failure if FALSE returned /** * Indicates whether this class represents one of the elements that can be * the root element of a \c QRExpr. @@ -550,9 +545,7 @@ class QRElement : public XMLElement return FALSE; // overridden to be TRUE for Function, BinaryOper, // and UnaryOper } - // LCOV_EXCL_STOP - // LCOV_EXCL_START :rfi -- assertion failure if FALSE returned /** * Indicates whether this class represents one of the elements that can be * an output item. @@ -564,9 +557,7 @@ class QRElement : public XMLElement { return FALSE; // overridden to be TRUE for Column, Expr, MVColumn } - // LCOV_EXCL_STOP - // LCOV_EXCL_START :rfi -- assertion failure if FALSE returned /** * Indicates whether this class represents one of the elements that can be * a <code>Group By</code> item. @@ -578,7 +569,6 @@ class QRElement : public XMLElement { return FALSE; // overridden to be TRUE for Column, Expr, MVColumn } - // LCOV_EXCL_STOP /** * Indicates whether an element belongs to the extra-hub as opposed to the @@ -594,7 +584,6 @@ class QRElement : public XMLElement return FALSE; } - // LCOV_EXCL_START :rfi /** * Returns the string value used as the basis for comparing this element * with other elements when creating a sorted list; for example, when @@ -608,7 +597,6 @@ class QRElement : public XMLElement throw QRDescriptorException("getSortName() is not defined for Element %s", getElementName()); } - // LCOV_EXCL_STOP void serializeBoolAttr(const char* attrName, NABoolean attrVal, @@ -639,7 +627,6 @@ class QRElement : public XMLElement return (id_.length() < 2 ? 0 : atoi(id_.data()+1)); } - // LCOV_EXCL_START :rfi /** * Return the first character of ID strings used by an element. * @return the first char of the ID for subclass elements. @@ -652,7 +639,6 @@ class QRElement : public XMLElement "to use the id attribute."); return ' '; } - // LCOV_EXCL_STOP /** * Returns the id of the element referenced by this element. @@ -777,7 +763,6 @@ class QRElement : public XMLElement #define THROW_DOWNCAST_EXCEPTION assertLogAndThrow(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL, FALSE, QRLogicException, "Down cast to wrong element type."); - // LCOV_EXCL_START :rfi // Methods for easy downcasting to specific classes. // Each method is overridden by its specific class, to return 'this'. virtual QRColumnPtr downCastToQRColumn() { THROW_DOWNCAST_EXCEPTION } @@ -790,7 +775,6 @@ class QRElement : public XMLElement virtual QRFunctionPtr downCastToQRFunction() { THROW_DOWNCAST_EXCEPTION } virtual QRColumnPtr getFirstColumn() { return NULL; } - // LCOV_EXCL_STOP const QRElementPtr getParentElement() const { @@ -822,7 +806,6 @@ class QRElement : public XMLElement referencedElement_ = this; } - // LCOV_EXCL_START :rfi // This method must be redefined for element types that have element content. virtual void startElement(void *parser, const char *elementName, @@ -831,7 +814,6 @@ class QRElement : public XMLElement throw QRDescriptorException("Element %s cannot contain element content", getElementName()); } - // LCOV_EXCL_STOP virtual void serializeAttrs(XMLString& xml); @@ -1025,7 +1007,7 @@ public: void addElement(QRElementPtr elem) { if (!isAllowed(elem)) - throw QRDescriptorException("<%s> is not allowed in <%s>", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("<%s> is not allowed in <%s>", elem->getElementName(), getElementName()); list_.insert(elem); } @@ -1914,7 +1896,6 @@ class QRTable : public QRElement return 'T'; } - // LCOV_EXCL_START :rfi /** * Overrides the standard definition of this function to throw an exception. * This ensures that #setAndRegisterID() is not bypassed as the way to set @@ -1930,7 +1911,6 @@ class QRTable : public QRElement "setAndRegisterID() must be used instead of setID() " "for element QRTable"); } - // LCOV_EXCL_STOP /** * Sets the id for this table element, and creates an entry in the hash @@ -2264,7 +2244,6 @@ class QRKey : public QRElementList }; // QRKey -// LCOV_EXCL_START :cnu Entire QRForcedMVs currently not used. /** * Class representing a list of forced MVs, defined in an XML document by the * <ForcedMVs> element. Forced MVs are those that QMS is instructed not to @@ -2334,7 +2313,6 @@ class QRForcedMVs : public QRElement // Attributes and contained elements. }; // QRForcedMVs -// LCOV_EXCL_STOP /** * Abstract class that is parent of any element that can be part of an explicit @@ -2549,7 +2527,6 @@ class QRColumn : public QRExplicitExpr return 'C'; } - // LCOV_EXCL_START :rfi /** * Overrides the standard definition of this function to throw an exception. * This ensures that #setAndRegisterID() is not bypassed as the way to set @@ -2565,7 +2542,6 @@ class QRColumn : public QRExplicitExpr "setAndRegisterID() must be used instead of setID() " "for element QRColumn"); } - // LCOV_EXCL_STOP /** * Sets the id for this column element, and creates an entry in the hash @@ -3088,7 +3064,6 @@ class QRJoinPred : public QRElementList return 'J'; } - // LCOV_EXCL_START :rfi /** * Overrides the standard definition of this function to throw an exception. * This ensures that #setAndRegisterID() is not bypassed as the way to set @@ -3104,7 +3079,6 @@ class QRJoinPred : public QRElementList "setAndRegisterID() must be used instead of setID() " "for element QRJoinPred"); } - // LCOV_EXCL_STOP /** * We get here only when, in a multi-JBB query, one join pred includes @@ -3475,7 +3449,7 @@ class QROpEQ : public QRRangeOperator nullVal_(NULL) { if (*atts) - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, *atts); } @@ -4008,7 +3982,7 @@ class QROpBT : public QRRangeOperator virtual void endElement(void *parser, const char *elementName) { if (valueCount_ != 2) - throw QRDescriptorException("Two values must be contained in %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Two values must be contained in %s", elementName); QRRangeOperator::endElement(parser, elementName); } @@ -4422,7 +4396,6 @@ class QRWStringVal : public QRScalarValue return elemName; } - // LCOV_EXCL_START :rfi /** * Overrides the standard definition of this function to throw an exception. * This ensures that #setWideValue() is called instead. @@ -4437,7 +4410,6 @@ class QRWStringVal : public QRScalarValue "setWideValue() must be used instead of setValue() " "for element QRWStringVal"); } - // LCOV_EXCL_STOP void setWideValue(const NAWString& value) { @@ -4479,7 +4451,6 @@ class QRWStringVal : public QRScalarValue */ virtual void serializeBody(XMLString& xml); - // LCOV_EXCL_START :rfi /** * Overrides the standard definition of this function to throw an exception. * This ensures that #getWideValue() is called instead. @@ -4494,14 +4465,12 @@ class QRWStringVal : public QRScalarValue "getWideValue() must be used instead of getValue() " "for element QRWStringVal"); } - // LCOV_EXCL_STOP const NAWString& getWideValue() const { return wideStringRep_; } - // LCOV_EXCL_START :rfi /** * Overrides the standard definition of this function to throw an exception. * This ensures that #setWStringRep() is called instead. @@ -4516,7 +4485,6 @@ class QRWStringVal : public QRScalarValue "setWStringRep() must be used instead of setStringRep() " "for element QRWStringVal"); } - // LCOV_EXCL_STOP /** * Sets the string representation of the value represented by this object. @@ -4667,7 +4635,7 @@ class QRNullVal : public QRExplicitExpr : QRExplicitExpr(ET_NullVal, parent, ADD_MEMCHECK_ARGS_PASS(heap)) { if (*atts) - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, *atts); } @@ -5251,7 +5219,7 @@ class QRExtraHub : public QRElement joinPredList_(NULL) { if (*atts) - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, *atts); } @@ -6055,7 +6023,6 @@ class QRExpr : public QRElement return (isResidual_ ? 'D' : 'X'); } - // LCOV_EXCL_START :rfi /** * Overrides the standard definition of this function to throw an exception. * This ensures that #setAndRegisterID() is not bypassed as the way to set @@ -6071,7 +6038,6 @@ class QRExpr : public QRElement "setAndRegisterID() must be used instead of setID() " "for element QRExpr"); } - // LCOV_EXCL_STOP /** * Sets the id for this expression element, and creates an entry in the hash @@ -6409,7 +6375,7 @@ class QRVersion : public QRElement versionString_(charData_) { if (*atts) - throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("Invalid attribute specified for element %s: %s", elemName, *atts); } @@ -6485,7 +6451,7 @@ class QRMVDescriptor : public QRDescriptor misc_(NULL) { if (*atts) - throw QRDescriptorException("<%s> should have no attributes; attribute %s specified", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("<%s> should have no attributes; attribute %s specified", getElementName(), *atts); } @@ -7138,7 +7104,7 @@ class QRResultDescriptor : public QRElement // Set parent here so we don't have to use 'this' in initializer setParent(this); if (*atts) - throw QRDescriptorException("<%s> should have no attributes; attribute %s specified", // LCOV_EXCL_LINE :rfi + throw QRDescriptorException("<%s> should have no attributes; attribute %s specified", getElementName(), *atts); } @@ -7521,7 +7487,6 @@ class QRUpdate : public QRElement newName_ = name; } - // LCOV_EXCL_START :cnu const NABoolean getIgnoreChanges() { assertLogAndThrow(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL, @@ -7529,7 +7494,6 @@ class QRUpdate : public QRElement "Ignore changes flag can only be used in Alter Update elements."); return hasIgnoreChanges_; } - // LCOV_EXCL_STOP void setIgnoreChanges(NABoolean ic) { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRLogger.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qmscommon/QRLogger.cpp b/core/sql/qmscommon/QRLogger.cpp index be1e974..f4fb75d 100644 --- a/core/sql/qmscommon/QRLogger.cpp +++ b/core/sql/qmscommon/QRLogger.cpp @@ -332,7 +332,6 @@ void QRLogger::introduceSelf () // form of the query, cause an informational rather than an error notification // to be entered in the system log. // ************************************************************************** -// LCOV_EXCL_START :rfi void QRLogger::logError(const char* file, Int32 line, std::string &cat, @@ -380,7 +379,6 @@ void QRLogger::logError(const char* file, va_end(args); } -// LCOV_EXCL_STOP // This temporary function is used for logging QVP messages only. More extensive // changes to the CommonLogger hierarchy will be made when the QI integration @@ -471,7 +469,6 @@ CommonTracer::CommonTracer(const char* fnName, { if (level_ == TL_all) { - // LCOV_EXCL_START :cnu if (file_.length() == 0) logger_.log(category_, LL_DEBUG, "Entering %s", fnName_.data()); @@ -479,7 +476,6 @@ CommonTracer::CommonTracer(const char* fnName, logger_.log(category_, LL_DEBUG, "Entering %s (file %s, line %d)", fnName_.data(), file_.data(), line_); - // LCOV_EXCL_STOP } } @@ -492,17 +488,15 @@ CommonTracer::~CommonTracer() if (level_ >= TL_exceptionOnly && std::uncaught_exception()) logMsg.append("Exiting %s with uncaught exception"); else if (level_ == TL_all) - logMsg.append("Exiting %s"); // LCOV_EXCL_LINE :cnu + logMsg.append("Exiting %s"); else return; if (file_.length() > 0) { - // LCOV_EXCL_START :cnu logMsg.append("(file %s, line %d)"); logger_.log(category_, LL_DEBUG, logMsg, fnName_.data(), file_.data(), line_); - // LCOV_EXCL_STOP } else { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRLogger.h ---------------------------------------------------------------------- diff --git a/core/sql/qmscommon/QRLogger.h b/core/sql/qmscommon/QRLogger.h index 59384d6..5cabac4 100644 --- a/core/sql/qmscommon/QRLogger.h +++ b/core/sql/qmscommon/QRLogger.h @@ -434,7 +434,6 @@ class QRException /** * Exception thrown when an error in the program logic is found. */ -// LCOV_EXCL_START :rfi class QRLogicException : public QRException { public: @@ -458,6 +457,5 @@ class QRLogicException : public QRException {} }; //QRLogicException -// LCOV_EXCL_STOP #endif /* _QRLOGGER_H_ */ http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRQueries.h ---------------------------------------------------------------------- diff --git a/core/sql/qmscommon/QRQueries.h b/core/sql/qmscommon/QRQueries.h index 277e5bc..6ba5d77 100644 --- a/core/sql/qmscommon/QRQueries.h +++ b/core/sql/qmscommon/QRQueries.h @@ -69,7 +69,6 @@ class QRQueries; #define MAX_DEFAULTS_VALUE 1000 #define MAX_DEFAULTS_UTF8_VALUE_IN_BYTES 4001 -// LCOV_EXCL_START :rfi /** * Exception thrown when an error in a database operation is found. */ @@ -96,7 +95,6 @@ class QRDatabaseException : public QRException {} }; // QRDatabaseException -// LCOV_EXCL_STOP /** * QRMVData is the structure used to pass information between http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRQueriesImpl.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qmscommon/QRQueriesImpl.cpp b/core/sql/qmscommon/QRQueriesImpl.cpp index 5911ac7..7432e32 100644 --- a/core/sql/qmscommon/QRQueriesImpl.cpp +++ b/core/sql/qmscommon/QRQueriesImpl.cpp @@ -135,7 +135,6 @@ void QRQueriesImpl::commitTransaction() return; } // End of commitTransaction -// LCOV_EXCL_START :rfi // *************************************************************** // * Rollback the transaction // * This routine calls a static SQL routine to execute "ROLLBACK WORK;" @@ -149,7 +148,6 @@ void QRQueriesImpl::rollbackTransaction() return; } // End of rollbackTransaction -// LCOV_EXCL_STOP // *************************************************************** // *************************************************************** @@ -171,13 +169,11 @@ NABoolean QRQueriesImpl::getSystemDefault(const char* attribute, char* defValue) // Always close to free up resources queries_->closeSystemDefault(); } - // LCOV_EXCL_START :rfi catch(...) { // If we get an error here, just go with the defaults. return FALSE; } - // LCOV_EXCL_STOP if (sqlCode == SQL_Success) return TRUE; @@ -242,19 +238,16 @@ NABoolean QRQueriesImpl::getCollectQMSStatsEnabled() if (getSystemDefault(collectQMSStatsdEnabled, defValue) == FALSE) return FALSE; // The default value. - // LCOV_EXCL_START :cnu CQD does not exist. else if (!strcmp(defValue, "OFF")) return FALSE; else if (!strcmp(defValue, "ON")) return TRUE; - // LCOV_EXCL_STOP else - assertLogAndThrow1(CAT_SQL_COMP_QR_COMMON, LL_ERROR, // LCOV_EXCL_LINE :rfi + assertLogAndThrow1(CAT_SQL_COMP_QR_COMMON, LL_ERROR, FALSE, QRDatabaseException, "Invalid value for MVQR_COLLECT_QMS_STATS system default: %s.", defValue); } -// LCOV_EXCL_START :cnu // *************************************************************** // * Get the ISO_MAPPING setting from the SYSTEM DEFAULTS TABLE // * for National character set support. @@ -282,9 +275,7 @@ CharInfo::CharSet QRQueriesImpl::getIsoMapping() return CharInfo::getCharSetEnum((const char *)"ISO88591"); } } // End of getIsoMapping -// LCOV_EXCL_STOP -// LCOV_EXCL_START :cnu // *************************************************************** // * Get the DEFAULT_CHARSET setting from the SYSTEM DEFAULTS TABLE // * for National character set support. @@ -311,11 +302,9 @@ CharInfo::CharSet QRQueriesImpl::getDefaultCharset() return CharInfo::getCharSetEnum((const char *)"ISO88591"); } } // End of getDefaultCharset -// LCOV_EXCL_STOP // *************************************************************** // *************************************************************** -// LCOV_EXCL_START :cnu Int32 QRQueriesImpl::getMvqrCpusPerQMS() { static const char cpusPerQms[] = "MVQR_CPUS_PER_QMS"; @@ -330,11 +319,9 @@ Int32 QRQueriesImpl::getMvqrCpusPerQMS() return result; } } // End of getMvqrCpusPerQMS -// LCOV_EXCL_STOP // *************************************************************** // *************************************************************** -// LCOV_EXCL_START :cnu Int32 QRQueriesImpl::getMvqrQMSCpuOffset() { static const char qmsCpusOffset[] = "MVQR_QMS_CPU_OFFSET"; @@ -349,7 +336,6 @@ Int32 QRQueriesImpl::getMvqrQMSCpuOffset() return result; } } // End of getMvqrQMSCpuOffset -// LCOV_EXCL_STOP // *************************************************************** // * Obtain the CAT_UID for a specific catalog http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QueryRewriteServer.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qmscommon/QueryRewriteServer.cpp b/core/sql/qmscommon/QueryRewriteServer.cpp index b3f0921..84572cf 100644 --- a/core/sql/qmscommon/QueryRewriteServer.cpp +++ b/core/sql/qmscommon/QueryRewriteServer.cpp @@ -263,11 +263,9 @@ IpcServer* MvQueryRewriteServer::getQmsServer(DefaultToken publishDest, } else { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "Failed to allocate server process for QMS"); QRLogger::logDiags(diagsArea, CAT_SQL_COMP_QR_IPC); - // LCOV_EXCL_STOP } } else @@ -276,14 +274,12 @@ IpcServer* MvQueryRewriteServer::getQmsServer(DefaultToken publishDest, "Could not find local QMS."); } } - // LCOV_EXCL_START :rfi catch(...) { QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "Exception when allocating server process for QMS"); return NULL; } - // LCOV_EXCL_STOP } return qmsServer_; } // End of getQmsServer @@ -438,30 +434,24 @@ QRXmlMessageObj* MvQueryRewriteServer::sendMatchMessage(IpcServer* qms, } break; - // LCOV_EXCL_START :rfi default: - QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "Unexpected response type: %d.", t); // LCOV_EXCL_LINE :rfi + QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "Unexpected response type: %d.", t); break; - // LCOV_EXCL_STOP } if (msgStream.moreObjects()) { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_WARN, "Match request received one or more extraneous response " "objects, which were discarded"); msgStream.clearAllObjects(); - // LCOV_EXCL_STOP } } else { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_WARN, "No response object in message stream from QMS"); checkQmsServer(); - // LCOV_EXCL_STOP } return xmlResponse; @@ -476,7 +466,7 @@ QRRequestResult MvQueryRewriteServer::initQms(IpcServer* qmsServer, QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_DEBUG, "...Initialization succeeded"); else QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "INITIALIZATION FAILED, result = %d", - response); // LCOV_EXCL_LINE :rfi + response); return response; } @@ -521,29 +511,23 @@ QRRequestResult MvQueryRewriteServer::sendInitializeMessage(IpcServer* qms, statusResponse->decrRefCount(); } else - // LCOV_EXCL_START :rfi QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "Unexpected response type: %d.", t); - // LCOV_EXCL_STOP if (msgStream.moreObjects()) { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_WARN, "Initialize request received one or more extraneous response " "objects, which were discarded"); msgStream.clearAllObjects(); - // LCOV_EXCL_STOP } } else { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_WARN, "No response object in message stream from QMS"); if (qmsServer_) checkQmsServer(); - // LCOV_EXCL_STOP } return status; @@ -569,8 +553,8 @@ void MvQueryRewriteServer::formatTimestamp( { if (GMT_Time == 0) { - buffer[0] = '\0'; // LCOV_EXCL_LINE :rfi - return; // LCOV_EXCL_LINE :rfi + buffer[0] = '\0'; + return; } short Date_and_Time[8]; @@ -591,8 +575,8 @@ void MvQueryRewriteServer::formatTimestamp( if (GMT_Time > 274958971199999999LL || // The year 4000 GMT_Time < 146728398400000000LL) // The year 1 { - *buffer = 0; // LCOV_EXCL_LINE :rfi - return; // LCOV_EXCL_LINE :rfi + *buffer = 0; + return; } //#endif @@ -601,7 +585,7 @@ void MvQueryRewriteServer::formatTimestamp( // If we can't convert, just show GMT if (errorNumber) - isGMT = true; // LCOV_EXCL_LINE :rfi + isGMT = true; // Decompose timestamp INTERPRETTIMESTAMP(julianTime,Date_and_Time); @@ -627,13 +611,11 @@ void MvQueryRewriteServer::formatTimestamp( if (isGMT) { - // LCOV_EXCL_START :rfi buffer[27] = ' '; buffer[28] = 'G'; buffer[29] = 'M'; buffer[30] = 'T'; buffer[31] = 0; - // LCOV_EXCL_STOP } else buffer[27] = 0; @@ -655,7 +637,6 @@ MvQueryRewriteServer::sendPublishMessage(const NAString* descriptorText, // String constant used in logging entries. const static char PUBLISH[] = "PUBLISH"; - // LCOV_EXCL_START :rfi if (!descriptorText) { QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, @@ -663,16 +644,13 @@ MvQueryRewriteServer::sendPublishMessage(const NAString* descriptorText, "MvQueryRewriteServer::sendPublishMessage()"); return InternalError; } - // LCOV_EXCL_STOP - // LCOV_EXCL_START :rfi if (!server) { QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "null server passed to MvQueryRewriteServer::sendPublishMessage()"); return InternalError; } - // LCOV_EXCL_STOP // Only messages we deal with here are publish. const char* requestName = PUBLISH; @@ -742,11 +720,9 @@ MvQueryRewriteServer::sendPublishMessage(const NAString* descriptorText, } else if (msgStream.getNextObjType() != QR::STATUS_RESPONSE) { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "Wrong response object returned from %s request", requestName); return ProtocolError; - // LCOV_EXCL_STOP } else { @@ -757,26 +733,20 @@ MvQueryRewriteServer::sendPublishMessage(const NAString* descriptorText, QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_INFO, "%s request succeeded", requestName); else - // LCOV_EXCL_START :rfi QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "%s request failed with status %d", requestName, result); - // LCOV_EXCL_STOP if (msgStream.moreObjects()) { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_WARN, "%s request received one or more extraneous response " "objects, which were discarded", requestName); msgStream.clearAllObjects(); - // LCOV_EXCL_STOP } return result; } } // sendPublishMessage -// LCOV_EXCL_START :nsk void extractDefineAndThenPutEnvIfFound(char *defineName) { } // static void extractDefineAndThenPutEnvIfFound() -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/Range.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qmscommon/Range.cpp b/core/sql/qmscommon/Range.cpp index e09a72b..e92732c 100644 --- a/core/sql/qmscommon/Range.cpp +++ b/core/sql/qmscommon/Range.cpp @@ -523,7 +523,6 @@ void RangeSpec::addSubrange(QRScalarValuePtr startVal, QRScalarValuePtr endVal, } break; - // LCOV_EXCL_START :rfi default: { // Need this to avoid link errors. @@ -535,7 +534,6 @@ void RangeSpec::addSubrange(QRScalarValuePtr startVal, QRScalarValuePtr endVal, valueElemType); } break; - // LCOV_EXCL_STOP } } // addSubrange(QRScalarValuePtr... @@ -690,13 +688,11 @@ void RangeSpec::addDenormalizedSubrange(const char* typeText, } else if (!strncmp(typeText, "INTERVAL", typeNameLen)) intvlType = parseIntervalTypeText(typeText + typeNameLen); - // LCOV_EXCL_START :rfi else assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_, FALSE, QRLogicException, "Invalid data type for normalized range pred item -- %s", typeText); - // LCOV_EXCL_STOP // Fill in the missing value based on the type to turn the open interval into // a closed one. This restricts the range to the values allowable for the type. @@ -1097,13 +1093,11 @@ static Int64 intervalMaxIntegerValue(const NAType& naType, logLevel level) maxVal += maxStartFieldUnits * 12; break; - // LCOV_EXCL_START :rfi default: assertLogAndThrow1(CAT_SQL_COMP_RANGE, level, FALSE, QRLogicException, "Invalid end field for interval type -- %d", type.getEndField()); - // LCOV_EXCL_STOP break; } @@ -1133,14 +1127,12 @@ void SubrangeBase::getExactNumericMinMax(const NAType& type, typeMin = (numType.isSigned() ? (-typeMax - 1) : 0); break; - // LCOV_EXCL_START :rfi default: assertLogAndThrow1(CAT_SQL_COMP_RANGE, level, FALSE, QRLogicException, "No case in getExactNumericMinMax() for " "binary exact numeric of type %d", numType.getFSDatatype()); - // LCOV_EXCL_STOP break; } } @@ -1186,12 +1178,10 @@ void SubrangeBase::getExactNumericMinMax(const NAType& type, typeMax = intervalMaxIntegerValue(type, level); typeMin = -typeMax; } - // LCOV_EXCL_START :rfi else assertLogAndThrow1(CAT_SQL_COMP_RANGE, level, FALSE, QRLogicException, "Type not handled by getExactNumericMinMax() -- %d", type.getTypeQualifier()); - // LCOV_EXCL_STOP } // getExactNumericMinMax() QRScalarValuePtr SubrangeBase::createScalarValElem(CollHeap* heap, @@ -1278,13 +1268,11 @@ Int64 SubrangeBase::getStepSize(const NAType* type, logLevel level) case REC_DATE_SECOND: stepSize = (Int64)pow(10, 6 - dtiType->getFractionPrecision()); break; - // LCOV_EXCL_START :rfi default: assertLogAndThrow1(CAT_SQL_COMP_RANGE, level, FALSE, QRDescriptorException, "unexpected end field for datetime type -- %d", dtiType->getEndField()); - // LCOV_EXCL_STOP } break; @@ -1310,23 +1298,19 @@ Int64 SubrangeBase::getStepSize(const NAType* type, logLevel level) case REC_DATE_SECOND: stepSize = (Int64)pow(10, 6 - dtiType->getFractionPrecision()); break; - // LCOV_EXCL_START :rfi default: assertLogAndThrow1(CAT_SQL_COMP_RANGE, level, FALSE, QRDescriptorException, "unexpected end field for datetime type -- %d", dtiType->getEndField()); - // LCOV_EXCL_STOP } break; - // LCOV_EXCL_START :rfi default: assertLogAndThrow1(CAT_SQL_COMP_RANGE, level, FALSE, QRDescriptorException, "getStepSize() called for incorrect type -- %d", typeQual); - // LCOV_EXCL_STOP } return stepSize; @@ -1819,7 +1803,6 @@ void Subrange<Int64>::initSpecifiedValueCount() specifiedValueCount_ = 1; } -// LCOV_EXCL_START :rfi // This template throws an exception if the function is called for any type other // than Int64. The work for Int64 is done by a specialization of the template. template <class T> inline @@ -1828,7 +1811,6 @@ void Subrange<T>::makeStartInclusive(const NAType* type, NABoolean& overflowed) assertLogAndThrow(CAT_SQL_COMP_RANGE, logLevel_, FALSE, QRLogicException, "makeStartInclusive() called for non-Int64-based type"); } -// LCOV_EXCL_STOP // This is the specialization of the above template that makes the start of a // subrange inclusive, by adjusting it up to the next allowable value (in its @@ -1861,7 +1843,6 @@ void Subrange<Int64>::makeStartInclusive(const NAType* type, } } -// LCOV_EXCL_START :rfi // This template throws an exception if the function is called for any type other // than Int64. The work for Int64 is done by a specialization of the template. template <class T> inline @@ -1870,7 +1851,6 @@ void Subrange<T>::makeEndInclusive(const NAType* type, NABoolean& overflowed) assertLogAndThrow(CAT_SQL_COMP_RANGE, logLevel_, FALSE, QRLogicException, "makeEndInclusive() called for non-Int64-based type"); } -// LCOV_EXCL_STOP // This is the specialization of the above template that makes the end of a // subrange inclusive, by adjusting it down to the previous allowable value (in http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/XMLUtil.h ---------------------------------------------------------------------- diff --git a/core/sql/qmscommon/XMLUtil.h b/core/sql/qmscommon/XMLUtil.h index 926d19a..ad9919d 100644 --- a/core/sql/qmscommon/XMLUtil.h +++ b/core/sql/qmscommon/XMLUtil.h @@ -120,7 +120,6 @@ typedef UInt32 NumericID; #define WHITESPACE " \t\n\r\v\f" #define XMLPARSEHEAP XML_GetNAHeap((XML_Parser)parser) -// LCOV_EXCL_START :rfi /** * Exception thrown when an error occurs in processing or generating an XML * message. @@ -163,7 +162,6 @@ class XMLException /** Buffer used to construct the message in. */ char msgBuffer_[200]; }; //XMLException -// LCOV_EXCL_STOP /** * An \c NAString subclass with special formatting capabilities for XML. This @@ -190,7 +188,6 @@ class XMLString : public NAString virtual ~XMLString() {} - // LCOV_EXCL_START :cnu /** * This function is effectively a no-op; it is redefined in the subclass * used for writing formatted XML. @@ -270,7 +267,6 @@ class XMLString : public NAString append(charData); return *this; } - // LCOV_EXCL_STOP }; // XMLString /** @@ -335,7 +331,6 @@ class XMLFormattedString : public XMLString virtual ~XMLFormattedString() {} - // LCOV_EXCL_START :cnu /** * Returns the nesting level for this string. The level starts at 0. It goes * up by one each time #incrementLevel is called, and down by one when @@ -348,7 +343,6 @@ class XMLFormattedString : public XMLString { return level_; } - // LCOV_EXCL_STOP /** * Adds one to the current nesting level of the XML content being written @@ -478,10 +472,8 @@ class XMLAttributeIterator inx_ += 2; inRange_ = TRUE; } - // LCOV_EXCL_START :rfi else throw XMLException("Attribute index out of range"); - // LCOV_EXCL_STOP } /** @@ -492,10 +484,8 @@ class XMLAttributeIterator */ const char* getName() const { - // LCOV_EXCL_START :rfi if (!inRange_) throw XMLException("Attribute index out of range"); - // LCOV_EXCL_STOP return *(atts_+inx_); } @@ -507,10 +497,8 @@ class XMLAttributeIterator */ const char* getValue() const { - // LCOV_EXCL_START :rfi if (!inRange_) throw XMLException("Attribute index out of range"); - // LCOV_EXCL_STOP return *(atts_+inx_+1); } @@ -869,7 +857,7 @@ class XMLElement : public NAIntrusiveSharedPtrObject // content. if (strspn(data, WHITESPACE) < (size_t)len) throw XMLException("Character content not allowed for element %s", - getElementName()); // LCOV_EXCL_LINE :rfi + getElementName()); } /** http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/vers_libqmscommon.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qmscommon/vers_libqmscommon.cpp b/core/sql/qmscommon/vers_libqmscommon.cpp index 6b60617..cf1e92e 100644 --- a/core/sql/qmscommon/vers_libqmscommon.cpp +++ b/core/sql/qmscommon/vers_libqmscommon.cpp @@ -26,6 +26,4 @@ #define VERS_CV_MIN 0 #define VERS_CV_UPD 1 -// LCOV_EXCL_START VERS_LIB(libqmscommon) -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuAuditRefreshTaskExecutor.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuAuditRefreshTaskExecutor.h b/core/sql/refresh/RuAuditRefreshTaskExecutor.h index f715b5a..01ae5f4 100644 --- a/core/sql/refresh/RuAuditRefreshTaskExecutor.h +++ b/core/sql/refresh/RuAuditRefreshTaskExecutor.h @@ -93,7 +93,6 @@ public: // These functions serialize/de-serialize the executor's context // for the message communication with the remote server process - // LCOV_EXCL_START :cnu // Used in the main process side virtual void StoreRequest(CUOFsIpcMessageTranslator &translator); virtual void LoadReply(CUOFsIpcMessageTranslator &translator) @@ -107,7 +106,6 @@ public: { inherited::StoreReply(translator); } - // LCOV_EXCL_STOP //----------------------------------// // Private Members http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuDeltaDef.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuDeltaDef.cpp b/core/sql/refresh/RuDeltaDef.cpp index 7ffef05..c1158a7 100644 --- a/core/sql/refresh/RuDeltaDef.cpp +++ b/core/sql/refresh/RuDeltaDef.cpp @@ -176,7 +176,6 @@ CreateInstance(CUOFsIpcMessageTranslator &translator) // // Serialize the context //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUUpdateBitmap::StoreData(CUOFsIpcMessageTranslator &translator) { RUASSERT(size_ > 0); @@ -186,7 +185,6 @@ void CRUUpdateBitmap::StoreData(CUOFsIpcMessageTranslator &translator) translator.WriteBlock(buffer_, size_); #pragma warn(1506) // warning elimination } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUDeltaDef @@ -362,7 +360,6 @@ TInt32 CRUDeltaStatistics::GetDeltaSize() // // De-serialize the context //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUDeltaStatistics::LoadData(CUOFsIpcMessageTranslator &translator) { translator.ReadBlock(&nRanges_, sizeof(TInt32)); @@ -387,14 +384,12 @@ void CRUDeltaStatistics::LoadData(CUOFsIpcMessageTranslator &translator) pUpdateBitmap_ = CRUUpdateBitmap::CreateInstance(translator); } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUDeltaStatistics::StoreData() // // Serialize the context //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUDeltaStatistics::StoreData(CUOFsIpcMessageTranslator &translator) { @@ -418,7 +413,6 @@ void CRUDeltaStatistics::StoreData(CUOFsIpcMessageTranslator &translator) pUpdateBitmap_->StoreData(translator); } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUDeltaStatistics::GetPackedBufferSize() @@ -471,7 +465,6 @@ CRUDeltaStatisticsMap::operator = (const CRUDeltaStatisticsMap& other) // // De-serialize the context //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUDeltaStatisticsMap::LoadData(CUOFsIpcMessageTranslator &translator) { CRUDeltaStatistics deStat; @@ -487,14 +480,12 @@ void CRUDeltaStatisticsMap::LoadData(CUOFsIpcMessageTranslator &translator) (*this)[epoch] = deStat; } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUDeltaStatisticsMap::StoreData() // // Serialize the context //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUDeltaStatisticsMap::StoreData(CUOFsIpcMessageTranslator &translator) { CRUDeltaStatistics deStat; @@ -516,4 +507,3 @@ void CRUDeltaStatisticsMap::StoreData(CUOFsIpcMessageTranslator &translator) deStat.StoreData(translator); } } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuDupElimGlobals.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuDupElimGlobals.cpp b/core/sql/refresh/RuDupElimGlobals.cpp index 7e9c655..cf78709 100644 --- a/core/sql/refresh/RuDupElimGlobals.cpp +++ b/core/sql/refresh/RuDupElimGlobals.cpp @@ -92,7 +92,6 @@ void CRUDupElimGlobals::Init( // // Singletone initialization from the IPC buffer //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUDupElimGlobals::LoadData(CUOFsIpcMessageTranslator &translator) { translator.ReadBlock(&isRangeResolv_, sizeof(BOOL)); @@ -107,14 +106,12 @@ void CRUDupElimGlobals::LoadData(CUOFsIpcMessageTranslator &translator) translator.ReadBlock(&wasPrevDEInvocationCompleted_, sizeof(BOOL)); translator.ReadBlock(&isSkipCrossTypeResoultion_, sizeof(BOOL)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUDupElimGlobals::StoreData() // // Serialization to the IPC buffer //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUDupElimGlobals::StoreData(CUOFsIpcMessageTranslator &translator) { translator.WriteBlock(&isRangeResolv_, sizeof(BOOL)); @@ -129,4 +126,3 @@ void CRUDupElimGlobals::StoreData(CUOFsIpcMessageTranslator &translator) translator.WriteBlock(&wasPrevDEInvocationCompleted_, sizeof(BOOL)); translator.WriteBlock(&isSkipCrossTypeResoultion_, sizeof(BOOL)); } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuDupElimLogScanner.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuDupElimLogScanner.h b/core/sql/refresh/RuDupElimLogScanner.h index 65472ad..726d35c 100644 --- a/core/sql/refresh/RuDupElimLogScanner.h +++ b/core/sql/refresh/RuDupElimLogScanner.h @@ -129,7 +129,6 @@ public: public: // Pack/unpack for IPC - refinements & implementation of pure virtuals - // LCOV_EXCL_START :cnu // Used in the main process side virtual void StoreRequest(CUOFsIpcMessageTranslator &translator) @@ -154,7 +153,6 @@ public: { statMap_.StoreData(translator); } - // LCOV_EXCL_STOP //-----------------------------------------// // Private area http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuDupElimTaskExecutor.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuDupElimTaskExecutor.cpp b/core/sql/refresh/RuDupElimTaskExecutor.cpp index de490a7..3a476e3 100644 --- a/core/sql/refresh/RuDupElimTaskExecutor.cpp +++ b/core/sql/refresh/RuDupElimTaskExecutor.cpp @@ -209,7 +209,6 @@ Lng32 CRUDupElimTaskExecutor::GetIpcBufferSize() const // build the units and load their SQL text. // //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUDupElimTaskExecutor:: LoadRequest(CUOFsIpcMessageTranslator &translator) { @@ -246,14 +245,12 @@ LoadRequest(CUOFsIpcMessageTranslator &translator) pRangeResolver_->LoadRequest(translator); } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUDupElimTaskExecutor::StoreReply() // // REMOTE before sending to MAIN, pack the statistics //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUDupElimTaskExecutor:: StoreReply(CUOFsIpcMessageTranslator &translator) { @@ -289,14 +286,12 @@ StoreReply(CUOFsIpcMessageTranslator &translator) translator.WriteBlock(&flag, sizeof(BOOL)); } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUDupElimTaskExecutor::LoadReply() // // MAIN after receiving from REMOTE, unpack the statistics //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUDupElimTaskExecutor:: LoadReply(CUOFsIpcMessageTranslator &translator) { @@ -321,7 +316,6 @@ LoadReply(CUOFsIpcMessageTranslator &translator) pRangeResolver_->LoadReply(translator); } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUDupElimTaskExecutor::StoreRequest() @@ -329,7 +323,6 @@ LoadReply(CUOFsIpcMessageTranslator &translator) // MAIN before sending to REMOTE, pack the DE globals and the SQL text. // //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUDupElimTaskExecutor:: StoreRequest(CUOFsIpcMessageTranslator &translator) { @@ -370,7 +363,6 @@ StoreRequest(CUOFsIpcMessageTranslator &translator) translator.SetMessageType(CUOFsIpcMessageTranslator::RU_DE_EXECUTOR); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // PRIVATE AREA @@ -868,7 +860,6 @@ BOOL CRUDupElimTaskExecutor::CanCompletePhase() //--------------------------------------------------------------------------// #ifdef _DEBUG -// LCOV_EXCL_START :dpm void CRUDupElimTaskExecutor::DumpPerformanceStatistics() { CRUOptions &options = CRUGlobals::GetInstance()->GetOptions(); @@ -896,5 +887,4 @@ void CRUDupElimTaskExecutor::DumpPerformanceStatistics() journal.LogMessage(str); } } -// LCOV_EXCL_STOP #endif http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuEmpCheckTaskExecutor.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuEmpCheckTaskExecutor.cpp b/core/sql/refresh/RuEmpCheckTaskExecutor.cpp index bbe380b..b55058d 100644 --- a/core/sql/refresh/RuEmpCheckTaskExecutor.cpp +++ b/core/sql/refresh/RuEmpCheckTaskExecutor.cpp @@ -111,7 +111,6 @@ void CRUEmpCheckTaskExecutor::Init() //--------------------------------------------------------------------------// // CRUEmpCheckTaskExecutor::LoadRequest() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUEmpCheckTaskExecutor:: LoadRequest(CUOFsIpcMessageTranslator &translator) { @@ -123,12 +122,10 @@ LoadRequest(CUOFsIpcMessageTranslator &translator) pEmpCheck_->LoadData(translator); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUEmpCheckTaskExecutor::LoadReply() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUEmpCheckTaskExecutor:: LoadReply(CUOFsIpcMessageTranslator &translator) { @@ -138,12 +135,10 @@ LoadReply(CUOFsIpcMessageTranslator &translator) pEmpCheck_->LoadData(translator); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUEmpCheckTaskExecutor::StoreRequest() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUEmpCheckTaskExecutor:: StoreRequest(CUOFsIpcMessageTranslator &translator) { @@ -154,12 +149,10 @@ StoreRequest(CUOFsIpcMessageTranslator &translator) translator.SetMessageType(CUOFsIpcMessageTranslator:: RU_EMP_CHECK_EXECUTOR); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUEmpCheckTaskExecutor::StoreReply() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUEmpCheckTaskExecutor:: StoreReply(CUOFsIpcMessageTranslator &translator) { @@ -167,7 +160,6 @@ StoreReply(CUOFsIpcMessageTranslator &translator) pEmpCheck_->StoreData(translator); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUEmpCheckTaskExecutor::Work() http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuEmpCheckTaskExecutor.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuEmpCheckTaskExecutor.h b/core/sql/refresh/RuEmpCheckTaskExecutor.h index 10b3175..146129b 100644 --- a/core/sql/refresh/RuEmpCheckTaskExecutor.h +++ b/core/sql/refresh/RuEmpCheckTaskExecutor.h @@ -98,12 +98,10 @@ protected: enum { SIZE_OF_PACK_BUFFER = 1000 }; //-- Implementation of pure virtual - // LCOV_EXCL_START :cnu virtual Lng32 GetIpcBufferSize() const { return SIZE_OF_PACK_BUFFER; // Initial size } - // LCOV_EXCL_STOP private: enum STATES { EX_CHECK = REMOTE_STATES_START }; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuException.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuException.cpp b/core/sql/refresh/RuException.cpp index fe96bad..39b4dd2 100644 --- a/core/sql/refresh/RuException.cpp +++ b/core/sql/refresh/RuException.cpp @@ -40,7 +40,6 @@ //--------------------------------------------------------------------------// // CRUException::StoreData() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUException::StoreData(CUOFsIpcMessageTranslator &translator) { Int32 i; @@ -74,12 +73,10 @@ void CRUException::StoreData(CUOFsIpcMessageTranslator &translator) // StoreErrorParams(translator,i); } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUException::StoreErrorParams() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRUException::StoreErrorParams(CUOFsIpcMessageTranslator &translator, Int32 index) { @@ -107,12 +104,10 @@ void CRUException::StoreErrorParams(CUOFsIpcMessageTranslator &translator, #pragma warn(1506) // warning elimination } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUException::LoadData() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUException::LoadData(CUOFsIpcMessageTranslator &translator) { Int32 i; @@ -138,12 +133,10 @@ void CRUException::LoadData(CUOFsIpcMessageTranslator &translator) // LoadErrorParams(translator,i); } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUException::LoadErrorParams() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRUException:: LoadErrorParams(CUOFsIpcMessageTranslator &translator, Int32 index) @@ -175,4 +168,3 @@ LoadErrorParams(CUOFsIpcMessageTranslator &translator, delete [] buffer; } } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuExecController.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuExecController.cpp b/core/sql/refresh/RuExecController.cpp index 0d90ddb..2322618 100644 --- a/core/sql/refresh/RuExecController.cpp +++ b/core/sql/refresh/RuExecController.cpp @@ -108,7 +108,6 @@ void CRUExecController::HandleRequest(CRURuntimeControllerRqst *pRqst) HandleRequestFailure(pRqst, ex); return; } - // LCOV_EXCL_START :rfi catch (...) { // Unknown error happened @@ -116,7 +115,6 @@ void CRUExecController::HandleRequest(CRURuntimeControllerRqst *pRqst) HandleRequestFailure(pRqst, ex); return; } - // LCOV_EXCL_STOP } //--------------------------------------------------------------------------// @@ -228,7 +226,6 @@ void CRUExecController::HandleAwaitEventRqst() return; } - // LCOV_EXCL_START :rfi catch (CUOFsTaskProcessPool::CUOFsUnknownProcessException &e) { // If it's the TMF completion message, then try to listen again @@ -240,7 +237,6 @@ void CRUExecController::HandleAwaitEventRqst() throw e; } } - // LCOV_EXCL_STOP } } @@ -442,7 +438,6 @@ void CRUExecController::SerializeTaskExecutor(CRUTaskExecutor &executor) break; } - // LCOV_EXCL_START :rfi catch (CUOFsBufferOverFlowException &ex) { if (pTranslator->GetBufferSize() @@ -458,7 +453,6 @@ void CRUExecController::SerializeTaskExecutor(CRUTaskExecutor &executor) // The buffer can be resized up to the maximum executor.ReAllocateBuffer(2 /*factor*/); } - // LCOV_EXCL_STOP } } @@ -524,7 +518,6 @@ HandleRemoteExecutorSuccess(CRUTask *pTask, //--------------------------------------------------------------------------// // CRUExecController::HandleRemoteExecutorFailure() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRUExecController:: HandleRemoteExecutorFailure(CRUTask *pTask, Lng32 pid, @@ -549,7 +542,6 @@ HandleRemoteExecutorFailure(CRUTask *pTask, ex.SetError(IDS_RU_REMOTE_EXECUTION_FAILURE); HandleTaskFailure(*pTask, ex); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // GENERAL-PURPOSE METHODS http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuForceOptions.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuForceOptions.cpp b/core/sql/refresh/RuForceOptions.cpp index ef637fb..24b9711 100644 --- a/core/sql/refresh/RuForceOptions.cpp +++ b/core/sql/refresh/RuForceOptions.cpp @@ -38,7 +38,6 @@ #include "dsstring.h" #include"RuForceOptions.h" -// LCOV_EXCL_START :cnu CRUForceOptions::~CRUForceOptions() { @@ -165,6 +164,5 @@ CRUForceOptions::MdamOptions CRUMVForceOptions::GetForceMdamOptionForTable(const return CRUForceOptions::MDAM_NO_FORCE; } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuForceOptions.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuForceOptions.h b/core/sql/refresh/RuForceOptions.h index 1bb317a..4a0298b 100644 --- a/core/sql/refresh/RuForceOptions.h +++ b/core/sql/refresh/RuForceOptions.h @@ -52,16 +52,13 @@ class CRUMVForceOptionsList; //---------------------------------------------------------------------------- // used by Range logging -// LCOV_EXCL_START DECLARE_PTRLIST(REFRESH_LIB_CLASS, CRUMVForceOptions); -// LCOV_EXCL_STOP //---------------------------------------------------------------------------- // CRUForceOptions // Store data about the force options for a group of MVs //---------------------------------------------------------------------------- -// LCOV_EXCL_START :cnu class REFRESH_LIB_CLASS CRUForceOptions { public: @@ -317,6 +314,5 @@ private: inline CRUMVForceOptionsList::~CRUMVForceOptionsList() {} inline CRUTableForceOptionsList::~CRUTableForceOptionsList() {} -// LCOV_EXCL_STOP #endif http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuForceOptionsParser.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuForceOptionsParser.cpp b/core/sql/refresh/RuForceOptionsParser.cpp index 6d307c4..4e184b4 100644 --- a/core/sql/refresh/RuForceOptionsParser.cpp +++ b/core/sql/refresh/RuForceOptionsParser.cpp @@ -43,7 +43,6 @@ #include "RuGlobals.h" #include "RuOptions.h" -// LCOV_EXCL_START :cnu //---------------------------------------------------------------------------- //Destructor @@ -739,4 +738,3 @@ CDSString CRUForceOptionsParser::GetQualifiedName() const ansiName.GetObjectName(); } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuForceOptionsParser.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuForceOptionsParser.h b/core/sql/refresh/RuForceOptionsParser.h index b5cd4aa..c59a189 100644 --- a/core/sql/refresh/RuForceOptionsParser.h +++ b/core/sql/refresh/RuForceOptionsParser.h @@ -94,7 +94,6 @@ class CRUMVForceOptionsList; // line --> FORCE_CQS = sql_stmt // sql_stmt --> (one line statement that ends with ;) -// LCOV_EXCL_START :cnu class REFRESH_LIB_CLASS CRUForceOptionsParser { @@ -205,6 +204,5 @@ private: Int32 lineNumber_; }; -// LCOV_EXCL_STOP #endif http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuLockEquivSetTaskExecutor.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuLockEquivSetTaskExecutor.h b/core/sql/refresh/RuLockEquivSetTaskExecutor.h index 63dd794..d103d5e 100644 --- a/core/sql/refresh/RuLockEquivSetTaskExecutor.h +++ b/core/sql/refresh/RuLockEquivSetTaskExecutor.h @@ -87,19 +87,16 @@ public: //----------------------------------// protected: //-- Implementation of pure virtual - // LCOV_EXCL_START :cnu virtual Lng32 GetIpcBufferSize() const { return 0; // The task is always performed locally } - // LCOV_EXCL_STOP //----------------------------------// // Private Members //----------------------------------// private: // Not implemented because this executor always runs in the main process - // LCOV_EXCL_START :cnu // These functions serialize/de-serialize the executor's context // for the message communication with the remote server process @@ -123,7 +120,6 @@ private: { RUASSERT(FALSE); } - // LCOV_EXCL_STOP private: //-- Prevent copying http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuLogCleanupTaskExecutor.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuLogCleanupTaskExecutor.cpp b/core/sql/refresh/RuLogCleanupTaskExecutor.cpp index fb956cd..4ca6a97 100644 --- a/core/sql/refresh/RuLogCleanupTaskExecutor.cpp +++ b/core/sql/refresh/RuLogCleanupTaskExecutor.cpp @@ -78,7 +78,6 @@ void CRULogCleanupTaskExecutor::Init() //--------------------------------------------------------------------------// // CRULogCleanupTaskExecutor::StoreRequest() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRULogCleanupTaskExecutor:: StoreRequest(CUOFsIpcMessageTranslator &translator) { @@ -91,12 +90,10 @@ void CRULogCleanupTaskExecutor:: translator.SetMessageType( CUOFsIpcMessageTranslator::RU_LOG_CLEANUP_EXECUTOR); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRULogCleanupTaskExecutor::LoadRequest() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRULogCleanupTaskExecutor:: LoadRequest(CUOFsIpcMessageTranslator &translator) { @@ -106,7 +103,6 @@ void CRULogCleanupTaskExecutor:: translator.ReadBlock(&hasRangeLog_,sizeof(BOOL)); translator.ReadBlock(&noOfPartitions_,sizeof(Int32)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRULogCleanupTaskExecutor::ComposeMySql() @@ -262,11 +258,9 @@ CRULogCleanupTaskExecutor::SQL_STATEMENT CRULogCleanupTaskExecutor::decideOnDele deleteMethod = CLEAN_IUD_BASIC; #ifdef _DEBUG - // LCOV_EXCL_START :dpb CDSString msg("Safety factor set to 100 or less - using simple delete."); CRUGlobals::GetInstance()-> LogDebugMessage(CRUGlobals::DUMP_COMPILED_DYNAMIC_SQL, "", msg, FALSE); - // LCOV_EXCL_STOP #endif } else http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuLogCleanupTaskExecutor.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuLogCleanupTaskExecutor.h b/core/sql/refresh/RuLogCleanupTaskExecutor.h index 131a919..97933cf 100644 --- a/core/sql/refresh/RuLogCleanupTaskExecutor.h +++ b/core/sql/refresh/RuLogCleanupTaskExecutor.h @@ -92,7 +92,6 @@ public: // These functions serialize/de-serialize the executor's context // for the message communication with the remote server process - // LCOV_EXCL_START :cnu // Used in the main process side virtual void StoreRequest(CUOFsIpcMessageTranslator &translator); @@ -107,18 +106,15 @@ public: { inherited::StoreReply(translator); } - // LCOV_EXCL_STOP protected: enum { SIZE_OF_PACK_BUFFER = 2000 }; //-- Implementation of pure virtual - // LCOV_EXCL_START :cnu virtual Lng32 GetIpcBufferSize() const { return SIZE_OF_PACK_BUFFER; // Initial size } - // LCOV_EXCL_STOP private: //-- Prevent copying http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuMVEquivSetBuilder.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuMVEquivSetBuilder.cpp b/core/sql/refresh/RuMVEquivSetBuilder.cpp index 6c25e2e..f54ac54 100644 --- a/core/sql/refresh/RuMVEquivSetBuilder.cpp +++ b/core/sql/refresh/RuMVEquivSetBuilder.cpp @@ -221,7 +221,6 @@ CRUMVList& CRUMVEquivSetBuilder::GetEquivSetsRootsByMVUID(TInt64 uid) } #ifdef _DEBUG -// LCOV_EXCL_START :dpm //--------------------------------------------------------------------------// // CRUMVEquivSetBuilder::DumpSets() //--------------------------------------------------------------------------// @@ -252,5 +251,4 @@ void CRUMVEquivSetBuilder::DumpSets() } } } -// LCOV_EXCL_STOP #endif http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuMVEquivSetBuilder.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuMVEquivSetBuilder.h b/core/sql/refresh/RuMVEquivSetBuilder.h index 904458d..9d99a04 100644 --- a/core/sql/refresh/RuMVEquivSetBuilder.h +++ b/core/sql/refresh/RuMVEquivSetBuilder.h @@ -80,12 +80,10 @@ public: virtual void Run(); // These functions are used for retrieving the results - // LCOV_EXCL_START :cnu virtual Int32 GetNumOfSets() { return equivSetsRootsList_.GetCount(); } - // LCOV_EXCL_STOP CRUMVList& GetEquivSetsRootsByMVUID(TInt64 uid);
