Updated release code

Author: mohitalgolia

Helper/ConfigHelper.php

@@ -145,7 +145,6 @@ class ConfigHelper
     public const ENHANCED_QUEUE_ARCHIVE = 'algoliasearch_advanced/queue/enhanced_archive';
     public const NUMBER_OF_ELEMENT_BY_PAGE = 'algoliasearch_advanced/queue/number_of_element_by_page';
     public const ARCHIVE_LOG_CLEAR_LIMIT = 'algoliasearch_advanced/queue/archive_clear_limit';
-    public const MAX_VIRTUAL_REPLICA_COUNT = 50;
 
     /**
      * @var Magento\Framework\App\Config\ScopeConfigInterface
@@ -1021,14 +1020,7 @@ public function getSortingIndices($originalIndexName, $storeId = null, $currentC
 
         $currency = $this->getCurrencyCode($storeId);
         $attributesToAdd = [];
-        $defaultVirtualReplicaEnabled = $this->useVirtualReplica($storeId);
-        $virtualReplicaCount = 0;
         foreach ($attrs as $key => $attr) {
-            if ($virtualReplicaCount < self::MAX_VIRTUAL_REPLICA_COUNT && ($defaultVirtualReplicaEnabled || (isset($attr['virtualReplica']) && $attr['virtualReplica']))){
-                $virtualReplica = 1;
-            } else {
-                $virtualReplica = 0;
-            }
             $indexName = false;
             $sortAttribute = false;
             if ($this->isCustomerGroupsEnabled($storeId) && $attr['attribute'] === 'price') {
@@ -1052,7 +1044,6 @@ public function getSortingIndices($originalIndexName, $storeId = null, $currentC
                     $newAttr['attribute'] = $attr['attribute'];
                     $newAttr['sort'] = $attr['sort'];
                     $newAttr['sortLabel'] = $attr['sortLabel'];
-                    $newAttr['virtualReplica'] = $virtualReplica;
                     if (!array_key_exists('label', $newAttr) && array_key_exists('sortLabel', $newAttr)) {
                         $newAttr['label'] = $newAttr['sortLabel'];
                     }
@@ -1068,7 +1059,6 @@ public function getSortingIndices($originalIndexName, $storeId = null, $currentC
                         'custom',
                     ];
                     $attributesToAdd[$newAttr['sort']][] = $newAttr;
-                    $virtualReplicaCount++;
                 }
             } elseif ($attr['attribute'] === 'price') {
                 $indexName = $originalIndexName . '_' . $attr['attribute'] . '_' . 'default' . '_' . $attr['sort'];
@@ -1078,8 +1068,7 @@ public function getSortingIndices($originalIndexName, $storeId = null, $currentC
                 $sortAttribute = $attr['attribute'];
             }
             if ($indexName && $sortAttribute) {
-                $attrs[$key]['name'] = $indexName;
-                $attrs[$key]['virtualReplica'] = $virtualReplica;
+                $attrs[$key]['name'] = $indexName;                
                 if (!array_key_exists('label', $attrs[$key]) && array_key_exists('sortLabel', $attrs[$key])) {
                     $attrs[$key]['label'] = $attrs[$key]['sortLabel'];
                 }
@@ -1094,7 +1083,6 @@ public function getSortingIndices($originalIndexName, $storeId = null, $currentC
                     'exact',
                     'custom',
                 ];
-                $virtualReplicaCount++;
             }
         }
         $attrsToReturn = [];

Helper/Entity/ProductHelper.php

@@ -464,7 +464,7 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
 
         if ($this->configHelper->isInstantEnabled($storeId)) {
             $replicas = array_values(array_map(function ($sortingIndex) {
-                return [$sortingIndex['name'],$sortingIndex['virtualReplica']];
+                return $sortingIndex['name'];
             }, $sortingIndices));
         }
 
@@ -488,23 +488,24 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
             $this->logger->log('Setting replicas to "' . $indexName . '" index.');
             $this->logger->log('Replicas: ' . json_encode($replicas));
             $setReplicasTaskId = $this->algoliaHelper->getLastTaskId();
-            foreach ($sortingIndices as $values) {
-                if ($values['virtualReplica']) {
+            if (!$this->configHelper->useVirtualReplica($storeId)) {
+                foreach ($sortingIndices as $values) {
+                    $replicaName = $values['name'];
+                    $indexSettings['ranking'] = $values['ranking'];
+                    $this->algoliaHelper->setSettings($replicaName, $indexSettings, false, true);
+                    $this->logger->log('Setting settings to "' . $replicaName . '" replica.');
+                    $this->logger->log('Settings: ' . json_encode($indexSettings));
+                }
+            } else {
+                foreach ($sortingIndices as $values) {
                     $replicaName = $values['name'];
                     array_unshift($customRanking, $values['ranking'][0]);
                     $replicaSetting['customRanking'] = $customRanking;
                     $this->algoliaHelper->setSettings($replicaName, $replicaSetting, false, false);
                     $this->logger->log('Setting settings to "' . $replicaName . '" replica.');
                     $this->logger->log('Settings: ' . json_encode($replicaSetting));
-                } else {
-                    $replicaName = $values['name'];
-                    $indexSettings['ranking'] = $values['ranking'];
-                    $this->algoliaHelper->setSettings($replicaName, $indexSettings, false, true);
-                    $this->logger->log('Setting settings to "' . $replicaName . '" replica.');
-                    $this->logger->log('Settings: ' . json_encode($indexSettings));
                 }
             }
-
         } else {
             $this->algoliaHelper->setSettings($indexName, ['replicas' => []]);
             $this->logger->log('Removing replicas from "' . $indexName . '" index');
@@ -1546,13 +1547,9 @@ public function handleVirtualReplica($replicas)
     {
         $virtualReplicaArray = [];
         foreach ($replicas as $replica) {
-            if ($replica[1]) {
-                $replicaArray[] = 'virtual(' . $replica[0] . ')';
-            } else {
-                $replicaArray[] = $replica[0];
-            }
+            $virtualReplicaArray[] = 'virtual(' . $replica . ')';
         }
-        return $replicaArray;
+        return $virtualReplicaArray;
     }
 
     /**
@@ -1567,7 +1564,7 @@ public function handlingReplica($indexName, $storeId, $sortingAttribute = false)
         $sortingIndices = $this->configHelper->getSortingIndices($indexName, $storeId, null, $sortingAttribute);
         if ($this->configHelper->isInstantEnabled($storeId)) {
             $replicas = array_values(array_map(function ($sortingIndex) {
-                return [$sortingIndex['name'],$sortingIndex['virtualReplica']];
+                return $sortingIndex['name'];
             }, $sortingIndices));
 
             try {