You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2016/01/21 10:45:29 UTC
[1/2] ignite git commit: Updated documentation
Repository: ignite
Updated Branches:
refs/heads/master 7a31e4fb6 -> 4fa85a185
Updated documentation
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/58c6909e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58c6909e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58c6909e
Branch: refs/heads/master
Commit: 58c6909e34767c1f33b9486883d23aa4c03806ad
Parents: 0abe0df
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu Jan 21 12:44:03 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu Jan 21 12:44:03 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/binary/BinaryObjectBuilder.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/58c6909e/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java
index 9fd8420..156ddb9 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java
@@ -44,13 +44,13 @@ import org.jetbrains.annotations.Nullable;
* </pre>
* </p>
*
- * If you need to modify nested binary object you can get builder for nested object using
+ * If you need to modify nested binary object you can get an instance of a builder for nested binary object using
* {@link #getField(String)}, changes made on nested builder will affect parent object,
* for example:
*
* <pre name=code class=java>
* BinaryObjectBuilder personBuilder = grid.binary().createBuilder(personBinaryObj);
- * BinaryObjectBuilder addressBuilder = personBuilder.setField("address");
+ * BinaryObjectBuilder addressBuilder = personBuilder.getField("address");
*
* addressBuilder.setField("city", "New York");
*
@@ -66,7 +66,7 @@ import org.jetbrains.annotations.Nullable;
public interface BinaryObjectBuilder {
/**
* Returns value assigned to the specified field.
- * If the value is a binary object instance of {@code BinaryObjectBuilder} will be returned,
+ * If the value is a binary object then an instance of {@code BinaryObjectBuilder} will be returned,
* which can be modified.
* <p>
* Collections and maps returned from this method are modifiable.
@@ -132,4 +132,4 @@ public interface BinaryObjectBuilder {
* @throws BinaryObjectException In case of error.
*/
public BinaryObject build() throws BinaryObjectException;
-}
\ No newline at end of file
+}
[2/2] ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ignite into master-main
Posted by dm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4fa85a18
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4fa85a18
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4fa85a18
Branch: refs/heads/master
Commit: 4fa85a1855e7ffe13e9a97a5f92d40c8f0ca35a4
Parents: 58c6909 7a31e4f
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu Jan 21 12:45:20 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu Jan 21 12:45:20 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMvccManager.java | 43 ++-
.../processors/cache/GridCacheProcessor.java | 18 ++
.../distributed/GridCacheTxRecoveryFuture.java | 2 +-
.../dht/CacheDistributedGetFutureAdapter.java | 2 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 2 +-
.../colocated/GridDhtColocatedLockFuture.java | 2 +-
.../distributed/near/GridNearLockFuture.java | 2 +-
...arOptimisticSerializableTxPrepareFuture.java | 47 ++-
.../GridNearPessimisticTxPrepareFuture.java | 6 +-
.../near/GridNearTxFinishFuture.java | 29 +-
.../processors/cluster/ClusterProcessor.java | 37 ++-
.../processors/query/GridQueryProcessor.java | 7 +-
.../service/GridServiceProcessor.java | 17 +-
.../util/future/GridCompoundFuture.java | 314 +++++--------------
.../util/future/GridCompoundIdentityFuture.java | 6 +-
.../internal/util/future/GridFutureAdapter.java | 2 +
.../ignite/internal/visor/cache/VisorCache.java | 63 ++--
.../visor/cache/VisorCacheConfiguration.java | 4 +-
.../cache/VisorCacheQueryConfiguration.java | 31 +-
.../cache/VisorCacheQueryConfigurationV2.java | 47 +++
.../cache/VisorCacheStoreConfiguration.java | 39 +--
.../cache/VisorCacheStoreConfigurationV2.java | 48 +++
.../internal/visor/cache/VisorCacheV2.java | 73 +++++
.../visor/node/VisorIgfsConfiguration.java | 32 +-
.../visor/node/VisorNodeDataCollectorJob.java | 5 +-
.../visor/node/VisorNodeDataCollectorTask.java | 2 +-
.../resources/META-INF/classnames.properties | 15 +-
.../ignite/testframework/GridTestUtils.java | 7 +-
.../Cache/CacheAbstractTest.cs | 72 +++--
.../Impl/Unmanaged/IgniteJniNativeMethods.cs | 2 +-
.../Impl/Unmanaged/UnmanagedUtils.cs | 6 +-
.../commands/cache/VisorCacheCommand.scala | 10 +-
34 files changed, 573 insertions(+), 423 deletions(-)
----------------------------------------------------------------------