-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/refactor/convention' into deploy…
…/production
- Loading branch information
Showing
6 changed files
with
140 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
src/main/java/net/sinzak/server/common/redis/RedisService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package net.sinzak.server.common.redis; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.data.redis.core.RedisTemplate; | ||
| import org.springframework.data.redis.core.ZSetOperations; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import javax.annotation.Resource; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class RedisService { | ||
|
|
||
| private final RedisTemplate<String,String> redisTemplate; | ||
|
|
||
| private static final String REDIS_KEY_AUTO_COMPLETE ="autoComplete:"; | ||
| private static final String COMPLETE_WORD ="+"; | ||
| private static final Integer NUMBER_OF_WORD_TO_SHOW = 5; | ||
| public void addWordToRedis(String newWord){ | ||
| String key = REDIS_KEY_AUTO_COMPLETE; | ||
| for(int i=0;i<newWord.length();i++){ | ||
| String word = newWord.substring(i,i+1); | ||
| redisTemplate.opsForZSet().incrementScore(key,word,1); | ||
| key += word; | ||
| } | ||
| redisTemplate.opsForZSet().add(key,COMPLETE_WORD,0); | ||
| } | ||
|
|
||
| public List<String> getAutoCompleteWords(String prefix){ | ||
| List<String> wordsToShow = new ArrayList<>(); | ||
| findEndOfWord(prefix,wordsToShow); | ||
| return wordsToShow; | ||
| } | ||
| public void findEndOfWord(String prefix,List<String> wordsToShow){ | ||
| List<String> temporaryWord = redisTemplate | ||
| .opsForZSet() | ||
| .reverseRangeWithScores(REDIS_KEY_AUTO_COMPLETE+prefix,0,NUMBER_OF_WORD_TO_SHOW) | ||
| .stream() | ||
| .map(ZSetOperations.TypedTuple::getValue) | ||
| .collect(Collectors.toList()); | ||
| for(int i=0;i<temporaryWord.size();i++){ | ||
| if(wordsToShow.size()>=NUMBER_OF_WORD_TO_SHOW) return; | ||
| if(temporaryWord.get(i).equals(COMPLETE_WORD)) wordsToShow.add(prefix); | ||
| if(!temporaryWord.get(i).equals(COMPLETE_WORD)) findEndOfWord(prefix+temporaryWord.get(i),wordsToShow); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| // private void addWordsThroughNode(String newWord) { | ||
| // SearchNode parentNode = SearchNode.builder() | ||
| // .children(null) | ||
| // .score(0) | ||
| // .value(newWord.substring(0,1)) | ||
| // .build(); | ||
| // SearchNode firstNode = parentNode; | ||
| // for(int i = 1; i< newWord.length(); i++){ | ||
| // SearchNode childNode = SearchNode.builder() | ||
| // .children(null) | ||
| // .score(0) | ||
| // .value(newWord.substring(i,i+1)) | ||
| // .build(); | ||
| // parentNode.setChildren(childNode); | ||
| // parentNode = childNode; | ||
| // | ||
| // } | ||
| // redisTemplate.opsForValue().set(REDIS_KEY_AUTO_COMPLETE,firstNode); | ||
| // } | ||
|
|
||
| } |
20 changes: 20 additions & 0 deletions
20
src/main/java/net/sinzak/server/common/redis/SearchNode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package net.sinzak.server.common.redis; | ||
|
|
||
| import lombok.Builder; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
|
|
||
| @Builder | ||
| @Setter | ||
| @Getter | ||
| public class SearchNode { | ||
| private String value; | ||
| private SearchNode children; | ||
| private int score; | ||
|
|
||
| public SearchNode(String value, SearchNode children, int score) { | ||
| this.value = value; | ||
| this.children = children; | ||
| this.score = score; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters