Merge pull request #18 from caibofeng/main

impl filter
chenghuaWang · Dec 11, 2022 · a2577d2 · a2577d2
2 parents a4edb77 + 4a71ead
commit a2577d2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/scripts/libCB.lua b/scripts/libCB.lua
@@ -215,7 +215,6 @@ function Cb.Op.CombineOp(baseOpPtr, primaryKeys, newTableName)
     -- for c = 1, output:getShape()[1] do
     --     print(c, output:colNameAt(c - 1))
     -- end
-
 end
 
 function Cb.Op.FilterOp(baseOpPtr, judgeMethod, modifyMethod)
@@ -238,6 +237,7 @@ function Cb.Op.FilterOp(baseOpPtr, judgeMethod, modifyMethod)
     local newRow = inputs:getShape()[0];
     local newCol = inputs:getShape()[1];
     local bufRow;
+
     output:resetShapeH(Cb.F.makeShapeFull(newRow, newCol));
     for r = 1, newRow do
         bufRow = inputs:getRow(r - 1)
@@ -250,7 +250,7 @@ function Cb.Op.FilterOp(baseOpPtr, judgeMethod, modifyMethod)
     end
 
     for c = 1, output:getShape()[1] do
-        output:setInfoAt(c-1, inputs:getInfoAt(c-1));
+        output:setInfoAt(c - 1, inputs:getInfoAt(c - 1));
     end
 
     Cb.F.setTableName(output, inputs:getInfoAt(0, 0):getTableName());

diff --git a/scripts/utils/postScript2.json b/scripts/utils/postScript2.json
@@ -1 +1 @@
-{"id": 100, "script": "function testJudgeMethod(rowOfTable)\n    print('debug21')\n    print(rowOfTable:getShape()[0])\n    print(rowOfTable:getShape()[1])\n    if rowOfTable:atPtr(0, 0):isInt() then\n        print('debug22')\n        if Cb.F.value(rowOfTable:atPtr(0, 0)) < 10 then\n            print('debug23')\n            return true;\n        end\n    end\n    return false;\nend\n\nfunction testModifyMethod(rowOfTable)\n    rowOfTable:setPtrAt(0, 0, ThisGraph:createKVCell(Cb.F.value(rowOfTable:atPtr(0, 0)) + 1));\n    return rowOfTable;\nend\n\nnode_vd_1 = ThisGraph:createVirtualDeviceNode(0);\nnode_vd_2 = ThisGraph:createVirtualDeviceNode(1);\nnode_vd_1:addQuery(\"SELECT * FROM runoob_tbl;\");\nnode_vd_2:addQuery(\"SELECT * FROM myel;\");\n\nnode_vd_combine = ThisGraph:createCombineNode(Cb.F.PackedStringToVec(\"runoob_id\", \"runoob_id\"), \"NewTable\");\nnode_vd_1:PointTo(Cb.F.refNode(node_vd_combine));\nnode_vd_2:PointTo(Cb.F.refNode(node_vd_combine));\nnode_vd_filter = ThisGraph:createFilterNode(testJudgeMethod, testModifyMethod);\nnode_vd_combine:PointTo(Cb.F.refNode(node_vd_filter))\n\nThisGraph:addCacheServer(ThisGraph:createRedisCachingNode(0));\n"}
+{"id": 100, "script": "function testJudgeMethod(rowOfTable)\n    if rowOfTable:atPtr(0, 0):isInt() then\n        if Cb.F.value(rowOfTable:atPtr(0, 0)) < 10 then\n            return true;\n        end\n    end\n    return false;\nend\n\nfunction testModifyMethod(rowOfTable)\n    rowOfTable:setPtrAt(0, 0, ThisGraph:createKVCell(Cb.F.value(rowOfTable:atPtr(0, 0)) + 1));\n    return rowOfTable;\nend\n\nnode_vd_1 = ThisGraph:createVirtualDeviceNode(0);\nnode_vd_2 = ThisGraph:createVirtualDeviceNode(1);\nnode_vd_1:addQuery(\"SELECT * FROM runoob_tbl;\");\nnode_vd_2:addQuery(\"SELECT * FROM myel;\");\n\nnode_vd_combine = ThisGraph:createCombineNode(Cb.F.PackedStringToVec(\"runoob_id\", \"runoob_id\"), \"NewTable\");\nnode_vd_1:PointTo(Cb.F.refNode(node_vd_combine));\nnode_vd_2:PointTo(Cb.F.refNode(node_vd_combine));\nnode_vd_filter = ThisGraph:createFilterNode(testJudgeMethod, testModifyMethod);\nnode_vd_combine:PointTo(Cb.F.refNode(node_vd_filter))\n\nThisGraph:addCacheServer(ThisGraph:createRedisCachingNode(0));\n"}
diff --git a/src/core/server/task/cbComputeGraph.cpp b/src/core/server/task/cbComputeGraph.cpp
@@ -1,4 +1,6 @@
 #include "cbComputeGraph.hpp"
+#include "task/cbOperator.hpp"
+#include "task/cbTable.hpp"
 #include "trivial/cbVirtualDevice.hpp"
 
 namespace cb {
@@ -246,7 +248,9 @@ cbComputeGraph::cbComputeGraph(int32_t idx)
 
       "KVField",
 
-      "setTableName", &cbMySQLField::setTable
+      "setTableName", &cbMySQLField::setTable,
+
+      "getTableName", &cbMySQLField::getTable
 
   );
 
@@ -342,6 +346,15 @@ cbComputeGraph::cbComputeGraph(int32_t idx)
 
   );
 
+  // bind FilterOp
+  covalentBound.new_usertype<cbOpFilter>(
+
+      "cbOpFilter",
+
+      "overrideFunc", &cbOpFilter::overload
+
+  );
+
   // bind cbVirtualDeviceNode
   covalentBound.new_usertype<cbVirtualDeviceNode>(
 
@@ -474,7 +487,7 @@ cbOperatorNode* cbComputeGraph::createFilterNode(const sol::function& boolF,
                                                  const sol::function& exF) {
   cbOpFilter* ansOp = new cbOpFilter(boolF, exF);
 
-  ansOp->overload(this->m_sharedLuaStack->get()()["Cb"]["Op"]["Filter"]);
+  ansOp->overload(this->m_sharedLuaStack->get()()["Cb"]["Op"]["FilterOp"]);
   cbOperatorNode* ans = new cbOperatorNode(ansOp);
   this->registerNode(ans);
   return ans;