Skip to content

Commit 3782315

Browse files
dfeyerdfeyer
committed
Merge branch 'johannessteu-master' into 3.0
2 parents dbc595d + 52d4a94 commit 3782315

6 files changed

Lines changed: 89 additions & 30 deletions

File tree

‎Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Command/NodeIndexQueueCommandController.php‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@
22
namespace Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\Command;
33

44
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexer;
5+
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
56
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
67
use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\Domain\Repository\NodeDataRepository;
78
use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\IndexingJob;
89
use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\LoggerTrait;
910
use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\UpdateAliasJob;
10-
use Flowpack\ElasticSearch\Domain\Model\Mapping;
1111
use Flowpack\JobQueue\Common\Job\JobManager;
12-
use Flowpack\JobQueue\Common\Queue\QueueManager;
13-
use TYPO3\Flow\Annotations as Flow;
14-
use TYPO3\Flow\Cli\CommandController;
15-
use TYPO3\Flow\Persistence\PersistenceManagerInterface;
16-
use TYPO3\Flow\Utility\Files;
17-
use TYPO3\TYPO3CR\Domain\Repository\WorkspaceRepository;
18-
use Flowpack\JobQueue\Common\Exception as JobQueueException;
12+
use Neos\Flow\Annotations as Flow;
13+
use Neos\Flow\Cli\CommandController;
14+
use Neos\Flow\Persistence\PersistenceManagerInterface;
15+
use Neos\ContentRepository\Domain\Repository\WorkspaceRepository;
1916

