limit whole query

Author: rverdile

internal/test/integration/rpm_test.go

@@ -8,6 +8,8 @@ import (
 	"github.com/content-services/tang/internal/config"
 	"github.com/content-services/tang/internal/zestwrapper"
 	"github.com/content-services/tang/pkg/tangy"
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
@@ -68,7 +70,7 @@ func TestRpmSuite(t *testing.T) {
 		Port:     dbConfig.Port,
 		User:     dbConfig.User,
 		Password: dbConfig.Password,
-	}, tangy.Logger{})
+	}, tangy.Logger{Enabled: true, Logger: &log.Logger, LogLevel: zerolog.LevelDebugValue})
 	require.NoError(t, err)
 
 	r := RpmSuite{}
@@ -122,6 +124,21 @@ func (r *RpmSuite) TestRpmRepositoryVersionPackageSearch() {
 	assert.Equal(r.T(), search[0].Name, "bear")
 	assert.Equal(r.T(), search[1].Name, "camel")
 
+	// Create third repository version to remove new package
+	r.UpdateTestRepository(r.T(), testRepoURL)
+	resp, err = r.client.GetRpmRepositoryByName(r.domainName, testRepoName)
+	require.NoError(r.T(), err)
+	thirdVersionHref := resp.LatestVersionHref
+	require.NotNil(r.T(), thirdVersionHref)
+
+	// Search third repository version, should not have new package
+	search, err = r.tangy.RpmRepositoryVersionPackageSearch(context.Background(), []string{*thirdVersionHref}, "bea", 100)
+	assert.NoError(r.T(), err)
+	assert.Equal(r.T(), search[0].Name, "bear")
+	search, err = r.tangy.RpmRepositoryVersionPackageSearch(context.Background(), []string{*thirdVersionHref}, "cam", 100)
+	assert.NoError(r.T(), err)
+	assert.Empty(r.T(), search)
+
 	// Test search limit
 	search, err = r.tangy.RpmRepositoryVersionPackageSearch(context.Background(), []string{*secondVersionHref}, "a", 1)
 	assert.NoError(r.T(), err)

pkg/tangy/rpm.go

@@ -34,26 +34,25 @@ func (t *tangyImpl) RpmRepositoryVersionPackageSearch(ctx context.Context, hrefs
 		return nil, fmt.Errorf("error parsing repository version hrefs: %w", err)
 	}
 
-	var query string
+	query := `SELECT DISTINCT ON (rp.name) rp.name, rp.summary
+              FROM rpm_package rp WHERE rp.content_ptr_id IN (`
 	for i := 0; i < len(repositoryIDs); i++ {
 		id := repositoryIDs[i]
 		ver := versions[i]
 
 		query += fmt.Sprintf(`
-			SELECT DISTINCT ON (rp.name) rp.name, rp.summary
-		    FROM rpm_package rp
-		    WHERE rp.content_ptr_id IN (
+			(
     		    SELECT crc.content_id
     		    FROM core_repositorycontent crc
     		    INNER JOIN core_repositoryversion crv ON (crc.version_added_id = crv.pulp_id)
     		    LEFT OUTER JOIN core_repositoryversion crv2 ON (crc.version_removed_id = crv2.pulp_id)
     		    WHERE crv.repository_id = '%v' AND crv.number <= %v AND NOT (crv2.number <= %v AND crv2.number IS NOT NULL)
-				AND rp.name ILIKE CONCAT( '%%', '%v'::text, '%%') ORDER BY rp.name ASC LIMIT %v
+				AND rp.name ILIKE CONCAT( '%%', '%v'::text, '%%')
             )
-		`, id, ver, ver, search, limit)
+		`, id, ver, ver, search)
 
 		if i == len(repositoryIDs)-1 {
-			query += ";"
+			query += fmt.Sprintf(") ORDER BY rp.name ASC LIMIT %v;", limit)
 			break
 		}