tp: move span join and window tables to sqlite folder
Change-Id: I434bea2f2cec883b0dbd97744dda9c066c1f7162
diff --git a/Android.bp b/Android.bp
index 862a044..bd3d9b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5992,14 +5992,12 @@
name: "perfetto_src_trace_processor_lib",
srcs: [
"src/trace_processor/read_trace.cc",
- "src/trace_processor/span_join_operator_table.cc",
"src/trace_processor/sql_stats_table.cc",
"src/trace_processor/sqlite_experimental_flamegraph_table.cc",
"src/trace_processor/sqlite_raw_table.cc",
"src/trace_processor/stats_table.cc",
"src/trace_processor/trace_processor.cc",
"src/trace_processor/trace_processor_impl.cc",
- "src/trace_processor/window_operator_table.cc",
],
}
@@ -6033,8 +6031,10 @@
srcs: [
"src/trace_processor/sqlite/db_sqlite_table.cc",
"src/trace_processor/sqlite/query_constraints.cc",
+ "src/trace_processor/sqlite/span_join_operator_table.cc",
"src/trace_processor/sqlite/sqlite3_str_split.cc",
"src/trace_processor/sqlite/sqlite_table.cc",
+ "src/trace_processor/sqlite/window_operator_table.cc",
],
}
@@ -6044,6 +6044,7 @@
srcs: [
"src/trace_processor/sqlite/db_sqlite_table_unittest.cc",
"src/trace_processor/sqlite/query_constraints_unittest.cc",
+ "src/trace_processor/sqlite/span_join_operator_table_unittest.cc",
"src/trace_processor/sqlite/sqlite3_str_split_unittest.cc",
],
}
@@ -6156,7 +6157,6 @@
"src/trace_processor/process_tracker_unittest.cc",
"src/trace_processor/protozero_to_text_unittests.cc",
"src/trace_processor/slice_tracker_unittest.cc",
- "src/trace_processor/span_join_operator_table_unittest.cc",
"src/trace_processor/syscall_tracker_unittest.cc",
"src/trace_processor/trace_sorter_unittest.cc",
],
diff --git a/BUILD b/BUILD
index 9ac10f3..9184449 100644
--- a/BUILD
+++ b/BUILD
@@ -768,11 +768,15 @@
"src/trace_processor/sqlite/query_constraints.cc",
"src/trace_processor/sqlite/query_constraints.h",
"src/trace_processor/sqlite/scoped_db.h",
+ "src/trace_processor/sqlite/span_join_operator_table.cc",
+ "src/trace_processor/sqlite/span_join_operator_table.h",
"src/trace_processor/sqlite/sqlite3_str_split.cc",
"src/trace_processor/sqlite/sqlite3_str_split.h",
"src/trace_processor/sqlite/sqlite_table.cc",
"src/trace_processor/sqlite/sqlite_table.h",
"src/trace_processor/sqlite/sqlite_utils.h",
+ "src/trace_processor/sqlite/window_operator_table.cc",
+ "src/trace_processor/sqlite/window_operator_table.h",
],
)
@@ -825,8 +829,6 @@
name = "src_trace_processor_lib",
srcs = [
"src/trace_processor/read_trace.cc",
- "src/trace_processor/span_join_operator_table.cc",
- "src/trace_processor/span_join_operator_table.h",
"src/trace_processor/sql_stats_table.cc",
"src/trace_processor/sql_stats_table.h",
"src/trace_processor/sqlite_experimental_flamegraph_table.cc",
@@ -838,8 +840,6 @@
"src/trace_processor/trace_processor.cc",
"src/trace_processor/trace_processor_impl.cc",
"src/trace_processor/trace_processor_impl.h",
- "src/trace_processor/window_operator_table.cc",
- "src/trace_processor/window_operator_table.h",
],
)
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index c337f7e..31f346c 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -286,8 +286,6 @@
source_set("lib") {
sources = [
"read_trace.cc",
- "span_join_operator_table.cc",
- "span_join_operator_table.h",
"sql_stats_table.cc",
"sql_stats_table.h",
"sqlite_experimental_flamegraph_table.cc",
@@ -299,8 +297,6 @@
"trace_processor.cc",
"trace_processor_impl.cc",
"trace_processor_impl.h",
- "window_operator_table.cc",
- "window_operator_table.h",
]
deps = [
@@ -396,11 +392,7 @@
]
if (enable_perfetto_trace_processor_sqlite) {
- sources += [ "span_join_operator_table_unittest.cc" ]
deps += [
- ":lib",
- "../../gn:sqlite",
- "sqlite",
"sqlite:unittests",
]
}
diff --git a/src/trace_processor/metrics/BUILD.gn b/src/trace_processor/metrics/BUILD.gn
index 92512a9..bf74149 100644
--- a/src/trace_processor/metrics/BUILD.gn
+++ b/src/trace_processor/metrics/BUILD.gn
@@ -92,6 +92,7 @@
sources = [ "metrics_unittest.cc" ]
deps = [
":lib",
+ "..:lib",
"../../../gn:default_deps",
"../../../gn:gtest_and_gmock",
"../../../gn:sqlite",
diff --git a/src/trace_processor/sqlite/BUILD.gn b/src/trace_processor/sqlite/BUILD.gn
index ec5e4cf..30d6e81 100644
--- a/src/trace_processor/sqlite/BUILD.gn
+++ b/src/trace_processor/sqlite/BUILD.gn
@@ -23,11 +23,15 @@
"query_constraints.cc",
"query_constraints.h",
"scoped_db.h",
+ "span_join_operator_table.cc",
+ "span_join_operator_table.h",
"sqlite3_str_split.cc",
"sqlite3_str_split.h",
"sqlite_table.cc",
"sqlite_table.h",
"sqlite_utils.h",
+ "window_operator_table.cc",
+ "window_operator_table.h",
]
deps = [
"../../../gn:default_deps",
@@ -45,6 +49,7 @@
sources = [
"db_sqlite_table_unittest.cc",
"query_constraints_unittest.cc",
+ "span_join_operator_table_unittest.cc",
"sqlite3_str_split_unittest.cc",
]
deps = [
diff --git a/src/trace_processor/span_join_operator_table.cc b/src/trace_processor/sqlite/span_join_operator_table.cc
similarity index 99%
rename from src/trace_processor/span_join_operator_table.cc
rename to src/trace_processor/sqlite/span_join_operator_table.cc
index 1cb258d..bf14bdf 100644
--- a/src/trace_processor/span_join_operator_table.cc
+++ b/src/trace_processor/sqlite/span_join_operator_table.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/span_join_operator_table.h"
+#include "src/trace_processor/sqlite/span_join_operator_table.h"
#include <sqlite3.h>
#include <string.h>
diff --git a/src/trace_processor/span_join_operator_table.h b/src/trace_processor/sqlite/span_join_operator_table.h
similarity index 98%
rename from src/trace_processor/span_join_operator_table.h
rename to src/trace_processor/sqlite/span_join_operator_table.h
index 3f9ec18..290b3d9 100644
--- a/src/trace_processor/span_join_operator_table.h
+++ b/src/trace_processor/sqlite/span_join_operator_table.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_SPAN_JOIN_OPERATOR_TABLE_H_
-#define SRC_TRACE_PROCESSOR_SPAN_JOIN_OPERATOR_TABLE_H_
+#ifndef SRC_TRACE_PROCESSOR_SQLITE_SPAN_JOIN_OPERATOR_TABLE_H_
+#define SRC_TRACE_PROCESSOR_SQLITE_SPAN_JOIN_OPERATOR_TABLE_H_
#include <sqlite3.h>
@@ -425,4 +425,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_SPAN_JOIN_OPERATOR_TABLE_H_
+#endif // SRC_TRACE_PROCESSOR_SQLITE_SPAN_JOIN_OPERATOR_TABLE_H_
diff --git a/src/trace_processor/span_join_operator_table_unittest.cc b/src/trace_processor/sqlite/span_join_operator_table_unittest.cc
similarity index 96%
rename from src/trace_processor/span_join_operator_table_unittest.cc
rename to src/trace_processor/sqlite/span_join_operator_table_unittest.cc
index 503360e..87bb645 100644
--- a/src/trace_processor/span_join_operator_table_unittest.cc
+++ b/src/trace_processor/sqlite/span_join_operator_table_unittest.cc
@@ -14,10 +14,8 @@
* limitations under the License.
*/
-#include "src/trace_processor/span_join_operator_table.h"
+#include "src/trace_processor/sqlite/span_join_operator_table.h"
-#include "src/trace_processor/trace_processor_context.h"
-#include "src/trace_processor/trace_storage.h"
#include "test/gtest_and_gmock.h"
namespace perfetto {
@@ -32,9 +30,7 @@
PERFETTO_CHECK(sqlite3_open(":memory:", &db) == SQLITE_OK);
db_.reset(db);
- context_.storage.reset(new TraceStorage());
-
- SpanJoinOperatorTable::RegisterTable(db_.get(), context_.storage.get());
+ SpanJoinOperatorTable::RegisterTable(db_.get(), nullptr);
}
void PrepareValidStatement(const std::string& sql) {
@@ -59,7 +55,6 @@
}
protected:
- TraceProcessorContext context_;
ScopedDb db_;
ScopedStmt stmt_;
};
diff --git a/src/trace_processor/window_operator_table.cc b/src/trace_processor/sqlite/window_operator_table.cc
similarity index 98%
rename from src/trace_processor/window_operator_table.cc
rename to src/trace_processor/sqlite/window_operator_table.cc
index 1d801f8..2c7b543 100644
--- a/src/trace_processor/window_operator_table.cc
+++ b/src/trace_processor/sqlite/window_operator_table.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/window_operator_table.h"
+#include "src/trace_processor/sqlite/window_operator_table.h"
#include "src/trace_processor/sqlite/sqlite_utils.h"
diff --git a/src/trace_processor/window_operator_table.h b/src/trace_processor/sqlite/window_operator_table.h
similarity index 93%
rename from src/trace_processor/window_operator_table.h
rename to src/trace_processor/sqlite/window_operator_table.h
index 504ec13..c0001c6 100644
--- a/src/trace_processor/window_operator_table.h
+++ b/src/trace_processor/sqlite/window_operator_table.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_WINDOW_OPERATOR_TABLE_H_
-#define SRC_TRACE_PROCESSOR_WINDOW_OPERATOR_TABLE_H_
+#ifndef SRC_TRACE_PROCESSOR_SQLITE_WINDOW_OPERATOR_TABLE_H_
+#define SRC_TRACE_PROCESSOR_SQLITE_WINDOW_OPERATOR_TABLE_H_
#include <limits>
#include <memory>
@@ -94,4 +94,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_WINDOW_OPERATOR_TABLE_H_
+#endif // SRC_TRACE_PROCESSOR_SQLITE_WINDOW_OPERATOR_TABLE_H_
diff --git a/src/trace_processor/trace_processor_impl.cc b/src/trace_processor/trace_processor_impl.cc
index 935ed1c..6b7a9eb 100644
--- a/src/trace_processor/trace_processor_impl.cc
+++ b/src/trace_processor/trace_processor_impl.cc
@@ -26,16 +26,16 @@
#include "src/trace_processor/importers/ftrace/sched_event_tracker.h"
#include "src/trace_processor/metadata_tracker.h"
#include "src/trace_processor/register_additional_modules.h"
-#include "src/trace_processor/span_join_operator_table.h"
#include "src/trace_processor/sql_stats_table.h"
+#include "src/trace_processor/sqlite/span_join_operator_table.h"
#include "src/trace_processor/sqlite/sqlite3_str_split.h"
#include "src/trace_processor/sqlite/sqlite_table.h"
#include "src/trace_processor/sqlite/sqlite_utils.h"
+#include "src/trace_processor/sqlite/window_operator_table.h"
#include "src/trace_processor/sqlite_experimental_flamegraph_table.h"
#include "src/trace_processor/sqlite_raw_table.h"
#include "src/trace_processor/stats_table.h"
#include "src/trace_processor/types/variadic.h"
-#include "src/trace_processor/window_operator_table.h"
#include "src/trace_processor/metrics/metrics.descriptor.h"
#include "src/trace_processor/metrics/metrics.h"