You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/02/04 15:45:53 UTC
[44/50] [abbrv] ignite git commit: Page memory integration WIP
Page memory integration WIP
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ee0982a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ee0982a7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ee0982a7
Branch: refs/heads/sql-store-cmp
Commit: ee0982a78fb42fcac4ca3753d27695baf3bdaa16
Parents: 252296f
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Feb 1 09:58:16 2016 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Feb 3 17:13:43 2016 +0300
----------------------------------------------------------------------
.../internal/processors/query/h2/IgniteH2Indexing.java | 11 ++++++++---
.../processors/query/h2/IgniteH2QueryIndexProvider.java | 10 +++++++++-
2 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ee0982a7/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 79b081a..b94c489 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
@@ -2032,10 +2032,15 @@ public class IgniteH2Indexing implements GridQueryIndexing {
int valCol,
IndexColumn... cols
) {
- if (idxProvider != null)
- return idxProvider.createIndex(cacheId, name, tbl, pk, keyCol, valCol, cols);
+ try {
+ if (idxProvider != null)
+ return idxProvider.createIndex(cacheId, name, tbl, pk, keyCol, valCol, cols);
- return new GridH2TreeIndex(name, tbl, pk, keyCol, valCol, cols);
+ return new GridH2TreeIndex(name, tbl, pk, keyCol, valCol, cols);
+ }
+ catch (IgniteCheckedException e) {
+ throw new IgniteException(e);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/ee0982a7/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2QueryIndexProvider.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2QueryIndexProvider.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2QueryIndexProvider.java
index 3fada9b..a69cc3c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2QueryIndexProvider.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2QueryIndexProvider.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.query.h2;
+import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table;
import org.h2.index.Index;
import org.h2.table.IndexColumn;
@@ -34,5 +35,12 @@ public interface IgniteH2QueryIndexProvider {
* @param cols Index columns.
* @return Created index.
*/
- public Index createIndex(int cacheId, String name, GridH2Table tbl, boolean pk, int keyCol, int valCol, IndexColumn... cols);
+ public Index createIndex(
+ int cacheId,
+ String name,
+ GridH2Table tbl,
+ boolean pk,
+ int keyCol,
+ int valCol,
+ IndexColumn... cols) throws IgniteCheckedException;
}