qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject svn commit: r1700868 - /qpid/trunk/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
Date Wed, 02 Sep 2015 18:53:40 GMT
Author: astitcher
Date: Wed Sep  2 18:53:39 2015
New Revision: 1700868

URL: http://svn.apache.org/r1700868
Log:
Revert "QPID-6717: fix evaluation of BETWEEN and NOT IN when types are mismatched"

This reverts commit 85ed093ba4beae54c1622000cb7a38cb30889239.

- This change broke handling of the IN construct.

Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/SelectorExpression.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SelectorExpression.cpp?rev=1700868&r1=1700867&r2=1700868&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SelectorExpression.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SelectorExpression.cpp Wed Sep  2 18:53:39 2015
@@ -375,7 +375,6 @@ public:
         Value vu(u->eval(env));
         if (!unknown(vu) && ve>vu) return BN_FALSE;
         if (unknown(vl) || unknown(vu)) return BN_UNKNOWN;
-        else if (numeric(ve) != numeric(vu) || numeric(ve) != numeric(vl)) return BN_FALSE;
         return BN_TRUE;
     }
 };
@@ -404,7 +403,7 @@ public:
         BoolOrNone r = BN_FALSE;
         for (std::size_t i = 0; i<l.size(); ++i){
             Value li(l[i].eval(env));
-            if (unknown(li) || numeric(li) != numeric(ve)) {
+            if (unknown(li)) {
                 r = BN_UNKNOWN;
                 continue;
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message