From 26f2e5b6c1f85ff70da3fa6a4e4e7581ad0e11d7 Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Fri, 21 Mar 2014 14:26:27 +0100 Subject: [PATCH 1/3] MT#5847 Fixup debian/changelog version to Sipwise style --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 671b89ac..6d764e38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ngcp-schema (3.1.0.0+0~mr3.3.0.0) unstable; urgency=low + + [ Irina Peshinskaya ] + * [d0de41e] MT#5879 Add relation between accounting.cdr to billing.billing_zones_history to get calls list + * [aa62130] MT#5879 Added schema class for invoice_template to make possible save/use customer templates + * [8ac4c7b] MT#5879 Fix previousely broken ngcp-schema + + -- Alexander Lutay Fri, 21 Mar 2014 14:24:46 +0100 + ngcp-schema (3.000+0~mr3.3) unstable; urgency=low [ Andreas Granig ] From 21eae2b82e407c5683f82a082e61d9d8c2fa4076 Mon Sep 17 00:00:00 2001 From: Gerhard Jungwirth Date: Mon, 24 Mar 2014 08:13:20 +0100 Subject: [PATCH 2/3] MT#4369 custom messages virtualview for sql performance --- lib/NGCP/Schema/Result/messages_custom.pm | 106 ++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 lib/NGCP/Schema/Result/messages_custom.pm diff --git a/lib/NGCP/Schema/Result/messages_custom.pm b/lib/NGCP/Schema/Result/messages_custom.pm new file mode 100644 index 00000000..d3200b3c --- /dev/null +++ b/lib/NGCP/Schema/Result/messages_custom.pm @@ -0,0 +1,106 @@ +package NGCP::Schema::Result::messages_custom; +use Scalar::Util qw(blessed); +use base qw/DBIx::Class::Core/; + +our $VERSION = '2.007'; + +__PACKAGE__->load_components( + "InflateColumn::DateTime", + "Helper::Row::ToJSON", + "+NGCP::Schema::InflateColumn::DateTime::EpochMicro", +); +__PACKAGE__->table_class('DBIx::Class::ResultSource::View'); + +__PACKAGE__->table("messages_custom"); + + +__PACKAGE__->add_columns( + "id", + { + data_type => "bigint", + extra => { unsigned => 1 }, + is_auto_increment => 1, + is_nullable => 0, + }, + "timestamp", + { data_type => "decimal", is_nullable => 0, size => [17, 6] }, + "protocol", + { + data_type => "enum", + extra => { list => ["IPv4", "IPv6"] }, + is_nullable => 0, + }, + "transport", + { + data_type => "enum", + extra => { list => ["UDP", "TCP"] }, + is_nullable => 0, + }, + "src_ip", + { data_type => "varchar", is_nullable => 0, size => 39 }, + "dst_ip", + { data_type => "varchar", is_nullable => 0, size => 39 }, + "src_port", + { data_type => "smallint", extra => { unsigned => 1 }, is_nullable => 0 }, + "dst_port", + { data_type => "smallint", extra => { unsigned => 1 }, is_nullable => 0 }, + "payload", + { data_type => "blob", is_nullable => 0 }, + "method", + { + accessor => "column_method", + data_type => "varchar", + is_nullable => 0, + size => 20, + }, + "cseq_method", + { data_type => "varchar", is_nullable => 0, size => 16 }, + "call_id", + { data_type => "varchar", is_nullable => 0, size => 255 }, + "request_uri", + { data_type => "varchar", is_nullable => 0, size => 255 }, + "from_uri", + { data_type => "varchar", is_nullable => 0, size => 255 }, + "caller_uuid", + { data_type => "varchar", is_nullable => 0, size => 255 }, + "callee_uuid", + { data_type => "varchar", is_nullable => 0, size => 255 }, +); + +__PACKAGE__->set_primary_key("id"); + +for my $col (qw/timestamp/) { + if(__PACKAGE__->has_column($col)) { + __PACKAGE__->remove_column($col); + __PACKAGE__->add_column($col => + { data_type => "decimal", is_nullable => 0, size => [17, 6], inflate_datetime => 'epoch_micro' } + ); + } +} + +sub TO_JSON { + my ($self) = @_; + return { + map { blessed($_) && $_->isa('DateTime') ? $_->datetime : $_ } %{ $self->next::method } + }; +} + +__PACKAGE__->result_source_instance->is_virtual(1); + +__PACKAGE__->result_source_instance->view_definition(" +SELECT m.* FROM +( +( +SELECT DISTINCT ( call_id ) + FROM sipstats.messages + WHERE caller_uuid LIKE ? OR callee_uuid LIKE ? OR call_id LIKE ? +ORDER BY timestamp DESC + LIMIT ?, ? +) +) q JOIN sipstats.messages m ON q.call_id = m.call_id +GROUP BY call_id +"); + + +1; + From 1fd77a8b7e04a0d0dc329b90030baa15513c17ea Mon Sep 17 00:00:00 2001 From: Gerhard Jungwirth Date: Mon, 24 Mar 2014 09:16:51 +0100 Subject: [PATCH 3/3] MT#4369 select min(timestamp) on custom messages which is the time, the call started --- lib/NGCP/Schema/Result/messages_custom.pm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/NGCP/Schema/Result/messages_custom.pm b/lib/NGCP/Schema/Result/messages_custom.pm index d3200b3c..6d903240 100644 --- a/lib/NGCP/Schema/Result/messages_custom.pm +++ b/lib/NGCP/Schema/Result/messages_custom.pm @@ -23,7 +23,9 @@ __PACKAGE__->add_columns( is_nullable => 0, }, "timestamp", - { data_type => "decimal", is_nullable => 0, size => [17, 6] }, + { data_type => "decimal", is_nullable => 0, size => [17, 6], inflate_datetime => 'epoch_micro' }, + "min_timestamp", + { data_type => "decimal", is_nullable => 0, size => [17, 6], inflate_datetime => 'epoch_micro' }, "protocol", { data_type => "enum", @@ -69,15 +71,6 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("id"); -for my $col (qw/timestamp/) { - if(__PACKAGE__->has_column($col)) { - __PACKAGE__->remove_column($col); - __PACKAGE__->add_column($col => - { data_type => "decimal", is_nullable => 0, size => [17, 6], inflate_datetime => 'epoch_micro' } - ); - } -} - sub TO_JSON { my ($self) = @_; return { @@ -88,7 +81,7 @@ sub TO_JSON { __PACKAGE__->result_source_instance->is_virtual(1); __PACKAGE__->result_source_instance->view_definition(" -SELECT m.* FROM +SELECT min(m.timestamp) as min_timestamp, m.* FROM ( ( SELECT DISTINCT ( call_id )