Merge pull request #22 from ray6080/issue17

Rename the prefix of packages to io.pixelsdb

cpp/PixelsCacheReader.cc

@@ -3,15 +3,15 @@
 #include "MemoryMappedFile.h"
 using namespace std;
 
-JNIEXPORT jbyteArray JNICALL Java_cn_edu_ruc_iir_pixels_cache_NativePixelsCacheReader_get
+JNIEXPORT jbyteArray JNICALL Java_io_pixelsdb_pixels_cache_NativePixelsCacheReader_get
   (JNIEnv *env, jclass cls, jlong blockId, jshort rowGroupId, jshort columnId)
 {
     jbyteArray res;
     return res;
 }
 
 
-JNIEXPORT jbyteArray JNICALL Java_cn_edu_ruc_iir_pixels_cache_NativePixelsCacheReader_sch
+JNIEXPORT jbyteArray JNICALL Java_io_pixelsdb_pixels_cache_NativePixelsCacheReader_sch
   (JNIEnv *env, jclass cls, jlong blockId, jshort rowGroupId, jshort columnId)
 {
     jbyteArray res;

pixels-cache/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>pixels</artifactId>
-        <groupId>cn.edu.ruc.iir</groupId>
+        <groupId>io.pixelsdb</groupId>
         <version>0.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>cn.edu.ruc.iir</groupId>
+            <groupId>io.pixelsdb</groupId>
             <artifactId>pixels-common</artifactId>
             <optional>true</optional>
         </dependency>

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/CacheLocationDistribution.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/CacheLocationDistribution.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import com.facebook.presto.spi.HostAddress;
 

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/CacheLogger.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/CacheLogger.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/ColumnletId.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/ColumnletId.java

@@ -1,12 +1,7 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
-import cn.edu.ruc.iir.pixels.cache.mq.MappedBusMessage;
-import cn.edu.ruc.iir.pixels.common.utils.Constants;
-import org.apache.commons.compress.utils.CharsetNames;
+import io.pixelsdb.pixels.cache.mq.MappedBusMessage;
 
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.Arrays;
 import java.util.Objects;
 
 import static com.google.common.base.MoreObjects.toStringHelper;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/ColumnletSeq.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/ColumnletSeq.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import java.util.ArrayList;
 import java.util.Comparator;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/DynamicArray.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/DynamicArray.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import javax.annotation.concurrent.NotThreadSafe;
 

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/MemoryMappedFile.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/MemoryMappedFile.java

@@ -17,7 +17,7 @@
 /*
  * This class was inspired from an entry in Bryce Nyeggen's blog
  */
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import sun.misc.Unsafe;
 import sun.nio.ch.FileChannelImpl;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/NativePixelsCacheReader.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/NativePixelsCacheReader.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/PixelsCacheConfig.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/PixelsCacheConfig.java

@@ -1,6 +1,6 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
-import cn.edu.ruc.iir.pixels.common.utils.ConfigFactory;
+import io.pixelsdb.pixels.common.utils.ConfigFactory;
 
 /**
  * pixels

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/PixelsCacheIdx.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/PixelsCacheIdx.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import java.nio.ByteBuffer;
 import java.util.Objects;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/PixelsCacheKey.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/PixelsCacheKey.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import java.nio.ByteBuffer;
 import java.util.Objects;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/PixelsCacheKeyUtil.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/PixelsCacheKeyUtil.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import java.nio.ByteBuffer;
 

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/PixelsCacheReader.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/PixelsCacheReader.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/PixelsCacheUtil.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/PixelsCacheUtil.java

@@ -1,6 +1,6 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
-import cn.edu.ruc.iir.pixels.common.utils.Constants;
+import io.pixelsdb.pixels.common.utils.Constants;
 import org.apache.directory.api.util.Strings;
 
 import java.nio.charset.StandardCharsets;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/PixelsCacheWriter.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/PixelsCacheWriter.java

@@ -1,11 +1,11 @@
-package cn.edu.ruc.iir.pixels.cache;
-
-import cn.edu.ruc.iir.pixels.common.exception.FSException;
-import cn.edu.ruc.iir.pixels.common.metadata.domain.Compact;
-import cn.edu.ruc.iir.pixels.common.metadata.domain.Layout;
-import cn.edu.ruc.iir.pixels.common.utils.Constants;
-import cn.edu.ruc.iir.pixels.common.utils.EtcdUtil;
-import cn.edu.ruc.iir.pixels.core.PixelsProto;
+package io.pixelsdb.pixels.cache;
+
+import io.pixelsdb.pixels.common.exception.FSException;
+import io.pixelsdb.pixels.common.metadata.domain.Compact;
+import io.pixelsdb.pixels.common.metadata.domain.Layout;
+import io.pixelsdb.pixels.common.utils.Constants;
+import io.pixelsdb.pixels.common.utils.EtcdUtil;
+import io.pixelsdb.pixels.core.PixelsProto;
 import com.coreos.jetcd.data.KeyValue;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/PixelsPhysicalReader.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/PixelsPhysicalReader.java

@@ -1,9 +1,9 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
-import cn.edu.ruc.iir.pixels.common.exception.FSException;
-import cn.edu.ruc.iir.pixels.common.physical.PhysicalReader;
-import cn.edu.ruc.iir.pixels.common.physical.PhysicalReaderUtil;
-import cn.edu.ruc.iir.pixels.core.PixelsProto;
+import io.pixelsdb.pixels.common.exception.FSException;
+import io.pixelsdb.pixels.common.physical.PhysicalReader;
+import io.pixelsdb.pixels.common.physical.PhysicalReaderUtil;
+import io.pixelsdb.pixels.core.PixelsProto;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/PixelsRadix.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/PixelsRadix.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/RadixNode.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/RadixNode.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.pixels.cache;
+package io.pixelsdb.pixels.cache;
 
 import java.util.HashMap;
 import java.util.Map;

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/mq/MappedBusConstants.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/mq/MappedBusConstants.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.edu.ruc.iir.pixels.cache.mq;
+package io.pixelsdb.pixels.cache.mq;
 
 /**
  * Class with constants.

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/mq/MappedBusMessage.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/mq/MappedBusMessage.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.edu.ruc.iir.pixels.cache.mq;
+package io.pixelsdb.pixels.cache.mq;
 
-import cn.edu.ruc.iir.pixels.cache.MemoryMappedFile;
+import io.pixelsdb.pixels.cache.MemoryMappedFile;
 
 /**
  * Interface for messages that can be serialized to the bus.

pixels-cache/src/main/java/cn/edu/ruc/iir/pixels/cache/mq/MappedBusReader.java → pixels-cache/src/main/java/io/pixelsdb/pixels/cache/mq/MappedBusReader.java

@@ -13,13 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.edu.ruc.iir.pixels.cache.mq;
+package io.pixelsdb.pixels.cache.mq;
 
-import cn.edu.ruc.iir.pixels.cache.MemoryMappedFile;
-import cn.edu.ruc.iir.pixels.cache.mq.MappedBusConstants.Commit;
-import cn.edu.ruc.iir.pixels.cache.mq.MappedBusConstants.Length;
-import cn.edu.ruc.iir.pixels.cache.mq.MappedBusConstants.Rollback;
-import cn.edu.ruc.iir.pixels.cache.mq.MappedBusConstants.Structure;
+import io.pixelsdb.pixels.cache.MemoryMappedFile;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -71,7 +67,7 @@ public class MappedBusReader
 
     private MemoryMappedFile mem;
 
-    private long limit = Structure.Data;
+    private long limit = MappedBusConstants.Structure.Data;
 
     private long initialLimit;
 
@@ -113,7 +109,7 @@ public void open()
         {
             throw new IOException("Unable to open the file: " + fileName, e);
         }
-        initialLimit = mem.getLongVolatile(Structure.Limit);
+        initialLimit = mem.getLongVolatile(MappedBusConstants.Structure.Limit);
     }
 
     /**
@@ -145,20 +141,20 @@ public boolean next()
         {
             throw new EOFException("End of file was reached");
         }
-        if (mem.getLongVolatile(Structure.Limit) <= limit)
+        if (mem.getLongVolatile(MappedBusConstants.Structure.Limit) <= limit)
         {
             return false;
         }
         byte commit = mem.getByteVolatile(limit);
-        byte rollback = mem.getByteVolatile(limit + Length.Commit);
-        if (rollback == Rollback.Set)
+        byte rollback = mem.getByteVolatile(limit + MappedBusConstants.Length.Commit);
+        if (rollback == MappedBusConstants.Rollback.Set)
         {
-            limit += Length.RecordHeader + recordSize;
+            limit += MappedBusConstants.Length.RecordHeader + recordSize;
             timeoutCounter = 0;
             timerStart = 0;
             return false;
         }
-        if (commit == Commit.Set)
+        if (commit == MappedBusConstants.Commit.Set)
         {
             timeoutCounter = 0;
             timerStart = 0;
@@ -175,8 +171,8 @@ public boolean next()
             {
                 if (System.currentTimeMillis() - timerStart >= maxTimeout)
                 {
-                    mem.putByteVolatile(limit + Length.Commit, Rollback.Set);
-                    limit += Length.RecordHeader + recordSize;
+                    mem.putByteVolatile(limit + MappedBusConstants.Length.Commit, MappedBusConstants.Rollback.Set);
+                    limit += MappedBusConstants.Length.RecordHeader + recordSize;
                     timeoutCounter = 0;
                     timerStart = 0;
                     return false;
@@ -194,9 +190,9 @@ public boolean next()
     public int readType()
     {
         typeRead = true;
-        limit += Length.StatusFlags;
+        limit += MappedBusConstants.Length.StatusFlags;
         int type = mem.getInt(limit);
-        limit += Length.Metadata;
+        limit += MappedBusConstants.Length.Metadata;
         return type;
     }
 
@@ -227,9 +223,9 @@ public MappedBusMessage readMessage(MappedBusMessage message)
      */
     public int readBuffer(byte[] dst, int offset)
     {
-        limit += Length.StatusFlags;
+        limit += MappedBusConstants.Length.StatusFlags;
         int length = mem.getInt(limit);
-        limit += Length.Metadata;
+        limit += MappedBusConstants.Length.Metadata;
         mem.getBytes(limit, dst, offset, length);
         limit += recordSize;
         return length;