Remove Custom Logic For Archive Querying

Signed-off-by: Mahad Zaryab <[email protected]>
jaegertracing · Nov 8, 2024 · ecc679f · ecc679f
1 parent 7f87200
commit ecc679f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/plugin/storage/es/spanstore/reader.go b/plugin/storage/es/spanstore/reader.go
@@ -139,7 +139,7 @@ func NewSpanReader(p SpanReaderParams) *SpanReader {
 			p.Logger,
 			getTimeRangeIndexFn(p.Archive, p.UseReadWriteAliases, p.RemoteReadClusters),
 		),
-		sourceFn:            getSourceFn(p.Archive, p.MaxDocCount),
+		sourceFn:            getSourceFn(p.MaxDocCount),
 		maxDocCount:         p.MaxDocCount,
 		useReadWriteAliases: p.UseReadWriteAliases,
 		logger:              p.Logger,
@@ -202,16 +202,13 @@ func addRemoteReadClusters(fn timeRangeIndexFn, remoteReadClusters []string) tim
 	}
 }
 
-func getSourceFn(archive bool, maxDocCount int) sourceFn {
+func getSourceFn(maxDocCount int) sourceFn {
 	return func(query elastic.Query, nextTime uint64) *elastic.SearchSource {
-		s := elastic.NewSearchSource().
+		return elastic.NewSearchSource().
 			Query(query).
-			Size(maxDocCount)
-		if !archive {
-			s.Sort("startTime", true).
-				SearchAfter(nextTime)
-		}
-		return s
+			Size(maxDocCount).
+			Sort("startTime", true).
+			SearchAfter(nextTime)
 	}
 }
 

diff --git a/plugin/storage/es/spanstore/reader_test.go b/plugin/storage/es/spanstore/reader_test.go
@@ -1339,7 +1339,7 @@ func TestBuildTraceByIDQuery(t *testing.T) {
 }
 
 func TestTerminateAfterNotSet(t *testing.T) {
-	srcFn := getSourceFn(false, 99)
+	srcFn := getSourceFn(99)
 	searchSource := srcFn(elastic.NewMatchAllQuery(), 1)
 	sp, err := searchSource.Source()
 	require.NoError(t, err)