aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/juick/service/PostgresSearchService.java (renamed from src/main/java/com/juick/service/PostgreGINService.java)76
1 files changed, 46 insertions, 30 deletions
diff --git a/src/main/java/com/juick/service/PostgreGINService.java b/src/main/java/com/juick/service/PostgresSearchService.java
index d02e79a7..500f3d20 100644
--- a/src/main/java/com/juick/service/PostgreGINService.java
+++ b/src/main/java/com/juick/service/PostgresSearchService.java
@@ -21,6 +21,7 @@ import com.juick.model.User;
import org.apache.commons.lang3.StringUtils;
import org.postgresql.PGConnection;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +30,6 @@ import javax.sql.DataSource;
import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
-import java.util.stream.Collectors;
/**
* Created by aalexeev on 11/18/16.
@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
@Repository
@ConditionalOnProperty(name = "spring.sql.init.platform", havingValue = "postgresql")
@Transactional(readOnly = true)
-public class PostgreGINService extends BaseJdbcService implements SearchService {
+public class PostgresSearchService extends BaseJdbcService implements SearchService {
private static final int DEFAULT_MAX_RESULT = 20;
private int maxResult = DEFAULT_MAX_RESULT;
@@ -58,52 +58,68 @@ public class PostgreGINService extends BaseJdbcService implements SearchService
return searchString;
}
- public String sortHint(String escapedSearchString) {
- boolean isOneWord = escapedSearchString.split("[^\\S\\+]+").length == 1;
- return isOneWord ? " message_id desc" : String.format(" ts_rank(to_tsvector('russian', txt), websearch_to_tsquery('russian', '%s')) DESC, message_id desc", escapedSearchString);
+
+ public List<Integer> search(final int visitorId, final int userId, final String searchString, final int page) {
+ var usersFilter = userService.getUserBLUsers(visitorId).stream().map(User::getUid).toList();
+ var offset = page * maxResult;
+ var query = escapeQuery(searchString);
+ var isOneWord = query.split("[^\\S\\+]+").length == 1;
+ var sql = """
+ SELECT
+ message_id
+ FROM
+ (
+ select
+ messages.message_id message_id,
+ messages.user_id user_id,
+ txt,
+ to_tsvector('russian', txt) v,
+ websearch_to_tsquery('russian', :query) q
+ from
+ messages_txt
+ inner join messages on messages.message_id = messages_txt.message_id
+ ) t
+ WHERE
+ v @@ q
+ """
+ + ( userId > 0 ? "AND user_id = :user_id" : "" ) +
+ """
+ """
+ + (usersFilter.isEmpty() ? "" : " AND user_id NOT IN (:filter)") +
+ """
+ ORDER BY
+ """
+ + (isOneWord ? "message_id DESC" : "ts_rank_cd(v, q) DESC, message_id DESC") +
+ """
+ LIMIT :limit OFFSET :offset
+ """;
+ return getNamedParameterJdbcTemplate().queryForList(sql,
+ new MapSqlParameterSource()
+ .addValue("query", escapeQuery(searchString))
+ .addValue("user_id", userId)
+ .addValue("filter", usersFilter)
+ .addValue("limit", maxResult)
+ .addValue("offset", offset), Integer.class);
}
@Override
public List<Integer> searchInAllMessages(User visitor, final String searchString, final int page) {
if (StringUtils.isBlank(searchString))
return Collections.emptyList();
-
- String usersFilter = userService.getUserBLUsers(visitor.getUid()).stream().map(u -> String.valueOf(u.getUid())).collect(Collectors.joining(","));
- var filter = usersFilter.isBlank() ?
- "to_tsvector('russian', txt) @@ websearch_to_tsquery('russian', '" + escapeQuery(searchString) + "')"
- : "to_tsvector('russian', txt) @@ websearch_to_tsquery('russian', '" + escapeQuery(searchString) + "') AND messages.user_id not in (" + usersFilter + ")";
- var offset = page * maxResult;
- var sql = String.format("""
- SELECT messages.message_id FROM messages_txt inner join messages
- on messages.message_id = messages_txt.message_id
- WHERE %s
- ORDER BY %s
- LIMIT %d OFFSET %d
- """, filter, sortHint(escapeQuery(searchString)), maxResult, offset);
- return getJdbcTemplate().queryForList(sql, Integer.class);
+ return search(visitor.getUid(), -1, searchString, page);
}
@Override
public List<Integer> searchByStringAndUser(User visitor, final String searchString, final int userId, int page) {
if (StringUtils.isBlank(searchString))
return Collections.emptyList();
-
- var offset = page * maxResult;
- var sql = String.format("""
- SELECT messages.message_id FROM messages_txt inner join messages
- on messages.message_id = messages_txt.message_id
- WHERE to_tsvector('russian', txt) @@ websearch_to_tsquery('russian', '%s') AND user_id=%d
- ORDER BY %s
- LIMIT %d OFFSET %d
- """, escapeQuery(searchString), userId, sortHint(escapeQuery(searchString)), maxResult, offset);
- return getJdbcTemplate().queryForList(sql, Integer.class);
+ return search(visitor.getUid(), userId, searchString, page);
}
@Override
public void setMaxResult(int maxResult) {
if (maxResult <= 0)
throw new IllegalArgumentException("maxResult value (" + maxResult + ") must be greater then 0");
-
this.maxResult = maxResult;
}
} \ No newline at end of file