intro. unsigned for sql expression parser

Support of `unsigned` type implemented the same way as it's done for
signed integer (64 bit form only).

Author: Splinter1984

src/core/ddsc/include/dds/dds.h

@@ -1665,6 +1665,7 @@ struct dds_content_filter {
 
 DDS_EXPORT dds_return_t dds_expression_filter_create (const char *expression, dds_expression_content_filter_t **filter);
 DDS_EXPORT void dds_expression_filter_free (dds_expression_content_filter_t *filter);
+DDS_EXPORT dds_return_t dds_expression_filter_bind_unsigned (dds_expression_content_filter_t *filter, size_t id, uint64_t param);
 DDS_EXPORT dds_return_t dds_expression_filter_bind_integer (dds_expression_content_filter_t *filter, size_t id, int64_t param);
 DDS_EXPORT dds_return_t dds_expression_filter_bind_real (dds_expression_content_filter_t *filter, size_t id, double param);
 DDS_EXPORT dds_return_t dds_expression_filter_bind_string (dds_expression_content_filter_t *filter, size_t id, char *param);

src/core/ddsc/src/dds__content_filter.h

@@ -17,8 +17,8 @@
 extern "C" {
 #endif
 
-/* #define DDS_EXPR_FILTER_PARAM_UINTEGER  DDS_SLQ_TK_UINT */
 #define DDS_EXPR_FILTER_PARAM_INTEGER   DDS_SQL_TK_INTEGER
+#define DDS_EXPR_FILTER_PARAM_UNSIGNED  DDS_SQL_TK_UNSIGNED
 #define DDS_EXPR_FILTER_PARAM_REAL      DDS_SQL_TK_FLOAT
 #define DDS_EXPR_FILTER_PARAM_STRING    DDS_SQL_TK_STRING
 #define DDS_EXPR_FILTER_PARAM_BLOB      DDS_SQL_TK_BLOB
@@ -27,7 +27,7 @@ struct dds_expression_filter_param
 {
   int t;
   union {
-    int64_t i; double d;
+    int64_t i; double d; uint64_t u;
   } n;
   union {
     char *s;

src/core/ddsc/src/dds__sql_expr.h

@@ -59,6 +59,7 @@ extern "C" {
 #define DDS_SQL_TK_SPACE                          184
 #define DDS_SQL_TK_COMMENT                        185
 #define DDS_SQL_TK_ILLEGAL                        186
+#define DDS_SQL_TK_UNSIGNED                       189
 
 #define DDS_SQL_AFFINITY_NONE       0x40    /* '@' */
 #define DDS_SQL_AFFINITY_BLOB       0x41    /* 'A' */
@@ -85,9 +86,7 @@ struct dds_sql_token {
   union {
     double  r;    // DDS_SQL_TK_FLOAT
     int64_t i;    // DDS_SQL_TK_INTEGER
-    /* FIXME:
     uint64_t u;   // DDS_SQL_TK_UNSIGNED
-    */
   } n;
   char *s;        // DDS_SQL_TK_BLOB/DDS_SQL_TK_STRING
   /* FIXME:
@@ -170,10 +169,11 @@ void dds_sql_expr_fini(struct dds_sql_expr *expr);
 
 dds_return_t dds_sql_expr_parse(const unsigned char *s, struct dds_sql_expr **ex);
 
-dds_return_t dds_sql_expr_bind_integer(const struct dds_sql_expr *ex, uintptr_t i, int64_t p);
-dds_return_t dds_sql_expr_bind_real   (const struct dds_sql_expr *ex, uintptr_t i, double p);
-dds_return_t dds_sql_expr_bind_string (const struct dds_sql_expr *ex, uintptr_t i, char s[]);
-dds_return_t dds_sql_expr_bind_blob   (const struct dds_sql_expr *ex, uintptr_t i, unsigned char b[], size_t s);
+dds_return_t dds_sql_expr_bind_unsigned (const struct dds_sql_expr *ex, uintptr_t i, uint64_t p);
+dds_return_t dds_sql_expr_bind_integer  (const struct dds_sql_expr *ex, uintptr_t i, int64_t p);
+dds_return_t dds_sql_expr_bind_real     (const struct dds_sql_expr *ex, uintptr_t i, double p);
+dds_return_t dds_sql_expr_bind_string   (const struct dds_sql_expr *ex, uintptr_t i, char s[]);
+dds_return_t dds_sql_expr_bind_blob     (const struct dds_sql_expr *ex, uintptr_t i, unsigned char b[], size_t s);
 
 dds_return_t dds_sql_expr_build(const struct dds_sql_expr *ex, struct dds_sql_expr **out);
 dds_return_t dds_sql_expr_eval(const struct dds_sql_expr *ex, struct dds_sql_token **out);

src/core/ddsc/src/dds_content_filter.c

@@ -72,6 +72,12 @@ static dds_return_t expression_filter_param_set (dds_expression_content_filter_t
   return filter_param_copy(&p, &ef->param[id-1]) ? DDS_RETCODE_OK: DDS_RETCODE_BAD_PARAMETER;
 }
 
+dds_return_t dds_expression_filter_bind_unsigned (dds_expression_content_filter_t *filter, size_t id, uint64_t param)
+{
+  struct dds_expression_filter_param p = {.t = DDS_EXPR_FILTER_PARAM_UNSIGNED, .n.u = param};
+  return expression_filter_param_set(filter, id, p);
+}
+
 dds_return_t dds_expression_filter_bind_integer (dds_expression_content_filter_t *filter, size_t id, int64_t param)
 {
   struct dds_expression_filter_param p = {.t = DDS_EXPR_FILTER_PARAM_INTEGER, .n.i = param};

src/core/ddsc/src/dds_filter.c

@@ -40,7 +40,7 @@
       ret = dds_sql_expr_bind_integer (e, i ,*v); \
     } else { \
       u##t *v = (u##t *) (so); \
-      ret = dds_sql_expr_bind_integer (e, i, *v); \
+      ret = dds_sql_expr_bind_unsigned (e, i, *v); \
     } \
     assert (ret == DDS_RETCODE_OK); \
   } while (0);
@@ -93,20 +93,7 @@ static dds_return_t expr_var_set (const struct dds_expression_filter *filter, co
             break;
           }
           case DDS_OP_VAL_8BY: {
-            if (op_flags & DDS_OP_FLAG_SGN) {
-              const int64_t *j = (const int64_t *)smpl;
-              ret = dds_sql_expr_bind_integer (filter->bin_expr, id, *j);
-            } else {
-            /* FIXME:
-             * current implementation doesn't support 64 bit unsigned, since sql
-             * expression evaluator have nothing to handle that type. */
-              const uint64_t *j = (const uint64_t *)smpl;
-              if ((*j) > UINT32_MAX)
-                ret = DDS_RETCODE_UNSUPPORTED;
-              else
-                ret = dds_sql_expr_bind_integer (filter->bin_expr, id, (int64_t)(*j));
-            }
-            assert (ret == DDS_RETCODE_OK);
+            DDS_EXPR_VAR_SET_INTEGER(op_flags, filter->bin_expr, smpl, id, int64_t);
             break;
           }
           default: assert (false);
@@ -280,6 +267,9 @@ static dds_return_t topic_expr_filter_param_rebind (struct dds_filter *a, const
       case DDS_EXPR_FILTER_PARAM_INTEGER:
         ret = dds_sql_expr_bind_integer(expr, id, param.n.i);
         break;
+      case DDS_EXPR_FILTER_PARAM_UNSIGNED:
+        ret = dds_sql_expr_bind_unsigned(expr, id, param.n.u);
+        break;
       case DDS_EXPR_FILTER_PARAM_REAL:
         ret = dds_sql_expr_bind_real(expr, id, param.n.d);
         break;