embulk-input-filesplit 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16ce42eb0c98f4e0f5092b4ddf29b5d77954e106
-  data.tar.gz: 961132ebfbadeb9650f480e27946cf4de4b3763a
+  metadata.gz: db346109428797d7798e50be35a6d8b24b016e84
+  data.tar.gz: e3c3206c03686b1ba05d3ddcd955768451f871c4
 SHA512:
-  metadata.gz: fdc723070b206a2d2bc1c9de1445f610acc10227c74e6fc13966521391fe430eca9d9d267b6e9dfabbe03f513fc810a5cb869ed88108cf9223d9402e123f406b
-  data.tar.gz: 220a17b5af68e4f6fe8c80f1d3f1a98cb3e3fc7ee6466ff85911fbb8dd4c145d2ce60cc362b6db15467d15458eef9411595eada0272ef799b41e8e2c2cf6ab04
+  metadata.gz: b4df6195347a2eae091b9e783e1c554244885d408f7e89706a27129f7afc18ad76a031bb1155b17818d81b8399c2286cc02d6772ff137c59df09bc30d3331d81
+  data.tar.gz: 49a1b4306e12a38532ef48dbe3c51094a970b9869e2d9510ab79c8fb8fdbdc35fd1b88df963b0a929a49dea546ce78f0a9313e78da2d894041b77fb8491264d4

data/build.gradle

@@ -10,7 +10,7 @@ apply plugin: 'com.github.jruby-gradle.base'
 
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
-project.version = '0.1.1'
+project.version = '0.1.2'
 
 repositories {
     mavenCentral()

data/src/main/java/org/embulk/input/filesplit/LocalFileSplitInputPlugin.java

@@ -31,7 +31,7 @@ import com.google.common.base.Optional;
 public class LocalFileSplitInputPlugin
         implements FileInputPlugin
 {
-	public interface PluginTask
+    public interface PluginTask
             extends Task
     {
         @Config("path")
@@ -59,22 +59,22 @@ public class LocalFileSplitInputPlugin
 
         int tasks;
         if (task.getTasks().isPresent()) {
-        	tasks = task.getTasks().get();
-        	if (tasks <= 0) {
-        		throw new IllegalArgumentException(String.format("'tasks' is %d but must be greater than 0", tasks));
-        	}
+            tasks = task.getTasks().get();
+            if (tasks <= 0) {
+                throw new IllegalArgumentException(String.format("'tasks' is %d but must be greater than 0", tasks));
+            }
         } else {
-        	tasks = Runtime.getRuntime().availableProcessors() * 2;
+            tasks = Runtime.getRuntime().availableProcessors() * 2;
         }
 
         long size = new File(task.getPath()).length();
         List<PartialFile> files = new ArrayList<PartialFile>();
         for (int i = 0; i < tasks; i++) {
-        	long start = size * i / tasks;
-        	long end = size * (i + 1) / tasks;
-        	if (start < end) {
-        		files.add(new PartialFile(task.getPath(), start, end));
-        	}
+            long start = size * i / tasks;
+            long end = size * (i + 1) / tasks;
+            if (start < end) {
+                files.add(new PartialFile(task.getPath(), start, end));
+            }
         }
         
         task.setFiles(files);
@@ -132,7 +132,7 @@ public class LocalFileSplitInputPlugin
                 
                 InputStream in = new PartialFileInputStream(new FileInputStream(file.getPath()), file.getStart(), file.getEnd());
                 if (file.getStart() > 0 && hasHeader) {
-                	in = new SequenceInputStream(openHeader(file.getPath()), in);
+                    in = new SequenceInputStream(openHeader(file.getPath()), in);
                 }
                 return in;
             }
@@ -142,31 +142,31 @@ public class LocalFileSplitInputPlugin
             
             private InputStream openHeader(String path) throws IOException
             {
-            	ByteArrayOutputStream header = new ByteArrayOutputStream();
-            	try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(path))) {
-            		while (true) {
-            			int c = in.read();
-            			if (c < 0) {
-            				break;
-            			}
-            			
-        				header.write(c);
-        				
-            			if (c == '\n') {
-            				break;
-            			}
-            			
-            			if (c == '\r') {
-            				int c2 = in.read();
-            				if (c2 == '\n') {
-            					header.write(c2);
-            				}
-            				break;
-            			}
-            		}
-            	}
-            	header.close();
-            	return new ByteArrayInputStream(header.toByteArray());
+                ByteArrayOutputStream header = new ByteArrayOutputStream();
+                try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(path))) {
+                    while (true) {
+                        int c = in.read();
+                        if (c < 0) {
+                            break;
+                        }
+                        
+                        header.write(c);
+                        
+                        if (c == '\n') {
+                            break;
+                        }
+                        
+                        if (c == '\r') {
+                            int c2 = in.read();
+                            if (c2 == '\n') {
+                                header.write(c2);
+                            }
+                            break;
+                        }
+                    }
+                }
+                header.close();
+                return new ByteArrayInputStream(header.toByteArray());
             }
         }
 

