Merge pull request #1719 from FIWARE/hardening/functest-for-context-c…

…ache-reload Added a functest for issue 1708
FIWARE · Dec 12, 2024 · 98ab745 · 98ab745
2 parents fe744a2 + 7924a50
commit 98ab745
Show file tree

Hide file tree

Showing 5 changed files with 601 additions and 5 deletions.
diff --git a/src/lib/logMsg/traceLevels.h b/src/lib/logMsg/traceLevels.h
@@ -106,6 +106,9 @@ typedef enum TraceLevels
   LmtContextDownload,                  // Context Download
   LmtCoreContext,                      // Core Context
   LmtUserContext,                      // User Context
+  LmtContextItem,                      // Item in context cache
+  LmtExpand,                           // JSON-LD Expansions
+  LmtCompact,                          // JSON-LD Compactions
 
   // GeoJSON
   LmtGeoJSON = 110,                    // GeoJSON ... everything (for now)

diff --git a/src/lib/orionld/context/orionldAttributeExpand.cpp b/src/lib/orionld/context/orionldAttributeExpand.cpp
@@ -25,7 +25,6 @@
 #include <string.h>                                              // strcmp
 
 #include "logMsg/logMsg.h"                                       // LM_*
-#include "logMsg/traceLevels.h"                                  // Lmt*
 
 #include "orionld/context/orionldContextItemAlreadyExpanded.h"   // orionldContextItemAlreadyExpanded
 #include "orionld/context/orionldContextItemExpand.h"            // orionldContextItemExpand
@@ -67,7 +66,7 @@ char* orionldAttributeExpand
   //  The implementation needs modifications.
   //
   //  Wait ... what if the @context says it must be a String, a DateTime?
-  //  The @context doesn't distinguish between attributesd and sub-attributes ...
+  //  The @context doesn't distinguish between attributes and sub-attributes ...
   //  It will need to be a String wherever it is.
   //
   //  We should probably forbid an attribute to have the name 'observedAt'
@@ -80,7 +79,10 @@ char* orionldAttributeExpand
 #endif
 
   if (orionldContextItemAlreadyExpanded(sName) == true)
+  {
+    LM_T(LmtExpand, ("Already Expanded: '%s'", sName));
     return sName;
+  }
 
   return orionldContextItemExpand(contextP, sName, useDefaultUrlIfNotFound, contextItemPP);
 }
diff --git a/src/lib/orionld/context/orionldContextHashTablesFill.cpp b/src/lib/orionld/context/orionldContextHashTablesFill.cpp
@@ -97,6 +97,7 @@ bool orionldContextHashTablesFill(OrionldContext* contextP, KjNode* keyValueTree
       return false;
     }
 
+    LM_T(LmtContextItem, ("Adding '%s' -> '%s' to hash table for context '%s' (step 1)", hiP->name, hiP->id, contextP->url));
     khashItemAdd(nameHashTableP,  hiP->name, hiP);
   }
 
@@ -123,6 +124,8 @@ bool orionldContextHashTablesFill(OrionldContext* contextP, KjNode* keyValueTree
       hashItemP->id = kaStrdup(&kalloc, hashItemP->id);
       khashItemAdd(valueHashTableP, hashItemP->id, hashItemP);
 
+      LM_T(LmtContextItem, ("Fixed '%s' -> '%s' in hash table for context '%s' (step 2)", hashItemP->name, hashItemP->id, contextP->url));
+
       itemP = itemP->next;
     }
   }

diff --git a/src/lib/orionld/context/orionldContextItemExpand.cpp b/src/lib/orionld/context/orionldContextItemExpand.cpp
@@ -25,7 +25,6 @@
 #include <string.h>                                              // strchr
 
 #include "logMsg/logMsg.h"                                       // LM_*
-#include "logMsg/traceLevels.h"                                  // Lmt*
 
 #include "orionld/types/OrionldContextItem.h"                    // OrionldContextItem
 #include "orionld/types/OrionldContext.h"                        // OrionldContext
@@ -72,7 +71,11 @@ char* orionldContextItemExpand
     contextP = orionldCoreContextP;
 
   if ((colonP = strchr((char*) shortName, ':')) != NULL)
-    return orionldContextPrefixExpand(contextP, shortName, colonP);
+  {
+    char* longName = orionldContextPrefixExpand(contextP, shortName, colonP);
+    LM_T(LmtExpand, ("Prefix-Expanded '%s' to '%s'", shortName, longName));
+    return longName;
+  }
 
   // 1. Lookup in Core Context
   if (orionldCoreContextP != NULL)
@@ -98,17 +101,21 @@ char* orionldContextItemExpand
 
       orionldCoreContextP->expansions += 1;  // Really, @vocab expansions of the core context
 
+      LM_T(LmtExpand, ("Vocab-Expanded '%s' to '%s'", shortName, longName));
       return longName;
     }
 
+    LM_T(LmtExpand, ("No Expansion found for '%s'", shortName));
     return NULL;
   }
 
   // 4. Save the pointer to the context item
   if (contextItemPP != NULL)
     *contextItemPP = contextItemP;
 
-  contextP->expansions += 1;  // Really, @vocab expansions of the core context
+  contextP->expansions += 1;
+
+  LM_T(LmtExpand, ("Expanded '%s' to '%s'", shortName, contextItemP->id));
 
   return contextItemP->id;
 }