yoho-search / yoho-search-service · Commits

Go to a project

Authored by unknown
Commit c0ab275852f6bc87999faad6b7e7547f56a9f87d 1 parent 8f643fb1

日志fix

Inline Side-by-side
Showing 2 changed files with 7 additions and 8 deletions
@@ -39,6 +39,7 @@ public class SknImageVectorsController { @@ -39,6 +39,7 @@ public class SknImageVectorsController {
39 if (StringUtils.isBlank(vectors_32)||StringUtils.isBlank(vectors_128)) { 39 if (StringUtils.isBlank(vectors_32)||StringUtils.isBlank(vectors_128)) {
40 return new SearchApiResult().setCode(400).setMessage("vectors_32或vectors_128不能为空"); 40 return new SearchApiResult().setCode(400).setMessage("vectors_32或vectors_128不能为空");
41 } 41 }
  42 + logger.warn("vectors_32 is [{}],vectors_128 is[{}]", vectors_32, vectors_128);
42 Map<String, String> paramMap = new HashMap<>(); 43 Map<String, String> paramMap = new HashMap<>();
43 paramMap.put(VECTORS_32_KEY, vectors_32); 44 paramMap.put(VECTORS_32_KEY, vectors_32);
44 paramMap.put(VECTORS_128_KEY, vectors_128); 45 paramMap.put(VECTORS_128_KEY, vectors_128);
@@ -77,12 +77,10 @@ public class SknImageVectorsServiceImpl implements ISknImageVectorsService, Appl @@ -77,12 +77,10 @@ public class SknImageVectorsServiceImpl implements ISknImageVectorsService, Appl
77 logger.info("[func=searchSknByPhoto][param={}][begin={}]", paramMap.toString(), begin); 77 logger.info("[func=searchSknByPhoto][param={}][begin={}]", paramMap.toString(), begin);
78 String vectors_32 = paramMap.get(VECTORS_32_KEY); 78 String vectors_32 = paramMap.get(VECTORS_32_KEY);
79 String vectors_128 = paramMap.get(VECTORS_128_KEY); 79 String vectors_128 = paramMap.get(VECTORS_128_KEY);
80 - Integer viewNum = MapUtils.getInteger(paramMap, "viewNum",20);  
81 - //Integer viewNum = 20;  
82 - logger.warn("vectors_32 is [{}],vectors_128 is[{}]", vectors_32, vectors_128); 80 + Integer viewNum = MapUtils.getInteger(paramMap, "viewNum", 20);
  81 + // Integer viewNum = 20;
83 // 2、按32维向量召回 82 // 2、按32维向量召回
84 List<Integer> sknListFromVector32 = this.querySknListWithVector32(vectors_32); 83 List<Integer> sknListFromVector32 = this.querySknListWithVector32(vectors_32);
85 - logger.warn("sknListFromVector32 size is [{}]", sknListFromVector32.size());  
86 if (sknListFromVector32.isEmpty()) { 84 if (sknListFromVector32.isEmpty()) {
87 return new SearchApiResult().setData(this.getResultsDataData(viewNum, null)); 85 return new SearchApiResult().setData(this.getResultsDataData(viewNum, null));
88 } 86 }
@@ -117,7 +115,7 @@ public class SknImageVectorsServiceImpl implements ISknImageVectorsService, Appl @@ -117,7 +115,7 @@ public class SknImageVectorsServiceImpl implements ISknImageVectorsService, Appl
117 final String indexName = ISearchConstants.INDEX_NAME_IMAGE_VECTORS; 115 final String indexName = ISearchConstants.INDEX_NAME_IMAGE_VECTORS;
118 SearchResult searchResult = searchCommonService.doSearch(indexName, searchParam); 116 SearchResult searchResult = searchCommonService.doSearch(indexName, searchParam);
119 List<Integer> sknResults = getSknResultsFromImageVectors(searchResult.getResultList()); 117 List<Integer> sknResults = getSknResultsFromImageVectors(searchResult.getResultList());
120 - logger.warn("[func=querySknListWithVector32][query with vector_32][resultsize is {}][cost={}]", sknResults.size(), System.currentTimeMillis() - begin); 118 + logger.info("[func=querySknListWithVector32][query with vector_32][resultsize is {}][cost={}]", sknResults.size(), System.currentTimeMillis() - begin);
121 return sknResults; 119 return sknResults;
122 } 120 }
123 121
@@ -136,7 +134,7 @@ public class SknImageVectorsServiceImpl implements ISknImageVectorsService, Appl @@ -136,7 +134,7 @@ public class SknImageVectorsServiceImpl implements ISknImageVectorsService, Appl
136 final String indexName = ISearchConstants.INDEX_NAME_IMAGE_VECTORS; 134 final String indexName = ISearchConstants.INDEX_NAME_IMAGE_VECTORS;
137 SearchResult searchResult = searchCommonService.doSearch(indexName, searchParam); 135 SearchResult searchResult = searchCommonService.doSearch(indexName, searchParam);
138 List<Integer> sknResults = getSknResultsFromImageVectors(searchResult.getResultList()); 136 List<Integer> sknResults = getSknResultsFromImageVectors(searchResult.getResultList());
139 - logger.warn("[func=querySknListWithVector128][query with vector_128][resultsize is {}][cost={}]", searchResult.getResultList().size(), System.currentTimeMillis() - begin); 137 + logger.info("[func=querySknListWithVector128][query with vector_128][resultsize is {}][cost={}]", searchResult.getResultList().size(), System.currentTimeMillis() - begin);
140 return sknResults; 138 return sknResults;
141 } 139 }
142 140
@@ -161,8 +159,8 @@ public class SknImageVectorsServiceImpl implements ISknImageVectorsService, Appl @@ -161,8 +159,8 @@ public class SknImageVectorsServiceImpl implements ISknImageVectorsService, Appl
161 } 159 }
162 // 3、排序截取 160 // 3、排序截取
163 List<Map<String, Object>> productList = searchResult.getResultList(); 161 List<Map<String, Object>> productList = searchResult.getResultList();
164 - logger.warn("[func=queryProductListWithSort][query by sknList][resultsize is {}][cost={}]",productList.size(), System.currentTimeMillis() - begin);  
165 - 162 + logger.info("[func=queryProductListWithSort][query by sknList][resultsize is {}][cost={}]", productList.size(), System.currentTimeMillis() - begin);
  163 +
166 Map<Integer, Map<String, Object>> productMap = new HashMap<Integer, Map<String, Object>>(); 164 Map<Integer, Map<String, Object>> productMap = new HashMap<Integer, Map<String, Object>>();
167 for (Map<String, Object> product : productList) { 165 for (Map<String, Object> product : productList) {
168 productMap.put(MapUtils.getInteger(product, "productSkn", 0), product); 166 productMap.put(MapUtils.getInteger(product, "productSkn", 0), product);