Added tests and better transformations and much more.

Author: EraYaN

.gitignore

@@ -496,3 +496,5 @@ venv.bak/
 cmake-build-*/
 
 *.fbs
+**/fletcherfiltering_test_workspace/**
+**/mysql-data/**

codegen-cpp/CMakeLists.txt

@@ -3,4 +3,8 @@ project(codegen_cpp)
 
 set(CMAKE_CXX_STANDARD 14)
 
-add_executable(codegen_cpp fletcherfiltering.cpp query.cpp main.cpp)
+add_library(codegen_lib SHARED fletcherfiltering.cpp query_test.cpp query.cpp)
+
+add_executable(codegen_cpp main.cpp)
+
+TARGET_LINK_LIBRARIES(codegen_cpp codegen_lib)

codegen-cpp/main.cpp

@@ -1,52 +1,40 @@
 #include <iostream>
 #include "fletcherfiltering.h"
-#include "query.h"
+#include "query_test.h"
 
 int main() {
 
-    in_schema in;
-    out_schema out;
+    in_schema_test in;
+    out_schema_test out;
 
-    int id = 1;
-    int int1 = 2347645;
-    int int2 = 123325;
-    int string1_len = 11;
-    char string1[STRING_SIZE] = "abcdefghijk";
-    unsigned long long timestamp1 = 1544620718000ul;
+    in.id = 1;
+    in.string1 = "abcdefghijk, sdoifghdsfgsbfgshdfbsifgb8sdfjsdif sbf sdbfis df bsdjns kdfs fisbd fjsodnfisnf sbdif sd bsbg";
+    in.string2 = "abcdefghijk, sdoifghdsfgsbfgshdfbsifgb8sdfjsdif haohgw8y245bhwe9y713rbi2 25 ghu924y24tbj24t stfgswr tgwerw4t wrt2 45rt2 45625";
 
 
-    in.id.write(id);
-    in.int1.write(int1);
-    in.int2.write(int2);
-    in.string1_len.write(string1_len);
-    for(int i = 0; i<string1_len; i++) {
-        in.string1.write(string1[i]);
-    }
-    in.timestamp1.write(timestamp1);
-
-    query(in,out);
+    std::cout << "Input:" << std::endl;
+    std::cout << "id: " << in.id << std::endl;
+    std::cout << "string1 (" << strlen(in.string1) << "): " << in.string1 << std::endl;
+    std::cout << "string2 (" << strlen(in.string2) << "): " << in.string2 << std::endl;
 
-    if(!out.int1.empty()) {
-        int int1_o = out.int1.read();
-        int concat_o_len = out.concat_len.read();
-        char concat_o[STRING_SIZE];
-        for (int i = 0; i < concat_o_len; i++)
-            concat_o[i] = out.concat.read();
 
-        concat_o[concat_o_len] = '\0';
+    out.string1 = (char*)malloc(sizeof(char)*256);
+    out.string2 = (char*)malloc(sizeof(char)*256);
 
-        int concat2_o_len = out.concat2_len.read();
-        char concat2_o[STRING_SIZE];
-        for (int i = 0; i < concat2_o_len; i++)
-            concat2_o[i] = out.concat2.read();
+    bool matched = query_test(in, out);
 
-        concat2_o[concat2_o_len] = '\0';
 
-        std::cout << "int1: " << int1_o << std::endl;
-        std::cout << "concat (" << concat_o_len << "): " << concat_o << std::endl;
-        std::cout << "concat2 (" << concat2_o_len << "): " << concat2_o << std::endl;
+    if(matched) {
+        std::cout << "Output:" << std::endl;
+        std::cout << "id: " << out.id << std::endl;
+        std::cout << "string1 (" << strlen(out.string1) << "): " << out.string1 << std::endl;
+        std::cout << "string2 (" << strlen(out.string2) << "): " << out.string2 << std::endl;
     } else {
         std::cout << "Record didn't match." << std::endl;
     }
+
+    free(out.string1);
+    free(out.string2);
+
     return 0;
 }

codegen-cpp/query.cpp

@@ -0,0 +1,39 @@
+#include "query.h" 
+
+bool query(in_schema& in_data, out_schema& out_data) {
+    int32_t id;
+    (in_data.id >> id);
+    int32_t string1_len;
+    (in_data.string1_len >> string1_len);
+    char string1[255];
+    for (int i = 0; i < string1_len; i += 1) {
+        (in_data.string1 >> string1[i]);
+    }
+    int32_t string2_len;
+    (in_data.string2_len >> string2_len);
+    char string2[255];
+    for (int i = 0; i < string2_len; i += 1) {
+        (in_data.string2 >> string2[i]);
+    }
+    //Start of data processing
+    int32_t id_o = id;
+    char* string1_o = string1;
+    int string1_o_len = string1_len;
+    char* string2_o = string2;
+    int string2_o_len = string2_len;
+    bool __pass_record = true;
+    //End of data processing
+    if (__pass_record) {
+        (out_data.id << id_o);
+        (out_data.string1_len << string1_o_len);
+        for (int i = 0; i < string1_o_len; i += 1) {
+            (out_data.string1 << string1_o[i]);
+        }
+        (out_data.string2_len << string2_o_len);
+        for (int i = 0; i < string2_o_len; i += 1) {
+            (out_data.string2 << string2_o[i]);
+        }
+    }
+    
+    return __pass_record;
+}

codegen-cpp/query.h

@@ -0,0 +1,22 @@
+#pragma once
+#include "hls_stream.h"
+#include "fletcherfiltering.h" 
+
+
+struct in_schema {
+    hls::stream<int32_t> id;
+    hls::stream<char> string1;
+    hls::stream<int32_t> string1_len;
+    hls::stream<char> string2;
+    hls::stream<int32_t> string2_len;
+};
+
+
+struct out_schema {
+    hls::stream<int32_t> id;
+    hls::stream<char> string1;
+    hls::stream<int32_t> string1_len;
+    hls::stream<char> string2;
+    hls::stream<int32_t> string2_len;
+};
+bool query(in_schema& in_data, out_schema& out_data);

codegen-cpp/query_test.cpp

@@ -0,0 +1,39 @@
+#include "query_test.h" 
+extern "C" {
+
+bool query_test(in_schema_test& in_data_test, out_schema_test& out_data_test) {
+    in_schema in_data;
+    out_schema out_data;
+    (in_data.id << in_data_test.id);
+    int32_t string1_len = strlen(in_data_test.string1);
+    (in_data.string1_len << string1_len);
+    for (int i = 0; i < string1_len; i += 1) {
+        (in_data.string1 << in_data_test.string1[i]);
+    }
+    int32_t string2_len = strlen(in_data_test.string2);
+    (in_data.string2_len << string2_len);
+    for (int i = 0; i < string2_len; i += 1) {
+        (in_data.string2 << in_data_test.string2[i]);
+    }
+    //Start of query code
+    bool __pass_record = query(in_data, out_data);
+    //End of query code
+    if (__pass_record) {
+        (out_data.id >> out_data_test.id);
+        int32_t string1_o_len;
+        (out_data.string1_len >> string1_o_len);
+        for (int i = 0; i < string1_o_len; i += 1) {
+            (out_data.string1 >> out_data_test.string1[i]);
+        }
+        out_data_test.string1[string1_o_len] = '\0';
+        int32_t string2_o_len;
+        (out_data.string2_len >> string2_o_len);
+        for (int i = 0; i < string2_o_len; i += 1) {
+            (out_data.string2 >> out_data_test.string2[i]);
+        }
+        out_data_test.string2[string2_o_len] = '\0';
+    }
+    
+    return __pass_record;
+}
+}

codegen-cpp/query_test.h

@@ -0,0 +1,21 @@
+#pragma once
+#include "hls_stream.h"
+#include "query.h" 
+
+extern "C" {
+
+
+struct in_schema_test {
+    int32_t id;
+    char* string1;
+    char* string2;
+};
+
+
+struct out_schema_test {
+    int32_t id;
+    char* string1;
+    char* string2;
+};
+bool query_test(in_schema_test& in_data_test, out_schema_test& out_data_test);
+}