ignite-959-m - clean debug
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46b00166 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46b00166 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46b00166 Branch: refs/heads/ignite-959-m Commit: 46b0016611884380b0585ace57db481e90f10729 Parents: 2ebdc56 Author: S.Vladykin <[email protected]> Authored: Wed Jul 22 13:24:22 2015 +0300 Committer: S.Vladykin <[email protected]> Committed: Wed Jul 22 13:24:22 2015 +0300 ---------------------------------------------------------------------- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 36 +++----------------- .../processors/query/h2/opt/GridH2Table.java | 20 ++--------- 2 files changed, 7 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46b00166/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java index e784f0e..5e1aade 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java @@ -19,9 +19,7 @@ package org.apache.ignite.internal.processors.query.h2.opt; import org.apache.ignite.*; import org.apache.ignite.internal.processors.query.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; import org.h2.message.*; import org.h2.result.*; import org.h2.value.*; @@ -104,8 +102,6 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row { * @throws IgniteCheckedException If failed. */ public synchronized void onSwap() throws IgniteCheckedException { - D.debug("onSwap", getValue(KEY_COL).getInt()); - setValue(VAL_COL, null); } @@ -117,8 +113,6 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row { * @throws IgniteCheckedException If failed. */ public synchronized void onUnswap(Object val, boolean beforeRmv) throws IgniteCheckedException { - D.debug("onUnswap", getValue(KEY_COL).getInt(), val, val.getClass()); - setValue(VAL_COL, desc.wrap(val, desc.valueType())); notifyAll(); @@ -213,31 +207,11 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row { // Even if valObj was found in swap we still have to recheck if this row was concurrently // unswapped because we can racy read wrong value from swap here. if ((v = syncValue(0)) == null && (v = getOffheapValue(VAL_COL)) == null) { - try { - Value upd = desc.wrap(valObj, desc.valueType()); - - v = updateWeakValue(upd); - - return v == null ? upd : v; - } - catch (ClassCastException e) { - D.dumpWithStop(new IgnitePredicate<GridDebug.Item>() { - @Override public boolean apply(GridDebug.Item item) { - Integer k0 = null; - - try { - k0 = desc.wrap(item.data[1], Value.INT).getInt(); - } - catch (IgniteCheckedException e1) { - e1.printStackTrace(); - } - - return kx.equals(k0); - } - }); - - throw new IllegalStateException(e); - } + Value upd = desc.wrap(valObj, desc.valueType()); + + v = updateWeakValue(upd); + + return v == null ? upd : v; } } else // If nothing found in swap then we should be already unswapped. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46b00166/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 0a5f55a..42c46d5 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 @@ -19,10 +19,7 @@ package org.apache.ignite.internal.processors.query.h2.opt; import org.apache.ignite.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.offheap.unsafe.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; import org.h2.api.*; import org.h2.command.ddl.*; import org.h2.engine.*; @@ -312,12 +309,10 @@ public class GridH2Table extends TableBase { throws IgniteCheckedException { assert desc != null; - D.debug("update", key, getName(), rmv, val); - GridH2Row row = desc.createRow(key, val, expirationTime, rmv); return doUpdate(row, rmv); - } + }gnite /** * Gets index by index. @@ -403,18 +398,7 @@ public class GridH2Table extends TableBase { Row res = index(i).remove(old); assert eq(pk, res, old): "\n" + old + "\n" + res + "\n" + i + " -> " + index(i).getName() + - " -> " + index(i).validate() + D.dumpWithStop(new IgnitePredicate<GridDebug.Item>() { - @Override public boolean apply(GridDebug.Item item) { - try { - return row.getValue(KEY_COL).getInt() == desc.wrap(item.data[1], Value.INT).getInt(); - } - catch (IgniteCheckedException e1) { - e1.printStackTrace(); - } - - return false; - } - }); + " -> " + index(i).validate(); } } else
