[11/11] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e97a96c7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e97a96c7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e97a96c7 Branch: refs/heads/ignite-1537 Commit: e97a96c7eadc2161b7b84d73098343f0c9f3bb78 Parents: 1a00ab5 d4687d9 Author: sboikov Authored: Mon Dec 21 10:22:50 2015 +0300 Committer: sboikov Committed: Mon Dec 21 10:22:50 2015 +0300 -- RELEASE_NOTES.txt | 1 + ...ComputeClientBinaryTaskExecutionExample.java | 4 +- .../CacheClientBinaryPutGetExample.java | 6 +- .../datagrid/CacheClientBinaryQueryExample.java | 10 +- .../datagrid/CacheEntryProcessorExample.java| 157 ++ .../examples/datagrid/CacheQueryExample.java| 4 +- .../apache/ignite/examples/model/Address.java | 72 +++ .../apache/ignite/examples/model/Employee.java | 93 .../ignite/examples/model/EmployeeKey.java | 93 .../ignite/examples/model/Organization.java | 85 +++- .../ignite/examples/model/OrganizationType.java | 32 ++ .../apache/ignite/examples/model/Person.java| 2 +- .../ignite/examples/model/binary/Address.java | 72 --- .../ignite/examples/model/binary/Employee.java | 93 .../examples/model/binary/EmployeeKey.java | 93 .../examples/model/binary/Organization.java | 93 .../examples/model/binary/OrganizationType.java | 32 -- .../ignite/examples/model/package-info.java | 23 + .../datagrid/CacheEntryProcessorExample.java| 147 ++ .../ScalarCacheEntryProcessorExample.scala | 125 + .../ignite/examples/CacheExamplesSelfTest.java | 8 + .../java8/examples/CacheExamplesSelfTest.java | 8 + .../tests/examples/ScalarExamplesSelfTest.scala | 5 + .../ignite/internal/binary/BinaryContext.java | 16 +- .../processors/cache/CacheObjectAdapter.java| 3 + .../cache/BinarySerializationQuerySelfTest.java | 2 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 68 ++- modules/platforms/cpp/core/impl/doxygen.h | 53 -- .../cpp/core/include/ignite/binary/binary.h | 5 + .../core/include/ignite/binary/binary_consts.h | 5 + .../include/ignite/binary/binary_containers.h | 5 + .../include/ignite/binary/binary_raw_reader.h | 5 + .../include/ignite/binary/binary_raw_writer.h | 5 + .../core/include/ignite/binary/binary_reader.h | 5 + .../core/include/ignite/binary/binary_type.h| 17 + .../core/include/ignite/binary/binary_writer.h | 5 + .../cpp/core/include/ignite/cache/cache.h | 5 + .../cpp/core/include/ignite/cache/cache_entry.h | 5 + .../core/include/ignite/cache/cache_peek_mode.h | 5 + .../cpp/core/include/ignite/cache/query/query.h | 5 + .../include/ignite/cache/query/query_argument.h | 6 + .../include/ignite/cache/query/query_cursor.h | 5 + .../ignite/cache/query/query_fields_cursor.h| 5 + .../ignite/cache/query/query_fields_row.h | 5 + .../include/ignite/cache/query/query_scan.h | 5 + .../core/include/ignite/cache/query/query_sql.h | 5 + .../ignite/cache/query/query_sql_fields.h | 5 + .../include/ignite/cache/query/query_text.h | 5 + .../platforms/cpp/core/include/ignite/guid.h| 5 + .../platforms/cpp/core/include/ignite/ignite.h | 5 + .../core/include/ignite/ignite_configuration.h | 5 + .../cpp/core/include/ignite/ignite_error.h | 5 + .../cpp/core/include/ignite/ignition.h | 5 + modules/platforms/cpp/core/namespaces.dox | 53 ++ .../ignite/schema/generator/CodeGenerator.java | 7 +- .../schema/test/AbstractSchemaImportTest.java | 18 + .../org/apache/ignite/schema/test/model/Tst.txt | 506 +++ .../apache/ignite/schema/test/model/TstKey.txt | 96 .../schema/test/model/ignite-type-metadata.xml | 180 +++ .../test/parser/DbMetadataParserTest.java | 17 +- 60 files changed, 1935 insertions(+), 480 deletions(-) --
[11/11] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b69eab2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b69eab2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b69eab2
Branch: refs/heads/ignite-1537
Commit: 4b69eab2dfa986fbc4f1b41906c9f5d348020654
Parents: 9f158b9
Author: sboikov
Authored: Thu Dec 24 09:09:23 2015 +0300
Committer: sboikov
Committed: Thu Dec 24 09:09:23 2015 +0300
--
.../processors/cache/binary/CacheObjectBinaryProcessorImpl.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b69eab2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index 2209ec9..bcc2ab7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -477,7 +477,7 @@ public class CacheObjectBinaryProcessorImpl extends
IgniteCacheObjectProcessorIm
}
/** {@inheritDoc} */
-public void addMeta(final int typeId, final BinaryType newMeta) {
+@Override public void addMeta(final int typeId, final BinaryType newMeta)
throws BinaryObjectException {
assert newMeta != null;
assert newMeta instanceof BinaryTypeImpl;
