flydata 0.2.26 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9ac346de420a785776ae309674640dd0afe3ff3
-  data.tar.gz: b9dcd9d82316b6906517ab008cc02e1024e8851e
+  metadata.gz: 31c9862228f6affa3e27e1ffbe4bbd7bd330774e
+  data.tar.gz: 5a447f0bb5cc7db2997d90580d7b59360834743f
 SHA512:
-  metadata.gz: f2c936dab2a85f0b2b575900218b03472874be5061c2dc72f89753f37ef7f166f31bfd4e4ffb1f47f367b12b1aac3367cc6d10f766a219a45831787456c512c8
-  data.tar.gz: 138786e380f022dd2ad70a3a96e20a88a379a36fb4ba1ed4636605d81a98c4f65ae86f4f143c87cc0ae09758c5a5a00487d2d60ff78327ceb1e8cfd58a6d8eb8
+  metadata.gz: 7bdec134c9d33a26ab24c734220ba639465f2b7f1bc6e49333beebf80a6ee73794d603566aa5ca429b296718f1cdaa52d4ee98d5044b96981a60d64aeca724df
+  data.tar.gz: 7242fb4e8e3d1c19da49557238921b5ee5f91b7891f5710d39a136ed25127781c0db7269aece6ab08d167d53196dea16fbf98ddb07ef7b28c82b46d0c38d474d

data/VERSION

@@ -1 +1 @@
-0.2.26
+0.2.27

data/flydata-core/lib/flydata-core/errors.rb

@@ -173,6 +173,10 @@ class TableRevisionError < RecordDeliveryError
   def err_code; ErrorCode::TABLE_REVISION_ERROR; end
 end
 
+# Table's revision is lower than the record's revision.  Should catch up soon.
+class StaleTableRevisionError < TableRevisionError
+end
+
 # Unsupported ALTER TABLE which breaks the tables sync consistency.
 class BreakingAlterTableError < RecordDeliveryError
   def err_code; ErrorCode::BREAKING_ALTER_TABLE_ERROR; end

data/flydata-core/lib/flydata-core/table_def/redshift_table_def.rb

@@ -219,14 +219,18 @@ EOS
   end
 
   APACHE_TIMESTAMP_REGEXP = Regexp.new('^(?<apache_time_format>\[[0-3]\d\/\D{3}\/[1-2]\d{3}:[0-2]\d:[0-5]\d:[0-5]\d ?[\+\-]\d{2}:?\d{2}\])$')
+  TIME_REGEXP = Regexp.new('^(?<sign>-)?(?<hour>\d{2,3}):(?<minute>[0-5][0-9]):(?<second>[0-5][0-9](\.\d+)?)$')
 
   def self.parse_timestamp(value)
+    return nil if value.to_s.empty?
     if value.kind_of?(Integer) or /^\d+$/ === value
       # Unix epoch in UTC
       t = DateTime.strptime(value.to_s, '%s')
     elsif APACHE_TIMESTAMP_REGEXP.match(value)
       # apache time format
       t = DateTime.strptime(value, "[%d/%b/%Y:%H:%M:%S %Z]")
+    elsif time_match = TIME_REGEXP.match(value)
+      t = convert_time_into_timestamp(time_match)
     else
       t = DateTime.parse(value)
     end
@@ -241,6 +245,16 @@ EOS
     end
   end
 
+  STANDARD_DATETIME = DateTime.new(1, 1, 1)
+
+  def self.convert_time_into_timestamp(time_match)
+    sign = time_match[:sign] ? -1 : 1
+    STANDARD_DATETIME.dup +
+      sign * Rational(time_match[:hour].to_i, 24) +
+      sign * Rational(time_match[:minute].to_i, 1440) +
+      sign * Rational(time_match[:second].to_f, 86400)
+  end
+
   def self.parse_date(value)
     dt = Date.parse(value)
     dt.strftime('%Y-%m-%d')

data/flydata-core/spec/table_def/redshift_table_def_spec.rb

@@ -450,6 +450,149 @@ EOT
     end
   end
 
