[PATCH mogilefs 2/7] Clean up two instances of UNIX_TIMESTAMP() that lurked outside the Store classes. $self->unix_timestamp should used instead.

[Robin H. Johnson]

From: Robin H. Johnson <robbat2 at gentoo.org>

Signed-off-by: Robin H. Johnson <robbat2 at gentoo.org>
---
 server/lib/MogileFS/Worker/Delete.pm |    2 +-
 server/lib/MogileFS/Worker/Query.pm  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/lib/MogileFS/Worker/Delete.pm b/server/lib/MogileFS/Worker/Delete.pm
index 3b439e3..4838c48 100644
--- a/server/lib/MogileFS/Worker/Delete.pm
+++ b/server/lib/MogileFS/Worker/Delete.pm
@@ -156,7 +156,7 @@ sub process_deletes {
         my $reschedule_fid = sub {
             my ($secs, $reason) = (int(shift), shift);
             $dbh->do("INSERT IGNORE INTO file_to_delete_later (fid, delafter) ".
-                     "VALUES (?,UNIX_TIMESTAMP()+$secs)", undef,
+                     "VALUES (?,".$self->unix_timestamp."+$secs)", undef,
                      $fid);
             $sto->condthrow("Failure to insert into file_to_delete_later");
             error("delete of fid $fid rescheduled: $reason") if $Mgd::DEBUG >= 2;
diff --git a/server/lib/MogileFS/Worker/Query.pm b/server/lib/MogileFS/Worker/Query.pm
index c5e9ab8..abeaada 100644
--- a/server/lib/MogileFS/Worker/Query.pm
+++ b/server/lib/MogileFS/Worker/Query.pm
@@ -1014,7 +1014,7 @@ sub cmd_stats {
         $ret->{"replicationcount"} = $count;
 
         # now we want to do the "new" replication stats
-        my $db_time = $dbh->selectrow_array('SELECT UNIX_TIMESTAMP()');
+        my $db_time = $dbh->selectrow_array('SELECT '.$self->unix_timestamp);
         $stats = $dbh->selectall_arrayref('SELECT nexttry, COUNT(*) FROM file_to_replicate GROUP BY 1');
         foreach my $stat (@$stats) {
             if ($stat->[0] < 1000) {
-- 
1.5.2