From 0fbe889abbc76d7f4cc4fd256d7139a8b175ef5b Mon Sep 17 00:00:00 2001 From: Sangwan Kwon Date: Mon, 27 Jul 2020 14:12:23 +0900 Subject: [PATCH] Rename Table::generate to Table::select Change-Id: I3d9e18c1bb21b0ea9da9a865929af38b15d9b5fe Signed-off-by: Sangwan Kwon --- src/osquery/core/tables.cpp | 4 ++-- src/osquery/include/osquery/tables.h | 2 +- src/osquery/sql/sql.cpp | 4 ++-- src/osquery/sql/tests/sql.cpp | 2 +- src/osquery/sql/tests/virtual_table.cpp | 22 +++++++++++----------- src/osquery/sql/virtual_table.cpp | 4 ++-- src/vist/table/policy/bluetooth/table.cpp | 2 +- src/vist/table/policy/bluetooth/table.hpp | 2 +- src/vist/table/policy/policy-admin.cpp | 2 +- src/vist/table/policy/policy-admin.hpp | 2 +- src/vist/table/policy/policy.cpp | 2 +- src/vist/table/policy/policy.hpp | 2 +- src/vist/table/policy/sample/table.cpp | 2 +- src/vist/table/policy/sample/table.hpp | 2 +- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/osquery/core/tables.cpp b/src/osquery/core/tables.cpp index 18bfa80..15ceb56 100644 --- 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 5cf05da..5c9637e 100644 --- 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 6244e92..f8a06f8 100644 --- 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& 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 9543bf0..178ec80 100644 --- 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 bec6d6c..5188bf3 100644 --- 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 511d2d7..91fae11 100644 --- 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(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 ade0c1a..6bedb72 100644 --- 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 5695f14..0acfde2 100644 --- 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 3f7b705..55179b4 100644 --- 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 ff701e5..6112f8c 100644 --- 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 849bb09..e3526a5 100644 --- 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 5ef6f71..7bdcd4f 100644 --- 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 487d9f9..cdab50c 100644 --- 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 1934e9b..e66e862 100644 --- 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; }; -- 2.34.1