add linear search

Author: christso

GitContentSearch.Tests/GitContentSearcherTests.cs

@@ -30,7 +30,7 @@ public void SearchContent_ShouldLogFirstAndLastAppearance_Correctly()
             using (var stringWriter = new StringWriter())
             {
                 // Act
-                var gitContentSearcher = new GitContentSearcher(gitHelperMock.Object, fileSearcherMock.Object, new FileManager(), logWriter: stringWriter);
+                var gitContentSearcher = new GitContentSearcher(gitHelperMock.Object, fileSearcherMock.Object, new FileManager(), disableLinearSearch: true, logWriter: stringWriter);
                 gitContentSearcher.SearchContent("dummy/path.txt", "search string");
 
                 // Assert
@@ -60,7 +60,7 @@ public void SearchContent_ShouldLogCorrectly_WhenStringNotFound()
             using (var stringWriter = new StringWriter())
             {
                 // Act
-                var gitContentSearcher = new GitContentSearcher(gitHelperMock.Object, fileSearcherMock.Object, new FileManager(), logWriter: stringWriter);
+                var gitContentSearcher = new GitContentSearcher(gitHelperMock.Object, fileSearcherMock.Object, new FileManager(), disableLinearSearch: true, logWriter: stringWriter);
                 gitContentSearcher.SearchContent("dummy/path.txt", "search string");
 
                 // Assert
@@ -93,7 +93,7 @@ public void SearchContent_ShouldLogCorrectly_WhenStringAppearsInSingleCommit()
             using (var stringWriter = new StringWriter())
             {
                 // Act
-                var gitContentSearcher = new GitContentSearcher(gitHelperMock.Object, fileSearcherMock.Object, new FileManager(), logWriter: stringWriter);
+                var gitContentSearcher = new GitContentSearcher(gitHelperMock.Object, fileSearcherMock.Object, new FileManager(), disableLinearSearch: true, logWriter: stringWriter);
                 gitContentSearcher.SearchContent("dummy/path.txt", "search string");
 
                 // Assert
@@ -132,7 +132,7 @@ public void SearchContent_ShouldRestrictSearchToSpecifiedCommitRange()
             using (var stringWriter = new StringWriter())
             {
                 // Act
-                var gitContentSearcher = new GitContentSearcher(gitHelperMock.Object, fileSearcherMock.Object, new FileManager(), logWriter: stringWriter);
+                var gitContentSearcher = new GitContentSearcher(gitHelperMock.Object, fileSearcherMock.Object, new FileManager(), disableLinearSearch: true, logWriter: stringWriter);
                 gitContentSearcher.SearchContent("dummy/path.txt", "search string", "commit2", "commit3");
 
                 // Assert
@@ -168,7 +168,7 @@ public void SearchContent_ShouldLogError_WhenEarliestCommitIsMoreRecentThanLates
             using (var stringWriter = new StringWriter())
             {
                 // Act
-                var gitContentSearcher = new GitContentSearcher(gitHelperMock.Object, fileSearcherMock.Object, new FileManager(), logWriter: stringWriter);
+                var gitContentSearcher = new GitContentSearcher(gitHelperMock.Object, fileSearcherMock.Object, new FileManager(), disableLinearSearch: true, logWriter: stringWriter);
                 gitContentSearcher.SearchContent("dummy/path.txt", "search string", "commit4", "commit3");
 
                 // Assert

GitContentSearch/GitContentSearcher.cs

@@ -8,12 +8,14 @@ public class GitContentSearcher : IGitContentSearcher
         private readonly IFileSearcher _fileSearcher;
         private readonly IFileManager _fileManager;
         private readonly TextWriter _logWriter;
+        private readonly bool _disableLinearSearch;
 
-        public GitContentSearcher(IGitHelper gitHelper, IFileSearcher fileSearcher, IFileManager fileManager, TextWriter? logWriter = null)
+        public GitContentSearcher(IGitHelper gitHelper, IFileSearcher fileSearcher, IFileManager fileManager, bool disableLinearSearch, TextWriter? logWriter = null)
         {
             _gitHelper = gitHelper;
             _fileSearcher = fileSearcher;
             _fileManager = fileManager;
+            _disableLinearSearch = disableLinearSearch;
             _logWriter = logWriter ?? new CompositeTextWriter(
                 Console.Out,
                 new StreamWriter("search_log.txt", append: true)
@@ -79,6 +81,17 @@ private int FindFirstMatchIndex(string[] commits, string filePath, string search
                 }
                 else
                 {
+                    if (!_disableLinearSearch)
+                    {
+                        // Use the linear search helper
+                        int? linearSearchResult = PerformLinearSearch(commits, filePath, searchString, left, mid - 1);
+                        if (linearSearchResult.HasValue)
+                        {
+                            firstMatchIndex = linearSearchResult;
+                            break;
+                        }
+                    }
+
                     left = mid + 1;
                 }
 
@@ -133,6 +146,44 @@ private int FindLastMatchIndex(string[] commits, string filePath, string searchS
             return lastMatchIndex ?? -1;
         }
 
+        private int? PerformLinearSearch(string[] commits, string filePath, string searchString, int left, int right)
+        {
+            int? matchIndex = null;
+
+            for (int i = left; i <= right; i++)
+            {
+                string commit = commits[i];
+                string tempFileName = _fileManager.GenerateTempFileName(commit, filePath);
+                string commitTime = GetCommitTime(commit);
+
+                bool gitShowSuccess = false;
+                try
+                {
+                    _gitHelper.RunGitShow(commit, filePath, tempFileName);
+                    gitShowSuccess = true;
+                }
+                catch (Exception ex)
+                {
+                    _logWriter.WriteLine($"Error retrieving file at commit {commit}: {ex.Message}");
+                }
+
+                bool found = gitShowSuccess && _fileSearcher.SearchInFile(tempFileName, searchString);
+
+                _logWriter.WriteLine($"Linear search commit: {commit} at {commitTime}, found: {found}");
+                _logWriter.Flush();
+
+                if (found)
+                {
+                    matchIndex = i; // Update matchIndex when a match is found
+                    break; // Stop search on first match (can be modified for last match)
+                }
+
+                _fileManager.DeleteTempFile(tempFileName);
+            }
+
+            return matchIndex;
+        }
+
         private string GetCommitTime(string commit)
         {
             try

GitContentSearch/Program.cs

@@ -17,6 +17,7 @@ static void Main(string[] args)
             string searchString = args[1];
             string earliestCommit = "";
             string latestCommit = "";
+            bool disableLinearSearch = false;
             string? workingDirectory = null;
             string? logDirectory = null;
 
@@ -39,6 +40,10 @@ static void Main(string[] args)
                 {
                     logDirectory = arg.Replace("--log-directory=", "");
                 }
+                else if (arg == "--disable-linear-search")
+                {
+                    disableLinearSearch = true;
+                }
             }
 
             if (string.IsNullOrEmpty(workingDirectory))
@@ -72,7 +77,7 @@ static void Main(string[] args)
                 var gitHelper = new GitHelper(processWrapper, workingDirectory);
                 var fileSearcher = new FileSearcher();
                 var fileManager = new FileManager(logAndTempFileDirectory);
-                var gitContentSearcher = new GitContentSearcher(gitHelper, fileSearcher, fileManager, logWriter);
+                var gitContentSearcher = new GitContentSearcher(gitHelper, fileSearcher, fileManager, disableLinearSearch, logWriter);
 
                 gitContentSearcher.SearchContent(filePath, searchString, earliestCommit, latestCommit);