Unverified Commit c3697412 authored by Simon Esposito's avatar Simon Esposito Committed by GitHub
Browse files

Prefix storage index values with 'value.' (#1073)

parent 2d76ca29

server/storage_index.go

+3 −1
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ LIMIT $2` 
		if err != nil {

			return err

		}

		defer rows.Close()



		var rowsRead bool

		batch := bluge.NewBatch()
@@ -338,6 +339,7 @@ LIMIT $2` 


			doc, err := si.mapIndexStorageFields(dbUserID.String(), idx.Collection, dbKey, dbVersion, dbValue, idx.Fields, dbUpdateTime.Time)

			if err != nil {

				rows.Close()

				si.logger.Error("Failed to map storage object values to index", zap.Error(err))

				return err

			}
@@ -417,7 +419,7 @@ func (si *LocalStorageIndex) mapIndexStorageFields(userID, collection, key, vers 
	rv.AddField(bluge.NewKeywordField("user_id", userID).StoreValue())

	rv.AddField(bluge.NewKeywordField("version", version).StoreValue())



	BlugeWalkDocument(mapValue, []string{}, rv)

	BlugeWalkDocument(mapValue, []string{"value"}, rv)



	return rv, nil

}

server/storage_index_test.go

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ func TestLocalStorageIndex_Write(t *testing.T) { 
			t.Fatal(err.Error())

		}



		entries, err := storageIdx.List(ctx, indexName1, "+three:3", maxEntries1)

		entries, err := storageIdx.List(ctx, indexName1, "+value.three:3", maxEntries1)

		if err != nil {

			t.Fatal(err.Error())

		}
@@ -362,7 +362,7 @@ func TestLocalStorageIndex_List(t *testing.T) { 
			t.Fatal(err.Error())

		}



		entries, err := storageIdx.List(ctx, indexName, "one:1 three:3", 10)

		entries, err := storageIdx.List(ctx, indexName, "value.one:1 value.three:3", 10)

		if err != nil {

			t.Fatal(err.Error())

		}