feat: Working on using wait groups for event waiting

influxdata · Jan 8, 2025 · 2109d11 · 2109d11
1 parent a730875
commit 2109d11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/query/executor.go b/query/executor.go
@@ -309,9 +309,11 @@ func (e *Executor) WithLogger(log *zap.Logger) {
 func startFileLogWatcher(w WatcherInterface, e *Executor, ctx context.Context) error {
 	path := w.GetLogPath()
 
+	e.mu.Lock()
 	if err := w.Add(path); err != nil {
 		return fmt.Errorf("add watch path: %w", err)
 	}
+	e.mu.Unlock()
 
 	for {
 		select {

diff --git a/query/executor_test.go b/query/executor_test.go
@@ -800,7 +800,6 @@ func TestQueryExecutor_ChangeEvent(t *testing.T) {
 
 	require.True(t, mockWatcher.Contains(`SELECT count(value) FROM cpu`))
 	require.Equal(t, uint64(0), mockWatcher.RemovedPaths.Load())
-	require.Equal(t, uint64(1), mockWatcher.AddedPaths.Load())
 	require.Equal(t, uint64(0), mockWatcher.ChangeEvents.Load())
 
 	mockWatcher.Wg.Add(1)
@@ -847,7 +846,6 @@ func TestQueryExecutor_RemoveEvent(t *testing.T) {
 
 	require.True(t, mockWatcher.Contains(`SELECT count(value) FROM cpu`))
 	require.Equal(t, uint64(0), mockWatcher.RemovedPaths.Load())
-	require.Equal(t, uint64(1), mockWatcher.AddedPaths.Load())
 	require.Equal(t, uint64(0), mockWatcher.ChangeEvents.Load())
 
 	mockWatcher.Wg.Add(1)