Merge branch 'develop' into hnsw_fix

Author: cwlacewe

tests/unit_tests/meta_data.cc

@@ -367,6 +367,112 @@ Json::Value Meta_Data::construct_find_video_with_dynamic_metadata() {
   return tuple;
 }
 
+Json::Value Meta_Data::construct_find_video_withop(Json::Value operations) {
+  Json::Value tuple;
+
+  Json::Value results;
+  results["blob"] = true;
+  results["limit"] = 1;
+
+  Json::Value video;
+  video["results"] = results;
+  video["operations"].append(operations);
+
+  Json::Value find_video;
+  find_video["FindVideo"] = video;
+
+  tuple.append(find_video);
+  return tuple;
+}
+
+Json::Value Meta_Data::construct_find_image_with_dynamic_metadata() {
+  Json::Value tuple;
+
+  Json::Value cons;
+  cons["category"][0] = "==";
+  cons["category"][1] = "image_dynamic_metadata";
+
+  Json::Value metacons;
+  metacons["objectID"][0] = "==";
+  metacons["objectID"][1] = "face";
+
+  Json::Value results;
+  results["blob"] = true;
+
+  Json::Value link_image;
+  link_image["ref"] = 1;
+
+  Json::Value image;
+  image["constraints"] = cons;
+  image["_ref"] = 1;
+
+  Json::Value find_image;
+  find_image["FindImage"] = image;
+
+  tuple.append(find_image);
+
+  Json::Value bimage;
+  bimage["metaconstraints"] = metacons;
+  bimage["link"] = link_image;
+
+  Json::Value find_image_bbox;
+  find_image_bbox["FindImage"] = bimage;
+
+  tuple.append(find_image_bbox);
+
+  return tuple;
+}
+
+Json::Value Meta_Data::construct_find_video_with_dynamic_metadata() {
+  Json::Value tuple;
+
+  Json::Value cons;
+  cons["category"][0] = "==";
+  cons["category"][1] = "dynamic_metadata";
+
+  Json::Value metacons;
+  metacons["objectID"][0] = "==";
+  metacons["objectID"][1] = "face";
+
+  Json::Value results;
+  results["blob"] = true;
+
+  Json::Value link_video;
+  link_video["ref"] = 1;
+  Json::Value link_frame;
+  link_frame["ref"] = 2;
+
+  Json::Value video;
+  video["constraints"] = cons;
+  video["_ref"] = 1;
+
+  Json::Value find_video;
+  find_video["FindVideo"] = video;
+
+  tuple.append(find_video);
+
+  Json::Value fvideo;
+  fvideo["frameconstraints"] = false;
+  fvideo["_ref"] = 2;
+  fvideo["link"] = link_video;
+
+  Json::Value find_video_frame;
+  find_video_frame["FindVideo"] = fvideo;
+
+  tuple.append(find_video_frame);
+
+  Json::Value bvideo;
+  bvideo["metaconstraints"] = metacons;
+  bvideo["link"] = link_frame;
+
+  Json::Value find_video_bbox;
+  find_video_bbox["FindVideo"] = bvideo;
+
+  tuple.append(find_video_bbox);
+
+  return tuple;
+}
+
 std::string *Meta_Data::read_blob(std::string &fname) {
   std::string video;
   std::ifstream video_file(fname,