View Options

	diff --git a/src/applications/paste/query/PhabricatorPasteQuery.php b/src/applications/paste/query/PhabricatorPasteQuery.php
	index d22ab8154d..65794eae94 100644
	--- a/src/applications/paste/query/PhabricatorPasteQuery.php
	+++ b/src/applications/paste/query/PhabricatorPasteQuery.php
	@@ -1,183 +1,197 @@
	<?php

	final class PhabricatorPasteQuery
	extends PhabricatorCursorPagedPolicyAwareQuery {

	private $ids;
	private $phids;
	private $authorPHIDs;
	private $parentPHIDs;

	private $needContent;
	private $needRawContent;

	public function withIDs(array $ids) {
	$this->ids = $ids;
	return $this;
	}

	public function withPHIDs(array $phids) {
	$this->phids = $phids;
	return $this;
	}

	public function withAuthorPHIDs(array $phids) {
	$this->authorPHIDs = $phids;
	return $this;
	}

	public function withParentPHIDs(array $phids) {
	$this->parentPHIDs = $phids;
	return $this;
	}

	public function needContent($need_content) {
	$this->needContent = $need_content;
	return $this;
	}

	public function needRawContent($need_raw_content) {
	$this->needRawContent = $need_raw_content;
	return $this;
	}

	protected function loadPage() {
	$table = new PhabricatorPaste();
	$conn_r = $table->establishConnection('r');

	$data = queryfx_all(
	$conn_r,
	'SELECT paste.* FROM %T paste %Q %Q %Q',
	$table->getTableName(),
	$this->buildWhereClause($conn_r),
	$this->buildOrderClause($conn_r),
	$this->buildLimitClause($conn_r));

	$pastes = $table->loadAllFromArray($data);

	- if ($pastes && $this->needRawContent) {
	- $this->loadRawContent($pastes);
	+ return $pastes;
	+ }
	+
	+ protected function willFilterPage(array $pastes) {
	+ if (!$pastes) {
	+ return $pastes;
	}

	- if ($pastes && $this->needContent) {
	- $this->loadContent($pastes);
	+ if ($this->needRawContent) {
	+ $pastes = $this->loadRawContent($pastes);
	+ }
	+
	+ if ($this->needContent) {
	+ $pastes = $this->loadContent($pastes);
	}

	return $pastes;
	}

	protected function buildWhereClause($conn_r) {
	$where = array();

	$where[] = $this->buildPagingClause($conn_r);

	if ($this->ids) {
	$where[] = qsprintf(
	$conn_r,
	'id IN (%Ld)',
	$this->ids);
	}

	if ($this->phids) {
	$where[] = qsprintf(
	$conn_r,
	'phid IN (%Ls)',
	$this->phids);
	}

	if ($this->authorPHIDs) {
	$where[] = qsprintf(
	$conn_r,
	'authorPHID IN (%Ls)',
	$this->authorPHIDs);
	}

	if ($this->parentPHIDs) {
	$where[] = qsprintf(
	$conn_r,
	'parentPHID IN (%Ls)',
	$this->parentPHIDs);
	}

	return $this->formatWhereClause($where);
	}

	private function getContentCacheKey(PhabricatorPaste $paste) {
	return 'P'.$paste->getID().':content/'.$paste->getLanguage();
	}

	private function loadRawContent(array $pastes) {
	$file_phids = mpull($pastes, 'getFilePHID');
	$files = id(new PhabricatorFile())->loadAllWhere(
	'phid IN (%Ls)',
	$file_phids);
	$files = mpull($files, null, 'getPHID');

	- foreach ($pastes as $paste) {
	+ foreach ($pastes as $key => $paste) {
	$file = idx($files, $paste->getFilePHID());
	- if ($file) {
	- $paste->attachRawContent($file->loadFileData());
	- } else {
	- $paste->attachRawContent('');
	+ if (!$file) {
	+ unset($pastes[$key]);
	+ continue;
	}
	+ $paste->attachRawContent($file->loadFileData());
	}
	+
	+ return $pastes;
	}

	private function loadContent(array $pastes) {
	$cache = new PhabricatorKeyValueDatabaseCache();

	$cache = new PhutilKeyValueCacheProfiler($cache);
	$cache->setProfiler(PhutilServiceProfiler::getInstance());

	$keys = array();
	foreach ($pastes as $paste) {
	$keys[] = $this->getContentCacheKey($paste);
	}

	-
	$caches = $cache->getKeys($keys);
	+ $results = array();

	$need_raw = array();
	- foreach ($pastes as $paste) {
	+ foreach ($pastes as $key => $paste) {
	$key = $this->getContentCacheKey($paste);
	if (isset($caches[$key])) {
	$paste->attachContent(phutil_safe_html($caches[$key]));
	+ $results[$key] = $paste;
	} else {
	- $need_raw[] = $paste;
	+ $need_raw[$key] = $paste;
	}
	}

	if (!$need_raw) {
	- return;
	+ return $results;
	}

	$write_data = array();

	- $this->loadRawContent($need_raw);
	- foreach ($need_raw as $paste) {
	+ $need_raw = $this->loadRawContent($need_raw);
	+ foreach ($need_raw as $key => $paste) {
	$content = $this->buildContent($paste);
	$paste->attachContent($content);

	$write_data[$this->getContentCacheKey($paste)] = (string)$content;
	+ $results[$key] = $paste;
	}

	$cache->setKeys($write_data);
	+
	+ return $results;
	}


	private function buildContent(PhabricatorPaste $paste) {
	$language = $paste->getLanguage();
	$source = $paste->getRawContent();

	if (empty($language)) {
	return PhabricatorSyntaxHighlighter::highlightWithFilename(
	$paste->getTitle(),
	$source);
	} else {
	return PhabricatorSyntaxHighlighter::highlightWithLanguage(
	$language,
	$source);
	}
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Jan 19 2025, 22:01 (6 w, 2 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1129191
Default Alt Text: (5 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions