Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
advancedqueue
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
advancedqueue
Merge requests
!21
#3476814
: Handle nulled duplicate jobs
Code
Review changes
Check out branch
Download
Patches
Plain diff
Open
#3476814
: Handle nulled duplicate jobs
issue/advancedqueue-3476814:3476814-handle-nulled-duplicate
into
8.x-1.x
Overview
0
Commits
5
Pipelines
5
Changes
5
Open
Jonathan Shaw
requested to merge
issue/advancedqueue-3476814:3476814-handle-nulled-duplicate
into
8.x-1.x
8 months ago
Overview
0
Commits
5
Pipelines
5
Changes
5
Expand
/tests/modules/advancedqueue_test/src/Plugin/AdvancedQueue/JobType/AvoidDuplicates.php
/src/Entity/Queue.php
/tests/modules/advancedqueue_test/src/Plugin/AdvancedQueue/JobType/RejectDuplicates.php
/tests/modules/advancedqueue_test/src/Plugin/AdvancedQueue/JobType/SkipDuplicates.php
/tests/src/Kernel/DatabaseBackendTest.php
Closes
#3476814
0
0
Merge request reports
Compare
8.x-1.x
version 4
f4b648e5
8 months ago
version 3
898577bb
8 months ago
version 2
c13d195c
8 months ago
version 1
46d59eca
8 months ago
8.x-1.x (base)
and
latest version
latest version
79992adc
5 commits,
3 months ago
version 4
f4b648e5
4 commits,
8 months ago
version 3
898577bb
3 commits,
8 months ago
version 2
c13d195c
2 commits,
8 months ago
version 1
46d59eca
1 commit,
8 months ago
5 files
+
83
−
21
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
5
Search (e.g. *.vue) (Ctrl+P)
src/Entity/Queue.php
+
13
−
5
Options
@@ -139,7 +139,9 @@ class Queue extends ConfigEntityBase implements QueueInterface {
*/
public
function
enqueueJob
(
Job
$job
,
$delay
=
0
)
{
$job
=
$this
->
prepareJob
(
$job
);
return
$this
->
getBackend
()
->
enqueueJob
(
$job
,
$delay
);
if
(
$job
)
{
$this
->
getBackend
()
->
enqueueJob
(
$job
,
$delay
);
}
}
/**
@@ -148,24 +150,30 @@ class Queue extends ConfigEntityBase implements QueueInterface {
public
function
enqueueJobs
(
array
$jobs
,
$delay
=
0
)
{
$prepared_jobs
=
[];
foreach
(
$jobs
as
$job
)
{
$prepared_jobs
[]
=
$this
->
prepareJob
(
$job
);
if
(
$prepared_job
=
$this
->
prepareJob
(
$job
))
{
$prepared_jobs
[]
=
$prepared_job
;
}
}
if
(
$prepared_jobs
)
{
$this
->
getBackend
()
->
enqueueJobs
(
$prepared_jobs
,
$delay
);
}
return
$this
->
getBackend
()
->
enqueueJobs
(
$prepared_jobs
,
$delay
);
}
/**
* Prepare a job for enqueueing.
*
* If a null is returned, this is an instruction to discard the job.
*
* @param \Drupal\advancedqueue\Job $job
* The job to prepare.
*
* @return \Drupal\advancedqueue\Job
* @return \Drupal\advancedqueue\Job
|null
* A job to enqueue. This may or may not be the $job object supplied.
*
* @throws \Drupal\advancedqueue\Exception\InvalidBackendException
* Throws an exception if the queue's backend cannot handle the given job.
*/
protected
function
prepareJob
(
Job
$job
):
Job
{
protected
function
prepareJob
(
Job
$job
):
?
Job
{
$job
->
setQueueId
(
$this
->
id
());
$job_type_manager
=
\Drupal
::
service
(
'plugin.manager.advancedqueue_job_type'
);
if
(
!
$job_type_manager
->
getDefinition
(
$job
->
getType
())[
'allow_duplicates'
])
{
Loading