fixup! feat(database): introduce Snowflake IDs generator

Signed-off-by: Benjamin Gaussorgues <[email protected]>

Author: Altahrim

core/Command/SnowflakeDecodeId.php

@@ -8,7 +8,7 @@
  */
 namespace OC\Core\Command;
 
-use OC\SnowflakeId;
+use OC\Snowflake\Decoder;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -26,17 +26,17 @@ protected function configure(): void {
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$snowflakeId = $input->getArgument('snowflake-id');
-		$snowflakeId = new SnowflakeId($snowflakeId);
+		$data = (new Decoder)->decode($snowflakeId);
 
 		$rows = [
-			['Snowflake ID', $snowflakeId->numeric()],
-			['Seconds', $snowflakeId->seconds()],
-			['Milliseconds', $snowflakeId->milliseconds()],
-			['Created from CLI', $snowflakeId->isCli() ? 'yes' : 'no'],
-			['Server ID', $snowflakeId->serverId()],
-			['Sequence ID', $snowflakeId->sequenceId()],
-			['Creation timestamp', $snowflakeId->createdAt()],
-			['Creation date', date('Y-m-d H:i:s', (int)$snowflakeId->createdAt()) . '.' . $snowflakeId->milliseconds()],
+			['Snowflake ID', $snowflakeId],
+			['Seconds', $data['seconds']],
+			['Milliseconds', $data['milliseconds']],
+			['Created from CLI', $data['isCli'] ? 'yes' : 'no'],
+			['Server ID', $data['serverId']],
+			['Sequence ID', $data['sequenceId']],
+			['Creation timestamp', $data['createdAt']->format('U.v')],
+			['Creation date', $data['createdAt']->format('Y-m-d H:i:s.v')],
 		];
 
 		$table = new Table($output);

lib/private/Snowflake/Generator.php

@@ -23,6 +23,7 @@
 final class Generator implements IGenerator {
 	public function __construct(
 		private readonly ITimeFactory $timeFactory,
+		private readonly APCuSequence $sequenceGenerator,
 	) {
 	}
 
@@ -108,18 +109,23 @@ private function isCli(): bool {
 		return PHP_SAPI === 'cli';
 	}
 
-	private function getSequenceId(int $seconds, int $milliseconds, int $serverId): int {
+	private function getSequenceId(int $seconds, int $milliseconds, int $serverId): int|false {
 		$key = 'seq:' . $seconds . ':' . $milliseconds;
 
 		// Use APCu as fastest local cache, but not shared between processes in CLI
-		if (!$this->isCli() && function_exists('apcu_inc')) {
-			// TODO Try to detect reseted APCu cache
-			$sequenceId = apcu_inc($key, ttl: 1);
-			if ($sequenceId === false) {
-				throw new \Exception('Failed to generate SnowflakeId with APCu');
+		if (!$this->isCli() && function_exists('apcu_enabled') && apcu_enabled()) {
+			if ((int)apcu_cache_info(true)['creation_time'] === $seconds) {
+				// APCu cache was just started
+				// It means a sequence was maybe deleted
+				return false;
 			}
 
-			return $sequenceId;
+			$sequenceId = apcu_inc($key, success: $success, ttl: 1);
+			if ($success === true) {
+				return $sequenceId;
+			}
+
+			throw new \Exception('Failed to generate SnowflakeId with APCu');
 		}
 
 		// Otherwise, just return a random number

tests/lib/Snowflake/GeneratorTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later