提交 7703ad26 authored 作者: Andrei Tokar's avatar Andrei Tokar

Modify uniqness check in MVSecondaryIndex to use upper-bounded cursor

Push upper bound check from MVStoreCursor down to underlying map cursor
Propagate database compatibility mode down to Value comparison operation
上级 00478174
...@@ -60,7 +60,7 @@ class MVPlainTempResult extends MVTempResult { ...@@ -60,7 +60,7 @@ class MVPlainTempResult extends MVTempResult {
*/ */
MVPlainTempResult(Database database, Expression[] expressions, int visibleColumnCount) { MVPlainTempResult(Database database, Expression[] expressions, int visibleColumnCount) {
super(database, expressions.length, visibleColumnCount); super(database, expressions.length, visibleColumnCount);
ValueDataType valueType = new ValueDataType(database.getCompareMode(), database, new int[columnCount]); ValueDataType valueType = new ValueDataType(database, new int[columnCount]);
Builder<Long, ValueArray> builder = new MVMap.Builder<Long, ValueArray>() Builder<Long, ValueArray> builder = new MVMap.Builder<Long, ValueArray>()
.valueType(valueType).singleWriter(); .valueType(valueType).singleWriter();
map = store.openMap("tmp", builder); map = store.openMap("tmp", builder);
......
...@@ -51,9 +51,8 @@ public class MVPrimaryIndex extends BaseIndex { ...@@ -51,9 +51,8 @@ public class MVPrimaryIndex extends BaseIndex {
for (int i = 0; i < columns.length; i++) { for (int i = 0; i < columns.length; i++) {
sortTypes[i] = SortOrder.ASCENDING; sortTypes[i] = SortOrder.ASCENDING;
} }
ValueDataType keyType = new ValueDataType(null, null, null); ValueDataType keyType = ValueDataType.INSTANCE;
ValueDataType valueType = new ValueDataType(db.getCompareMode(), db, ValueDataType valueType = new ValueDataType(db, sortTypes);
sortTypes);
mapName = "table." + getId(); mapName = "table." + getId();
Transaction t = mvTable.getTransactionBegin(); Transaction t = mvTable.getTransactionBegin();
dataMap = t.openMap(mapName, keyType, valueType); dataMap = t.openMap(mapName, keyType, valueType);
......
...@@ -166,12 +166,12 @@ class MVSortedTempResult extends MVTempResult { ...@@ -166,12 +166,12 @@ class MVSortedTempResult extends MVTempResult {
indexes = null; indexes = null;
} }
this.indexes = indexes; this.indexes = indexes;
ValueDataType keyType = new ValueDataType(database.getCompareMode(), database, sortTypes); ValueDataType keyType = new ValueDataType(database, sortTypes);
Builder<ValueArray, Long> builder = new MVMap.Builder<ValueArray, Long>().keyType(keyType); Builder<ValueArray, Long> builder = new MVMap.Builder<ValueArray, Long>().keyType(keyType);
map = store.openMap("tmp", builder); map = store.openMap("tmp", builder);
if (distinct && length != visibleColumnCount || distinctIndexes != null) { if (distinct && length != visibleColumnCount || distinctIndexes != null) {
int count = distinctIndexes != null ? distinctIndexes.length : visibleColumnCount; int count = distinctIndexes != null ? distinctIndexes.length : visibleColumnCount;
ValueDataType distinctType = new ValueDataType(database.getCompareMode(), database, new int[count]); ValueDataType distinctType = new ValueDataType(database, new int[count]);
Builder<ValueArray, Boolean> indexBuilder = new MVMap.Builder<ValueArray, Boolean>().keyType(distinctType); Builder<ValueArray, Boolean> indexBuilder = new MVMap.Builder<ValueArray, Boolean>().keyType(distinctType);
index = store.openMap("idx", indexBuilder); index = store.openMap("idx", indexBuilder);
} }
......
...@@ -93,7 +93,7 @@ public class MVSpatialIndex extends BaseIndex implements SpatialIndex, MVIndex { ...@@ -93,7 +93,7 @@ public class MVSpatialIndex extends BaseIndex implements SpatialIndex, MVIndex {
checkIndexColumnTypes(columns); checkIndexColumnTypes(columns);
} }
String mapName = "index." + getId(); String mapName = "index." + getId();
ValueDataType vt = new ValueDataType(null, null, null); ValueDataType vt = new ValueDataType(db, null);
VersionedValue.Type valueType = new VersionedValue.Type(vt); VersionedValue.Type valueType = new VersionedValue.Type(vt);
MVRTreeMap.Builder<VersionedValue> mapBuilder = MVRTreeMap.Builder<VersionedValue> mapBuilder =
new MVRTreeMap.Builder<VersionedValue>(). new MVRTreeMap.Builder<VersionedValue>().
......
...@@ -160,9 +160,8 @@ public class MVTableEngine implements TableEngine { ...@@ -160,9 +160,8 @@ public class MVTableEngine implements TableEngine {
if (!db.getSettings().reuseSpace) { if (!db.getSettings().reuseSpace) {
store.setReuseSpace(false); store.setReuseSpace(false);
} }
this.transactionStore = new TransactionStore( this.transactionStore = new TransactionStore(store,
store, new ValueDataType(db, null), db.getLockTimeout());
new ValueDataType(db.getCompareMode(), db, null), db.getLockTimeout());
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
throw convertIllegalStateException(e); throw convertIllegalStateException(e);
} }
......
...@@ -13,6 +13,8 @@ import java.sql.ResultSetMetaData; ...@@ -13,6 +13,8 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Arrays; import java.util.Arrays;
import org.h2.api.ErrorCode; import org.h2.api.ErrorCode;
import org.h2.engine.Database;
import org.h2.engine.Mode;
import org.h2.message.DbException; import org.h2.message.DbException;
import org.h2.mvstore.DataUtils; import org.h2.mvstore.DataUtils;
import org.h2.mvstore.WriteBuffer; import org.h2.mvstore.WriteBuffer;
...@@ -33,6 +35,7 @@ import org.h2.value.ValueBytes; ...@@ -33,6 +35,7 @@ import org.h2.value.ValueBytes;
import org.h2.value.ValueDate; import org.h2.value.ValueDate;
import org.h2.value.ValueDecimal; import org.h2.value.ValueDecimal;
import org.h2.value.ValueDouble; import org.h2.value.ValueDouble;
import org.h2.value.ValueEnum;
import org.h2.value.ValueFloat; import org.h2.value.ValueFloat;
import org.h2.value.ValueGeometry; import org.h2.value.ValueGeometry;
import org.h2.value.ValueInt; import org.h2.value.ValueInt;
...@@ -73,12 +76,20 @@ public class ValueDataType implements DataType { ...@@ -73,12 +76,20 @@ public class ValueDataType implements DataType {
final DataHandler handler; final DataHandler handler;
final CompareMode compareMode; final CompareMode compareMode;
protected final Mode mode;
final int[] sortTypes; final int[] sortTypes;
SpatialDataType spatialType; SpatialDataType spatialType;
public ValueDataType(CompareMode compareMode, DataHandler handler, public static ValueDataType INSTANCE = new ValueDataType(null, Mode.getRegular(), null, null);
public ValueDataType(Database database, int[] sortTypes) {
this(database.getCompareMode(), database.getMode(), database, sortTypes);
}
private ValueDataType(CompareMode compareMode, Mode mode, DataHandler handler,
int[] sortTypes) { int[] sortTypes) {
this.compareMode = compareMode; this.compareMode = compareMode;
this.mode = mode;
this.handler = handler; this.handler = handler;
this.sortTypes = sortTypes; this.sortTypes = sortTypes;
} }
...@@ -103,7 +114,13 @@ public class ValueDataType implements DataType { ...@@ -103,7 +114,13 @@ public class ValueDataType implements DataType {
int len = Math.min(al, bl); int len = Math.min(al, bl);
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
int sortType = sortTypes == null ? SortOrder.ASCENDING : sortTypes[i]; int sortType = sortTypes == null ? SortOrder.ASCENDING : sortTypes[i];
int comp = compareValues(ax[i], bx[i], sortType); Value one = ax[i];
Value two = bx[i];
if (one == null || two == null) {
return compareValues(ax[len - 1], bx[len - 1], SortOrder.ASCENDING);
}
int comp = compareValues(one, two, sortType);
if (comp != 0) { if (comp != 0) {
return comp; return comp;
} }
...@@ -136,7 +153,12 @@ public class ValueDataType implements DataType { ...@@ -136,7 +153,12 @@ public class ValueDataType implements DataType {
if (aNull || bNull) { if (aNull || bNull) {
return SortOrder.compareNull(aNull, sortType); return SortOrder.compareNull(aNull, sortType);
} }
int comp = a.compareTypeSafe(b, compareMode);
int t2 = Value.getHigherOrder(a.getType(), b.getType());
String[] enumerators = ValueEnum.getEnumeratorsForBinaryOperation(a, b);
int comp = a.convertTo(t2, -1, mode, null, enumerators)
.compareTypeSafe(b.convertTo(t2, -1, mode, null, enumerators), compareMode);
if ((sortType & SortOrder.DESCENDING) != 0) { if ((sortType & SortOrder.DESCENDING) != 0) {
comp = -comp; comp = -comp;
} }
......
...@@ -622,12 +622,8 @@ public class Recover extends Tool implements DataHandler { ...@@ -622,12 +622,8 @@ public class Recover extends Tool implements DataHandler {
} }
String tableId = mapName.substring("table.".length()); String tableId = mapName.substring("table.".length());
if (Integer.parseInt(tableId) == 0) { if (Integer.parseInt(tableId) == 0) {
ValueDataType keyType = new ValueDataType(
null, this, null);
ValueDataType valueType = new ValueDataType(
null, this, null);
TransactionMap<Value, Value> dataMap = store.begin().openMap( TransactionMap<Value, Value> dataMap = store.begin().openMap(
mapName, keyType, valueType); mapName, ValueDataType.INSTANCE, ValueDataType.INSTANCE);
Iterator<Value> dataIt = dataMap.keyIterator(null); Iterator<Value> dataIt = dataMap.keyIterator(null);
while (dataIt.hasNext()) { while (dataIt.hasNext()) {
Value rowId = dataIt.next(); Value rowId = dataIt.next();
...@@ -660,12 +656,8 @@ public class Recover extends Tool implements DataHandler { ...@@ -660,12 +656,8 @@ public class Recover extends Tool implements DataHandler {
if (Integer.parseInt(tableId) == 0) { if (Integer.parseInt(tableId) == 0) {
continue; continue;
} }
ValueDataType keyType = new ValueDataType(
null, this, null);
ValueDataType valueType = new ValueDataType(
null, this, null);
TransactionMap<Value, Value> dataMap = store.begin().openMap( TransactionMap<Value, Value> dataMap = store.begin().openMap(
mapName, keyType, valueType); mapName, ValueDataType.INSTANCE, ValueDataType.INSTANCE);
Iterator<Value> dataIt = dataMap.keyIterator(null); Iterator<Value> dataIt = dataMap.keyIterator(null);
boolean init = false; boolean init = false;
while (dataIt.hasNext()) { while (dataIt.hasNext()) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论