CaseInsensitiveMap类移到common.util包

lealone · Sep 13, 2018 · 02a1b02 · 02a1b02
1 parent c522f5b
commit 02a1b02
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 13 deletions.
diff --git a/...lue/CaseInsensitiveConcurrentHashMap.java → ...til/CaseInsensitiveConcurrentHashMap.java b/...lue/CaseInsensitiveConcurrentHashMap.java → ...til/CaseInsensitiveConcurrentHashMap.java
@@ -4,12 +4,10 @@
  * (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package org.lealone.common.util;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.lealone.common.util.StringUtils;
-
 /**
  * A hash map with a case-insensitive string key.
  *

diff --git a/.../lealone/db/value/CaseInsensitiveMap.java → ...alone/common/util/CaseInsensitiveMap.java b/.../lealone/db/value/CaseInsensitiveMap.java → ...alone/common/util/CaseInsensitiveMap.java
@@ -4,12 +4,10 @@
  * (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.lealone.db.value;
+package org.lealone.common.util;
 
 import java.util.HashMap;
 
-import org.lealone.common.util.StringUtils;
-
 /**
  * A hash map with a case-insensitive string key.
  *

diff --git a/lealone-db/src/main/java/org/lealone/db/Database.java b/lealone-db/src/main/java/org/lealone/db/Database.java
@@ -30,6 +30,7 @@
 import org.lealone.common.trace.Trace;
 import org.lealone.common.trace.TraceSystem;
 import org.lealone.common.util.BitField;
+import org.lealone.common.util.CaseInsensitiveMap;
 import org.lealone.common.util.MathUtils;
 import org.lealone.common.util.New;
 import org.lealone.common.util.ShutdownHookUtils;
@@ -59,7 +60,6 @@
 import org.lealone.db.table.TableAlterHistoryRecord;
 import org.lealone.db.table.TableView;
 import org.lealone.db.util.SourceCompiler;
-import org.lealone.db.value.CaseInsensitiveMap;
 import org.lealone.db.value.CompareMode;
 import org.lealone.db.value.Value;
 import org.lealone.db.value.ValueInt;

diff --git a/lealone-db/src/main/java/org/lealone/db/LealoneDatabase.java b/lealone-db/src/main/java/org/lealone/db/LealoneDatabase.java
@@ -26,7 +26,7 @@
 
 import org.lealone.api.ErrorCode;
 import org.lealone.common.exceptions.DbException;
-import org.lealone.db.value.CaseInsensitiveConcurrentHashMap;
+import org.lealone.common.util.CaseInsensitiveConcurrentHashMap;
 
 /**
  * 管理所有Database

diff --git a/lealone-db/src/main/java/org/lealone/db/table/CreateTableData.java b/lealone-db/src/main/java/org/lealone/db/table/CreateTableData.java
@@ -8,10 +8,10 @@
 
 import java.util.ArrayList;
 
+import org.lealone.common.util.CaseInsensitiveMap;
 import org.lealone.common.util.New;
 import org.lealone.db.ServerSession;
 import org.lealone.db.schema.Schema;
-import org.lealone.db.value.CaseInsensitiveMap;
 
 /**
  * The data required to create a table.

diff --git a/lealone-sql/src/main/java/org/lealone/sql/Parser.java b/lealone-sql/src/main/java/org/lealone/sql/Parser.java
@@ -17,6 +17,7 @@
 import org.lealone.api.ErrorCode;
 import org.lealone.api.Trigger;
 import org.lealone.common.exceptions.DbException;
+import org.lealone.common.util.CaseInsensitiveMap;
 import org.lealone.common.util.MathUtils;
 import org.lealone.common.util.New;
 import org.lealone.common.util.StatementBuilder;
@@ -51,7 +52,6 @@
 import org.lealone.db.table.TableFilter;
 import org.lealone.db.table.TableFilter.TableFilterVisitor;
 import org.lealone.db.table.TableView;
-import org.lealone.db.value.CaseInsensitiveMap;
 import org.lealone.db.value.CompareMode;
 import org.lealone.db.value.DataType;
 import org.lealone.db.value.Value;

diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateDatabase.java b/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateDatabase.java
@@ -21,13 +21,13 @@
 
 import org.lealone.api.ErrorCode;
 import org.lealone.common.exceptions.DbException;
+import org.lealone.common.util.CaseInsensitiveMap;
 import org.lealone.common.util.StringUtils;
 import org.lealone.db.Database;
 import org.lealone.db.DbObjectType;
 import org.lealone.db.LealoneDatabase;
 import org.lealone.db.RunMode;
 import org.lealone.db.ServerSession;
-import org.lealone.db.value.CaseInsensitiveMap;
 import org.lealone.router.RouterHolder;
 import org.lealone.sql.SQLStatement;
 

diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateService.java b/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateService.java
@@ -18,6 +18,7 @@
 import org.lealone.api.ErrorCode;
 import org.lealone.common.exceptions.DbException;
 import org.lealone.common.util.CamelCaseHelper;
+import org.lealone.common.util.CaseInsensitiveMap;
 import org.lealone.common.util.New;
 import org.lealone.db.Database;
 import org.lealone.db.DbObjectType;
@@ -31,7 +32,6 @@
 import org.lealone.db.table.CreateTableData;
 import org.lealone.db.table.IndexColumn;
 import org.lealone.db.table.Table;
-import org.lealone.db.value.CaseInsensitiveMap;
 import org.lealone.db.value.DataType;
 import org.lealone.sql.SQLStatement;
 

diff --git a/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateTable.java b/lealone-sql/src/main/java/org/lealone/sql/ddl/CreateTable.java
@@ -14,6 +14,7 @@
 import org.lealone.api.ErrorCode;
 import org.lealone.common.exceptions.DbException;
 import org.lealone.common.util.CamelCaseHelper;
+import org.lealone.common.util.CaseInsensitiveMap;
 import org.lealone.common.util.New;
 import org.lealone.db.Database;
 import org.lealone.db.DbObjectType;
@@ -26,7 +27,6 @@
 import org.lealone.db.table.CreateTableData;
 import org.lealone.db.table.IndexColumn;
 import org.lealone.db.table.Table;
-import org.lealone.db.value.CaseInsensitiveMap;
 import org.lealone.db.value.DataType;
 import org.lealone.db.value.Value;
 import org.lealone.sql.SQLStatement;