2017
/**
2118
* Provides CLI features for index handling
@@ -82,6 +79,7 @@ public function buildCommand($workspace = null)
8279
$indexName = $this->createNextIndex($indexPostfix);
8380
$this->updateMapping();
8481

82+
8583
$this->outputLine();
8684
$this->outputLine('<b>Indexing on %s ...</b>', [$indexName]);
8785

@@ -211,7 +209,7 @@ protected function indexWorkspace($workspaceName, $indexPostfix)
211209
$this->outputLine('<info>++</info> Indexing %s workspace', [$workspaceName]);
212210
$nodeCounter = 0;
213211
$offset = 0;
214-
$batchSize = 250;
212+
$batchSize = 500;
215213
while (true) {
216214
$iterator = $this->nodeDataRepository->findAllBySiteAndWorkspace($workspaceName, $offset, $batchSize);
217215

‎Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Domain/Repository/NodeDataRepository.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,16 @@
33

44
use Doctrine\Common\Persistence\ObjectManager;
55
use Doctrine\ORM\Internal\Hydration\IterableResult;
6-
use Doctrine\ORM\Query;
76
use Doctrine\ORM\QueryBuilder;
8-
use TYPO3\Flow\Annotations as Flow;
9-
use TYPO3\Flow\Persistence\Repository;
10-
use TYPO3\TYPO3CR\Exception;
7+
use Neos\Flow\Annotations as Flow;
8+
use Neos\Flow\Persistence\Repository;
119

1210
/**
1311
* @Flow\Scope("singleton")
1412
*/
1513
class NodeDataRepository extends Repository
1614
{
17-
const ENTITY_CLASSNAME = 'TYPO3\TYPO3CR\Domain\Model\NodeData';
15+
const ENTITY_CLASSNAME = 'Neos\ContentRepository\Domain\Model\NodeData';
1816

1917
/**
2018
* @Flow\Inject
@@ -35,7 +33,7 @@ public function findAllBySiteAndWorkspace($workspaceName, $firstResult = 0, $max
3533
$queryBuilder = $this->entityManager->createQueryBuilder();
3634

3735
$queryBuilder->select('n.Persistence_Object_Identifier nodeIdentifier, n.dimensionValues dimensions')
38-
->from('TYPO3\TYPO3CR\Domain\Model\NodeData', 'n')
36+
->from('Neos\ContentRepository\Domain\Model\NodeData', 'n')
3937
->where("n.workspace = :workspace AND n.removed = :removed AND n.movedTo IS NULL")
4038
->setFirstResult((integer)$firstResult)
4139
->setMaxResults((integer)$maxResults)
@@ -50,7 +48,7 @@ public function findAllBySiteAndWorkspace($workspaceName, $firstResult = 0, $max
5048
/**
5149
* Iterator over an IterableResult and return a Generator
5250
*
53-
* This methos is useful for batch processing huge result set as it clear the object
51+
* This method is useful for batch processing huge result set as it clear the object
5452
* manager and detach the current object on each iteration.
5553
*
5654
* @param IterableResult $iterator

‎Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/IndexingJob.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
namespace Flowpack\ElasticSearch\ContentRepositoryQueueIndexer;
33

44
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexer;
5+
use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\Domain\Repository\NodeDataRepository;
56
use Flowpack\JobQueue\Common\Job\JobInterface;
67
use Flowpack\JobQueue\Common\Queue\Message;
78
use Flowpack\JobQueue\Common\Queue\QueueInterface;
8-
use TYPO3\Flow\Annotations as Flow;
9-
use TYPO3\Flow\Utility\Algorithms;
10-
use TYPO3\TYPO3CR\Domain\Factory\NodeFactory;
11-
use TYPO3\TYPO3CR\Domain\Model\NodeData;
12-
use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
13-
use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository;
14-
use TYPO3\TYPO3CR\Domain\Service\ContextFactory;
9+
use Neos\Flow\Annotations as Flow;
10+
use Neos\Flow\Log\SystemLoggerInterface;
11+
use Neos\Flow\Utility\Algorithms;
12+
use Neos\ContentRepository\Domain\Factory\NodeFactory;
13+
use Neos\ContentRepository\Domain\Model\NodeInterface;
14+
use Neos\ContentRepository\Domain\Service\ContextFactoryInterface;
1515

1616
/**
1717
* ElasticSearch Indexing Job Interface
@@ -39,7 +39,7 @@ class IndexingJob implements JobInterface
3939
protected $nodeFactory;
4040

4141
/**
42-
* @var ContextFactory
42+
* @var ContextFactoryInterface
4343
* @Flow\Inject
4444
*/
4545
protected $contextFactory;

‎Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/UpdateAliasJob.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
namespace Flowpack\ElasticSearch\ContentRepositoryQueueIndexer;
33

44
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexer;
5+
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
56
use Flowpack\JobQueue\Common\Job\JobInterface;
67
use Flowpack\JobQueue\Common\Queue\Message;
78
use Flowpack\JobQueue\Common\Queue\QueueInterface;
8-
use TYPO3\Flow\Annotations as Flow;
9-
use TYPO3\Flow\Utility\Algorithms;
9+
use Neos\Flow\Annotations as Flow;
10+
use Neos\Flow\Utility\Algorithms;
1011

1112
/**
1213
* ElasticSearch Indexing Job Interface

‎Configuration/Settings.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
Flowpack:
2-
32
ElasticSearch:
4-
53
ContentRepositoryQueueIndexer:
6-
74
enableLiveAsyncIndexing: true
85

96
JobQueue:
10-
117
Common:
128
queues:
139
'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':

‎composer.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,71 @@
1212
"psr-0": {
1313
"Flowpack\\ElasticSearch\\ContentRepositoryQueueIndexer": "Classes"
1414
}
15+
},
16+
"extra": {
17+
"applied-flow-migrations": [
18+
"TYPO3.FLOW3-201201261636",
19+
"TYPO3.Fluid-201205031303",
20+
"TYPO3.FLOW3-201205292145",
21+
"TYPO3.FLOW3-201206271128",
22+
"TYPO3.FLOW3-201209201112",
23+
"TYPO3.Flow-201209251426",
24+
"TYPO3.Flow-201211151101",
25+
"TYPO3.Flow-201212051340",
26+
"TYPO3.TypoScript-130516234520",
27+
"TYPO3.TypoScript-130516235550",
28+
"TYPO3.TYPO3CR-130523180140",
29+
"TYPO3.Neos.NodeTypes-201309111655",
30+
"TYPO3.Flow-201310031523",
31+
"TYPO3.Flow-201405111147",
32+
"TYPO3.Neos-201407061038",
33+
"TYPO3.Neos-201409071922",
34+
"TYPO3.TYPO3CR-140911160326",
35+
"TYPO3.Neos-201410010000",
36+
"TYPO3.TYPO3CR-141101082142",
37+
"TYPO3.Neos-20141113115300",
38+
"TYPO3.Fluid-20141113120800",
39+
"TYPO3.Flow-20141113121400",
40+
"TYPO3.Fluid-20141121091700",
41+
"TYPO3.Neos-20141218134700",
42+
"TYPO3.Fluid-20150214130800",
43+
"TYPO3.Neos-20150303231600",
44+
"TYPO3.TYPO3CR-20150510103823",
45+
"TYPO3.Flow-20151113161300",
46+
"TYPO3.Form-20160601101500",
47+
"TYPO3.Flow-20161115140400",
48+
"TYPO3.Flow-20161115140430",
49+
"Neos.Flow-20161124204700",
50+
"Neos.Flow-20161124204701",
51+
"Neos.Twitter.Bootstrap-20161124204912",
52+
"Neos.Form-20161124205254",
53+
"Neos.Flow-20161124224015",
54+
"Neos.Party-20161124225257",
55+
"Neos.Eel-20161124230101",
56+
"Neos.Setup-20161124230842",
57+
"Neos.Imagine-20161124231742",
58+
"Neos.Media-20161124233100",
59+
"Neos.NodeTypes-20161125002300",
60+
"Neos.Neos-20161125002322",
61+
"Neos.ContentRepository-20161125012000",
62+
"Neos.Fusion-20161125013710",
63+
"Neos.Setup-20161125014759",
64+
"Neos.Fusion-20161125104701",
65+
"Neos.NodeTypes-20161125104800",
66+
"Neos.Neos-20161125104802",
67+
"Neos.Neos-20161125122412",
68+
"Neos.Flow-20161125124112",
69+
"TYPO3.FluidAdaptor-20161130112935",
70+
"Neos.Fusion-20161201202543",
71+
"Neos.Neos-20161201222211",
72+
"Neos.Fusion-20161202215034",
73+
"Neos.Fusion-20161219092345",
74+
"Neos.ContentRepository-20161219093512",
75+
"Neos.Media-20161219094126",
76+
"Neos.Neos-20161219094403",
77+
"Neos.Neos-20161219122512",
78+
"Neos.Fusion-20161219130100",
79+
"Neos.Neos-20161220163741"
80+
]
1581
}
1682
}

0 commit comments

Comments
 (0)