owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove unnecessary joins

Browse Source
This commit is contained in:
emeric
2023-11-02 17:18:44 +01:00
parent 8b35e61c7d
commit 2acba9d0cc
3 changed files with 518 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/services/database/impl/Release.cpp
+1 -2
View File
@@ -125,13 +125,12 @@ namespace Database
std::ostringstream oss;
oss << "r.id IN (SELECT DISTINCT r.id FROM release r"
" INNER JOIN track t ON t.release_id = r.id"
" INNER JOIN cluster c ON c.id = t_c.cluster_id"
" INNER JOIN track_cluster t_c ON t_c.track_id = t.id";
WhereClause clusterClause;
for (const ClusterId clusterId : params.clusters)
{
clusterClause.Or(WhereClause("c.id = ?"));
clusterClause.Or(WhereClause("t_c.cluster_id = ?"));
query.bind(clusterId);
}
src/libs/services/database/impl/Track.cpp
+125 -151
View File
@@ -35,15 +35,15 @@
#include "StringViewTraits.hpp"
#include "Utils.hpp"
namespace Database {
static
Wt::Dbo::Query<TrackId>
createQuery(Session& session, const Track::FindParameters& params)
namespace Database
{
namespace
{
Wt::Dbo::Query<TrackId> createQuery(Session& session, const Track::FindParameters& params)
{
session.checkSharedLocked();
auto query {session.getDboSession().query<TrackId>(params.distinct ? "SELECT DISTINCT t.id FROM track t" : "SELECT t.id FROM track t")};
auto query{ session.getDboSession().query<TrackId>(params.distinct ? "SELECT DISTINCT t.id FROM track t" : "SELECT t.id FROM track t") };
assert(params.keywords.empty() || params.name.empty());
for (std::string_view keyword : params.keywords)
@@ -68,13 +68,12 @@ createQuery(Session& session, const Track::FindParameters& params)
{
std::ostringstream oss;
oss << "t.id IN (SELECT DISTINCT t.id FROM track t"
" INNER JOIN track_cluster t_c ON t_c.track_id = t.id"
" INNER JOIN cluster c ON c.id = t_c.cluster_id";
" INNER JOIN track_cluster t_c ON t_c.track_id = t.id";
WhereClause clusterClause;
for (const ClusterId clusterId : params.clusters)
{
clusterClause.Or(WhereClause("c.id = ?"));
clusterClause.Or(WhereClause("t_c.cluster_id = ?"));
query.bind(clusterId);
}
@@ -98,7 +97,7 @@ createQuery(Session& session, const Track::FindParameters& params)
{
std::ostringstream oss;
bool first {true};
bool first{ true };
for (TrackArtistLinkType linkType : params.trackArtistLinkTypes)
{
if (!first)
@@ -162,87 +161,81 @@ createQuery(Session& session, const Track::FindParameters& params)
}
return query;
}
}
}
Track::Track(const std::filesystem::path& p)
: _filePath {p.string()}
{
}
Track::Track(const std::filesystem::path& p)
: _filePath{ p.string() }
{
}
Track::pointer
Track::create(Session& session, const std::filesystem::path& p)
{
return session.getDboSession().add(std::unique_ptr<Track> {new Track {p}});
}
Track::pointer Track::create(Session& session, const std::filesystem::path& p)
{
return session.getDboSession().add(std::unique_ptr<Track> {new Track{ p }});
}
std::size_t
Track::getCount(Session& session)
{
std::size_t
Track::getCount(Session& session)
{
session.checkSharedLocked();
return session.getDboSession().query<int>("SELECT COUNT(*) FROM track");
}
}
Track::pointer
Track::findByPath(Session& session, const std::filesystem::path& p)
{
Track::pointer Track::findByPath(Session& session, const std::filesystem::path& p)
{
session.checkSharedLocked();
return session.getDboSession().find<Track>().where("file_path = ?").bind(p.string()).resultValue();
}
}
Track::pointer
Track::find(Session& session, TrackId id)
{
Track::pointer Track::find(Session& session, TrackId id)
{
session.checkSharedLocked();
return session.getDboSession().find<Track>()
.where("id = ?").bind(id)
.resultValue();
}
}
bool
Track::exists(Session& session, TrackId id)
{
bool Track::exists(Session& session, TrackId id)
{
session.checkSharedLocked();
return session.getDboSession().query<int>("SELECT 1 from track").where("id = ?").bind(id).resultValue() == 1;
}
}
std::vector<Track::pointer>
Track::findByMBID(Session& session, const UUID& mbid)
{
std::vector<Track::pointer> Track::findByMBID(Session& session, const UUID& mbid)
{
session.checkSharedLocked();
auto res {session.getDboSession().find<Track>()
auto res{ session.getDboSession().find<Track>()
.where("mbid = ?").bind(std::string {mbid.getAsString()})
.resultList()};
.resultList() };
return std::vector<Track::pointer>(res.begin(), res.end());
}
}
std::vector<Track::pointer>
Track::findByRecordingMBID(Session& session, const UUID& mbid)
{
std::vector<Track::pointer> Track::findByRecordingMBID(Session& session, const UUID& mbid)
{
session.checkSharedLocked();
auto res {session.getDboSession().find<Track>()
auto res{ session.getDboSession().find<Track>()
.where("recording_mbid = ?").bind(std::string {mbid.getAsString()})
.resultList()};
.resultList() };
return std::vector<Track::pointer>(res.begin(), res.end());
}
}
RangeResults<Track::PathResult>
Track::findPaths(Session& session, Range range)
{
RangeResults<Track::PathResult> Track::findPaths(Session& session, Range range)
{
using QueryResultType = std::tuple<TrackId, std::string>;
session.checkSharedLocked();
// TODO Dbo traits on filesystem
auto query {session.getDboSession().query<QueryResultType>("SELECT id, file_path FROM track")};
auto query{ session.getDboSession().query<QueryResultType>("SELECT id, file_path FROM track") };
RangeResults<QueryResultType> queryResults {Utils::execQuery(query, range)};
RangeResults<QueryResultType> queryResults{ Utils::execQuery(query, range) };
RangeResults<PathResult> res;
res.range = queryResults.range;
@@ -252,85 +245,79 @@ Track::findPaths(Session& session, Range range)
std::transform(std::cbegin(queryResults.results), std::cend(queryResults.results), std::back_inserter(res.results),
[](const QueryResultType& queryResult)
{
return PathResult {std::get<0>(queryResult), std::get<1>(queryResult)};
return PathResult{ std::get<0>(queryResult), std::get<1>(queryResult) };
});
return res;
}
}
RangeResults<TrackId>
Track::findTrackMBIDDuplicates(Session& session, Range range)
{
RangeResults<TrackId> Track::findTrackMBIDDuplicates(Session& session, Range range)
{
session.checkSharedLocked();
auto query {session.getDboSession().query<TrackId>( "SELECT track.id FROM track WHERE mbid in (SELECT mbid FROM track WHERE mbid <> '' GROUP BY mbid HAVING COUNT (*) > 1)")
.orderBy("track.release_id,track.disc_number,track.track_number,track.mbid")};
auto query{ session.getDboSession().query<TrackId>("SELECT track.id FROM track WHERE mbid in (SELECT mbid FROM track WHERE mbid <> '' GROUP BY mbid HAVING COUNT (*) > 1)")
.orderBy("track.release_id,track.disc_number,track.track_number,track.mbid") };
return Utils::execQuery(query, range);
}
}
RangeResults<TrackId>
Track::findWithRecordingMBIDAndMissingFeatures(Session& session, Range range)
{
RangeResults<TrackId> Track::findWithRecordingMBIDAndMissingFeatures(Session& session, Range range)
{
session.checkSharedLocked();
auto query {session.getDboSession().query<TrackId>("SELECT t.id FROM track t")
auto query{ session.getDboSession().query<TrackId>("SELECT t.id FROM track t")
.where("LENGTH(t.recording_mbid) > 0")
.where("NOT EXISTS (SELECT * FROM track_features t_f WHERE t_f.track_id = t.id)")};
.where("NOT EXISTS (SELECT * FROM track_features t_f WHERE t_f.track_id = t.id)") };
return Utils::execQuery(query, range);
}
}
std::vector<Cluster::pointer>
Track::getClusters() const
{
std::vector<Cluster::pointer> Track::getClusters() const
{
return std::vector<Cluster::pointer>(_clusters.begin(), _clusters.end());
}
}
std::vector<ClusterId>
Track::getClusterIds() const
{
std::vector<ClusterId> Track::getClusterIds() const
{
assert(session());
auto res {session()->query<ClusterId>
auto res{ session()->query<ClusterId>
("SELECT DISTINCT c.id FROM cluster c INNER JOIN track_cluster t_c ON t_c.cluster_id = c.id INNER JOIN track t ON t.id = t_c.track_id")
.where("t.id = ?").bind(getId())
.resultList()};
.resultList() };
return std::vector<ClusterId>(res.begin(), res.end());
}
}
RangeResults<TrackId>
Track::find(Session& session, const FindParameters& parameters)
{
RangeResults<TrackId> Track::find(Session& session, const FindParameters& parameters)
{
session.checkSharedLocked();
auto query {createQuery(session, parameters)};
auto query{ createQuery(session, parameters) };
return Utils::execQuery(query, parameters.range);
}
}
RangeResults<TrackId>
Track::findSimilarTracks(Session& session, const std::vector<TrackId>& tracks, Range range)
{
RangeResults<TrackId> Track::findSimilarTracks(Session& session, const std::vector<TrackId>& tracks, Range range)
{
assert(!tracks.empty());
session.checkSharedLocked();
std::ostringstream oss;
for (std::size_t i {}; i < tracks.size(); ++i)
for (std::size_t i{}; i < tracks.size(); ++i)
{
if (!oss.str().empty())
oss << ", ";
oss << "?";
}
auto query {session.getDboSession().query<TrackId>(
auto query{ session.getDboSession().query<TrackId>(
"SELECT t.id FROM track t"
" INNER JOIN track_cluster t_c ON t_c.track_id = t.id"
" AND t_c.cluster_id IN (SELECT DISTINCT c.id FROM cluster c INNER JOIN track_cluster t_c ON t_c.cluster_id = c.id WHERE t_c.track_id IN (" + oss.str() + "))"
" AND t.id NOT IN (" + oss.str() + ")")
.groupBy("t.id")
.orderBy("COUNT(*) DESC, RANDOM()")};
.orderBy("COUNT(*) DESC, RANDOM()") };
for (TrackId trackId : tracks)
query.bind(trackId);
@@ -339,55 +326,47 @@ Track::findSimilarTracks(Session& session, const std::vector<TrackId>& tracks, R
query.bind(trackId);
return Utils::execQuery(query, range);
}
}
void
Track::clearArtistLinks()
{
void Track::clearArtistLinks()
{
_trackArtistLinks.clear();
}
}
void
Track::addArtistLink(const ObjectPtr<TrackArtistLink>& artistLink)
{
void Track::addArtistLink(const ObjectPtr<TrackArtistLink>& artistLink)
{
_trackArtistLinks.insert(getDboPtr(artistLink));
}
}
void
Track::setClusters(const std::vector<ObjectPtr<Cluster>>& clusters)
{
void Track::setClusters(const std::vector<ObjectPtr<Cluster>>& clusters)
{
_clusters.clear();
for (const ObjectPtr<Cluster>& cluster : clusters)
_clusters.insert(getDboPtr(cluster));
}
}
std::optional<int>
Track::getYear() const
{
std::optional<int> Track::getYear() const
{
return (_date.isValid() ? std::make_optional<int>(_date.year()) : std::nullopt);
}
}
std::optional<int>
Track::getOriginalYear() const
{
std::optional<int> Track::getOriginalYear() const
{
return (_originalDate.isValid() ? std::make_optional<int>(_originalDate.year()) : std::nullopt);
}
}
std::optional<std::string>
Track::getCopyright() const
{
std::optional<std::string> Track::getCopyright() const
{
return _copyright != "" ? std::make_optional<std::string>(_copyright) : std::nullopt;
}
}
std::optional<std::string>
Track::getCopyrightURL() const
{
std::optional<std::string> Track::getCopyrightURL() const
{
return _copyrightURL != "" ? std::make_optional<std::string>(_copyrightURL) : std::nullopt;
}
}
std::vector<Artist::pointer>
Track::getArtists(EnumSet<TrackArtistLinkType> linkTypes) const
{
std::vector<Artist::pointer> Track::getArtists(EnumSet<TrackArtistLinkType> linkTypes) const
{
assert(session());
std::ostringstream oss;
@@ -400,7 +379,7 @@ Track::getArtists(EnumSet<TrackArtistLinkType> linkTypes) const
{
oss << " AND t_a_l.type IN (";
bool first {true};
bool first{ true };
for ([[maybe_unused]] TrackArtistLinkType type : linkTypes)
{
if (!first)
@@ -411,19 +390,18 @@ Track::getArtists(EnumSet<TrackArtistLinkType> linkTypes) const
oss << ")";
}
auto query {session()->query<Wt::Dbo::ptr<Artist>>(oss.str())};
auto query{ session()->query<Wt::Dbo::ptr<Artist>>(oss.str()) };
for (TrackArtistLinkType type : linkTypes)
query.bind(type);
query.where("t.id = ?").bind(getId());
auto res {query.resultList()};
auto res{ query.resultList() };
return std::vector<Artist::pointer>(std::begin(res), std::end(res));
}
}
std::vector<ArtistId>
Track::getArtistIds(EnumSet<TrackArtistLinkType> linkTypes) const
{
std::vector<ArtistId> Track::getArtistIds(EnumSet<TrackArtistLinkType> linkTypes) const
{
assert(self());
assert(session());
@@ -437,7 +415,7 @@ Track::getArtistIds(EnumSet<TrackArtistLinkType> linkTypes) const
{
oss << " AND t_a_l.type IN (";
bool first {true};
bool first{ true };
for ([[maybe_unused]] TrackArtistLinkType type : linkTypes)
{
if (!first)
@@ -448,25 +426,23 @@ Track::getArtistIds(EnumSet<TrackArtistLinkType> linkTypes) const
oss << ")";
}
auto query {session()->query<ArtistId>(oss.str())};
auto query{ session()->query<ArtistId>(oss.str()) };
for (TrackArtistLinkType type : linkTypes)
query.bind(type);
query.where("t.id = ?").bind(getId());
auto res {query.resultList()};
auto res{ query.resultList() };
return std::vector<ArtistId>(std::cbegin(res), std::cend(res));
}
}
std::vector<TrackArtistLink::pointer>
Track::getArtistLinks() const
{
std::vector<TrackArtistLink::pointer> Track::getArtistLinks() const
{
return std::vector<TrackArtistLink::pointer>(_trackArtistLinks.begin(), _trackArtistLinks.end());
}
}
std::vector<std::vector<Cluster::pointer>>
Track::getClusterGroups(const std::vector<ClusterType::pointer>& clusterTypes, std::size_t size) const
{
std::vector<std::vector<Cluster::pointer>> Track::getClusterGroups(const std::vector<ClusterType::pointer>& clusterTypes, std::size_t size) const
{
assert(self());
assert(session());
@@ -486,11 +462,11 @@ Track::getClusterGroups(const std::vector<ClusterType::pointer>& clusterTypes, s
oss << " " << where.get();
oss << " GROUP BY c.id ORDER BY COUNT(c.id) DESC";
auto query {session()->query<Wt::Dbo::ptr<Cluster>>(oss.str())};
auto query{ session()->query<Wt::Dbo::ptr<Cluster>>(oss.str()) };
for (const std::string& bindArg : where.getBindArgs())
query.bind(bindArg);
auto queryRes {query.resultList()};
auto queryRes{ query.resultList() };
std::map<ClusterTypeId, std::vector<Cluster::pointer>> clusters;
for (const Wt::Dbo::ptr<Cluster>& cluster : queryRes)
@@ -504,23 +480,22 @@ Track::getClusterGroups(const std::vector<ClusterType::pointer>& clusterTypes, s
res.push_back(cluster_list.second);
return res;
}
}
namespace Debug
{
std::ostream&
operator<<(std::ostream& os, const TrackInfo& trackInfo)
namespace Debug
{
auto transaction {trackInfo.session.createSharedTransaction()};
std::ostream& operator<<(std::ostream& os, const TrackInfo& trackInfo)
{
auto transaction{ trackInfo.session.createSharedTransaction() };
const Track::pointer track {Track::find(trackInfo.session, trackInfo.trackId)};
const Track::pointer track{ Track::find(trackInfo.session, trackInfo.trackId) };
if (track)
{
os << track->getName();
if (const Release::pointer release {track->getRelease()})
if (const Release::pointer release{ track->getRelease() })
os << " [" << release->getName() << "]";
for (auto artist : track->getArtists({TrackArtistLinkType::Artist}))
for (auto artist : track->getArtists({ TrackArtistLinkType::Artist }))
os << " - " << artist->getName();
for (auto cluster : track->getClusters())
os << " {" + cluster->getType()->getName() << "-" << cluster->getName() << "}";
@@ -532,7 +507,6 @@ namespace Debug
return os;
}
}
}
} // namespace Database
src/libs/services/database/test/Cluster.cpp
+45
View File
@@ -154,6 +154,51 @@ TEST_F(DatabaseFixture, Cluster_singleTrack)
}
}
TEST_F(DatabaseFixture, Cluster_singleTrackWithSeveralClusters)
{
ScopedTrack track{ session, "MyTrack" };
ScopedClusterType clusterType{ session, "MyClusterType" };
ScopedCluster cluster1{ session, clusterType.lockAndGet(), "MyCluster1" };
ScopedCluster cluster2{ session, clusterType.lockAndGet(), "MyCluster2" };
const std::vector<ClusterId> clusterIds{ cluster1.getId(), cluster2.getId() };
{
auto transaction{ session.createSharedTransaction() };
const auto tracks{ Track::find(session, Track::FindParameters{}.setClusters(clusterIds)) };
EXPECT_TRUE(tracks.results.empty());
}
{
auto transaction{ session.createUniqueTransaction() };
cluster1.get().modify()->addTrack(track.get());
}
{
auto transaction{ session.createSharedTransaction() };
const auto tracks{ Track::find(session, Track::FindParameters{}.setClusters(clusterIds)) };
EXPECT_TRUE(tracks.results.empty());
}
{
auto transaction{ session.createUniqueTransaction() };
cluster2.get().modify()->addTrack(track.get());
}
{
auto transaction{ session.createSharedTransaction() };
const auto tracks{ Track::find(session, Track::FindParameters{}.setClusters(clusterIds)) };
ASSERT_FALSE(tracks.results.empty());
EXPECT_EQ(tracks.results.front(), track.getId());
}
}
TEST_F(DatabaseFixture, Cluster_multiTracks)
{
std::list<ScopedTrack> tracks;