You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/09/20 20:04:10 UTC
ignite git commit: ignite-h2 - new version
Repository: ignite
Updated Branches:
refs/heads/ignite-h2 [created] 5dc81e8b7
ignite-h2 - new version
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5dc81e8b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5dc81e8b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5dc81e8b
Branch: refs/heads/ignite-h2
Commit: 5dc81e8b72840af043e0b2feb90c9af6724a7962
Parents: c28cec1
Author: S.Vladykin <sv...@gridgain.com>
Authored: Sun Sep 20 21:03:42 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Sun Sep 20 21:03:42 2015 +0300
----------------------------------------------------------------------
modules/indexing/pom.xml | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 18 +++++----
.../query/h2/opt/GridH2IndexBase.java | 42 --------------------
.../processors/query/h2/opt/GridH2Table.java | 20 ++++++++--
.../query/h2/opt/GridH2ValueCacheObject.java | 3 +-
.../query/h2/opt/GridLuceneIndex.java | 4 +-
.../query/h2/twostep/GridMergeTable.java | 4 +-
.../query/h2/twostep/GridThreadLocalTable.java | 4 +-
.../query/h2/twostep/msg/GridH2Timestamp.java | 2 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 5 +--
10 files changed, 40 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5dc81e8b/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index d539f6b..1e15ddf 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.3.175</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/5dc81e8b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 2af1386..f30756a 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -114,7 +114,7 @@ import org.apache.ignite.spi.IgniteSpiCloseableIterator;
import org.apache.ignite.spi.indexing.IndexingQueryFilter;
import org.h2.api.JavaObjectSerializer;
import org.h2.command.CommandInterface;
-import org.h2.constant.SysProperties;
+import org.h2.engine.SysProperties;
import org.h2.index.Index;
import org.h2.index.SpatialIndex;
import org.h2.jdbc.JdbcPreparedStatement;
@@ -125,7 +125,7 @@ import org.h2.table.Column;
import org.h2.table.IndexColumn;
import org.h2.table.Table;
import org.h2.tools.Server;
-import org.h2.util.Utils;
+import org.h2.util.JdbcUtils;
import org.h2.value.DataType;
import org.h2.value.Value;
import org.h2.value.ValueArray;
@@ -1297,10 +1297,10 @@ public class IgniteH2Indexing implements GridQueryIndexing {
SysProperties.serializeJavaObject = false;
}
- if (Utils.serializer != null)
+ if (JdbcUtils.serializer != null)
U.warn(log, "Custom H2 serialization is already configured, will override.");
- Utils.serializer = h2Serializer();
+ JdbcUtils.serializer = h2Serializer();
String dbName = (ctx != null ? ctx.localNodeId() : UUID.randomUUID()).toString();
@@ -2061,9 +2061,13 @@ public class IgniteH2Indexing implements GridQueryIndexing {
this.offheap = offheap;
this.ccfg = ccfg;
- if (offheap != null)
- rowCache = new CacheLongKeyLIRS<>(ccfg.getSqlOnheapRowCacheSize(), 1, 128, 256);
- else
+ if (offheap != null) {
+ CacheLongKeyLIRS.Config lirsCfg = new CacheLongKeyLIRS.Config();
+
+ lirsCfg.maxMemory = ccfg.getSqlOnheapRowCacheSize();
+
+ rowCache = new CacheLongKeyLIRS<>(lirsCfg);
+ } else
rowCache = null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5dc81e8b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
index 39664ff..ff9aa23 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2IndexBase.java
@@ -27,8 +27,6 @@ import org.h2.index.BaseIndex;
import org.h2.message.DbException;
import org.h2.result.Row;
import org.h2.result.SearchRow;
-import org.h2.result.SortOrder;
-import org.h2.value.Value;
import org.jetbrains.annotations.Nullable;
/**
@@ -108,46 +106,6 @@ public abstract class GridH2IndexBase extends BaseIndex {
// No-op.
}
- /** {@inheritDoc} */
- @Override public int compareRows(SearchRow rowData, SearchRow compare) {
- if (rowData == compare)
- return 0;
-
- for (int i = 0, len = indexColumns.length; i < len; i++) {
- int index = columnIds[i];
-
- Value v1 = rowData.getValue(index);
- Value v2 = compare.getValue(index);
-
- if (v1 == null || v2 == null)
- return 0;
-
- int c = compareValues(v1, v2, indexColumns[i].sortType);
-
- if (c != 0)
- return c;
- }
- return 0;
- }
-
- /**
- * @param a First value.
- * @param b Second value.
- * @param sortType Sort type.
- * @return Comparison result.
- */
- private int compareValues(Value a, Value b, int sortType) {
- if (a == b)
- return 0;
-
- int comp = table.compareTypeSave(a, b);
-
- if ((sortType & SortOrder.DESCENDING) != 0)
- comp = -comp;
-
- return comp;
- }
-
/**
* Filters rows from expired ones and using predicate.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/5dc81e8b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
index 66241b4..ab08fa8 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
@@ -22,8 +22,10 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentNavigableMap;
+import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
@@ -197,10 +199,10 @@ public class GridH2Table extends TableBase {
/** {@inheritDoc} */
@SuppressWarnings({"LockAcquiredButNotSafelyReleased", "SynchronizationOnLocalVariableOrMethodParameter", "unchecked"})
- @Override public void lock(@Nullable final Session ses, boolean exclusive, boolean force) {
+ @Override public boolean lock(@Nullable final Session ses, boolean exclusive, boolean force) {
if (ses != null) {
if (!sessions.add(ses))
- return;
+ return false;
synchronized (ses) {
ses.addLock(this);
@@ -217,7 +219,7 @@ public class GridH2Table extends TableBase {
for (int i = 1, len = idxs.size(); i < len; i++)
index(i).takeSnapshot(snapshot[i - 1]);
- return;
+ return false;
}
try {
@@ -251,6 +253,8 @@ public class GridH2Table extends TableBase {
for (int i = 1, len = idxs.size(); i < len; i++)
index(i).takeSnapshot(snapshot[i - 1]);
}
+
+ return false;
}
/**
@@ -828,6 +832,16 @@ public class GridH2Table extends TableBase {
}
/** {@inheritDoc} */
+ @Override public int getPreferedLookupBatchSize() {
+ return 0;
+ }
+
+ /** {@inheritDoc} */
+ @Override public List<Future<Cursor>> findBatched(TableFilter tableFilter, List<SearchRow> list) {
+ throw new IllegalStateException("Must never be called.");
+ }
+
+ /** {@inheritDoc} */
@Override public void truncate(Session ses) {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5dc81e8b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java
index d790d34..e2f6e61 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java
@@ -25,6 +25,7 @@ import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.CacheObjectContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.h2.message.DbException;
+import org.h2.util.JdbcUtils;
import org.h2.util.Utils;
import org.h2.value.CompareMode;
import org.h2.value.Value;
@@ -115,7 +116,7 @@ public class GridH2ValueCacheObject extends Value {
}
// For portables and byte array cache object types.
- return Utils.serialize(obj.value(objectContext(), false), null);
+ return JdbcUtils.serialize(obj.value(objectContext(), false), null);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/5dc81e8b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
index 85cf822..8558727 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java
@@ -51,7 +51,7 @@ import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermRangeFilter;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.util.Version;
-import org.h2.util.Utils;
+import org.h2.util.JdbcUtils;
import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing.KEY_FIELD_NAME;
@@ -363,7 +363,7 @@ public class GridLuceneIndex implements Closeable {
@SuppressWarnings("unchecked")
private <Z> Z unmarshall(byte[] bytes, ClassLoader ldr) throws IgniteCheckedException {
if (coctx == null) // For tests.
- return (Z)Utils.deserialize(bytes, null);
+ return (Z)JdbcUtils.deserialize(bytes, null);
return (Z)coctx.processor().unmarshal(coctx, bytes, ldr);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5dc81e8b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
index adfd220..97170bf 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
@@ -64,8 +64,8 @@ public class GridMergeTable extends TableBase {
}
/** {@inheritDoc} */
- @Override public void lock(Session session, boolean exclusive, boolean force) {
- // No-op.
+ @Override public boolean lock(Session session, boolean exclusive, boolean force) {
+ return false;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/5dc81e8b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridThreadLocalTable.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridThreadLocalTable.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridThreadLocalTable.java
index a38d137..f9619f2 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridThreadLocalTable.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridThreadLocalTable.java
@@ -122,8 +122,8 @@ public class GridThreadLocalTable extends Table {
}
/** {@inheritDoc} */
- @Override public void lock(Session session, boolean exclusive, boolean force) {
- tbl.get().lock(session, exclusive, force);
+ @Override public boolean lock(Session session, boolean exclusive, boolean force) {
+ return tbl.get().lock(session, exclusive, force);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/5dc81e8b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java
index ccdba92..dda93a6 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java
@@ -50,7 +50,7 @@ public class GridH2Timestamp extends GridH2ValueMessage {
ValueTimestamp t = (ValueTimestamp)val;
date = t.getDateValue();
- nanos = t.getNanos();
+ nanos = t.getTimeNanos();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/5dc81e8b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
index acfe3b6..81f84fb 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -44,7 +43,7 @@ import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.testframework.GridStringLogger;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.h2.util.Utils;
+import org.h2.util.JdbcUtils;
import org.jetbrains.annotations.Nullable;
/**
@@ -561,7 +560,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
/** {@inheritDoc} */
@Override public byte[] valueBytes(CacheObjectContext ctx) throws IgniteCheckedException {
- return Utils.serialize(val, null);
+ return JdbcUtils.serialize(val, null);
}
/** {@inheritDoc} */