[clang-tools-extra] r354505 - [clangd] Store index in '.clangd/index' instead of '.clangd-index'

[Hans Wennborg via cfe-commits]

Merged to release_80 in r354982.

On Wed, Feb 20, 2019 at 8:07 PM Ilya Biryukov via cfe-commits
<cfe-commits at lists.llvm.org> wrote:
>
> Author: ibiryukov
> Date: Wed Feb 20 11:08:06 2019
> New Revision: 354505
>
> URL: http://llvm.org/viewvc/llvm-project?rev=354505&view=rev
> Log:
> [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
>
> Modified:
>     clang-tools-extra/trunk/clangd/index/Background.h
>     clang-tools-extra/trunk/clangd/index/BackgroundIndexStorage.cpp
>     clang-tools-extra/trunk/test/clangd/background-index.test
>
> Modified: clang-tools-extra/trunk/clangd/index/Background.h
> URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/index/Background.h?rev=354505&r1=354504&r2=354505&view=diff
> ==============================================================================
> --- clang-tools-extra/trunk/clangd/index/Background.h (original)
> +++ clang-tools-extra/trunk/clangd/index/Background.h Wed Feb 20 11:08:06 2019
> @@ -54,7 +54,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();
>  };
>
>
> Modified: clang-tools-extra/trunk/clangd/index/BackgroundIndexStorage.cpp
> URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/index/BackgroundIndexStorage.cpp?rev=354505&r1=354504&r2=354505&view=diff
> ==============================================================================
> --- clang-tools-extra/trunk/clangd/index/BackgroundIndexStorage.cpp (original)
> +++ clang-tools-extra/trunk/clangd/index/BackgroundIndexStorage.cpp Wed Feb 20 11:08:06 2019
> @@ -63,19 +63,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());
>
> Modified: clang-tools-extra/trunk/test/clangd/background-index.test
> URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clangd/background-index.test?rev=354505&r1=354504&r2=354505&view=diff
> ==============================================================================
> --- clang-tools-extra/trunk/test/clangd/background-index.test (original)
> +++ clang-tools-extra/trunk/test/clangd/background-index.test Wed Feb 20 11:08:06 2019
> @@ -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
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits