ignite-2.0 - H2 upgraded to 1.4.195
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2d7fc517 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d7fc517 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d7fc517 Branch: refs/heads/ignite-5024 Commit: 2d7fc5176414f9ab47baad2305b700b5f198e037 Parents: 045ae66 Author: Sergi Vladykin <[email protected]> Authored: Mon Apr 24 01:52:22 2017 +0300 Committer: Sergi Vladykin <[email protected]> Committed: Mon Apr 24 01:52:22 2017 +0300 ---------------------------------------------------------------------- .../processors/query/h2/IgniteH2Indexing.java | 13 +-------- .../query/h2/opt/GridH2IndexBase.java | 3 ++ .../h2/twostep/GridReduceQueryExecutor.java | 29 -------------------- .../query/h2/twostep/GridThreadLocalTable.java | 5 ++-- parent/pom.xml | 2 +- 5 files changed, 8 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2d7fc517/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 8296945..bf0276a 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 @@ -462,7 +462,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { PreparedStatement stmt = cache.get(sql); - if (stmt != null && !stmt.isClosed() && !((JdbcStatement)stmt).wasCancelled()) { + if (stmt != null && !stmt.isClosed() && !((JdbcStatement)stmt).isCancelled()) { assert stmt.getConnection() == c; return stmt; @@ -669,17 +669,6 @@ public class IgniteH2Indexing implements GridQueryIndexing { } /** - * @param coctx Cache object context. - * @param o Object. - * @return Object class. - */ - private Class<?> getClass(CacheObjectContext coctx, CacheObject o) { - return isBinary(o) ? - Object.class : - o.value(coctx, false).getClass(); - } - - /** * @param space Space. * @return Cache object context. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/2d7fc517/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 9dab752..81a9620 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 @@ -1360,6 +1360,9 @@ public abstract class GridH2IndexBase extends BaseIndex { * Start streaming. */ private void start() { + assert ctx != null; + assert log != null: getName(); + remainingRanges = req.bounds().size(); assert remainingRanges > 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/2d7fc517/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java index 0421ca0..d307c00 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.query.h2.twostep; -import java.lang.reflect.Constructor; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; @@ -87,9 +86,6 @@ import org.h2.engine.Session; import org.h2.index.Cursor; import org.h2.index.Index; import org.h2.jdbc.JdbcConnection; -import org.h2.jdbc.JdbcResultSet; -import org.h2.jdbc.JdbcStatement; -import org.h2.result.ResultInterface; import org.h2.result.Row; import org.h2.table.Column; import org.h2.util.IntArray; @@ -138,31 +134,6 @@ public class GridReduceQueryExecutor { private final Lock fakeTblsLock = new ReentrantLock(); /** */ - private static final Constructor<JdbcResultSet> CONSTRUCTOR; - - /** - * Init constructor. - */ - static { - try { - CONSTRUCTOR = JdbcResultSet.class.getDeclaredConstructor( - JdbcConnection.class, - JdbcStatement.class, - ResultInterface.class, - Integer.TYPE, - Boolean.TYPE, - Boolean.TYPE, - Boolean.TYPE - ); - - CONSTRUCTOR.setAccessible(true); - } - catch (NoSuchMethodException e) { - throw new IllegalStateException("Check H2 version in classpath.", e); - } - } - - /** */ private final GridSpinBusyLock busyLock; /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/2d7fc517/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 9bbb9b4..b01c3d4 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,9 @@ public class GridThreadLocalTable extends Table { } /** {@inheritDoc} */ - @Override public Index getIndexForColumn(Column column) { - return innerTable().getIndexForColumn(column); + @Override public Index getIndexForColumn(Column column, + boolean needGetFirstOrLast, boolean needFindNext) { + return innerTable().getIndexForColumn(column, needGetFirstOrLast, needFindNext); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/2d7fc517/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index cb638e1..3d0f413 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -71,7 +71,7 @@ <guava.version>18.0</guava.version> <guava14.version>14.0.1</guava14.version> <guava16.version>16.0.1</guava16.version> - <h2.version>1.4.194</h2.version> + <h2.version>1.4.195</h2.version> <httpclient.version>4.5.1</httpclient.version> <httpcore.version>4.4.3</httpcore.version> <jackson.version>1.9.13</jackson.version>
