TeamPiped-mirror/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2024-08-14 23:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace left joins with inner joins.

Browse source
This commit is contained in:
FireMasterK 2022-02-24 11:52:05 +00:00
parent 79b00f52e5
commit 5aed4c189d
No known key found for this signature in database
GPG key ID: 49451E4482CC5BCD
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/me/kavin/piped/utils/DatabaseHelper.java
View file

@ -1,18 +1,16 @@
package me.kavin.piped.utils; package me.kavin.piped.utils;
import java.util.List;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Root;
import org.hibernate.Session;
import me.kavin.piped.utils.obj.db.Channel; import me.kavin.piped.utils.obj.db.Channel;
import me.kavin.piped.utils.obj.db.PubSub; import me.kavin.piped.utils.obj.db.PubSub;
import me.kavin.piped.utils.obj.db.User; import me.kavin.piped.utils.obj.db.User;
import me.kavin.piped.utils.obj.db.Video; import me.kavin.piped.utils.obj.db.Video;
import org.hibernate.Session;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Root;
import java.util.List;
public class DatabaseHelper { public class DatabaseHelper {
@ -29,7 +27,7 @@ public class DatabaseHelper {
CriteriaBuilder cb = s.getCriteriaBuilder(); CriteriaBuilder cb = s.getCriteriaBuilder();
CriteriaQuery<User> cr = cb.createQuery(User.class); CriteriaQuery<User> cr = cb.createQuery(User.class);
Root<User> root = cr.from(User.class); Root<User> root = cr.from(User.class);
root.fetch("subscribed_ids", JoinType.LEFT); root.fetch("subscribed_ids", JoinType.INNER);
cr.select(root).where(root.get("sessionId").in(session)); cr.select(root).where(root.get("sessionId").in(session));
return s.createQuery(cr).uniqueResult(); return s.createQuery(cr).uniqueResult();
@ -57,7 +55,7 @@ public class DatabaseHelper {
CriteriaBuilder cb = s.getCriteriaBuilder(); CriteriaBuilder cb = s.getCriteriaBuilder();
CriteriaQuery<Video> cr = cb.createQuery(Video.class); CriteriaQuery<Video> cr = cb.createQuery(Video.class);
Root<Video> root = cr.from(Video.class); Root<Video> root = cr.from(Video.class);
root.fetch("channel", JoinType.LEFT); root.fetch("channel", JoinType.INNER);
cr.select(root).where(root.get("channel").get("uploader_id").in(id)); cr.select(root).where(root.get("channel").get("uploader_id").in(id));
return s.createQuery(cr).getResultList(); return s.createQuery(cr).getResultList();

4
src/main/java/me/kavin/piped/utils/ResponseHelper.java
View file

@ -736,7 +736,7 @@ public class ResponseHelper {
criteria.distinct(true); criteria.distinct(true);
var root = criteria.from(Video.class); var root = criteria.from(Video.class);
var userRoot = criteria.from(User.class); var userRoot = criteria.from(User.class);
root.fetch("channel", JoinType.LEFT); root.fetch("channel", JoinType.INNER);
criteria.select(root) criteria.select(root)
.where(cb.and( .where(cb.and(
@ -792,7 +792,7 @@ public class ResponseHelper {
criteria.distinct(true); criteria.distinct(true);
var root = criteria.from(Video.class); var root = criteria.from(Video.class);
var userRoot = criteria.from(User.class); var userRoot = criteria.from(User.class);
root.fetch("channel", JoinType.LEFT); root.fetch("channel", JoinType.INNER);
criteria.select(root) criteria.select(root)
.where(cb.and( .where(cb.and(