ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/4] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-3478-idx' into ignite-5937
Date Tue, 17 Oct 2017 10:16:02 GMT
Merge remote-tracking branch 'remotes/origin/ignite-3478-idx' into ignite-5937


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e0897f13
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e0897f13
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e0897f13

Branch: refs/heads/ignite-5937
Commit: e0897f13a50fd8d13f55bdcb413bcb2bf5da1173
Parents: dfa3b78 bc831a7
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Oct 17 12:50:13 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Oct 17 12:50:13 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheEntryEx.java      |   3 +-
 .../processors/cache/GridCacheMapEntry.java     |   8 +-
 .../cache/IgniteCacheOffheapManagerImpl.java    |  42 +-----
 .../cache/query/GridCacheQueryManager.java      |  53 ++------
 .../processors/query/GridQueryIndexing.java     |  25 ++--
 .../processors/query/GridQueryProcessor.java    |  68 +++++-----
 .../schema/SchemaIndexCacheVisitorClosure.java  |  14 +-
 .../schema/SchemaIndexCacheVisitorImpl.java     |  29 ++---
 .../processors/cache/GridCacheTestEntryEx.java  |   2 +-
 ...IgniteClientCacheInitializationFailTest.java |  12 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  68 +++++-----
 .../query/h2/database/H2PkHashIndex.java        |   5 +-
 .../query/h2/database/H2RowFactory.java         |   6 +-
 .../query/h2/opt/GridH2KeyRowOnheap.java        |   6 +-
 .../query/h2/opt/GridH2KeyValueRowOnheap.java   |  35 ++---
 .../processors/query/h2/opt/GridH2Row.java      |  59 +++------
 .../query/h2/opt/GridH2RowDescriptor.java       |  24 +---
 .../processors/query/h2/opt/GridH2Table.java    |  28 ++--
 .../cache/IgniteCacheAbstractQuerySelfTest.java |  13 +-
 .../cache/index/H2DynamicTableSelfTest.java     |  43 ++++++
 ...teSqlSkipReducerOnUpdateDmlFlagSelfTest.java |  17 +++
 .../ignite/logger/log4j2/Log4J2Logger.java      | 130 ++++++++-----------
 .../log4j2/GridLog4j2CorrectFileNameTest.java   |  94 --------------
 .../log4j2/GridLog4j2InitializedTest.java       |  77 -----------
 .../log4j2/GridLog4j2LoggingFileTest.java       |  68 ----------
 .../logger/log4j2/Log4j2LoggerSelfTest.java     |   7 +
 .../log4j2/Log4j2LoggerVerboseModeSelfTest.java |  71 ++++++----
 .../testsuites/IgniteLog4j2TestSuite.java       |   2 +
 28 files changed, 349 insertions(+), 660 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e0897f13/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/e0897f13/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/e0897f13/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/e0897f13/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/e0897f13/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/e0897f13/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java
index cdfc7cb,8b1b711..54e0417
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java
@@@ -104,21 -83,6 +83,21 @@@ public abstract class GridH2Row extend
  
      /** {@inheritDoc} */
      @Override public int cacheId() {
-         return 0;
+         return row.cacheId();
      }
 +
 +    /** {@inheritDoc} */
 +    @Override public long mvccCoordinatorVersion() {
 +        throw new UnsupportedOperationException();
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public long mvccCounter() {
 +        throw new UnsupportedOperationException();
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public boolean removed() {
 +        throw new UnsupportedOperationException();
 +    }
  }


Mime
View raw message