API: Lucene.Net.Index.SegmentCommitInfo: Renamed Files() > GetFiles() (consistency)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/21097229 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/21097229 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/21097229 Branch: refs/heads/master Commit: 2109722960deafd24a5d0ae0db076714f7b0b05b Parents: 93d80d3 Author: Shad Storhaug <[email protected]> Authored: Sat Jun 17 12:50:58 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Sat Jun 17 12:53:51 2017 +0700 ---------------------------------------------------------------------- src/Lucene.Net.Misc/Index/IndexSplitter.cs | 2 +- src/Lucene.Net/Index/CheckIndex.cs | 4 ++-- .../Index/DocumentsWriterPerThread.cs | 2 +- src/Lucene.Net/Index/IndexWriter.cs | 22 ++++++++++---------- src/Lucene.Net/Index/SegmentCommitInfo.cs | 4 ++-- src/Lucene.Net/Index/SegmentInfos.cs | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net.Misc/Index/IndexSplitter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Misc/Index/IndexSplitter.cs b/src/Lucene.Net.Misc/Index/IndexSplitter.cs index a8847fc..9710943 100644 --- a/src/Lucene.Net.Misc/Index/IndexSplitter.cs +++ b/src/Lucene.Net.Misc/Index/IndexSplitter.cs @@ -156,7 +156,7 @@ namespace Lucene.Net.Index SegmentInfo newInfo = new SegmentInfo(destFSDir, info.Version, info.Name, info.DocCount, info.UseCompoundFile, info.Codec, info.Diagnostics); destInfos.Add(new SegmentCommitInfo(newInfo, infoPerCommit.DelCount, infoPerCommit.DelGen, infoPerCommit.FieldInfosGen)); // now copy files over - ICollection<string> files = infoPerCommit.Files(); + ICollection<string> files = infoPerCommit.GetFiles(); foreach (string srcName in files) { FileInfo srcFile = new FileInfo(Path.Combine(dir.FullName, srcName)); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net/Index/CheckIndex.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Index/CheckIndex.cs b/src/Lucene.Net/Index/CheckIndex.cs index 5ef6586..6a43b1b 100644 --- a/src/Lucene.Net/Index/CheckIndex.cs +++ b/src/Lucene.Net/Index/CheckIndex.cs @@ -741,8 +741,8 @@ namespace Lucene.Net.Index segInfoStat.Codec = codec; Msg(infoStream, " compound=" + info.Info.UseCompoundFile); segInfoStat.Compound = info.Info.UseCompoundFile; - Msg(infoStream, " numFiles=" + info.Files().Count); - segInfoStat.NumFiles = info.Files().Count; + Msg(infoStream, " numFiles=" + info.GetFiles().Count); + segInfoStat.NumFiles = info.GetFiles().Count; segInfoStat.SizeMB = info.GetSizeInBytes() / (1024.0 * 1024.0); #pragma warning disable 612, 618 if (info.Info.GetAttribute(Lucene3xSegmentInfoFormat.DS_OFFSET_KEY) == null) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net/Index/DocumentsWriterPerThread.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Index/DocumentsWriterPerThread.cs b/src/Lucene.Net/Index/DocumentsWriterPerThread.cs index a516d36..3fe6c9c 100644 --- a/src/Lucene.Net/Index/DocumentsWriterPerThread.cs +++ b/src/Lucene.Net/Index/DocumentsWriterPerThread.cs @@ -578,7 +578,7 @@ namespace Lucene.Net.Index { infoStream.Message("DWPT", "new segment has " + (flushState.LiveDocs == null ? 0 : (flushState.SegmentInfo.DocCount - flushState.DelCountOnFlush)) + " deleted docs"); infoStream.Message("DWPT", "new segment has " + (flushState.FieldInfos.HasVectors ? "vectors" : "no vectors") + "; " + (flushState.FieldInfos.HasNorms ? "norms" : "no norms") + "; " + (flushState.FieldInfos.HasDocValues ? "docValues" : "no docValues") + "; " + (flushState.FieldInfos.HasProx ? "prox" : "no prox") + "; " + (flushState.FieldInfos.HasFreq ? "freqs" : "no freqs")); - infoStream.Message("DWPT", "flushedFiles=" + Arrays.ToString(segmentInfoPerCommit.Files())); + infoStream.Message("DWPT", "flushedFiles=" + Arrays.ToString(segmentInfoPerCommit.GetFiles())); infoStream.Message("DWPT", "flushed codec=" + codec); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net/Index/IndexWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Index/IndexWriter.cs b/src/Lucene.Net/Index/IndexWriter.cs index 0c81ccb..0f7d3dc 100644 --- a/src/Lucene.Net/Index/IndexWriter.cs +++ b/src/Lucene.Net/Index/IndexWriter.cs @@ -3096,7 +3096,7 @@ namespace Lucene.Net.Index { foreach (SegmentCommitInfo sipc in infos) { - foreach (string file in sipc.Files()) + foreach (string file in sipc.GetFiles()) { try { @@ -3124,7 +3124,7 @@ namespace Lucene.Net.Index { foreach (SegmentCommitInfo sipc in infos) { - foreach (string file in sipc.Files()) + foreach (string file in sipc.GetFiles()) { try { @@ -3267,7 +3267,7 @@ namespace Lucene.Net.Index { if (stopMerges) { - deleter.DeleteNewFiles(infoPerCommit.Files()); + deleter.DeleteNewFiles(infoPerCommit.GetFiles()); return; } EnsureOpen(); @@ -3277,7 +3277,7 @@ namespace Lucene.Net.Index // Now create the compound file if needed if (useCompoundFile) { - ICollection<string> filesToDelete = infoPerCommit.Files(); + ICollection<string> filesToDelete = infoPerCommit.GetFiles(); try { CreateCompoundFile(infoStream, directory, CheckAbort.NONE, info, context); @@ -3393,7 +3393,7 @@ namespace Lucene.Net.Index // Build up new segment's file names. Must do this // before writing SegmentInfo: - foreach (string file in info.Files()) + foreach (string file in info.GetFiles()) { string newFileName; if (docStoreFiles3xOnly != null && docStoreFiles3xOnly.Contains(file)) @@ -3438,7 +3438,7 @@ namespace Lucene.Net.Index try { // Copy the segment's files - foreach (string file in info.Files()) + foreach (string file in info.GetFiles()) { string newFileName; if (docStoreFiles3xOnly != null && docStoreFiles3xOnly.Contains(file)) @@ -4388,7 +4388,7 @@ namespace Lucene.Net.Index // doing this makes MockDirWrapper angry in // TestNRTThreads (LUCENE-5434): readerPool.Drop(merge.info); - deleter.DeleteNewFiles(merge.info.Files()); + deleter.DeleteNewFiles(merge.info.GetFiles()); return false; } @@ -4455,7 +4455,7 @@ namespace Lucene.Net.Index { Debug.Assert(!segmentInfos.Contains(merge.info)); readerPool.Drop(merge.info); - deleter.DeleteNewFiles(merge.info.Files()); + deleter.DeleteNewFiles(merge.info.GetFiles()); } bool success_ = false; @@ -5121,7 +5121,7 @@ namespace Lucene.Net.Index { success = false; - ICollection<string> filesToRemove = merge.info.Files(); + ICollection<string> filesToRemove = merge.info.GetFiles(); try { @@ -5161,7 +5161,7 @@ namespace Lucene.Net.Index { deleter.DeleteFile(Lucene.Net.Index.IndexFileNames.SegmentFileName(mergedName, "", Lucene.Net.Index.IndexFileNames.COMPOUND_FILE_EXTENSION)); deleter.DeleteFile(Lucene.Net.Index.IndexFileNames.SegmentFileName(mergedName, "", Lucene.Net.Index.IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION)); - deleter.DeleteNewFiles(merge.info.Files()); + deleter.DeleteNewFiles(merge.info.GetFiles()); } } } @@ -5215,7 +5215,7 @@ namespace Lucene.Net.Index { lock (this) { - deleter.DeleteNewFiles(merge.info.Files()); + deleter.DeleteNewFiles(merge.info.GetFiles()); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net/Index/SegmentCommitInfo.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Index/SegmentCommitInfo.cs b/src/Lucene.Net/Index/SegmentCommitInfo.cs index e788d38..34c3f49 100644 --- a/src/Lucene.Net/Index/SegmentCommitInfo.cs +++ b/src/Lucene.Net/Index/SegmentCommitInfo.cs @@ -164,7 +164,7 @@ namespace Lucene.Net.Index if (sizeInBytes == -1) { long sum = 0; - foreach (string fileName in Files()) + foreach (string fileName in GetFiles()) { sum += Info.Dir.FileLength(fileName); } @@ -176,7 +176,7 @@ namespace Lucene.Net.Index /// <summary> /// Returns all files in use by this segment. </summary> - public virtual ICollection<string> Files() // LUCENENET TODO: API Rename GetFiles() + public virtual ICollection<string> GetFiles() { // Start from the wrapped info's files: ISet<string> files = new HashSet<string>(Info.GetFiles()); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/21097229/src/Lucene.Net/Index/SegmentInfos.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Index/SegmentInfos.cs b/src/Lucene.Net/Index/SegmentInfos.cs index 4eb63bf..51f866a 100644 --- a/src/Lucene.Net/Index/SegmentInfos.cs +++ b/src/Lucene.Net/Index/SegmentInfos.cs @@ -1175,7 +1175,7 @@ namespace Lucene.Net.Index Debug.Assert(info.Info.Dir == dir); if (info.Info.Dir == dir) { - files.UnionWith(info.Files()); + files.UnionWith(info.GetFiles()); } }
