From 52280c2560ab7b8471c0dc3955b5002157713fd2 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 1 Jun 2018 10:15:18 +0300
Subject: server: using SphinxSE for search
---
.../com/juick/service/FTSSearchServiceImpl.java | 85 ----------------------
.../com/juick/service/SphinxSearchService.java | 83 +++++++++++++++++++++
2 files changed, 83 insertions(+), 85 deletions(-)
delete mode 100644 juick-server-jdbc/src/main/java/com/juick/service/FTSSearchServiceImpl.java
create mode 100644 juick-server-jdbc/src/main/java/com/juick/service/SphinxSearchService.java
(limited to 'juick-server-jdbc/src/main/java/com/juick')
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/FTSSearchServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/FTSSearchServiceImpl.java
deleted file mode 100644
index 8d2ffbdb..00000000
--- a/juick-server-jdbc/src/main/java/com/juick/service/FTSSearchServiceImpl.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2008-2017, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-package com.juick.service;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/18/16.
- */
-
-@Repository
-@Transactional(readOnly = true)
-public class FTSSearchServiceImpl extends BaseJdbcService implements SearchService {
- private static final int DEFAULT_MAX_RESULT = 20;
-
- private int maxResult = DEFAULT_MAX_RESULT;
-
- @Override
- public List searchInAllMessages(final String searchString, final int messageIdBefore) {
- if (StringUtils.isBlank(searchString))
- return Collections.emptyList();
-
- MapSqlParameterSource sqlParameterSource = new MapSqlParameterSource()
- .addValue("search", searchString)
- .addValue("before", messageIdBefore)
- .addValue("limit", maxResult);
-
- return getNamedParameterJdbcTemplate().queryForList(
- "SELECT message_id FROM messages_txt WHERE MATCH(txt) AGAINST(:search) " +
- (messageIdBefore > 0 ?
- " AND message_id < :before " : StringUtils.EMPTY) +
- " ORDER BY message_id DESC LIMIT :limit",
- sqlParameterSource,
- Integer.class);
- }
-
- @Override
- public List searchByStringAndUser(final String searchString, final int userId, int messageIdBefore) {
- if (StringUtils.isBlank(searchString))
- return Collections.emptyList();
-
- MapSqlParameterSource sqlParameterSource = new MapSqlParameterSource()
- .addValue("search", searchString)
- .addValue("userId", userId)
- .addValue("before", messageIdBefore)
- .addValue("limit", maxResult);
-
- return getNamedParameterJdbcTemplate().queryForList(
- "SELECT messages.message_id AS message_id FROM messages INNER JOIN messages_txt ON messages_txt.message_id=messages.message_id WHERE messages.user_id = :userId AND MATCH(messages_txt.txt) AGAINST (:search) " +
- (messageIdBefore > 0 ?
- " AND messages.message_id < :before " : StringUtils.EMPTY) +
- " ORDER BY messages.message_id DESC LIMIT :limit",
- sqlParameterSource,
- Integer.class);
- }
-
- @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
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/SphinxSearchService.java b/juick-server-jdbc/src/main/java/com/juick/service/SphinxSearchService.java
new file mode 100644
index 00000000..26cf3a16
--- /dev/null
+++ b/juick-server-jdbc/src/main/java/com/juick/service/SphinxSearchService.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package com.juick.service;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Created by aalexeev on 11/18/16.
+ */
+
+@Repository
+@Transactional(readOnly = true)
+public class SphinxSearchService extends BaseJdbcService implements SearchService {
+ private static final int DEFAULT_MAX_RESULT = 20;
+
+ private int maxResult = DEFAULT_MAX_RESULT;
+
+ @Override
+ public List searchInAllMessages(final String searchString, final int messageIdBefore) {
+ if (StringUtils.isBlank(searchString))
+ return Collections.emptyList();
+
+ MapSqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+ .addValue("search", searchString)
+ .addValue("before", messageIdBefore - 1)
+ .addValue("limit", maxResult);
+
+ return getNamedParameterJdbcTemplate().queryForList(
+ "SELECT id FROM search WHERE query = ':search;limit=:limit;mode=any;sort=extended:@id desc" +
+ (messageIdBefore > 0 ?
+ ";maxid=:before" : StringUtils.EMPTY) + "'",
+ sqlParameterSource,
+ Integer.class);
+ }
+
+ @Override
+ public List searchByStringAndUser(final String searchString, final int userId, int messageIdBefore) {
+ if (StringUtils.isBlank(searchString))
+ return Collections.emptyList();
+
+ MapSqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+ .addValue("search", searchString)
+ .addValue("userId", userId)
+ .addValue("before", messageIdBefore - 1)
+ .addValue("limit", maxResult);
+
+ return getNamedParameterJdbcTemplate().queryForList(
+ "SELECT id FROM search WHERE query = ':search;filter=user_id,:userId;sort=extended:@id desc" +
+ (messageIdBefore > 0 ?
+ ";maxid=:before" : StringUtils.EMPTY) + "'",
+ sqlParameterSource,
+ Integer.class);
+ }
+
+ @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
--
cgit v1.2.3