Page MenuHomestyx hydra
Files F128419

No OneTemporary
Actions

View Options

diff --git a/src/applications/harbormaster/storage/HarbormasterSchemaSpec.php b/src/applications/harbormaster/storage/HarbormasterSchemaSpec.php
index 60d942596e..b1ec953af9 100644
--- a/src/applications/harbormaster/storage/HarbormasterSchemaSpec.php
+++ b/src/applications/harbormaster/storage/HarbormasterSchemaSpec.php
@@ -1,51 +1,51 @@
<?php
final class HarbormasterSchemaSpec extends PhabricatorConfigSchemaSpec {
public function buildSchemata() {
$this->buildEdgeSchemata(new HarbormasterBuildable());
// NOTE: This table is not used by any Harbormaster objects, but is used
// by unit tests.
$this->buildRawSchema(
id(new HarbormasterObject())->getApplicationName(),
PhabricatorLiskDAO::COUNTER_TABLE_NAME,
array(
'counterName' => 'text32',
'counterValue' => 'id64',
),
array(
'PRIMARY' => array(
'columns' => array('counterName'),
'unique' => true,
),
));
$this->buildRawSchema(
id(new HarbormasterBuildable())->getApplicationName(),
- 'harbormaster_buildlogchunk',
+ HarbormasterBuildLog::CHUNK_TABLE,
array(
'id' => 'auto',
'logID' => 'id',
'encoding' => 'text32',
// T6203/NULLABILITY
// Both the type and nullability of this column are crazily wrong.
'size' => 'uint32?',
'chunk' => 'bytes',
),
array(
'PRIMARY' => array(
'columns' => array('id'),
'unique' => true,
),
'key_log' => array(
'columns' => array('logID'),
),
));
}
}
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index 8b7c5c85bb..50b1545c06 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -1,221 +1,239 @@
<?php
final class HarbormasterBuildLog
extends HarbormasterDAO
implements PhabricatorPolicyInterface {
protected $buildTargetPHID;
protected $logSource;
protected $logType;
protected $duration;
protected $live;
private $buildTarget = self::ATTACHABLE;
+ private $rope;
+ private $isOpen;
const CHUNK_BYTE_LIMIT = 102400;
+ const CHUNK_TABLE = 'harbormaster_buildlogchunk';
/**
* The log is encoded as plain text.
*/
const ENCODING_TEXT = 'text';
+ public function __construct() {
+ $this->rope = new PhutilRope();
+ }
+
public function __destruct() {
- if ($this->getLive()) {
+ if ($this->isOpen) {
$this->closeBuildLog();
}
}
public static function initializeNewBuildLog(
HarbormasterBuildTarget $build_target) {
return id(new HarbormasterBuildLog())
->setBuildTargetPHID($build_target->getPHID())
->setDuration(null)
->setLive(0);
}
public function openBuildLog() {
- if ($this->getLive()) {
+ if ($this->isOpen) {
throw new Exception(pht('This build log is already open!'));
}
+ $this->isOpen = true;
+
return $this
->setLive(1)
->save();
}
public function closeBuildLog() {
- if (!$this->getLive()) {
+ if (!$this->isOpen) {
throw new Exception(pht('This build log is not open!'));
}
// TODO: Encode the log contents in a gzipped format.
$this->reload();
$start = $this->getDateCreated();
$now = PhabricatorTime::getNow();
return $this
->setDuration($now - $start)
->setLive(0)
->save();
}
protected function getConfiguration() {
return array(
self::CONFIG_AUX_PHID => true,
self::CONFIG_COLUMN_SCHEMA => array(
// T6203/NULLABILITY
// It seems like these should be non-nullable? All logs should have a
// source, etc.
'logSource' => 'text255?',
'logType' => 'text255?',
'duration' => 'uint32?',
'live' => 'bool',
),
self::CONFIG_KEY_SCHEMA => array(
'key_buildtarget' => array(
'columns' => array('buildTargetPHID'),
),
),
) + parent::getConfiguration();
}
public function generatePHID() {
return PhabricatorPHID::generateNewPHID(
HarbormasterBuildLogPHIDType::TYPECONST);
}
public function attachBuildTarget(HarbormasterBuildTarget $build_target) {
$this->buildTarget = $build_target;
return $this;
}
public function getBuildTarget() {
return $this->assertAttached($this->buildTarget);
}
public function getName() {
return pht('Build Log');
}
public function append($content) {
if (!$this->getLive()) {
throw new PhutilInvalidStateException('openBuildLog');
}
$content = (string)$content;
- if (!strlen($content)) {
- return;
- }
- // If the length of the content is greater than the chunk size limit,
- // then we can never fit the content in a single record. We need to
- // split our content out and call append on it for as many parts as there
- // are to the content.
- if (strlen($content) > self::CHUNK_BYTE_LIMIT) {
- $current = $content;
- while (strlen($current) > self::CHUNK_BYTE_LIMIT) {
- $part = substr($current, 0, self::CHUNK_BYTE_LIMIT);
- $current = substr($current, self::CHUNK_BYTE_LIMIT);
- $this->append($part);
+ $this->rope->append($content);
+ $this->flush();
+ }
+
+ private function flush() {
+
+ // TODO: Maybe don't flush more than a couple of times per second. If a
+ // caller writes a single character over and over again, we'll currently
+ // spend a lot of time flushing that.
+
+ $chunk_table = self::CHUNK_TABLE;
+ $chunk_limit = self::CHUNK_BYTE_LIMIT;
+ $rope = $this->rope;
+
+ while (true) {
+ $length = $rope->getByteLength();
+ if (!$length) {
+ break;
}
- $this->append($current);
- return;
- }
- // Retrieve the size of last chunk from the DB for this log. If the
- // chunk is over 500K, then we need to create a new log entry.
- $conn = $this->establishConnection('w');
- $result = queryfx_all(
- $conn,
- 'SELECT id, size, encoding '.
- 'FROM harbormaster_buildlogchunk '.
- 'WHERE logID = %d '.
- 'ORDER BY id DESC '.
- 'LIMIT 1',
- $this->getID());
- if (count($result) === 0 ||
- $result[0]['size'] + strlen($content) > self::CHUNK_BYTE_LIMIT ||
- $result[0]['encoding'] !== self::ENCODING_TEXT) {
-
- // We must insert a new chunk because the data we are appending
- // won't fit into the existing one, or we don't have any existing
- // chunk data.
- queryfx(
- $conn,
- 'INSERT INTO harbormaster_buildlogchunk '.
- '(logID, encoding, size, chunk) '.
- 'VALUES '.
- '(%d, %s, %d, %B)',
- $this->getID(),
- self::ENCODING_TEXT,
- strlen($content),
- $content);
- } else {
- // We have a resulting record that we can append our content onto.
- queryfx(
- $conn,
- 'UPDATE harbormaster_buildlogchunk '.
- 'SET chunk = CONCAT(chunk, %B), size = LENGTH(CONCAT(chunk, %B))'.
- 'WHERE id = %d',
- $content,
- $content,
- $result[0]['id']);
+ $conn_w = $this->establishConnection('w');
+ $tail = queryfx_one(
+ $conn_w,
+ 'SELECT id, size, encoding FROM %T WHERE logID = %d
+ ORDER BY id DESC LIMIT 1',
+ $chunk_table,
+ $this->getID());
+
+ $can_append =
+ ($tail) &&
+ ($tail['encoding'] == self::ENCODING_TEXT) &&
+ ($tail['size'] < $chunk_limit);
+ if ($can_append) {
+ $append_id = $tail['id'];
+ $prefix_size = $tail['size'];
+ } else {
+ $append_id = null;
+ $prefix_size = 0;
+ }
+
+ $data_limit = ($chunk_limit - $prefix_size);
+ $append_data = $rope->getPrefixBytes($data_limit);
+ $data_size = strlen($append_data);
+
+ if ($append_id) {
+ queryfx(
+ $conn_w,
+ 'UPDATE %T SET chunk = CONCAT(chunk, %B), size = %d WHERE id = %d',
+ $chunk_table,
+ $append_data,
+ $prefix_size + $data_size,
+ $append_id);
+ } else {
+ queryfx(
+ $conn_w,
+ 'INSERT INTO %T (logID, encoding, size, chunk)
+ VALUES (%d, %s, %d, %B)',
+ $chunk_table,
+ $this->getID(),
+ self::ENCODING_TEXT,
+ $data_size,
+ $append_data);
+ }
+
+ $rope->removeBytesFromHead(strlen($append_data));
}
}
public function getLogText() {
// TODO: This won't cope very well if we're pulling like a 700MB
// log file out of the DB. We should probably implement some sort
// of optional limit parameter so that when we're rendering out only
// 25 lines in the UI, we don't wastefully read in the whole log.
// We have to read our content out of the database and stitch all of
// the log data back together.
$conn = $this->establishConnection('r');
$result = queryfx_all(
$conn,
'SELECT chunk '.
'FROM harbormaster_buildlogchunk '.
'WHERE logID = %d '.
'ORDER BY id ASC',
$this->getID());
$content = '';
foreach ($result as $row) {
$content .= $row['chunk'];
}
return $content;
}
/* -( PhabricatorPolicyInterface )----------------------------------------- */
public function getCapabilities() {
return array(
PhabricatorPolicyCapability::CAN_VIEW,
);
}
public function getPolicy($capability) {
return $this->getBuildTarget()->getPolicy($capability);
}
public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
return $this->getBuildTarget()->hasAutomaticCapability(
$capability,
$viewer);
}
public function describeAutomaticCapability($capability) {
return pht(
"Users must be able to see a build target to view it's build log.");
}
}

File Metadata

Mime Type
text/x-diff
Expires
Wed, Apr 30, 3:12 PM (1 d, 10 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
108740
Default Alt Text
(10 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)