Skip to content

Fix N+1 Query Issue in Vets Endpoint-created-by-agentic #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix N+1 Query Issue in Vets Endpoint-created-by-agentic #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de49be7
feat: optimize vet repository with fetch join queries
shaykeren Jul 24, 2025
9da5302
perf: optimize Vet entity with lazy loading and batch size for specia…
shaykeren Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/main/java/org/springframework/samples/petclinic/vet/Vet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@

import org.springframework.beans.support.MutableSortDefinition;
import org.springframework.beans.support.PropertyComparator;
import org.springframework.samples.petclinic.model.Person;

import jakarta.persistence.Entity;
import org.springframework.samples.petclinic.model.Person;import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.JoinTable;
Expand All @@ -42,10 +40,10 @@
* @author Arjen Poutsma
*/
@Entity
@Table(name = "vets")
public class Vet extends Person {
@Table(name = "vets")public class Vet extends Person {

@ManyToMany(fetch = FetchType.EAGER)
@ManyToMany(fetch = FetchType.LAZY)
@BatchSize(size = 100)
@JoinTable(name = "vet_specialties", joinColumns = @JoinColumn(name = "vet_id"),
inverseJoinColumns = @JoinColumn(name = "specialty_id"))
private Set<Specialty> specialties;
Expand Down Expand Up @@ -76,4 +74,4 @@ public void addSpecialty(Specialty specialty) {
getSpecialtiesInternal().add(specialty);
}

}
}
70 changes: 47 additions & 23 deletions src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
import org.springframework.dao.DataAccessException;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.Repository;
import org.springframework.transaction.annotation.Transactional;

import java.util.Collection;
import java.util.Collection;import java.util.Collection;

/**
* Repository class for <code>Vet</code> domain objects All method names are compliant
Expand All @@ -34,25 +35,48 @@
* @author Juergen Hoeller
* @author Sam Brannen
* @author Michael Isvy
*/
public interface VetRepository extends Repository<Vet, Integer> {

/**
* Retrieve all <code>Vet</code>s from the data store.
* @return a <code>Collection</code> of <code>Vet</code>s
*/
@Transactional(readOnly = true)
@Cacheable("vets")
Collection<Vet> findAll() throws DataAccessException;

/**
* Retrieve all <code>Vet</code>s from data store in Pages
* @param pageable
* @return
* @throws DataAccessException
*/
@Transactional(readOnly = true)
@Cacheable("vets")
Page<Vet> findAll(Pageable pageable) throws DataAccessException;

}
*/public interface VetRepository extends Repository<Vet, Integer> {

/**
* Retrieve all <code>Vet</code>s from the data store.
* @return a <code>Collection</code> of <code>Vet</code>s
*/
@Query("SELECT DISTINCT vet FROM Vet vet LEFT JOIN FETCH vet.specialties")
@Transactional(readOnly = true)
@Cacheable("vets")
Collection<Vet> findAll() throws DataAccessException;

/**
* Retrieve all <code>Vet</code>s with specialties from the data store.
* @return a <code>Collection</code> of <code>Vet</code>s
*/
@Query("SELECT DISTINCT vet FROM Vet vet LEFT JOIN FETCH vet.specialties")
@Transactional(readOnly = true)
@Cacheable("vets")
Collection<Vet> findAllWithSpecialties() throws DataAccessException;

/**
* Retrieve all <code>Vet</code>s from data store in Pages
* @param pageable
* @return
* @throws DataAccessException
*/
@Query(value = "SELECT DISTINCT vet FROM Vet vet LEFT JOIN FETCH vet.specialties",
countQuery = "SELECT COUNT(DISTINCT vet) FROM Vet vet")
@Transactional(readOnly = true)
@Cacheable("vets")
Page<Vet> findAll(Pageable pageable) throws DataAccessException;

/**
* Retrieve all <code>Vet</code>s with specialties from data store in Pages
* @param pageable
* @return
* @throws DataAccessException
*/
@Query(value = "SELECT DISTINCT vet FROM Vet vet LEFT JOIN FETCH vet.specialties",
countQuery = "SELECT COUNT(DISTINCT vet) FROM Vet vet")
@Transactional(readOnly = true)
@Cacheable("vets")
Page<Vet> findAllWithSpecialties(Pageable pageable) throws DataAccessException;

}