提交 7249a6bb authored 作者: Thomas Mueller's avatar Thomas Mueller

Remove unused code.

上级 1c3f17e2
...@@ -35,7 +35,6 @@ import org.h2.schema.Sequence; ...@@ -35,7 +35,6 @@ import org.h2.schema.Sequence;
import org.h2.schema.TriggerObject; import org.h2.schema.TriggerObject;
import org.h2.util.New; import org.h2.util.New;
import org.h2.value.CompareMode; import org.h2.value.CompareMode;
import org.h2.value.DataType;
import org.h2.value.Value; import org.h2.value.Value;
import org.h2.value.ValueNull; import org.h2.value.ValueNull;
...@@ -85,11 +84,6 @@ public abstract class Table extends SchemaObjectBase { ...@@ -85,11 +84,6 @@ public abstract class Table extends SchemaObjectBase {
*/ */
protected Column[] columns; protected Column[] columns;
/**
* The amount of memory required for a row if all values would be very small.
*/
protected int memoryPerRow;
/** /**
* The compare mode used for this table. * The compare mode used for this table.
*/ */
...@@ -342,15 +336,12 @@ public abstract class Table extends SchemaObjectBase { ...@@ -342,15 +336,12 @@ public abstract class Table extends SchemaObjectBase {
if (columnMap.size() > 0) { if (columnMap.size() > 0) {
columnMap.clear(); columnMap.clear();
} }
// a row needs memory even if there are no columns
int memory = 1;
for (int i = 0; i < columns.length; i++) { for (int i = 0; i < columns.length; i++) {
Column col = columns[i]; Column col = columns[i];
int dataType = col.getType(); int dataType = col.getType();
if (dataType == Value.UNKNOWN) { if (dataType == Value.UNKNOWN) {
throw DbException.get(ErrorCode.UNKNOWN_DATA_TYPE_1, col.getSQL()); throw DbException.get(ErrorCode.UNKNOWN_DATA_TYPE_1, col.getSQL());
} }
memory += DataType.getDataType(dataType).memory;
col.setTable(this, i); col.setTable(this, i);
String columnName = col.getName(); String columnName = col.getName();
if (columnMap.get(columnName) != null) { if (columnMap.get(columnName) != null) {
...@@ -358,7 +349,6 @@ public abstract class Table extends SchemaObjectBase { ...@@ -358,7 +349,6 @@ public abstract class Table extends SchemaObjectBase {
} }
columnMap.put(columnName, col); columnMap.put(columnName, col);
} }
memoryPerRow = memory;
} }
/** /**
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论