[ YC-731 ] Optimise full text search query builder for deep category …

…hierarchies - added parent categories to index - added new categories with parents query builder - modified brands retrieval
inspire-software · Jul 13, 2016 · 5c1fcc2 · 5c1fcc2
1 parent ad72eeb
commit 5c1fcc2
Show file tree

Hide file tree

Showing 39 changed files with 582 additions and 263 deletions.
diff --git a/core/src/main/java/org/yes/cart/service/domain/impl/CategoryServiceImpl.java b/core/src/main/java/org/yes/cart/service/domain/impl/CategoryServiceImpl.java
@@ -470,6 +470,7 @@ public List<Category> findByProductId(final long productId) {
             "categoryService-categoryIdsWithLinks",
             "categoryService-categoryHasSubcategory",
             "categoryService-byId",
+            "categoryService-categoryParentsIds",
             "shopService-shopCategoriesIds",
             "shopService-shopAllCategoriesIds"
     }, allEntries = true)
@@ -505,6 +506,7 @@ public Category create(Category instance) {
             "categoryService-categoryIdsWithLinks",
             "categoryService-categoryHasSubcategory",
             "categoryService-byId",
+            "categoryService-categoryParentsIds",
             "shopService-shopCategoriesIds",
             "shopService-shopAllCategoriesIds"
     }, allEntries = true)
