Inline 1-use methods for performance/readability

thiemowmde · Krinkle · commit 404b6e37a335 · 2022-11-17T19:55:15.000Z
I suggest this for a series of reasons:

1. Performance. Every function scope is expensive in PHP. This code
is executed hundreds of thousands of times. This adds up fast.

2. This allows us to merge two write() calls together.

3. Readabilty becomes better, I would argue. Names like "addbegin"
and "addend" were not really meaningful to begin with. Inlining them
allows to change the execution order slightly and group stuff together
that belongs together. Both $this-&gt;hplist and $this-&gt;numentries are
only needed much later in finish().

This patch alone makes an actual difference. For example, the
MessageIndexTest in the Translate extension improves from 1.7s to
1.4s on my machine.

Change-Id: I94ce310384a807b8ff177a5c80826d5e77f184b0
diff --git a/src/Writer/PHP.php b/src/Writer/PHP.php
@@ -72,9 +72,27 @@ public function set( $key, $value ): void {
 			// DBA cross-check hack
 			return;
 		}
-		$this->addbegin( strlen( $key ), strlen( $value ) );
-		$this->write( $key . $value );
-		$this->addend( strlen( $key ), strlen( $value ), Util::hash( $key ) );
+
+		// Based on cdb_make_addbegin
+		$keylen = strlen( $key );
+		$datalen = strlen( $value );
+		if ( $keylen > 0x7fffffff ) {
+			$this->throwException( 'Key length too long in file "' . $this->tmpFileName . '".' );
+		}
+		if ( $datalen > 0x7fffffff ) {
+			$this->throwException( 'Data length too long in file "' . $this->tmpFileName . '".' );
+		}
+		$begin = pack( 'VV', $keylen, $datalen );
+
+		$this->write( $begin . $key . $value );
+
+		// Based on cdb_make_addend
+		$this->hplist[] = [
+			'h' => Util::hash( $key ),
+			'p' => $this->pos
+		];
+		$this->numentries++;
+		$this->posplus( 8 + $keylen + $datalen );
 	}
 
 	public function close(): void {
@@ -114,36 +132,6 @@ protected function posplus( $len ) {
 		$this->pos = $newpos;
 	}
 
-	/**
-	 * @param int $keylen
-	 * @param int $datalen
-	 * @param int $h
-	 */
-	protected function addend( $keylen, $datalen, $h ) {
-		$this->hplist[] = [
-			'h' => $h,
-			'p' => $this->pos
-		];
-
-		$this->numentries++;
-		$this->posplus( 8 + $keylen + $datalen );
-	}
-
-	/**
-	 * @param int $keylen
-	 * @param int $datalen
-	 */
-	protected function addbegin( $keylen, $datalen ) {
-		if ( $keylen > 0x7fffffff ) {
-			$this->throwException( 'Key length too long in file "' . $this->tmpFileName . '".' );
-		}
-		if ( $datalen > 0x7fffffff ) {
-			$this->throwException( 'Data length too long in file "' . $this->tmpFileName . '".' );
-		}
-		$buf = pack( 'VV', $keylen, $datalen );
-		$this->write( $buf );
-	}
-
 	protected function finish(): void {
 		// Hack for DBA cross-check
 		$this->hplist = array_reverse( $this->hplist );
