Skip to content

Commit d644226

Browse files
Lubos KoscoLubos Kosco
authored andcommitted
take queries from the bug, fixes #774
1 parent 1f3fa87 commit d644226

File tree

1 file changed

+28
-17
lines changed

1 file changed

+28
-17
lines changed

src/org/opensolaris/opengrok/history/JDBCHistoryCache_queries.properties

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -113,28 +113,39 @@ hasCacheForDirectory=\
113113
getFileHistory=\
114114
SELECT CS.REVISION, A.NAME, CS.TIME, CS.MESSAGE, CS.ID \
115115
FROM \
116-
OPENGROK.CHANGESETS CS \
117-
JOIN (SELECT * FROM OPENGROK.FILECHANGES UNION \
118-
SELECT * FROM OPENGROK.FILEMOVES) as FC ON CS.ID = FC.CHANGESET \
119-
JOIN OPENGROK.FILES F ON FC.FILE = F.ID \
120-
JOIN OPENGROK.DIRECTORIES D ON D.ID = F.DIRECTORY \
121-
JOIN OPENGROK.AUTHORS A ON A.ID = CS.AUTHOR \
122-
JOIN OPENGROK.REPOSITORIES R ON D.REPOSITORY = R.ID \
123-
WHERE \
124-
R.PATH = ? AND D.PATH = ? AND F.NAME = ? \
116+
OPENGROK.CHANGESETS CS, \
117+
(SELECT * FROM OPENGROK.FILECHANGES UNION SELECT * FROM OPENGROK.FILEMOVES) FC, \
118+
OPENGROK.FILES F, \
119+
OPENGROK.DIRECTORIES D, \
120+
OPENGROK.AUTHORS A, \
121+
OPENGROK.REPOSITORIES R \
122+
WHERE R.PATH = ? \
123+
AND D.path = ? \
124+
AND F.name = ? \
125+
AND D.REPOSITORY = R.ID \
126+
AND CS.ID = FC.CHANGESET \
127+
AND FC.FILE = F.ID \
128+
AND D.ID = F.DIRECTORY \
129+
AND A.ID = CS.AUTHOR \
125130
ORDER BY CS.ID DESC
126131

127132
getFileHistoryFolded=\
128133
SELECT CS.REVISION, A.NAME, CS.TIME, CS.MESSAGE, CS.ID \
129134
FROM \
130-
OPENGROK.CHANGESETS CS \
131-
JOIN OPENGROK.FILECHANGES FC ON CS.ID = FC.CHANGESET \
132-
JOIN OPENGROK.FILES F ON FC.FILE = F.ID \
133-
JOIN OPENGROK.DIRECTORIES D ON D.ID = F.DIRECTORY \
134-
JOIN OPENGROK.AUTHORS A ON A.ID = CS.AUTHOR \
135-
JOIN OPENGROK.REPOSITORIES R ON D.REPOSITORY = R.ID \
136-
WHERE \
137-
R.PATH = ? AND D.PATH = ? AND F.NAME = ? \
135+
OPENGROK.CHANGESETS CS, \
136+
OPENGROK.FILECHANGES FC, \
137+
OPENGROK.FILES F, \
138+
OPENGROK.DIRECTORIES D, \
139+
OPENGROK.AUTHORS A, \
140+
OPENGROK.REPOSITORIES R \
141+
WHERE R.PATH = ? \
142+
AND D.path = ? \
143+
AND F.name = ? \
144+
AND D.REPOSITORY = R.ID \
145+
AND CS.ID = FC.CHANGESET \
146+
AND FC.FILE = F.ID \
147+
AND D.ID = F.DIRECTORY \
148+
AND A.ID = CS.AUTHOR \
138149
ORDER BY CS.ID DESC
139150

140151
getFilemovesCount=\

0 commit comments

Comments
 (0)