Merge pull request #2 from nikcomestotalk/Refactoring

Refactoring of code
nikcomestotalk · Jan 19, 2018 · 0e55f5b · 0e55f5b
2 parents 34cbbf1 + 885a38e
commit 0e55f5b
Show file tree

Hide file tree

Showing 48 changed files with 511 additions and 1,362 deletions.
diff --git a/config/config.properties b/config/config.properties
@@ -0,0 +1,15 @@
+application.debug=true
+listener.port= 1081
+listener.limit= 10
+listener.url = /query
+updater.port= 1082
+updater.url = /update
+searchstorage.path= store
+searchstorage.name= search.bin
+main.basedir=${main.basedir}
+#recover.method=serialize
+recover.method.serialize.path=/suggest/content/search.bin
+recover.method=file
+recover.method.file.days=1
+recover.method.file.backup.path=/suggest/content/backup/
+stopwords.path = /suggest/config/stopwords.txt
diff --git a/content/stopwords.txt → config/stopwords.txt b/content/stopwords.txt → config/stopwords.txt
diff --git a/content/config.properties b/content/config.properties
diff --git a/content/search.bin b/content/search.bin
diff --git a/example/demo.html b/example/demo.html
diff --git a/example/newData.php b/example/newData.php
diff --git a/example/populateData.php b/example/populateData.php
diff --git a/example/pos_loc.txt b/example/pos_loc.txt
diff --git a/example/randomData.php b/example/randomData.php
diff --git a/src/main/java/com/search/suggestion/TextSuggestor.java b/src/main/java/com/search/suggestion/TextSuggestor.java
@@ -6,64 +6,40 @@
 import com.search.suggestion.listener.SearchListener;
 import com.search.suggestion.socket.ServerHandler;
 import com.search.suggestion.text.analyze.SuggestAnalyzer;
+import com.search.suggestion.text.backup.SerializeDump;
+import com.search.suggestion.text.recover.Recover;
+import com.search.suggestion.text.recover.RecoverFactory;
 import com.search.suggestion.updater.SearchUpdater;
-import com.search.suggestion.util.BackupTree;
+import com.search.suggestion.text.recover.RecoverFromText;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 public final class TextSuggestor
 {
     private TextSuggestor() { }
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) throws IOException, InterruptedException {
 
-       /* List<String> a = new ArrayList<String>();
-        a.add("HI");
-        a.add("HasdfaI");
-        a.add("asdfa");
-        String b = String.join("<",a);
-        a.clear();*/
-        SearchEngine<SuggestPayload> suggest = new SearchEngine.Builder<SuggestPayload>()
+       SearchEngine<SuggestPayload> suggestCurrent = new SearchEngine.Builder<SuggestPayload>()
+               .setIndex(new SuggestAdapter())
+               .setAnalyzer(new SuggestAnalyzer())
+               .build();
+
+       SearchEngine<SuggestPayload> suggestFuture = new SearchEngine.Builder<SuggestPayload>()
                 .setIndex(new SuggestAdapter())
                 .setAnalyzer(new SuggestAnalyzer())
                 .build();
 
-        BackupTree backupTree = new BackupTree(suggest);
-        backupTree.updateIndexer();
+
+        Recover recover = RecoverFactory.getInstance(suggestCurrent, suggestFuture);
+        recover.updateIndexer();
+        recover.swap();
         ServerHandler serverHandler = new ServerHandler();
-        (new SearchUpdater(suggest)).startService(serverHandler);
+        (new SearchUpdater(suggestCurrent)).startService(serverHandler);
+
+        (new SearchListener(suggestCurrent)).startService(serverHandler);
 
-        (new SearchListener(suggest)).startService(serverHandler);
+        (new Thread(new SerializeDump(suggestCurrent))).start();
 
-        (new Thread(backupTree)).start();
     }
 }
-/* Map<String, Integer> m = new HashMap<String,Integer>();
-        m.put("user",1);
-        m.put("category",12);
-        m.put("location",14);
-        SuggestPayload sr = new SuggestPayload("name nikhil", m);
-        Map<String, Integer> m1 = new HashMap<String,Integer>();
-        m1.put("user",2);
-        m1.put("category",12);
-        m1.put("location",10);
-        SuggestPayload sr1 = new SuggestPayload("dhiman nicks",m1);
-        Map<String, Integer> m2 = new HashMap<String,Integer>();
-        m2.put("user",1);
-        m2.put("category",10);
-        m2.put("location",14);
-        SuggestPayload sr2 = new SuggestPayload("nik dhiemn who",m2);
-
-        suggest.add(sr);
-        //suggest.add(sr1);
-        suggest.add(sr2);
-
-        Map<String, Integer> msearch = new HashMap<String,Integer>();
-        msearch.put("user",1);
-        msearch.put("category",10);
-        msearch.put("location",14);
-        SuggestPayload search = new SuggestPayload("ni", m);*/
-
-//System.out.println(suggest.search(search));