fix: move xblock tree location to top level

Parsing down the tree is vastly slower for some reason.

event_sink_clickhouse/sinks/course_published.py

@@ -103,11 +103,9 @@ def serialize_item(self, item, many=False, initial=None):
             elif fields["xblock_data_json"]["block_type"] == "vertical":
                 unit_idx += 1
 
-            fields["xblock_data_json"]["course_tree_location"] = {
-                "section": section_idx,
-                "subsection": subsection_idx,
-                "unit": unit_idx
-            }
+            fields["xblock_data_json"]["section"] = section_idx
+            fields["xblock_data_json"]["subsection"] = subsection_idx
+            fields["xblock_data_json"]["unit"] = unit_idx
 
             fields["xblock_data_json"] = json.dumps(fields["xblock_data_json"])
             location_to_node[

tests/test_course_published.py

@@ -243,9 +243,9 @@ def _check_tree_location(block, expected_section=0, expected_subsection=0, expec
         """
         try:
             j = json.loads(block["xblock_data_json"])
-            assert j["course_tree_location"]["section"] == expected_section
-            assert j["course_tree_location"]["subsection"] == expected_subsection
-            assert j["course_tree_location"]["unit"] == expected_unit
+            assert j["section"] == expected_section
+            assert j["subsection"] == expected_subsection
+            assert j["unit"] == expected_unit
         except AssertionError as e:
             print(e)
             print(block)