You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/03 13:09:37 UTC
[3/3] ignite git commit: IGNITE-1364: GridError -> IgniteError.
IGNITE-1364: GridError -> IgniteError.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/863189fd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/863189fd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/863189fd
Branch: refs/heads/ignite-1364
Commit: 863189fdd23b88809223f7509791eb660053a7df
Parents: a79962c
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 3 14:10:14 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 3 14:10:14 2015 +0300
----------------------------------------------------------------------
.../main/cpp/core-test/src/cache_query_test.cpp | 16 +-
.../src/main/cpp/core-test/src/cache_test.cpp | 8 +-
.../cpp/core-test/src/grid_factory_test.cpp | 14 +-
.../src/portable_reader_writer_raw_test.cpp | 196 +++++++-------
.../src/portable_reader_writer_test.cpp | 252 +++++++++---------
modules/platform/src/main/cpp/core/Makefile.am | 2 +-
.../src/main/cpp/core/include/Makefile.am | 2 +-
.../main/cpp/core/include/ignite/cache/cache.h | 186 ++++++-------
.../include/ignite/cache/query/query_cursor.h | 28 +-
.../src/main/cpp/core/include/ignite/grid.h | 18 +-
.../main/cpp/core/include/ignite/grid_error.h | 260 -------------------
.../main/cpp/core/include/ignite/grid_factory.h | 16 +-
.../main/cpp/core/include/ignite/ignite_error.h | 260 +++++++++++++++++++
.../core/include/ignite/impl/cache/cache_impl.h | 72 ++---
.../ignite/impl/cache/query/query_impl.h | 12 +-
.../cpp/core/include/ignite/impl/grid_impl.h | 12 +-
.../ignite/impl/portable/portable_id_resolver.h | 2 +-
.../impl/portable/portable_metadata_manager.h | 4 +-
.../impl/portable/portable_metadata_updater.h | 4 +-
.../portable/portable_metadata_updater_impl.h | 2 +-
.../ignite/impl/portable/portable_reader_impl.h | 10 +-
.../include/ignite/portable/portable_type.h | 12 +-
.../src/main/cpp/core/project/vs/core.vcxproj | 4 +-
.../cpp/core/project/vs/core.vcxproj.filters | 4 +-
.../main/cpp/core/project/vs/core.vcxprojrel | 4 +-
.../src/main/cpp/core/src/grid_error.cpp | 222 ----------------
.../src/main/cpp/core/src/grid_factory.cpp | 70 ++---
.../src/main/cpp/core/src/ignite_error.cpp | 222 ++++++++++++++++
.../main/cpp/core/src/impl/cache/cache_impl.cpp | 78 +++---
.../core/src/impl/cache/query/query_impl.cpp | 30 +--
.../src/impl/interop/interop_input_stream.cpp | 6 +-
.../core/src/impl/interop/interop_memory.cpp | 4 +-
.../src/impl/interop/interop_output_stream.cpp | 2 +-
.../impl/portable/portable_metadata_manager.cpp | 2 +-
.../portable/portable_metadata_updater_impl.cpp | 4 +-
.../src/impl/portable/portable_reader_impl.cpp | 16 +-
.../src/impl/portable/portable_writer_impl.cpp | 12 +-
37 files changed, 1034 insertions(+), 1034 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/863189fd/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 4ad5278..ad3fb15 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
@@ -208,11 +208,11 @@ struct CacheQueryTestSuiteFixture {
cfg.springCfgPath = const_cast<char*>(cfgPathStr.c_str());
- GridError err;
+ IgniteError err;
Grid grid0 = GridFactory::Start(cfg, &err);
- if (err.GetCode() != GridError::IGNITE_SUCCESS)
+ if (err.GetCode() != IgniteError::IGNITE_SUCCESS)
BOOST_ERROR(err.GetText());
grid = grid0;
@@ -240,9 +240,9 @@ void CheckHasNextFail(QueryCursor<int, QueryPerson>& cur)
BOOST_FAIL("Must fail.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_GENERIC);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_GENERIC);
}
}
@@ -259,9 +259,9 @@ void CheckGetNextFail(QueryCursor<int, QueryPerson>& cur)
BOOST_FAIL("Must fail.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_GENERIC);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_GENERIC);
}
}
@@ -280,9 +280,9 @@ void CheckGetAllFail(QueryCursor<int, QueryPerson>& cur)
BOOST_FAIL("Must fail.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_GENERIC);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_GENERIC);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/863189fd/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 b9ae672..7d0cbce 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
@@ -121,11 +121,11 @@ struct CacheTestSuiteFixture {
stream << "grid-" << i;
- GridError err;
+ IgniteError err;
Grid grid = GridFactory::Start(cfg, stream.str().c_str(), &err);
- if (err.GetCode() != GridError::IGNITE_SUCCESS)
+ if (err.GetCode() != IgniteError::IGNITE_SUCCESS)
BOOST_FAIL(err.GetText());
if (i == 0)
@@ -454,11 +454,11 @@ BOOST_AUTO_TEST_CASE(TestCreateCache)
BOOST_REQUIRE(7 == cache.Get(5));
// Attempt to create cache with existing name
- GridError err;
+ IgniteError err;
grid0.CreateCache<int, int>("dynamic_cache", &err);
- BOOST_REQUIRE(err.GetCode() != GridError::IGNITE_SUCCESS);
+ BOOST_REQUIRE(err.GetCode() != IgniteError::IGNITE_SUCCESS);
}
BOOST_AUTO_TEST_CASE(TestGetOrCreateCache)
http://git-wip-us.apache.org/repos/asf/ignite/blob/863189fd/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 575b5c7..61a1a29 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
@@ -53,19 +53,19 @@ BOOST_AUTO_TEST_CASE(TestGridFactory)
cfg.springCfgPath = const_cast<char*>(cfgPathStr.c_str());
- GridError err;
+ IgniteError err;
// Start two grids
Grid grid1 = GridFactory::Start(cfg, "gridFactoryTest-1", &err);
- if (err.GetCode() != GridError::IGNITE_SUCCESS)
+ if (err.GetCode() != IgniteError::IGNITE_SUCCESS)
BOOST_ERROR(err.GetText());
BOOST_REQUIRE(strcmp(grid1.GetName(), "gridFactoryTest-1") == 0);
Grid grid2 = GridFactory::Start(cfg, "gridFactoryTest-2", &err);
- if (err.GetCode() != GridError::IGNITE_SUCCESS)
+ if (err.GetCode() != IgniteError::IGNITE_SUCCESS)
BOOST_ERROR(err.GetText());
BOOST_REQUIRE(strcmp(grid2.GetName(), "gridFactoryTest-2") == 0);
@@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE(TestGridFactory)
// Test get
Grid grid0 = GridFactory::Get("gridFactoryTest-1", &err);
- if (err.GetCode() != GridError::IGNITE_SUCCESS)
+ if (err.GetCode() != IgniteError::IGNITE_SUCCESS)
BOOST_ERROR(err.GetText());
BOOST_REQUIRE(strcmp(grid0.GetName(), grid1.GetName()) == 0);
@@ -82,16 +82,16 @@ BOOST_AUTO_TEST_CASE(TestGridFactory)
GridFactory::Stop(grid1.GetName(), true);
GridFactory::Get("gridFactoryTest-1", &err);
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_GENERIC);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_GENERIC);
GridFactory::Get("gridFactoryTest-2", &err);
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_SUCCESS);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_SUCCESS);
// Stop all
GridFactory::StopAll(true);
GridFactory::Get("gridFactoryTest-2", &err);
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_GENERIC);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_GENERIC);
}
BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/863189fd/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 c717372..c3a98aa 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
@@ -177,9 +177,9 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -190,9 +190,9 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -203,9 +203,9 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -214,9 +214,9 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -225,9 +225,9 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -236,9 +236,9 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -247,9 +247,9 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
}
@@ -261,9 +261,9 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -274,9 +274,9 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -285,9 +285,9 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -296,9 +296,9 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -307,9 +307,9 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -318,9 +318,9 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -329,9 +329,9 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
}
@@ -358,9 +358,9 @@ void CheckRawCollectionEmpty(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -369,9 +369,9 @@ void CheckRawCollectionEmpty(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -397,9 +397,9 @@ void CheckRawCollectionEmpty(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -436,9 +436,9 @@ void CheckRawCollection(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -447,9 +447,9 @@ void CheckRawCollection(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -487,9 +487,9 @@ void CheckRawCollection(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -518,9 +518,9 @@ void CheckRawMapEmpty(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -529,9 +529,9 @@ void CheckRawMapEmpty(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -560,9 +560,9 @@ void CheckRawMapEmpty(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -599,9 +599,9 @@ void CheckRawMap(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -610,9 +610,9 @@ void CheckRawMap(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -658,9 +658,9 @@ void CheckRawMap(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -865,9 +865,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayNull)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -876,9 +876,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayNull)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -908,9 +908,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -921,9 +921,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -934,9 +934,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -945,9 +945,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -970,9 +970,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -981,9 +981,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1023,9 +1023,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1036,9 +1036,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1049,9 +1049,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1060,9 +1060,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1133,9 +1133,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1144,9 +1144,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1246,9 +1246,9 @@ BOOST_AUTO_TEST_CASE(TestArrayNull)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1276,9 +1276,9 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1287,9 +1287,9 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1310,9 +1310,9 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1348,9 +1348,9 @@ BOOST_AUTO_TEST_CASE(TestArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1359,9 +1359,9 @@ BOOST_AUTO_TEST_CASE(TestArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1394,9 +1394,9 @@ BOOST_AUTO_TEST_CASE(TestArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1432,9 +1432,9 @@ BOOST_AUTO_TEST_CASE(TestCollectionNull)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1497,9 +1497,9 @@ BOOST_AUTO_TEST_CASE(TestMapNull)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/863189fd/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_test.cpp b/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_test.cpp
index ee27df8..aff929b 100644
--- a/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_test.cpp
@@ -52,9 +52,9 @@ void CheckPrimitive(T val)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
Write<T>(writer, "test", val);
@@ -74,9 +74,9 @@ void CheckPrimitive(T val)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
T readVal = Read<T>(reader, "test");
@@ -114,9 +114,9 @@ void CheckPrimitiveArray(T dflt, T val1, T val2)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
// 1. Write NULL and see what happens.
@@ -216,9 +216,9 @@ void CheckPrimitiveArray(T dflt, T val1, T val2)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(ReadArray<T>(reader, fieldName, arr1, 0) == 2);
@@ -242,9 +242,9 @@ void CheckWritesRestricted(PortableWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -255,9 +255,9 @@ void CheckWritesRestricted(PortableWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -268,9 +268,9 @@ void CheckWritesRestricted(PortableWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -279,9 +279,9 @@ void CheckWritesRestricted(PortableWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -290,9 +290,9 @@ void CheckWritesRestricted(PortableWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -301,9 +301,9 @@ void CheckWritesRestricted(PortableWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -312,9 +312,9 @@ void CheckWritesRestricted(PortableWriter& writer)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
}
@@ -326,9 +326,9 @@ void CheckReadsRestricted(PortableReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -339,9 +339,9 @@ void CheckReadsRestricted(PortableReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -350,9 +350,9 @@ void CheckReadsRestricted(PortableReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -361,9 +361,9 @@ void CheckReadsRestricted(PortableReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -372,9 +372,9 @@ void CheckReadsRestricted(PortableReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -383,9 +383,9 @@ void CheckReadsRestricted(PortableReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -394,9 +394,9 @@ void CheckReadsRestricted(PortableReader& reader)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
}
@@ -427,9 +427,9 @@ void CheckCollectionEmpty(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -438,9 +438,9 @@ void CheckCollectionEmpty(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -468,9 +468,9 @@ void CheckCollectionEmpty(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -511,9 +511,9 @@ void CheckCollection(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -522,9 +522,9 @@ void CheckCollection(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -564,9 +564,9 @@ void CheckCollection(CollectionType* colType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -599,9 +599,9 @@ void CheckMapEmpty(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -610,9 +610,9 @@ void CheckMapEmpty(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -643,9 +643,9 @@ void CheckMapEmpty(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -686,9 +686,9 @@ void CheckMap(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -697,9 +697,9 @@ void CheckMap(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -747,9 +747,9 @@ void CheckMap(MapType* mapType)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -871,9 +871,9 @@ BOOST_AUTO_TEST_CASE(TestGuidNull)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
writer.WriteNull("test");
@@ -892,9 +892,9 @@ BOOST_AUTO_TEST_CASE(TestGuidNull)
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
Guid expVal;
@@ -924,9 +924,9 @@ BOOST_AUTO_TEST_CASE(TestString) {
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -935,9 +935,9 @@ BOOST_AUTO_TEST_CASE(TestString) {
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -946,9 +946,9 @@ BOOST_AUTO_TEST_CASE(TestString) {
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
writer.WriteString("field1", writeVal1);
@@ -973,9 +973,9 @@ BOOST_AUTO_TEST_CASE(TestString) {
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -984,9 +984,9 @@ BOOST_AUTO_TEST_CASE(TestString) {
BOOST_FAIL("Not restricted.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
char readVal1[9];
@@ -1051,9 +1051,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayNull)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1062,9 +1062,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayNull)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1098,9 +1098,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1111,9 +1111,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1124,9 +1124,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1135,9 +1135,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1162,9 +1162,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1173,9 +1173,9 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1219,9 +1219,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1232,9 +1232,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1245,9 +1245,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1256,9 +1256,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1331,9 +1331,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1342,9 +1342,9 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1462,9 +1462,9 @@ BOOST_AUTO_TEST_CASE(TestArrayNull)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1496,9 +1496,9 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1507,9 +1507,9 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1532,9 +1532,9 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1574,9 +1574,9 @@ BOOST_AUTO_TEST_CASE(TestArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
try
@@ -1585,9 +1585,9 @@ BOOST_AUTO_TEST_CASE(TestArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1622,9 +1622,9 @@ BOOST_AUTO_TEST_CASE(TestArray)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1666,9 +1666,9 @@ BOOST_AUTO_TEST_CASE(TestCollectionNull)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1737,9 +1737,9 @@ BOOST_AUTO_TEST_CASE(TestMapNull)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1789,9 +1789,9 @@ BOOST_AUTO_TEST_CASE(TestRawMode)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
rawWriter.WriteInt8(1);
@@ -1814,9 +1814,9 @@ BOOST_AUTO_TEST_CASE(TestRawMode)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1895,9 +1895,9 @@ BOOST_AUTO_TEST_CASE(TestFieldSeek)
BOOST_FAIL("Error expected.");
}
- catch (GridError& err)
+ catch (IgniteError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == IgniteError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt32("val2") == 2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/863189fd/modules/platform/src/main/cpp/core/Makefile.am
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/Makefile.am b/modules/platform/src/main/cpp/core/Makefile.am
index 07091c6..9cca4ea 100644
--- a/modules/platform/src/main/cpp/core/Makefile.am
+++ b/modules/platform/src/main/cpp/core/Makefile.am
@@ -25,7 +25,7 @@ AM_CXXFLAGS = -Wall -std=c++0x
LIB_LDFLAGS = -no-undefined -version-info 1
COMMON_SRC = os/linux/src/impl/utils.cpp \
- src/grid_error.cpp \
+ src/ignite_error.cpp \
src/guid.cpp \
src/impl/handle_registry.cpp \
src/impl/interop/interop_memory.cpp \
http://git-wip-us.apache.org/repos/asf/ignite/blob/863189fd/modules/platform/src/main/cpp/core/include/Makefile.am
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/Makefile.am b/modules/platform/src/main/cpp/core/include/Makefile.am
index e938e1c..f5a067a 100644
--- a/modules/platform/src/main/cpp/core/include/Makefile.am
+++ b/modules/platform/src/main/cpp/core/include/Makefile.am
@@ -56,6 +56,6 @@ nobase_include_HEADERS = ignite/cache/cache.h \
ignite/portable/portable_writer.h \
ignite/grid.h \
ignite/grid_configuration.h \
- ignite/grid_error.h \
+ ignite/ignite_error.h \
ignite/grid_factory.h \
ignite/guid.h
http://git-wip-us.apache.org/repos/asf/ignite/blob/863189fd/modules/platform/src/main/cpp/core/include/ignite/cache/cache.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/ignite/cache/cache.h b/modules/platform/src/main/cpp/core/include/ignite/cache/cache.h
index 628caa8..dcc837b 100644
--- a/modules/platform/src/main/cpp/core/include/ignite/cache/cache.h
+++ b/modules/platform/src/main/cpp/core/include/ignite/cache/cache.h
@@ -31,7 +31,7 @@
#include "ignite/cache/query/query_text.h"
#include "ignite/impl/cache/cache_impl.h"
#include "ignite/impl/operations.h"
-#include "ignite/grid_error.h"
+#include "ignite/ignite_error.h"
namespace ignite
{
@@ -68,11 +68,11 @@ namespace ignite
*/
bool IsEmpty()
{
- GridError err;
+ IgniteError err;
bool res = IsEmpty(err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -84,7 +84,7 @@ namespace ignite
* @param err Error.
* @return True if cache is empty.
*/
- bool IsEmpty(GridError& err)
+ bool IsEmpty(IgniteError& err)
{
return impl.Get()->IsEmpty(&err);
}
@@ -97,11 +97,11 @@ namespace ignite
*/
bool ContainsKey(const K& key)
{
- GridError err;
+ IgniteError err;
bool res = ContainsKey(key, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -113,7 +113,7 @@ namespace ignite
* @param err Error.
* @return True if cache contains mapping for this key.
*/
- bool ContainsKey(const K& key, GridError& err)
+ bool ContainsKey(const K& key, IgniteError& err)
{
impl::In1Operation<K> op(&key);
@@ -128,11 +128,11 @@ namespace ignite
*/
bool ContainsKeys(const std::set<K>& keys)
{
- GridError err;
+ IgniteError err;
bool res = ContainsKeys(keys, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -144,7 +144,7 @@ namespace ignite
* @param err Error.
* @return True if cache contains mapping for all these keys.
*/
- bool ContainsKeys(const std::set<K>& keys, GridError& err)
+ bool ContainsKeys(const std::set<K>& keys, IgniteError& err)
{
impl::InSetOperation<K> op(&keys);
@@ -164,11 +164,11 @@ namespace ignite
*/
V LocalPeek(const K& key, int32_t peekModes)
{
- GridError err;
+ IgniteError err;
V res = LocalPeek(key, peekModes, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -185,7 +185,7 @@ namespace ignite
* @param err Error.
* @return Value.
*/
- V LocalPeek(const K& key, int32_t peekModes, GridError& err)
+ V LocalPeek(const K& key, int32_t peekModes, IgniteError& err)
{
impl::InCacheLocalPeekOperation<K> inOp(&key, peekModes);
impl::Out1Operation<V> outOp;
@@ -207,11 +207,11 @@ namespace ignite
*/
V Get(const K& key)
{
- GridError err;
+ IgniteError err;
V res = Get(key, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -227,7 +227,7 @@ namespace ignite
* @param err Error.
* @return Value.
*/
- V Get(const K& key, GridError& err)
+ V Get(const K& key, IgniteError& err)
{
impl::In1Operation<K> inOp(&key);
impl::Out1Operation<V> outOp;
@@ -249,11 +249,11 @@ namespace ignite
*/
std::map<K, V> GetAll(const std::set<K>& keys)
{
- GridError err;
+ IgniteError err;
std::map<K, V> res = GetAll(keys, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -269,7 +269,7 @@ namespace ignite
* @param err Error.
* @return Map of key-value pairs.
*/
- std::map<K, V> GetAll(const std::set<K>& keys, GridError& err)
+ std::map<K, V> GetAll(const std::set<K>& keys, IgniteError& err)
{
impl::InSetOperation<K> inOp(&keys);
impl::OutMapOperation<K, V> outOp;
@@ -289,11 +289,11 @@ namespace ignite
*/
void Put(const K& key, const V& val)
{
- GridError err;
+ IgniteError err;
Put(key, val, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
}
/**
@@ -305,7 +305,7 @@ namespace ignite
* @param val Value to be associated with the specified key.
* @param err Error.
*/
- void Put(const K& key, const V& val, GridError& err)
+ void Put(const K& key, const V& val, IgniteError& err)
{
impl::In2Operation<K, V> op(&key, &val);
@@ -321,11 +321,11 @@ namespace ignite
*/
void PutAll(const std::map<K, V>& vals)
{
- GridError err;
+ IgniteError err;
PutAll(vals, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
}
/**
@@ -336,7 +336,7 @@ namespace ignite
* @param vals Key-value pairs to store in cache.
* @param err Error.
*/
- void PutAll(const std::map<K, V>& vals, GridError& err)
+ void PutAll(const std::map<K, V>& vals, IgniteError& err)
{
impl::InMapOperation<K, V> op(&vals);
@@ -354,11 +354,11 @@ namespace ignite
*/
V GetAndPut(const K& key, const V& val)
{
- GridError err;
+ IgniteError err;
V res = GetAndPut(key, val, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -373,7 +373,7 @@ namespace ignite
* @return The value associated with the key at the start of the
* operation or null if none was associated.
*/
- V GetAndPut(const K& key, const V& val, GridError& err)
+ V GetAndPut(const K& key, const V& val, IgniteError& err)
{
impl::In2Operation<K, V> inOp(&key, &val);
impl::Out1Operation<V> outOp;
@@ -394,11 +394,11 @@ namespace ignite
*/
V GetAndReplace(const K& key, const V& val)
{
- GridError err;
+ IgniteError err;
V res = GetAndReplace(key, val, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -413,7 +413,7 @@ namespace ignite
* @return The previous value associated with the specified key, or
* null if there was no mapping for the key.
*/
- V GetAndReplace(const K& key, const V& val, GridError& err)
+ V GetAndReplace(const K& key, const V& val, IgniteError& err)
{
impl::In2Operation<K, V> inOp(&key, &val);
impl::Out1Operation<V> outOp;
@@ -431,11 +431,11 @@ namespace ignite
*/
V GetAndRemove(const K& key)
{
- GridError err;
+ IgniteError err;
V res = GetAndRemove(key, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -447,7 +447,7 @@ namespace ignite
* @param err Error.
* @return The value if one existed or null if no mapping existed for this key.
*/
- V GetAndRemove(const K& key, GridError& err)
+ V GetAndRemove(const K& key, IgniteError& err)
{
impl::In1Operation<K> inOp(&key);
impl::Out1Operation<V> outOp;
@@ -467,11 +467,11 @@ namespace ignite
*/
bool PutIfAbsent(const K& key, const V& val)
{
- GridError err;
+ IgniteError err;
bool res = PutIfAbsent(key, val, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -485,7 +485,7 @@ namespace ignite
* @param err Error.
* @return True if a value was set.
*/
- bool PutIfAbsent(const K& key, const V& val, GridError& err)
+ bool PutIfAbsent(const K& key, const V& val, IgniteError& err)
{
impl::In2Operation<K, V> op(&key, &val);
@@ -510,11 +510,11 @@ namespace ignite
*/
V GetAndPutIfAbsent(const K& key, const V& val)
{
- GridError err;
+ IgniteError err;
V res = GetAndPutIfAbsent(key, val, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -536,7 +536,7 @@ namespace ignite
* @return Previously contained value regardless of whether put happened or not
* (null if there was no previous value).
*/
- V GetAndPutIfAbsent(const K& key, const V& val, GridError& err)
+ V GetAndPutIfAbsent(const K& key, const V& val, IgniteError& err)
{
impl::In2Operation<K, V> inOp(&key, &val);
impl::Out1Operation<V> outOp;
@@ -561,11 +561,11 @@ namespace ignite
*/
bool Replace(const K& key, const V& val)
{
- GridError err;
+ IgniteError err;
bool res = Replace(key, val, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -584,7 +584,7 @@ namespace ignite
* @param err Error.
* @return True if the value was replaced.
*/
- bool Replace(const K& key, const V& val, GridError& err)
+ bool Replace(const K& key, const V& val, IgniteError& err)
{
impl::In2Operation<K, V> op(&key, &val);
@@ -603,11 +603,11 @@ namespace ignite
*/
bool Replace(const K& key, const V& oldVal, const V& newVal)
{
- GridError err;
+ IgniteError err;
bool res = Replace(key, oldVal, newVal, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -623,7 +623,7 @@ namespace ignite
* @param err Error.
* @return True if replace happened, false otherwise.
*/
- bool Replace(const K& key, const V& oldVal, const V& newVal, GridError& err)
+ bool Replace(const K& key, const V& oldVal, const V& newVal, IgniteError& err)
{
impl::In3Operation<K, V, V> op(&key, &oldVal, &newVal);
@@ -638,11 +638,11 @@ namespace ignite
*/
void LocalEvict(const std::set<K>& keys)
{
- GridError err;
+ IgniteError err;
LocalEvict(keys, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
}
/**
@@ -652,7 +652,7 @@ namespace ignite
* @param keys Keys to evict from cache.
* @param err Error.
*/
- void LocalEvict(const std::set<K>& keys, GridError& err)
+ void LocalEvict(const std::set<K>& keys, IgniteError& err)
{
impl::InSetOperation<K> op(&keys);
@@ -664,11 +664,11 @@ namespace ignite
*/
void Clear()
{
- GridError err;
+ IgniteError err;
Clear(err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
}
/**
@@ -676,7 +676,7 @@ namespace ignite
*
* @param err Error.
*/
- void Clear(GridError& err)
+ void Clear(IgniteError& err)
{
impl.Get()->Clear(&err);
}
@@ -689,11 +689,11 @@ namespace ignite
*/
void Clear(const K& key)
{
- GridError err;
+ IgniteError err;
Clear(key, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
}
/**
@@ -703,7 +703,7 @@ namespace ignite
* @param key Key to clear.
* @param err Error.
*/
- void Clear(const K& key, GridError& err)
+ void Clear(const K& key, IgniteError& err)
{
impl::In1Operation<K> op(&key);
@@ -718,11 +718,11 @@ namespace ignite
*/
void ClearAll(const std::set<K>& keys)
{
- GridError err;
+ IgniteError err;
ClearAll(keys, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
}
/**
@@ -732,7 +732,7 @@ namespace ignite
* @param keys Keys to clear.
* @param err Error.
*/
- void ClearAll(const std::set<K>& keys, GridError& err)
+ void ClearAll(const std::set<K>& keys, IgniteError& err)
{
impl::InSetOperation<K> op(&keys);
@@ -749,11 +749,11 @@ namespace ignite
*/
void LocalClear(const K& key)
{
- GridError err;
+ IgniteError err;
LocalClear(key, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
}
/**
@@ -765,7 +765,7 @@ namespace ignite
* @param key Key to clear.
* @param err Error.
*/
- void LocalClear(const K& key, GridError& err)
+ void LocalClear(const K& key, IgniteError& err)
{
impl::In1Operation<K> op(&key);
@@ -782,11 +782,11 @@ namespace ignite
*/
void LocalClearAll(const std::set<K>& keys)
{
- GridError err;
+ IgniteError err;
LocalClearAll(keys, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
}
/**
@@ -798,7 +798,7 @@ namespace ignite
* @param keys Keys to clear.
* @param err Error.
*/
- void LocalClearAll(const std::set<K>& keys, GridError& err)
+ void LocalClearAll(const std::set<K>& keys, IgniteError& err)
{
impl::InSetOperation<K> op(&keys);
@@ -820,11 +820,11 @@ namespace ignite
*/
bool Remove(const K& key)
{
- GridError err;
+ IgniteError err;
bool res = Remove(key, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -843,7 +843,7 @@ namespace ignite
* @param err Error.
* @return False if there was no matching key.
*/
- bool Remove(const K& key, GridError& err)
+ bool Remove(const K& key, IgniteError& err)
{
impl::In1Operation<K> op(&key);
@@ -861,11 +861,11 @@ namespace ignite
*/
bool Remove(const K& key, const V& val)
{
- GridError err;
+ IgniteError err;
bool res = Remove(key, val, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -880,7 +880,7 @@ namespace ignite
* @param err Error.
* @return True if entry was removed, false otherwise.
*/
- bool Remove(const K& key, const V& val, GridError& err)
+ bool Remove(const K& key, const V& val, IgniteError& err)
{
impl::In2Operation<K, V> op(&key, &val);
@@ -896,11 +896,11 @@ namespace ignite
*/
void RemoveAll(const std::set<K>& keys)
{
- GridError err;
+ IgniteError err;
RemoveAll(keys, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
}
/**
@@ -911,7 +911,7 @@ namespace ignite
* @param keys Keys whose mappings are to be removed from cache.
* @param err Error.
*/
- void RemoveAll(const std::set<K>& keys, GridError& err)
+ void RemoveAll(const std::set<K>& keys, IgniteError& err)
{
impl::InSetOperation<K> op(&keys);
@@ -927,11 +927,11 @@ namespace ignite
*/
void RemoveAll()
{
- GridError err;
+ IgniteError err;
RemoveAll(err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
}
/**
@@ -941,7 +941,7 @@ namespace ignite
*
* @param err Error.
*/
- void RemoveAll(GridError& err)
+ void RemoveAll(IgniteError& err)
{
return impl.Get()->RemoveAll(&err);
}
@@ -962,7 +962,7 @@ namespace ignite
* @param err Error.
* @return Cache size on this node.
*/
- int32_t LocalSize(GridError& err)
+ int32_t LocalSize(IgniteError& err)
{
return LocalSize(IGNITE_PEEK_MODE_ALL, err);
}
@@ -975,11 +975,11 @@ namespace ignite
*/
int32_t LocalSize(int32_t peekModes)
{
- GridError err;
+ IgniteError err;
int32_t res = LocalSize(peekModes, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -991,7 +991,7 @@ namespace ignite
* @param err Error.
* @return Cache size on this node.
*/
- int32_t LocalSize(int32_t peekModes, GridError& err)
+ int32_t LocalSize(int32_t peekModes, IgniteError& err)
{
return impl.Get()->LocalSize(peekModes, &err);
}
@@ -1014,7 +1014,7 @@ namespace ignite
* @param err Error.
* @return Cache size across all nodes.
*/
- int32_t Size(GridError& err)
+ int32_t Size(IgniteError& err)
{
return Size(ignite::cache::IGNITE_PEEK_MODE_ALL, err);
}
@@ -1028,11 +1028,11 @@ namespace ignite
*/
int32_t Size(int32_t peekModes)
{
- GridError err;
+ IgniteError err;
int32_t res = Size(peekModes, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -1045,7 +1045,7 @@ namespace ignite
* @param err Error.
* @return Cache size across all nodes.
*/
- int32_t Size(int32_t peekModes, GridError& err)
+ int32_t Size(int32_t peekModes, IgniteError& err)
{
return impl.Get()->Size(peekModes, &err);
}
@@ -1058,11 +1058,11 @@ namespace ignite
*/
query::QueryCursor<K, V> Query(const query::SqlQuery& qry)
{
- GridError err;
+ IgniteError err;
query::QueryCursor<K, V> res = Query(qry, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -1074,7 +1074,7 @@ namespace ignite
* @param err Error.
* @return Query cursor.
*/
- query::QueryCursor<K, V> Query(const query::SqlQuery& qry, GridError& err)
+ query::QueryCursor<K, V> Query(const query::SqlQuery& qry, IgniteError& err)
{
impl::cache::query::QueryCursorImpl* cursorImpl = impl.Get()->QuerySql(qry, &err);
@@ -1089,11 +1089,11 @@ namespace ignite
*/
query::QueryCursor<K, V> Query(const query::TextQuery& qry)
{
- GridError err;
+ IgniteError err;
query::QueryCursor<K, V> res = Query(qry, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -1105,7 +1105,7 @@ namespace ignite
* @param err Error.
* @return Query cursor.
*/
- query::QueryCursor<K, V> Query(const query::TextQuery& qry, GridError& err)
+ query::QueryCursor<K, V> Query(const query::TextQuery& qry, IgniteError& err)
{
impl::cache::query::QueryCursorImpl* cursorImpl = impl.Get()->QueryText(qry, &err);
@@ -1120,11 +1120,11 @@ namespace ignite
*/
query::QueryCursor<K, V> Query(const query::ScanQuery& qry)
{
- GridError err;
+ IgniteError err;
query::QueryCursor<K, V> res = Query(qry, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -1136,7 +1136,7 @@ namespace ignite
* @param err Error.
* @return Query cursor.
*/
- query::QueryCursor<K, V> Query(const query::ScanQuery& qry, GridError& err)
+ query::QueryCursor<K, V> Query(const query::ScanQuery& qry, IgniteError& err)
{
impl::cache::query::QueryCursorImpl* cursorImpl = impl.Get()->QueryScan(qry, &err);
http://git-wip-us.apache.org/repos/asf/ignite/blob/863189fd/modules/platform/src/main/cpp/core/include/ignite/cache/query/query_cursor.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/ignite/cache/query/query_cursor.h b/modules/platform/src/main/cpp/core/include/ignite/cache/query/query_cursor.h
index 7860676..23133e1 100644
--- a/modules/platform/src/main/cpp/core/include/ignite/cache/query/query_cursor.h
+++ b/modules/platform/src/main/cpp/core/include/ignite/cache/query/query_cursor.h
@@ -23,7 +23,7 @@
#include <ignite/common/concurrent.h>
#include "ignite/cache/cache_entry.h"
-#include "ignite/grid_error.h"
+#include "ignite/ignite_error.h"
#include "ignite/impl/cache/query/query_impl.h"
#include "ignite/impl/operations.h"
@@ -66,11 +66,11 @@ namespace ignite
*/
bool HasNext()
{
- GridError err;
+ IgniteError err;
bool res = HasNext(err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -81,7 +81,7 @@ namespace ignite
* @param err Error.
* @return True if next entry exists.
*/
- bool HasNext(GridError& err)
+ bool HasNext(IgniteError& err)
{
impl::cache::query::QueryCursorImpl* impl0 = impl.Get();
@@ -89,7 +89,7 @@ namespace ignite
return impl0->HasNext(&err);
else
{
- err = GridError(GridError::IGNITE_ERR_GENERIC,
+ err = IgniteError(IgniteError::IGNITE_ERR_GENERIC,
"Instance is not usable (did you check for error?).");
return false;
@@ -103,11 +103,11 @@ namespace ignite
*/
CacheEntry<K, V> GetNext()
{
- GridError err;
+ IgniteError err;
CacheEntry<K, V> res = GetNext(err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -118,7 +118,7 @@ namespace ignite
* @param err Error.
* @return Next entry.
*/
- CacheEntry<K, V> GetNext(GridError& err)
+ CacheEntry<K, V> GetNext(IgniteError& err)
{
impl::cache::query::QueryCursorImpl* impl0 = impl.Get();
@@ -127,7 +127,7 @@ namespace ignite
impl0->GetNext(outOp, &err);
- if (err.GetCode() == GridError::IGNITE_SUCCESS)
+ if (err.GetCode() == IgniteError::IGNITE_SUCCESS)
{
K& key = outOp.Get1();
V& val = outOp.Get2();
@@ -139,7 +139,7 @@ namespace ignite
}
else
{
- err = GridError(GridError::IGNITE_ERR_GENERIC,
+ err = IgniteError(IgniteError::IGNITE_ERR_GENERIC,
"Instance is not usable (did you check for error?).");
return CacheEntry<K, V>();
@@ -153,11 +153,11 @@ namespace ignite
*/
void GetAll(std::vector<CacheEntry<K, V>>& res)
{
- GridError err;
+ IgniteError err;
GetAll(res, err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
}
/**
@@ -166,7 +166,7 @@ namespace ignite
* @param Vector where query entries will be stored.
* @param err Error.
*/
- void GetAll(std::vector<CacheEntry<K, V>>& res, GridError& err)
+ void GetAll(std::vector<CacheEntry<K, V>>& res, IgniteError& err)
{
impl::cache::query::QueryCursorImpl* impl0 = impl.Get();
@@ -176,7 +176,7 @@ namespace ignite
impl0->GetAll(outOp, &err);
}
else
- err = GridError(GridError::IGNITE_ERR_GENERIC,
+ err = IgniteError(IgniteError::IGNITE_ERR_GENERIC,
"Instance is not usable (did you check for error?).");
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/863189fd/modules/platform/src/main/cpp/core/include/ignite/grid.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/ignite/grid.h b/modules/platform/src/main/cpp/core/include/ignite/grid.h
index e388467..4d24832 100644
--- a/modules/platform/src/main/cpp/core/include/ignite/grid.h
+++ b/modules/platform/src/main/cpp/core/include/ignite/grid.h
@@ -56,11 +56,11 @@ namespace ignite
template<typename K, typename V>
cache::Cache<K, V> GetCache(const char* name)
{
- GridError err;
+ IgniteError err;
cache::Cache<K, V> res = GetCache<K, V>(name, &err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -73,7 +73,7 @@ namespace ignite
* @return Cache.
*/
template<typename K, typename V>
- cache::Cache<K, V> GetCache(const char* name, GridError* err)
+ cache::Cache<K, V> GetCache(const char* name, IgniteError* err)
{
impl::cache::CacheImpl* cacheImpl = impl.Get()->GetCache<K, V>(name, err);
@@ -89,11 +89,11 @@ namespace ignite
template<typename K, typename V>
cache::Cache<K, V> GetOrCreateCache(const char* name)
{
- GridError err;
+ IgniteError err;
cache::Cache<K, V> res = GetOrCreateCache<K, V>(name, &err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -106,7 +106,7 @@ namespace ignite
* @return Cache.
*/
template<typename K, typename V>
- cache::Cache<K, V> GetOrCreateCache(const char* name, GridError* err)
+ cache::Cache<K, V> GetOrCreateCache(const char* name, IgniteError* err)
{
impl::cache::CacheImpl* cacheImpl = impl.Get()->GetOrCreateCache<K, V>(name, err);
@@ -122,11 +122,11 @@ namespace ignite
template<typename K, typename V>
cache::Cache<K, V> CreateCache(const char* name)
{
- GridError err;
+ IgniteError err;
cache::Cache<K, V> res = CreateCache<K, V>(name, &err);
- GridError::ThrowIfNeeded(err);
+ IgniteError::ThrowIfNeeded(err);
return res;
}
@@ -139,7 +139,7 @@ namespace ignite
* @return Cache.
*/
template<typename K, typename V>
- cache::Cache<K, V> CreateCache(const char* name, GridError* err)
+ cache::Cache<K, V> CreateCache(const char* name, IgniteError* err)
{
impl::cache::CacheImpl* cacheImpl = impl.Get()->CreateCache<K, V>(name, err);