expr filtering without typelib build

Support for content filtering without typelib dependency, which allow
user to use filtering via expressions on `key` fields only.

Author: Splinter1984

src/core/cdr/include/dds/cdr/dds_cdrstream.h

@@ -117,6 +117,7 @@ typedef struct dds_cdrstream_allocator {
 } dds_cdrstream_allocator_t;
 
 typedef struct dds_cdrstream_desc_key {
+  char *name;          /* Name of key field */
   uint32_t ops_offs;   /* Offset for key ops */
   uint32_t idx;        /* Key index in containing type (definition order) */
 } dds_cdrstream_desc_key_t;

src/core/cdr/src/dds_cdrstream.c

@@ -6919,6 +6919,7 @@ static void copy_desc_keys (dds_cdrstream_desc_key_t **dst, const struct dds_cdr
     *dst = allocator->malloc (nkeys  * sizeof (**dst));
     for (uint32_t i = 0; i < nkeys; i++)
     {
+      (*dst)[i].name = ddsrt_strdup(keys[i].m_name);
       (*dst)[i].ops_offs = keys[i].m_offset;
       (*dst)[i].idx = keys[i].m_idx;
     }
@@ -7036,6 +7037,12 @@ void dds_cdrstream_desc_fini (struct dds_cdrstream_desc *desc, const struct dds_
 {
   if (desc->keys.nkeys > 0)
   {
+    for (size_t i = 0; i < desc->keys.nkeys; i++) {
+      if (desc->keys.keys != NULL)
+        allocator->free (desc->keys.keys[i].name);
+      if (desc->keys.keys_definition_order != NULL)
+        allocator->free (desc->keys.keys_definition_order[i].name);
+    }
     if (desc->keys.keys != NULL)
       allocator->free (desc->keys.keys);
     if (desc->keys.keys_definition_order != NULL)

src/core/ddsc/src/dds__types.h

@@ -14,17 +14,17 @@
 /* DDS internal type definitions */
 
 #include "dds/dds.h"
+#include "dds/ddsrt/avl.h"
 #include "dds/ddsrt/sync.h"
 #include "dds/ddsi/ddsi_protocol.h"
 #include "dds/ddsi/ddsi_domaingv.h"
+#include "dds/ddsi/ddsi_builtin_topic_if.h"
 #ifdef DDS_HAS_TOPIC_DISCOVERY
-#include "dds/ddsi/ddsi_typewrap.h"
+ #include "dds/ddsi/ddsi_typewrap.h"
 #endif
-#include "dds/ddsrt/avl.h"
-#include "dds/ddsi/ddsi_builtin_topic_if.h"
 #include "dds/ddsc/dds_psmx.h"
+#include "dds/cdr/dds_cdrstream.h"
 #include "dds__handles.h"
-#include "dds__loaned_sample.h"
 
 
 #if defined (__cplusplus)
@@ -459,7 +459,6 @@ struct dds_expression_filter {
   char *expression;
   struct dds_sql_expr *expr;          // pre-build expression a.k.a full described.
   struct dds_sql_expr *bin_expr;      // build/optimized expression with params.
-  struct dds_topic_descriptor *desc;  // newly constructed descriptor.
   struct ddsi_sertype *st;            // newly constructed sertype.
 };
 

src/core/ddsc/src/dds_filter.c

@@ -12,11 +12,13 @@
 
 #include "dds/dds.h"
 
-#include "dds/ddsi/ddsi_typebuilder.h"
 #include "dds/ddsrt/heap.h"
 #include "dds/ddsrt/string.h"
 #include "dds/ddsi/ddsi_sertype.h"
-#include "dds/ddsi/ddsi_typelib.h"
+#include "dds/ddsi/ddsi_typebuilder.h"
+#ifdef DDS_HAS_TYPELIB
+ #include "dds/ddsi/ddsi_typelib.h"
+#endif
 
 #include "dds__domain.h"
 #include "dds__filter.h"
@@ -178,15 +180,16 @@ static dds_return_t expr_var_set (const struct dds_expression_filter *filter, co
 static dds_return_t topic_expr_filter_vars_apply(const struct dds_expression_filter *filter, const void *sample)
 {
   dds_return_t ret = DDS_RETCODE_OK;
-  const dds_topic_descriptor_t *desc = filter->desc;
+  const struct dds_sertype_default *st = (const struct dds_sertype_default *)filter->st;
+  const struct dds_cdrstream_desc desc = st->type;
 
-  for (size_t i = 0; i < desc->m_nkeys; i++)
+  for (size_t i = 0; i < desc.keys.nkeys; i++)
   {
-    dds_key_descriptor_t msg_field = desc->m_keys[i];
-    const uint32_t *op = desc->m_ops + msg_field.m_offset;
+    const struct dds_cdrstream_desc_key msg_field = desc.keys.keys[i];
+    const uint32_t *op = desc.ops.ops + msg_field.ops_offs;
     size_t offset = 0U, op_id = 1;
-    const uint32_t *ops = (desc->m_ops + op[op_id]);
-    if ((ret = expr_var_set (filter, sample, (uintptr_t)msg_field.m_name, op, ops, &offset, &op_id)) != DDS_RETCODE_OK)
+    const uint32_t *ops = (desc.ops.ops + op[op_id]);
+    if ((ret = expr_var_set (filter, sample, (uintptr_t)msg_field.name, op, ops, &offset, &op_id)) != DDS_RETCODE_OK)
       goto err;
   }
 
@@ -256,7 +259,6 @@ static void topic_expr_filter_free(struct dds_filter *filter)
   ddsrt_free(ef->expression);
   if (ef->bin_expr != NULL) dds_sql_expr_fini(ef->bin_expr);
   if (ef->expr != NULL) dds_sql_expr_fini(ef->expr);
-  if (ef->desc != NULL) {ddsi_topic_descriptor_fini(ef->desc); ddsrt_free(ef->desc);}
   if (ef->st != NULL) ddsi_sertype_unref(ef->st);
   ddsrt_free(ef);
 }
@@ -306,12 +308,6 @@ static dds_return_t topic_expr_filter_param_rebind (struct dds_filter *a, const
     dds_sql_expr_fini(ef->bin_expr);
   ef->bin_expr = exp;
 
-  ddsi_typeid_t *id = ddsi_sertype_typeid(st, DDSI_TYPEID_KIND_COMPLETE);
-  struct ddsi_domaingv *gv = ddsrt_atomic_ldvoidp (&st->gv);
-  struct ddsi_type *type = ddsi_type_lookup(gv, id);
-  ddsi_typeid_fini (id);
-  ddsrt_free (id);
-
   const char **fields = ddsrt_malloc(sizeof(*fields)*ef->bin_expr->nparams);
   size_t nfields = ef->bin_expr->nparams;
 
@@ -320,14 +316,24 @@ static dds_return_t topic_expr_filter_param_rebind (struct dds_filter *a, const
   for (dds_sql_param_t *param = ddsrt_hh_iter_first(ef->bin_expr->param_tokens, &it); param != NULL; param = ddsrt_hh_iter_next(&it))
     fields[i++] = param->token.s;
 
+#ifndef NDEBUG
   assert (i == nfields);
+#else
+  (void) nfields;
+#endif
+
+#ifdef DDS_HAS_TYPELIB
+  ddsi_typeid_t *id = ddsi_sertype_typeid(st, DDSI_TYPEID_KIND_COMPLETE);
+  struct ddsi_domaingv *gv = ddsrt_atomic_ldvoidp (&st->gv);
+  struct ddsi_type *type = ddsi_type_lookup(gv, id);
+  ddsi_typeid_fini (id);
+  ddsrt_free (id);
 
   struct ddsi_type *res_type = ddsi_type_dup_with_keys(type, fields, nfields);
-  ddsrt_free (fields);
-  if (ef->desc != NULL)
-    ddsi_topic_descriptor_fini(ef->desc);
-  ef->desc = ddsrt_malloc(sizeof(*ef->desc));
-  ret = ddsi_topic_descriptor_from_type (gv, ef->desc, res_type);
+  if (ef->st != NULL)
+    ddsi_sertype_unref(ef->st);
+  struct dds_topic_descriptor *desc = ddsrt_malloc(sizeof(*desc));
+  ret = ddsi_topic_descriptor_from_type (gv, desc, res_type);
   assert (ret == DDS_RETCODE_OK);
 
   /* FIXME
@@ -340,17 +346,20 @@ static dds_return_t topic_expr_filter_param_rebind (struct dds_filter *a, const
    * (by meaningful we mean interpretations which mentioned in initial expression)
    * interpretations of this "union" */
 
-  assert (ef->desc->m_nkeys == nfields);
+  assert (desc->m_nkeys == nfields);
 
   ddsrt_mutex_lock (&dds_global.m_mutex);
   struct dds_domain *dom = dds_domain_find_locked(ef->tf.domain_id);
   struct dds_sertype_default *st_def = ddsrt_malloc(sizeof(*st_def));
-  uint16_t min_xcdrv = ef->desc->m_flagset & DDS_DATA_REPRESENTATION_FLAG_XCDR1? DDSI_RTPS_CDR_ENC_VERSION_1: DDSI_RTPS_CDR_ENC_VERSION_2;
+  uint16_t min_xcdrv = desc->m_flagset & DDS_DATA_REPRESENTATION_FLAG_XCDR1? DDSI_RTPS_CDR_ENC_VERSION_1: DDSI_RTPS_CDR_ENC_VERSION_2;
   dds_data_representation_id_t data_representation = ((struct dds_sertype_default *)st)->write_encoding_version == DDSI_RTPS_CDR_ENC_VERSION_1? DDS_DATA_REPRESENTATION_XCDR1: DDS_DATA_REPRESENTATION_XCDR2;
-  ret = dds_sertype_default_init (dom, st_def, ef->desc, min_xcdrv, data_representation);
+  ret = dds_sertype_default_init (dom, st_def, desc, min_xcdrv, data_representation);
   assert (ret == DDS_RETCODE_OK);
   ddsrt_mutex_unlock (&dds_global.m_mutex);
 
+  ret = dds_delete_topic_descriptor (desc);
+  assert (ret == DDS_RETCODE_OK);
+
   ef->st = (struct ddsi_sertype *)st_def;
   /* FIXME
    * the next unref cause to constructed type to be destroyed. which is not so
@@ -359,6 +368,11 @@ static dds_return_t topic_expr_filter_param_rebind (struct dds_filter *a, const
    * type?
    * */
   ddsi_type_unref (gv, res_type);
+#else
+  ef->st = ddsi_sertype_ref(st);
+#endif
+
+  ddsrt_free (fields);
 
 err:
   return ret;
@@ -373,7 +387,6 @@ static dds_return_t expression_filter_create (dds_domainid_t domain_id, const st
   dds_return_t ret = DDS_RETCODE_OK;
   struct dds_expression_filter *ef = (struct dds_expression_filter *) ddsrt_malloc(sizeof(*ef));
   ef->st = NULL;
-  ef->desc = NULL;
   ef->expr = NULL;
   ef->bin_expr = NULL;
   ef->expression = ddsrt_strdup(cflt->expression);

src/core/ddsc/src/dds_reader.c

@@ -28,6 +28,7 @@
 #include "dds/ddsi/ddsi_tkmap.h"
 #include "dds/ddsc/dds_rhc.h"
 #include "dds/ddsc/dds_internal_api.h"
+#include "dds__loaned_sample.h"
 #include "dds__participant.h"
 #include "dds__subscriber.h"
 #include "dds__reader.h"

src/core/ddsc/src/dds_sql_expr.c

@@ -1841,6 +1841,8 @@ dds_return_t dds_sql_expr_bind_integer(const struct dds_sql_expr *ex, uintptr_t
   if      (ex->param_kind == DDS_SQL_EXPR_KIND_PARAMETER)     tmpl.id.index = (uint64_t)i;
   else if (ex->param_kind == DDS_SQL_EXPR_KIND_VARIABLE)      tmpl.id.str   = ddsrt_strdup((char *)(void *)i);
   else goto err;
+  /* FIXME: not found? no worries it's optimized or DDS_HAS_TYPELIB missing. */
+  retcode = (ex->param_kind == DDS_SQL_EXPR_KIND_VARIABLE)? DDS_RETCODE_OK: DDS_RETCODE_BAD_PARAMETER;
   struct dds_sql_param *param = ddsrt_hh_lookup(ex->param_tokens, &tmpl);
   if (param == NULL) goto err_not_found;
   struct dds_sql_token *t = (struct dds_sql_token *)param;
@@ -1863,6 +1865,8 @@ dds_return_t dds_sql_expr_bind_real(const struct dds_sql_expr *ex, uintptr_t i,
   if      (ex->param_kind == DDS_SQL_EXPR_KIND_PARAMETER)     tmpl.id.index = (uint64_t)i;
   else if (ex->param_kind == DDS_SQL_EXPR_KIND_VARIABLE)      tmpl.id.str   = ddsrt_strdup((char *)(void *)i);
   else goto err;
+  /* FIXME: not found? no worries it's optimized or DDS_HAS_TYPELIB missing. */
+  retcode = (ex->param_kind == DDS_SQL_EXPR_KIND_VARIABLE)? DDS_RETCODE_OK: DDS_RETCODE_BAD_PARAMETER;
   struct dds_sql_param *param = ddsrt_hh_lookup(ex->param_tokens, &tmpl);
   if (param == NULL) goto err_not_found;
   struct dds_sql_token *t = (struct dds_sql_token *)param;
@@ -1885,6 +1889,8 @@ dds_return_t dds_sql_expr_bind_string(const struct dds_sql_expr *ex, uintptr_t i
   if      (ex->param_kind == DDS_SQL_EXPR_KIND_PARAMETER)     tmpl.id.index = (uint64_t)i;
   else if (ex->param_kind == DDS_SQL_EXPR_KIND_VARIABLE)      tmpl.id.str   = ddsrt_strdup((char *)(void *)i);
   else goto err;
+  /* FIXME: not found? no worries it's optimized or DDS_HAS_TYPELIB missing. */
+  retcode = (ex->param_kind == DDS_SQL_EXPR_KIND_VARIABLE)? DDS_RETCODE_OK: DDS_RETCODE_BAD_PARAMETER;
   struct dds_sql_param *param = ddsrt_hh_lookup(ex->param_tokens, &tmpl);
   if (param == NULL) goto err_not_found;
   struct dds_sql_token *t = (struct dds_sql_token *)param;
@@ -1910,6 +1916,8 @@ dds_return_t dds_sql_expr_bind_blob(const struct dds_sql_expr *ex, uintptr_t i,
   if      (ex->param_kind == DDS_SQL_EXPR_KIND_PARAMETER)     tmpl.id.index = (uint64_t)i;
   else if (ex->param_kind == DDS_SQL_EXPR_KIND_VARIABLE)      tmpl.id.str   = ddsrt_strdup((char *)(void *)i);
   else goto err;
+  /* FIXME: not found? no worries it's optimized or DDS_HAS_TYPELIB missing. */
+  retcode = (ex->param_kind == DDS_SQL_EXPR_KIND_VARIABLE)? DDS_RETCODE_OK: DDS_RETCODE_BAD_PARAMETER;
   struct dds_sql_param *param = ddsrt_hh_lookup(ex->param_tokens, &tmpl);
   if (param == NULL) goto err_not_found;
   struct dds_sql_token *t = (struct dds_sql_token *)param;

src/core/ddsc/src/dds_writer.c

@@ -29,6 +29,7 @@
 #include "dds/cdr/dds_cdrstream.h"
 #include "dds/ddsc/dds_internal_api.h"
 #include "dds__filter.h"
+#include "dds__loaned_sample.h"
 #include "dds__writer.h"
 #include "dds__listener.h"
 #include "dds__init.h"

src/core/ddsc/tests/Space.idl

@@ -9,6 +9,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
 module Space {
+  struct Type0 {
+    @key
+    long	long_1;
+    @key
+    long	long_2;
+    long	long_3;
+  };
+
   struct Type1 {
     @key
     long	long_1;