data/src/main/java/org/embulk/input/filesplit/PartialFile.java

@@ -1,53 +1,50 @@
-/*
- * $Id: typical.epf 2627 2010-03-18 01:40:13Z tiba $
- */
-package org.embulk.input.filesplit;
-
-public class PartialFile 
-{
-	private String path;
-	private long start;
-	private long end;
-
-	
-	public PartialFile(String path, long start, long end) 
-	{
-		this.path = path;
-		this.start = start;
-		this.end = end;
-	}
-
-	public PartialFile() {
-	}
-	
-	public String getPath() 
-	{
-		return path;
-	}
-
-	public void setPath(String path)
-	{
-		this.path = path;
-	}
-
-
-	public long getStart() 
-	{
-		return start;
-	}
-
-	public void setStart(long start)
-	{
-		this.start = start;
-	}
-
-	public long getEnd() 
-	{
-		return end;
-	}
-
-	public void setEnd(long end)
-	{
-		this.end = end;
-	}
+package org.embulk.input.filesplit;
+
+public class PartialFile
+{
+    private String path;
+    private long start;
+    private long end;
+
+
+    public PartialFile(String path, long start, long end)
+    {
+        this.path = path;
+        this.start = start;
+        this.end = end;
+    }
+
+    public PartialFile() {
+    }
+
+    public String getPath()
+    {
+        return path;
+    }
+
+    public void setPath(String path)
+    {
+        this.path = path;
+    }
+
+
+    public long getStart()
+    {
+        return start;
+    }
+
+    public void setStart(long start)
+    {
+        this.start = start;
+    }
+
+    public long getEnd()
+    {
+        return end;
+    }
+
+    public void setEnd(long end)
+    {
+        this.end = end;
+    }
 }

data/src/main/java/org/embulk/input/filesplit/PartialFileInputStream.java

@@ -1,154 +1,154 @@
-package org.embulk.input.filesplit;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-
-
-public class PartialFileInputStream extends InputStream
-{
-	private final PushbackInputStream original;
-	private long start;
-	private long end;
-	private long current;
-	private boolean eof;
-	
-	public PartialFileInputStream(InputStream original, long start, long end)
-	{
-		this.original = new PushbackInputStream(new BufferedInputStream(original));
-		this.start = start;
-		this.end = end;
-		current = -1;
-	}
-	
-	@Override
-	public int read(byte[] b) throws IOException
-	{
-		return read(b, 0, b.length);
-	}
-	
-	@Override
-	public int read(byte[] b, int off, int len) throws IOException 
-	{
-		initializeIfNeeded();
-
-		if (eof) {
-			return -1;
-		}
-		
-		int read = original.read(b, off, len);
-		if (read < 0) {
-			eof = true;
-			return -1;
-		}
-		
-		current += read;
-		if (current >= end) {
-			for (int i = Math.max((int)(end - 1 - current + read), 0); i < read; i++) {
-				if (b[off + i] == '\n') {
-					eof = true;
-					return i + 1;
-				}
-				
-				if (b[off + i] == '\r') {
-					int next = (i < read ? b[off + i + 1] : prefetch());
-					if (next != '\n') {
-						eof = true;
-						return i + 1;
-					}
-				}
-			}
-		}
-		
-		return read;
-	}
-
-	@Override
-	public int read() throws IOException 
-	{
-		initializeIfNeeded();
-
-		if (eof) {
-			return -1;
-		}
-		
-		int read = original.read();
-		current++;
-		
-		if (read < 0) {
-			eof = true;
-			return -1;
-		}
-		
-		if (current >= end) {
-			if (read == '\n' || read == '\r' && prefetch() != '\n') {
-				eof = true;
-			}
-		}
-		
-		return read;
-	}
-	
-	@Override
-	public long skip(long n) throws IOException
-	{
-		throw new IOException("Skip not supported.");
-		/*
-		long skip = original.skip(n);
-		current += skip;
-		return skip;
-		*/
-	}
-	
-	@Override
-	public int available() throws IOException 
-	{
-		return 0;
-	}
-	
-	@Override
-	public void close() throws IOException 
-	{
-		original.close();
-	}
-	
-	private void initializeIfNeeded() throws IOException 
-	{
-		if (current >= start) {
-			return;
-			
-		}
-		if (start == 0) {
-			current = 0;
-		} else {
-			current = original.skip(--start);
-			if (current != start) {
-				throw new IOException("Cannot skip.");
-			}
-			
-			int c;
-			while ((c = original.read()) >= 0) {
-				start++;
-				current++;
-				
-				if (c == '\n' || c == '\r' && prefetch() != '\n') {
-					break;
-				}
-			}
-		}
-		
-		if (start >= end) {
-			eof = true;
-		}
-	}
-	
-	private int prefetch() throws IOException 
-	{
-		int c = original.read();
-		if (c >= 0) {
-			original.unread(c);
-		}
-		return c;
-	}
-}
+package org.embulk.input.filesplit;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PushbackInputStream;
+
+
+public class PartialFileInputStream extends InputStream
+{
+    private final PushbackInputStream original;
+    private long start;
+    private long end;
+    private long current;
+    private boolean eof;
+    
+    public PartialFileInputStream(InputStream original, long start, long end)
+    {
+        this.original = new PushbackInputStream(new BufferedInputStream(original));
+        this.start = start;
+        this.end = end;
+        current = -1;
+    }
+    
+    @Override
+    public int read(byte[] b) throws IOException
+    {
+        return read(b, 0, b.length);
+    }
+    
+    @Override
+    public int read(byte[] b, int off, int len) throws IOException 
+    {
+        initializeIfNeeded();
+
+        if (eof) {
+            return -1;
+        }
+        
+        int read = original.read(b, off, len);
+        if (read < 0) {
+            eof = true;
+            return -1;
+        }
+        
+        current += read;
+        if (current >= end) {
+            for (int i = Math.max((int)(end - 1 - current + read), 0); i < read; i++) {
+                if (b[off + i] == '\n') {
+                    eof = true;
+                    return i + 1;
+                }
+                
+                if (b[off + i] == '\r') {
+                    int next = (i < read ? b[off + i + 1] : prefetch());
+                    if (next != '\n') {
+                        eof = true;
+                        return i + 1;
+                    }
+                }
+            }
+        }
+        
+        return read;
+    }
+
+    @Override
+    public int read() throws IOException 
+    {
+        initializeIfNeeded();
+
+        if (eof) {
+            return -1;
+        }
+        
+        int read = original.read();
+        current++;
+        
+        if (read < 0) {
+            eof = true;
+            return -1;
+        }
+        
+        if (current >= end) {
+            if (read == '\n' || read == '\r' && prefetch() != '\n') {
+                eof = true;
+            }
+        }
+        
+        return read;
+    }
+    
+    @Override
+    public long skip(long n) throws IOException
+    {
+        throw new IOException("Skip not supported.");
+        /*
+        long skip = original.skip(n);
+        current += skip;
+        return skip;
+        */
+    }
+    
+    @Override
+    public int available() throws IOException 
+    {
+        return 0;
+    }
+    
+    @Override
+    public void close() throws IOException 
+    {
+        original.close();
+    }
+    
+    private void initializeIfNeeded() throws IOException 
+    {
+        if (current >= start) {
+            return;
+            
+        }
+        if (start == 0) {
+            current = 0;
+        } else {
+            current = original.skip(--start);
+            if (current != start) {
+                throw new IOException("Cannot skip.");
+            }
+            
+            int c;
+            while ((c = original.read()) >= 0) {
+                start++;
+                current++;
+                
+                if (c == '\n' || c == '\r' && prefetch() != '\n') {
+                    break;
+                }
+            }
+        }
+        
+        if (start >= end) {
+            eof = true;
+        }
+    }
+    
+    private int prefetch() throws IOException 
+    {
+        int c = original.read();
+        if (c >= 0) {
+            original.unread(c);
+        }
+        return c;
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-filesplit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hitoshi Tanaka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -36,7 +36,7 @@ files:
 - src/test/resources/yml/test-only-header.yml
 - src/test/resources/yml/test-tasks.yml
 - src/test/resources/yml/test.yml
-- classpath/embulk-input-filesplit-0.1.1.jar
+- classpath/embulk-input-filesplit-0.1.2.jar
 homepage: https://github.com/hito4t/embulk-input-filesplit
 licenses:
 - Apache 2.0