IGNITE-1364: Moved headers to correct folders.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0d70d547 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d70d547 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d70d547 Branch: refs/heads/ignite-1364 Commit: 0d70d547cd5dbec5809da7f6c1748d7bae034a58 Parents: 41cd824 Author: vozerov-gridgain <[email protected]> Authored: Thu Sep 3 13:49:28 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Sep 3 13:49:30 2015 +0300 ---------------------------------------------------------------------- .../platform/src/main/cpp/common/configure.ac | 2 +- .../src/main/cpp/common/ignite-common.pc.in | 2 +- .../platform/src/main/cpp/core-test/Makefile.am | 10 +- .../main/cpp/core-test/config/cache-query.xml | 22 +- .../main/cpp/core-test/config/cache-test.xml | 43 +- .../src/main/cpp/core-test/configure.ac | 2 +- .../src/main/cpp/core-test/include/Makefile.am | 21 +- .../include/gridgain/portable_test_defs.h | 312 ----- .../include/gridgain/portable_test_utils.h | 508 -------- .../include/ignite/portable_test_defs.h | 320 +++++ .../include/ignite/portable_test_utils.h | 516 ++++++++ .../cpp/core-test/project/vs/core-test.vcxproj | 4 +- .../project/vs/core-test.vcxproj.filters | 4 +- .../main/cpp/core-test/src/cache_query_test.cpp | 35 +- .../src/main/cpp/core-test/src/cache_test.cpp | 26 +- .../main/cpp/core-test/src/concurrent_test.cpp | 20 +- .../cpp/core-test/src/grid_factory_test.cpp | 24 +- .../cpp/core-test/src/handle_registry_test.cpp | 22 +- .../src/portable_reader_writer_raw_test.cpp | 28 +- .../src/portable_reader_writer_test.cpp | 28 +- .../cpp/core-test/src/portable_session_test.cpp | 28 +- .../cpp/core-test/src/portable_test_defs.cpp | 26 +- .../main/cpp/core-test/src/teamcity_boost.cpp | 2 +- modules/platform/src/main/cpp/core/Makefile.am | 8 +- modules/platform/src/main/cpp/core/configure.ac | 4 +- .../platform/src/main/cpp/core/gridgain.pc.in | 9 - modules/platform/src/main/cpp/core/ignite.pc.in | 9 + .../src/main/cpp/core/include/Makefile.am | 84 +- .../cpp/core/include/gridgain/cache/cache.h | 1153 ------------------ .../core/include/gridgain/cache/cache_entry.h | 118 -- .../include/gridgain/cache/cache_peek_mode.h | 71 -- .../core/include/gridgain/cache/query/query.h | 27 - .../gridgain/cache/query/query_argument.h | 125 -- .../include/gridgain/cache/query/query_cursor.h | 191 --- .../include/gridgain/cache/query/query_scan.h | 151 --- .../include/gridgain/cache/query/query_sql.h | 253 ---- .../include/gridgain/cache/query/query_text.h | 159 --- .../src/main/cpp/core/include/gridgain/grid.h | 154 --- .../core/include/gridgain/grid_configuration.h | 92 -- .../main/cpp/core/include/gridgain/grid_error.h | 260 ---- .../cpp/core/include/gridgain/grid_factory.h | 195 --- .../src/main/cpp/core/include/gridgain/guid.h | 112 -- .../include/gridgain/impl/cache/cache_impl.h | 418 ------- .../gridgain/impl/cache/query/query_impl.h | 115 -- .../include/gridgain/impl/grid_environment.h | 130 -- .../cpp/core/include/gridgain/impl/grid_impl.h | 146 --- .../include/gridgain/impl/handle_registry.h | 202 --- .../include/gridgain/impl/interop/interop.h | 25 - .../impl/interop/interop_input_stream.h | 234 ---- .../gridgain/impl/interop/interop_memory.h | 280 ----- .../impl/interop/interop_output_stream.h | 234 ---- .../cpp/core/include/gridgain/impl/operations.h | 452 ------- .../gridgain/impl/portable/portable_common.h | 146 --- .../impl/portable/portable_id_resolver.h | 106 -- .../impl/portable/portable_metadata_handler.h | 102 -- .../impl/portable/portable_metadata_manager.h | 121 -- .../impl/portable/portable_metadata_snapshot.h | 122 -- .../impl/portable/portable_metadata_updater.h | 53 - .../portable/portable_metadata_updater_impl.h | 65 - .../impl/portable/portable_reader_impl.h | 1130 ----------------- .../gridgain/impl/portable/portable_utils.h | 344 ------ .../impl/portable/portable_writer_impl.h | 859 ------------- .../core/include/gridgain/portable/portable.h | 29 - .../include/gridgain/portable/portable_consts.h | 106 -- .../gridgain/portable/portable_containers.h | 525 -------- .../gridgain/portable/portable_raw_reader.h | 324 ----- .../gridgain/portable/portable_raw_writer.h | 300 ----- .../include/gridgain/portable/portable_reader.h | 355 ------ .../include/gridgain/portable/portable_type.h | 293 ----- .../include/gridgain/portable/portable_writer.h | 335 ----- .../main/cpp/core/include/ignite/cache/cache.h | 1153 ++++++++++++++++++ .../cpp/core/include/ignite/cache/cache_entry.h | 118 ++ .../core/include/ignite/cache/cache_peek_mode.h | 71 ++ .../cpp/core/include/ignite/cache/query/query.h | 27 + .../include/ignite/cache/query/query_argument.h | 125 ++ .../include/ignite/cache/query/query_cursor.h | 191 +++ .../include/ignite/cache/query/query_scan.h | 151 +++ .../core/include/ignite/cache/query/query_sql.h | 253 ++++ .../include/ignite/cache/query/query_text.h | 159 +++ .../src/main/cpp/core/include/ignite/grid.h | 154 +++ .../core/include/ignite/grid_configuration.h | 92 ++ .../main/cpp/core/include/ignite/grid_error.h | 260 ++++ .../main/cpp/core/include/ignite/grid_factory.h | 195 +++ .../src/main/cpp/core/include/ignite/guid.h | 112 ++ .../core/include/ignite/impl/cache/cache_impl.h | 418 +++++++ .../ignite/impl/cache/query/query_impl.h | 115 ++ .../core/include/ignite/impl/grid_environment.h | 130 ++ .../cpp/core/include/ignite/impl/grid_impl.h | 146 +++ .../core/include/ignite/impl/handle_registry.h | 202 +++ .../core/include/ignite/impl/interop/interop.h | 25 + .../ignite/impl/interop/interop_input_stream.h | 234 ++++ .../ignite/impl/interop/interop_memory.h | 280 +++++ .../ignite/impl/interop/interop_output_stream.h | 234 ++++ .../cpp/core/include/ignite/impl/operations.h | 452 +++++++ .../ignite/impl/portable/portable_common.h | 146 +++ .../ignite/impl/portable/portable_id_resolver.h | 106 ++ .../impl/portable/portable_metadata_handler.h | 102 ++ .../impl/portable/portable_metadata_manager.h | 120 ++ .../impl/portable/portable_metadata_snapshot.h | 122 ++ .../impl/portable/portable_metadata_updater.h | 53 + .../portable/portable_metadata_updater_impl.h | 65 + .../ignite/impl/portable/portable_reader_impl.h | 1130 +++++++++++++++++ .../ignite/impl/portable/portable_utils.h | 344 ++++++ .../ignite/impl/portable/portable_writer_impl.h | 859 +++++++++++++ .../cpp/core/include/ignite/portable/portable.h | 29 + .../include/ignite/portable/portable_consts.h | 106 ++ .../ignite/portable/portable_containers.h | 525 ++++++++ .../ignite/portable/portable_raw_reader.h | 324 +++++ .../ignite/portable/portable_raw_writer.h | 300 +++++ .../include/ignite/portable/portable_reader.h | 355 ++++++ .../include/ignite/portable/portable_type.h | 293 +++++ .../include/ignite/portable/portable_writer.h | 335 +++++ .../main/cpp/core/os/linux/include/Makefile.am | 2 +- .../core/os/linux/include/gridgain/impl/utils.h | 155 --- .../core/os/linux/include/ignite/impl/utils.h | 155 +++ .../main/cpp/core/os/linux/src/impl/utils.cpp | 8 +- .../core/os/win/include/gridgain/impl/utils.h | 155 --- .../cpp/core/os/win/include/ignite/impl/utils.h | 155 +++ .../src/main/cpp/core/os/win/src/impl/utils.cpp | 2 +- .../src/main/cpp/core/project/vs/core.vcxproj | 94 +- .../cpp/core/project/vs/core.vcxproj.filters | 86 +- .../main/cpp/core/project/vs/core.vcxprojrel | 94 +- modules/platform/src/main/cpp/core/src/grid.cpp | 4 +- .../src/main/cpp/core/src/grid_error.cpp | 4 +- .../src/main/cpp/core/src/grid_factory.cpp | 8 +- modules/platform/src/main/cpp/core/src/guid.cpp | 2 +- .../main/cpp/core/src/impl/cache/cache_impl.cpp | 14 +- .../core/src/impl/cache/query/query_impl.cpp | 2 +- .../main/cpp/core/src/impl/grid_environment.cpp | 6 +- .../src/main/cpp/core/src/impl/grid_impl.cpp | 2 +- .../main/cpp/core/src/impl/handle_registry.cpp | 2 +- .../src/impl/interop/interop_input_stream.cpp | 4 +- .../core/src/impl/interop/interop_memory.cpp | 4 +- .../src/impl/interop/interop_output_stream.cpp | 4 +- .../impl/portable/portable_metadata_handler.cpp | 2 +- .../impl/portable/portable_metadata_manager.cpp | 2 +- .../portable/portable_metadata_snapshot.cpp | 2 +- .../impl/portable/portable_metadata_updater.cpp | 2 +- .../portable/portable_metadata_updater_impl.cpp | 8 +- .../src/impl/portable/portable_reader_impl.cpp | 14 +- .../core/src/impl/portable/portable_utils.cpp | 4 +- .../src/impl/portable/portable_writer_impl.cpp | 4 +- .../core/src/portable/portable_containers.cpp | 2 +- .../core/src/portable/portable_raw_reader.cpp | 4 +- .../core/src/portable/portable_raw_writer.cpp | 4 +- .../cpp/core/src/portable/portable_reader.cpp | 4 +- .../cpp/core/src/portable/portable_type.cpp | 2 +- .../cpp/core/src/portable/portable_writer.cpp | 4 +- 148 files changed, 12230 insertions(+), 12132 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/common/configure.ac ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/common/configure.ac b/modules/platform/src/main/cpp/common/configure.ac index 7706737..b34d7d8 100644 --- a/modules/platform/src/main/cpp/common/configure.ac +++ b/modules/platform/src/main/cpp/common/configure.ac @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Ignite JNI bridge for C++], [7.4.1], [[email protected]], [ignite-common], [ignite.apache.org]) +AC_INIT([Apache Ignite JNI bridge for C++], [1.4.0], [[email protected]], [ignite-common], [ignite.apache.org]) AC_CONFIG_SRCDIR(src) AC_CANONICAL_SYSTEM http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/common/ignite-common.pc.in ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/common/ignite-common.pc.in b/modules/platform/src/main/cpp/common/ignite-common.pc.in index 3cd3cec..b8c40d2 100644 --- a/modules/platform/src/main/cpp/common/ignite-common.pc.in +++ b/modules/platform/src/main/cpp/common/ignite-common.pc.in @@ -4,6 +4,6 @@ libdir=@libdir@ includedir=@includedir@ Name: ignite-common -Description: Ignite JNI bridge for C++. +Description: Apache Ignite JNI bridge for C++. Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lignite-common http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/Makefile.am ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/Makefile.am b/modules/platform/src/main/cpp/core-test/Makefile.am index 7ebe9f4..8a2f8ae 100644 --- a/modules/platform/src/main/cpp/core-test/Makefile.am +++ b/modules/platform/src/main/cpp/core-test/Makefile.am @@ -23,9 +23,9 @@ DIST_SUBDIRS = . include AM_CPPFLAGS = -I$(srcdir)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -DIGNITE_IMPL AM_CXXFLAGS = -Wall -std=c++0x -noinst_PROGRAMS = gridgain-tests +noinst_PROGRAMS = ignite-tests -gridgain_tests_SOURCES = src/cache_test.cpp \ +ignite_tests_SOURCES = src/cache_test.cpp \ src/cache_query_test.cpp \ src/concurrent_test.cpp \ src/grid_factory_test.cpp \ @@ -37,13 +37,13 @@ gridgain_tests_SOURCES = src/cache_test.cpp \ src/teamcity_messages.cpp \ src/teamcity_boost.cpp -gridgain_tests_LDFLAGS = -static-libtool-libs -L/usr/local/lib -lgridgain +ignite_tests_LDFLAGS = -static-libtool-libs -L/usr/local/lib -lignite run-check: check - ./gridgain-tests -p + ./ignite-tests -p clean-local: clean-check $(RM) *.gcno *.gcda clean-check: - $(RM) $(gridgain_tests_OBJECTS) + $(RM) $(ignite_tests_OBJECTS) http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/config/cache-query.xml ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/config/cache-query.xml b/modules/platform/src/main/cpp/core-test/config/cache-query.xml index d3af85a..160fe49 100644 --- a/modules/platform/src/main/cpp/core-test/config/cache-query.xml +++ b/modules/platform/src/main/cpp/core-test/config/cache-query.xml @@ -1,16 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) GridGain Systems. All Rights Reserved. - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --> <!-- - GridGain Spring configuration file to startup grid cache. + Ignite Spring configuration file to startup grid cache. --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/config/cache-test.xml ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/config/cache-test.xml b/modules/platform/src/main/cpp/core-test/config/cache-test.xml index 59c6142..f239ba9 100644 --- a/modules/platform/src/main/cpp/core-test/config/cache-test.xml +++ b/modules/platform/src/main/cpp/core-test/config/cache-test.xml @@ -1,16 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) GridGain Systems. All Rights Reserved. - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --> <!-- - GridGain Spring configuration file to startup grid cache. + Ignite Spring configuration file to startup grid cache. --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; @@ -24,27 +32,6 @@ <property name="localHost" value="127.0.0.1"/> <property name="connectorConfiguration"><null/></property> - <property name="marshaller"> - <bean class="org.gridgain.grid.marshaller.portable.PortableMarshaller"> - <property name="typeConfigurations"> - <list> - <bean class="org.gridgain.grid.portables.PortableTypeConfiguration"> - <property name="className" value="org.gridgain.client.ClientTestPortable"/> - </bean> - <bean class="org.gridgain.grid.portables.PortableTypeConfiguration"> - <property name="className" value="org.gridgain.internal.client.model.GridPortablePerson"/> - </bean> - <bean class="org.gridgain.grid.portables.PortableTypeConfiguration"> - <property name="className" value="org.gridgain.internal.client.model.GridImplicitPortablePerson"/> - </bean> - <bean class="org.gridgain.grid.portables.PortableTypeConfiguration"> - <property name="className" value="GridNoDefPortablePerson"/> - </bean> - </list> - </property> - </bean> - </property> - <property name="includeEventTypes"> <util:constant static-field="org.apache.ignite.events.EventType.EVTS_CACHE"/> </property> http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/configure.ac ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/configure.ac b/modules/platform/src/main/cpp/core-test/configure.ac index 6557adc..3a1b660 100644 --- a/modules/platform/src/main/cpp/core-test/configure.ac +++ b/modules/platform/src/main/cpp/core-test/configure.ac @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([GridGain for C++ Test], [7.4.1], [[email protected]], [gridgain], [www.gridgain.com]) +AC_INIT([Apache Ignite C++ Test], [1.4.0], [[email protected]], [ignite], [ignite.apache.org]) AC_CONFIG_SRCDIR(src) AC_CANONICAL_SYSTEM http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/include/Makefile.am ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/include/Makefile.am b/modules/platform/src/main/cpp/core-test/include/Makefile.am index eafae0d..c43103e 100644 --- a/modules/platform/src/main/cpp/core-test/include/Makefile.am +++ b/modules/platform/src/main/cpp/core-test/include/Makefile.am @@ -1,5 +1,22 @@ +## +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## + ACLOCAL_AMFLAGS = "-Im4" nobase_include_HEADERS = teamcity_messages.h \ - gridgain/portable_test_defs.h \ - gridgain/portable_test_utils.h + ignite/portable_test_defs.h \ + ignite/portable_test_utils.h http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_defs.h ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_defs.h b/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_defs.h deleted file mode 100644 index 58ae419..0000000 --- a/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_defs.h +++ /dev/null @@ -1,312 +0,0 @@ -/* - * Copyright (C) GridGain Systems. All Rights Reserved. - * _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -#ifndef _IGNITE_PORTABLE_TEST_DEFS -#define _IGNITE_PORTABLE_TEST_DEFS - -#include <stdexcept> -#include <stdint.h> - -#include "gridgain/portable/portable.h" - -namespace ignite_test -{ - namespace core - { - namespace portable - { - class PortableDummy - { - // No-op. - }; - - class PortableInner - { - public: - PortableInner(); - - PortableInner(int32_t val); - - int32_t GetValue() const; - private: - int32_t val; - }; - - class PortableOuter - { - public: - PortableOuter(int32_t valIn, int32_t valOut); - - PortableInner GetInner() const; - - int32_t GetValue() const; - private: - PortableInner inner; - int32_t val; - }; - - struct PortableFields - { - int32_t val1; - int32_t val2; - int32_t rawVal1; - int32_t rawVal2; - - PortableFields() : val1(0), val2(0), rawVal1(0), rawVal2(0) - { - // No-op. - } - - PortableFields(int32_t val1, int32_t val2, int32_t rawVal1, int32_t rawVal2) : - val1(val1), val2(val2), rawVal1(rawVal1), rawVal2(rawVal2) - { - // No-op. - } - }; - } - } -} - -namespace ignite -{ - namespace portable - { - namespace gt = ignite_test::core::portable; - - template<> - struct PortableType<gt::PortableDummy> - { - /** <inheritdoc /> */ - int32_t GetTypeId() - { - return GetPortableStringHashCode("PortableDummy"); - } - - /** <inheritdoc /> */ - std::string GetTypeName() - { - return "PortableDummy"; - } - - /** <inheritdoc /> */ - int32_t GetFieldId(const char* name) - { - return GetPortableStringHashCode(name); - } - - /** <inheritdoc /> */ - int32_t GetHashCode(const gt::PortableInner& obj) - { - return obj.GetValue(); - } - - /** <inheritdoc /> */ - bool IsNull(const gt::PortableInner& obj) - { - return obj.GetValue() == 0; - } - - /** <inheritdoc /> */ - gt::PortableInner GetNull() - { - return gt::PortableInner(0); - } - - /** <inheritdoc /> */ - void Write(PortableWriter& writer, const gt::PortableDummy& obj) - { - // No-op. - } - - /** <inheritdoc /> */ - gt::PortableDummy Read(PortableReader& reader) - { - return gt::PortableDummy(); - } - }; - - template<> - struct PortableType<gt::PortableInner> - { - /** <inheritdoc /> */ - int32_t GetTypeId() - { - return GetPortableStringHashCode("PortableInner"); - } - - /** <inheritdoc /> */ - std::string GetTypeName() - { - return "PortableInner"; - } - - /** <inheritdoc /> */ - int32_t GetFieldId(const char* name) - { - return GetPortableStringHashCode(name); - } - - /** <inheritdoc /> */ - int32_t GetHashCode(const gt::PortableInner& obj) - { - return obj.GetValue(); - } - - /** <inheritdoc /> */ - bool IsNull(const gt::PortableInner& obj) - { - return obj.GetValue() == 0; - } - - /** <inheritdoc /> */ - gt::PortableInner GetNull() - { - return gt::PortableInner(0); - } - - /** <inheritdoc /> */ - void Write(PortableWriter& writer, const gt::PortableInner& obj) - { - writer.WriteInt32("val", obj.GetValue()); - } - - /** <inheritdoc /> */ - gt::PortableInner Read(PortableReader& reader) - { - int val = reader.ReadInt32("val"); - - return gt::PortableInner(val); - } - }; - - template<> - struct PortableType<gt::PortableOuter> - { - /** <inheritdoc /> */ - int32_t GetTypeId() - { - return GetPortableStringHashCode("PortableOuter"); - } - - /** <inheritdoc /> */ - std::string GetTypeName() - { - return "PortableOuter"; - } - - /** <inheritdoc /> */ - int32_t GetFieldId(const char* name) - { - return GetPortableStringHashCode(name); - } - - /** <inheritdoc /> */ - int32_t GetHashCode(const gt::PortableOuter& obj) - { - return obj.GetValue() + obj.GetInner().GetValue(); - } - - /** <inheritdoc /> */ - bool IsNull(const gt::PortableOuter& obj) - { - return obj.GetValue() == 0 && obj.GetInner().GetValue(); - } - - /** <inheritdoc /> */ - gt::PortableOuter GetNull() - { - return gt::PortableOuter(0, 0); - } - - /** <inheritdoc /> */ - void Write(PortableWriter& writer, const gt::PortableOuter& obj) - { - writer.WriteObject("inner", obj.GetInner()); - writer.WriteInt32("val", obj.GetValue()); - } - - /** <inheritdoc /> */ - gt::PortableOuter Read(PortableReader& reader) - { - gt::PortableInner inner = reader.ReadObject<gt::PortableInner>("inner"); - int val = reader.ReadInt32("val"); - - return gt::PortableOuter(inner.GetValue(), val); - } - }; - - template<> - struct PortableType<gt::PortableFields> - { - /** <inheritdoc /> */ - int32_t GetTypeId() - { - return GetPortableStringHashCode("PortableFields"); - } - - /** <inheritdoc /> */ - std::string GetTypeName() - { - return "PortableFields"; - } - - /** <inheritdoc /> */ - int32_t GetFieldId(const char* name) - { - return GetPortableStringHashCode(name); - } - - /** <inheritdoc /> */ - int32_t GetHashCode(const gt::PortableFields& obj) - { - return obj.val1 + obj.val2 + obj.rawVal1 + obj.rawVal2; - } - - /** <inheritdoc /> */ - bool IsNull(const gt::PortableFields& obj) - { - return false; - } - - /** <inheritdoc /> */ - gt::PortableFields GetNull() - { - throw std::runtime_error("Must not be called."); - } - - /** <inheritdoc /> */ - void Write(PortableWriter& writer, const gt::PortableFields& obj) - { - writer.WriteInt32("val1", obj.val1); - writer.WriteInt32("val2", obj.val2); - - PortableRawWriter rawWriter = writer.RawWriter(); - - rawWriter.WriteInt32(obj.rawVal1); - rawWriter.WriteInt32(obj.rawVal2); - } - - /** <inheritdoc /> */ - gt::PortableFields Read(PortableReader& reader) - { - int32_t val1 = reader.ReadInt32("val1"); - int32_t val2 = reader.ReadInt32("val2"); - - PortableRawReader rawReader = reader.RawReader(); - - int32_t rawVal1 = rawReader.ReadInt32(); - int32_t rawVal2 = rawReader.ReadInt32(); - - return gt::PortableFields(val1, val2, rawVal1, rawVal2); - } - }; - } -} - -#endif \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_utils.h ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_utils.h b/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_utils.h deleted file mode 100644 index 4df37c4..0000000 --- a/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_utils.h +++ /dev/null @@ -1,508 +0,0 @@ -/* - * Copyright (C) GridGain Systems. All Rights Reserved. - * _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -#ifndef _IGNITE_PORTABLE_TEST_UTILS -#define _IGNITE_PORTABLE_TEST_UTILS - -#include "gridgain/portable/portable.h" - -using namespace ignite; -using namespace ignite::portable; -using namespace ignite::impl::portable; - -namespace ignite_test -{ - namespace core - { - namespace portable - { - template<typename T> - inline void Write(PortableRawWriter& writer, T val) - { - throw std::runtime_error("Function is not defined"); - } - - template<typename T> - inline T Read(PortableRawReader& reader) - { - throw std::runtime_error("Function is not defined"); - } - - template<> - inline void Write(PortableRawWriter& writer, int8_t val) - { - writer.WriteInt8(val); - } - - template<> - inline int8_t Read(PortableRawReader& reader) - { - return reader.ReadInt8(); - } - - template<> - inline void Write(PortableRawWriter& writer, bool val) - { - writer.WriteBool(val); - } - - template<> - inline bool Read(PortableRawReader& reader) - { - return reader.ReadBool(); - } - - template<> - inline void Write(PortableRawWriter& writer, int16_t val) - { - writer.WriteInt16(val); - } - - template<> - inline int16_t Read(PortableRawReader& reader) - { - return reader.ReadInt16(); - } - - template<> - inline void Write(PortableRawWriter& writer, uint16_t val) - { - writer.WriteUInt16(val); - } - - template<> - inline uint16_t Read(PortableRawReader& reader) - { - return reader.ReadUInt16(); - } - - template<> - inline void Write(PortableRawWriter& writer, int32_t val) - { - writer.WriteInt32(val); - } - - template<> - inline int32_t Read(PortableRawReader& reader) - { - return reader.ReadInt32(); - } - - template<> - inline void Write(PortableRawWriter& writer, int64_t val) - { - writer.WriteInt64(val); - } - - template<> - inline int64_t Read(PortableRawReader& reader) - { - return reader.ReadInt64(); - } - - template<> - inline void Write(PortableRawWriter& writer, float val) - { - writer.WriteFloat(val); - } - - template<> - inline float Read(PortableRawReader& reader) - { - return reader.ReadFloat(); - } - - template<> - inline void Write(PortableRawWriter& writer, double val) - { - writer.WriteDouble(val); - } - - template<> - inline double Read(PortableRawReader& reader) - { - return reader.ReadDouble(); - } - - template<> - inline void Write(PortableRawWriter& writer, Guid val) - { - writer.WriteGuid(val); - } - - template<> - inline Guid Read(PortableRawReader& reader) - { - return reader.ReadGuid(); - } - - template<typename T> - inline void WriteArray(PortableRawWriter& writer, T* val, int32_t len) - { - throw std::runtime_error("Function is not defined"); - } - - template<typename T> - inline int32_t ReadArray(PortableRawReader& reader, T* val, int32_t len) - { - throw std::runtime_error("Function is not defined"); - } - - template<> - inline void WriteArray(PortableRawWriter& writer, int8_t* val, int32_t len) - { - writer.WriteInt8Array(val, len); - } - - template<> - inline int32_t ReadArray(PortableRawReader& reader, int8_t* val, int32_t len) - { - return reader.ReadInt8Array(val, len); - } - - template<> - inline void WriteArray(PortableRawWriter& writer, bool* val, int32_t len) - { - writer.WriteBoolArray(val, len); - } - - template<> - inline int32_t ReadArray(PortableRawReader& reader, bool* val, int32_t len) - { - return reader.ReadBoolArray(val, len); - } - - template<> - inline void WriteArray(PortableRawWriter& writer, int16_t* val, int32_t len) - { - writer.WriteInt16Array(val, len); - } - - template<> - inline int32_t ReadArray(PortableRawReader& reader, int16_t* val, int32_t len) - { - return reader.ReadInt16Array(val, len); - } - - template<> - inline void WriteArray(PortableRawWriter& writer, uint16_t* val, int32_t len) - { - writer.WriteUInt16Array(val, len); - } - - template<> - inline int32_t ReadArray(PortableRawReader& reader, uint16_t* val, int32_t len) - { - return reader.ReadUInt16Array(val, len); - } - - template<> - inline void WriteArray(PortableRawWriter& writer, int32_t* val, int32_t len) - { - writer.WriteInt32Array(val, len); - } - - template<> - inline int32_t ReadArray(PortableRawReader& reader, int32_t* val, int32_t len) - { - return reader.ReadInt32Array(val, len); - } - - template<> - inline void WriteArray(PortableRawWriter& writer, int64_t* val, int32_t len) - { - writer.WriteInt64Array(val, len); - } - - template<> - inline int32_t ReadArray(PortableRawReader& reader, int64_t* val, int32_t len) - { - return reader.ReadInt64Array(val, len); - } - - template<> - inline void WriteArray(PortableRawWriter& writer, float* val, int32_t len) - { - writer.WriteFloatArray(val, len); - } - - template<> - inline int32_t ReadArray(PortableRawReader& reader, float* val, int32_t len) - { - return reader.ReadFloatArray(val, len); - } - - template<> - inline void WriteArray(PortableRawWriter& writer, double* val, int32_t len) - { - writer.WriteDoubleArray(val, len); - } - - template<> - inline int32_t ReadArray(PortableRawReader& reader, double* val, int32_t len) - { - return reader.ReadDoubleArray(val, len); - } - - template<> - inline void WriteArray(PortableRawWriter& writer, Guid* val, int32_t len) - { - writer.WriteGuidArray(val, len); - } - - template<> - inline int32_t ReadArray(PortableRawReader& reader, Guid* val, int32_t len) - { - return reader.ReadGuidArray(val, len); - } - - template<typename T> - inline void Write(PortableWriter& writer, const char* fieldName, T val) - { - throw std::runtime_error("Function is not defined"); - } - - template<typename T> - inline T Read(PortableReader& reader, const char* fieldName) - { - throw std::runtime_error("Function is not defined"); - } - - template<> - inline void Write(PortableWriter& writer, const char* fieldName, int8_t val) - { - writer.WriteInt8(fieldName, val); - } - - template<> - inline int8_t Read(PortableReader& reader, const char* fieldName) - { - return reader.ReadInt8(fieldName); - } - - template<> - inline void Write(PortableWriter& writer, const char* fieldName, bool val) - { - writer.WriteBool(fieldName, val); - } - - template<> - inline bool Read(PortableReader& reader, const char* fieldName) - { - return reader.ReadBool(fieldName); - } - - template<> - inline void Write(PortableWriter& writer, const char* fieldName, int16_t val) - { - writer.WriteInt16(fieldName, val); - } - - template<> - inline int16_t Read(PortableReader& reader, const char* fieldName) - { - return reader.ReadInt16(fieldName); - } - - template<> - inline void Write(PortableWriter& writer, const char* fieldName, uint16_t val) - { - writer.WriteUInt16(fieldName, val); - } - - template<> - inline uint16_t Read(PortableReader& reader, const char* fieldName) - { - return reader.ReadUInt16(fieldName); - } - - template<> - inline void Write(PortableWriter& writer, const char* fieldName, int32_t val) - { - writer.WriteInt32(fieldName, val); - } - - template<> - inline int32_t Read(PortableReader& reader, const char* fieldName) - { - return reader.ReadInt32(fieldName); - } - - template<> - inline void Write(PortableWriter& writer, const char* fieldName, int64_t val) - { - writer.WriteInt64(fieldName, val); - } - - template<> - inline int64_t Read(PortableReader& reader, const char* fieldName) - { - return reader.ReadInt64(fieldName); - } - - template<> - inline void Write(PortableWriter& writer, const char* fieldName, float val) - { - writer.WriteFloat(fieldName, val); - } - - template<> - inline float Read(PortableReader& reader, const char* fieldName) - { - return reader.ReadFloat(fieldName); - } - - template<> - inline void Write(PortableWriter& writer, const char* fieldName, double val) - { - writer.WriteDouble(fieldName, val); - } - - template<> - inline double Read(PortableReader& reader, const char* fieldName) - { - return reader.ReadDouble(fieldName); - } - - template<> - inline void Write(PortableWriter& writer, const char* fieldName, Guid val) - { - writer.WriteGuid(fieldName, val); - } - - template<> - inline Guid Read(PortableReader& reader, const char* fieldName) - { - return reader.ReadGuid(fieldName); - } - - template<typename T> - inline void WriteArray(PortableWriter& writer, const char* fieldName, T* val, int32_t len) - { - throw std::runtime_error("Function is not defined"); - } - - template<typename T> - inline int32_t ReadArray(PortableReader& reader, const char* fieldName, T* val, int32_t len) - { - throw std::runtime_error("Function is not defined"); - } - - template<> - inline void WriteArray(PortableWriter& writer, const char* fieldName, int8_t* val, int32_t len) - { - writer.WriteInt8Array(fieldName, val, len); - } - - template<> - inline int32_t ReadArray(PortableReader& reader, const char* fieldName, int8_t* val, int32_t len) - { - return reader.ReadInt8Array(fieldName, val, len); - } - - template<> - inline void WriteArray(PortableWriter& writer, const char* fieldName, bool* val, int32_t len) - { - writer.WriteBoolArray(fieldName, val, len); - } - - template<> - inline int32_t ReadArray(PortableReader& reader, const char* fieldName, bool* val, int32_t len) - { - return reader.ReadBoolArray(fieldName, val, len); - } - - template<> - inline void WriteArray(PortableWriter& writer, const char* fieldName, int16_t* val, int32_t len) - { - writer.WriteInt16Array(fieldName, val, len); - } - - template<> - inline int32_t ReadArray(PortableReader& reader, const char* fieldName, int16_t* val, int32_t len) - { - return reader.ReadInt16Array(fieldName, val, len); - } - - template<> - inline void WriteArray(PortableWriter& writer, const char* fieldName, uint16_t* val, int32_t len) - { - writer.WriteUInt16Array(fieldName, val, len); - } - - template<> - inline int32_t ReadArray(PortableReader& reader, const char* fieldName, uint16_t* val, int32_t len) - { - return reader.ReadUInt16Array(fieldName, val, len); - } - - template<> - inline void WriteArray(PortableWriter& writer, const char* fieldName, int32_t* val, int32_t len) - { - writer.WriteInt32Array(fieldName, val, len); - } - - template<> - inline int32_t ReadArray(PortableReader& reader, const char* fieldName, int32_t* val, int32_t len) - { - return reader.ReadInt32Array(fieldName, val, len); - } - - template<> - inline void WriteArray(PortableWriter& writer, const char* fieldName, int64_t* val, int32_t len) - { - writer.WriteInt64Array(fieldName, val, len); - } - - template<> - inline int32_t ReadArray(PortableReader& reader, const char* fieldName, int64_t* val, int32_t len) - { - return reader.ReadInt64Array(fieldName, val, len); - } - - template<> - inline void WriteArray(PortableWriter& writer, const char* fieldName, float* val, int32_t len) - { - writer.WriteFloatArray(fieldName, val, len); - } - - template<> - inline int32_t ReadArray(PortableReader& reader, const char* fieldName, float* val, int32_t len) - { - return reader.ReadFloatArray(fieldName, val, len); - } - - template<> - inline void WriteArray(PortableWriter& writer, const char* fieldName, double* val, int32_t len) - { - writer.WriteDoubleArray(fieldName, val, len); - } - - template<> - inline int32_t ReadArray(PortableReader& reader, const char* fieldName, double* val, int32_t len) - { - return reader.ReadDoubleArray(fieldName, val, len); - } - - template<> - inline void WriteArray(PortableWriter& writer, const char* fieldName, Guid* val, int32_t len) - { - writer.WriteGuidArray(fieldName, val, len); - } - - template<> - inline int32_t ReadArray(PortableReader& reader, const char* fieldName, Guid* val, int32_t len) - { - return reader.ReadGuidArray(fieldName, val, len); - } - } - } -} - -#endif \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/include/ignite/portable_test_defs.h ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/include/ignite/portable_test_defs.h b/modules/platform/src/main/cpp/core-test/include/ignite/portable_test_defs.h new file mode 100644 index 0000000..bae0118 --- /dev/null +++ b/modules/platform/src/main/cpp/core-test/include/ignite/portable_test_defs.h @@ -0,0 +1,320 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _IGNITE_PORTABLE_TEST_DEFS +#define _IGNITE_PORTABLE_TEST_DEFS + +#include <stdexcept> +#include <stdint.h> + +#include "ignite/portable/portable.h" + +namespace ignite_test +{ + namespace core + { + namespace portable + { + class PortableDummy + { + // No-op. + }; + + class PortableInner + { + public: + PortableInner(); + + PortableInner(int32_t val); + + int32_t GetValue() const; + private: + int32_t val; + }; + + class PortableOuter + { + public: + PortableOuter(int32_t valIn, int32_t valOut); + + PortableInner GetInner() const; + + int32_t GetValue() const; + private: + PortableInner inner; + int32_t val; + }; + + struct PortableFields + { + int32_t val1; + int32_t val2; + int32_t rawVal1; + int32_t rawVal2; + + PortableFields() : val1(0), val2(0), rawVal1(0), rawVal2(0) + { + // No-op. + } + + PortableFields(int32_t val1, int32_t val2, int32_t rawVal1, int32_t rawVal2) : + val1(val1), val2(val2), rawVal1(rawVal1), rawVal2(rawVal2) + { + // No-op. + } + }; + } + } +} + +namespace ignite +{ + namespace portable + { + namespace gt = ignite_test::core::portable; + + template<> + struct PortableType<gt::PortableDummy> + { + /** <inheritdoc /> */ + int32_t GetTypeId() + { + return GetPortableStringHashCode("PortableDummy"); + } + + /** <inheritdoc /> */ + std::string GetTypeName() + { + return "PortableDummy"; + } + + /** <inheritdoc /> */ + int32_t GetFieldId(const char* name) + { + return GetPortableStringHashCode(name); + } + + /** <inheritdoc /> */ + int32_t GetHashCode(const gt::PortableInner& obj) + { + return obj.GetValue(); + } + + /** <inheritdoc /> */ + bool IsNull(const gt::PortableInner& obj) + { + return obj.GetValue() == 0; + } + + /** <inheritdoc /> */ + gt::PortableInner GetNull() + { + return gt::PortableInner(0); + } + + /** <inheritdoc /> */ + void Write(PortableWriter& writer, const gt::PortableDummy& obj) + { + // No-op. + } + + /** <inheritdoc /> */ + gt::PortableDummy Read(PortableReader& reader) + { + return gt::PortableDummy(); + } + }; + + template<> + struct PortableType<gt::PortableInner> + { + /** <inheritdoc /> */ + int32_t GetTypeId() + { + return GetPortableStringHashCode("PortableInner"); + } + + /** <inheritdoc /> */ + std::string GetTypeName() + { + return "PortableInner"; + } + + /** <inheritdoc /> */ + int32_t GetFieldId(const char* name) + { + return GetPortableStringHashCode(name); + } + + /** <inheritdoc /> */ + int32_t GetHashCode(const gt::PortableInner& obj) + { + return obj.GetValue(); + } + + /** <inheritdoc /> */ + bool IsNull(const gt::PortableInner& obj) + { + return obj.GetValue() == 0; + } + + /** <inheritdoc /> */ + gt::PortableInner GetNull() + { + return gt::PortableInner(0); + } + + /** <inheritdoc /> */ + void Write(PortableWriter& writer, const gt::PortableInner& obj) + { + writer.WriteInt32("val", obj.GetValue()); + } + + /** <inheritdoc /> */ + gt::PortableInner Read(PortableReader& reader) + { + int val = reader.ReadInt32("val"); + + return gt::PortableInner(val); + } + }; + + template<> + struct PortableType<gt::PortableOuter> + { + /** <inheritdoc /> */ + int32_t GetTypeId() + { + return GetPortableStringHashCode("PortableOuter"); + } + + /** <inheritdoc /> */ + std::string GetTypeName() + { + return "PortableOuter"; + } + + /** <inheritdoc /> */ + int32_t GetFieldId(const char* name) + { + return GetPortableStringHashCode(name); + } + + /** <inheritdoc /> */ + int32_t GetHashCode(const gt::PortableOuter& obj) + { + return obj.GetValue() + obj.GetInner().GetValue(); + } + + /** <inheritdoc /> */ + bool IsNull(const gt::PortableOuter& obj) + { + return obj.GetValue() == 0 && obj.GetInner().GetValue(); + } + + /** <inheritdoc /> */ + gt::PortableOuter GetNull() + { + return gt::PortableOuter(0, 0); + } + + /** <inheritdoc /> */ + void Write(PortableWriter& writer, const gt::PortableOuter& obj) + { + writer.WriteObject("inner", obj.GetInner()); + writer.WriteInt32("val", obj.GetValue()); + } + + /** <inheritdoc /> */ + gt::PortableOuter Read(PortableReader& reader) + { + gt::PortableInner inner = reader.ReadObject<gt::PortableInner>("inner"); + int val = reader.ReadInt32("val"); + + return gt::PortableOuter(inner.GetValue(), val); + } + }; + + template<> + struct PortableType<gt::PortableFields> + { + /** <inheritdoc /> */ + int32_t GetTypeId() + { + return GetPortableStringHashCode("PortableFields"); + } + + /** <inheritdoc /> */ + std::string GetTypeName() + { + return "PortableFields"; + } + + /** <inheritdoc /> */ + int32_t GetFieldId(const char* name) + { + return GetPortableStringHashCode(name); + } + + /** <inheritdoc /> */ + int32_t GetHashCode(const gt::PortableFields& obj) + { + return obj.val1 + obj.val2 + obj.rawVal1 + obj.rawVal2; + } + + /** <inheritdoc /> */ + bool IsNull(const gt::PortableFields& obj) + { + return false; + } + + /** <inheritdoc /> */ + gt::PortableFields GetNull() + { + throw std::runtime_error("Must not be called."); + } + + /** <inheritdoc /> */ + void Write(PortableWriter& writer, const gt::PortableFields& obj) + { + writer.WriteInt32("val1", obj.val1); + writer.WriteInt32("val2", obj.val2); + + PortableRawWriter rawWriter = writer.RawWriter(); + + rawWriter.WriteInt32(obj.rawVal1); + rawWriter.WriteInt32(obj.rawVal2); + } + + /** <inheritdoc /> */ + gt::PortableFields Read(PortableReader& reader) + { + int32_t val1 = reader.ReadInt32("val1"); + int32_t val2 = reader.ReadInt32("val2"); + + PortableRawReader rawReader = reader.RawReader(); + + int32_t rawVal1 = rawReader.ReadInt32(); + int32_t rawVal2 = rawReader.ReadInt32(); + + return gt::PortableFields(val1, val2, rawVal1, rawVal2); + } + }; + } +} + +#endif \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/include/ignite/portable_test_utils.h ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/include/ignite/portable_test_utils.h b/modules/platform/src/main/cpp/core-test/include/ignite/portable_test_utils.h new file mode 100644 index 0000000..62f99f9 --- /dev/null +++ b/modules/platform/src/main/cpp/core-test/include/ignite/portable_test_utils.h @@ -0,0 +1,516 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _IGNITE_PORTABLE_TEST_UTILS +#define _IGNITE_PORTABLE_TEST_UTILS + +#include "ignite/portable/portable.h" + +using namespace ignite; +using namespace ignite::portable; +using namespace ignite::impl::portable; + +namespace ignite_test +{ + namespace core + { + namespace portable + { + template<typename T> + inline void Write(PortableRawWriter& writer, T val) + { + throw std::runtime_error("Function is not defined"); + } + + template<typename T> + inline T Read(PortableRawReader& reader) + { + throw std::runtime_error("Function is not defined"); + } + + template<> + inline void Write(PortableRawWriter& writer, int8_t val) + { + writer.WriteInt8(val); + } + + template<> + inline int8_t Read(PortableRawReader& reader) + { + return reader.ReadInt8(); + } + + template<> + inline void Write(PortableRawWriter& writer, bool val) + { + writer.WriteBool(val); + } + + template<> + inline bool Read(PortableRawReader& reader) + { + return reader.ReadBool(); + } + + template<> + inline void Write(PortableRawWriter& writer, int16_t val) + { + writer.WriteInt16(val); + } + + template<> + inline int16_t Read(PortableRawReader& reader) + { + return reader.ReadInt16(); + } + + template<> + inline void Write(PortableRawWriter& writer, uint16_t val) + { + writer.WriteUInt16(val); + } + + template<> + inline uint16_t Read(PortableRawReader& reader) + { + return reader.ReadUInt16(); + } + + template<> + inline void Write(PortableRawWriter& writer, int32_t val) + { + writer.WriteInt32(val); + } + + template<> + inline int32_t Read(PortableRawReader& reader) + { + return reader.ReadInt32(); + } + + template<> + inline void Write(PortableRawWriter& writer, int64_t val) + { + writer.WriteInt64(val); + } + + template<> + inline int64_t Read(PortableRawReader& reader) + { + return reader.ReadInt64(); + } + + template<> + inline void Write(PortableRawWriter& writer, float val) + { + writer.WriteFloat(val); + } + + template<> + inline float Read(PortableRawReader& reader) + { + return reader.ReadFloat(); + } + + template<> + inline void Write(PortableRawWriter& writer, double val) + { + writer.WriteDouble(val); + } + + template<> + inline double Read(PortableRawReader& reader) + { + return reader.ReadDouble(); + } + + template<> + inline void Write(PortableRawWriter& writer, Guid val) + { + writer.WriteGuid(val); + } + + template<> + inline Guid Read(PortableRawReader& reader) + { + return reader.ReadGuid(); + } + + template<typename T> + inline void WriteArray(PortableRawWriter& writer, T* val, int32_t len) + { + throw std::runtime_error("Function is not defined"); + } + + template<typename T> + inline int32_t ReadArray(PortableRawReader& reader, T* val, int32_t len) + { + throw std::runtime_error("Function is not defined"); + } + + template<> + inline void WriteArray(PortableRawWriter& writer, int8_t* val, int32_t len) + { + writer.WriteInt8Array(val, len); + } + + template<> + inline int32_t ReadArray(PortableRawReader& reader, int8_t* val, int32_t len) + { + return reader.ReadInt8Array(val, len); + } + + template<> + inline void WriteArray(PortableRawWriter& writer, bool* val, int32_t len) + { + writer.WriteBoolArray(val, len); + } + + template<> + inline int32_t ReadArray(PortableRawReader& reader, bool* val, int32_t len) + { + return reader.ReadBoolArray(val, len); + } + + template<> + inline void WriteArray(PortableRawWriter& writer, int16_t* val, int32_t len) + { + writer.WriteInt16Array(val, len); + } + + template<> + inline int32_t ReadArray(PortableRawReader& reader, int16_t* val, int32_t len) + { + return reader.ReadInt16Array(val, len); + } + + template<> + inline void WriteArray(PortableRawWriter& writer, uint16_t* val, int32_t len) + { + writer.WriteUInt16Array(val, len); + } + + template<> + inline int32_t ReadArray(PortableRawReader& reader, uint16_t* val, int32_t len) + { + return reader.ReadUInt16Array(val, len); + } + + template<> + inline void WriteArray(PortableRawWriter& writer, int32_t* val, int32_t len) + { + writer.WriteInt32Array(val, len); + } + + template<> + inline int32_t ReadArray(PortableRawReader& reader, int32_t* val, int32_t len) + { + return reader.ReadInt32Array(val, len); + } + + template<> + inline void WriteArray(PortableRawWriter& writer, int64_t* val, int32_t len) + { + writer.WriteInt64Array(val, len); + } + + template<> + inline int32_t ReadArray(PortableRawReader& reader, int64_t* val, int32_t len) + { + return reader.ReadInt64Array(val, len); + } + + template<> + inline void WriteArray(PortableRawWriter& writer, float* val, int32_t len) + { + writer.WriteFloatArray(val, len); + } + + template<> + inline int32_t ReadArray(PortableRawReader& reader, float* val, int32_t len) + { + return reader.ReadFloatArray(val, len); + } + + template<> + inline void WriteArray(PortableRawWriter& writer, double* val, int32_t len) + { + writer.WriteDoubleArray(val, len); + } + + template<> + inline int32_t ReadArray(PortableRawReader& reader, double* val, int32_t len) + { + return reader.ReadDoubleArray(val, len); + } + + template<> + inline void WriteArray(PortableRawWriter& writer, Guid* val, int32_t len) + { + writer.WriteGuidArray(val, len); + } + + template<> + inline int32_t ReadArray(PortableRawReader& reader, Guid* val, int32_t len) + { + return reader.ReadGuidArray(val, len); + } + + template<typename T> + inline void Write(PortableWriter& writer, const char* fieldName, T val) + { + throw std::runtime_error("Function is not defined"); + } + + template<typename T> + inline T Read(PortableReader& reader, const char* fieldName) + { + throw std::runtime_error("Function is not defined"); + } + + template<> + inline void Write(PortableWriter& writer, const char* fieldName, int8_t val) + { + writer.WriteInt8(fieldName, val); + } + + template<> + inline int8_t Read(PortableReader& reader, const char* fieldName) + { + return reader.ReadInt8(fieldName); + } + + template<> + inline void Write(PortableWriter& writer, const char* fieldName, bool val) + { + writer.WriteBool(fieldName, val); + } + + template<> + inline bool Read(PortableReader& reader, const char* fieldName) + { + return reader.ReadBool(fieldName); + } + + template<> + inline void Write(PortableWriter& writer, const char* fieldName, int16_t val) + { + writer.WriteInt16(fieldName, val); + } + + template<> + inline int16_t Read(PortableReader& reader, const char* fieldName) + { + return reader.ReadInt16(fieldName); + } + + template<> + inline void Write(PortableWriter& writer, const char* fieldName, uint16_t val) + { + writer.WriteUInt16(fieldName, val); + } + + template<> + inline uint16_t Read(PortableReader& reader, const char* fieldName) + { + return reader.ReadUInt16(fieldName); + } + + template<> + inline void Write(PortableWriter& writer, const char* fieldName, int32_t val) + { + writer.WriteInt32(fieldName, val); + } + + template<> + inline int32_t Read(PortableReader& reader, const char* fieldName) + { + return reader.ReadInt32(fieldName); + } + + template<> + inline void Write(PortableWriter& writer, const char* fieldName, int64_t val) + { + writer.WriteInt64(fieldName, val); + } + + template<> + inline int64_t Read(PortableReader& reader, const char* fieldName) + { + return reader.ReadInt64(fieldName); + } + + template<> + inline void Write(PortableWriter& writer, const char* fieldName, float val) + { + writer.WriteFloat(fieldName, val); + } + + template<> + inline float Read(PortableReader& reader, const char* fieldName) + { + return reader.ReadFloat(fieldName); + } + + template<> + inline void Write(PortableWriter& writer, const char* fieldName, double val) + { + writer.WriteDouble(fieldName, val); + } + + template<> + inline double Read(PortableReader& reader, const char* fieldName) + { + return reader.ReadDouble(fieldName); + } + + template<> + inline void Write(PortableWriter& writer, const char* fieldName, Guid val) + { + writer.WriteGuid(fieldName, val); + } + + template<> + inline Guid Read(PortableReader& reader, const char* fieldName) + { + return reader.ReadGuid(fieldName); + } + + template<typename T> + inline void WriteArray(PortableWriter& writer, const char* fieldName, T* val, int32_t len) + { + throw std::runtime_error("Function is not defined"); + } + + template<typename T> + inline int32_t ReadArray(PortableReader& reader, const char* fieldName, T* val, int32_t len) + { + throw std::runtime_error("Function is not defined"); + } + + template<> + inline void WriteArray(PortableWriter& writer, const char* fieldName, int8_t* val, int32_t len) + { + writer.WriteInt8Array(fieldName, val, len); + } + + template<> + inline int32_t ReadArray(PortableReader& reader, const char* fieldName, int8_t* val, int32_t len) + { + return reader.ReadInt8Array(fieldName, val, len); + } + + template<> + inline void WriteArray(PortableWriter& writer, const char* fieldName, bool* val, int32_t len) + { + writer.WriteBoolArray(fieldName, val, len); + } + + template<> + inline int32_t ReadArray(PortableReader& reader, const char* fieldName, bool* val, int32_t len) + { + return reader.ReadBoolArray(fieldName, val, len); + } + + template<> + inline void WriteArray(PortableWriter& writer, const char* fieldName, int16_t* val, int32_t len) + { + writer.WriteInt16Array(fieldName, val, len); + } + + template<> + inline int32_t ReadArray(PortableReader& reader, const char* fieldName, int16_t* val, int32_t len) + { + return reader.ReadInt16Array(fieldName, val, len); + } + + template<> + inline void WriteArray(PortableWriter& writer, const char* fieldName, uint16_t* val, int32_t len) + { + writer.WriteUInt16Array(fieldName, val, len); + } + + template<> + inline int32_t ReadArray(PortableReader& reader, const char* fieldName, uint16_t* val, int32_t len) + { + return reader.ReadUInt16Array(fieldName, val, len); + } + + template<> + inline void WriteArray(PortableWriter& writer, const char* fieldName, int32_t* val, int32_t len) + { + writer.WriteInt32Array(fieldName, val, len); + } + + template<> + inline int32_t ReadArray(PortableReader& reader, const char* fieldName, int32_t* val, int32_t len) + { + return reader.ReadInt32Array(fieldName, val, len); + } + + template<> + inline void WriteArray(PortableWriter& writer, const char* fieldName, int64_t* val, int32_t len) + { + writer.WriteInt64Array(fieldName, val, len); + } + + template<> + inline int32_t ReadArray(PortableReader& reader, const char* fieldName, int64_t* val, int32_t len) + { + return reader.ReadInt64Array(fieldName, val, len); + } + + template<> + inline void WriteArray(PortableWriter& writer, const char* fieldName, float* val, int32_t len) + { + writer.WriteFloatArray(fieldName, val, len); + } + + template<> + inline int32_t ReadArray(PortableReader& reader, const char* fieldName, float* val, int32_t len) + { + return reader.ReadFloatArray(fieldName, val, len); + } + + template<> + inline void WriteArray(PortableWriter& writer, const char* fieldName, double* val, int32_t len) + { + writer.WriteDoubleArray(fieldName, val, len); + } + + template<> + inline int32_t ReadArray(PortableReader& reader, const char* fieldName, double* val, int32_t len) + { + return reader.ReadDoubleArray(fieldName, val, len); + } + + template<> + inline void WriteArray(PortableWriter& writer, const char* fieldName, Guid* val, int32_t len) + { + writer.WriteGuidArray(fieldName, val, len); + } + + template<> + inline int32_t ReadArray(PortableReader& reader, const char* fieldName, Guid* val, int32_t len) + { + return reader.ReadGuidArray(fieldName, val, len); + } + } + } +} + +#endif \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj b/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj index 52def17..1f70a04 100644 --- a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj +++ b/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj @@ -44,8 +44,8 @@ <ClCompile Include="..\..\src\teamcity_messages.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\include\gridgain\portable_test_defs.h" /> - <ClInclude Include="..\..\include\gridgain\portable_test_utils.h" /> + <ClInclude Include="..\..\include\ignite\portable_test_defs.h" /> + <ClInclude Include="..\..\include\ignite\portable_test_utils.h" /> <ClInclude Include="..\..\include\teamcity_messages.h" /> </ItemGroup> <PropertyGroup Label="Globals"> http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj.filters ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj.filters b/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj.filters index 0d8a707..6ecc63b 100644 --- a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj.filters +++ b/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj.filters @@ -36,10 +36,10 @@ </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\include\gridgain\portable_test_defs.h"> + <ClInclude Include="..\..\include\ignite\portable_test_defs.h"> <Filter>Code</Filter> </ClInclude> - <ClInclude Include="..\..\include\gridgain\portable_test_utils.h"> + <ClInclude Include="..\..\include\ignite\portable_test_utils.h"> <Filter>Code</Filter> </ClInclude> <ClInclude Include="..\..\include\teamcity_messages.h"> http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp b/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp index 266ff19..4ad5278 100644 --- a/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp +++ b/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp @@ -1,10 +1,18 @@ /* - * Copyright (C) GridGain Systems. All Rights Reserved. - * _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef _MSC_VER @@ -15,14 +23,13 @@ #include <boost/test/unit_test.hpp> -#include "gridgain/impl/utils.h" - -#include "gridgain/cache/cache.h" -#include "gridgain/cache/query/query_cursor.h" -#include "gridgain/cache/query/query_sql.h" -#include "gridgain/cache/query/query_text.h" -#include "gridgain/grid.h" -#include "gridgain/grid_factory.h" +#include "ignite/impl/utils.h" +#include "ignite/cache/cache.h" +#include "ignite/cache/query/query_cursor.h" +#include "ignite/cache/query/query_sql.h" +#include "ignite/cache/query/query_text.h" +#include "ignite/grid.h" +#include "ignite/grid_factory.h" using namespace boost::unit_test; http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/src/cache_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/src/cache_test.cpp b/modules/platform/src/main/cpp/core-test/src/cache_test.cpp index 1682055..b9ae672 100644 --- a/modules/platform/src/main/cpp/core-test/src/cache_test.cpp +++ b/modules/platform/src/main/cpp/core-test/src/cache_test.cpp @@ -1,10 +1,18 @@ /* - * Copyright (C) GridGain Systems. All Rights Reserved. - * _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef _MSC_VER @@ -13,9 +21,9 @@ #include <boost/test/unit_test.hpp> -#include "gridgain/cache/cache_peek_mode.h" -#include "gridgain/grid.h" -#include "gridgain/grid_factory.h" +#include "ignite/cache/cache_peek_mode.h" +#include "ignite/grid.h" +#include "ignite/grid_factory.h" using namespace ignite; using namespace boost::unit_test; http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/src/concurrent_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/src/concurrent_test.cpp b/modules/platform/src/main/cpp/core-test/src/concurrent_test.cpp index 5bd09a2..2d89b7a 100644 --- a/modules/platform/src/main/cpp/core-test/src/concurrent_test.cpp +++ b/modules/platform/src/main/cpp/core-test/src/concurrent_test.cpp @@ -1,10 +1,18 @@ /* - * Copyright (C) GridGain Systems. All Rights Reserved. - * _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef _MSC_VER http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/src/grid_factory_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/src/grid_factory_test.cpp b/modules/platform/src/main/cpp/core-test/src/grid_factory_test.cpp index fc33fb3..575b5c7 100644 --- a/modules/platform/src/main/cpp/core-test/src/grid_factory_test.cpp +++ b/modules/platform/src/main/cpp/core-test/src/grid_factory_test.cpp @@ -1,10 +1,18 @@ /* - * Copyright (C) GridGain Systems. All Rights Reserved. - * _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef _MSC_VER @@ -13,8 +21,8 @@ #include <boost/test/unit_test.hpp> -#include "gridgain/grid.h" -#include "gridgain/grid_factory.h" +#include "ignite/grid.h" +#include "ignite/grid_factory.h" using namespace ignite; using namespace boost::unit_test; http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/src/handle_registry_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/src/handle_registry_test.cpp b/modules/platform/src/main/cpp/core-test/src/handle_registry_test.cpp index 9b2798b..bc4a654 100644 --- a/modules/platform/src/main/cpp/core-test/src/handle_registry_test.cpp +++ b/modules/platform/src/main/cpp/core-test/src/handle_registry_test.cpp @@ -1,10 +1,18 @@ /* - * Copyright (C) GridGain Systems. All Rights Reserved. - * _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef _MSC_VER @@ -13,7 +21,7 @@ #include <boost/test/unit_test.hpp> -#include "gridgain/impl/handle_registry.h" +#include "ignite/impl/handle_registry.h" using namespace ignite::common::concurrent; using namespace ignite::impl; http://git-wip-us.apache.org/repos/asf/ignite/blob/0d70d547/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_raw_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_raw_test.cpp b/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_raw_test.cpp index c213e67..c717372 100644 --- a/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_raw_test.cpp +++ b/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_raw_test.cpp @@ -1,10 +1,18 @@ /* - * Copyright (C) GridGain Systems. All Rights Reserved. - * _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef _MSC_VER @@ -13,11 +21,11 @@ #include <boost/test/unit_test.hpp> -#include "gridgain/impl/interop/interop.h" -#include "gridgain/portable/portable.h" +#include "ignite/impl/interop/interop.h" +#include "ignite/portable/portable.h" -#include "gridgain/portable_test_defs.h" -#include "gridgain/portable_test_utils.h" +#include "ignite/portable_test_defs.h" +#include "ignite/portable_test_utils.h" using namespace ignite; using namespace ignite::impl::interop;