@@ -539,7 +541,8 @@ public Category update(Category instance) {
             "categoryService-childCategoriesRecursiveIdsWithLinks",
             "categoryService-categoryIdsWithLinks",
             "categoryService-categoryHasSubcategory",
-            "categoryService-byId"
+            "categoryService-byId",
+            "categoryService-categoryParentsIds"
     }, allEntries = true)
     public void delete(Category instance) {
         super.delete(instance);

diff --git a/core/src/main/java/org/yes/cart/service/domain/impl/ProductServiceImpl.java b/core/src/main/java/org/yes/cart/service/domain/impl/ProductServiceImpl.java
@@ -607,10 +607,8 @@ public List<Product> getProductByIdList(final List idList) {
      * {@inheritDoc}
      */
     @Cacheable(value = "productService-distinctBrands")
-    public List<FilteredNavigationRecord> getDistinctBrands(final String locale, final List categories) {
-        List<Object[]> list = productDao.findQueryObjectsByNamedQuery(
-                "PRODUCTS.BRANDS.BY.ASSIGNED.CATEGORIES",
-                categories);
+    public List<FilteredNavigationRecord> getDistinctBrands(final String locale) {
+        List<Object[]> list = productDao.findQueryObjectsByNamedQuery("PRODUCTS.BRANDS.ALL");
 
         final List<FilteredNavigationRecord> records = constructBrandFilteredNavigationRecords(list);
         Collections.sort(

diff --git a/core/src/main/resources/cache-config.xml b/core/src/main/resources/cache-config.xml
@@ -218,7 +218,10 @@
             <constructor-arg index="0" value="categoryService-byId"/>
             <constructor-arg index="1" value="key"/>
         </bean>
-
+        <bean class="org.yes.cart.domain.misc.Pair">
+            <constructor-arg index="0" value="categoryService-categoryParentsIds"/>
+            <constructor-arg index="1" value="key"/>
+        </bean>
         <bean class="org.yes.cart.domain.misc.Pair">
             <constructor-arg index="0" value="contentService-rootContent"/>
             <constructor-arg index="1" value="all"/>
@@ -322,7 +325,10 @@
             <constructor-arg index="0" value="categoryService-byId"/>
             <constructor-arg index="1" value="key"/>
         </bean>
-
+        <bean class="org.yes.cart.domain.misc.Pair">
+            <constructor-arg index="0" value="categoryService-categoryParentsIds"/>
+            <constructor-arg index="1" value="key"/>
+        </bean>
         <bean class="org.yes.cart.domain.misc.Pair">
             <constructor-arg index="0" value="contentService-rootContent"/>
             <constructor-arg index="1" value="all"/>

diff --git a/core/src/main/resources/core-services.xml b/core/src/main/resources/core-services.xml
@@ -41,6 +41,7 @@
     </bean>
     <bean id="brandLuceneQueryBuilder" class="org.yes.cart.domain.query.impl.ProductBrandSearchQueryBuilder"/>
     <bean id="productCategoryLuceneQueryBuilder" class="org.yes.cart.domain.query.impl.ProductCategorySearchQueryBuilder"/>
+    <bean id="productCategoryIncludingParentsLuceneQueryBuilder" class="org.yes.cart.domain.query.impl.ProductCategoryIncludingParentsSearchQueryBuilder"/>
     <bean id="productShopLuceneQueryBuilder" class="org.yes.cart.domain.query.impl.ProductShopSearchQueryBuilder"/>
     <bean id="productShopInStockLuceneQueryBuilder" class="org.yes.cart.domain.query.impl.ProductShopInStockSearchQueryBuilder"/>
     <bean id="productShopHasPriceLuceneQueryBuilder" class="org.yes.cart.domain.query.impl.ProductShopHasPriceSearchQueryBuilder"/>
@@ -71,12 +72,13 @@
                 <entry key="price"          value-ref="priceLuceneQueryBuilder"/>
 
                 <!-- Internal -->
-                <entry key="attribute.attribute"           value-ref="attributeLuceneQueryBuilder"/>
-                <entry key="productCategory.category"      value-ref="productCategoryLuceneQueryBuilder"/>
-                <entry key="productShopId"                 value-ref="productShopLuceneQueryBuilder"/>
-                <entry key="productInStockShopId"          value-ref="productShopInStockLuceneQueryBuilder"/>
-                <entry key="productHasPriceShopId"         value-ref="productShopHasPriceLuceneQueryBuilder"/>
-                <entry key="featured"                      value-ref="featuredProductLuceneQueryBuilder"/>
+                <entry key="attribute.attribute"                    value-ref="attributeLuceneQueryBuilder"/>
+                <entry key="productCategory.category"               value-ref="productCategoryLuceneQueryBuilder"/>
+                <entry key="productCategory.category.inc.parents"   value-ref="productCategoryIncludingParentsLuceneQueryBuilder"/>
+                <entry key="productShopId"                          value-ref="productShopLuceneQueryBuilder"/>
+                <entry key="productInStockShopId"                   value-ref="productShopInStockLuceneQueryBuilder"/>
+                <entry key="productHasPriceShopId"                  value-ref="productShopHasPriceLuceneQueryBuilder"/>
+                <entry key="featured"                               value-ref="featuredProductLuceneQueryBuilder"/>
             </map>
         </constructor-arg>
         <constructor-arg index="4">

diff --git a/.../src/test/java/org/yes/cart/bulkjob/product/ProductInventoryChangedProcessorImplTest.java b/.../src/test/java/org/yes/cart/bulkjob/product/ProductInventoryChangedProcessorImplTest.java
@@ -72,7 +72,7 @@ public void testRun() throws Exception {
 
         productService.reindexProduct(product.getId());
 
-        final NavigationContext context = luceneQueryFactory.getFilteredNavigationQueryChain(10L, null,
+        final NavigationContext context = luceneQueryFactory.getFilteredNavigationQueryChain(10L, null, false,
                 Collections.singletonMap(ProductSearchQueryBuilder.PRODUCT_ID_FIELD, (List) Arrays.asList("9998")));
 
         List<ProductSearchResultDTO> rez = productService.getProductSearchResultDTOByQuery(

diff --git a/...ava/org/yes/cart/bulkjob/product/ProductsPassedAvailbilityDateIndexProcessorImplTest.java b/...ava/org/yes/cart/bulkjob/product/ProductsPassedAvailbilityDateIndexProcessorImplTest.java
@@ -54,7 +54,7 @@ public void testRun() throws Exception {
 
         productService.reindexProduct(product.getId());
 
-        final NavigationContext context = luceneQueryFactory.getFilteredNavigationQueryChain(10L, null,
+        final NavigationContext context = luceneQueryFactory.getFilteredNavigationQueryChain(10L, null, false,
                 Collections.singletonMap(ProductSearchQueryBuilder.PRODUCT_ID_FIELD, (List) Arrays.asList("9998")));
 
         List<ProductSearchResultDTO> rez = productService.getProductSearchResultDTOByQuery(