Merge branch 'master' into improve-locking
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/a3cf33f1 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/a3cf33f1 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/a3cf33f1 Branch: refs/heads/master Commit: a3cf33f1efc796a284d6a5761142f89a1319ac52 Parents: 6e8538a 7a64a28 Author: Nick Wellnhofer <wellnho...@aevum.de> Authored: Fri Mar 17 17:10:51 2017 +0100 Committer: Nick Wellnhofer <wellnho...@aevum.de> Committed: Fri Mar 17 17:10:51 2017 +0100 ---------------------------------------------------------------------- core/Lucy/Analysis/Analyzer.cfh | 2 + core/Lucy/Index/BackgroundMerger.c | 43 ++-- core/Lucy/Index/IndexManager.c | 27 --- core/Lucy/Index/IndexManager.cfh | 7 - core/Lucy/Index/Indexer.c | 25 +-- core/Lucy/Index/Indexer.cfh | 1 + core/Lucy/Store/FSFileHandle.c | 7 +- core/Lucy/Store/FSFolder.c | 241 +++++++++++++++------- core/Lucy/Util/IndexFileNames.c | 8 + core/Lucy/Util/IndexFileNames.cfh | 6 + go/build.go | 1 - go/lucy/index.go | 12 -- go/lucy/index_test.go | 5 - perl/buildlib/Lucy/Build/Binding/Analysis.pm | 59 +++++- perl/t/051-fsfile.t | 1 + perl/t/240-custom-analyzer.t | 69 +++++++ 16 files changed, 350 insertions(+), 164 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/a3cf33f1/core/Lucy/Index/BackgroundMerger.c ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/a3cf33f1/core/Lucy/Index/IndexManager.c ---------------------------------------------------------------------- diff --cc core/Lucy/Index/IndexManager.c index 8e56509,24eed1d..b99254d --- a/core/Lucy/Index/IndexManager.c +++ b/core/Lucy/Index/IndexManager.c @@@ -25,10 -25,10 +25,9 @@@ #include "Lucy/Index/Snapshot.h" #include "Lucy/Store/DirHandle.h" #include "Lucy/Store/Folder.h" -#include "Lucy/Store/Lock.h" -#include "Lucy/Store/LockFactory.h" +#include "Lucy/Store/LockFileLock.h" #include "Lucy/Util/IndexFileNames.h" #include "Lucy/Util/Json.h" - #include "Lucy/Util/StringHelper.h" #include <stdlib.h> http://git-wip-us.apache.org/repos/asf/lucy/blob/a3cf33f1/core/Lucy/Index/IndexManager.cfh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/a3cf33f1/core/Lucy/Index/Indexer.c ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/a3cf33f1/go/build.go ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/a3cf33f1/go/lucy/index_test.go ---------------------------------------------------------------------- diff --cc go/lucy/index_test.go index a47c364,0049ee4..341bf64 --- a/go/lucy/index_test.go +++ b/go/lucy/index_test.go @@@ -212,11 -222,7 +211,7 @@@ func TestIndexManagerMergeData(t *testi } func TestIndexManagerMisc(t *testing.T) { - manager := NewIndexManager("", nil) + manager := NewIndexManager("") - manager.SetFolder(NewRAMFolder("")) - if got, err := manager.MakeSnapshotFilename(); !strings.Contains(got, "snapshot") || err != nil { - t.Errorf("MakeSnapshotFilename: %s, %v", got, err) - } snapshot := NewSnapshot() snapshot.AddEntry("seg_4") snapshot.AddEntry("seg_5")