1.5.4 版本提交（10万条数性能测试）

litesuits · litesuits · commit d68de07ae16e · 2015-09-10T20:13:01.000+08:00
100 000条数据压力性能测试demo提交
diff --git a/jars/LiteOrm vs SQLiteDatabase性能对比.jpg b/jars/LiteOrm vs SQLiteDatabase性能对比.jpg
diff --git a/jars/LiteOrm10w数据性能眼里测试结论.jpg b/jars/LiteOrm10w数据性能眼里测试结论.jpg
diff --git a/jars/lite-orm-1.5.4.jar b/jars/lite-orm-1.5.4.jar
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.litesuits.orm"
-          android:versionCode="16"
-          android:versionName="1.5.3">
+          android:versionCode="17"
+          android:versionName="1.5.4">
+
     <uses-sdk android:minSdkVersion="3"/>
 
     <!-- db文件在sd卡：在SDCard中创建与删除文件权限 -->
diff --git a/library/proguard-android-optimize.txt b/library/proguard-android-optimize.txt
@@ -18,7 +18,7 @@
 -verbose
 
 # 使用注解
--keepattributes *Annotation*,Signature,Exceptions
+-keepattributes *Annotation*,Signature,Exceptions,InnerClasses
 
 # For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
 -keepclassmembers enum * {
diff --git a/library/src/com/litesuits/orm/LiteOrm.java b/library/src/com/litesuits/orm/LiteOrm.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.*;
 import com.litesuits.orm.db.DataBase;
 import com.litesuits.orm.db.DataBaseConfig;
 import com.litesuits.orm.db.TableManager;
diff --git a/library/src/com/litesuits/orm/db/DataBase.java b/library/src/com/litesuits/orm/db/DataBase.java
@@ -3,8 +3,8 @@
 import android.database.sqlite.SQLiteDatabase;
 import com.litesuits.orm.db.assit.QueryBuilder;
 import com.litesuits.orm.db.assit.WhereBuilder;
-import com.litesuits.orm.db.impl.SQLStatement;
-import com.litesuits.orm.db.impl.SQLiteHelper;
+import com.litesuits.orm.db.assit.SQLStatement;
+import com.litesuits.orm.db.assit.SQLiteHelper;
 import com.litesuits.orm.db.model.ColumnsValue;
 import com.litesuits.orm.db.model.ConflictAlgorithm;
 import com.litesuits.orm.db.model.RelationKey;
diff --git a/library/src/com/litesuits/orm/db/DataBaseConfig.java b/library/src/com/litesuits/orm/db/DataBaseConfig.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import com.litesuits.orm.db.assit.Checker;
-import com.litesuits.orm.db.impl.SQLiteHelper.OnUpdateListener;
+import com.litesuits.orm.db.assit.SQLiteHelper.OnUpdateListener;
 
 /**
  * 数据操作配置
diff --git a/library/src/com/litesuits/orm/db/TableManager.java b/library/src/com/litesuits/orm/db/TableManager.java
@@ -12,7 +12,7 @@
 import com.litesuits.orm.db.assit.SQLBuilder;
 import com.litesuits.orm.db.assit.Transaction;
 import com.litesuits.orm.db.enums.AssignType;
-import com.litesuits.orm.db.impl.SQLStatement;
+import com.litesuits.orm.db.assit.SQLStatement;
 import com.litesuits.orm.db.model.*;
 import com.litesuits.orm.db.utils.DataUtil;
 import com.litesuits.orm.db.utils.FieldUtil;
diff --git a/library/src/com/litesuits/orm/db/assit/Querier.java b/library/src/com/litesuits/orm/db/assit/Querier.java
@@ -3,7 +3,6 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import com.litesuits.orm.log.OrmLog;
-import com.litesuits.orm.db.impl.SQLStatement;
 
 /**
  * 辅助查询
diff --git a/library/src/com/litesuits/orm/db/assit/QueryBuilder.java b/library/src/com/litesuits/orm/db/assit/QueryBuilder.java
@@ -1,7 +1,6 @@
 package com.litesuits.orm.db.assit;
 
 import com.litesuits.orm.db.TableManager;
-import com.litesuits.orm.db.impl.SQLStatement;
 
 import java.util.regex.Pattern;
 
diff --git a/library/src/com/litesuits/orm/db/assit/SQLBuilder.java b/library/src/com/litesuits/orm/db/assit/SQLBuilder.java
@@ -4,7 +4,6 @@
 import com.litesuits.orm.db.TableManager;
 import com.litesuits.orm.db.annotation.*;
 import com.litesuits.orm.db.enums.AssignType;
-import com.litesuits.orm.db.impl.SQLStatement;
 import com.litesuits.orm.db.model.*;
 import com.litesuits.orm.db.model.MapInfo.MapTable;
 import com.litesuits.orm.db.utils.ClassUtil;
@@ -105,7 +104,10 @@ public static SQLStatement buildDropTable(String tableName) {
 
     /**
      * 构建【表】sql语句
+     *
      * create [temp] table if not exists (table-name) (co1 TEXT, co2 TEXT, UNIQUE (co1, co2))
+     *
+     * such as : CREATE TABLE IF NOT EXISTS table-name (_id INTEGER PRIMARY KEY AUTOINCREMENT ,xx TEXT)
      */
     public static SQLStatement buildCreateTable(EntityTable table) {
         StringBuilder sb = new StringBuilder();
diff --git a/library/src/com/litesuits/orm/db/assit/SQLStatement.java b/library/src/com/litesuits/orm/db/assit/SQLStatement.java
@@ -1,15 +1,11 @@
-package com.litesuits.orm.db.impl;
+package com.litesuits.orm.db.assit;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteStatement;
 import android.os.Build;
 import com.litesuits.orm.db.TableManager;
-import com.litesuits.orm.db.assit.Checker;
-import com.litesuits.orm.db.assit.Querier;
 import com.litesuits.orm.db.assit.Querier.CursorParser;
-import com.litesuits.orm.db.assit.SQLBuilder;
-import com.litesuits.orm.db.assit.Transaction;
 import com.litesuits.orm.db.model.ColumnsValue;
 import com.litesuits.orm.db.model.EntityTable;
 import com.litesuits.orm.db.model.MapInfo;
diff --git a/library/src/com/litesuits/orm/db/assit/SQLiteHelper.java b/library/src/com/litesuits/orm/db/assit/SQLiteHelper.java
@@ -1,4 +1,4 @@
-package com.litesuits.orm.db.impl;
+package com.litesuits.orm.db.assit;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/library/src/com/litesuits/orm/db/assit/WhereBuilder.java b/library/src/com/litesuits/orm/db/assit/WhereBuilder.java
@@ -1,7 +1,6 @@
 package com.litesuits.orm.db.assit;
 
 import com.litesuits.orm.db.TableManager;
-import com.litesuits.orm.db.impl.SQLStatement;
 
 /**
  * @author MaTianyu
diff --git a/library/src/com/litesuits/orm/db/impl/SQLiteClosable.java b/library/src/com/litesuits/orm/db/impl/SQLiteClosable.java
diff --git a/library/src/com/litesuits/orm/db/impl/SingleSQLiteImpl.java b/library/src/com/litesuits/orm/db/impl/SingleSQLiteImpl.java
@@ -4,10 +4,7 @@
 import com.litesuits.orm.LiteOrm;
 import com.litesuits.orm.db.DataBaseConfig;
 import com.litesuits.orm.db.TableManager;
-import com.litesuits.orm.db.assit.Checker;
-import com.litesuits.orm.db.assit.QueryBuilder;
-import com.litesuits.orm.db.assit.SQLBuilder;
-import com.litesuits.orm.db.assit.WhereBuilder;
+import com.litesuits.orm.db.assit.*;
 import com.litesuits.orm.db.model.ColumnsValue;
 import com.litesuits.orm.db.model.ConflictAlgorithm;
 import com.litesuits.orm.db.model.EntityTable;
diff --git a/library/src/com/litesuits/orm/db/model/MapInfo.java b/library/src/com/litesuits/orm/db/model/MapInfo.java
@@ -1,7 +1,7 @@
 package com.litesuits.orm.db.model;
 
 import com.litesuits.orm.db.assit.Checker;
-import com.litesuits.orm.db.impl.SQLStatement;
+import com.litesuits.orm.db.assit.SQLStatement;
 
 import java.util.ArrayList;
 
diff --git a/sample/libs/lite-orm-1.5.3-mini.jar b/sample/libs/lite-orm-1.5.3-mini.jar
diff --git a/sample/libs/lite-orm-1.5.4.jar b/sample/libs/lite-orm-1.5.4.jar
diff --git a/sample/res/values-zh/strings.xml b/sample/res/values-zh/strings.xml
@@ -22,6 +22,8 @@
         <item>删除 指定数量</item>
         <item>删除 使用WhereBuilder</item>
         <item>删除全部</item>
+        <item>使用LiteOrm：较大规模数据测试</item>
+        <item>使用SQLiteDatabase：较大规模数据测试</item>
     </string-array>
 
 </resources>
diff --git a/sample/res/values/strings.xml b/sample/res/values/strings.xml
@@ -22,6 +22,8 @@
         <item>Delete By Index</item>
         <item>Delete By WhereBuilder</item>
         <item>Delete All</item>
+        <item>Use LiteOrm : Large-scale Test</item>
+        <item>Use SQLiteDatabase: Large-scale Test </item>
     </string-array>
 
 </resources>
diff --git a/sample/src/com/litesuits/orm/model/single/Boss.java b/sample/src/com/litesuits/orm/model/single/Boss.java
@@ -7,20 +7,23 @@
 import java.util.ArrayList;
 
 /**
- * 
  * 老湿，和Man是多对多关系
+ *
  * @author MaTianyu
- * 2014-3-7上午10:42:55
+ *         2014-3-7上午10:42:55
  */
 @Table("boss")
-public class Boss extends Person{
-
-    public String address = "默认地址";
-    public String phone = "";
+public class Boss extends Person {
+    public String address;
+    public String phone;
 
     @Mapping(Relation.ManyToMany)
     private ArrayList<Man> list;
 
+    public Boss() {
+
+    }
+
     public Boss(String name, ArrayList<Man> list) {
         this.name = name;
         this.list = list;
@@ -50,16 +53,34 @@ public void setList(ArrayList<Man> list) {
         this.list = list;
     }
 
+    public String getAddress() {
+        return address;
+    }
+
+    public Boss setAddress(String address) {
+        this.address = address;
+        return this;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public Boss setPhone(String phone) {
+        this.phone = phone;
+        return this;
+    }
+
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder("Boss [id=" + id + ", name=" + name + ", phone=" + phone+ ", " +
-                "address=" + address);
+        StringBuilder sb = new StringBuilder("Boss [id=" + id + ", name=" + name + ", phone=" + phone + ", " +
+                                             "address=" + address);
         if (list != null) {
             sb.append(", list=");
             for (Man m : list) {
                 sb.append(m.getName() + ", ");
             }
         }
-		return sb.toString();
-	}
+        return sb.toString();
+    }
 }
diff --git a/sample/src/com/litesuits/orm/model/single/Person.java b/sample/src/com/litesuits/orm/model/single/Person.java
@@ -1,16 +1,17 @@
 package com.litesuits.orm.model.single;
 
-import com.litesuits.orm.db.annotation.*;
+import com.litesuits.orm.db.annotation.Column;
+import com.litesuits.orm.db.annotation.Conflict;
+import com.litesuits.orm.db.annotation.NotNull;
+import com.litesuits.orm.db.annotation.PrimaryKey;
 import com.litesuits.orm.db.enums.AssignType;
 import com.litesuits.orm.db.enums.Strategy;
 
 /**
- * Wifi 和Man 是一对一关系
- * 
+ *
  * @author MaTianyu
  * 2014-3-7上午10:39:45
  */
-@Table("wife")
 public class Person extends  BaseModel{
     @PrimaryKey(AssignType.AUTO_INCREMENT)
     @Column("_id")
diff --git a/sample/src/com/litesuits/orm/samples/SingleTestActivity.java b/sample/src/com/litesuits/orm/samples/SingleTestActivity.java
diff --git a/sample/src/com/litesuits/orm/test/SqliteUtils.java b/sample/src/com/litesuits/orm/test/SqliteUtils.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.litesuits.orm.db.impl;`
	`1`	`+package com.litesuits.orm.db.assit;`
`2`	`2`
`3`	`3`	`import android.content.Context;`
`4`	`4`	`import android.database.sqlite.SQLiteDatabase;`