Discussion:
[22946] standard/trunk/library/Zend/Service/WindowsAzure: WindowsAzure functional updates
matthew
2010-09-15 18:05:51 UTC
Permalink
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22946] standard/trunk/library/Zend/Service/WindowsAzure: WindowsAzure functional updates</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22946</dd>
<dt>Author</dt> <dd>matthew</dd>
<dt>Date</dt> <dd>2010-09-15 11:05:49 -0700 (Wed, 15 Sep 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>WindowsAzure functional updates

- Updated Storage object to add method for returning HTTP client
(getHttpChannelClient()) (makes debugging easier)
- Updated Table to use timestamp of entity, if provided
- Updated TableEntity to allow better timestamp handling</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardtrunklibraryZendServiceWindowsAzureStorageTablephp">standard/trunk/library/Zend/Service/WindowsAzure/Storage/Table.php</a></li>
<li><a href="#standardtrunklibraryZendServiceWindowsAzureStorageTableEntityphp">standard/trunk/library/Zend/Service/WindowsAzure/Storage/TableEntity.php</a></li>
<li><a href="#standardtrunklibraryZendServiceWindowsAzureStoragephp">standard/trunk/library/Zend/Service/WindowsAzure/Storage.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardtrunklibraryZendServiceWindowsAzureStorageTablephp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Service/WindowsAzure/Storage/Table.php (22945 => 22946)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Service/WindowsAzure/Storage/Table.php 2010-09-14 22:45:17 UTC (rev 22945)
+++ standard/trunk/library/Zend/Service/WindowsAzure/Storage/Table.php 2010-09-15 18:05:49 UTC (rev 22946)
</span><span class="lines">@@ -655,6 +655,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> $mergeEntity = $entity;
</span><span class="cx"> }
</span><ins>+
+ // Ensure entity timestamp matches updated timestamp
+ $entity-&gt;setTimestamp($this-&gt;isoDate()); </ins><span class="cx"> </span><span class="cx"> return $this-&gt;_changeEntity(Zend_Http_Client::MERGE, $tableName, $mergeEntity, $verifyEtag); </span><span class="cx"> } </span><span class="lines">@@ -720,8 +723,14 @@ </span><span class="cx"> &lt;/content&gt; </span><span class="cx"> &lt;/entry&gt;';
</span><span class="cx">
</span><ins>+ // Attempt to get timestamp from entity
+ $timestamp = $entity-&gt;getTimestamp();
+ if ($timestamp == Zend_Service_WindowsAzure_Storage_TableEntity::DEFAULT_TIMESTAMP) {
+ $timestamp = $this-&gt;isoDate();
+ }
+ </ins><span class="cx"> $requestBody = $this-&gt;_fillTemplate($requestBody, array( </span><del>- 'Updated' =&gt; $this-&gt;isoDate(), </del><ins>+ 'Updated' =&gt; $timestamp, </ins><span class="cx"> 'Properties' =&gt; $this-&gt;_generateAzureRepresentation($entity) </span><span class="cx"> )); </span><span class="cx"> </span><span class="lines">@@ -737,10 +746,10 @@ </span><span class="cx"> // Perform request </span><span class="cx"> $response = null; </span><span class="cx"> if ($this-&gt;isInBatch()) { </span><del>- $this-&gt;getCurrentBatch()-&gt;enlistOperation($tableName . '(PartitionKey=\'' . $entity-&gt;getPartitionKey() . '\', RowKey=\'' . $entity-&gt;getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody); </del><ins>+ $this-&gt;getCurrentBatch()-&gt;enlistOperation($tableName . '(PartitionKey=\'' . $entity-&gt;getPartitionKey() . '\',RowKey=\'' . $entity-&gt;getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody); </ins><span class="cx"> return null; </span><span class="cx"> } else { </span><del>- $response = $this-&gt;_performRequest($tableName . '(PartitionKey=\'' . $entity-&gt;getPartitionKey() . '\', RowKey=\'' . $entity-&gt;getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody); </del><ins>+ $response = $this-&gt;_performRequest($tableName . '(PartitionKey=\'' . $entity-&gt;getPartitionKey() . '\',RowKey=\'' . $entity-&gt;getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody); </ins><span class="cx"> } </span><span class="cx"> if ($response-&gt;isSuccessful()) {
</span><span class="cx"> // Update properties
</span></span></pre></div>
<a id="standardtrunklibraryZendServiceWindowsAzureStorageTableEntityphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Service/WindowsAzure/Storage/TableEntity.php (22945 => 22946)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Service/WindowsAzure/Storage/TableEntity.php 2010-09-14 22:45:17 UTC (rev 22945)
+++ standard/trunk/library/Zend/Service/WindowsAzure/Storage/TableEntity.php 2010-09-15 18:05:49 UTC (rev 22946)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> */
</span><span class="cx"> class Zend_Service_WindowsAzure_Storage_TableEntity
</span><span class="cx"> {
</span><ins>+ const DEFAULT_TIMESTAMP = '1900-01-01T00:00:00';
+ </ins><span class="cx"> /** </span><span class="cx"> * Partition key </span><span class="cx"> * </span><span class="lines">@@ -54,7 +56,7 @@ </span><span class="cx"> * </span><span class="cx"> * @var string </span><span class="cx"> */ </span><del>- protected $_timestamp = '1900-01-01T00:00:00'; </del><ins>+ protected $_timestamp; </ins><span class="cx"> </span><span class="cx"> /** </span><span class="cx"> * Etag </span><span class="lines">@@ -127,6 +129,9 @@ </span><span class="cx"> */ </span><span class="cx"> public function getTimestamp() </span><span class="cx"> { </span><ins>+ if (null === $this-&gt;_timestamp) {
+ $this-&gt;setTimestamp(self::DEFAULT_TIMESTAMP);
+ } </ins><span class="cx"> return $this-&gt;_timestamp;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="standardtrunklibraryZendServiceWindowsAzureStoragephp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Service/WindowsAzure/Storage.php (22945 => 22946)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Service/WindowsAzure/Storage.php 2010-09-14 22:45:17 UTC (rev 22945)
+++ standard/trunk/library/Zend/Service/WindowsAzure/Storage.php 2010-09-15 18:05:49 UTC (rev 22946) </span><span class="lines">@@ -238,6 +238,16 @@ </span><span class="cx"> { </span><span class="cx"> $this-&gt;_httpClientChannel-&gt;setAdapter($adapterInstance);
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Retrieve HTTP client channel
+ *
+ * @return Zend_Http_Client_Adapter_Interface
+ */
+ public function getHttpClientChannel()
+ {
+ return $this-&gt;_httpClientChannel;
+ }
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Set retry policy to use when making requests
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...