Merge branch 'main' into replace-bitset-with-roaring

Author: ValentaTomas

packages/db/scripts/seed/postgres/seed-db.go

@@ -77,8 +77,46 @@ func main() {
 	}
 	defer authDb.Close()
 
-	// Open .e2b/config.json
-	// Delete existing user and recreate (simpler for seeding)
+	// Clean up existing data for idempotent re-seeding.
+	// Delete child rows that have ON DELETE NO ACTION constraints
+	// before deleting the team and user.
+	err = authDb.TestsRawSQL(ctx, `
+DELETE FROM envs WHERE team_id IN (SELECT id FROM teams WHERE email = $1)
+`, email)
+	if err != nil {
+		panic(err)
+	}
+
+	err = authDb.TestsRawSQL(ctx, `
+DELETE FROM snapshots WHERE team_id IN (SELECT id FROM teams WHERE email = $1)
+`, email)
+	if err != nil {
+		panic(err)
+	}
+
+	err = authDb.TestsRawSQL(ctx, `
+DELETE FROM volumes WHERE team_id IN (SELECT id FROM teams WHERE email = $1)
+`, email)
+	if err != nil {
+		panic(err)
+	}
+
+	err = authDb.TestsRawSQL(ctx, `
+DELETE FROM addons WHERE added_by IN (SELECT id FROM auth.users WHERE email = $1)
+`, email)
+	if err != nil {
+		panic(err)
+	}
+
+	// Now safe to delete team (team_api_keys, users_teams cascade automatically)
+	err = authDb.TestsRawSQL(ctx, `
+DELETE FROM teams WHERE email = $1
+`, email)
+	if err != nil {
+		panic(err)
+	}
+
+	// Now safe to delete user (access_tokens cascade automatically)
 	err = authDb.TestsRawSQL(ctx, `
 DELETE FROM auth.users WHERE email = $1
 `, email)
@@ -87,6 +125,10 @@ DELETE FROM auth.users WHERE email = $1
 	}
 
 	// Create the user
+	// NOTE: Inserting into auth.users fires the sync_inserts_to_public_users trigger,
+	// which inserts into public.users, which fires the post_user_signup trigger,
+	// which auto-creates a default team + users_teams row. We delete that
+	// trigger-created team below so we can create our own with a known ID/name.
 	userID := uuid.New()
 	err = authDb.TestsRawSQL(ctx, `
 INSERT INTO auth.users (id, email)
@@ -96,7 +138,8 @@ VALUES ($1, $2)
 		panic(err)
 	}
 
-	// Delete team
+	// Remove the team auto-created by the post_user_signup trigger so we can
+	// create our own seed team with a deterministic ID and custom name/slug.
 	err = authDb.TestsRawSQL(ctx, `
 DELETE FROM teams WHERE email = $1
 `, email)

packages/orchestrator/pkg/sandbox/nbd/dispatch.go

@@ -34,6 +34,14 @@ var (
 
 var ErrShuttingDown = errors.New("shutting down. Cannot serve any new requests")
 
+var dispatchBufPool = sync.Pool{
+	New: func() any {
+		b := make([]byte, dispatchBufferSize)
+
+		return &b
+	},
+}
+
 type Provider interface {
 	storage.SeekableReader
 	io.WriterAt
@@ -141,7 +149,9 @@ func (d *Dispatch) writeResponse(respError uint32, respHandle uint64, chunk []by
  *
  */
 func (d *Dispatch) Handle(ctx context.Context) error {
-	buffer := make([]byte, dispatchBufferSize)
+	poolBuf := dispatchBufPool.Get().(*[]byte)
+	defer dispatchBufPool.Put(poolBuf)
+	buffer := *poolBuf
 	wp := 0
 
 	request := Request{}