Commit 3043a72f authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r354505: 

------------------------------------------------------------------------
r354505 | ibiryukov | 2019-02-20 20:08:06 +0100 (Wed, 20 Feb 2019) | 13 lines

[clangd] Store index in '.clangd/index' instead of '.clangd-index'

Summary: To take up the .clangd folder for other potential uses in the future.

Reviewers: kadircet, sammccall

Reviewed By: kadircet

Subscribers: ioeric, MaskRay, jkorous, arphaman, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D58440
------------------------------------------------------------------------

llvm-svn: 354982
parent c57a1fcc

clang-tools-extra/clangd/index/Background.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public: 
      llvm::unique_function<BackgroundIndexStorage *(llvm::StringRef)>;



  // Creates an Index Storage that saves shards into disk. Index storage uses

  // CDBDirectory + ".clangd-index/" as the folder to save shards.

  // CDBDirectory + ".clangd/index/" as the folder to save shards.

  static Factory createDiskBackedStorageFactory();

};

clang-tools-extra/clangd/index/BackgroundIndexStorage.cpp

+4 −4
Original line number Diff line number Diff line
@@ -64,19 +64,19 @@ writeAtomically(llvm::StringRef OutPath, 
}



// Uses disk as a storage for index shards. Creates a directory called

// ".clangd-index/" under the path provided during construction.

// ".clangd/index/" under the path provided during construction.

class DiskBackedIndexStorage : public BackgroundIndexStorage {

  std::string DiskShardRoot;



public:

  // Sets DiskShardRoot to (Directory + ".clangd-index/") which is the base

  // Sets DiskShardRoot to (Directory + ".clangd/index/") which is the base

  // directory for all shard files.

  DiskBackedIndexStorage(llvm::StringRef Directory) {

    llvm::SmallString<128> CDBDirectory(Directory);

    llvm::sys::path::append(CDBDirectory, ".clangd-index/");

    llvm::sys::path::append(CDBDirectory, ".clangd", "index");

    DiskShardRoot = CDBDirectory.str();

    std::error_code OK;

    std::error_code EC = llvm::sys::fs::create_directory(DiskShardRoot);

    std::error_code EC = llvm::sys::fs::create_directories(DiskShardRoot);

    if (EC != OK) {

      elog("Failed to create directory {0} for index storage: {1}",

           DiskShardRoot, EC.message());

clang-tools-extra/test/clangd/background-index.test

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
# RUN: clangd -background-index -background-index-rebuild-period=0 -lit-test < %t/definition.jsonrpc | FileCheck %t/definition.jsonrpc



# Test that the index is writing files in the expected location.

# RUN: ls %t/.clangd-index/foo.cpp.*.idx

# RUN: ls %t/.clangd/index/foo.cpp.*.idx



# Test the index is read from disk: delete code and restart clangd.

# RUN: rm %t/foo.cpp