+  describe '.parse_timestamp' do
+    let(:value) { nil }
+    subject { described_class.parse_timestamp(value) }
+
+    context 'with w3c format value' do
+      context 'with sec' do
+        let(:value) { '1997-07-16T19:20:01+01:00' }
+        it { is_expected.to eq('1997-07-16 18:20:01.000000') }
+      end
+      context 'with millisec' do
+        let(:value) { '1997-07-16T19:20:01+01:00' }
+        it { is_expected.to eq('1997-07-16 18:20:01.000000') }
+      end
+    end
+
+    context 'with twitter format value' do
+      let(:value) { 'Sat Sep 17 14:48:57 +0900 2011' }
+      it { is_expected.to eq('2011-09-17 05:48:57.000000') }
+    end
+
+    context 'with redshift support format value' do
+      context 'with sec' do
+        let(:value) { '2012-01-23 19:20:15' }
+        it { is_expected.to eq('2012-01-23 19:20:15.000000') }
+      end
+
+      context 'with millisec' do
+        let(:value) { '2012-01-23 19:20:15.243' }
+        it { is_expected.to eq('2012-01-23 19:20:15.243000') }
+      end
+      context 'with nanosec' do
+        let(:value) { '2012-1-23 10:40:5.243312' }
+        it { is_expected.to eq('2012-01-23 10:40:05.243312') }
+      end
+    end
+
+    context 'with apache format value' do
+      let(:value) { '[13/Sep/2006:07:01:53 -0700]' }
+      it { is_expected.to eq('2006-09-13 14:01:53.000000') }
+    end
+
+    context 'with timezone value' do
+      context 'with sec' do
+        let(:value) { '2012-01-23 19:20:15 +0100' }
+        it { is_expected.to eq('2012-01-23 18:20:15.000000') }
+      end
+
+      context 'with millisec' do
+        let(:value) { '2012-1-23 10:40:5.243 +0230' }
+        it { is_expected.to eq('2012-01-23 08:10:05.243000') }
+      end
+    end
+
+    context 'with unix epoch time' do
+      context 'with string type' do
+        let(:value) { '1400705967' }
+        it { is_expected.to eq('2014-05-21 20:59:27.000000') }
+      end
+
+      context 'with integer type' do
+        let(:value) { 1400705967 }
+        it { is_expected.to eq('2014-05-21 20:59:27.000000') }
+      end
+    end
+
+    context 'with all zero string' do
+      context 'without fraction' do
+        let(:value) { '0000-00-00 00:00:00' }
+        it { is_expected.to eq('0001-01-01 00:00:00.000000') }
+      end
+
+      context 'with fraction' do
+        let(:value) { '0000-00-00 00:00:00.000000' }
+        it { is_expected.to eq('0001-01-01 00:00:00.000000') }
+      end
+    end
+
+    context 'with time value' do
+      context 'when value is positive' do
+        context 'with sec' do
+          let(:value) { '23:01:24' }
+          it { is_expected.to eq('0001-01-01 23:01:24.000000') }
+        end
+
+        context 'with msec' do
+          let(:value) { '23:01:24.123456' }
+          it { is_expected.to eq('0001-01-01 23:01:24.123456') }
+        end
+      end
+
+      context 'when value is bigger than 24 hour' do
+        let(:value) { '28:01:24' }
+        it { is_expected.to eq('0001-01-02 04:01:24.000000') }
+      end
+
+      context 'when value is mysql max value' do
+        let(:value) { '838:59:59' }
+        it { is_expected.to eq('0001-02-04 22:59:59.000000') }
+      end
+
+      context 'when value is mysql min value' do
+        let(:value) { '-838:59:59' }
+        it { is_expected.to eq('0000-11-27 01:00:01.000000') }
+      end
+
+      context 'when value is zero time' do
+        let(:value) { '00:00:00' }
+        it { is_expected.to eq('0001-01-01 00:00:00.000000') }
+      end
+
+      context 'when value is negative' do
+        context 'with sec' do
+          let(:value) { '-03:01:24' }
+          it { is_expected.to eq('0000-12-31 20:58:36.000000') }
+        end
+
+        context 'with msec' do
+          let(:value) { '-03:01:24.123' }
+          it { is_expected.to eq('0000-12-31 20:58:35.876999') } # floating-point arithmetic(only negative value)
+        end
+
+        context 'with nsec' do
+          let(:value) { '-03:01:24.123456' }
+          it { is_expected.to eq('0000-12-31 20:58:35.876543') } # floating-point arithmetic(only negative value)
+        end
+      end
+    end
+
+    context 'with nil value' do
+      let(:value){ nil }
+      it { is_expected.to be_nil }
+    end
+
+    context 'with empty string' do
+      let(:value){ '' }
+      it { is_expected.to be_nil }
+    end
+
+    context 'with invalid value' do
+      let(:value) { 'abcd' }
+      it { expect{subject}.to raise_error(ArgumentError) }
+    end
+  end
 end
 
 end

data/flydata.gemspec

@@ -2,16 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: flydata 0.2.26 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.2.26"
+  s.version = "0.2.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
   s.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
-  s.date = "2014-12-31"
+  s.date = "2015-01-08"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]
@@ -146,7 +144,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://flydata.com/"
   s.licenses = ["All right reserved."]
-  s.rubygems_version = "2.2.2"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.0.14"
   s.summary = "FlyData Agent"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.2.26
+  version: 0.2.27
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -566,7 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: FlyData Agent