Lift sharding restrictions from $lookup and $graphLookup

doctrine · Dec 20, 2022 · 7a6fcd9 · 7a6fcd9
1 parent 632ad8e
commit 7a6fcd9
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 51 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup.php
@@ -136,9 +136,6 @@ public function depthField(string $depthField): self
      * Target collection for the $graphLookup operation to search, recursively
      * matching the connectFromField to the connectToField.
      *
-     * The from collection cannot be sharded and must be in the same database as
-     * any other collections used in the operation.
-     *
      * @psalm-param class-string|string $from
      */
     public function from(string $from): self
@@ -161,10 +158,6 @@ public function from(string $from): self
             return $this;
         }
 
-        if ($this->targetClass->isSharded()) {
-            throw MappingException::cannotUseShardedCollectionInLookupStages($this->targetClass->name);
-        }
-
         $this->from = $this->targetClass->getCollection();
 
         return $this;
@@ -239,9 +232,6 @@ private function fromReference(string $fieldName): self
 
         $referenceMapping  = $this->class->getFieldMapping($fieldName);
         $this->targetClass = $this->dm->getClassMetadata($referenceMapping['targetDocument']);
-        if ($this->targetClass->isSharded()) {
-            throw MappingException::cannotUseShardedCollectionInLookupStages($this->targetClass->name);
-        }
 
         $this->from = $this->targetClass->getCollection();
 

diff --git a/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Lookup.php b/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Lookup.php
@@ -65,8 +65,6 @@ public function alias(string $alias): self
 
     /**
      * Specifies the collection or field name in the same database to perform the join with.
-     *
-     * Starting in MongoDB 5.1, the from collection can be sharded.
      */
     public function from(string $from): self
     {
@@ -88,10 +86,6 @@ public function from(string $from): self
             return $this;
         }
 
-        if ($this->targetClass->isSharded()) {
-            throw MappingException::cannotUseShardedCollectionInLookupStages($this->targetClass->name);
-        }
-
         $this->from = $this->targetClass->getCollection();
 
         return $this;
@@ -214,9 +208,6 @@ private function fromReference(string $fieldName): self
 
         $referenceMapping  = $this->class->getFieldMapping($fieldName);
         $this->targetClass = $this->dm->getClassMetadata($referenceMapping['targetDocument']);
-        if ($this->targetClass->isSharded()) {
-            throw MappingException::cannotUseShardedCollectionInLookupStages($this->targetClass->name);
-        }
 
         $this->from = $this->targetClass->getCollection();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/GraphLookupTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/GraphLookupTest.php
@@ -15,7 +15,6 @@
 use Documents\GraphLookup\Employee;
 use Documents\GraphLookup\ReportingHierarchy;
 use Documents\GraphLookup\Traveller;
-use Documents\Sharded\ShardedOne;
 use Documents\User;
 
 use function array_merge;
@@ -252,15 +251,6 @@ public function testGraphLookupWithTraveller(Closure $addGraphLookupStage, array
         self::assertCount(3, $result);
     }
 
-    public function testGraphLookupToShardedCollectionThrowsException(): void
-    {
-        $builder = $this->dm->createAggregationBuilder(User::class);
-
-        $this->expectException(MappingException::class);
-        $builder
-            ->graphLookup(ShardedOne::class);
-    }
-
     public function testGraphLookupWithUnmappedFields(): void
     {
         $builder = $this->dm->createAggregationBuilder(User::class);

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/LookupTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/LookupTest.php
@@ -4,11 +4,9 @@
 
 namespace Doctrine\ODM\MongoDB\Tests\Aggregation\Stage;
 
-use Doctrine\ODM\MongoDB\Mapping\MappingException;
 use Doctrine\ODM\MongoDB\Tests\BaseTest;
 use Documents\CmsComment;
 use Documents\ReferenceUser;
-use Documents\Sharded\ShardedOne;
 use Documents\SimpleReferenceUser;
 use Documents\User;
 
@@ -406,26 +404,6 @@ public function testLookupStageReferenceManyInverseStoreAsRef(): void
         self::assertCount(1, $result[0]['embeddedReferenceManyInverse']);
     }
 
-    public function testLookupToShardedCollectionThrowsException(): void
-    {
-        $builder = $this->dm->createAggregationBuilder(User::class);
-
-        $this->expectException(MappingException::class);
-        $builder
-            ->lookup(ShardedOne::class)
-                ->localField('id')
-                ->foreignField('id');
-    }
-
-    public function testLookupToShardedReferenceThrowsException(): void
-    {
-        $builder = $this->dm->createAggregationBuilder(ShardedOne::class);
-
-        $this->expectException(MappingException::class);
-        $builder
-            ->lookup('user');
-    }
-
     private function insertTestData(): void
     {
         $user1 = new User();