master - schema drop fix for TL tables
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/952c7fc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/952c7fc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/952c7fc9 Branch: refs/heads/ignite-gg-9615-1 Commit: 952c7fc99d63b5af0d5a3fe7df4b610f8baf9001 Parents: ad12147 Author: S.Vladykin <svlady...@gridgain.com> Authored: Mon Aug 17 21:22:50 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Mon Aug 17 21:22:50 2015 +0300 ---------------------------------------------------------------------- .../query/h2/twostep/GridThreadLocalTable.java | 22 +++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/952c7fc9/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 c468371..f6735b5 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 @@ -21,6 +21,7 @@ import org.h2.api.*; import org.h2.command.ddl.*; import org.h2.engine.*; import org.h2.index.*; +import org.h2.message.*; import org.h2.result.*; import org.h2.schema.*; import org.h2.table.*; @@ -154,7 +155,7 @@ public class GridThreadLocalTable extends Table { /** {@inheritDoc} */ @Override public String getTableType() { - return tbl.get().getTableType(); + return EXTERNAL_TABLE_ENGINE; } /** {@inheritDoc} */ @@ -179,7 +180,7 @@ public class GridThreadLocalTable extends Table { /** {@inheritDoc} */ @Override public long getMaxDataModificationId() { - return tbl.get().getMaxDataModificationId(); + return 0; } /** {@inheritDoc} */ @@ -194,7 +195,7 @@ public class GridThreadLocalTable extends Table { /** {@inheritDoc} */ @Override public boolean canDrop() { - return tbl.get().canDrop(); + return false; } /** {@inheritDoc} */ @@ -204,12 +205,14 @@ public class GridThreadLocalTable extends Table { /** {@inheritDoc} */ @Override public long getRowCountApproximation() { - return tbl.get().getRowCountApproximation(); + Table t = tbl.get(); + + return t == null ? 0 : t.getRowCountApproximation(); } /** {@inheritDoc} */ @Override public long getDiskSpaceUsed() { - return tbl.get().getDiskSpaceUsed(); + return 0; } /** {@inheritDoc} */ @@ -219,12 +222,17 @@ public class GridThreadLocalTable extends Table { /** {@inheritDoc} */ @Override public String getDropSQL() { - return tbl.get().getDropSQL(); + return ""; + } + + /** {@inheritDoc} */ + @Override public void addDependencies(HashSet<DbObject> dependencies) { + // No-op. We should not have any dependencies to add. } /** {@inheritDoc} */ @Override public void checkRename() { - tbl.get().checkRename(); + throw DbException.getUnsupportedException("rename"); } /**
