fix charset

ilsanbao · ilsanbao · commit 76c163e42584 · 2015-04-30T17:57:23.000+08:00
diff --git a/IP.java b/IP.java
@@ -4,17 +4,40 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
+import java.nio.charset.Charset;
+import java.util.Random;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
 class IP {
 
+    public static String randomIp() {
+        Random r = new Random();
+        StringBuffer str = new StringBuffer();
+        str.append(r.nextInt(1000000) % 255);
+        str.append(".");
+        str.append(r.nextInt(1000000) % 255);
+        str.append(".");
+        str.append(r.nextInt(1000000) % 255);
+        str.append(".");
+        str.append(0);
+
+        return str.toString();
+    }
+
     public static void main(String[] args){
         IP.load("H:\\loveapp\\codebase\\17mon\\17monipdb.dat");
 
-        System.out.println(Arrays.toString(IP.find("8.8.8.8")));
-        System.out.println(Arrays.toString(IP.find("255.255.255.255")));
+        Long st = System.nanoTime();
+        for (int i = 0; i < 1000000; i++)
+        {
+            IP.find(randomIp());
+        }
+        Long et = System.nanoTime();
+        System.out.println((et - st) / 1000 / 1000);
+
+        System.out.println(Arrays.toString(IP.find("118.28.8.8")));
     }
 
     public static boolean enableFileWatch = false;
@@ -52,6 +75,7 @@ public static String[] find(String ip) {
         }
 
         byte[] areaBytes;
+
         lock.lock();
         try {
             dataBuffer.position(offset + (int) index_offset - 1024);
@@ -61,7 +85,7 @@ public static String[] find(String ip) {
             lock.unlock();
         }
 
-        return new String(areaBytes).split("\t");
+        return new String(areaBytes, Charset.forName("UTF-8")).split("\t");
     }
 
     private static void watch() {
@@ -104,13 +128,15 @@ private static void load() {
             }
             indexBuffer.order(ByteOrder.BIG_ENDIAN);
         } catch (IOException ioe) {
-
+            ioe.printStackTrace();
         } finally {
             try {
                 if (fin != null) {
                     fin.close();
                 }
-            } catch (IOException e){}
+            } catch (IOException e){
+                e.printStackTrace();
+            }
             lock.unlock();
         }
     }
diff --git a/IPExt.java b/IPExt.java
@@ -4,6 +4,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
+import java.nio.charset.Charset;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
@@ -65,7 +66,7 @@ public static String[] find(String ip) {
             lock.unlock();
         }
 
-        return new String(areaBytes).split("\t");
+        return new String(areaBytes, Charset.forName("UTF-8")).split("\t");
     }
 
     private static void watch() {

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import java.nio.ByteBuffer;`
`5`	`5`	`import java.nio.ByteOrder;`
`6`	`6`	`import java.util.Arrays;`
	`7`	`+import java.nio.charset.Charset;`
`7`	`8`	`import java.util.concurrent.Executors;`
`8`	`9`	`import java.util.concurrent.TimeUnit;`
`9`	`10`	`import java.util.concurrent.locks.ReentrantLock;`
`@@ -65,7 +66,7 @@ public static String[] find(String ip) {`
`65`	`66`	`lock.unlock();`
`66`	`67`	`}`
`67`	`68`
`68`		`- return new String(areaBytes).split("\t");`
	`69`	`+ return new String(areaBytes, Charset.forName("UTF-8")).split("\t");`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`private static void watch() {`