[1.0.0] Only materialize the attributes needed in PDO.

src/FreeDSx/Ldap/Search/Filter/ApproximateFilter.php

@@ -20,7 +20,7 @@
  *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
-class ApproximateFilter implements FilterInterface, Stringable
+class ApproximateFilter implements FilterInterface, FilterAttributeInterface, Stringable
 {
     use AttributeValueAssertionTrait;
 

src/FreeDSx/Ldap/Search/Filter/EqualityFilter.php

@@ -20,7 +20,7 @@
  *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
-class EqualityFilter implements FilterInterface, Stringable
+class EqualityFilter implements FilterInterface, FilterAttributeInterface, Stringable
 {
     use AttributeValueAssertionTrait;
 

src/FreeDSx/Ldap/Search/Filter/FilterAttributeInterface.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of the FreeDSx LDAP package.
+ *
+ * (c) Chad Sikorra <Chad.Sikorra@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FreeDSx\Ldap\Search\Filter;
+
+/**
+ * A filter that asserts against a single attribute type.
+ */
+interface FilterAttributeInterface
+{
+    /**
+     * The attribute type the filter references, or null when it is unspecified (an extensibleMatch without one).
+     */
+    public function getAttribute(): ?string;
+}

src/FreeDSx/Ldap/Search/Filter/FilterAttributes.php

@@ -0,0 +1,93 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of the FreeDSx LDAP package.
+ *
+ * (c) Chad Sikorra <Chad.Sikorra@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FreeDSx\Ldap\Search\Filter;
+
+use function array_merge;
+use function array_unique;
+use function array_values;
+use function strtok;
+use function strtolower;
+
+/**
+ * Collects the base attribute names a filter references, so a reader can materialize just those for evaluation.
+ */
+final class FilterAttributes
+{
+    /**
+     * Lowercased base attribute names the filter references, or null when the set is indeterminate (an extensibleMatch
+     * without an attribute, or an unrecognized filter type) and every attribute must therefore be materialized.
+     *
+     * @return list<string>|null
+     */
+    public static function referenced(FilterInterface $filter): ?array
+    {
+        $names = self::walk($filter);
+
+        if ($names === null) {
+            return null;
+        }
+
+        return array_values(array_unique($names));
+    }
+
+    /**
+     * @return list<string>|null
+     */
+    private static function walk(FilterInterface $filter): ?array
+    {
+        if ($filter instanceof FilterContainerInterface) {
+            return self::walkChildren($filter->get());
+        }
+
+        if ($filter instanceof NotFilter) {
+            return self::walk($filter->get());
+        }
+
+        if (!$filter instanceof FilterAttributeInterface) {
+            return null;
+        }
+
+        $attribute = $filter->getAttribute();
+
+        if ($attribute === null) {
+            return null;
+        }
+
+        return [strtolower((string) strtok($attribute, ';'))];
+    }
+
+    /**
+     * @param array<FilterInterface> $children
+     * @return list<string>|null
+     */
+    private static function walkChildren(array $children): ?array
+    {
+        $names = [];
+
+        foreach ($children as $child) {
+            $childNames = self::walk($child);
+
+            if ($childNames === null) {
+                return null;
+            }
+
+            $names = array_merge(
+                $names,
+                $childNames,
+            );
+        }
+
+        return $names;
+    }
+}

src/FreeDSx/Ldap/Search/Filter/GreaterThanOrEqualFilter.php

@@ -20,7 +20,7 @@
  *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
-class GreaterThanOrEqualFilter implements FilterInterface, Stringable
+class GreaterThanOrEqualFilter implements FilterInterface, FilterAttributeInterface, Stringable
 {
     use AttributeValueAssertionTrait;
 

src/FreeDSx/Ldap/Search/Filter/LessThanOrEqualFilter.php

@@ -20,7 +20,7 @@
  *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
-class LessThanOrEqualFilter implements FilterInterface, Stringable
+class LessThanOrEqualFilter implements FilterInterface, FilterAttributeInterface, Stringable
 {
     use AttributeValueAssertionTrait;
 

src/FreeDSx/Ldap/Search/Filter/MatchingRuleFilter.php

@@ -38,7 +38,7 @@
  *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
-class MatchingRuleFilter implements FilterInterface, Stringable
+class MatchingRuleFilter implements FilterInterface, FilterAttributeInterface, Stringable
 {
     protected const CHOICE_TAG = 9;
 

src/FreeDSx/Ldap/Search/Filter/PresentFilter.php

@@ -29,7 +29,7 @@
  *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
-class PresentFilter implements FilterInterface, Stringable
+class PresentFilter implements FilterInterface, FilterAttributeInterface, Stringable
 {
     use FilterAttributeTrait;
 

src/FreeDSx/Ldap/Search/Filter/SubstringFilter.php

@@ -40,7 +40,7 @@
  *
  * @author Chad Sikorra <Chad.Sikorra@gmail.com>
  */
-class SubstringFilter implements FilterInterface, Stringable
+class SubstringFilter implements FilterInterface, FilterAttributeInterface, Stringable
 {
     use FilterAttributeTrait;
 

src/FreeDSx/Ldap/Server/Backend/Storage/Adapter/PdoStorage.php

@@ -182,6 +182,7 @@ public function list(StorageListOptions $options): EntryStream
                         $composed->params,
                     ),
                     $deadline,
+                    $options->attributes,
                 ),
                 false,
             );
@@ -208,6 +209,7 @@ public function list(StorageListOptions $options): EntryStream
             $this->generateRows(
                 $this->prepareAndExecute($query->sql, $query->params),
                 $deadline,
+                $options->attributes,
             ),
             $isPreFiltered,
         );
@@ -397,16 +399,27 @@ private function probeLeafSelectivity(SidecarLeaf $leaf): int
     /**
      * @return Generator<Entry>
      */
+    /**
+     * @param list<string>|null $attributes
+     */
     private function generateRows(
         PooledStatement $stmt,
         ?float $deadline,
+        ?array $attributes = null,
     ): Generator {
+        $allowed = $attributes === null
+            ? null
+            : array_fill_keys($attributes, true);
+
         while (($row = $stmt->fetch()) !== false) {
             if ($deadline !== null && microtime(true) >= $deadline) {
                 throw new TimeLimitExceededException();
             }
 
-            $entry = $this->rowToEntry($row);
+            $entry = $this->rowToEntry(
+                $row,
+                $allowed,
+            );
             if ($entry !== null) {
                 yield $entry;
             }
@@ -515,8 +528,13 @@ private function encodeAttributes(Entry $entry): string
         return serialize($attributes);
     }
 
-    private function rowToEntry(mixed $row): ?Entry
-    {
+    /**
+     * @param array<string, true>|null $allowed Base names to materialize, or null for all.
+     */
+    private function rowToEntry(
+        mixed $row,
+        ?array $allowed = null,
+    ): ?Entry {
         if (!is_array($row)) {
             return null;
         }
@@ -541,6 +559,10 @@ private function rowToEntry(mixed $row): ?Entry
         $attributes = [];
 
         foreach ($raw as $name => $values) {
+            if ($allowed !== null && !isset($allowed[strtolower((string) strtok($name, ';'))])) {
+                continue;
+            }
+
             $attributes[] = Attribute::fromArray(
                 $name,
                 $values,

src/FreeDSx/Ldap/Server/Backend/Storage/StorageListOptions.php

@@ -28,6 +28,7 @@ final class StorageListOptions
 {
     /**
      * @param SortKey[] $sortKeys
+     * @param list<string>|null $attributes Lowercase base attribute names to materialize, or null for all.
      * @param (\Closure(string): (bool|null))|null $isIntegerOrderedResolver Resolves whether an attribute orders numerically.
      */
     public function __construct(
@@ -38,6 +39,7 @@ public function __construct(
         public readonly int $sizeLimit = 0,
         public readonly array $sortKeys = [],
         public readonly int $lookthroughLimit = 0,
+        public readonly ?array $attributes = null,
         public readonly ?Closure $isIntegerOrderedResolver = null,
     ) {}
 

src/FreeDSx/Ldap/Server/Backend/Storage/WritableStorageBackend.php

@@ -16,6 +16,7 @@
 use FreeDSx\Ldap\Control\Control;
 use FreeDSx\Ldap\Control\ControlBag;
 use FreeDSx\Ldap\Control\Sorting\SortingControl;
+use FreeDSx\Ldap\Entry\Attribute;
 use FreeDSx\Ldap\Entry\Change;
 use FreeDSx\Ldap\Entry\Dn;
 use FreeDSx\Ldap\Entry\Entry;
@@ -34,6 +35,7 @@
 use FreeDSx\Ldap\Server\Backend\Write\Command\MoveCommand;
 use FreeDSx\Ldap\Server\Backend\Write\Command\UpdateCommand;
 use FreeDSx\Ldap\Search\Filter\EqualityFilter;
+use FreeDSx\Ldap\Search\Filter\FilterAttributes;
 use FreeDSx\Ldap\Server\Backend\Storage\Exception\DnTooLongException;
 use FreeDSx\Ldap\Server\Backend\Storage\Exception\InvalidAttributeException;
 use FreeDSx\Ldap\Server\Backend\Storage\Exception\StorageIoException;
@@ -207,6 +209,7 @@ public function search(
                 ? $sortingControl->getSortKeys()
                 : [],
             lookthroughLimit: $limits->maxSearchLookthrough,
+            attributes: $this->materializedAttributes($request),
             isIntegerOrderedResolver: fn(string $attribute): ?bool => $this->schema?->isIntegerOrdered($attribute),
         );
 
@@ -498,6 +501,43 @@ public function move(
         });
     }
 
+    /**
+     * Base attribute names storage must materialize (requested plus filter-referenced), or null to materialize all.
+     *
+     * @return list<string>|null
+     */
+    private function materializedAttributes(SearchRequest $request): ?array
+    {
+        $names = array_map(
+            static fn(Attribute $attribute): string => strtolower($attribute->getName()),
+            $request->getAttributes(),
+        );
+
+        if ($names === [] || in_array('*', $names, true) || in_array('+', $names, true)) {
+            return null;
+        }
+
+        $filterAttributes = FilterAttributes::referenced($request->getFilter());
+
+        if ($filterAttributes === null) {
+            return null;
+        }
+
+        $materialized = [];
+        foreach ($names as $name) {
+            if ($name === '1.1') {
+                continue;
+            }
+
+            $materialized[$name] = true;
+        }
+        foreach ($filterAttributes as $attribute) {
+            $materialized[$attribute] = true;
+        }
+
+        return array_keys($materialized);
+    }
+
     /**
      * Confirm the search base exists.
      *