Merge pull request #35 from gluster/fix_seek

Update global input stream position and unit test - for hbase compatibil...

Author: jayunit100

src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFUSEInputStream.java

@@ -89,11 +89,13 @@ public long getPos() throws IOException{
     public synchronized int available() throws IOException{
         return (int) ((f.length())-getPos());
     }
-
-    public void seek(long pos) throws IOException{
-        fuseInputStream.seek(pos);
+    
+    public void seek(long newPos) throws IOException{
+        fuseInputStream.seek(newPos);
         if(fsInputStream!=null)
-            fsInputStream.seek(pos);
+            fsInputStream.seek(newPos);
+        //Important for any seek app: HBASE checks explicitly that position after seek is correct.
+        this.pos=newPos;
     }
 
     public boolean seekToNewSource(long pos) throws IOException{

src/test/java/org/gluster/test/TestGlusterFuseInputStream.java

@@ -1,28 +1,40 @@
 package org.gluster.test;
 
 import java.io.File;
-import java.io.IOException;
-import java.util.TreeMap;
 
-import org.apache.hadoop.fs.glusterfs.GlusterFSBrickClass;
+import junit.framework.Assert;
+
 import org.apache.hadoop.fs.glusterfs.GlusterFUSEInputStream;
+import org.apache.hadoop.fs.glusterfs.GlusterFUSEOutputStream;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class TestGlusterFuseInputStream{
+	String infile ;
 
+	@Before
+	public void create() throws Exception{
+		//setup: no need for gluster specific path, since its just reading from local path
+	    infile=File.createTempFile("TestGlusterFuseInputStream"+System.currentTimeMillis(),"txt").getAbsolutePath();
+	    new File(infile).deleteOnExit();
+	    final GlusterFUSEOutputStream stream = new GlusterFUSEOutputStream(infile,true);
+		stream.write("hello there, certainly, there is some data in this stream".getBytes());
+		stream.close();
+	}
+	
     @Test
-    public void testDoubleClose() throws IOException{
-        /**
-         * GlusterFUSEInputStream gfi= new GlusterFUSEInputStream ( new
-         * File(""), null, "localhost") ; gfi.close(); gfi.close();
-         **/
-    }
+    public void testDoubleClose() throws Exception{
+    	 //test
+         GlusterFUSEInputStream gfi= new GlusterFUSEInputStream (new File(infile), null, "localhost") ; 
+         
+         //assert that Position is updated (necessary for hbase to function properly)
+         gfi.seek(2);
+         Assert.assertEquals(2,gfi.getPos());
 
-    @Test
-    public void testDoubleClose2() throws IOException{
-        /**
-         * GlusterFUSEInputStream gfi= new GlusterFUSEInputStream ( new
-         * File(""), null, "localhost") ; gfi.close(); gfi.close();
-         **/
+         gfi.close();
+     
+         //cleanup
+         new File(infile).delete();
     }
 }