[PATCH] D89685: [clangd] Rename edge name for filesymbols to slabs in memorytree

[Kadir Cetinkaya via Phabricator via cfe-commits]

kadircet created this revision.
kadircet added a reviewer: sammccall.
Herald added subscribers: cfe-commits, usaxena95, arphaman.
Herald added a project: clang.
kadircet requested review of this revision.
Herald added subscribers: MaskRay, ilya-biryukov.

This was causing duplicate `symbols` components on the path as both the
edge from an index to filesymbols and filesymbols to symbolslabs were named
symbols.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D89685

Files:
  clang-tools-extra/clangd/index/Background.cpp
  clang-tools-extra/clangd/index/FileIndex.cpp
  clang-tools-extra/clangd/test/memory_tree.test
  clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
  clang-tools-extra/clangd/unittests/FileIndexTests.cpp


Index: clang-tools-extra/clangd/unittests/FileIndexTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/FileIndexTests.cpp
+++ clang-tools-extra/clangd/unittests/FileIndexTests.cpp
@@ -672,9 +672,9 @@
               UnorderedElementsAre(Pair("preamble", _), Pair("main_file", _)));
 
   ASSERT_THAT(MT.child("preamble").children(),
-              UnorderedElementsAre(Pair("index", _), Pair("symbols", _)));
+              UnorderedElementsAre(Pair("index", _), Pair("slabs", _)));
   ASSERT_THAT(MT.child("main_file").children(),
-              UnorderedElementsAre(Pair("index", _), Pair("symbols", _)));
+              UnorderedElementsAre(Pair("index", _), Pair("slabs", _)));
 
   ASSERT_THAT(MT.child("preamble").child("index").total(), Gt(0U));
   ASSERT_THAT(MT.child("main_file").child("index").total(), Gt(0U));
Index: clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
+++ clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
@@ -927,7 +927,7 @@
   MemoryTree MT(&Alloc);
   Idx.profile(MT);
   ASSERT_THAT(MT.children(),
-              UnorderedElementsAre(Pair("symbols", _), Pair("index", _)));
+              UnorderedElementsAre(Pair("slabs", _), Pair("index", _)));
 }
 
 } // namespace clangd
Index: clang-tools-extra/clangd/test/memory_tree.test
===================================================================
--- clang-tools-extra/clangd/test/memory_tree.test
+++ clang-tools-extra/clangd/test/memory_tree.test
@@ -22,7 +22,7 @@
 # CHECK-NEXT:             "_self": {{[0-9]+}},
 # CHECK-NEXT:             "_total": {{[0-9]+}}
 # CHECK-NEXT:           },
-# CHECK-NEXT:           "symbols": {
+# CHECK-NEXT:           "slabs": {
 # CHECK-NEXT:             "{{.*}}main.cpp": {
 # CHECK-NEXT:               "_self": {{[0-9]+}},
 # CHECK-NEXT:               "_total": {{[0-9]+}},
@@ -50,7 +50,7 @@
 # CHECK-NEXT:             "_self": {{[0-9]+}},
 # CHECK-NEXT:             "_total": {{[0-9]+}}
 # CHECK-NEXT:           },
-# CHECK-NEXT:           "symbols": {
+# CHECK-NEXT:           "slabs": {
 # CHECK-NEXT:             "_self": {{[0-9]+}},
 # CHECK-NEXT:             "_total": {{[0-9]+}}
 # CHECK-NEXT:           }
Index: clang-tools-extra/clangd/index/FileIndex.cpp
===================================================================
--- clang-tools-extra/clangd/index/FileIndex.cpp
+++ clang-tools-extra/clangd/index/FileIndex.cpp
@@ -478,11 +478,11 @@
 }
 
 void FileIndex::profile(MemoryTree &MT) const {
-  PreambleSymbols.profile(MT.child("preamble").child("symbols"));
+  PreambleSymbols.profile(MT.child("preamble").child("slabs"));
   MT.child("preamble")
       .child("index")
       .addUsage(PreambleIndex.estimateMemoryUsage());
-  MainFileSymbols.profile(MT.child("main_file").child("symbols"));
+  MainFileSymbols.profile(MT.child("main_file").child("slabs"));
   MT.child("main_file")
       .child("index")
       .addUsage(MainFileIndex.estimateMemoryUsage());
Index: clang-tools-extra/clangd/index/Background.cpp
===================================================================
--- clang-tools-extra/clangd/index/Background.cpp
+++ clang-tools-extra/clangd/index/Background.cpp
@@ -416,7 +416,7 @@
 }
 
 void BackgroundIndex::profile(MemoryTree &MT) const {
-  IndexedSymbols.profile(MT.child("symbols"));
+  IndexedSymbols.profile(MT.child("slabs"));
   // We don't want to mix memory used by index and symbols, so call base class.
   MT.child("index").addUsage(SwapIndex::estimateMemoryUsage());
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D89685.298992.patch
Type: text/x-patch
Size: 3659 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20201019/707f3d08/attachment.bin>