embulk 0.8.2-java → 0.8.3-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/build.gradle +1 -1
- data/embulk-core/src/main/java/org/embulk/exec/SetCurrentThreadName.java +4 -1
- data/embulk-core/src/main/java/org/embulk/spi/util/InputStreamFileInput.java +0 -1
- data/embulk-docs/src/built-in.rst +3 -3
- data/embulk-docs/src/release.rst +2 -0
- data/embulk-docs/src/release/release-0.7.11.rst +12 -0
- data/embulk-docs/src/release/release-0.8.3.rst +15 -0
- data/lib/embulk/guess/schema_guess.rb +6 -1
- data/lib/embulk/plugin_registry.rb +10 -6
- data/lib/embulk/runner.rb +1 -1
- data/lib/embulk/version.rb +1 -1
- metadata +36 -34
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 956d386bd5ac502aba7c83bc7737405fc79b67d9
|
4
|
+
data.tar.gz: 1c2ecba6b13fce3d5befbfdd58a0eb354d30eb52
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 354abced4dc4a3e0c99544a0b669e53c37e0e7c3b66065697c4997b9cc9c98e7f355dfd6fe507a3e4a9ae6dccbdeb3ea0ff37e53261589a65576ec1dc710edcd
|
7
|
+
data.tar.gz: 51c32feb1a486d4873ed4cc5efbbeda83aff46d2f5bdc653ec51aaeba5f876e0b3017fc965daa2234fac404b992bd3cbec3b2c439554ad6fee3bbf81205c1f22
|
data/build.gradle
CHANGED
@@ -1,5 +1,7 @@
|
|
1
1
|
package org.embulk.exec;
|
2
2
|
|
3
|
+
import static java.util.Locale.ENGLISH;
|
4
|
+
|
3
5
|
public class SetCurrentThreadName
|
4
6
|
implements AutoCloseable
|
5
7
|
{
|
@@ -8,7 +10,8 @@ public class SetCurrentThreadName
|
|
8
10
|
public SetCurrentThreadName(String name)
|
9
11
|
{
|
10
12
|
this.original = Thread.currentThread().getName();
|
11
|
-
Thread.currentThread()
|
13
|
+
Thread thread = Thread.currentThread();
|
14
|
+
thread.setName(String.format(ENGLISH, "%04d:", thread.getId()) + name);
|
12
15
|
}
|
13
16
|
|
14
17
|
@Override
|
@@ -134,7 +134,6 @@ public class InputStreamFileInput
|
|
134
134
|
|
135
135
|
public Buffer poll()
|
136
136
|
{
|
137
|
-
// TODO check current != null and throw Illegal State - file is not opened
|
138
137
|
if (current == null) {
|
139
138
|
throw new IllegalStateException("nextFile() must be called before poll()");
|
140
139
|
}
|
@@ -410,14 +410,14 @@ Example
|
|
410
410
|
...
|
411
411
|
formatter:
|
412
412
|
type: csv
|
413
|
-
delimiter:
|
413
|
+
delimiter: "\t"
|
414
414
|
newline: CRLF
|
415
415
|
newline_in_field: LF
|
416
416
|
charset: UTF-8
|
417
417
|
quote_policy: MINIMAL
|
418
418
|
quote: '"'
|
419
|
-
escape:
|
420
|
-
null_string:
|
419
|
+
escape: "\\"
|
420
|
+
null_string: "\\N"
|
421
421
|
default_timezone: 'UTC'
|
422
422
|
column_options:
|
423
423
|
mycol1: {format: '%Y-%m-%d %H:%M:%S'}
|
data/embulk-docs/src/release.rst
CHANGED
@@ -0,0 +1,15 @@
|
|
1
|
+
Release 0.8.3
|
2
|
+
==================================
|
3
|
+
|
4
|
+
General Changes
|
5
|
+
------------------
|
6
|
+
|
7
|
+
* Fixed unexpected error when ``-c`` option is set and file doesn't exist yet (@hiroyuki-sato++)
|
8
|
+
* Added a workaround for https://github.com/jruby/jruby/issues/3652
|
9
|
+
* Adds thread ID to thread name so that stacktrace shown by SIGQUIT can distinguish multiple threads running the same stage (transaction, guess, preview).
|
10
|
+
* Embulk::Guess::SchemaGuess returns ``"json"`` type if a given value is a Hash or Array.
|
11
|
+
|
12
|
+
|
13
|
+
Release Date
|
14
|
+
------------------
|
15
|
+
2016-02-08
|
@@ -37,7 +37,7 @@ module Embulk::Guess
|
|
37
37
|
def types_from_array_records(samples)
|
38
38
|
columnar_types = []
|
39
39
|
samples.each do |record|
|
40
|
-
record.each_with_index {|value,i| (columnar_types[i] ||= []) << guess_type(value
|
40
|
+
record.each_with_index {|value,i| (columnar_types[i] ||= []) << guess_type(value) }
|
41
41
|
end
|
42
42
|
columnar_types.map {|types| merge_types(types) }
|
43
43
|
end
|
@@ -45,6 +45,11 @@ module Embulk::Guess
|
|
45
45
|
private
|
46
46
|
|
47
47
|
def guess_type(str)
|
48
|
+
if str.is_a?(Hash) || str.is_a?(Array)
|
49
|
+
return "json"
|
50
|
+
end
|
51
|
+
str = str.to_s
|
52
|
+
|
48
53
|
if TRUE_STRINGS[str] || FALSE_STRINGS[str]
|
49
54
|
return "boolean"
|
50
55
|
end
|
@@ -58,8 +58,10 @@ module Embulk
|
|
58
58
|
|
59
59
|
# search gems
|
60
60
|
if defined?(::Gem::Specification) && ::Gem::Specification.respond_to?(:find_all)
|
61
|
-
specs =
|
62
|
-
|
61
|
+
specs = Kernel::RUBYGEMS_ACTIVATION_MONITOR.synchronize do # this lock is added as a workaround of https://github.com/jruby/jruby/issues/3652
|
62
|
+
Gem::Specification.find_all do |spec|
|
63
|
+
spec.contains_requirable_file? name
|
64
|
+
end
|
63
65
|
end
|
64
66
|
|
65
67
|
# prefer newer version
|
@@ -78,10 +80,12 @@ module Embulk
|
|
78
80
|
def require_and_show(path, spec=nil)
|
79
81
|
require path
|
80
82
|
unless spec
|
81
|
-
name, spec =
|
82
|
-
|
83
|
-
|
84
|
-
|
83
|
+
name, spec = Kernel::RUBYGEMS_ACTIVATION_MONITOR.synchronize do # this lock is added as a workaround of https://github.com/jruby/jruby/issues/3652
|
84
|
+
Gem.loaded_specs.find {|name,spec|
|
85
|
+
#spec.files.include?(path)
|
86
|
+
spec.contains_requirable_file?(path)
|
87
|
+
}
|
88
|
+
end
|
85
89
|
end
|
86
90
|
if spec
|
87
91
|
unless @loaded_gems[spec.name]
|
data/lib/embulk/runner.rb
CHANGED
@@ -61,7 +61,7 @@ module Embulk
|
|
61
61
|
check_file_writable(config_diff_path)
|
62
62
|
check_file_writable(resume_state_path)
|
63
63
|
|
64
|
-
if config_diff_path
|
64
|
+
if config_diff_path && File.size(config_diff_path) > 0
|
65
65
|
lastConfigDiff = read_config(config_diff_path, options)
|
66
66
|
configSource = configSource.merge(lastConfigDiff)
|
67
67
|
end
|
data/lib/embulk/version.rb
CHANGED
metadata
CHANGED
@@ -1,127 +1,127 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: embulk
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.8.
|
4
|
+
version: 0.8.3
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Sadayuki Furuhashi
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-02-
|
11
|
+
date: 2016-02-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
|
+
name: bundler
|
15
|
+
version_requirements: !ruby/object:Gem::Requirement
|
16
|
+
requirements:
|
17
|
+
- - ">="
|
18
|
+
- !ruby/object:Gem::Version
|
19
|
+
version: 1.10.6
|
14
20
|
requirement: !ruby/object:Gem::Requirement
|
15
21
|
requirements:
|
16
22
|
- - ">="
|
17
23
|
- !ruby/object:Gem::Version
|
18
24
|
version: 1.10.6
|
19
|
-
name: bundler
|
20
25
|
prerelease: false
|
21
26
|
type: :runtime
|
27
|
+
- !ruby/object:Gem::Dependency
|
28
|
+
name: msgpack
|
22
29
|
version_requirements: !ruby/object:Gem::Requirement
|
23
30
|
requirements:
|
24
|
-
- - "
|
31
|
+
- - "~>"
|
25
32
|
- !ruby/object:Gem::Version
|
26
|
-
version:
|
27
|
-
- !ruby/object:Gem::Dependency
|
33
|
+
version: 0.7.3
|
28
34
|
requirement: !ruby/object:Gem::Requirement
|
29
35
|
requirements:
|
30
36
|
- - "~>"
|
31
37
|
- !ruby/object:Gem::Version
|
32
38
|
version: 0.7.3
|
33
|
-
name: msgpack
|
34
39
|
prerelease: false
|
35
40
|
type: :runtime
|
41
|
+
- !ruby/object:Gem::Dependency
|
42
|
+
name: liquid
|
36
43
|
version_requirements: !ruby/object:Gem::Requirement
|
37
44
|
requirements:
|
38
45
|
- - "~>"
|
39
46
|
- !ruby/object:Gem::Version
|
40
|
-
version: 0.
|
41
|
-
- !ruby/object:Gem::Dependency
|
47
|
+
version: 3.0.6
|
42
48
|
requirement: !ruby/object:Gem::Requirement
|
43
49
|
requirements:
|
44
50
|
- - "~>"
|
45
51
|
- !ruby/object:Gem::Version
|
46
52
|
version: 3.0.6
|
47
|
-
name: liquid
|
48
53
|
prerelease: false
|
49
54
|
type: :runtime
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: rjack-icu
|
50
57
|
version_requirements: !ruby/object:Gem::Requirement
|
51
58
|
requirements:
|
52
59
|
- - "~>"
|
53
60
|
- !ruby/object:Gem::Version
|
54
|
-
version:
|
55
|
-
- !ruby/object:Gem::Dependency
|
61
|
+
version: 4.54.1.1
|
56
62
|
requirement: !ruby/object:Gem::Requirement
|
57
63
|
requirements:
|
58
64
|
- - "~>"
|
59
65
|
- !ruby/object:Gem::Version
|
60
66
|
version: 4.54.1.1
|
61
|
-
name: rjack-icu
|
62
67
|
prerelease: false
|
63
68
|
type: :runtime
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: rake
|
64
71
|
version_requirements: !ruby/object:Gem::Requirement
|
65
72
|
requirements:
|
66
|
-
- - "
|
73
|
+
- - ">="
|
67
74
|
- !ruby/object:Gem::Version
|
68
|
-
version:
|
69
|
-
- !ruby/object:Gem::Dependency
|
75
|
+
version: 0.10.0
|
70
76
|
requirement: !ruby/object:Gem::Requirement
|
71
77
|
requirements:
|
72
78
|
- - ">="
|
73
79
|
- !ruby/object:Gem::Version
|
74
80
|
version: 0.10.0
|
75
|
-
name: rake
|
76
81
|
prerelease: false
|
77
82
|
type: :development
|
83
|
+
- !ruby/object:Gem::Dependency
|
84
|
+
name: test-unit
|
78
85
|
version_requirements: !ruby/object:Gem::Requirement
|
79
86
|
requirements:
|
80
|
-
- - "
|
87
|
+
- - "~>"
|
81
88
|
- !ruby/object:Gem::Version
|
82
|
-
version: 0.
|
83
|
-
- !ruby/object:Gem::Dependency
|
89
|
+
version: 3.0.9
|
84
90
|
requirement: !ruby/object:Gem::Requirement
|
85
91
|
requirements:
|
86
92
|
- - "~>"
|
87
93
|
- !ruby/object:Gem::Version
|
88
94
|
version: 3.0.9
|
89
|
-
name: test-unit
|
90
95
|
prerelease: false
|
91
96
|
type: :development
|
97
|
+
- !ruby/object:Gem::Dependency
|
98
|
+
name: yard
|
92
99
|
version_requirements: !ruby/object:Gem::Requirement
|
93
100
|
requirements:
|
94
101
|
- - "~>"
|
95
102
|
- !ruby/object:Gem::Version
|
96
|
-
version:
|
97
|
-
- !ruby/object:Gem::Dependency
|
103
|
+
version: 0.8.7
|
98
104
|
requirement: !ruby/object:Gem::Requirement
|
99
105
|
requirements:
|
100
106
|
- - "~>"
|
101
107
|
- !ruby/object:Gem::Version
|
102
108
|
version: 0.8.7
|
103
|
-
name: yard
|
104
109
|
prerelease: false
|
105
110
|
type: :development
|
111
|
+
- !ruby/object:Gem::Dependency
|
112
|
+
name: kramdown
|
106
113
|
version_requirements: !ruby/object:Gem::Requirement
|
107
114
|
requirements:
|
108
115
|
- - "~>"
|
109
116
|
- !ruby/object:Gem::Version
|
110
|
-
version:
|
111
|
-
- !ruby/object:Gem::Dependency
|
117
|
+
version: 1.5.0
|
112
118
|
requirement: !ruby/object:Gem::Requirement
|
113
119
|
requirements:
|
114
120
|
- - "~>"
|
115
121
|
- !ruby/object:Gem::Version
|
116
122
|
version: 1.5.0
|
117
|
-
name: kramdown
|
118
123
|
prerelease: false
|
119
124
|
type: :development
|
120
|
-
version_requirements: !ruby/object:Gem::Requirement
|
121
|
-
requirements:
|
122
|
-
- - "~>"
|
123
|
-
- !ruby/object:Gem::Version
|
124
|
-
version: 1.5.0
|
125
125
|
description: Embulk is an open-source, plugin-based bulk data loader to scale and simplify data management across heterogeneous data stores. It can collect and ship any kinds of data in high throughput with transaction control.
|
126
126
|
email:
|
127
127
|
- frsyuki@gmail.com
|
@@ -147,8 +147,8 @@ files:
|
|
147
147
|
- classpath/bval-jsr303-0.5.jar
|
148
148
|
- classpath/commons-beanutils-core-1.8.3.jar
|
149
149
|
- classpath/commons-lang3-3.1.jar
|
150
|
-
- classpath/embulk-core-0.8.
|
151
|
-
- classpath/embulk-standards-0.8.
|
150
|
+
- classpath/embulk-core-0.8.3.jar
|
151
|
+
- classpath/embulk-standards-0.8.3.jar
|
152
152
|
- classpath/guava-18.0.jar
|
153
153
|
- classpath/guice-4.0.jar
|
154
154
|
- classpath/guice-bootstrap-0.1.1.jar
|
@@ -449,6 +449,7 @@ files:
|
|
449
449
|
- embulk-docs/src/release/release-0.7.0.rst
|
450
450
|
- embulk-docs/src/release/release-0.7.1.rst
|
451
451
|
- embulk-docs/src/release/release-0.7.10.rst
|
452
|
+
- embulk-docs/src/release/release-0.7.11.rst
|
452
453
|
- embulk-docs/src/release/release-0.7.2.rst
|
453
454
|
- embulk-docs/src/release/release-0.7.3.rst
|
454
455
|
- embulk-docs/src/release/release-0.7.4.rst
|
@@ -460,6 +461,7 @@ files:
|
|
460
461
|
- embulk-docs/src/release/release-0.8.0.rst
|
461
462
|
- embulk-docs/src/release/release-0.8.1.rst
|
462
463
|
- embulk-docs/src/release/release-0.8.2.rst
|
464
|
+
- embulk-docs/src/release/release-0.8.3.rst
|
463
465
|
- embulk-standards/build.gradle
|
464
466
|
- embulk-standards/src/main/java/org/embulk/standards/CsvFormatterPlugin.java
|
465
467
|
- embulk-standards/src/main/java/org/embulk/standards/CsvParserPlugin.java
|