Rename Table::generate to Table::select

Change-Id: I3d9e18c1bb21b0ea9da9a865929af38b15d9b5fe
Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/src/osquery/core/tables.cpp b/src/osquery/core/tables.cpp
index 18bfa8062025941b20c0d8eaf415ebee779b0a00..15ceb56c9e5a9c7bdde4d15c594b61398c36f7e5 100644 (file)
--- a/src/osquery/core/tables.cpp
+++ b/src/osquery/core/tables.cpp
@@ -136,9 +136,9 @@ Status TablePlugin::call(const PluginRequest& request,
 
        const auto& action = request.at("action");
 
-       if (action == "generate") {
+       if (action == "select") {
                auto context = getContextFromRequest(request);
-               response = generate(context);
+               response = select(context);
        } else if (action == "delete") {
                auto context = getContextFromRequest(request);
                response = delete_(context, request);

diff --git a/src/osquery/include/osquery/tables.h b/src/osquery/include/osquery/tables.h
index 5cf05da4d064dc649de1fc429fc329b33fc343dd..5c9637e096f589efbd1bf16cd47b38386bb55318 100644 (file)
--- a/src/osquery/include/osquery/tables.h
+++ b/src/osquery/include/osquery/tables.h
@@ -748,7 +748,7 @@ public:
         * @param context A query context filled in by SQLite's virtual table API.
         * @return The result rows for this table, given the query context.
         */
-       virtual QueryData generate(QueryContext&)
+       virtual QueryData select(QueryContext&)
        {
                return QueryData();
        }

diff --git a/src/osquery/sql/sql.cpp b/src/osquery/sql/sql.cpp
index 6244e924c642be2d38ce6dda807e42d4277fa334..f8a06f81e088b2306614747cfc86b93b44e47ab3 100644 (file)
--- a/src/osquery/sql/sql.cpp
+++ b/src/osquery/sql/sql.cpp
@@ -100,7 +100,7 @@ void escapeNonPrintableBytesEx(std::string& data)
 QueryData SQL::selectAllFrom(const std::string& table)
 {
        PluginResponse response;
-       Registry::call("table", table, {{"action", "generate"}}, response);
+       Registry::call("table", table, {{"action", "select"}}, response);
        return response;
 }
 
@@ -118,7 +118,7 @@ QueryData SQL::selectFrom(const std::initializer_list<std::string>& columns,
                                                  ConstraintOperator op,
                                                  const std::string& expr)
 {
-       PluginRequest request = {{"action", "generate"}};
+       PluginRequest request = {{"action", "select"}};
        // Create a fake content, there will be no caching.
        QueryContext ctx;
        ctx.constraints[column].add(Constraint(op, expr));

diff --git a/src/osquery/sql/tests/sql.cpp b/src/osquery/sql/tests/sql.cpp
index 9543bf054e868f939f602632b72f68b3c8022f28..178ec80e90566a746740e40c5e95b123c0b5641e 100644 (file)
--- a/src/osquery/sql/tests/sql.cpp
+++ b/src/osquery/sql/tests/sql.cpp
@@ -37,7 +37,7 @@ private:
                };
        }
 
-       QueryData generate(QueryContext& ctx)
+       QueryData select(QueryContext& ctx)
        {
                QueryData results;
                if (ctx.constraints["test_int"].existsAndMatches("1")) {

diff --git a/src/osquery/sql/tests/virtual_table.cpp b/src/osquery/sql/tests/virtual_table.cpp
index bec6d6c80e21519665ba94493705847b80e785e1..5188bf35536cfd08f3590072390cdc889506feda 100644 (file)
--- a/src/osquery/sql/tests/virtual_table.cpp
+++ b/src/osquery/sql/tests/virtual_table.cpp
@@ -225,7 +225,7 @@ private:
        }
 
 public:
-       QueryData generate(QueryContext&) override
+       QueryData select(QueryContext&) override
        {
                QueryData tr;
                tr.push_back({{"x", "1"}, {"y", "2"}});
@@ -248,7 +248,7 @@ private:
        }
 
 public:
-       QueryData generate(QueryContext&) override
+       QueryData select(QueryContext&) override
        {
                QueryData tr;
                tr.push_back({{"x", "1"}, {"z", "2"}});
@@ -353,7 +353,7 @@ private:
        }
 
 public:
-       QueryData generate(QueryContext&) override
+       QueryData select(QueryContext&) override
        {
                QueryData results;
                results.push_back({{"data", "{\"test\": 1}"}});
@@ -431,7 +431,7 @@ private:
        }
 
 public:
-       QueryData generate(QueryContext& context) override
+       QueryData select(QueryContext& context) override
        {
                QueryData results;
                if (context.isCached("awesome_data")) {
@@ -488,7 +488,7 @@ public:
                return TableAttributes::CACHEABLE;
        }
 
-       QueryData generate(QueryContext& ctx) override
+       QueryData select(QueryContext& ctx) override
        {
                generates_++;
                Row r;
@@ -567,7 +567,7 @@ private:
        }
 
 public:
-       QueryData generate(QueryContext& context) override
+       QueryData select(QueryContext& context) override
        {
                QueryData results;
 
@@ -678,7 +678,7 @@ private:
        }
 
 public:
-       QueryData generate(QueryContext& context) override
+       QueryData select(QueryContext& context) override
        {
                scans++;
 
@@ -712,7 +712,7 @@ private:
        }
 
 public:
-       QueryData generate(QueryContext& context) override
+       QueryData select(QueryContext& context) override
        {
                scans++;
 
@@ -745,7 +745,7 @@ private:
        }
 
 public:
-       QueryData generate(QueryContext& context) override
+       QueryData select(QueryContext& context) override
        {
                scans++;
 
@@ -779,7 +779,7 @@ private:
        }
 
 public:
-       QueryData generate(QueryContext& context) override
+       QueryData select(QueryContext& context) override
        {
                Row r;
                if (context.isColumnUsed("col1")) {
@@ -861,7 +861,7 @@ private:
        }
 
 public:
-       QueryData generate(QueryContext& context) override
+       QueryData select(QueryContext& context) override
        {
                QueryData results;
                Row r;

diff --git a/src/osquery/sql/virtual_table.cpp b/src/osquery/sql/virtual_table.cpp
index 511d2d723c5a59744d284406235dd2b3e0590856..91fae115563c60c675bdec3b81f086dc678e74ea 100644 (file)
--- a/src/osquery/sql/virtual_table.cpp
+++ b/src/osquery/sql/virtual_table.cpp
@@ -923,9 +923,9 @@ static int xFilter(sqlite3_vtab_cursor* pVtabCursor,
        if (Registry::get().exists("table", pVtab->content->name, true)) {
                auto plugin = Registry::get().plugin("table", pVtab->content->name);
                auto table = std::dynamic_pointer_cast<TablePlugin>(plugin);
-               pCur->rows = tableRowsFromQueryData(table->generate(context));
+               pCur->rows = tableRowsFromQueryData(table->select(context));
        } else {
-               PluginRequest request = {{"action", "generate"}};
+               PluginRequest request = {{"action", "select"}};
                TablePlugin::setRequestFromContext(context, request);
                QueryData qd;
                Registry::call("table", pVtab->content->name, request, qd);

diff --git a/src/vist/table/policy/bluetooth/table.cpp b/src/vist/table/policy/bluetooth/table.cpp
index ade0c1af09d8ad86dc24757cb69437fad35435af..6bedb72c101b52a8d224680a09acf7725989a91b 100644 (file)
--- a/src/vist/table/policy/bluetooth/table.cpp
+++ b/src/vist/table/policy/bluetooth/table.cpp
@@ -73,7 +73,7 @@ TableColumns BluetoothTable::columns() const
        };
 }
 
-QueryData BluetoothTable::generate(QueryContext&)
+QueryData BluetoothTable::select(QueryContext&)
 {
        TABLE_EXCEPTION_GUARD_START
 

diff --git a/src/vist/table/policy/bluetooth/table.hpp b/src/vist/table/policy/bluetooth/table.hpp
index 5695f141c94815dc53c8ad661b5a0c00131f1404..0acfde2b167afd406e4c350aea1d8bd2f965c639 100644 (file)
--- a/src/vist/table/policy/bluetooth/table.hpp
+++ b/src/vist/table/policy/bluetooth/table.hpp
@@ -31,7 +31,7 @@ public:
 
 private:
        TableColumns columns() const override;
-       QueryData generate(QueryContext&) override;
+       QueryData select(QueryContext&) override;
        QueryData update(QueryContext&, const PluginRequest& request) override;
 };
 

diff --git a/src/vist/table/policy/policy-admin.cpp b/src/vist/table/policy/policy-admin.cpp
index 3f7b705a78bd7fb5fdb28ff67f2e68315681501c..55179b4adf2fdeff8cdd1cf331d829902c36f17e 100644 (file)
--- a/src/vist/table/policy/policy-admin.cpp
+++ b/src/vist/table/policy/policy-admin.cpp
@@ -54,7 +54,7 @@ TableColumns PolicyAdminTable::columns() const
        };
 }
 
-QueryData PolicyAdminTable::generate(QueryContext& context)
+QueryData PolicyAdminTable::select(QueryContext& context)
 {
        TABLE_EXCEPTION_GUARD_START
 

diff --git a/src/vist/table/policy/policy-admin.hpp b/src/vist/table/policy/policy-admin.hpp
index ff701e5fe531f77a843c1b9269d26e92ae054768..6112f8cfaa8777519b233045ea709eb62e2b3a66 100644 (file)
--- a/src/vist/table/policy/policy-admin.hpp
+++ b/src/vist/table/policy/policy-admin.hpp
@@ -27,7 +27,7 @@ public:
 
 private:
        TableColumns columns() const override;
-       QueryData generate(QueryContext&) override;
+       QueryData select(QueryContext&) override;
        QueryData delete_(QueryContext&, const PluginRequest& request) override;
        QueryData insert(QueryContext&, const PluginRequest& request) override;
        QueryData update(QueryContext&, const PluginRequest& request) override;

diff --git a/src/vist/table/policy/policy.cpp b/src/vist/table/policy/policy.cpp
index 849bb09b9bd30438fb7836b3dfab55d4e972691e..e3526a59876ee86a554d9a97d4ba253be1ecbe59 100644 (file)
--- a/src/vist/table/policy/policy.cpp
+++ b/src/vist/table/policy/policy.cpp
@@ -56,7 +56,7 @@ TableColumns PolicyTable::columns() const
        };
 }
 
-QueryData PolicyTable::generate(QueryContext& context)
+QueryData PolicyTable::select(QueryContext& context)
 {
        TABLE_EXCEPTION_GUARD_START
 

diff --git a/src/vist/table/policy/policy.hpp b/src/vist/table/policy/policy.hpp
index 5ef6f716f9b64cf8fb48e9966c70a4b7d8c79671..7bdcd4f4064b424fb73891e9e1333158df927422 100644 (file)
--- a/src/vist/table/policy/policy.hpp
+++ b/src/vist/table/policy/policy.hpp
@@ -27,7 +27,7 @@ public:
 
 private:
        TableColumns columns() const override;
-       QueryData generate(QueryContext&) override;
+       QueryData select(QueryContext&) override;
        QueryData update(QueryContext&, const PluginRequest& request) override;
 };
 

diff --git a/src/vist/table/policy/sample/table.cpp b/src/vist/table/policy/sample/table.cpp
index 487d9f9c3b0df73a90dbb47259894305c573e654..cdab50ce7125128cf8233559424194bddb344855 100644 (file)
--- a/src/vist/table/policy/sample/table.cpp
+++ b/src/vist/table/policy/sample/table.cpp
@@ -55,7 +55,7 @@ TableColumns SamplePolicyTable::columns() const
        };
 }
 
-QueryData SamplePolicyTable::generate(QueryContext&)
+QueryData SamplePolicyTable::select(QueryContext&)
 {
        TABLE_EXCEPTION_GUARD_START
 

diff --git a/src/vist/table/policy/sample/table.hpp b/src/vist/table/policy/sample/table.hpp
index 1934e9b5af5d2113c1f885745f7f2c43e1486809..e66e86237da90e2701f68793e836cf106841a53e 100644 (file)
--- a/src/vist/table/policy/sample/table.hpp
+++ b/src/vist/table/policy/sample/table.hpp
@@ -32,7 +32,7 @@ public:
 
 private:
        TableColumns columns() const override;
-       QueryData generate(QueryContext&) override;
+       QueryData select(QueryContext&) override;
        QueryData update(QueryContext&, const PluginRequest& request) override;
 };