You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2016/01/29 11:43:33 UTC
[1/3] ignite git commit: sql-store-idx - wip
Repository: ignite
Updated Branches:
refs/heads/sql-store 7bec0b9c4 -> 6db40d43c
sql-store-idx - wip
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a9242a71
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a9242a71
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a9242a71
Branch: refs/heads/sql-store
Commit: a9242a71051542821f971eb564404a9aa4d20296
Parents: 26a191b
Author: S.Vladykin <sv...@gridgain.com>
Authored: Thu Jan 28 08:50:00 2016 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Thu Jan 28 08:50:00 2016 +0300
----------------------------------------------------------------------
.../internal/processors/query/h2/opt/GridH2Row.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a9242a71/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Row.java
----------------------------------------------------------------------
diff --git 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
index 3b6b56e..a1aa728 100644
--- 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
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.query.h2.opt;
+import org.apache.ignite.internal.processors.cache.CacheObject;
import org.h2.result.Row;
import org.h2.value.Value;
@@ -24,6 +25,15 @@ import org.h2.value.Value;
* Row with locking support needed for unique key conflicts resolution.
*/
public class GridH2Row extends Row implements GridSearchRowPointer {
+ /** */
+ public long link; // TODO remove
+
+ /** */
+ public CacheObject key; // TODO remove
+
+ /** */
+ public CacheObject val; // TODO remove
+
/**
* @param data Column values.
*/
[2/3] ignite git commit: Merge branch 'sql-store' of
https://github.com/apache/ignite into sql-store
Posted by se...@apache.org.
Merge branch 'sql-store' of https://github.com/apache/ignite into sql-store
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7464230a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7464230a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7464230a
Branch: refs/heads/sql-store
Commit: 7464230aea75f35069e7965f5ef2157fcd82ae1c
Parents: a9242a7 0af9108
Author: S.Vladykin <sv...@gridgain.com>
Authored: Thu Jan 28 15:10:56 2016 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Thu Jan 28 15:10:56 2016 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/schema-import/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/apache-license-gen/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/benchmarks/pom.xml | 170 ++++++++++++++++++
.../benchmarks/jmh/cache/PutBenchmark.java | 170 ++++++++++++++++++
.../ignite/benchmarks/model/IntValue.java | 91 ++++++++++
modules/camel/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 5 +-
.../ignite/binary/BinaryObjectBuilder.java | 8 +-
.../internal/binary/BinaryClassDescriptor.java | 32 ++--
.../discovery/GridDiscoveryManager.java | 20 +++
.../processors/cache/CacheObjectAdapter.java | 3 +
.../dht/atomic/GridDhtAtomicCache.java | 11 +-
.../handlers/log/GridLogCommandHandler.java | 25 ++-
.../ignite/internal/visor/cache/VisorCache.java | 12 +-
.../visor/cache/VisorCacheConfiguration.java | 31 +++-
.../visor/node/VisorNodeDataCollectorJob.java | 18 +-
.../plugin/security/SecurityCredentials.java | 4 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 5 +-
.../core/src/main/resources/ignite.properties | 2 +-
.../cache/IgniteCacheObjectPutSelfTest.java | 177 ++++++++++++++++++
.../distributed/IgniteCachePrimarySyncTest.java | 129 ++++++++++++++
.../IgniteCacheWriteBehindNoUpdateSelfTest.java | 178 +++++++++++++++++++
.../handlers/log/GridLogCommandHandlerTest.java | 58 +++++-
.../testsuites/IgniteCacheTestSuite5.java | 2 +
modules/extdata/p2p/pom.xml | 2 +-
.../extdata/uri/modules/uri-dependency/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/flume/pom.xml | 2 +-
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
.../processors/hadoop/v2/HadoopV2Context.java | 2 +
.../processors/hadoop/v2/HadoopV2MapTask.java | 23 +--
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jms11/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kafka/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/log4j2/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
modules/mqtt/pom.xml | 2 +-
modules/osgi-karaf/pom.xml | 2 +-
modules/osgi-paxlogging/pom.xml | 2 +-
modules/osgi/pom.xml | 2 +-
modules/platforms/cpp/common/configure.ac | 2 +-
modules/platforms/cpp/core-test/configure.ac | 2 +-
modules/platforms/cpp/core/configure.ac | 2 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
modules/platforms/cpp/ignite/configure.ac | 2 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Apache.Ignite/Properties/AssemblyInfo.cs | 6 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Properties/AssemblyInfo.cs | 6 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/storm/pom.xml | 6 +-
modules/tools/pom.xml | 2 +-
modules/twitter/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console-2.10/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
modules/yarn/pom.xml | 2 +-
modules/zookeeper/pom.xml | 2 +-
.../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 15 +-
pom.xml | 3 +-
87 files changed, 1176 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
[3/3] ignite git commit: Merge branch 'sql-store' of
https://git-wip-us.apache.org/repos/asf/ignite into sql-store
Posted by se...@apache.org.
Merge branch 'sql-store' of https://git-wip-us.apache.org/repos/asf/ignite into sql-store
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6db40d43
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6db40d43
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6db40d43
Branch: refs/heads/sql-store
Commit: 6db40d43c0086ed14fd425188fbf49399a33f512
Parents: 7464230 7bec0b9
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Jan 29 13:43:12 2016 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Jan 29 13:43:12 2016 +0300
----------------------------------------------------------------------
.../stream/v2/DirectByteBufferStreamImplV2.java | 1 +
.../processors/query/h2/IgniteH2Indexing.java | 26 +++++++++++++++++---
.../query/h2/IgniteH2QueryIndexProvider.java | 2 +-
3 files changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------