Merge pull request #1225 from lightninglabs/universe-sync-limit

multi: roll back change in request page size

Author: Roasbeef

cmd/tapcli/universe.go

@@ -321,7 +321,7 @@ func universeKeys(ctx *cli.Context) error {
 			ctxc, &unirpc.AssetLeafKeysRequest{
 				Id:     universeID,
 				Offset: int32(offset),
-				Limit:  universe.MaxPageSize,
+				Limit:  universe.RequestPageSize,
 			},
 		)
 
@@ -336,7 +336,7 @@ func universeKeys(ctx *cli.Context) error {
 		assetKeys.AssetKeys = append(
 			assetKeys.AssetKeys, tempKeys.AssetKeys...,
 		)
-		offset += universe.MaxPageSize
+		offset += universe.RequestPageSize
 	}
 
 	printRespJSON(assetKeys)

itest/assertions.go

@@ -1598,10 +1598,10 @@ func AssertUniverseRootsEqual(a, b *unirpc.AssetRootResponse) bool {
 func AssertUniverseStateEqual(t *testing.T, a, b unirpc.UniverseClient) bool {
 	ctxb := context.Background()
 
-	rootsA, err := assetRoots(ctxb, a, universe.MaxPageSize/100)
+	rootsA, err := assetRoots(ctxb, a, universe.RequestPageSize/100)
 	require.NoError(t, err)
 
-	rootsB, err := assetRoots(ctxb, b, universe.MaxPageSize/100)
+	rootsB, err := assetRoots(ctxb, b, universe.RequestPageSize/100)
 	require.NoError(t, err)
 
 	return AssertUniverseRootsEqual(rootsA, rootsB)

sample-tapd.conf

@@ -328,8 +328,8 @@
 ; universe.multiverse-caches.syncer-cache-pre-alloc-size=100000
 
 ; The size of the root node page cache for all requests that aren't served by
-; the syncer cache. (default: 327680)
-; universe.multiverse-caches.root-node-page-cache-size=327680
+; the syncer cache. (default: 10240)
+; universe.multiverse-caches.root-node-page-cache-size=10240
 
 
 [address]

tapdb/multiverse.go

@@ -446,7 +446,7 @@ func (b *MultiverseStore) RootNodes(ctx context.Context,
 		NumOffset:     q.Offset,
 		NumLimit: func() int32 {
 			if q.Limit == 0 {
-				return universe.MaxPageSize
+				return universe.RequestPageSize
 			}
 
 			return q.Limit
@@ -573,7 +573,7 @@ func (b *MultiverseStore) fillSyncerCache(ctx context.Context) error {
 	params := sqlc.UniverseRootsParams{
 		SortDirection: sqlInt16(universe.SortAscending),
 		NumOffset:     0,
-		NumLimit:      universe.MaxPageSize,
+		NumLimit:      universe.RequestPageSize,
 	}
 
 	allRoots := make(
@@ -586,9 +586,9 @@ func (b *MultiverseStore) fillSyncerCache(ctx context.Context) error {
 		}
 
 		allRoots = append(allRoots, newRoots...)
-		params.NumOffset += universe.MaxPageSize
+		params.NumOffset += universe.RequestPageSize
 
-		if len(newRoots) < universe.MaxPageSize {
+		if len(newRoots) < universe.RequestPageSize {
 			break
 		}
 	}

tapdb/multiverse_cache.go

@@ -63,7 +63,7 @@ func DefaultMultiverseCacheConfig() MultiverseCacheConfig {
 		LeavesPerUniverse:        50,
 		SyncerCacheEnabled:       false,
 		SyncerCachePreAllocSize:  100_000,
-		RootNodePageCacheSize:    20 * universe.MaxPageSize,
+		RootNodePageCacheSize:    20 * universe.RequestPageSize,
 	}
 }
 

tapdb/universe.go

@@ -723,7 +723,7 @@ func mintingKeys(ctx context.Context, dbTx BaseUniverseStore,
 			NumOffset:     q.Offset,
 			NumLimit: func() int32 {
 				if q.Limit == 0 {
-					return universe.MaxPageSize
+					return universe.RequestPageSize
 				}
 
 				return q.Limit

universe/interface.go

@@ -39,6 +39,13 @@ const (
 	// MaxPageSize is the maximum page size that can be used when querying
 	// for asset roots and leaves.
 	MaxPageSize = 16384
+
+	// RequestPageSize is the default page size that should be used when
+	// querying for asset roots and leaves.
+	//
+	// TODO(guggero): Bump this to the value of MaxPageSize once the
+	// universe servers have been updated to v0.5.0-rc1 or later.
+	RequestPageSize = 512
 )
 
 // IdentifierKey is the compact representation of a universe identifier that can

universe/syncer.go

@@ -16,7 +16,7 @@ import (
 )
 
 const (
-	defaultPageSize = int32(MaxPageSize)
+	defaultPageSize = int32(RequestPageSize)
 )
 
 var (