isolate index build logic

TykTechnologies · Nov 23, 2024 · 44e8d11 · 44e8d11
1 parent 913eb63
commit 44e8d11
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/pumps/sql.go b/pumps/sql.go
@@ -110,6 +110,18 @@ var (
 	SQLPrefix                = "SQL-pump"
 	SQLDefaultENV            = PUMPS_ENV_PREFIX + "_SQL" + PUMPS_ENV_META_PREFIX
 	SQLDefaultQueryBatchSize = 1000
+
+	indexes = []struct {
+		baseName string
+		columns  string
+	}{
+		{"idx_responsecode", "responsecode"},
+		{"idx_apikey", "apikey"},
+		{"idx_timestamp", "timestamp"},
+		{"idx_apiid", "apiid"},
+		{"idx_orgid", "orgid"},
+		{"idx_oauthid", "oauthid"},
+	}
 )
 
 func (c *SQLPump) New() Pump {
@@ -358,25 +370,17 @@ func (c *SQLPump) WriteUptimeData(data []interface{}) {
 	c.log.Debug("Purged ", len(data), " records...")
 }
 
+func (c *SQLPump) buildIndexName(baseIndexName string, tableName string) string {
+	return fmt.Sprintf("%s_%s", tableName, baseIndexName)
+}
+
 func (c *SQLPump) ensureIndex(tableName string, background bool) error {
 	if !c.db.Migrator().HasTable(tableName) {
 		return errors.New("cannot create indexes as table doesn't exist: " + tableName)
 	}
 
-	indexes := []struct {
-		baseName string
-		columns  string
-	}{
-		{"idx_responsecode", "responsecode"},
-		{"idx_apikey", "apikey"},
-		{"idx_timestamp", "timestamp"},
-		{"idx_apiid", "apiid"},
-		{"idx_orgid", "orgid"},
-		{"idx_oauthid", "oauthid"},
-	}
-
 	createIndexFn := func(indexBaseName, columns string) error {
-		indexName := tableName + "_" + indexBaseName
+		indexName := c.buildIndexName(indexBaseName, columns)
 		option := ""
 		if c.dbType == "postgres" {
 			option = "CONCURRENTLY"

diff --git a/pumps/sql_test.go b/pumps/sql_test.go
@@ -364,7 +364,7 @@ func TestDecodeRequestAndDecodeResponseSQL(t *testing.T) {
 	assert.False(t, newPump.GetDecodedResponse())
 }
 
-func TestEnsureIndexSQL(t *testing.T) {
+func TestEnsureIndexSQL1(t *testing.T) {
 	//nolint:govet
 	tcs := []struct {
 		testName             string
@@ -425,6 +425,10 @@ func TestEnsureIndexSQL(t *testing.T) {
 	for _, tc := range tcs {
 		t.Run(tc.testName, func(t *testing.T) {
 			pmp := tc.pmpSetupFn(tc.givenTableName)
+			defer func() {
+				pmp.db.Migrator().DropTable(tc.givenTableName)
+			}()
+
 			assert.NotNil(t, pmp)
 
 			actualErr := pmp.ensureIndex(tc.givenTableName, tc.givenRunInBackground)
@@ -434,7 +438,7 @@ func TestEnsureIndexSQL(t *testing.T) {
 					// wait for the background index creation to finish
 					<-pmp.backgroundIndexCreated
 				} else {
-					indexName := tc.givenTableName + "_idx_apiid"
+					indexName := pmp.buildIndexName("idx_apiid", tc.givenTableName)
 					hasIndex := pmp.db.Table(tc.givenTableName).Migrator().HasIndex(tc.givenTableName, indexName)
 					assert.Equal(t, tc.shouldHaveIndex, hasIndex)
 				}