Author: spadkins
Date: Wed Jan 9 08:17:17 2008
New Revision: 10502
Modified:
p5ee/trunk/App-WorkQueue/lib/App/WorkQueue/Repository.pm
Log:
commenting out the multiple queue code, trying to simplify a bit
Modified: p5ee/trunk/App-WorkQueue/lib/App/WorkQueue/Repository.pm
==============================================================================
--- p5ee/trunk/App-WorkQueue/lib/App/WorkQueue/Repository.pm (original)
+++ p5ee/trunk/App-WorkQueue/lib/App/WorkQueue/Repository.pm Wed Jan 9
08:17:17 2008
@@ -61,8 +61,8 @@
$self->SUPER::_init($args);
die "STATUS_UNBUFFERED not set on queue" if (!$self->{STATUS_UNBUFFERED});
- die "client_id_attrib not set on queue" if (!$self->{client_id_attrib});
- die "client_id not set on queue" if (!$self->{client_id});
+ #die "client_id_attrib not set on queue" if (!$self->{client_id_attrib});
+ #die "client_id not set on queue" if (!$self->{client_id});
my $context = $self->{context};
my $options = $context->{options};
@@ -136,9 +136,9 @@
my $count_expr = "count(1)";
my $status = ($STATUS_UNBUFFERED ne $STATUS_UNACQUIRED) ?
"$STATUS_UNBUFFERED,$STATUS_UNACQUIRED" : $STATUS_UNBUFFERED;
my $params = { $status_attrib => $status };
- if ($self->{multiple_queues} && $self->{client_id_attrib} &&
$self->{client_id}) {
- $params->{$self->{client_id_attrib}} = $self->{client_id};
- }
+ #if ($self->{multiple_queues} && $self->{client_id_attrib} &&
$self->{client_id}) {
+ # $params->{$self->{client_id_attrib}} = $self->{client_id};
+ #}
if ($self->{params}) {
my $base_params = $self->{params};
foreach my $param (keys %$base_params) {
@@ -333,7 +333,7 @@
}
else {
$released = $self->_release_in_db($entry,$columns,$values);
- $self->_release_resources($entry) if (!$release_without_acquire);
+ $self->_release_resources($entry) if ($released &&
!$release_without_acquire);
#$resource_counts->{total}{$resource_key}-- if
(!$release_without_acquire);
}
$self->print() if ($self->{verbose});
@@ -377,9 +377,9 @@
my $params = $self->_resource_key_to_params($resource_key);
$params->{$status_attrib} = $STATUS_UNBUFFERED;
- if ($self->{multiple_queues} && $self->{client_id_attrib} &&
$self->{client_id}) {
- $params->{$self->{client_id_attrib}} = $self->{client_id};
- }
+ #if ($self->{multiple_queues} && $self->{client_id_attrib} &&
$self->{client_id}) {
+ # $params->{$self->{client_id_attrib}} = $self->{client_id};
+ #}
if ($self->{params}) {
my $base_params = $self->{params};
foreach my $param (keys %$base_params) {
@@ -460,9 +460,9 @@
my $STATUS_ACQUIRED = $self->{STATUS_ACQUIRED};
my $status_attrib = $self->{status_attrib};
$params{$status_attrib} =
$self->unique_list($STATUS_UNBUFFERED,$STATUS_UNACQUIRED,$STATUS_ACQUIRED);
- if ($self->{multiple_queues} && $self->{client_id_attrib} &&
$self->{client_id}) {
- $params{$self->{client_id_attrib}} = $self->{client_id};
- }
+ #if ($self->{multiple_queues} && $self->{client_id_attrib} &&
$self->{client_id}) {
+ # $params{$self->{client_id_attrib}} = $self->{client_id};
+ #}
if ($self->{params}) {
my $base_params = $self->{params};
foreach my $param (keys %$base_params) {
@@ -498,11 +498,11 @@
else {
$params = $self->_hash_to_key_params($entry);
}
- if ($self->{client_id_attrib} && $self->{client_id}) {
- $params->{$self->{client_id_attrib}} = undef;
- CORE::push(@$columns, $self->{client_id_attrib});
- CORE::push(@$values, $self->{client_id});
- }
+ #if ($self->{client_id_attrib} && $self->{client_id}) {
+ # $params->{$self->{client_id_attrib}} = undef;
+ # CORE::push(@$columns, $self->{client_id_attrib});
+ # CORE::push(@$values, $self->{client_id});
+ #}
$acquired = $db->update($self->{table}, $params, $columns, $values);
$self->_update_ref($entry, $columns, $values) if ($acquired);
}
@@ -516,11 +516,13 @@
sub update {
&App::sub_entry if ($App::trace);
my ($self, $entry, $columns, $values) = @_;
+ my $success = 1;
if ($self->_update_is_different($entry, $columns, $values)) {
$self->_update_ref($entry, $columns, $values);
- $self->_update_in_db($entry, $columns, $values);
+ $success = $self->_update_in_db($entry, $columns, $values);
}
- &App::sub_exit() if ($App::trace);
+ &App::sub_exit($success) if ($App::trace);
+ return $success;
}
sub _update_is_different {
@@ -574,8 +576,9 @@
else {
$params = $self->_hash_to_key_params($entry);
}
- $db->update($self->{table}, $params, $columns, $values);
- &App::sub_exit() if ($App::trace);
+ my $success = $db->update($self->{table}, $params, $columns, $values);
+ &App::sub_exit($success) if ($App::trace);
+ return $success;
}
sub num_entries {
@@ -606,9 +609,9 @@
$status = ($STATUS_UNBUFFERED ne $STATUS_UNACQUIRED) ?
"$STATUS_UNBUFFERED,$STATUS_UNACQUIRED" : $STATUS_UNBUFFERED;
}
my $params = { $status_attrib => $status };
- if ($self->{multiple_queues} && $self->{client_id_attrib} &&
$self->{client_id}) {
- $params->{$self->{client_id_attrib}} = $self->{client_id};
- }
+ #if ($self->{multiple_queues} && $self->{client_id_attrib} &&
$self->{client_id}) {
+ # $params->{$self->{client_id_attrib}} = $self->{client_id};
+ #}
if ($self->{params}) {
my $base_params = $self->{params};
foreach my $param (keys %$base_params) {
@@ -664,9 +667,9 @@
my $params = {
$self->{status_attrib} =>
$self->unique_list($self->{STATUS_UNBUFFERED},$self->{STATUS_UNACQUIRED},$self->{STATUS_ACQUIRED}),
};
- if ($self->{multiple_queues} && $self->{client_id_attrib} &&
$self->{client_id}) {
- $params->{$self->{client_id_attrib}} = $self->{client_id};
- }
+ #if ($self->{multiple_queues} && $self->{client_id_attrib} &&
$self->{client_id}) {
+ # $params->{$self->{client_id_attrib}} = $self->{client_id};
+ #}
if ($self->{params}) {
my $base_params = $self->{params};
foreach my $param (keys %$base_params) {
