sapling/eden/fs/inodes/Dirstate.h
Michael Bolin 57f5d72a27 Reimplement dirstate used by Eden's Hg extension as a subclass of Hg's dirstate.
Summary:
This is a major change to Eden's Hg extension.

Our initial attempt to implement `edendirstate` was to create a "clean room"
implementation that did not share code with `mercurial/dirstate.py`. This was
helpful in uncovering the subset of the dirstate API that matters for Eden. It
also provided a better safeguard against upstream changes to `dirstate.py` in
Mercurial itself.

In this implementation, the state transition management was mostly done
on the server in `Dirstate.cpp`. We also made a modest attempt to make
`Dirstate.cpp` "SCM-agnostic" such that the same APIs could be used for
Git at some point.

However, as we have tried to support more of the sophisticated functionality
in Mercurial, particularly `hg histedit`, achieving parity between the clean room
implementation and Mercurial's internals has become more challenging.
Ultimately, the clean room implementation is likely the right way to go for Eden,
but for now, we need to prioritize having feature parity with vanilla Hg when
using Eden. Once we have a more complete set of integration tests in place,
we can reimplement Eden's dirstate more aggressively to optimize things.

Fortunately, the [[ https://bitbucket.org/facebook/hg-experimental/src/default/sqldirstate/ | sqldirstate ]]
extension has already demonstrated that it is possible to provide a faithful
dirstate implementation that subclasses the original `dirstate` while using a different
storage mechanism. As such, I used `sqldirstate` as a model when implementing
the new `eden_dirstate` (distinguishing it from our v1 implementation, `edendirstate`).

In particular, `sqldirstate` uses SQL tables as storage for the following private fields
of `dirstate`: `_map`, `_dirs`, `_copymap`, `_filefoldmap`, `_dirfoldmap`. Because
`_filefoldmap` and `_dirfoldmap` exist to deal with case-insensitivity issues, we
do not support them in `eden_dirstate` and add code to ensure the codepaths that
would access them in `dirstate` never get exercised. Similarly, we also implemented
`eden_dirstate` so that it never accesses `_dirs`. (`_dirs` is a multiset of all directories in the
dirstate, which is an O(repo) data structure, so we do not want to maintain it in Eden.
It appears to be primarily used for checking whether a path to a file already exists in
the dirstate as a directory. We can protect against that in more efficient ways.)

That leaves only `_map` and `_copymap` to worry about. `_copymap` contains the set
of files that have been marked "copied" in the current dirstate, so it is fairly small and
can be stored on disk or in memory with little concern. `_map` is a bit trickier because
it is expected to have an entry for every file in the dirstate. In `sqldirstate`, it is stored
across two tables: `files` and `nonnormalfiles`. For Eden, we already represent the data
analogous to the `files` table in RocksDB/the overlay, so we do not need to create a new
equivalent to the `files` table. We do, however, need an equivalent to the `nonnormalfiles`
table, which we store in as Thrift-serialized data in an ordinary file along with the `_copymap`
data.

In our Hg extension, our implementation of `_map` is `eden_dirstate_map`, which is defined
in a Python file of the same name. Our implementation of `_copymap` is `dummy_copymap`,
which is defined in `eden_dirstate.py`. Both of these collections are simple pass-through data
structures that translate their method calls to Thrift server calls. I expect we will want to
optimize this in the future via some client-side caching, as well as creating batch APIs for talking
to the server via Thrift.

One advantage of this new implementation is that it enables us to delete
`eden/hg/eden/overrides.py`, which overrode the entry points for `hg add` and `hg remove`.
Between the recent implementation of `dirstate.walk()` for Eden and this switch
to the real dirstate, we can now use the default implementation of `hg add` and `hg remove`
(although we have to play some tricks, like in the implementation of `eden_dirstate.status()`
in order to make `hg remove` work).

In the course of doing this revision, I discovered that I had to make a minor fix to
`EdenMatchInfo.make_glob_list()` because `hg add foo` was being treated as
`hg add foo/**/*` even when `foo` was just a file (as opposed to a directory), in which
case the glob was not matching `foo`!

I also had to do some work in `eden_dirstate.status()` in which the `match` argument
was previously largely ignored. It turns out that `dirstate.py` uses `status()` for a number
of things with the `match` specified as a filter, so the output of `status()` must be filtered
by `match` accordingly. Ultimately, this seems like work that would be better done on the
server, but for simplicity, we're just going to do it in Python, for now.

For the reasons explained above, this revision deletes a lot of code `Dirstate.cpp`.
As such, `DirstateTest.cpp` does not seem worth refactoring, though the scenarios it was
testing should probably be converted to integration tests. At a high level, the role of
`DirstatePersistence` has not changed, but the exact data it writes is much different.
Its corresponding unit test is also disabled, for now.

Note that this revision does not change the name of the file where "dirstate data" is written
(this is defined as `kDirstateFile` in `ClientConfig.cpp`), so we should blow away any existing
instances of this file once this change lands. (It is still early enough in the project that it does
not seem worth the overhead of a proper migration.)

The true test of the success of this new approach is the ease with which we can write more
integration tests for things like `hg histedit` and `hg graft`. Ideally, these should require very
few changes to `eden_dirstate.py`.

Reviewed By: simpkins

Differential Revision: D5071778

fbshipit-source-id: e8fec4d393035d80f36516ac050cad025dc3ba31
2017-05-26 12:05:29 -07:00

130 lines
4.2 KiB
C++

/*
* Copyright (c) 2016-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
*/
#pragma once
#include <folly/Synchronized.h>
#include <folly/experimental/StringKeyedUnorderedMap.h>
#include "eden/fs/inodes/DirstatePersistence.h"
#include "eden/fs/inodes/InodePtrFwd.h"
#include "eden/fs/inodes/gen-cpp2/hgdirstate_types.h"
#include "eden/fs/model/Tree.h"
#include "eden/fs/service/gen-cpp2/EdenService.h"
#include "eden/fs/utils/PathFuncs.h"
namespace facebook {
namespace eden {
class ClientConfig;
class EdenMount;
class InodeBase;
class ObjectStore;
class Tree;
class TreeInode;
namespace fusell {
class InodeBase;
class MountPoint;
}
/**
* Returns the single-char representation of the status used by `hg status`.
* Note that this differs from the corresponding entry in the _VALUES_TO_NAMES
* map for a Thrift enum.
*/
char hgStatusCodeChar(StatusCode code);
struct DirstateAddRemoveError {
DirstateAddRemoveError(RelativePathPiece p, folly::StringPiece s)
: path{p}, errorMessage{s.str()} {}
RelativePath path;
std::string errorMessage;
};
inline bool operator==(
const DirstateAddRemoveError& lhs,
const DirstateAddRemoveError& rhs) {
return lhs.path == rhs.path && lhs.errorMessage == rhs.errorMessage;
}
inline bool operator!=(
const DirstateAddRemoveError& lhs,
const DirstateAddRemoveError& rhs) {
return !(lhs == rhs);
}
std::ostream& operator<<(std::ostream& os, const DirstateAddRemoveError& error);
std::ostream& operator<<(std::ostream& os, const ThriftHgStatus& status);
/**
* This is designed to be a simple implemenation of an Hg dirstate. It's
* "simple" in that every call to `getStatus()` walks the entire overlay to
* determine which files have been added/modified/removed, and then compares
* those files with the base commit to determine the appropriate Hg status code.
*
* Ideally, we would cache information between calls to `getStatus()` to make
* this more efficient, but this seems like an OK place to start. Once we have
* a complete implementation built that is supported by a battery of tests, then
* we can try to optimize things.
*
* For the moment, let's assume that we have the invariant that every file that
* has been modified since the "base commit" exists in the overlay. This means
* that we do not allow a non-commit snapshot to remove files from the overlay.
* Rather, the only time the overlay gets "cleaned up" is in response to a
* commit or an update.
*
* This may not be what we want in the long run, but we need to get basic
* Mercurial stuff working first before we can worry about snapshots.
*/
class Dirstate {
public:
explicit Dirstate(EdenMount* mount);
~Dirstate();
/**
* Get the status information about files that are changed.
*
* This is used for implementing "hg status". Returns the data as a thrift
* structure that can be returned to the eden hg extension.
*
* @param listIgnored Whether or not to report information about ignored
* files.
*/
ThriftHgStatus getStatus(bool listIgnored) const;
/**
* Clean up the Dirstate after the current commit has changed.
*
* This removes Add and Remove directives if the corresponding files have
* been added or removed in the new source control state.
*/
folly::Future<folly::Unit> onSnapshotChanged(const Tree* rootTree);
hgdirstate::DirstateTuple hgGetDirstateTuple(
const RelativePathPiece filename);
void hgSetDirstateTuple(
const RelativePathPiece filename,
const hgdirstate::DirstateTuple* tuple);
std::unordered_map<RelativePath, hgdirstate::DirstateTuple>
hgGetNonnormalFiles() const;
void hgCopyMapPut(
const RelativePathPiece dest,
const RelativePathPiece source);
RelativePath hgCopyMapGet(const RelativePathPiece dest) const;
folly::StringKeyedUnorderedMap<RelativePath> hgCopyMapGetAll() const;
private:
/** The EdenMount object that owns this Dirstate */
EdenMount* const mount_{nullptr};
DirstatePersistence persistence_;
folly::Synchronized<DirstateData> data_;
};
}
}