From 94f85e2ec113efee03def8ae9539cdaee21cccf9 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 28 Mar 2018 11:27:29 +0300
Subject: drop sphinx search and use datasource autoconfiguration
---
.../com/juick/service/FTSSearchServiceImpl.java | 85 +++++++++++++++++
.../com/juick/service/MessagesServiceImpl.java | 1 -
.../service/search/SphinxSearchServiceImpl.java | 102 ---------------------
3 files changed, 85 insertions(+), 103 deletions(-)
create mode 100644 juick-server-jdbc/src/main/java/com/juick/service/FTSSearchServiceImpl.java
delete mode 100644 juick-server-jdbc/src/main/java/com/juick/service/search/SphinxSearchServiceImpl.java
(limited to 'juick-server-jdbc/src/main/java/com/juick/service')
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
new file mode 100644
index 00000000..8d2ffbdb
--- /dev/null
+++ b/juick-server-jdbc/src/main/java/com/juick/service/FTSSearchServiceImpl.java
@@ -0,0 +1,85 @@
+/*
+ * 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/MessagesServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
index 4398259c..31731466 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -22,7 +22,6 @@ import com.juick.Tag;
import com.juick.User;
import com.juick.server.helpers.PrivacyOpts;
import com.juick.server.helpers.ResponseReply;
-import com.juick.service.search.SearchService;
import com.juick.util.MessageUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/search/SphinxSearchServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/search/SphinxSearchServiceImpl.java
deleted file mode 100644
index e4287502..00000000
--- a/juick-server-jdbc/src/main/java/com/juick/service/search/SphinxSearchServiceImpl.java
+++ /dev/null
@@ -1,102 +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.search;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.util.Assert;
-
-import javax.sql.DataSource;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/18/16.
- */
-
-/* Note
- * Don't use any spring's component annotation (such as @Repository, @Service, @Component, etc).
- * This class directly used by spring's search configuration class
- */
-public class SphinxSearchServiceImpl implements SearchService {
- private static final int DEFAULT_MAX_RESULT = 25;
-
- private final NamedParameterJdbcTemplate namedParameterSearchJdbcTemplate;
-
- private int maxResult = DEFAULT_MAX_RESULT;
-
-
- public SphinxSearchServiceImpl(JdbcTemplate searchJdbcTemplate) {
- Assert.notNull(searchJdbcTemplate, "JdbcTemplate must be initialized");
- this.namedParameterSearchJdbcTemplate = new NamedParameterJdbcTemplate(searchJdbcTemplate);
- }
-
- public SphinxSearchServiceImpl(DataSource searchDataSource) {
- Assert.notNull(searchDataSource, "DataSource must be initialized");
- this.namedParameterSearchJdbcTemplate = new NamedParameterJdbcTemplate(searchDataSource);
- }
-
- @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 namedParameterSearchJdbcTemplate.queryForList(
- "SELECT id AS message_id FROM messages WHERE MATCH(:search) " +
- (messageIdBefore > 0 ?
- " AND id < :before " : StringUtils.EMPTY) +
- " ORDER BY 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 namedParameterSearchJdbcTemplate.queryForList(
- "SELECT id AS message_id FROM messages WHERE user_id = :userId AND MATCH(:search) " +
- (messageIdBefore > 0 ?
- " AND id < :before " : StringUtils.EMPTY) +
- " ORDER BY 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
--
cgit v1.2.3