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 12:10:28 UTC
[1/7] ignite git commit: IGNITE-1364: Renames in header guards.
Repository: ignite
Updated Branches:
refs/heads/ignite-1364 0735eb237 -> 356ab0bb0
IGNITE-1364: Renames in header guards.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/509dbd5a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/509dbd5a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/509dbd5a
Branch: refs/heads/ignite-1364
Commit: 509dbd5a000f32b7d20938e93b80a19c0c94355c
Parents: 0735eb2
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 3 12:55:18 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 3 12:55:18 2015 +0300
----------------------------------------------------------------------
.../src/main/cpp/core-test/include/gridgain/portable_test_defs.h | 4 ++--
.../main/cpp/core-test/include/gridgain/portable_test_utils.h | 4 ++--
.../platform/src/main/cpp/core/include/gridgain/cache/cache.h | 4 ++--
.../src/main/cpp/core/include/gridgain/cache/cache_entry.h | 4 ++--
.../src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h | 4 ++--
.../src/main/cpp/core/include/gridgain/cache/query/query.h | 4 ++--
.../main/cpp/core/include/gridgain/cache/query/query_argument.h | 4 ++--
.../main/cpp/core/include/gridgain/cache/query/query_cursor.h | 4 ++--
.../src/main/cpp/core/include/gridgain/cache/query/query_scan.h | 4 ++--
.../src/main/cpp/core/include/gridgain/cache/query/query_sql.h | 4 ++--
.../src/main/cpp/core/include/gridgain/cache/query/query_text.h | 4 ++--
modules/platform/src/main/cpp/core/include/gridgain/grid.h | 4 ++--
.../src/main/cpp/core/include/gridgain/grid_configuration.h | 4 ++--
modules/platform/src/main/cpp/core/include/gridgain/grid_error.h | 4 ++--
.../platform/src/main/cpp/core/include/gridgain/grid_factory.h | 4 ++--
modules/platform/src/main/cpp/core/include/gridgain/guid.h | 4 ++--
.../src/main/cpp/core/include/gridgain/impl/cache/cache_impl.h | 4 ++--
.../main/cpp/core/include/gridgain/impl/cache/query/query_impl.h | 4 ++--
.../src/main/cpp/core/include/gridgain/impl/grid_environment.h | 4 ++--
.../platform/src/main/cpp/core/include/gridgain/impl/grid_impl.h | 4 ++--
.../src/main/cpp/core/include/gridgain/impl/handle_registry.h | 4 ++--
.../src/main/cpp/core/include/gridgain/impl/interop/interop.h | 4 ++--
.../core/include/gridgain/impl/interop/interop_input_stream.h | 4 ++--
.../main/cpp/core/include/gridgain/impl/interop/interop_memory.h | 4 ++--
.../core/include/gridgain/impl/interop/interop_output_stream.h | 4 ++--
.../src/main/cpp/core/include/gridgain/impl/operations.h | 4 ++--
.../cpp/core/include/gridgain/impl/portable/portable_common.h | 4 ++--
.../core/include/gridgain/impl/portable/portable_id_resolver.h | 4 ++--
.../include/gridgain/impl/portable/portable_metadata_handler.h | 4 ++--
.../include/gridgain/impl/portable/portable_metadata_manager.h | 4 ++--
.../include/gridgain/impl/portable/portable_metadata_snapshot.h | 4 ++--
.../include/gridgain/impl/portable/portable_metadata_updater.h | 4 ++--
.../gridgain/impl/portable/portable_metadata_updater_impl.h | 4 ++--
.../core/include/gridgain/impl/portable/portable_reader_impl.h | 4 ++--
.../cpp/core/include/gridgain/impl/portable/portable_utils.h | 4 ++--
.../core/include/gridgain/impl/portable/portable_writer_impl.h | 4 ++--
.../src/main/cpp/core/include/gridgain/portable/portable.h | 4 ++--
.../main/cpp/core/include/gridgain/portable/portable_consts.h | 4 ++--
.../cpp/core/include/gridgain/portable/portable_containers.h | 4 ++--
.../cpp/core/include/gridgain/portable/portable_raw_reader.h | 4 ++--
.../cpp/core/include/gridgain/portable/portable_raw_writer.h | 4 ++--
.../main/cpp/core/include/gridgain/portable/portable_reader.h | 4 ++--
.../src/main/cpp/core/include/gridgain/portable/portable_type.h | 4 ++--
.../main/cpp/core/include/gridgain/portable/portable_writer.h | 4 ++--
44 files changed, 88 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/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
index 6f70103..9e658a3 100644
--- 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
@@ -7,8 +7,8 @@
* \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
*/
-#ifndef _GRIDGAIN_PORTABLE_TEST_DEFS
-#define _GRIDGAIN_PORTABLE_TEST_DEFS
+#ifndef _IGNITE_PORTABLE_TEST_DEFS
+#define _IGNITE_PORTABLE_TEST_DEFS
#include <stdexcept>
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/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
index d034369..e78b235 100644
--- 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
@@ -7,8 +7,8 @@
* \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
*/
-#ifndef _GRIDGAIN_PORTABLE_TEST_UTILS
-#define _GRIDGAIN_PORTABLE_TEST_UTILS
+#ifndef _IGNITE_PORTABLE_TEST_UTILS
+#define _IGNITE_PORTABLE_TEST_UTILS
#include "gridgain/portable/portable.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
index 945ed18..be7ee61 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_CACHE
-#define _GRIDGAIN_CACHE
+#ifndef _IGNITE_CACHE
+#define _IGNITE_CACHE
#include <map>
#include <set>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_entry.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_entry.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_entry.h
index ef1e1fe..f2cd7ed 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_entry.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_entry.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_CACHE_ENTRY
-#define _GRIDGAIN_CACHE_ENTRY
+#ifndef _IGNITE_CACHE_ENTRY
+#define _IGNITE_CACHE_ENTRY
#include <ignite/common/common.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
index 040f565..b01f2d1 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_CACHE_PEEK_MODE
-#define _GRIDGAIN_CACHE_PEEK_MODE
+#ifndef _IGNITE_CACHE_PEEK_MODE
+#define _IGNITE_CACHE_PEEK_MODE
namespace gridgain
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query.h
index 9569ed0..2bf607c 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_QUERY
-#define _GRIDGAIN_QUERY
+#ifndef _IGNITE_QUERY
+#define _IGNITE_QUERY
#include "gridgain/cache/query/query_argument.h"
#include "gridgain/cache/query/query_cursor.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_argument.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_argument.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_argument.h
index 245045c..c7a9d90 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_argument.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_argument.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_CACHE_QUERY_ARGUMENT
-#define _GRIDGAIN_CACHE_QUERY_ARGUMENT
+#ifndef _IGNITE_CACHE_QUERY_ARGUMENT
+#define _IGNITE_CACHE_QUERY_ARGUMENT
#include "gridgain/portable/portable_raw_writer.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
index 1d2fcaa..844c6bc 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_CACHE_QUERY_CURSOR
-#define _GRIDGAIN_CACHE_QUERY_CURSOR
+#ifndef _IGNITE_CACHE_QUERY_CURSOR
+#define _IGNITE_CACHE_QUERY_CURSOR
#include <vector>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_scan.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_scan.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_scan.h
index bda7fda..4a8aeff 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_scan.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_scan.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_CACHE_QUERY_SCAN
-#define _GRIDGAIN_CACHE_QUERY_SCAN
+#ifndef _IGNITE_CACHE_QUERY_SCAN
+#define _IGNITE_CACHE_QUERY_SCAN
#include <stdint.h>
#include <string>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_sql.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_sql.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_sql.h
index 5722452..089e775 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_sql.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_sql.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_CACHE_QUERY_SQL
-#define _GRIDGAIN_CACHE_QUERY_SQL
+#ifndef _IGNITE_CACHE_QUERY_SQL
+#define _IGNITE_CACHE_QUERY_SQL
#include <stdint.h>
#include <string>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_text.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_text.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_text.h
index 7860541..430ce60 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_text.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_text.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_CACHE_QUERY_TEXT
-#define _GRIDGAIN_CACHE_QUERY_TEXT
+#ifndef _IGNITE_CACHE_QUERY_TEXT
+#define _IGNITE_CACHE_QUERY_TEXT
#include <stdint.h>
#include <string>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/grid.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/grid.h b/modules/platform/src/main/cpp/core/include/gridgain/grid.h
index 6ce71ce..528a884 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/grid.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/grid.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_GRID
-#define _GRIDGAIN_GRID
+#ifndef _IGNITE_GRID
+#define _IGNITE_GRID
#include "gridgain/cache/cache.h"
#include "gridgain/impl/grid_impl.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/grid_configuration.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/grid_configuration.h b/modules/platform/src/main/cpp/core/include/gridgain/grid_configuration.h
index e7c0aa1..8940e32 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/grid_configuration.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/grid_configuration.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_GRID_CONFIGURATION
-#define _GRIDGAIN_GRID_CONFIGURATION
+#ifndef _IGNITE_GRID_CONFIGURATION
+#define _IGNITE_GRID_CONFIGURATION
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h b/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
index 85031bc..54e1f53 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_GRID_ERROR
-#define _GRIDGAIN_GRID_ERROR
+#ifndef _IGNITE_GRID_ERROR
+#define _IGNITE_GRID_ERROR
#include <sstream>
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/grid_factory.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/grid_factory.h b/modules/platform/src/main/cpp/core/include/gridgain/grid_factory.h
index 5df7aa2..909fcac 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/grid_factory.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/grid_factory.h
@@ -56,8 +56,8 @@
* fraud detection, big data analytics, social networks, online gaming, and bioinformatics.
*/
-#ifndef _GRIDGAIN_GRID_FACTORY
-#define _GRIDGAIN_GRID_FACTORY
+#ifndef _IGNITE_GRID_FACTORY
+#define _IGNITE_GRID_FACTORY
#include "gridgain/grid.h"
#include "gridgain/grid_configuration.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/guid.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/guid.h b/modules/platform/src/main/cpp/core/include/gridgain/guid.h
index f0fae26..51da8c4 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/guid.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/guid.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_GUID
-#define _GRIDGAIN_GUID
+#ifndef _IGNITE_GUID
+#define _IGNITE_GUID
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/cache_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/cache_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/cache_impl.h
index e61c858..0777ecc 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/cache_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/cache_impl.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_CACHE_IMPL
-#define _GRIDGAIN_CACHE_IMPL
+#ifndef _IGNITE_CACHE_IMPL
+#define _IGNITE_CACHE_IMPL
#include "gridgain/cache/query/query_scan.h"
#include "gridgain/cache/query/query_sql.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/query/query_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/query/query_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/query/query_impl.h
index dac418c..703a347 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/query/query_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/query/query_impl.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_CACHE_QUERY_IMPL
-#define _GRIDGAIN_CACHE_QUERY_IMPL
+#ifndef _IGNITE_CACHE_QUERY_IMPL
+#define _IGNITE_CACHE_QUERY_IMPL
#include <gridgain/impl/grid_environment.h>
#include <gridgain/grid_error.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_environment.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_environment.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_environment.h
index a8d6862..568e69f 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_environment.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_environment.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_GRID_ENVIRONMENT
-#define _GRIDGAIN_GRID_ENVIRONMENT
+#ifndef _IGNITE_GRID_ENVIRONMENT
+#define _IGNITE_GRID_ENVIRONMENT
#include <ignite/common/concurrent.h>
#include <ignite/common/java.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_impl.h
index 7347607..3a13105 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_impl.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_GRID_IMPL
-#define _GRIDGAIN_GRID_IMPL
+#ifndef _IGNITE_GRID_IMPL
+#define _IGNITE_GRID_IMPL
#include <ignite/common/concurrent.h>
#include <ignite/common/java.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/handle_registry.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/handle_registry.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/handle_registry.h
index d9224d9..b57722c 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/handle_registry.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/handle_registry.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_HANDLE_REGISTRY
-#define _GRIDGAIN_HANDLE_REGISTRY
+#ifndef _IGNITE_HANDLE_REGISTRY
+#define _IGNITE_HANDLE_REGISTRY
#include <map>
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop.h
index 5f79d9b..f9d3f6c 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_INTEROP
-#define _GRIDGAIN_IMPL_INTEROP
+#ifndef _IGNITE_IMPL_INTEROP
+#define _IGNITE_IMPL_INTEROP
#include "gridgain/impl/interop/interop_memory.h"
#include "gridgain/impl/interop/interop_output_stream.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_input_stream.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_input_stream.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_input_stream.h
index f593072..f1ca2f9 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_input_stream.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_input_stream.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_INTEROP_INPUT_STREAM
-#define _GRIDGAIN_IMPL_INTEROP_INPUT_STREAM
+#ifndef _IGNITE_IMPL_INTEROP_INPUT_STREAM
+#define _IGNITE_IMPL_INTEROP_INPUT_STREAM
#include "gridgain/impl/interop/interop_memory.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
index 638f8c2..2d9a86e 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_INTEROP_MEMORY
-#define _GRIDGAIN_IMPL_INTEROP_MEMORY
+#ifndef _IGNITE_IMPL_INTEROP_MEMORY
+#define _IGNITE_IMPL_INTEROP_MEMORY
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_output_stream.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_output_stream.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_output_stream.h
index e332ae8..cc31db2 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_output_stream.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_output_stream.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_INTEROP_OUTPUT_STREAM
-#define _GRIDGAIN_IMPL_INTEROP_OUTPUT_STREAM
+#ifndef _IGNITE_IMPL_INTEROP_OUTPUT_STREAM
+#define _IGNITE_IMPL_INTEROP_OUTPUT_STREAM
#include "gridgain/impl/interop/interop_memory.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/operations.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/operations.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/operations.h
index dcca51f..8e937cb 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/operations.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/operations.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_OPERATION
-#define _GRIDGAIN_IMPL_OPERATION
+#ifndef _IGNITE_IMPL_OPERATION
+#define _IGNITE_IMPL_OPERATION
#include <map>
#include <set>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
index 4e3ef68..1fd39fd 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_PORTABLE_COMMON
-#define _GRIDGAIN_IMPL_PORTABLE_COMMON
+#ifndef _IGNITE_IMPL_PORTABLE_COMMON
+#define _IGNITE_IMPL_PORTABLE_COMMON
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
index e976eff..72e9bb0 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_PORTABLE_ID_RESOLVER
-#define _GRIDGAIN_IMPL_PORTABLE_ID_RESOLVER
+#ifndef _IGNITE_IMPL_PORTABLE_ID_RESOLVER
+#define _IGNITE_IMPL_PORTABLE_ID_RESOLVER
#include "gridgain/portable/portable_type.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_handler.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_handler.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_handler.h
index a347743..bc38486 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_handler.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_handler.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_PORTABLE_METADATA_HANDLER
-#define _GRIDGAIN_IMPL_PORTABLE_METADATA_HANDLER
+#ifndef _IGNITE_IMPL_PORTABLE_METADATA_HANDLER
+#define _IGNITE_IMPL_PORTABLE_METADATA_HANDLER
#include <ignite/common/concurrent.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_manager.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_manager.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_manager.h
index c382aa6..eeab4d3 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_manager.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_manager.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_PORTABLE_METADATA_MANAGER
-#define _GRIDGAIN_IMPL_PORTABLE_METADATA_MANAGER
+#ifndef _IGNITE_IMPL_PORTABLE_METADATA_MANAGER
+#define _IGNITE_IMPL_PORTABLE_METADATA_MANAGER
#include <vector>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_snapshot.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_snapshot.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_snapshot.h
index e2e6871..68eba75 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_snapshot.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_snapshot.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_PORTABLE_METADATA_SNAPSHOT
-#define _GRIDGAIN_IMPL_PORTABLE_METADATA_SNAPSHOT
+#ifndef _IGNITE_IMPL_PORTABLE_METADATA_SNAPSHOT
+#define _IGNITE_IMPL_PORTABLE_METADATA_SNAPSHOT
#include <map>
#include <set>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater.h
index 8dd3958..8a1a615 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_PORTABLE_METADATA_UPDATER
-#define _GRIDGAIN_IMPL_PORTABLE_METADATA_UPDATER
+#ifndef _IGNITE_IMPL_PORTABLE_METADATA_UPDATER
+#define _IGNITE_IMPL_PORTABLE_METADATA_UPDATER
#include "gridgain/grid_error.h"
#include "gridgain/impl/portable/portable_metadata_snapshot.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater_impl.h
index 4665234..ae447d2 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater_impl.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_PORTABLE_METADATA_UPDATER_IMPL
-#define _GRIDGAIN_IMPL_PORTABLE_METADATA_UPDATER_IMPL
+#ifndef _IGNITE_IMPL_PORTABLE_METADATA_UPDATER_IMPL
+#define _IGNITE_IMPL_PORTABLE_METADATA_UPDATER_IMPL
#include <ignite/common/exports.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
index 34c00f8..119f6c9 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_PORTABLE_READER
-#define _GRIDGAIN_IMPL_PORTABLE_READER
+#ifndef _IGNITE_IMPL_PORTABLE_READER
+#define _IGNITE_IMPL_PORTABLE_READER
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_utils.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_utils.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_utils.h
index eaac89d..17a428f 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_utils.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_utils.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_PORTABLE_UTILS
-#define _GRIDGAIN_IMPL_PORTABLE_UTILS
+#ifndef _IGNITE_IMPL_PORTABLE_UTILS
+#define _IGNITE_IMPL_PORTABLE_UTILS
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
index d74f01d..d92a863 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_IMPL_PORTABLE_WRITER
-#define _GRIDGAIN_IMPL_PORTABLE_WRITER
+#ifndef _IGNITE_IMPL_PORTABLE_WRITER
+#define _IGNITE_IMPL_PORTABLE_WRITER
#include <cstring>
#include <string>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable.h
index 587698f..60d4311 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_PORTABLE
-#define _GRIDGAIN_PORTABLE
+#ifndef _IGNITE_PORTABLE
+#define _IGNITE_PORTABLE
#include "gridgain/portable/portable_consts.h"
#include "gridgain/portable/portable_containers.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
index 42af5ea..ef69d7f 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_PORTABLE_CONSTS
-#define _GRIDGAIN_PORTABLE_CONSTS
+#ifndef _IGNITE_PORTABLE_CONSTS
+#define _IGNITE_PORTABLE_CONSTS
#include <ignite/common/common.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_containers.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_containers.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_containers.h
index ad3fee1..02e9d3e 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_containers.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_containers.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_PORTABLE_CONTAINERS
-#define _GRIDGAIN_PORTABLE_CONTAINERS
+#ifndef _IGNITE_PORTABLE_CONTAINERS
+#define _IGNITE_PORTABLE_CONTAINERS
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_reader.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_reader.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_reader.h
index 97f4500..c26271f 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_reader.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_reader.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_PORTABLE_RAW_READER
-#define _GRIDGAIN_PORTABLE_RAW_READER
+#ifndef _IGNITE_PORTABLE_RAW_READER
+#define _IGNITE_PORTABLE_RAW_READER
#include <stdint.h>
#include <string>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
index 79f0d6d..5830e68 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_PORTABLE_RAW_WRITER
-#define _GRIDGAIN_PORTABLE_RAW_WRITER
+#ifndef _IGNITE_PORTABLE_RAW_WRITER
+#define _IGNITE_PORTABLE_RAW_WRITER
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_reader.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_reader.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_reader.h
index aecf252..2f49859 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_reader.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_reader.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_PORTABLE_READER
-#define _GRIDGAIN_PORTABLE_READER
+#ifndef _IGNITE_PORTABLE_READER
+#define _IGNITE_PORTABLE_READER
#include <stdint.h>
#include <string>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
index f1add9f..7068e51 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_PORTABLE_TYPE
-#define _GRIDGAIN_PORTABLE_TYPE
+#ifndef _IGNITE_PORTABLE_TYPE
+#define _IGNITE_PORTABLE_TYPE
#include <stdint.h>
http://git-wip-us.apache.org/repos/asf/ignite/blob/509dbd5a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
index 9a5c6d5..2a9c098 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _GRIDGAIN_PORTABLE_WRITER
-#define _GRIDGAIN_PORTABLE_WRITER
+#ifndef _IGNITE_PORTABLE_WRITER
+#define _IGNITE_PORTABLE_WRITER
#include <string>
#include <stdint.h>
[6/7] ignite git commit: IGNITE-1364: Renaming GG_ -> IGNITE_ (3)
Posted by vo...@apache.org.
IGNITE-1364: Renaming GG_ -> IGNITE_ (3)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/664a1050
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/664a1050
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/664a1050
Branch: refs/heads/ignite-1364
Commit: 664a1050e454d083443b5973955ec6f94f69d200
Parents: 96245bf
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 3 13:08:38 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 3 13:08:38 2015 +0300
----------------------------------------------------------------------
.../cpp/core-test/project/vs/core-test.vcxproj | 8 +++---
.../core/os/linux/include/gridgain/impl/utils.h | 26 ++++++++++----------
.../core/os/win/include/gridgain/impl/utils.h | 26 ++++++++++----------
.../src/main/cpp/core/project/vs/core.vcxproj | 8 +++---
.../main/cpp/core/project/vs/core.vcxprojrel | 8 +++---
5 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/664a1050/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 cc7704f..52def17 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
@@ -109,7 +109,7 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;GG_FRIEND;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
</ClCompile>
<Link>
@@ -124,7 +124,7 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;GG_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
</ClCompile>
<Link>
@@ -140,7 +140,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;GG_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
</ClCompile>
<Link>
@@ -158,7 +158,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;GG_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
</ClCompile>
<Link>
http://git-wip-us.apache.org/repos/asf/ignite/blob/664a1050/modules/platform/src/main/cpp/core/os/linux/include/gridgain/impl/utils.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/os/linux/include/gridgain/impl/utils.h b/modules/platform/src/main/cpp/core/os/linux/include/gridgain/impl/utils.h
index c87b345..5cbd6cf 100644
--- a/modules/platform/src/main/cpp/core/os/linux/include/gridgain/impl/utils.h
+++ b/modules/platform/src/main/cpp/core/os/linux/include/gridgain/impl/utils.h
@@ -23,10 +23,10 @@
#include <ignite/common/common.h>
-#ifdef GG_FRIEND
- #define GG_FRIEND_EXPORT IGNITE_EXPORT
+#ifdef IGNITE_FRIEND
+ #define IGNITE_FRIEND_EXPORT IGNITE_EXPORT
#else
- #define GG_FRIEND_EXPORT
+ #define IGNITE_FRIEND_EXPORT
#endif
namespace gridgain
@@ -41,14 +41,14 @@ namespace gridgain
* @param val Value.
* @return Result.
*/
- GG_FRIEND_EXPORT char* CopyChars(const char* val);
+ IGNITE_FRIEND_EXPORT char* CopyChars(const char* val);
/**
* Release characters.
*
* @param val Value.
*/
- GG_FRIEND_EXPORT void ReleaseChars(char* val);
+ IGNITE_FRIEND_EXPORT void ReleaseChars(char* val);
/**
* Read system environment variable taking thread-safety in count.
@@ -57,7 +57,7 @@ namespace gridgain
* @param found Whether environment variable with such name was found.
* @return Environment variable value.
*/
- GG_FRIEND_EXPORT std::string GetEnv(const std::string& name, bool* found);
+ IGNITE_FRIEND_EXPORT std::string GetEnv(const std::string& name, bool* found);
/**
* Ensure that file on the given path exists in the system.
@@ -65,7 +65,7 @@ namespace gridgain
* @param path Path.
* @return True if file exists, false otherwise.
*/
- GG_FRIEND_EXPORT bool FileExists(const std::string& path);
+ IGNITE_FRIEND_EXPORT bool FileExists(const std::string& path);
/**
* Attempts to find JVM library to load it into the process later.
@@ -76,7 +76,7 @@ namespace gridgain
* @param found Whether library was found.
* @return Path to the file.
*/
- GG_FRIEND_EXPORT std::string FindJvmLibrary(const std::string* path, bool* found);
+ IGNITE_FRIEND_EXPORT std::string FindJvmLibrary(const std::string* path, bool* found);
/**
* Load JVM library into the process.
@@ -84,7 +84,7 @@ namespace gridgain
* @param path Optional path to the library.
* @return Whether load was successful.
*/
- GG_FRIEND_EXPORT bool LoadJvmLibrary(const std::string& path);
+ IGNITE_FRIEND_EXPORT bool LoadJvmLibrary(const std::string& path);
/**
* Resolve GRIDGAIN_HOME directory. Resolution is performed in several
@@ -100,7 +100,7 @@ namespace gridgain
* @param found Whether GRIDGAIN_HOME home was found.
* @return Resolved GG home.
*/
- GG_FRIEND_EXPORT std::string ResolveGridGainHome(const std::string* path, bool* found);
+ IGNITE_FRIEND_EXPORT std::string ResolveGridGainHome(const std::string* path, bool* found);
/**
* Create GridGain classpath based on user input and home directory.
@@ -109,7 +109,7 @@ namespace gridgain
* @param home GridGain home directory.
* @return Classpath.
*/
- GG_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home);
+ IGNITE_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home);
/**
* Create GridGain classpath based on user input and home directory.
@@ -119,13 +119,13 @@ namespace gridgain
* @param test Whether test classpath must be used.
* @return Classpath.
*/
- GG_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home, bool test);
+ IGNITE_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home, bool test);
/**
* Safe array which automatically reclaims occupied memory when out of scope.
*/
template<typename T>
- struct GG_FRIEND_EXPORT SafeArray
+ struct IGNITE_FRIEND_EXPORT SafeArray
{
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/ignite/blob/664a1050/modules/platform/src/main/cpp/core/os/win/include/gridgain/impl/utils.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/os/win/include/gridgain/impl/utils.h b/modules/platform/src/main/cpp/core/os/win/include/gridgain/impl/utils.h
index d261f8a..3ad40b7 100644
--- a/modules/platform/src/main/cpp/core/os/win/include/gridgain/impl/utils.h
+++ b/modules/platform/src/main/cpp/core/os/win/include/gridgain/impl/utils.h
@@ -23,10 +23,10 @@
#include <ignite/common/common.h>
-#ifdef GG_FRIEND
- #define GG_FRIEND_EXPORT IGNITE_EXPORT
+#ifdef IGNITE_FRIEND
+ #define IGNITE_FRIEND_EXPORT IGNITE_EXPORT
#else
- #define GG_FRIEND_EXPORT
+ #define IGNITE_FRIEND_EXPORT
#endif
namespace gridgain
@@ -41,14 +41,14 @@ namespace gridgain
* @param val Value.
* @return Result.
*/
- GG_FRIEND_EXPORT char* CopyChars(const char* val);
+ IGNITE_FRIEND_EXPORT char* CopyChars(const char* val);
/**
* Release characters.
*
* @param val Value.
*/
- GG_FRIEND_EXPORT void ReleaseChars(char* val);
+ IGNITE_FRIEND_EXPORT void ReleaseChars(char* val);
/**
* Read system environment variable taking thread-safety in count.
@@ -57,7 +57,7 @@ namespace gridgain
* @param found Whether environment variable with such name was found.
* @return Environment variable value.
*/
- GG_FRIEND_EXPORT std::string GetEnv(const std::string& name, bool* found);
+ IGNITE_FRIEND_EXPORT std::string GetEnv(const std::string& name, bool* found);
/**
* Ensure that file on the given path exists in the system.
@@ -65,7 +65,7 @@ namespace gridgain
* @param path Path.
* @return True if file exists, false otherwise.
*/
- GG_FRIEND_EXPORT bool FileExists(const std::string& path);
+ IGNITE_FRIEND_EXPORT bool FileExists(const std::string& path);
/**
* Attempts to find JVM library to load it into the process later.
@@ -76,7 +76,7 @@ namespace gridgain
* @param found Whether library was found.
* @return Path to the file.
*/
- GG_FRIEND_EXPORT std::string FindJvmLibrary(const std::string* path, bool* found);
+ IGNITE_FRIEND_EXPORT std::string FindJvmLibrary(const std::string* path, bool* found);
/**
* Load JVM library into the process.
@@ -84,7 +84,7 @@ namespace gridgain
* @param path Optional path to the library.
* @return Whether load was successful.
*/
- GG_FRIEND_EXPORT bool LoadJvmLibrary(const std::string& path);
+ IGNITE_FRIEND_EXPORT bool LoadJvmLibrary(const std::string& path);
/**
* Resolve GRIDGAIN_HOME directory. Resolution is performed in several
@@ -100,7 +100,7 @@ namespace gridgain
* @param found Whether GRIDGAIN_HOME home was found.
* @return Resolved GG home.
*/
- GG_FRIEND_EXPORT std::string ResolveGridGainHome(const std::string* path, bool* found);
+ IGNITE_FRIEND_EXPORT std::string ResolveGridGainHome(const std::string* path, bool* found);
/**
* Create GridGain classpath based on user input and home directory.
@@ -109,7 +109,7 @@ namespace gridgain
* @param home GridGain home directory.
* @return Classpath.
*/
- GG_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home);
+ IGNITE_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home);
/**
* Create GridGain classpath based on user input and home directory.
@@ -119,13 +119,13 @@ namespace gridgain
* @param test Whether test classpath must be used.
* @return Classpath.
*/
- GG_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home, bool test);
+ IGNITE_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home, bool test);
/**
* Safe array which automatically reclaims occupied memory when out of scope.
*/
template<typename T>
- struct GG_FRIEND_EXPORT SafeArray
+ struct IGNITE_FRIEND_EXPORT SafeArray
{
/** Target array. */
T* target;
http://git-wip-us.apache.org/repos/asf/ignite/blob/664a1050/modules/platform/src/main/cpp/core/project/vs/core.vcxproj
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/project/vs/core.vcxproj b/modules/platform/src/main/cpp/core/project/vs/core.vcxproj
index 4f9bfaf..78eb949 100644
--- a/modules/platform/src/main/cpp/core/project/vs/core.vcxproj
+++ b/modules/platform/src/main/cpp/core/project/vs/core.vcxproj
@@ -99,7 +99,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
@@ -127,7 +127,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
@@ -153,7 +153,7 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -177,7 +177,7 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
http://git-wip-us.apache.org/repos/asf/ignite/blob/664a1050/modules/platform/src/main/cpp/core/project/vs/core.vcxprojrel
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/project/vs/core.vcxprojrel b/modules/platform/src/main/cpp/core/project/vs/core.vcxprojrel
index 4f9bfaf..78eb949 100644
--- a/modules/platform/src/main/cpp/core/project/vs/core.vcxprojrel
+++ b/modules/platform/src/main/cpp/core/project/vs/core.vcxprojrel
@@ -99,7 +99,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
@@ -127,7 +127,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
@@ -153,7 +153,7 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -177,7 +177,7 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
[4/7] ignite git commit: IGNITE-1364: Renaming GG_ -> IGNITE_
Posted by vo...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
index 0bc2d56..16bd990 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
@@ -50,17 +50,17 @@ namespace gridgain
void PortableWriterImpl::WriteInt8Array(const int8_t* val, const int32_t len)
{
- WritePrimitiveArrayRaw<int8_t>(val, len, PortableUtils::WriteInt8Array, GG_TYPE_ARRAY_BYTE);
+ WritePrimitiveArrayRaw<int8_t>(val, len, PortableUtils::WriteInt8Array, IGNITE_TYPE_ARRAY_BYTE);
}
void PortableWriterImpl::WriteInt8(const char* fieldName, const int8_t val)
{
- WritePrimitive<int8_t>(fieldName, val, PortableUtils::WriteInt8, GG_TYPE_BYTE, 1);
+ WritePrimitive<int8_t>(fieldName, val, PortableUtils::WriteInt8, IGNITE_TYPE_BYTE, 1);
}
void PortableWriterImpl::WriteInt8Array(const char* fieldName, const int8_t* val, const int32_t len)
{
- WritePrimitiveArray<int8_t>(fieldName, val, len, PortableUtils::WriteInt8Array, GG_TYPE_ARRAY_BYTE, 0);
+ WritePrimitiveArray<int8_t>(fieldName, val, len, PortableUtils::WriteInt8Array, IGNITE_TYPE_ARRAY_BYTE, 0);
}
void PortableWriterImpl::WriteBool(const bool val)
@@ -70,17 +70,17 @@ namespace gridgain
void PortableWriterImpl::WriteBoolArray(const bool* val, const int32_t len)
{
- WritePrimitiveArrayRaw<bool>(val, len, PortableUtils::WriteBoolArray, GG_TYPE_ARRAY_BOOL);
+ WritePrimitiveArrayRaw<bool>(val, len, PortableUtils::WriteBoolArray, IGNITE_TYPE_ARRAY_BOOL);
}
void PortableWriterImpl::WriteBool(const char* fieldName, const bool val)
{
- WritePrimitive<bool>(fieldName, val, PortableUtils::WriteBool, GG_TYPE_BOOL, 1);
+ WritePrimitive<bool>(fieldName, val, PortableUtils::WriteBool, IGNITE_TYPE_BOOL, 1);
}
void PortableWriterImpl::WriteBoolArray(const char* fieldName, const bool* val, const int32_t len)
{
- WritePrimitiveArray<bool>(fieldName, val, len, PortableUtils::WriteBoolArray, GG_TYPE_ARRAY_BOOL, 0);
+ WritePrimitiveArray<bool>(fieldName, val, len, PortableUtils::WriteBoolArray, IGNITE_TYPE_ARRAY_BOOL, 0);
}
void PortableWriterImpl::WriteInt16(const int16_t val)
@@ -90,17 +90,17 @@ namespace gridgain
void PortableWriterImpl::WriteInt16Array(const int16_t* val, const int32_t len)
{
- WritePrimitiveArrayRaw<int16_t>(val, len, PortableUtils::WriteInt16Array, GG_TYPE_ARRAY_SHORT);
+ WritePrimitiveArrayRaw<int16_t>(val, len, PortableUtils::WriteInt16Array, IGNITE_TYPE_ARRAY_SHORT);
}
void PortableWriterImpl::WriteInt16(const char* fieldName, const int16_t val)
{
- WritePrimitive<int16_t>(fieldName, val, PortableUtils::WriteInt16, GG_TYPE_SHORT, 2);
+ WritePrimitive<int16_t>(fieldName, val, PortableUtils::WriteInt16, IGNITE_TYPE_SHORT, 2);
}
void PortableWriterImpl::WriteInt16Array(const char* fieldName, const int16_t* val, const int32_t len)
{
- WritePrimitiveArray<int16_t>(fieldName, val, len, PortableUtils::WriteInt16Array, GG_TYPE_ARRAY_SHORT, 1);
+ WritePrimitiveArray<int16_t>(fieldName, val, len, PortableUtils::WriteInt16Array, IGNITE_TYPE_ARRAY_SHORT, 1);
}
void PortableWriterImpl::WriteUInt16(const uint16_t val)
@@ -110,17 +110,17 @@ namespace gridgain
void PortableWriterImpl::WriteUInt16Array(const uint16_t* val, const int32_t len)
{
- WritePrimitiveArrayRaw<uint16_t>(val, len, PortableUtils::WriteUInt16Array, GG_TYPE_ARRAY_CHAR);
+ WritePrimitiveArrayRaw<uint16_t>(val, len, PortableUtils::WriteUInt16Array, IGNITE_TYPE_ARRAY_CHAR);
}
void PortableWriterImpl::WriteUInt16(const char* fieldName, const uint16_t val)
{
- WritePrimitive<uint16_t>(fieldName, val, PortableUtils::WriteUInt16, GG_TYPE_CHAR, 2);
+ WritePrimitive<uint16_t>(fieldName, val, PortableUtils::WriteUInt16, IGNITE_TYPE_CHAR, 2);
}
void PortableWriterImpl::WriteUInt16Array(const char* fieldName, const uint16_t* val, const int32_t len)
{
- WritePrimitiveArray<uint16_t>(fieldName, val, len, PortableUtils::WriteUInt16Array, GG_TYPE_ARRAY_CHAR, 1);
+ WritePrimitiveArray<uint16_t>(fieldName, val, len, PortableUtils::WriteUInt16Array, IGNITE_TYPE_ARRAY_CHAR, 1);
}
void PortableWriterImpl::WriteInt32(const int32_t val)
@@ -130,17 +130,17 @@ namespace gridgain
void PortableWriterImpl::WriteInt32Array(const int32_t* val, const int32_t len)
{
- WritePrimitiveArrayRaw<int32_t>(val, len, PortableUtils::WriteInt32Array, GG_TYPE_ARRAY_INT);
+ WritePrimitiveArrayRaw<int32_t>(val, len, PortableUtils::WriteInt32Array, IGNITE_TYPE_ARRAY_INT);
}
void PortableWriterImpl::WriteInt32(const char* fieldName, const int32_t val)
{
- WritePrimitive<int32_t>(fieldName, val, PortableUtils::WriteInt32, GG_TYPE_INT, 4);
+ WritePrimitive<int32_t>(fieldName, val, PortableUtils::WriteInt32, IGNITE_TYPE_INT, 4);
}
void PortableWriterImpl::WriteInt32Array(const char* fieldName, const int32_t* val, const int32_t len)
{
- WritePrimitiveArray<int32_t>(fieldName, val, len, PortableUtils::WriteInt32Array, GG_TYPE_ARRAY_INT, 2);
+ WritePrimitiveArray<int32_t>(fieldName, val, len, PortableUtils::WriteInt32Array, IGNITE_TYPE_ARRAY_INT, 2);
}
void PortableWriterImpl::WriteInt64(const int64_t val)
@@ -150,17 +150,17 @@ namespace gridgain
void PortableWriterImpl::WriteInt64Array(const int64_t* val, const int32_t len)
{
- WritePrimitiveArrayRaw<int64_t>(val, len, PortableUtils::WriteInt64Array, GG_TYPE_ARRAY_LONG);
+ WritePrimitiveArrayRaw<int64_t>(val, len, PortableUtils::WriteInt64Array, IGNITE_TYPE_ARRAY_LONG);
}
void PortableWriterImpl::WriteInt64(const char* fieldName, const int64_t val)
{
- WritePrimitive<int64_t>(fieldName, val, PortableUtils::WriteInt64, GG_TYPE_LONG, 8);
+ WritePrimitive<int64_t>(fieldName, val, PortableUtils::WriteInt64, IGNITE_TYPE_LONG, 8);
}
void PortableWriterImpl::WriteInt64Array(const char* fieldName, const int64_t* val, const int32_t len)
{
- WritePrimitiveArray<int64_t>(fieldName, val, len, PortableUtils::WriteInt64Array, GG_TYPE_ARRAY_LONG, 3);
+ WritePrimitiveArray<int64_t>(fieldName, val, len, PortableUtils::WriteInt64Array, IGNITE_TYPE_ARRAY_LONG, 3);
}
void PortableWriterImpl::WriteFloat(const float val)
@@ -170,17 +170,17 @@ namespace gridgain
void PortableWriterImpl::WriteFloatArray(const float* val, const int32_t len)
{
- WritePrimitiveArrayRaw<float>(val, len, PortableUtils::WriteFloatArray, GG_TYPE_ARRAY_FLOAT);
+ WritePrimitiveArrayRaw<float>(val, len, PortableUtils::WriteFloatArray, IGNITE_TYPE_ARRAY_FLOAT);
}
void PortableWriterImpl::WriteFloat(const char* fieldName, const float val)
{
- WritePrimitive<float>(fieldName, val, PortableUtils::WriteFloat, GG_TYPE_FLOAT, 4);
+ WritePrimitive<float>(fieldName, val, PortableUtils::WriteFloat, IGNITE_TYPE_FLOAT, 4);
}
void PortableWriterImpl::WriteFloatArray(const char* fieldName, const float* val, const int32_t len)
{
- WritePrimitiveArray<float>(fieldName, val, len, PortableUtils::WriteFloatArray, GG_TYPE_ARRAY_FLOAT, 2);
+ WritePrimitiveArray<float>(fieldName, val, len, PortableUtils::WriteFloatArray, IGNITE_TYPE_ARRAY_FLOAT, 2);
}
void PortableWriterImpl::WriteDouble(const double val)
@@ -190,17 +190,17 @@ namespace gridgain
void PortableWriterImpl::WriteDoubleArray(const double* val, const int32_t len)
{
- WritePrimitiveArrayRaw<double>(val, len, PortableUtils::WriteDoubleArray, GG_TYPE_ARRAY_DOUBLE);
+ WritePrimitiveArrayRaw<double>(val, len, PortableUtils::WriteDoubleArray, IGNITE_TYPE_ARRAY_DOUBLE);
}
void PortableWriterImpl::WriteDouble(const char* fieldName, const double val)
{
- WritePrimitive<double>(fieldName, val, PortableUtils::WriteDouble, GG_TYPE_DOUBLE, 8);
+ WritePrimitive<double>(fieldName, val, PortableUtils::WriteDouble, IGNITE_TYPE_DOUBLE, 8);
}
void PortableWriterImpl::WriteDoubleArray(const char* fieldName, const double* val, const int32_t len)
{
- WritePrimitiveArray<double>(fieldName, val, len, PortableUtils::WriteDoubleArray, GG_TYPE_ARRAY_DOUBLE, 3);
+ WritePrimitiveArray<double>(fieldName, val, len, PortableUtils::WriteDoubleArray, IGNITE_TYPE_ARRAY_DOUBLE, 3);
}
void PortableWriterImpl::WriteGuid(const Guid val)
@@ -208,7 +208,7 @@ namespace gridgain
CheckRawMode(true);
CheckSingleMode(true);
- stream->WriteInt8(GG_TYPE_UUID);
+ stream->WriteInt8(IGNITE_TYPE_UUID);
PortableUtils::WriteGuid(stream, val);
}
@@ -220,19 +220,19 @@ namespace gridgain
if (val)
{
- stream->WriteInt8(GG_TYPE_ARRAY_UUID);
+ stream->WriteInt8(IGNITE_TYPE_ARRAY_UUID);
stream->WriteInt32(len);
for (int i = 0; i < len; i++)
{
Guid elem = *(val + i);
- stream->WriteInt8(GG_TYPE_UUID);
+ stream->WriteInt8(IGNITE_TYPE_UUID);
PortableUtils::WriteGuid(stream, elem);
}
}
else
- stream->WriteInt8(GG_HDR_NULL);
+ stream->WriteInt8(IGNITE_HDR_NULL);
}
void PortableWriterImpl::WriteGuid(const char* fieldName, const Guid val)
@@ -240,9 +240,9 @@ namespace gridgain
CheckRawMode(false);
CheckSingleMode(true);
- WriteFieldIdAndLength(fieldName, GG_TYPE_UUID, 1 + 16);
+ WriteFieldIdAndLength(fieldName, IGNITE_TYPE_UUID, 1 + 16);
- stream->WriteInt8(GG_TYPE_UUID);
+ stream->WriteInt8(IGNITE_TYPE_UUID);
PortableUtils::WriteGuid(stream, val);
}
@@ -252,12 +252,12 @@ namespace gridgain
CheckRawMode(false);
CheckSingleMode(true);
- WriteFieldId(fieldName, GG_TYPE_ARRAY_UUID);
+ WriteFieldId(fieldName, IGNITE_TYPE_ARRAY_UUID);
if (val)
{
stream->WriteInt32(5 + len * 17);
- stream->WriteInt8(GG_TYPE_ARRAY_UUID);
+ stream->WriteInt8(IGNITE_TYPE_ARRAY_UUID);
stream->WriteInt32(len);
for (int i = 0; i < len; i++)
@@ -270,7 +270,7 @@ namespace gridgain
else
{
stream->WriteInt32(1);
- stream->WriteInt8(GG_HDR_NULL);
+ stream->WriteInt8(IGNITE_HDR_NULL);
}
}
@@ -281,12 +281,12 @@ namespace gridgain
if (val)
{
- stream->WriteInt8(GG_TYPE_STRING);
+ stream->WriteInt8(IGNITE_TYPE_STRING);
PortableUtils::WriteString(stream, val, len);
}
else
- stream->WriteInt8(GG_HDR_NULL);
+ stream->WriteInt8(IGNITE_HDR_NULL);
}
void PortableWriterImpl::WriteString(const char* fieldName, const char* val, const int32_t len)
@@ -294,14 +294,14 @@ namespace gridgain
CheckRawMode(false);
CheckSingleMode(true);
- WriteFieldId(fieldName, GG_TYPE_STRING);
+ WriteFieldId(fieldName, IGNITE_TYPE_STRING);
if (val)
{
int32_t lenPos = stream->Position();
stream->Position(lenPos + 4);
- stream->WriteInt8(GG_TYPE_STRING);
+ stream->WriteInt8(IGNITE_TYPE_STRING);
stream->WriteBool(false);
stream->WriteInt32(len);
@@ -313,7 +313,7 @@ namespace gridgain
else
{
stream->WriteInt32(1);
- stream->WriteInt8(GG_HDR_NULL);
+ stream->WriteInt8(IGNITE_HDR_NULL);
}
}
@@ -321,7 +321,7 @@ namespace gridgain
{
StartContainerSession(true);
- stream->WriteInt8(GG_TYPE_ARRAY_STRING);
+ stream->WriteInt8(IGNITE_TYPE_ARRAY_STRING);
stream->Position(stream->Position() + 4);
return elemId;
@@ -331,9 +331,9 @@ namespace gridgain
{
StartContainerSession(false);
- WriteFieldIdSkipLength(fieldName, GG_TYPE_ARRAY_STRING);
+ WriteFieldIdSkipLength(fieldName, IGNITE_TYPE_ARRAY_STRING);
- stream->WriteInt8(GG_TYPE_ARRAY_STRING);
+ stream->WriteInt8(IGNITE_TYPE_ARRAY_STRING);
stream->Position(stream->Position() + 4);
return elemId;
@@ -345,12 +345,12 @@ namespace gridgain
if (val)
{
- stream->WriteInt8(GG_TYPE_STRING);
+ stream->WriteInt8(IGNITE_TYPE_STRING);
PortableUtils::WriteString(stream, val, len);
}
else
- stream->WriteInt8(GG_HDR_NULL);
+ stream->WriteInt8(IGNITE_HDR_NULL);
elemCnt++;
}
@@ -360,7 +360,7 @@ namespace gridgain
CheckRawMode(true);
CheckSingleMode(true);
- stream->WriteInt8(GG_HDR_NULL);
+ stream->WriteInt8(IGNITE_HDR_NULL);
}
void PortableWriterImpl::WriteNull(const char* fieldName)
@@ -368,15 +368,15 @@ namespace gridgain
CheckRawMode(false);
CheckSingleMode(true);
- WriteFieldIdAndLength(fieldName, GG_TYPE_OBJECT, 1);
- stream->WriteInt8(GG_HDR_NULL);
+ WriteFieldIdAndLength(fieldName, IGNITE_TYPE_OBJECT, 1);
+ stream->WriteInt8(IGNITE_HDR_NULL);
}
int32_t PortableWriterImpl::WriteArray()
{
StartContainerSession(true);
- stream->WriteInt8(GG_TYPE_ARRAY);
+ stream->WriteInt8(IGNITE_TYPE_ARRAY);
stream->Position(stream->Position() + 4);
return elemId;
@@ -386,9 +386,9 @@ namespace gridgain
{
StartContainerSession(false);
- WriteFieldIdSkipLength(fieldName, GG_TYPE_ARRAY);
+ WriteFieldIdSkipLength(fieldName, IGNITE_TYPE_ARRAY);
- stream->WriteInt8(GG_TYPE_ARRAY);
+ stream->WriteInt8(IGNITE_TYPE_ARRAY);
stream->Position(stream->Position() + 4);
return elemId;
@@ -398,7 +398,7 @@ namespace gridgain
{
StartContainerSession(true);
- stream->WriteInt8(GG_TYPE_COLLECTION);
+ stream->WriteInt8(IGNITE_TYPE_COLLECTION);
stream->Position(stream->Position() + 4);
stream->WriteInt8(typ);
@@ -409,9 +409,9 @@ namespace gridgain
{
StartContainerSession(false);
- WriteFieldIdSkipLength(fieldName, GG_TYPE_COLLECTION);
+ WriteFieldIdSkipLength(fieldName, IGNITE_TYPE_COLLECTION);
- stream->WriteInt8(GG_TYPE_COLLECTION);
+ stream->WriteInt8(IGNITE_TYPE_COLLECTION);
stream->Position(stream->Position() + 4);
stream->WriteInt8(typ);
@@ -422,7 +422,7 @@ namespace gridgain
{
StartContainerSession(true);
- stream->WriteInt8(GG_TYPE_MAP);
+ stream->WriteInt8(IGNITE_TYPE_MAP);
stream->Position(stream->Position() + 4);
stream->WriteInt8(typ);
@@ -433,9 +433,9 @@ namespace gridgain
{
StartContainerSession(false);
- WriteFieldIdSkipLength(fieldName, GG_TYPE_MAP);
+ WriteFieldIdSkipLength(fieldName, IGNITE_TYPE_MAP);
- stream->WriteInt8(GG_TYPE_MAP);
+ stream->WriteInt8(IGNITE_TYPE_MAP);
stream->Position(stream->Position() + 4);
stream->WriteInt8(typ);
@@ -479,20 +479,20 @@ namespace gridgain
bool rawMode = rawPos != -1;
if (expected && !rawMode) {
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only in raw mode.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only in raw mode.");
}
else if (!expected && rawMode) {
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed in raw mode.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed in raw mode.");
}
}
void PortableWriterImpl::CheckSingleMode(bool expected)
{
if (expected && elemId != 0) {
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed when container is being written.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed when container is being written.");
}
else if (!expected && elemId == 0) {
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only when container is being written.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only when container is being written.");
}
}
@@ -509,7 +509,7 @@ namespace gridgain
{
if (elemId != expSes)
{
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Containter write session has been finished or is not started yet.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Containter write session has been finished or is not started yet.");
}
}
@@ -540,55 +540,55 @@ namespace gridgain
template <>
void PortableWriterImpl::WriteTopObject<int8_t>(const int8_t& obj)
{
- WriteTopObject0<int8_t>(obj, PortableUtils::WriteInt8, GG_TYPE_BYTE);
+ WriteTopObject0<int8_t>(obj, PortableUtils::WriteInt8, IGNITE_TYPE_BYTE);
}
template <>
void PortableWriterImpl::WriteTopObject<bool>(const bool& obj)
{
- WriteTopObject0<bool>(obj, PortableUtils::WriteBool, GG_TYPE_BOOL);
+ WriteTopObject0<bool>(obj, PortableUtils::WriteBool, IGNITE_TYPE_BOOL);
}
template <>
void PortableWriterImpl::WriteTopObject<int16_t>(const int16_t& obj)
{
- WriteTopObject0<int16_t>(obj, PortableUtils::WriteInt16, GG_TYPE_SHORT);
+ WriteTopObject0<int16_t>(obj, PortableUtils::WriteInt16, IGNITE_TYPE_SHORT);
}
template <>
void PortableWriterImpl::WriteTopObject<uint16_t>(const uint16_t& obj)
{
- WriteTopObject0<uint16_t>(obj, PortableUtils::WriteUInt16, GG_TYPE_CHAR);
+ WriteTopObject0<uint16_t>(obj, PortableUtils::WriteUInt16, IGNITE_TYPE_CHAR);
}
template <>
void PortableWriterImpl::WriteTopObject<int32_t>(const int32_t& obj)
{
- WriteTopObject0<int32_t>(obj, PortableUtils::WriteInt32, GG_TYPE_INT);
+ WriteTopObject0<int32_t>(obj, PortableUtils::WriteInt32, IGNITE_TYPE_INT);
}
template <>
void PortableWriterImpl::WriteTopObject<int64_t>(const int64_t& obj)
{
- WriteTopObject0<int64_t>(obj, PortableUtils::WriteInt64, GG_TYPE_LONG);
+ WriteTopObject0<int64_t>(obj, PortableUtils::WriteInt64, IGNITE_TYPE_LONG);
}
template <>
void PortableWriterImpl::WriteTopObject<float>(const float& obj)
{
- WriteTopObject0<float>(obj, PortableUtils::WriteFloat, GG_TYPE_FLOAT);
+ WriteTopObject0<float>(obj, PortableUtils::WriteFloat, IGNITE_TYPE_FLOAT);
}
template <>
void PortableWriterImpl::WriteTopObject<double>(const double& obj)
{
- WriteTopObject0<double>(obj, PortableUtils::WriteDouble, GG_TYPE_DOUBLE);
+ WriteTopObject0<double>(obj, PortableUtils::WriteDouble, IGNITE_TYPE_DOUBLE);
}
template <>
void PortableWriterImpl::WriteTopObject<Guid>(const Guid& obj)
{
- WriteTopObject0<Guid>(obj, PortableUtils::WriteGuid, GG_TYPE_UUID);
+ WriteTopObject0<Guid>(obj, PortableUtils::WriteGuid, IGNITE_TYPE_UUID);
}
InteropOutputStream* PortableWriterImpl::GetStream()
[3/7] ignite git commit: IGNITE-1364: Renaming GG_ -> IGNITE_
Posted by vo...@apache.org.
IGNITE-1364: Renaming GG_ -> IGNITE_
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c4165ee
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c4165ee
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c4165ee
Branch: refs/heads/ignite-1364
Commit: 7c4165eebb4a7965baba808708e03e489916813f
Parents: 509dbd5
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 3 12:59:03 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 3 12:59:03 2015 +0300
----------------------------------------------------------------------
.../main/cpp/core-test/src/cache_query_test.cpp | 8 +-
.../src/main/cpp/core-test/src/cache_test.cpp | 30 ++---
.../cpp/core-test/src/grid_factory_test.cpp | 12 +-
.../src/portable_reader_writer_raw_test.cpp | 98 +++++++--------
.../src/portable_reader_writer_test.cpp | 126 +++++++++----------
.../cpp/core/include/gridgain/cache/cache.h | 12 +-
.../include/gridgain/cache/cache_peek_mode.h | 20 +--
.../include/gridgain/cache/query/query_cursor.h | 8 +-
.../main/cpp/core/include/gridgain/grid_error.h | 74 +++++------
.../gridgain/impl/interop/interop_memory.h | 14 +--
.../impl/portable/portable_id_resolver.h | 2 +-
.../impl/portable/portable_reader_impl.h | 10 +-
.../include/gridgain/portable/portable_type.h | 10 +-
.../src/main/cpp/core/src/grid_error.cpp | 70 +++++------
.../src/main/cpp/core/src/grid_factory.cpp | 24 ++--
.../main/cpp/core/src/impl/cache/cache_impl.cpp | 2 +-
.../core/src/impl/cache/query/query_impl.cpp | 12 +-
.../src/impl/interop/interop_input_stream.cpp | 4 +-
.../core/src/impl/interop/interop_memory.cpp | 24 ++--
.../src/impl/portable/portable_reader_impl.cpp | 14 +--
.../src/impl/portable/portable_writer_impl.cpp | 10 +-
21 files changed, 292 insertions(+), 292 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/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 de4a8b2..5f3d79b 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
@@ -205,7 +205,7 @@ struct CacheQueryTestSuiteFixture {
Grid grid0 = GridFactory::Start(cfg, &err);
- if (err.GetCode() != GridError::GG_SUCCESS)
+ if (err.GetCode() != GridError::IGNITE_SUCCESS)
BOOST_ERROR(err.GetText());
grid = grid0;
@@ -235,7 +235,7 @@ void CheckHasNextFail(QueryCursor<int, QueryPerson>& cur)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_GENERIC);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_GENERIC);
}
}
@@ -254,7 +254,7 @@ void CheckGetNextFail(QueryCursor<int, QueryPerson>& cur)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_GENERIC);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_GENERIC);
}
}
@@ -275,7 +275,7 @@ void CheckGetAllFail(QueryCursor<int, QueryPerson>& cur)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_GENERIC);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_GENERIC);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/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 a531252..134c118 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
@@ -117,7 +117,7 @@ struct CacheTestSuiteFixture {
Grid grid = GridFactory::Start(cfg, stream.str().c_str(), &err);
- if (err.GetCode() != GridError::GG_SUCCESS)
+ if (err.GetCode() != GridError::IGNITE_SUCCESS)
BOOST_FAIL(err.GetText());
if (i == 0)
@@ -150,13 +150,13 @@ BOOST_AUTO_TEST_CASE(TestRemoveAllKeys)
cache.Put(2, 2);
cache.Put(3, 3);
- int size = cache.Size(cache::GG_PEEK_MODE_PRIMARY);
+ int size = cache.Size(cache::IGNITE_PEEK_MODE_PRIMARY);
BOOST_REQUIRE(3 == size);
cache.RemoveAll();
- size = cache.Size(cache::GG_PEEK_MODE_ALL);
+ size = cache.Size(cache::IGNITE_PEEK_MODE_ALL);
BOOST_REQUIRE(0 == size);
@@ -170,7 +170,7 @@ BOOST_AUTO_TEST_CASE(TestRemoveAllKeys)
cache.RemoveAll(keySet);
- size = cache.Size(cache::GG_PEEK_MODE_PRIMARY);
+ size = cache.Size(cache::IGNITE_PEEK_MODE_PRIMARY);
BOOST_REQUIRE(1 == size);
}
@@ -360,11 +360,11 @@ BOOST_AUTO_TEST_CASE(TestLocalClear)
cache.Put(0, 2);
- BOOST_REQUIRE(2 == cache.LocalPeek(0, cache::GG_PEEK_MODE_PRIMARY));
+ BOOST_REQUIRE(2 == cache.LocalPeek(0, cache::IGNITE_PEEK_MODE_PRIMARY));
cache.LocalClear(0);
- BOOST_REQUIRE(0 == cache.LocalPeek(0, cache::GG_PEEK_MODE_PRIMARY));
+ BOOST_REQUIRE(0 == cache.LocalPeek(0, cache::IGNITE_PEEK_MODE_PRIMARY));
}
BOOST_AUTO_TEST_CASE(TestLocalClearAll)
@@ -378,13 +378,13 @@ BOOST_AUTO_TEST_CASE(TestLocalClearAll)
std::set<int> keySet(keys, keys + 2);
- BOOST_REQUIRE(3 == cache.LocalPeek(0, cache::GG_PEEK_MODE_PRIMARY));
- BOOST_REQUIRE(3 == cache.LocalPeek(1, cache::GG_PEEK_MODE_PRIMARY));
+ BOOST_REQUIRE(3 == cache.LocalPeek(0, cache::IGNITE_PEEK_MODE_PRIMARY));
+ BOOST_REQUIRE(3 == cache.LocalPeek(1, cache::IGNITE_PEEK_MODE_PRIMARY));
cache.LocalClearAll(keySet);
- BOOST_REQUIRE(0 == cache.LocalPeek(0, cache::GG_PEEK_MODE_PRIMARY));
- BOOST_REQUIRE(0 == cache.LocalPeek(1, cache::GG_PEEK_MODE_PRIMARY));
+ BOOST_REQUIRE(0 == cache.LocalPeek(0, cache::IGNITE_PEEK_MODE_PRIMARY));
+ BOOST_REQUIRE(0 == cache.LocalPeek(1, cache::IGNITE_PEEK_MODE_PRIMARY));
}
BOOST_AUTO_TEST_CASE(TestSizes)
@@ -398,7 +398,7 @@ BOOST_AUTO_TEST_CASE(TestSizes)
BOOST_REQUIRE(2 <= cache.Size());
- BOOST_REQUIRE(1 <= cache.LocalSize(cache::GG_PEEK_MODE_PRIMARY));
+ BOOST_REQUIRE(1 <= cache.LocalSize(cache::IGNITE_PEEK_MODE_PRIMARY));
}
BOOST_AUTO_TEST_CASE(TestLocalEvict)
@@ -407,7 +407,7 @@ BOOST_AUTO_TEST_CASE(TestLocalEvict)
cache.Put(1, 5);
- BOOST_REQUIRE(5 == cache.LocalPeek(1, cache::GG_PEEK_MODE_ONHEAP));
+ BOOST_REQUIRE(5 == cache.LocalPeek(1, cache::IGNITE_PEEK_MODE_ONHEAP));
int keys[] = { 0, 1 };
@@ -415,11 +415,11 @@ BOOST_AUTO_TEST_CASE(TestLocalEvict)
cache.LocalEvict(keySet);
- BOOST_REQUIRE(0 == cache.LocalPeek(1, cache::GG_PEEK_MODE_ONHEAP));
+ BOOST_REQUIRE(0 == cache.LocalPeek(1, cache::IGNITE_PEEK_MODE_ONHEAP));
BOOST_REQUIRE(5 == cache.Get(1));
- BOOST_REQUIRE(5 == cache.LocalPeek(1, cache::GG_PEEK_MODE_ONHEAP));
+ BOOST_REQUIRE(5 == cache.LocalPeek(1, cache::IGNITE_PEEK_MODE_ONHEAP));
}
BOOST_AUTO_TEST_CASE(TestPortable)
@@ -450,7 +450,7 @@ BOOST_AUTO_TEST_CASE(TestCreateCache)
grid0.CreateCache<int, int>("dynamic_cache", &err);
- BOOST_REQUIRE(err.GetCode() != GridError::GG_SUCCESS);
+ BOOST_REQUIRE(err.GetCode() != GridError::IGNITE_SUCCESS);
}
BOOST_AUTO_TEST_CASE(TestGetOrCreateCache)
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/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 e1a098c..253a692 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
@@ -50,14 +50,14 @@ BOOST_AUTO_TEST_CASE(TestGridFactory)
// Start two grids
Grid grid1 = GridFactory::Start(cfg, "gridFactoryTest-1", &err);
- if (err.GetCode() != GridError::GG_SUCCESS)
+ if (err.GetCode() != GridError::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::GG_SUCCESS)
+ if (err.GetCode() != GridError::IGNITE_SUCCESS)
BOOST_ERROR(err.GetText());
BOOST_REQUIRE(strcmp(grid2.GetName(), "gridFactoryTest-2") == 0);
@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE(TestGridFactory)
// Test get
Grid grid0 = GridFactory::Get("gridFactoryTest-1", &err);
- if (err.GetCode() != GridError::GG_SUCCESS)
+ if (err.GetCode() != GridError::IGNITE_SUCCESS)
BOOST_ERROR(err.GetText());
BOOST_REQUIRE(strcmp(grid0.GetName(), grid1.GetName()) == 0);
@@ -74,16 +74,16 @@ BOOST_AUTO_TEST_CASE(TestGridFactory)
GridFactory::Stop(grid1.GetName(), true);
GridFactory::Get("gridFactoryTest-1", &err);
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_GENERIC);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_GENERIC);
GridFactory::Get("gridFactoryTest-2", &err);
- BOOST_REQUIRE(err.GetCode() == GridError::GG_SUCCESS);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_SUCCESS);
// Stop all
GridFactory::StopAll(true);
GridFactory::Get("gridFactoryTest-2", &err);
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_GENERIC);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_GENERIC);
}
BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/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 1d070b6..3eb773e 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
@@ -171,7 +171,7 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -184,7 +184,7 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -197,7 +197,7 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -208,7 +208,7 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -219,7 +219,7 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -230,7 +230,7 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -241,7 +241,7 @@ void CheckRawWritesRestricted(PortableRawWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
}
@@ -255,7 +255,7 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -268,7 +268,7 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -279,7 +279,7 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -290,7 +290,7 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -301,7 +301,7 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -312,7 +312,7 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -323,7 +323,7 @@ void CheckRawReadsRestricted(PortableRawReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
}
@@ -352,7 +352,7 @@ void CheckRawCollectionEmpty(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -363,7 +363,7 @@ void CheckRawCollectionEmpty(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -391,7 +391,7 @@ void CheckRawCollectionEmpty(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -430,7 +430,7 @@ void CheckRawCollection(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -441,7 +441,7 @@ void CheckRawCollection(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -481,7 +481,7 @@ void CheckRawCollection(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -512,7 +512,7 @@ void CheckRawMapEmpty(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -523,7 +523,7 @@ void CheckRawMapEmpty(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -554,7 +554,7 @@ void CheckRawMapEmpty(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -593,7 +593,7 @@ void CheckRawMap(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -604,7 +604,7 @@ void CheckRawMap(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -652,7 +652,7 @@ void CheckRawMap(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -859,7 +859,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -870,7 +870,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -902,7 +902,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -915,7 +915,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -928,7 +928,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -939,7 +939,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -964,7 +964,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -975,7 +975,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1017,7 +1017,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1030,7 +1030,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1043,7 +1043,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1054,7 +1054,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1127,7 +1127,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1138,7 +1138,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1240,7 +1240,7 @@ BOOST_AUTO_TEST_CASE(TestArrayNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1270,7 +1270,7 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1281,7 +1281,7 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1304,7 +1304,7 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1342,7 +1342,7 @@ BOOST_AUTO_TEST_CASE(TestArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1353,7 +1353,7 @@ BOOST_AUTO_TEST_CASE(TestArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1388,7 +1388,7 @@ BOOST_AUTO_TEST_CASE(TestArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1426,7 +1426,7 @@ BOOST_AUTO_TEST_CASE(TestCollectionNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1491,7 +1491,7 @@ BOOST_AUTO_TEST_CASE(TestMapNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/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 5caf4d5..11e2931 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
@@ -46,7 +46,7 @@ void CheckPrimitive(T val)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
Write<T>(writer, "test", val);
@@ -68,7 +68,7 @@ void CheckPrimitive(T val)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
T readVal = Read<T>(reader, "test");
@@ -108,7 +108,7 @@ void CheckPrimitiveArray(T dflt, T val1, T val2)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
// 1. Write NULL and see what happens.
@@ -210,7 +210,7 @@ void CheckPrimitiveArray(T dflt, T val1, T val2)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(ReadArray<T>(reader, fieldName, arr1, 0) == 2);
@@ -236,7 +236,7 @@ void CheckWritesRestricted(PortableWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -249,7 +249,7 @@ void CheckWritesRestricted(PortableWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -262,7 +262,7 @@ void CheckWritesRestricted(PortableWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -273,7 +273,7 @@ void CheckWritesRestricted(PortableWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -284,7 +284,7 @@ void CheckWritesRestricted(PortableWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -295,7 +295,7 @@ void CheckWritesRestricted(PortableWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -306,7 +306,7 @@ void CheckWritesRestricted(PortableWriter& writer)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
}
@@ -320,7 +320,7 @@ void CheckReadsRestricted(PortableReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -333,7 +333,7 @@ void CheckReadsRestricted(PortableReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -344,7 +344,7 @@ void CheckReadsRestricted(PortableReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -355,7 +355,7 @@ void CheckReadsRestricted(PortableReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -366,7 +366,7 @@ void CheckReadsRestricted(PortableReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -377,7 +377,7 @@ void CheckReadsRestricted(PortableReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -388,7 +388,7 @@ void CheckReadsRestricted(PortableReader& reader)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
}
@@ -421,7 +421,7 @@ void CheckCollectionEmpty(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -432,7 +432,7 @@ void CheckCollectionEmpty(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -462,7 +462,7 @@ void CheckCollectionEmpty(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -505,7 +505,7 @@ void CheckCollection(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -516,7 +516,7 @@ void CheckCollection(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -558,7 +558,7 @@ void CheckCollection(CollectionType* colType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -593,7 +593,7 @@ void CheckMapEmpty(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -604,7 +604,7 @@ void CheckMapEmpty(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -637,7 +637,7 @@ void CheckMapEmpty(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -680,7 +680,7 @@ void CheckMap(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -691,7 +691,7 @@ void CheckMap(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -741,7 +741,7 @@ void CheckMap(MapType* mapType)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -865,7 +865,7 @@ BOOST_AUTO_TEST_CASE(TestGuidNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
writer.WriteNull("test");
@@ -886,7 +886,7 @@ BOOST_AUTO_TEST_CASE(TestGuidNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
Guid expVal;
@@ -918,7 +918,7 @@ BOOST_AUTO_TEST_CASE(TestString) {
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -929,7 +929,7 @@ BOOST_AUTO_TEST_CASE(TestString) {
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -940,7 +940,7 @@ BOOST_AUTO_TEST_CASE(TestString) {
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
writer.WriteString("field1", writeVal1);
@@ -967,7 +967,7 @@ BOOST_AUTO_TEST_CASE(TestString) {
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -978,7 +978,7 @@ BOOST_AUTO_TEST_CASE(TestString) {
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
char readVal1[9];
@@ -1045,7 +1045,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1056,7 +1056,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1092,7 +1092,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1105,7 +1105,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1118,7 +1118,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1129,7 +1129,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1156,7 +1156,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1167,7 +1167,7 @@ BOOST_AUTO_TEST_CASE(TestStringArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1213,7 +1213,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1226,7 +1226,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1239,7 +1239,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1250,7 +1250,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1325,7 +1325,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1336,7 +1336,7 @@ BOOST_AUTO_TEST_CASE(TestStringArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1456,7 +1456,7 @@ BOOST_AUTO_TEST_CASE(TestArrayNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1490,7 +1490,7 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1501,7 +1501,7 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1526,7 +1526,7 @@ BOOST_AUTO_TEST_CASE(TestArrayEmpty)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1568,7 +1568,7 @@ BOOST_AUTO_TEST_CASE(TestArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
try
@@ -1579,7 +1579,7 @@ BOOST_AUTO_TEST_CASE(TestArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
out.Synchronize();
@@ -1616,7 +1616,7 @@ BOOST_AUTO_TEST_CASE(TestArray)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1660,7 +1660,7 @@ BOOST_AUTO_TEST_CASE(TestCollectionNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1731,7 +1731,7 @@ BOOST_AUTO_TEST_CASE(TestMapNull)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt8("field2") == 1);
@@ -1783,7 +1783,7 @@ BOOST_AUTO_TEST_CASE(TestRawMode)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
rawWriter.WriteInt8(1);
@@ -1808,7 +1808,7 @@ BOOST_AUTO_TEST_CASE(TestRawMode)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(rawReader.ReadInt8() == 1);
@@ -1889,7 +1889,7 @@ BOOST_AUTO_TEST_CASE(TestFieldSeek)
}
catch (GridError& err)
{
- BOOST_REQUIRE(err.GetCode() == GridError::GG_ERR_PORTABLE);
+ BOOST_REQUIRE(err.GetCode() == GridError::IGNITE_ERR_PORTABLE);
}
BOOST_REQUIRE(reader.ReadInt32("val2") == 2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
index be7ee61..81f01ab 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
@@ -62,7 +62,7 @@ namespace gridgain
/**
* Checks whether this cache contains no key-value mappings.
- * Semantically equals to Cache.Size(GG_PEEK_MODE_PRIMARY) == 0.
+ * Semantically equals to Cache.Size(IGNITE_PEEK_MODE_PRIMARY) == 0.
*
* @return True if cache is empty.
*/
@@ -79,7 +79,7 @@ namespace gridgain
/**
* Checks whether this cache contains no key-value mappings.
- * Semantically equals to Cache.Size(GG_PEEK_MODE_PRIMARY) == 0.
+ * Semantically equals to Cache.Size(IGNITE_PEEK_MODE_PRIMARY) == 0.
*
* @param err Error.
* @return True if cache is empty.
@@ -953,7 +953,7 @@ namespace gridgain
*/
int32_t LocalSize()
{
- return LocalSize(GG_PEEK_MODE_ALL);
+ return LocalSize(IGNITE_PEEK_MODE_ALL);
}
/**
@@ -964,7 +964,7 @@ namespace gridgain
*/
int32_t LocalSize(GridError& err)
{
- return LocalSize(GG_PEEK_MODE_ALL, err);
+ return LocalSize(IGNITE_PEEK_MODE_ALL, err);
}
/**
@@ -1004,7 +1004,7 @@ namespace gridgain
*/
int32_t Size()
{
- return Size(gridgain::cache::GG_PEEK_MODE_ALL);
+ return Size(gridgain::cache::IGNITE_PEEK_MODE_ALL);
}
/**
@@ -1016,7 +1016,7 @@ namespace gridgain
*/
int32_t Size(GridError& err)
{
- return Size(gridgain::cache::GG_PEEK_MODE_ALL, err);
+ return Size(gridgain::cache::IGNITE_PEEK_MODE_ALL, err);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
index b01f2d1..c00525d 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
@@ -30,40 +30,40 @@ namespace gridgain
/**
* Peeks into all available cache storages.
*/
- GG_PEEK_MODE_ALL = 0x01,
+ IGNITE_PEEK_MODE_ALL = 0x01,
/**
* Peek into near cache only (don't peek into partitioned cache).
- * In case of LOCAL cache, behaves as GG_PEEK_MODE_ALL mode.
+ * In case of LOCAL cache, behaves as IGNITE_PEEK_MODE_ALL mode.
*/
- GG_PEEK_MODE_NEAR = 0x02,
+ IGNITE_PEEK_MODE_NEAR = 0x02,
/**
* Peek value from primary copy of partitioned cache only (skip near cache).
- * In case of LOCAL cache, behaves as GG_PEEK_MODE_ALL mode.
+ * In case of LOCAL cache, behaves as IGNITE_PEEK_MODE_ALL mode.
*/
- GG_PEEK_MODE_PRIMARY = 0x04,
+ IGNITE_PEEK_MODE_PRIMARY = 0x04,
/**
* Peek value from backup copies of partitioned cache only (skip near cache).
- * In case of LOCAL cache, behaves as GG_PEEK_MODE_ALL mode.
+ * In case of LOCAL cache, behaves as IGNITE_PEEK_MODE_ALL mode.
*/
- GG_PEEK_MODE_BACKUP = 0x08,
+ IGNITE_PEEK_MODE_BACKUP = 0x08,
/**
* Peeks value from the on-heap storage only.
*/
- GG_PEEK_MODE_ONHEAP = 0x10,
+ IGNITE_PEEK_MODE_ONHEAP = 0x10,
/**
* Peeks value from the off-heap storage only, without loading off-heap value into cache.
*/
- GG_PEEK_MODE_OFFHEAP = 0x20,
+ IGNITE_PEEK_MODE_OFFHEAP = 0x20,
/**
* Peeks value from the swap storage only, without loading swapped value into cache.
*/
- GG_PEEK_MODE_SWAP = 0x40
+ IGNITE_PEEK_MODE_SWAP = 0x40
};
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
index 844c6bc..6f8dd3e 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
@@ -89,7 +89,7 @@ namespace gridgain
return impl0->HasNext(&err);
else
{
- err = GridError(GridError::GG_ERR_GENERIC,
+ err = GridError(GridError::IGNITE_ERR_GENERIC,
"Instance is not usable (did you check for error?).");
return false;
@@ -127,7 +127,7 @@ namespace gridgain
impl0->GetNext(outOp, &err);
- if (err.GetCode() == GridError::GG_SUCCESS)
+ if (err.GetCode() == GridError::IGNITE_SUCCESS)
{
K& key = outOp.Get1();
V& val = outOp.Get2();
@@ -139,7 +139,7 @@ namespace gridgain
}
else
{
- err = GridError(GridError::GG_ERR_GENERIC,
+ err = GridError(GridError::IGNITE_ERR_GENERIC,
"Instance is not usable (did you check for error?).");
return CacheEntry<K, V>();
@@ -176,7 +176,7 @@ namespace gridgain
impl0->GetAll(outOp, &err);
}
else
- err = GridError(GridError::GG_ERR_GENERIC,
+ err = GridError(GridError::IGNITE_ERR_GENERIC,
"Instance is not usable (did you check for error?).");
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h b/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
index 54e1f53..b8d1099 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
@@ -74,115 +74,115 @@ namespace gridgain
{
public:
/** Success. */
- static const int GG_SUCCESS = 0;
+ static const int IGNITE_SUCCESS = 0;
/** Failed to initialize JVM. */
- static const int GG_ERR_JVM_INIT = 1;
+ static const int IGNITE_ERR_JVM_INIT = 1;
/** Failed to attach to JVM. */
- static const int GG_ERR_JVM_ATTACH = 2;
+ static const int IGNITE_ERR_JVM_ATTACH = 2;
/** JVM library is not found. */
- static const int GG_ERR_JVM_LIB_NOT_FOUND = 3;
+ static const int IGNITE_ERR_JVM_LIB_NOT_FOUND = 3;
/** Failed to load JVM library. */
- static const int GG_ERR_JVM_LIB_LOAD_FAILED = 4;
+ static const int IGNITE_ERR_JVM_LIB_LOAD_FAILED = 4;
/** JVM classpath is not provided. */
- static const int GG_ERR_JVM_NO_CLASSPATH = 5;
+ static const int IGNITE_ERR_JVM_NO_CLASSPATH = 5;
/** JVM error: no class definition found. */
- static const int GG_ERR_JVM_NO_CLASS_DEF_FOUND = 6;
+ static const int IGNITE_ERR_JVM_NO_CLASS_DEF_FOUND = 6;
/** JVM error: no such method. */
- static const int GG_ERR_JVM_NO_SUCH_METHOD = 7;
+ static const int IGNITE_ERR_JVM_NO_SUCH_METHOD = 7;
/** Memory operation error. */
- static const int GG_ERR_MEMORY = 1001;
+ static const int IGNITE_ERR_MEMORY = 1001;
/** Portable error. */
- static const int GG_ERR_PORTABLE = 1002;
+ static const int IGNITE_ERR_PORTABLE = 1002;
/** Generic GridGain error. */
- static const int GG_ERR_GENERIC = 2000;
+ static const int IGNITE_ERR_GENERIC = 2000;
/** Illegal argument passed. */
- static const int GG_ERR_ILLEGAL_ARGUMENT = 2001;
+ static const int IGNITE_ERR_ILLEGAL_ARGUMENT = 2001;
/** Illegal state. */
- static const int GG_ERR_ILLEGAL_STATE = 2002;
+ static const int IGNITE_ERR_ILLEGAL_STATE = 2002;
/** Unsupported operation. */
- static const int GG_ERR_UNSUPPORTED_OPERATION = 2003;
+ static const int IGNITE_ERR_UNSUPPORTED_OPERATION = 2003;
/** Thread has been interrup. */
- static const int GG_ERR_INTERRUPTED = 2004;
+ static const int IGNITE_ERR_INTERRUPTED = 2004;
/** Cluster group is empty. */
- static const int GG_ERR_CLUSTER_GROUP_EMPTY = 2005;
+ static const int IGNITE_ERR_CLUSTER_GROUP_EMPTY = 2005;
/** Cluster topology problem. */
- static const int GG_ERR_CLUSTER_TOPOLOGY = 2006;
+ static const int IGNITE_ERR_CLUSTER_TOPOLOGY = 2006;
/** Compute execution rejected. */
- static const int GG_ERR_COMPUTE_EXECUTION_REJECTED = 2007;
+ static const int IGNITE_ERR_COMPUTE_EXECUTION_REJECTED = 2007;
/** Compute job failover. */
- static const int GG_ERR_COMPUTE_JOB_FAILOVER = 2008;
+ static const int IGNITE_ERR_COMPUTE_JOB_FAILOVER = 2008;
/** Compute task cancelled. */
- static const int GG_ERR_COMPUTE_TASK_CANCELLED = 2009;
+ static const int IGNITE_ERR_COMPUTE_TASK_CANCELLED = 2009;
/** Compute task timeout. */
- static const int GG_ERR_COMPUTE_TASK_TIMEOUT = 2010;
+ static const int IGNITE_ERR_COMPUTE_TASK_TIMEOUT = 2010;
/** Compute user undeclared exception. */
- static const int GG_ERR_COMPUTE_USER_UNDECLARED_EXCEPTION = 2011;
+ static const int IGNITE_ERR_COMPUTE_USER_UNDECLARED_EXCEPTION = 2011;
/** Generic cache error. */
- static const int GG_ERR_CACHE = 2012;
+ static const int IGNITE_ERR_CACHE = 2012;
/** Generic cache loader error. */
- static const int GG_ERR_CACHE_LOADER = 2013;
+ static const int IGNITE_ERR_CACHE_LOADER = 2013;
/** Generic cache writer error. */
- static const int GG_ERR_CACHE_WRITER = 2014;
+ static const int IGNITE_ERR_CACHE_WRITER = 2014;
/** Generic cache entry processor error. */
- static const int GG_ERR_ENTRY_PROCESSOR = 2015;
+ static const int IGNITE_ERR_ENTRY_PROCESSOR = 2015;
/** Cache atomic update timeout. */
- static const int GG_ERR_CACHE_ATOMIC_UPDATE_TIMEOUT = 2016;
+ static const int IGNITE_ERR_CACHE_ATOMIC_UPDATE_TIMEOUT = 2016;
/** Cache partial update. */
- static const int GG_ERR_CACHE_PARTIAL_UPDATE = 2017;
+ static const int IGNITE_ERR_CACHE_PARTIAL_UPDATE = 2017;
/** Transaction optimisitc exception. */
- static const int GG_ERR_TX_OPTIMISTIC = 2018;
+ static const int IGNITE_ERR_TX_OPTIMISTIC = 2018;
/** Transaction timeout. */
- static const int GG_ERR_TX_TIMEOUT = 2019;
+ static const int IGNITE_ERR_TX_TIMEOUT = 2019;
/** Transaction rollback. */
- static const int GG_ERR_TX_ROLLBACK = 2020;
+ static const int IGNITE_ERR_TX_ROLLBACK = 2020;
/** Transaction heuristic exception. */
- static const int GG_ERR_TX_HEURISTIC = 2021;
+ static const int IGNITE_ERR_TX_HEURISTIC = 2021;
/** Authentication error. */
- static const int GG_ERR_AUTHENTICATION = 2022;
+ static const int IGNITE_ERR_AUTHENTICATION = 2022;
/** Security error. */
- static const int GG_ERR_SECURITY = 2023;
+ static const int IGNITE_ERR_SECURITY = 2023;
/** Product license error. */
- static const int GG_ERR_PRODUCT_LICENSE = 2024;
+ static const int IGNITE_ERR_PRODUCT_LICENSE = 2024;
/** Unknown error. */
- static const int GG_ERR_UNKNOWN = -1;
+ static const int IGNITE_ERR_UNKNOWN = -1;
/**
- * Throw an error if code is not GG_SUCCESS.
+ * Throw an error if code is not IGNITE_SUCCESS.
*
* @param err Error.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
index 2d9a86e..566a768 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
@@ -29,25 +29,25 @@ namespace gridgain
namespace interop
{
/** Memory header length. */
- const int GG_MEM_HDR_LEN = 20;
+ const int IGNITE_MEM_HDR_LEN = 20;
/** Memory header offset: capacity. */
- const int GG_MEM_HDR_OFF_CAP = 8;
+ const int IGNITE_MEM_HDR_OFF_CAP = 8;
/** Memory header offset: length. */
- const int GG_MEM_HDR_OFF_LEN = 12;
+ const int IGNITE_MEM_HDR_OFF_LEN = 12;
/** Memory header offset: flags. */
- const int GG_MEM_HDR_OFF_FLAGS = 16;
+ const int IGNITE_MEM_HDR_OFF_FLAGS = 16;
/** Flag: external. */
- const int GG_MEM_FLAG_EXT = 0x1;
+ const int IGNITE_MEM_FLAG_EXT = 0x1;
/** Flag: pooled. */
- const int GG_MEM_FLAG_POOLED = 0x2;
+ const int IGNITE_MEM_FLAG_POOLED = 0x2;
/** Flag: acquired. */
- const int GG_MEM_FLAG_ACQUIRED = 0x4;
+ const int IGNITE_MEM_FLAG_ACQUIRED = 0x4;
/**
* Interop memory.
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
index 72e9bb0..4eaf481 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
@@ -90,7 +90,7 @@ namespace gridgain
virtual int32_t GetFieldId(const int32_t typeId, const char* name) {
if (!name)
{
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Field name cannot be NULL.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Field name cannot be NULL.");
}
return type.GetFieldId(name);
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
index 119f6c9..4437e10 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
@@ -639,7 +639,7 @@ namespace gridgain
if (hdr == GG_HDR_NULL)
return GetNull<T>();
else if (hdr == GG_HDR_HND) {
- GG_ERROR_1(gridgain::GridError::GG_ERR_PORTABLE, "Circular references are not supported.");
+ GG_ERROR_1(gridgain::GridError::IGNITE_ERR_PORTABLE, "Circular references are not supported.");
}
else if (hdr == GG_TYPE_PORTABLE)
{
@@ -802,7 +802,7 @@ namespace gridgain
{
int32_t pos = stream->Position();
- GG_ERROR_FORMATTED_3(GridError::GG_ERR_PORTABLE, "Invalid type ID",
+ GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid type ID",
"position", pos, "expected", expHdr, "actual", typeId)
}
}
@@ -1031,7 +1031,7 @@ namespace gridgain
else {
int32_t pos = stream->Position() - 1;
- GG_ERROR_FORMATTED_3(GridError::GG_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", typeId)
+ GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", typeId)
}
}
@@ -1054,7 +1054,7 @@ namespace gridgain
else {
int32_t pos = stream->Position() - 1;
- GG_ERROR_FORMATTED_3(GridError::GG_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", typeId)
+ GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", typeId)
}
}
};
@@ -1120,7 +1120,7 @@ namespace gridgain
else {
int32_t pos = stream->Position() - 1;
- GG_ERROR_FORMATTED_3(GridError::GG_ERR_PORTABLE, "Invalid header", "position", pos, "expected", GG_TYPE_STRING, "actual", typeId)
+ GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", GG_TYPE_STRING, "actual", typeId)
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
index 7068e51..ca8f6c9 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
@@ -147,7 +147,7 @@ namespace gridgain
*/
int32_t GetTypeId()
{
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "GetTypeId function is not defined for portable type.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "GetTypeId function is not defined for portable type.");
}
/**
@@ -157,7 +157,7 @@ namespace gridgain
*/
std::string GetTypeName()
{
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "GetTypeName function is not defined for portable type.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "GetTypeName function is not defined for portable type.");
}
/**
@@ -190,7 +190,7 @@ namespace gridgain
*/
void Write(PortableWriter& writer, const T& obj)
{
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Write function is not defined for portable type.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Write function is not defined for portable type.");
}
/**
@@ -201,7 +201,7 @@ namespace gridgain
*/
T Read(PortableReader& reader)
{
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Read function is not defined for portable type.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Read function is not defined for portable type.");
}
/**
@@ -222,7 +222,7 @@ namespace gridgain
*/
T GetNull()
{
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "GetNull function is not defined for portable type.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "GetNull function is not defined for portable type.");
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/src/grid_error.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/grid_error.cpp b/modules/platform/src/main/cpp/core/src/grid_error.cpp
index feea271..95992ce 100644
--- a/modules/platform/src/main/cpp/core/src/grid_error.cpp
+++ b/modules/platform/src/main/cpp/core/src/grid_error.cpp
@@ -26,11 +26,11 @@ namespace gridgain
{
void GridError::ThrowIfNeeded(GridError& err)
{
- if (err.code != GG_SUCCESS)
+ if (err.code != IGNITE_SUCCESS)
throw err;
}
- GridError::GridError() : code(GG_SUCCESS), msg(NULL)
+ GridError::GridError() : code(IGNITE_SUCCESS), msg(NULL)
{
// No-op.
}
@@ -83,7 +83,7 @@ namespace gridgain
const char* GridError::GetText()
{
- if (code == GG_SUCCESS)
+ if (code == IGNITE_SUCCESS)
return "Operation completed successfully.";
else if (msg)
return msg;
@@ -111,7 +111,7 @@ namespace gridgain
if (jniMsg)
stream << ": " << jniMsg;
- *err = GridError(GG_ERR_JVM_NO_CLASS_DEF_FOUND, stream.str().c_str());
+ *err = GridError(IGNITE_ERR_JVM_NO_CLASS_DEF_FOUND, stream.str().c_str());
}
else if (jniCls0.compare("java.lang.NoSuchMethodError") == 0)
{
@@ -122,60 +122,60 @@ namespace gridgain
if (jniMsg)
stream << ": " << jniMsg;
- *err = GridError(GG_ERR_JVM_NO_SUCH_METHOD, stream.str().c_str());
+ *err = GridError(IGNITE_ERR_JVM_NO_SUCH_METHOD, stream.str().c_str());
}
else if (jniCls0.compare("java.lang.IllegalArgumentException") == 0)
- *err = GridError(GG_ERR_ILLEGAL_ARGUMENT, jniMsg);
+ *err = GridError(IGNITE_ERR_ILLEGAL_ARGUMENT, jniMsg);
else if (jniCls0.compare("java.lang.IllegalStateException") == 0)
- *err = GridError(GG_ERR_ILLEGAL_STATE, jniMsg);
+ *err = GridError(IGNITE_ERR_ILLEGAL_STATE, jniMsg);
else if (jniCls0.compare("java.lang.UnsupportedOperationException") == 0)
- *err = GridError(GG_ERR_UNSUPPORTED_OPERATION, jniMsg);
+ *err = GridError(IGNITE_ERR_UNSUPPORTED_OPERATION, jniMsg);
else if (jniCls0.compare("java.lang.InterruptedException") == 0)
- *err = GridError(GG_ERR_INTERRUPTED, jniMsg);
+ *err = GridError(IGNITE_ERR_INTERRUPTED, jniMsg);
else if (jniCls0.compare("org.apache.ignite.cluster.ClusterGroupEmptyException") == 0)
- *err = GridError(GG_ERR_CLUSTER_GROUP_EMPTY, jniMsg);
+ *err = GridError(IGNITE_ERR_CLUSTER_GROUP_EMPTY, jniMsg);
else if (jniCls0.compare("org.apache.ignite.cluster.ClusterTopologyException") == 0)
- *err = GridError(GG_ERR_CLUSTER_TOPOLOGY, jniMsg);
+ *err = GridError(IGNITE_ERR_CLUSTER_TOPOLOGY, jniMsg);
else if (jniCls0.compare("org.apache.ignite.compute.ComputeExecutionRejectedException") == 0)
- *err = GridError(GG_ERR_COMPUTE_EXECUTION_REJECTED, jniMsg);
+ *err = GridError(IGNITE_ERR_COMPUTE_EXECUTION_REJECTED, jniMsg);
else if (jniCls0.compare("org.apache.ignite.compute.ComputeJobFailoverException") == 0)
- *err = GridError(GG_ERR_COMPUTE_JOB_FAILOVER, jniMsg);
+ *err = GridError(IGNITE_ERR_COMPUTE_JOB_FAILOVER, jniMsg);
else if (jniCls0.compare("org.apache.ignite.compute.ComputeTaskCancelledException") == 0)
- *err = GridError(GG_ERR_COMPUTE_TASK_CANCELLED, jniMsg);
+ *err = GridError(IGNITE_ERR_COMPUTE_TASK_CANCELLED, jniMsg);
else if (jniCls0.compare("org.apache.ignite.compute.ComputeTaskTimeoutException") == 0)
- *err = GridError(GG_ERR_COMPUTE_TASK_TIMEOUT, jniMsg);
+ *err = GridError(IGNITE_ERR_COMPUTE_TASK_TIMEOUT, jniMsg);
else if (jniCls0.compare("org.apache.ignite.compute.ComputeUserUndeclaredException") == 0)
- *err = GridError(GG_ERR_COMPUTE_USER_UNDECLARED_EXCEPTION, jniMsg);
+ *err = GridError(IGNITE_ERR_COMPUTE_USER_UNDECLARED_EXCEPTION, jniMsg);
else if (jniCls0.compare("javax.cache.CacheException") == 0)
- *err = GridError(GG_ERR_CACHE, jniMsg);
+ *err = GridError(IGNITE_ERR_CACHE, jniMsg);
else if (jniCls0.compare("javax.cache.integration.CacheLoaderException") == 0)
- *err = GridError(GG_ERR_CACHE_LOADER, jniMsg);
+ *err = GridError(IGNITE_ERR_CACHE_LOADER, jniMsg);
else if (jniCls0.compare("javax.cache.integration.CacheWriterException") == 0)
- *err = GridError(GG_ERR_CACHE_WRITER, jniMsg);
+ *err = GridError(IGNITE_ERR_CACHE_WRITER, jniMsg);
else if (jniCls0.compare("javax.cache.processor.EntryProcessorException") == 0)
- *err = GridError(GG_ERR_ENTRY_PROCESSOR, jniMsg);
+ *err = GridError(IGNITE_ERR_ENTRY_PROCESSOR, jniMsg);
else if (jniCls0.compare("org.apache.ignite.cache.CacheAtomicUpdateTimeoutException") == 0)
- *err = GridError(GG_ERR_CACHE_ATOMIC_UPDATE_TIMEOUT, jniMsg);
+ *err = GridError(IGNITE_ERR_CACHE_ATOMIC_UPDATE_TIMEOUT, jniMsg);
else if (jniCls0.compare("org.apache.ignite.cache.CachePartialUpdateException") == 0)
- *err = GridError(GG_ERR_CACHE_PARTIAL_UPDATE, jniMsg);
+ *err = GridError(IGNITE_ERR_CACHE_PARTIAL_UPDATE, jniMsg);
else if (jniCls0.compare("org.apache.ignite.transactions.TransactionOptimisticException") == 0)
- *err = GridError(GG_ERR_TX_OPTIMISTIC, jniMsg);
+ *err = GridError(IGNITE_ERR_TX_OPTIMISTIC, jniMsg);
else if (jniCls0.compare("org.apache.ignite.transactions.TransactionTimeoutException") == 0)
- *err = GridError(GG_ERR_TX_TIMEOUT, jniMsg);
+ *err = GridError(IGNITE_ERR_TX_TIMEOUT, jniMsg);
else if (jniCls0.compare("org.apache.ignite.transactions.TransactionRollbackException") == 0)
- *err = GridError(GG_ERR_TX_ROLLBACK, jniMsg);
+ *err = GridError(IGNITE_ERR_TX_ROLLBACK, jniMsg);
else if (jniCls0.compare("org.apache.ignite.transactions.TransactionHeuristicException") == 0)
- *err = GridError(GG_ERR_TX_HEURISTIC, jniMsg);
+ *err = GridError(IGNITE_ERR_TX_HEURISTIC, jniMsg);
else if (jniCls0.compare("org.apache.ignite.IgniteAuthenticationException") == 0)
- *err = GridError(GG_ERR_AUTHENTICATION, jniMsg);
+ *err = GridError(IGNITE_ERR_AUTHENTICATION, jniMsg);
else if (jniCls0.compare("org.apache.ignite.plugin.security.GridSecurityException") == 0)
- *err = GridError(GG_ERR_SECURITY, jniMsg);
+ *err = GridError(IGNITE_ERR_SECURITY, jniMsg);
else if (jniCls0.compare("org.gridgain.grid.product.ProductLicenseException") == 0)
- *err = GridError(GG_ERR_PRODUCT_LICENSE, jniMsg);
+ *err = GridError(IGNITE_ERR_PRODUCT_LICENSE, jniMsg);
else if (jniCls0.compare("org.apache.ignite.IgniteException") == 0)
- *err = GridError(GG_ERR_GENERIC, jniMsg);
+ *err = GridError(IGNITE_ERR_GENERIC, jniMsg);
else if (jniCls0.compare("org.apache.ignite.IgniteCheckedException") == 0)
- *err = GridError(GG_ERR_GENERIC, jniMsg);
+ *err = GridError(IGNITE_ERR_GENERIC, jniMsg);
else
{
std::stringstream stream;
@@ -187,13 +187,13 @@ namespace gridgain
stream << "]";
- *err = GridError(GG_ERR_UNKNOWN, stream.str().c_str());
+ *err = GridError(IGNITE_ERR_UNKNOWN, stream.str().c_str());
}
}
else
{
// JNI class name is not available. Something really weird.
- *err = GridError(GG_ERR_UNKNOWN);
+ *err = GridError(IGNITE_ERR_UNKNOWN);
}
}
else if (jniCode == IGNITE_JNI_ERR_JVM_INIT)
@@ -216,9 +216,9 @@ namespace gridgain
stream << "]";
- *err = GridError(GG_ERR_JVM_INIT, stream.str().c_str());
+ *err = GridError(IGNITE_ERR_JVM_INIT, stream.str().c_str());
}
else if (jniCode == IGNITE_JNI_ERR_JVM_ATTACH)
- *err = GridError(GG_ERR_JVM_ATTACH, "Failed to attach to JVM.");
+ *err = GridError(IGNITE_ERR_JVM_ATTACH, "Failed to attach to JVM.");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/src/grid_factory.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/grid_factory.cpp b/modules/platform/src/main/cpp/core/src/grid_factory.cpp
index 59ec619..b2ef1e2 100644
--- a/modules/platform/src/main/cpp/core/src/grid_factory.cpp
+++ b/modules/platform/src/main/cpp/core/src/grid_factory.cpp
@@ -158,7 +158,7 @@ namespace gridgain
if (!jvmLibFound)
{
- *err = GridError(GridError::GG_ERR_JVM_LIB_NOT_FOUND,
+ *err = GridError(GridError::IGNITE_ERR_JVM_LIB_NOT_FOUND,
"JVM library is not found (did you set JAVA_HOME environment variable?)");
failed = true;
@@ -167,7 +167,7 @@ namespace gridgain
if (!failed) {
if (!LoadJvmLibrary(jvmLib))
{
- *err = GridError(GridError::GG_ERR_JVM_LIB_LOAD_FAILED, "Failed to load JVM library.");
+ *err = GridError(GridError::IGNITE_ERR_JVM_LIB_LOAD_FAILED, "Failed to load JVM library.");
failed = true;
}
@@ -264,7 +264,7 @@ namespace gridgain
}
}
else {
- *err = GridError(GridError::GG_ERR_JVM_NO_CLASSPATH,
+ *err = GridError(GridError::IGNITE_ERR_JVM_NO_CLASSPATH,
"Java classpath is empty (did you set GRIDGAIN_HOME environment variable?)");
failed = true;
@@ -326,14 +326,14 @@ namespace gridgain
GridError::SetError(jniErr.code, jniErr.errCls, jniErr.errMsg, err);
- if (err->GetCode() == GridError::GG_SUCCESS)
+ if (err->GetCode() == GridError::IGNITE_SUCCESS)
{
// 2. Get environment pointer.
long long ptr = ctx.Get()->IgnitionEnvironmentPointer(name0, &jniErr);
GridError::SetError(jniErr.code, jniErr.errCls, jniErr.errMsg, err);
- if (err->GetCode() == GridError::GG_SUCCESS)
+ if (err->GetCode() == GridError::IGNITE_SUCCESS)
{
if (ptr != 0)
{
@@ -346,7 +346,7 @@ namespace gridgain
// 4. Get fresh node reference.
jobject ref = ctx.Get()->IgnitionInstance(name0, &jniErr);
- if (err->GetCode() == GridError::GG_SUCCESS) {
+ if (err->GetCode() == GridError::IGNITE_SUCCESS) {
if (ref)
{
GridImpl* impl = new GridImpl(*env, ref);
@@ -355,14 +355,14 @@ namespace gridgain
}
else
// Error: concurrent node stop.
- *err = GridError(GridError::GG_ERR_GENERIC,
+ *err = GridError(GridError::IGNITE_ERR_GENERIC,
"Failed to get grid instance because it was stopped concurrently.");
}
}
else
// Error: no node with the given name.
- *err = GridError(GridError::GG_ERR_GENERIC,
+ *err = GridError(GridError::IGNITE_ERR_GENERIC,
"Failed to get grid instance because it is either not started yet or already stopped.");
}
}
@@ -371,7 +371,7 @@ namespace gridgain
}
else
// Error: no node with the given name.
- *err = GridError(GridError::GG_ERR_GENERIC,
+ *err = GridError(GridError::IGNITE_ERR_GENERIC,
"Failed to get grid instance because it is either not started yet or already stopped.");
factoryLock.Leave();
@@ -414,7 +414,7 @@ namespace gridgain
GridError::SetError(jniErr.code, jniErr.errCls, jniErr.errMsg, err);
- if (err->GetCode() == GridError::GG_SUCCESS)
+ if (err->GetCode() == GridError::IGNITE_SUCCESS)
{
char* name0 = CopyChars(name);
@@ -424,7 +424,7 @@ namespace gridgain
GridError::SetError(jniErr.code, jniErr.errCls, jniErr.errMsg, err);
- if (err->GetCode() == GridError::GG_SUCCESS)
+ if (err->GetCode() == GridError::IGNITE_SUCCESS)
res = res0;
}
}
@@ -455,7 +455,7 @@ namespace gridgain
GridError::SetError(jniErr.code, jniErr.errCls, jniErr.errMsg, err);
- if (err->GetCode() == GridError::GG_SUCCESS)
+ if (err->GetCode() == GridError::IGNITE_SUCCESS)
{
ctx.Get()->IgnitionStopAll(cancel, &jniErr);
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/src/impl/cache/cache_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/cache/cache_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/cache/cache_impl.cpp
index 541a8c8..f6354ec 100644
--- a/modules/platform/src/main/cpp/core/src/impl/cache/cache_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/cache/cache_impl.cpp
@@ -138,7 +138,7 @@ namespace gridgain
bool CacheImpl::IsEmpty(GridError* err)
{
- return Size(GG_PEEK_MODE_ALL, err) == 0;
+ return Size(IGNITE_PEEK_MODE_ALL, err) == 0;
}
bool CacheImpl::ContainsKey(InputOperation& inOp, GridError* err)
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/src/impl/cache/query/query_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/cache/query/query_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/cache/query/query_impl.cpp
index 162a320..d10a6dd 100644
--- a/modules/platform/src/main/cpp/core/src/impl/cache/query/query_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/cache/query/query_impl.cpp
@@ -56,7 +56,7 @@ namespace gridgain
// Check whether GetAll() was called earlier.
if (getAllCalled)
{
- *err = GridError(GridError::GG_ERR_GENERIC,
+ *err = GridError(GridError::IGNITE_ERR_GENERIC,
"Cannot use HasNext() method because GetAll() was called.");
return false;
@@ -74,7 +74,7 @@ namespace gridgain
// Check whether GetAll() was called earlier.
if (getAllCalled)
{
- *err = GridError(GridError::GG_ERR_GENERIC,
+ *err = GridError(GridError::IGNITE_ERR_GENERIC,
"Cannot use GetNext() method because GetAll() was called.");
return;
@@ -108,8 +108,8 @@ namespace gridgain
else
{
// Ensure we do not overwrite possible previous error.
- if (err->GetCode() == GridError::GG_SUCCESS)
- *err = GridError(GridError::GG_ERR_GENERIC, "No more elements available.");
+ if (err->GetCode() == GridError::IGNITE_SUCCESS)
+ *err = GridError(GridError::IGNITE_ERR_GENERIC, "No more elements available.");
}
}
@@ -118,7 +118,7 @@ namespace gridgain
// Check whether any of iterator methods were called.
if (iterCalled)
{
- *err = GridError(GridError::GG_ERR_GENERIC,
+ *err = GridError(GridError::IGNITE_ERR_GENERIC,
"Cannot use GetAll() method because an iteration method was called.");
return;
@@ -127,7 +127,7 @@ namespace gridgain
// Check whether GetAll was called before.
if (getAllCalled)
{
- *err = GridError(GridError::GG_ERR_GENERIC,
+ *err = GridError(GridError::IGNITE_ERR_GENERIC,
"Cannot use GetNext() method because GetAll() was called.");
return;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp b/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
index 2af4b72..c146482 100644
--- a/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
@@ -176,7 +176,7 @@ namespace gridgain
void InteropInputStream::Position(int32_t pos)
{
if (pos > len) {
- GG_ERROR_FORMATTED_3(GridError::GG_ERR_MEMORY, "Requested input stream position is out of bounds",
+ GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_MEMORY, "Requested input stream position is out of bounds",
"memPtr", mem->PointerLong(), "len", len, "pos", pos);
}
@@ -192,7 +192,7 @@ namespace gridgain
void InteropInputStream::EnsureEnoughData(int32_t cnt)
{
if (len - pos < cnt) {
- GG_ERROR_FORMATTED_4(GridError::GG_ERR_MEMORY, "Not enough data in the stream",
+ GG_ERROR_FORMATTED_4(GridError::IGNITE_ERR_MEMORY, "Not enough data in the stream",
"memPtr", mem->PointerLong(), "len", len, "pos", pos, "requested", cnt);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp b/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
index 8a7903f..a8151f6 100644
--- a/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
@@ -40,32 +40,32 @@ namespace gridgain
int32_t InteropMemory::Capacity(int8_t* memPtr)
{
- return *reinterpret_cast<int32_t*>(memPtr + GG_MEM_HDR_OFF_CAP);
+ return *reinterpret_cast<int32_t*>(memPtr + IGNITE_MEM_HDR_OFF_CAP);
}
void InteropMemory::Capacity(int8_t* memPtr, int32_t val)
{
- *reinterpret_cast<int32_t*>(memPtr + GG_MEM_HDR_OFF_CAP) = val;
+ *reinterpret_cast<int32_t*>(memPtr + IGNITE_MEM_HDR_OFF_CAP) = val;
}
int32_t InteropMemory::Length(int8_t* memPtr)
{
- return *reinterpret_cast<int32_t*>(memPtr + GG_MEM_HDR_OFF_LEN);
+ return *reinterpret_cast<int32_t*>(memPtr + IGNITE_MEM_HDR_OFF_LEN);
}
void InteropMemory::Length(int8_t* memPtr, int32_t val)
{
- *reinterpret_cast<int32_t*>(memPtr + GG_MEM_HDR_OFF_LEN) = val;
+ *reinterpret_cast<int32_t*>(memPtr + IGNITE_MEM_HDR_OFF_LEN) = val;
}
int32_t InteropMemory::Flags(int8_t* memPtr)
{
- return *reinterpret_cast<int32_t*>(memPtr + GG_MEM_HDR_OFF_FLAGS);
+ return *reinterpret_cast<int32_t*>(memPtr + IGNITE_MEM_HDR_OFF_FLAGS);
}
void InteropMemory::Flags(int8_t* memPtr, int32_t val)
{
- *reinterpret_cast<int32_t*>(memPtr + GG_MEM_HDR_OFF_FLAGS) = val;
+ *reinterpret_cast<int32_t*>(memPtr + IGNITE_MEM_HDR_OFF_FLAGS) = val;
}
bool InteropMemory::IsExternal(int8_t* memPtr)
@@ -75,7 +75,7 @@ namespace gridgain
bool InteropMemory::IsExternal(int32_t flags)
{
- return (flags & GG_MEM_FLAG_EXT) != GG_MEM_FLAG_EXT;
+ return (flags & IGNITE_MEM_FLAG_EXT) != IGNITE_MEM_FLAG_EXT;
}
bool InteropMemory::IsPooled(int8_t* memPtr)
@@ -85,7 +85,7 @@ namespace gridgain
bool InteropMemory::IsPooled(int32_t flags)
{
- return (flags & GG_MEM_FLAG_POOLED) != 0;
+ return (flags & IGNITE_MEM_FLAG_POOLED) != 0;
}
bool InteropMemory::IsAcquired(int8_t* memPtr)
@@ -95,7 +95,7 @@ namespace gridgain
bool InteropMemory::IsAcquired(int32_t flags)
{
- return (flags & GG_MEM_FLAG_ACQUIRED) != 0;
+ return (flags & IGNITE_MEM_FLAG_ACQUIRED) != 0;
}
int8_t* InteropMemory::Pointer()
@@ -130,12 +130,12 @@ namespace gridgain
InteropUnpooledMemory::InteropUnpooledMemory(int32_t cap)
{
- memPtr = static_cast<int8_t*>(malloc(GG_MEM_HDR_LEN));
+ memPtr = static_cast<int8_t*>(malloc(IGNITE_MEM_HDR_LEN));
Data(memPtr, malloc(cap));
Capacity(memPtr, cap);
Length(memPtr, 0);
- Flags(memPtr, GG_MEM_FLAG_EXT);
+ Flags(memPtr, IGNITE_MEM_FLAG_EXT);
owning = true;
}
@@ -173,7 +173,7 @@ namespace gridgain
void InteropExternalMemory::Reallocate(int32_t cap)
{
if (JniContext::Reallocate(reinterpret_cast<int64_t>(memPtr), cap) == -1) {
- GG_ERROR_FORMATTED_2(GridError::GG_ERR_MEMORY, "Failed to reallocate external memory",
+ GG_ERROR_FORMATTED_2(GridError::IGNITE_ERR_MEMORY, "Failed to reallocate external memory",
"memPtr", PointerLong(), "requestedCapacity", cap)
}
}
[2/7] ignite git commit: IGNITE-1364: Renaming GG_ -> IGNITE_
Posted by vo...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
index 2f3d50f..d951070 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
@@ -551,7 +551,7 @@ namespace gridgain
else {
int32_t pos = stream->Position() - 1;
- GG_ERROR_FORMATTED_3(GridError::GG_ERR_PORTABLE, "Invalid header", "position", pos, "expected", GG_TYPE_UUID, "actual", typeId)
+ GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", GG_TYPE_UUID, "actual", typeId)
}
}
@@ -603,20 +603,20 @@ namespace gridgain
void PortableReaderImpl::CheckRawMode(bool expected)
{
if (expected && !rawMode) {
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Operation can be performed only in raw mode.")
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only in raw mode.")
}
else if (!expected && rawMode) {
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Operation cannot be performed in raw mode.")
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed in raw mode.")
}
}
void PortableReaderImpl::CheckSingleMode(bool expected)
{
if (expected && elemId != 0) {
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Operation cannot be performed when container is being read.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed when container is being read.");
}
else if (!expected && elemId == 0) {
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Operation can be performed only when container is being read.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only when container is being read.");
}
}
@@ -663,13 +663,13 @@ namespace gridgain
void PortableReaderImpl::CheckSession(int32_t expSes)
{
if (elemId != expSes) {
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Containter read session has been finished or is not started yet.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Containter read session has been finished or is not started yet.");
}
}
void PortableReaderImpl::ThrowOnInvalidHeader(int32_t pos, int8_t expHdr, int8_t hdr)
{
- GG_ERROR_FORMATTED_3(GridError::GG_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", hdr)
+ GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", hdr)
}
void PortableReaderImpl::ThrowOnInvalidHeader(int8_t expHdr, int8_t hdr)
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c4165ee/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
index 98395dd..0bc2d56 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
@@ -479,20 +479,20 @@ namespace gridgain
bool rawMode = rawPos != -1;
if (expected && !rawMode) {
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Operation can be performed only in raw mode.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only in raw mode.");
}
else if (!expected && rawMode) {
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Operation cannot be performed in raw mode.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed in raw mode.");
}
}
void PortableWriterImpl::CheckSingleMode(bool expected)
{
if (expected && elemId != 0) {
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Operation cannot be performed when container is being written.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed when container is being written.");
}
else if (!expected && elemId == 0) {
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Operation can be performed only when container is being written.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only when container is being written.");
}
}
@@ -509,7 +509,7 @@ namespace gridgain
{
if (elemId != expSes)
{
- GG_ERROR_1(GridError::GG_ERR_PORTABLE, "Containter write session has been finished or is not started yet.");
+ GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Containter write session has been finished or is not started yet.");
}
}
[7/7] ignite git commit: IGNITE-1364: Renaming GG_ -> IGNITE_ (4).
Posted by vo...@apache.org.
IGNITE-1364: Renaming GG_ -> IGNITE_ (4).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/356ab0bb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/356ab0bb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/356ab0bb
Branch: refs/heads/ignite-1364
Commit: 356ab0bb075a36a07373912d5e3856808b16a169
Parents: 664a105
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 3 13:11:02 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 3 13:11:02 2015 +0300
----------------------------------------------------------------------
.../main/cpp/core/include/gridgain/impl/portable/portable_common.h | 2 +-
.../cpp/core/include/gridgain/impl/portable/portable_writer_impl.h | 2 +-
.../src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/356ab0bb/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
index 193340c..7477c44 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
@@ -36,7 +36,7 @@ namespace gridgain
const int8_t IGNITE_HDR_FULL = 103;
/** Full header length. */
- const int32_t GG_FULL_HDR_LEN = 18;
+ const int32_t IGNITE_FULL_HDR_LEN = 18;
/** Type: object. */
const int8_t IGNITE_TYPE_OBJECT = IGNITE_HDR_FULL;
http://git-wip-us.apache.org/repos/asf/ignite/blob/356ab0bb/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
index a27fdac..96e718f 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
@@ -578,7 +578,7 @@ namespace gridgain
stream->WriteInt32(idRslvr.GetTypeId());
stream->WriteInt32(type.GetHashCode(obj));
- stream->Position(pos + 18);
+ stream->Position(pos + IGNITE_FULL_HDR_LEN);
type.Write(writer, obj);
http://git-wip-us.apache.org/repos/asf/ignite/blob/356ab0bb/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
index 5d6b845..fc72552 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
@@ -581,7 +581,7 @@ namespace gridgain
}
}
- stream->Position(pos + 18);
+ stream->Position(pos + IGNITE_FULL_HDR_LEN);
for (int32_t curPos = stream->Position(); curPos < marker;)
{
[5/7] ignite git commit: IGNITE-1364: Renaming GG_ -> IGNITE_
Posted by vo...@apache.org.
IGNITE-1364: Renaming GG_ -> IGNITE_
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/96245bfa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/96245bfa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/96245bfa
Branch: refs/heads/ignite-1364
Commit: 96245bfa9e40c6b3a41b9bfeb7a58106e98467b9
Parents: 7c4165e
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 3 13:03:45 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 3 13:03:45 2015 +0300
----------------------------------------------------------------------
.../main/cpp/core-test/src/cache_query_test.cpp | 16 +--
.../src/main/cpp/core-test/src/cache_test.cpp | 16 +--
.../src/portable_reader_writer_raw_test.cpp | 20 +--
.../src/portable_reader_writer_test.cpp | 20 +--
.../main/cpp/core/include/gridgain/grid_error.h | 14 +-
.../gridgain/impl/portable/portable_common.h | 74 +++++-----
.../impl/portable/portable_id_resolver.h | 2 +-
.../impl/portable/portable_reader_impl.h | 30 ++--
.../impl/portable/portable_writer_impl.h | 12 +-
.../include/gridgain/portable/portable_consts.h | 26 ++--
.../gridgain/portable/portable_raw_writer.h | 4 +-
.../include/gridgain/portable/portable_type.h | 32 ++---
.../include/gridgain/portable/portable_writer.h | 4 +-
.../src/impl/interop/interop_input_stream.cpp | 32 ++---
.../core/src/impl/interop/interop_memory.cpp | 2 +-
.../src/impl/interop/interop_output_stream.cpp | 24 ++--
.../src/impl/portable/portable_reader_impl.cpp | 128 ++++++++---------
.../src/impl/portable/portable_writer_impl.cpp | 138 +++++++++----------
18 files changed, 297 insertions(+), 297 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/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 5f3d79b..cc858ee 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
@@ -135,13 +135,13 @@ namespace gridgain
/**
* Portable type definition.
*/
- GG_PORTABLE_TYPE_START(QueryPerson)
- GG_PORTABLE_GET_TYPE_ID_AS_HASH(QueryPerson)
- GG_PORTABLE_GET_TYPE_NAME_AS_IS(QueryPerson)
- GG_PORTABLE_GET_FIELD_ID_AS_HASH
- GG_PORTABLE_GET_HASH_CODE_ZERO(QueryPerson)
- GG_PORTABLE_IS_NULL_FALSE(QueryPerson)
- GG_PORTABLE_GET_NULL_DEFAULT_CTOR(QueryPerson)
+ IGNITE_PORTABLE_TYPE_START(QueryPerson)
+ IGNITE_PORTABLE_GET_TYPE_ID_AS_HASH(QueryPerson)
+ IGNITE_PORTABLE_GET_TYPE_NAME_AS_IS(QueryPerson)
+ IGNITE_PORTABLE_GET_FIELD_ID_AS_HASH
+ IGNITE_PORTABLE_GET_HASH_CODE_ZERO(QueryPerson)
+ IGNITE_PORTABLE_IS_NULL_FALSE(QueryPerson)
+ IGNITE_PORTABLE_GET_NULL_DEFAULT_CTOR(QueryPerson)
void Write(PortableWriter& writer, QueryPerson obj)
{
@@ -157,7 +157,7 @@ namespace gridgain
return QueryPerson(name, age);
}
- GG_PORTABLE_TYPE_END
+ IGNITE_PORTABLE_TYPE_END
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/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 134c118..9f870f9 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
@@ -50,13 +50,13 @@ namespace gridgain
{
namespace portable
{
- GG_PORTABLE_TYPE_START(Person)
- GG_PORTABLE_GET_TYPE_ID_AS_HASH(Person)
- GG_PORTABLE_GET_TYPE_NAME_AS_IS(Person)
- GG_PORTABLE_GET_FIELD_ID_AS_HASH
- GG_PORTABLE_GET_HASH_CODE_ZERO(Person)
- GG_PORTABLE_IS_NULL_FALSE(Person)
- GG_PORTABLE_GET_NULL_DEFAULT_CTOR(Person)
+ IGNITE_PORTABLE_TYPE_START(Person)
+ IGNITE_PORTABLE_GET_TYPE_ID_AS_HASH(Person)
+ IGNITE_PORTABLE_GET_TYPE_NAME_AS_IS(Person)
+ IGNITE_PORTABLE_GET_FIELD_ID_AS_HASH
+ IGNITE_PORTABLE_GET_HASH_CODE_ZERO(Person)
+ IGNITE_PORTABLE_IS_NULL_FALSE(Person)
+ IGNITE_PORTABLE_GET_NULL_DEFAULT_CTOR(Person)
void Write(PortableWriter& writer, Person obj)
{
@@ -72,7 +72,7 @@ namespace gridgain
return Person(name, age);
}
- GG_PORTABLE_TYPE_END
+ IGNITE_PORTABLE_TYPE_END
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/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 3eb773e..59ee741 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
@@ -377,7 +377,7 @@ void CheckRawCollectionEmpty(CollectionType* colType)
if (colType)
BOOST_REQUIRE(colReader.GetType() == *colType);
else
- BOOST_REQUIRE(colReader.GetType() == GG_COLLECTION_UNDEFINED);
+ BOOST_REQUIRE(colReader.GetType() == IGNITE_COLLECTION_UNDEFINED);
BOOST_REQUIRE(colReader.GetSize() == 0);
BOOST_REQUIRE(!colReader.HasNext());
@@ -457,7 +457,7 @@ void CheckRawCollection(CollectionType* colType)
if (colType)
BOOST_REQUIRE(colReader.GetType() == *colType);
else
- BOOST_REQUIRE(colReader.GetType() == GG_COLLECTION_UNDEFINED);
+ BOOST_REQUIRE(colReader.GetType() == IGNITE_COLLECTION_UNDEFINED);
BOOST_REQUIRE(colReader.GetSize() == 3);
BOOST_REQUIRE(!colReader.IsNull());
@@ -537,7 +537,7 @@ void CheckRawMapEmpty(MapType* mapType)
if (mapType)
BOOST_REQUIRE(mapReader.GetType() == *mapType);
else
- BOOST_REQUIRE(mapReader.GetType() == GG_MAP_UNDEFINED);
+ BOOST_REQUIRE(mapReader.GetType() == IGNITE_MAP_UNDEFINED);
BOOST_REQUIRE(mapReader.GetSize() == 0);
BOOST_REQUIRE(!mapReader.HasNext());
@@ -620,7 +620,7 @@ void CheckRawMap(MapType* mapType)
if (mapType)
BOOST_REQUIRE(mapReader.GetType() == *mapType);
else
- BOOST_REQUIRE(mapReader.GetType() == GG_MAP_UNDEFINED);
+ BOOST_REQUIRE(mapReader.GetType() == IGNITE_MAP_UNDEFINED);
BOOST_REQUIRE(mapReader.GetSize() == 3);
BOOST_REQUIRE(!mapReader.IsNull());
@@ -1413,7 +1413,7 @@ BOOST_AUTO_TEST_CASE(TestCollectionNull)
PortableCollectionReader<PortableInner> colReader = rawReader.ReadCollection<PortableInner>();
- BOOST_REQUIRE(colReader.GetType() == GG_COLLECTION_UNDEFINED);
+ BOOST_REQUIRE(colReader.GetType() == IGNITE_COLLECTION_UNDEFINED);
BOOST_REQUIRE(colReader.GetSize() == -1);
BOOST_REQUIRE(!colReader.HasNext());
BOOST_REQUIRE(colReader.IsNull());
@@ -1439,7 +1439,7 @@ BOOST_AUTO_TEST_CASE(TestCollectionEmpty)
BOOST_AUTO_TEST_CASE(TestCollectionEmptyTyped)
{
- CollectionType typ = GG_COLLECTION_CONCURRENT_SKIP_LIST_SET;
+ CollectionType typ = IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET;
CheckRawCollectionEmpty(&typ);
}
@@ -1451,7 +1451,7 @@ BOOST_AUTO_TEST_CASE(TestCollection)
BOOST_AUTO_TEST_CASE(testCollectionTyped)
{
- CollectionType typ = GG_COLLECTION_CONCURRENT_SKIP_LIST_SET;
+ CollectionType typ = IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET;
CheckRawCollection(&typ);
}
@@ -1475,7 +1475,7 @@ BOOST_AUTO_TEST_CASE(TestMapNull)
PortableMapReader<int8_t, PortableInner> mapReader = rawReader.ReadMap<int8_t, PortableInner>();
- BOOST_REQUIRE(mapReader.GetType() == GG_MAP_UNDEFINED);
+ BOOST_REQUIRE(mapReader.GetType() == IGNITE_MAP_UNDEFINED);
BOOST_REQUIRE(mapReader.GetSize() == -1);
BOOST_REQUIRE(!mapReader.HasNext());
BOOST_REQUIRE(mapReader.IsNull());
@@ -1504,7 +1504,7 @@ BOOST_AUTO_TEST_CASE(TestMapEmpty)
BOOST_AUTO_TEST_CASE(TestMapEmptyTyped)
{
- MapType typ = GG_MAP_CONCURRENT_HASH_MAP;
+ MapType typ = IGNITE_MAP_CONCURRENT_HASH_MAP;
CheckRawMapEmpty(&typ);
}
@@ -1516,7 +1516,7 @@ BOOST_AUTO_TEST_CASE(TestMap)
BOOST_AUTO_TEST_CASE(TestMapTyped)
{
- MapType typ = GG_MAP_CONCURRENT_HASH_MAP;
+ MapType typ = IGNITE_MAP_CONCURRENT_HASH_MAP;
CheckRawMap(&typ);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/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 11e2931..139addc 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
@@ -448,7 +448,7 @@ void CheckCollectionEmpty(CollectionType* colType)
if (colType)
BOOST_REQUIRE(colReader.GetType() == *colType);
else
- BOOST_REQUIRE(colReader.GetType() == GG_COLLECTION_UNDEFINED);
+ BOOST_REQUIRE(colReader.GetType() == IGNITE_COLLECTION_UNDEFINED);
BOOST_REQUIRE(colReader.GetSize() == 0);
BOOST_REQUIRE(!colReader.HasNext());
@@ -534,7 +534,7 @@ void CheckCollection(CollectionType* colType)
if (colType)
BOOST_REQUIRE(colReader.GetType() == *colType);
else
- BOOST_REQUIRE(colReader.GetType() == GG_COLLECTION_UNDEFINED);
+ BOOST_REQUIRE(colReader.GetType() == IGNITE_COLLECTION_UNDEFINED);
BOOST_REQUIRE(colReader.GetSize() == 3);
BOOST_REQUIRE(!colReader.IsNull());
@@ -620,7 +620,7 @@ void CheckMapEmpty(MapType* mapType)
if (mapType)
BOOST_REQUIRE(mapReader.GetType() == *mapType);
else
- BOOST_REQUIRE(mapReader.GetType() == GG_MAP_UNDEFINED);
+ BOOST_REQUIRE(mapReader.GetType() == IGNITE_MAP_UNDEFINED);
BOOST_REQUIRE(mapReader.GetSize() == 0);
BOOST_REQUIRE(!mapReader.HasNext());
@@ -709,7 +709,7 @@ void CheckMap(MapType* mapType)
if (mapType)
BOOST_REQUIRE(mapReader.GetType() == *mapType);
else
- BOOST_REQUIRE(mapReader.GetType() == GG_MAP_UNDEFINED);
+ BOOST_REQUIRE(mapReader.GetType() == IGNITE_MAP_UNDEFINED);
BOOST_REQUIRE(mapReader.GetSize() == 3);
BOOST_REQUIRE(!mapReader.IsNull());
@@ -1647,7 +1647,7 @@ BOOST_AUTO_TEST_CASE(TestCollectionNull)
PortableCollectionReader<PortableInner> colReader = reader.ReadCollection<PortableInner>("field1");
- BOOST_REQUIRE(colReader.GetType() == GG_COLLECTION_UNDEFINED);
+ BOOST_REQUIRE(colReader.GetType() == IGNITE_COLLECTION_UNDEFINED);
BOOST_REQUIRE(colReader.GetSize() == -1);
BOOST_REQUIRE(!colReader.HasNext());
BOOST_REQUIRE(colReader.IsNull());
@@ -1673,7 +1673,7 @@ BOOST_AUTO_TEST_CASE(TestCollectionEmpty)
BOOST_AUTO_TEST_CASE(TestCollectionEmptyTyped)
{
- CollectionType typ = GG_COLLECTION_CONCURRENT_SKIP_LIST_SET;
+ CollectionType typ = IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET;
CheckCollectionEmpty(&typ);
}
@@ -1685,7 +1685,7 @@ BOOST_AUTO_TEST_CASE(TestCollection)
BOOST_AUTO_TEST_CASE(testCollectionTyped)
{
- CollectionType typ = GG_COLLECTION_CONCURRENT_SKIP_LIST_SET;
+ CollectionType typ = IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET;
CheckCollection(&typ);
}
@@ -1715,7 +1715,7 @@ BOOST_AUTO_TEST_CASE(TestMapNull)
PortableMapReader<int8_t, PortableInner> mapReader = reader.ReadMap<int8_t, PortableInner>("field1");
- BOOST_REQUIRE(mapReader.GetType() == GG_MAP_UNDEFINED);
+ BOOST_REQUIRE(mapReader.GetType() == IGNITE_MAP_UNDEFINED);
BOOST_REQUIRE(mapReader.GetSize() == -1);
BOOST_REQUIRE(!mapReader.HasNext());
BOOST_REQUIRE(mapReader.IsNull());
@@ -1744,7 +1744,7 @@ BOOST_AUTO_TEST_CASE(TestMapEmpty)
BOOST_AUTO_TEST_CASE(TestMapEmptyTyped)
{
- MapType typ = GG_MAP_CONCURRENT_HASH_MAP;
+ MapType typ = IGNITE_MAP_CONCURRENT_HASH_MAP;
CheckMapEmpty(&typ);
}
@@ -1756,7 +1756,7 @@ BOOST_AUTO_TEST_CASE(TestMap)
BOOST_AUTO_TEST_CASE(TestMapTyped)
{
- MapType typ = GG_MAP_CONCURRENT_HASH_MAP;
+ MapType typ = IGNITE_MAP_CONCURRENT_HASH_MAP;
CheckMap(&typ);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h b/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
index b8d1099..6774b45 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
@@ -23,43 +23,43 @@
#include <ignite/common/common.h>
-#define GG_ERROR_1(code, part1) { \
+#define IGNITE_ERROR_1(code, part1) { \
std::stringstream stream; \
stream << (part1); \
throw gridgain::GridError(code, stream.str().c_str()); \
}
-#define GG_ERROR_2(code, part1, part2) { \
+#define IGNITE_ERROR_2(code, part1, part2) { \
std::stringstream stream; \
stream << (part1) << (part2); \
throw gridgain::GridError(code, stream.str().c_str()); \
}
-#define GG_ERROR_3(code, part1, part2, part3) { \
+#define IGNITE_ERROR_3(code, part1, part2, part3) { \
std::stringstream stream; \
stream << (part1) << (part2) << (part3); \
throw gridgain::GridError(code, stream.str().c_str()); \
}
-#define GG_ERROR_FORMATTED_1(code, msg, key1, val1) { \
+#define IGNITE_ERROR_FORMATTED_1(code, msg, key1, val1) { \
std::stringstream stream; \
stream << msg << " [" << key1 << "=" << (val1) << "]"; \
throw gridgain::GridError(code, stream.str().c_str()); \
}
-#define GG_ERROR_FORMATTED_2(code, msg, key1, val1, key2, val2) { \
+#define IGNITE_ERROR_FORMATTED_2(code, msg, key1, val1, key2, val2) { \
std::stringstream stream; \
stream << msg << " [" << key1 << "=" << (val1) << ", " << key2 << "=" << (val2) << "]"; \
throw gridgain::GridError(code, stream.str().c_str()); \
}
-#define GG_ERROR_FORMATTED_3(code, msg, key1, val1, key2, val2, key3, val3) { \
+#define IGNITE_ERROR_FORMATTED_3(code, msg, key1, val1, key2, val2, key3, val3) { \
std::stringstream stream; \
stream << msg << " [" << key1 << "=" << (val1) << ", " << key2 << "=" << (val2) << ", " << key3 << "=" << (val3) << "]"; \
throw gridgain::GridError(code, stream.str().c_str()); \
}
-#define GG_ERROR_FORMATTED_4(code, msg, key1, val1, key2, val2, key3, val3, key4, val4) { \
+#define IGNITE_ERROR_FORMATTED_4(code, msg, key1, val1, key2, val2, key3, val3, key4, val4) { \
std::stringstream stream; \
stream << msg << " [" << key1 << "=" << (val1) << ", " << key2 << "=" << (val2) << ", " << key3 << "=" << (val3) << ", " << key4 << "=" << (val4) << "]"; \
throw gridgain::GridError(code, stream.str().c_str()); \
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
index 1fd39fd..193340c 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
@@ -27,118 +27,118 @@ namespace gridgain
namespace portable
{
/** Header: null. */
- const int8_t GG_HDR_NULL = 101;
+ const int8_t IGNITE_HDR_NULL = 101;
/** Header: handle. */
- const int8_t GG_HDR_HND = 102;
+ const int8_t IGNITE_HDR_HND = 102;
/** Header: fulle form. */
- const int8_t GG_HDR_FULL = 103;
+ const int8_t IGNITE_HDR_FULL = 103;
/** Full header length. */
const int32_t GG_FULL_HDR_LEN = 18;
/** Type: object. */
- const int8_t GG_TYPE_OBJECT = GG_HDR_FULL;
+ const int8_t IGNITE_TYPE_OBJECT = IGNITE_HDR_FULL;
/** Type: unsigned byte. */
- const int8_t GG_TYPE_BYTE = 1;
+ const int8_t IGNITE_TYPE_BYTE = 1;
/** Type: short. */
- const int8_t GG_TYPE_SHORT = 2;
+ const int8_t IGNITE_TYPE_SHORT = 2;
/** Type: int. */
- const int8_t GG_TYPE_INT = 3;
+ const int8_t IGNITE_TYPE_INT = 3;
/** Type: long. */
- const int8_t GG_TYPE_LONG = 4;
+ const int8_t IGNITE_TYPE_LONG = 4;
/** Type: float. */
- const int8_t GG_TYPE_FLOAT = 5;
+ const int8_t IGNITE_TYPE_FLOAT = 5;
/** Type: double. */
- const int8_t GG_TYPE_DOUBLE = 6;
+ const int8_t IGNITE_TYPE_DOUBLE = 6;
/** Type: char. */
- const int8_t GG_TYPE_CHAR = 7;
+ const int8_t IGNITE_TYPE_CHAR = 7;
/** Type: boolean. */
- const int8_t GG_TYPE_BOOL = 8;
+ const int8_t IGNITE_TYPE_BOOL = 8;
/** Type: decimal. */
- const int8_t GG_TYPE_DECIMAL = 30;
+ const int8_t IGNITE_TYPE_DECIMAL = 30;
/** Type: string. */
- const int8_t GG_TYPE_STRING = 9;
+ const int8_t IGNITE_TYPE_STRING = 9;
/** Type: UUID. */
- const int8_t GG_TYPE_UUID = 10;
+ const int8_t IGNITE_TYPE_UUID = 10;
/** Type: date. */
- const int8_t GG_TYPE_DATE = 11;
+ const int8_t IGNITE_TYPE_DATE = 11;
/** Type: unsigned byte array. */
- const int8_t GG_TYPE_ARRAY_BYTE = 12;
+ const int8_t IGNITE_TYPE_ARRAY_BYTE = 12;
/** Type: short array. */
- const int8_t GG_TYPE_ARRAY_SHORT = 13;
+ const int8_t IGNITE_TYPE_ARRAY_SHORT = 13;
/** Type: int array. */
- const int8_t GG_TYPE_ARRAY_INT = 14;
+ const int8_t IGNITE_TYPE_ARRAY_INT = 14;
/** Type: long array. */
- const int8_t GG_TYPE_ARRAY_LONG = 15;
+ const int8_t IGNITE_TYPE_ARRAY_LONG = 15;
/** Type: float array. */
- const int8_t GG_TYPE_ARRAY_FLOAT = 16;
+ const int8_t IGNITE_TYPE_ARRAY_FLOAT = 16;
/** Type: double array. */
- const int8_t GG_TYPE_ARRAY_DOUBLE = 17;
+ const int8_t IGNITE_TYPE_ARRAY_DOUBLE = 17;
/** Type: char array. */
- const int8_t GG_TYPE_ARRAY_CHAR = 18;
+ const int8_t IGNITE_TYPE_ARRAY_CHAR = 18;
/** Type: boolean array. */
- const int8_t GG_TYPE_ARRAY_BOOL = 19;
+ const int8_t IGNITE_TYPE_ARRAY_BOOL = 19;
/** Type: decimal array. */
- const int8_t GG_TYPE_ARRAY_DECIMAL = 31;
+ const int8_t IGNITE_TYPE_ARRAY_DECIMAL = 31;
/** Type: string array. */
- const int8_t GG_TYPE_ARRAY_STRING = 20;
+ const int8_t IGNITE_TYPE_ARRAY_STRING = 20;
/** Type: UUID array. */
- const int8_t GG_TYPE_ARRAY_UUID = 21;
+ const int8_t IGNITE_TYPE_ARRAY_UUID = 21;
/** Type: date array. */
- const int8_t GG_TYPE_ARRAY_DATE = 22;
+ const int8_t IGNITE_TYPE_ARRAY_DATE = 22;
/** Type: object array. */
- const int8_t GG_TYPE_ARRAY = 23;
+ const int8_t IGNITE_TYPE_ARRAY = 23;
/** Type: collection. */
- const int8_t GG_TYPE_COLLECTION = 24;
+ const int8_t IGNITE_TYPE_COLLECTION = 24;
/** Type: map. */
- const int8_t GG_TYPE_MAP = 25;
+ const int8_t IGNITE_TYPE_MAP = 25;
/** Type: map entry. */
- const int8_t GG_TYPE_MAP_ENTRY = 26;
+ const int8_t IGNITE_TYPE_MAP_ENTRY = 26;
/** Type: portable object. */
- const int8_t GG_TYPE_PORTABLE = 27;
+ const int8_t IGNITE_TYPE_PORTABLE = 27;
/** Read/write single object. */
- const int32_t GG_PORTABLE_MODE_SINGLE = 0;
+ const int32_t IGNITE_PORTABLE_MODE_SINGLE = 0;
/** Read/write array. */
- const int32_t GG_PORTABLE_MODE_ARRAY = 1;
+ const int32_t IGNITE_PORTABLE_MODE_ARRAY = 1;
/** Read/write collection. */
- const int32_t GG_PORTABLE_MODE_COL = 2;
+ const int32_t IGNITE_PORTABLE_MODE_COL = 2;
/** Read/write map. */
- const int32_t GG_PORTABLE_MODE_MAP = 3;
+ const int32_t IGNITE_PORTABLE_MODE_MAP = 3;
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
index 4eaf481..825f919 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
@@ -90,7 +90,7 @@ namespace gridgain
virtual int32_t GetFieldId(const int32_t typeId, const char* name) {
if (!name)
{
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Field name cannot be NULL.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Field name cannot be NULL.");
}
return type.GetFieldId(name);
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
index 4437e10..edee162 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
@@ -636,12 +636,12 @@ namespace gridgain
int32_t pos = stream->Position();
int8_t hdr = stream->ReadInt8();
- if (hdr == GG_HDR_NULL)
+ if (hdr == IGNITE_HDR_NULL)
return GetNull<T>();
- else if (hdr == GG_HDR_HND) {
- GG_ERROR_1(gridgain::GridError::IGNITE_ERR_PORTABLE, "Circular references are not supported.");
+ else if (hdr == IGNITE_HDR_HND) {
+ IGNITE_ERROR_1(gridgain::GridError::IGNITE_ERR_PORTABLE, "Circular references are not supported.");
}
- else if (hdr == GG_TYPE_PORTABLE)
+ else if (hdr == IGNITE_TYPE_PORTABLE)
{
int32_t portLen = stream->ReadInt32(); // Total length of portable object.
int32_t curPos = stream->Position();
@@ -798,11 +798,11 @@ namespace gridgain
if (typeId == expHdr)
return func(stream);
- else if (typeId != GG_HDR_NULL)
+ else if (typeId != IGNITE_HDR_NULL)
{
int32_t pos = stream->Position();
- GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid type ID",
+ IGNITE_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid type ID",
"position", pos, "expected", expHdr, "actual", typeId)
}
}
@@ -912,7 +912,7 @@ namespace gridgain
return realLen;
}
- else if (hdr != GG_HDR_NULL)
+ else if (hdr != IGNITE_HDR_NULL)
ThrowOnInvalidHeader(stream->Position() - 1, expHdr, hdr);
return -1;
@@ -938,7 +938,7 @@ namespace gridgain
if (hdr == expHdr)
return func(stream);
- else if (hdr == GG_HDR_NULL)
+ else if (hdr == IGNITE_HDR_NULL)
return Guid();
else {
ThrowOnInvalidHeader(stream->Position() - 1, expHdr, hdr);
@@ -1026,12 +1026,12 @@ namespace gridgain
if (typeId == expHdr)
return func(stream);
- else if (typeId == GG_HDR_NULL)
+ else if (typeId == IGNITE_HDR_NULL)
return GetNull<T>();
else {
int32_t pos = stream->Position() - 1;
- GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", typeId)
+ IGNITE_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", typeId)
}
}
@@ -1049,12 +1049,12 @@ namespace gridgain
if (typeId == expHdr)
return func(stream);
- else if (typeId == GG_HDR_NULL)
+ else if (typeId == IGNITE_HDR_NULL)
return dflt;
else {
int32_t pos = stream->Position() - 1;
- GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", typeId)
+ IGNITE_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", typeId)
}
}
};
@@ -1092,7 +1092,7 @@ namespace gridgain
{
int8_t typeId = stream->ReadInt8();
- if (typeId == GG_TYPE_STRING)
+ if (typeId == IGNITE_TYPE_STRING)
{
bool utf8Mode = stream->ReadBool();
int32_t realLen = stream->ReadInt32();
@@ -1115,12 +1115,12 @@ namespace gridgain
return std::string(arr.target);
}
- else if (typeId == GG_HDR_NULL)
+ else if (typeId == IGNITE_HDR_NULL)
return std::string();
else {
int32_t pos = stream->Position() - 1;
- GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", GG_TYPE_STRING, "actual", typeId)
+ IGNITE_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", IGNITE_TYPE_STRING, "actual", typeId)
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
index d92a863..a27fdac 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
@@ -524,7 +524,7 @@ namespace gridgain
CheckRawMode(false);
// 1. Write field ID.
- WriteFieldId(fieldName, GG_TYPE_OBJECT);
+ WriteFieldId(fieldName, IGNITE_TYPE_OBJECT);
// 2. Preserve space for length.
int32_t lenPos = stream->Position();
@@ -559,7 +559,7 @@ namespace gridgain
gridgain::portable::PortableType<T> type;
if (type.IsNull(obj))
- stream->WriteInt8(GG_HDR_NULL);
+ stream->WriteInt8(IGNITE_HDR_NULL);
else
{
TemplatedPortableIdResolver<T> idRslvr(type);
@@ -573,7 +573,7 @@ namespace gridgain
int32_t pos = stream->Position();
- stream->WriteInt8(GG_HDR_FULL);
+ stream->WriteInt8(IGNITE_HDR_FULL);
stream->WriteBool(true);
stream->WriteInt32(idRslvr.GetTypeId());
stream->WriteInt32(type.GetHashCode(obj));
@@ -675,7 +675,7 @@ namespace gridgain
func(stream, val, len);
}
else
- stream->WriteInt8(GG_HDR_NULL);
+ stream->WriteInt8(IGNITE_HDR_NULL);
}
/**
@@ -742,7 +742,7 @@ namespace gridgain
else
{
stream->WriteInt32(1);
- stream->WriteInt8(GG_HDR_NULL);
+ stream->WriteInt8(IGNITE_HDR_NULL);
}
}
@@ -848,7 +848,7 @@ namespace gridgain
int32_t len = static_cast<int32_t>(strlen(obj0));
- stream->WriteInt8(GG_TYPE_STRING);
+ stream->WriteInt8(IGNITE_TYPE_STRING);
PortableUtils::WriteString(stream, obj0, len);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
index ef69d7f..2c1f6bc 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
@@ -32,37 +32,37 @@ namespace gridgain
/**
* Undefined. Maps to ArrayList in Java.
*/
- GG_COLLECTION_UNDEFINED = 0,
+ IGNITE_COLLECTION_UNDEFINED = 0,
/**
* Array list. Maps to ArrayList in Java.
*/
- GG_COLLECTION_ARRAY_LIST = 1,
+ IGNITE_COLLECTION_ARRAY_LIST = 1,
/**
* Linked list. Maps to LinkedList in Java.
*/
- GG_COLLECTION_LINKED_LIST = 2,
+ IGNITE_COLLECTION_LINKED_LIST = 2,
/**
* Hash set. Maps to HashSet in Java.
*/
- GG_COLLECTION_HASH_SET = 3,
+ IGNITE_COLLECTION_HASH_SET = 3,
/**
* Linked hash set. Maps to LinkedHashSet in Java.
*/
- GG_COLLECTION_LINKED_HASH_SET = 4,
+ IGNITE_COLLECTION_LINKED_HASH_SET = 4,
/**
* Tree set. Maps to TreeSet in Java.
*/
- GG_COLLECTION_TREE_SET = 5,
+ IGNITE_COLLECTION_TREE_SET = 5,
/**
* Concurrent skip list set. Maps to ConcurrentSkipListSet in Java.
*/
- GG_COLLECTION_CONCURRENT_SKIP_LIST_SET = 6
+ IGNITE_COLLECTION_CONCURRENT_SKIP_LIST_SET = 6
};
/**
@@ -73,32 +73,32 @@ namespace gridgain
/**
* Undefined. Maps to HashMap in Java.
*/
- GG_MAP_UNDEFINED = 0,
+ IGNITE_MAP_UNDEFINED = 0,
/**
* Hash map. Maps to HashMap in Java.
*/
- GG_MAP_HASH_MAP = 1,
+ IGNITE_MAP_HASH_MAP = 1,
/**
* Linked hash map. Maps to LinkedHashMap in Java.
*/
- GG_MAP_LINKED_HASH_MAP = 2,
+ IGNITE_MAP_LINKED_HASH_MAP = 2,
/**
* Tree map. Maps to TreeMap in Java.
*/
- GG_MAP_TREE_MAP = 3,
+ IGNITE_MAP_TREE_MAP = 3,
/**
* Concurrent hash map. Maps to ConcurrentHashMap in Java.
*/
- GG_MAP_CONCURRENT_HASH_MAP = 4,
+ IGNITE_MAP_CONCURRENT_HASH_MAP = 4,
/**
* Properties map. Maps to Properties in Java.
*/
- GG_MAP_PROPERTIES_MAP = 5
+ IGNITE_MAP_PROPERTIES_MAP = 5
};
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
index 5830e68..3a3ac38 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
@@ -237,7 +237,7 @@ namespace gridgain
template<typename T>
PortableCollectionWriter<T> WriteCollection()
{
- return WriteCollection<T>(GG_COLLECTION_UNDEFINED);
+ return WriteCollection<T>(IGNITE_COLLECTION_UNDEFINED);
}
/**
@@ -263,7 +263,7 @@ namespace gridgain
template<typename K, typename V>
PortableMapWriter<K, V> WriteMap()
{
- return WriteMap<K, V>(GG_MAP_UNDEFINED);
+ return WriteMap<K, V>(IGNITE_MAP_UNDEFINED);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
index ca8f6c9..c1fda73 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
@@ -27,7 +27,7 @@
/**
* Start portable type definition.
*/
-#define GG_PORTABLE_TYPE_START(T) \
+#define IGNITE_PORTABLE_TYPE_START(T) \
template<> \
struct PortableType<T> \
{
@@ -35,13 +35,13 @@ struct PortableType<T> \
/**
* End portable type definition.
*/
-#define GG_PORTABLE_TYPE_END \
+#define IGNITE_PORTABLE_TYPE_END \
};
/**
* Implementation of GetTypeId() which returns predefined constant.
*/
-#define GG_PORTABLE_GET_TYPE_ID_AS_CONST(id) \
+#define IGNITE_PORTABLE_GET_TYPE_ID_AS_CONST(id) \
int32_t GetTypeId() \
{ \
return id; \
@@ -50,7 +50,7 @@ int32_t GetTypeId() \
/**
* Implementation of GetTypeId() which returns hash of passed type name.
*/
-#define GG_PORTABLE_GET_TYPE_ID_AS_HASH(typeName) \
+#define IGNITE_PORTABLE_GET_TYPE_ID_AS_HASH(typeName) \
int32_t GetTypeId() \
{ \
return GetPortableStringHashCode(#typeName); \
@@ -59,7 +59,7 @@ int32_t GetTypeId() \
/**
* Implementation of GetTypeName() which returns type name as is.
*/
-#define GG_PORTABLE_GET_TYPE_NAME_AS_IS(typeName) \
+#define IGNITE_PORTABLE_GET_TYPE_NAME_AS_IS(typeName) \
std::string GetTypeName() \
{ \
return #typeName; \
@@ -68,7 +68,7 @@ std::string GetTypeName() \
/**
* Default implementation of GetFieldId() function which returns Java-way hash code of the string.
*/
-#define GG_PORTABLE_GET_FIELD_ID_AS_HASH \
+#define IGNITE_PORTABLE_GET_FIELD_ID_AS_HASH \
int32_t GetFieldId(const char* name) \
{ \
return GetPortableStringHashCode(name); \
@@ -77,7 +77,7 @@ int32_t GetFieldId(const char* name) \
/**
* Implementation of GetHashCode() function which always returns 0.
*/
-#define GG_PORTABLE_GET_HASH_CODE_ZERO(T) \
+#define IGNITE_PORTABLE_GET_HASH_CODE_ZERO(T) \
int32_t GetHashCode(const T& obj) \
{ \
return 0; \
@@ -86,7 +86,7 @@ int32_t GetHashCode(const T& obj) \
/**
* Implementation of IsNull() function which always returns false.
*/
-#define GG_PORTABLE_IS_NULL_FALSE(T) \
+#define IGNITE_PORTABLE_IS_NULL_FALSE(T) \
bool IsNull(const T& obj) \
{ \
return false; \
@@ -95,7 +95,7 @@ bool IsNull(const T& obj) \
/**
* Implementation of IsNull() function which return true if passed object is null pointer.
*/
-#define GG_PORTABLE_IS_NULL_IF_NULLPTR(T) \
+#define IGNITE_PORTABLE_IS_NULL_IF_NULLPTR(T) \
bool IsNull(const T& obj) \
{ \
return obj; \
@@ -104,7 +104,7 @@ bool IsNull(const T& obj) \
/**
* Implementation of GetNull() function which returns an instance created with defult constructor.
*/
-#define GG_PORTABLE_GET_NULL_DEFAULT_CTOR(T) \
+#define IGNITE_PORTABLE_GET_NULL_DEFAULT_CTOR(T) \
T GetNull() \
{ \
return T(); \
@@ -113,7 +113,7 @@ T GetNull() \
/**
* Implementation of GetNull() function which returns NULL pointer.
*/
-#define GG_PORTABLE_GET_NULL_NULLPTR(T) \
+#define IGNITE_PORTABLE_GET_NULL_NULLPTR(T) \
T GetNull() \
{ \
return NULL; \
@@ -147,7 +147,7 @@ namespace gridgain
*/
int32_t GetTypeId()
{
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "GetTypeId function is not defined for portable type.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "GetTypeId function is not defined for portable type.");
}
/**
@@ -157,7 +157,7 @@ namespace gridgain
*/
std::string GetTypeName()
{
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "GetTypeName function is not defined for portable type.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "GetTypeName function is not defined for portable type.");
}
/**
@@ -190,7 +190,7 @@ namespace gridgain
*/
void Write(PortableWriter& writer, const T& obj)
{
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Write function is not defined for portable type.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Write function is not defined for portable type.");
}
/**
@@ -201,7 +201,7 @@ namespace gridgain
*/
T Read(PortableReader& reader)
{
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Read function is not defined for portable type.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Read function is not defined for portable type.");
}
/**
@@ -222,7 +222,7 @@ namespace gridgain
*/
T GetNull()
{
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "GetNull function is not defined for portable type.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "GetNull function is not defined for portable type.");
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
index 2a9c098..2cbc201 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
@@ -261,7 +261,7 @@ namespace gridgain
template<typename T>
PortableCollectionWriter<T> WriteCollection(const char* fieldName)
{
- return WriteCollection<T>(fieldName, GG_COLLECTION_UNDEFINED);
+ return WriteCollection<T>(fieldName, IGNITE_COLLECTION_UNDEFINED);
}
/**
@@ -289,7 +289,7 @@ namespace gridgain
template<typename K, typename V>
PortableMapWriter<K, V> WriteMap(const char* fieldName)
{
- return WriteMap<K, V>(fieldName, GG_MAP_UNDEFINED);
+ return WriteMap<K, V>(fieldName, IGNITE_MAP_UNDEFINED);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp b/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
index c146482..89fb5fa 100644
--- a/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
@@ -23,7 +23,7 @@
/**
* Common macro to read a single value.
*/
-#define GG_INTEROP_IN_READ(type, len) { \
+#define IGNITE_INTEROP_IN_READ(type, len) { \
EnsureEnoughData(len); \
type res = *reinterpret_cast<type*>(data + pos); \
Shift(len); \
@@ -33,7 +33,7 @@
/**
* Common macro to read an array.
*/
-#define GG_INTEROP_IN_READ_ARRAY(len, shift) { \
+#define IGNITE_INTEROP_IN_READ_ARRAY(len, shift) { \
CopyAndShift(reinterpret_cast<int8_t*>(res), 0, len << shift); \
}
@@ -66,12 +66,12 @@ namespace gridgain
int8_t InteropInputStream::ReadInt8()
{
- GG_INTEROP_IN_READ(int8_t, 1);
+ IGNITE_INTEROP_IN_READ(int8_t, 1);
}
void InteropInputStream::ReadInt8Array(int8_t* const res, const int32_t len)
{
- GG_INTEROP_IN_READ_ARRAY(len, 0);
+ IGNITE_INTEROP_IN_READ_ARRAY(len, 0);
}
bool InteropInputStream::ReadBool()
@@ -87,27 +87,27 @@ namespace gridgain
int16_t InteropInputStream::ReadInt16()
{
- GG_INTEROP_IN_READ(int16_t, 2);
+ IGNITE_INTEROP_IN_READ(int16_t, 2);
}
void InteropInputStream::ReadInt16Array(int16_t* const res, const int32_t len)
{
- GG_INTEROP_IN_READ_ARRAY(len, 1);
+ IGNITE_INTEROP_IN_READ_ARRAY(len, 1);
}
uint16_t InteropInputStream::ReadUInt16()
{
- GG_INTEROP_IN_READ(uint16_t, 2);
+ IGNITE_INTEROP_IN_READ(uint16_t, 2);
}
void InteropInputStream::ReadUInt16Array(uint16_t* const res, const int32_t len)
{
- GG_INTEROP_IN_READ_ARRAY(len, 1);
+ IGNITE_INTEROP_IN_READ_ARRAY(len, 1);
}
int32_t InteropInputStream::ReadInt32()
{
- GG_INTEROP_IN_READ(int32_t, 4);
+ IGNITE_INTEROP_IN_READ(int32_t, 4);
}
int32_t InteropInputStream::ReadInt32(int32_t pos)
@@ -122,17 +122,17 @@ namespace gridgain
void InteropInputStream::ReadInt32Array(int32_t* const res, const int32_t len)
{
- GG_INTEROP_IN_READ_ARRAY(len, 2);
+ IGNITE_INTEROP_IN_READ_ARRAY(len, 2);
}
int64_t InteropInputStream::ReadInt64()
{
- GG_INTEROP_IN_READ(int64_t, 8);
+ IGNITE_INTEROP_IN_READ(int64_t, 8);
}
void InteropInputStream::ReadInt64Array(int64_t* const res, const int32_t len)
{
- GG_INTEROP_IN_READ_ARRAY(len, 3);
+ IGNITE_INTEROP_IN_READ_ARRAY(len, 3);
}
float InteropInputStream::ReadFloat()
@@ -146,7 +146,7 @@ namespace gridgain
void InteropInputStream::ReadFloatArray(float* const res, const int32_t len)
{
- GG_INTEROP_IN_READ_ARRAY(len, 2);
+ IGNITE_INTEROP_IN_READ_ARRAY(len, 2);
}
double InteropInputStream::ReadDouble()
@@ -160,7 +160,7 @@ namespace gridgain
void InteropInputStream::ReadDoubleArray(double* const res, const int32_t len)
{
- GG_INTEROP_IN_READ_ARRAY(len, 3);
+ IGNITE_INTEROP_IN_READ_ARRAY(len, 3);
}
int32_t InteropInputStream::Remaining()
@@ -176,7 +176,7 @@ namespace gridgain
void InteropInputStream::Position(int32_t pos)
{
if (pos > len) {
- GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_MEMORY, "Requested input stream position is out of bounds",
+ IGNITE_ERROR_FORMATTED_3(GridError::IGNITE_ERR_MEMORY, "Requested input stream position is out of bounds",
"memPtr", mem->PointerLong(), "len", len, "pos", pos);
}
@@ -192,7 +192,7 @@ namespace gridgain
void InteropInputStream::EnsureEnoughData(int32_t cnt)
{
if (len - pos < cnt) {
- GG_ERROR_FORMATTED_4(GridError::IGNITE_ERR_MEMORY, "Not enough data in the stream",
+ IGNITE_ERROR_FORMATTED_4(GridError::IGNITE_ERR_MEMORY, "Not enough data in the stream",
"memPtr", mem->PointerLong(), "len", len, "pos", pos, "requested", cnt);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp b/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
index a8151f6..d0024d8 100644
--- a/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
@@ -173,7 +173,7 @@ namespace gridgain
void InteropExternalMemory::Reallocate(int32_t cap)
{
if (JniContext::Reallocate(reinterpret_cast<int64_t>(memPtr), cap) == -1) {
- GG_ERROR_FORMATTED_2(GridError::IGNITE_ERR_MEMORY, "Failed to reallocate external memory",
+ IGNITE_ERROR_FORMATTED_2(GridError::IGNITE_ERR_MEMORY, "Failed to reallocate external memory",
"memPtr", PointerLong(), "requestedCapacity", cap)
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/src/impl/interop/interop_output_stream.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/interop/interop_output_stream.cpp b/modules/platform/src/main/cpp/core/src/impl/interop/interop_output_stream.cpp
index e7e8601..27a47d3 100644
--- a/modules/platform/src/main/cpp/core/src/impl/interop/interop_output_stream.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/interop/interop_output_stream.cpp
@@ -23,7 +23,7 @@
/**
* Common macro to write a single value.
*/
-#define GG_INTEROP_OUT_WRITE(val, type, len) { \
+#define IGNITE_INTEROP_OUT_WRITE(val, type, len) { \
EnsureCapacity(pos + len); \
*reinterpret_cast<type*>(data + pos) = val; \
Shift(len); \
@@ -32,7 +32,7 @@
/**
* Common macro to write an array.
*/
-#define GG_INTEROP_OUT_WRITE_ARRAY(val, len) { \
+#define IGNITE_INTEROP_OUT_WRITE_ARRAY(val, len) { \
CopyAndShift(reinterpret_cast<const int8_t*>(val), 0, len); \
}
@@ -65,7 +65,7 @@ namespace gridgain
void InteropOutputStream::WriteInt8(const int8_t val)
{
- GG_INTEROP_OUT_WRITE(val, int8_t, 1);
+ IGNITE_INTEROP_OUT_WRITE(val, int8_t, 1);
}
void InteropOutputStream::WriteInt8(const int8_t val, const int32_t pos)
@@ -77,7 +77,7 @@ namespace gridgain
void InteropOutputStream::WriteInt8Array(const int8_t* val, const int32_t len)
{
- GG_INTEROP_OUT_WRITE_ARRAY(val, len);
+ IGNITE_INTEROP_OUT_WRITE_ARRAY(val, len);
}
void InteropOutputStream::WriteBool(const bool val)
@@ -93,27 +93,27 @@ namespace gridgain
void InteropOutputStream::WriteInt16(const int16_t val)
{
- GG_INTEROP_OUT_WRITE(val, int16_t, 2);
+ IGNITE_INTEROP_OUT_WRITE(val, int16_t, 2);
}
void InteropOutputStream::WriteInt16Array(const int16_t* val, const int32_t len)
{
- GG_INTEROP_OUT_WRITE_ARRAY(val, len << 1);
+ IGNITE_INTEROP_OUT_WRITE_ARRAY(val, len << 1);
}
void InteropOutputStream::WriteUInt16(const uint16_t val)
{
- GG_INTEROP_OUT_WRITE(val, uint16_t, 2);
+ IGNITE_INTEROP_OUT_WRITE(val, uint16_t, 2);
}
void InteropOutputStream::WriteUInt16Array(const uint16_t* val, const int32_t len)
{
- GG_INTEROP_OUT_WRITE_ARRAY(val, len << 1);
+ IGNITE_INTEROP_OUT_WRITE_ARRAY(val, len << 1);
}
void InteropOutputStream::WriteInt32(const int32_t val)
{
- GG_INTEROP_OUT_WRITE(val, int32_t, 4);
+ IGNITE_INTEROP_OUT_WRITE(val, int32_t, 4);
}
void InteropOutputStream::WriteInt32(const int32_t pos, const int32_t val)
@@ -125,17 +125,17 @@ namespace gridgain
void InteropOutputStream::WriteInt32Array(const int32_t* val, const int32_t len)
{
- GG_INTEROP_OUT_WRITE_ARRAY(val, len << 2);
+ IGNITE_INTEROP_OUT_WRITE_ARRAY(val, len << 2);
}
void InteropOutputStream::WriteInt64(const int64_t val)
{
- GG_INTEROP_OUT_WRITE(val, int64_t, 8);
+ IGNITE_INTEROP_OUT_WRITE(val, int64_t, 8);
}
void InteropOutputStream::WriteInt64Array(const int64_t* val, const int32_t len)
{
- GG_INTEROP_OUT_WRITE_ARRAY(val, len << 3);
+ IGNITE_INTEROP_OUT_WRITE_ARRAY(val, len << 3);
}
void InteropOutputStream::WriteFloat(const float val)
http://git-wip-us.apache.org/repos/asf/ignite/blob/96245bfa/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
index d951070..5d6b845 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
@@ -57,17 +57,17 @@ namespace gridgain
int32_t PortableReaderImpl::ReadInt8Array(int8_t* res, const int32_t len)
{
- return ReadRawArray<int8_t>(res, len, PortableUtils::ReadInt8Array, GG_TYPE_ARRAY_BYTE);
+ return ReadRawArray<int8_t>(res, len, PortableUtils::ReadInt8Array, IGNITE_TYPE_ARRAY_BYTE);
}
int8_t PortableReaderImpl::ReadInt8(const char* fieldName)
{
- return Read(fieldName, PortableUtils::ReadInt8, GG_TYPE_BYTE, static_cast<int8_t>(0));
+ return Read(fieldName, PortableUtils::ReadInt8, IGNITE_TYPE_BYTE, static_cast<int8_t>(0));
}
int32_t PortableReaderImpl::ReadInt8Array(const char* fieldName, int8_t* res, const int32_t len)
{
- return ReadArray<int8_t>(fieldName, res, len,PortableUtils::ReadInt8Array, GG_TYPE_ARRAY_BYTE);
+ return ReadArray<int8_t>(fieldName, res, len,PortableUtils::ReadInt8Array, IGNITE_TYPE_ARRAY_BYTE);
}
bool PortableReaderImpl::ReadBool()
@@ -77,17 +77,17 @@ namespace gridgain
int32_t PortableReaderImpl::ReadBoolArray(bool* res, const int32_t len)
{
- return ReadRawArray<bool>(res, len, PortableUtils::ReadBoolArray, GG_TYPE_ARRAY_BOOL);
+ return ReadRawArray<bool>(res, len, PortableUtils::ReadBoolArray, IGNITE_TYPE_ARRAY_BOOL);
}
bool PortableReaderImpl::ReadBool(const char* fieldName)
{
- return Read(fieldName, PortableUtils::ReadBool, GG_TYPE_BOOL, static_cast<bool>(0));
+ return Read(fieldName, PortableUtils::ReadBool, IGNITE_TYPE_BOOL, static_cast<bool>(0));
}
int32_t PortableReaderImpl::ReadBoolArray(const char* fieldName, bool* res, const int32_t len)
{
- return ReadArray<bool>(fieldName, res, len,PortableUtils::ReadBoolArray, GG_TYPE_ARRAY_BOOL);
+ return ReadArray<bool>(fieldName, res, len,PortableUtils::ReadBoolArray, IGNITE_TYPE_ARRAY_BOOL);
}
int16_t PortableReaderImpl::ReadInt16()
@@ -97,17 +97,17 @@ namespace gridgain
int32_t PortableReaderImpl::ReadInt16Array(int16_t* res, const int32_t len)
{
- return ReadRawArray<int16_t>(res, len, PortableUtils::ReadInt16Array, GG_TYPE_ARRAY_SHORT);
+ return ReadRawArray<int16_t>(res, len, PortableUtils::ReadInt16Array, IGNITE_TYPE_ARRAY_SHORT);
}
int16_t PortableReaderImpl::ReadInt16(const char* fieldName)
{
- return Read(fieldName, PortableUtils::ReadInt16, GG_TYPE_SHORT, static_cast<int16_t>(0));
+ return Read(fieldName, PortableUtils::ReadInt16, IGNITE_TYPE_SHORT, static_cast<int16_t>(0));
}
int32_t PortableReaderImpl::ReadInt16Array(const char* fieldName, int16_t* res, const int32_t len)
{
- return ReadArray<int16_t>(fieldName, res, len, PortableUtils::ReadInt16Array, GG_TYPE_ARRAY_SHORT);
+ return ReadArray<int16_t>(fieldName, res, len, PortableUtils::ReadInt16Array, IGNITE_TYPE_ARRAY_SHORT);
}
uint16_t PortableReaderImpl::ReadUInt16()
@@ -117,17 +117,17 @@ namespace gridgain
int32_t PortableReaderImpl::ReadUInt16Array(uint16_t* res, const int32_t len)
{
- return ReadRawArray<uint16_t>(res, len, PortableUtils::ReadUInt16Array, GG_TYPE_ARRAY_CHAR);
+ return ReadRawArray<uint16_t>(res, len, PortableUtils::ReadUInt16Array, IGNITE_TYPE_ARRAY_CHAR);
}
uint16_t PortableReaderImpl::ReadUInt16(const char* fieldName)
{
- return Read(fieldName, PortableUtils::ReadUInt16, GG_TYPE_CHAR, static_cast<uint16_t>(0));
+ return Read(fieldName, PortableUtils::ReadUInt16, IGNITE_TYPE_CHAR, static_cast<uint16_t>(0));
}
int32_t PortableReaderImpl::ReadUInt16Array(const char* fieldName, uint16_t* res, const int32_t len)
{
- return ReadArray<uint16_t>(fieldName, res, len,PortableUtils::ReadUInt16Array, GG_TYPE_ARRAY_CHAR);
+ return ReadArray<uint16_t>(fieldName, res, len,PortableUtils::ReadUInt16Array, IGNITE_TYPE_ARRAY_CHAR);
}
int32_t PortableReaderImpl::ReadInt32()
@@ -137,17 +137,17 @@ namespace gridgain
int32_t PortableReaderImpl::ReadInt32Array(int32_t* res, const int32_t len)
{
- return ReadRawArray<int32_t>(res, len, PortableUtils::ReadInt32Array, GG_TYPE_ARRAY_INT);
+ return ReadRawArray<int32_t>(res, len, PortableUtils::ReadInt32Array, IGNITE_TYPE_ARRAY_INT);
}
int32_t PortableReaderImpl::ReadInt32(const char* fieldName)
{
- return Read(fieldName, PortableUtils::ReadInt32, GG_TYPE_INT, static_cast<int32_t>(0));
+ return Read(fieldName, PortableUtils::ReadInt32, IGNITE_TYPE_INT, static_cast<int32_t>(0));
}
int32_t PortableReaderImpl::ReadInt32Array(const char* fieldName, int32_t* res, const int32_t len)
{
- return ReadArray<int32_t>(fieldName, res, len,PortableUtils::ReadInt32Array, GG_TYPE_ARRAY_INT);
+ return ReadArray<int32_t>(fieldName, res, len,PortableUtils::ReadInt32Array, IGNITE_TYPE_ARRAY_INT);
}
int64_t PortableReaderImpl::ReadInt64()
@@ -157,17 +157,17 @@ namespace gridgain
int32_t PortableReaderImpl::ReadInt64Array(int64_t* res, const int32_t len)
{
- return ReadRawArray<int64_t>(res, len, PortableUtils::ReadInt64Array, GG_TYPE_ARRAY_LONG);
+ return ReadRawArray<int64_t>(res, len, PortableUtils::ReadInt64Array, IGNITE_TYPE_ARRAY_LONG);
}
int64_t PortableReaderImpl::ReadInt64(const char* fieldName)
{
- return Read(fieldName, PortableUtils::ReadInt64, GG_TYPE_LONG, static_cast<int64_t>(0));
+ return Read(fieldName, PortableUtils::ReadInt64, IGNITE_TYPE_LONG, static_cast<int64_t>(0));
}
int32_t PortableReaderImpl::ReadInt64Array(const char* fieldName, int64_t* res, const int32_t len)
{
- return ReadArray<int64_t>(fieldName, res, len,PortableUtils::ReadInt64Array, GG_TYPE_ARRAY_LONG);
+ return ReadArray<int64_t>(fieldName, res, len,PortableUtils::ReadInt64Array, IGNITE_TYPE_ARRAY_LONG);
}
float PortableReaderImpl::ReadFloat()
@@ -177,17 +177,17 @@ namespace gridgain
int32_t PortableReaderImpl::ReadFloatArray(float* res, const int32_t len)
{
- return ReadRawArray<float>(res, len, PortableUtils::ReadFloatArray, GG_TYPE_ARRAY_FLOAT);
+ return ReadRawArray<float>(res, len, PortableUtils::ReadFloatArray, IGNITE_TYPE_ARRAY_FLOAT);
}
float PortableReaderImpl::ReadFloat(const char* fieldName)
{
- return Read(fieldName, PortableUtils::ReadFloat, GG_TYPE_FLOAT, static_cast<float>(0));
+ return Read(fieldName, PortableUtils::ReadFloat, IGNITE_TYPE_FLOAT, static_cast<float>(0));
}
int32_t PortableReaderImpl::ReadFloatArray(const char* fieldName, float* res, const int32_t len)
{
- return ReadArray<float>(fieldName, res, len,PortableUtils::ReadFloatArray, GG_TYPE_ARRAY_FLOAT);
+ return ReadArray<float>(fieldName, res, len,PortableUtils::ReadFloatArray, IGNITE_TYPE_ARRAY_FLOAT);
}
double PortableReaderImpl::ReadDouble()
@@ -197,17 +197,17 @@ namespace gridgain
int32_t PortableReaderImpl::ReadDoubleArray(double* res, const int32_t len)
{
- return ReadRawArray<double>(res, len, PortableUtils::ReadDoubleArray, GG_TYPE_ARRAY_DOUBLE);
+ return ReadRawArray<double>(res, len, PortableUtils::ReadDoubleArray, IGNITE_TYPE_ARRAY_DOUBLE);
}
double PortableReaderImpl::ReadDouble(const char* fieldName)
{
- return Read(fieldName, PortableUtils::ReadDouble, GG_TYPE_DOUBLE, static_cast<double>(0));
+ return Read(fieldName, PortableUtils::ReadDouble, IGNITE_TYPE_DOUBLE, static_cast<double>(0));
}
int32_t PortableReaderImpl::ReadDoubleArray(const char* fieldName, double* res, const int32_t len)
{
- return ReadArray<double>(fieldName, res, len,PortableUtils::ReadDoubleArray, GG_TYPE_ARRAY_DOUBLE);
+ return ReadArray<double>(fieldName, res, len,PortableUtils::ReadDoubleArray, IGNITE_TYPE_ARRAY_DOUBLE);
}
Guid PortableReaderImpl::ReadGuid()
@@ -215,7 +215,7 @@ namespace gridgain
CheckRawMode(true);
CheckSingleMode(true);
- return ReadNullable(stream, PortableUtils::ReadGuid, GG_TYPE_UUID);
+ return ReadNullable(stream, PortableUtils::ReadGuid, IGNITE_TYPE_UUID);
}
int32_t PortableReaderImpl::ReadGuidArray(Guid* res, const int32_t len)
@@ -223,7 +223,7 @@ namespace gridgain
CheckRawMode(true);
CheckSingleMode(true);
- return ReadArrayInternal<Guid>(res, len, stream, ReadGuidArrayInternal, GG_TYPE_ARRAY_UUID);
+ return ReadArrayInternal<Guid>(res, len, stream, ReadGuidArrayInternal, IGNITE_TYPE_ARRAY_UUID);
}
Guid PortableReaderImpl::ReadGuid(const char* fieldName)
@@ -235,7 +235,7 @@ namespace gridgain
int32_t fieldLen = SeekField(fieldId);
if (fieldLen > 0)
- return ReadNullable(stream, PortableUtils::ReadGuid, GG_TYPE_UUID);
+ return ReadNullable(stream, PortableUtils::ReadGuid, IGNITE_TYPE_UUID);
return Guid();
}
@@ -251,7 +251,7 @@ namespace gridgain
int32_t fieldLen = SeekField(fieldId);
if (fieldLen > 0) {
- int32_t realLen = ReadArrayInternal<Guid>(res, len, stream, ReadGuidArrayInternal, GG_TYPE_ARRAY_UUID);
+ int32_t realLen = ReadArrayInternal<Guid>(res, len, stream, ReadGuidArrayInternal, IGNITE_TYPE_ARRAY_UUID);
// If actual read didn't occur return to initial position so that we do not perform
// N jumps to find the field again, where N is total amount of fields.
@@ -267,7 +267,7 @@ namespace gridgain
void PortableReaderImpl::ReadGuidArrayInternal(InteropInputStream* stream, Guid* res, const int32_t len)
{
for (int i = 0; i < len; i++)
- *(res + i) = ReadNullable<Guid>(stream, PortableUtils::ReadGuid, GG_TYPE_UUID);
+ *(res + i) = ReadNullable<Guid>(stream, PortableUtils::ReadGuid, IGNITE_TYPE_UUID);
}
int32_t PortableReaderImpl::ReadString(char* res, const int32_t len)
@@ -304,7 +304,7 @@ namespace gridgain
int32_t PortableReaderImpl::ReadStringArray(int32_t* size)
{
- return StartContainerSession(true, GG_TYPE_ARRAY_STRING, size);
+ return StartContainerSession(true, IGNITE_TYPE_ARRAY_STRING, size);
}
int32_t PortableReaderImpl::ReadStringArray(const char* fieldName, int32_t* size)
@@ -316,7 +316,7 @@ namespace gridgain
int32_t fieldLen = SeekField(fieldId);
if (fieldLen > 0)
- return StartContainerSession(false, GG_TYPE_ARRAY_STRING, size);
+ return StartContainerSession(false, IGNITE_TYPE_ARRAY_STRING, size);
else {
*size = -1;
@@ -347,7 +347,7 @@ namespace gridgain
{
int8_t hdr = stream->ReadInt8();
- if (hdr == GG_TYPE_STRING) {
+ if (hdr == IGNITE_TYPE_STRING) {
bool utf8Mode = stream->ReadBool();
int32_t realLen = stream->ReadInt32();
@@ -371,15 +371,15 @@ namespace gridgain
return realLen;
}
- else if (hdr != GG_HDR_NULL)
- ThrowOnInvalidHeader(GG_TYPE_ARRAY, hdr);
+ else if (hdr != IGNITE_HDR_NULL)
+ ThrowOnInvalidHeader(IGNITE_TYPE_ARRAY, hdr);
return -1;
}
int32_t PortableReaderImpl::ReadArray(int32_t* size)
{
- return StartContainerSession(true, GG_TYPE_ARRAY, size);
+ return StartContainerSession(true, IGNITE_TYPE_ARRAY, size);
}
int32_t PortableReaderImpl::ReadArray(const char* fieldName, int32_t* size)
@@ -391,7 +391,7 @@ namespace gridgain
int32_t fieldLen = SeekField(fieldId);
if (fieldLen > 0)
- return StartContainerSession(false, GG_TYPE_ARRAY, size);
+ return StartContainerSession(false, IGNITE_TYPE_ARRAY, size);
else {
*size = -1;
@@ -401,10 +401,10 @@ namespace gridgain
int32_t PortableReaderImpl::ReadCollection(CollectionType* typ, int32_t* size)
{
- int32_t id = StartContainerSession(true, GG_TYPE_COLLECTION, size);
+ int32_t id = StartContainerSession(true, IGNITE_TYPE_COLLECTION, size);
if (*size == -1)
- *typ = GG_COLLECTION_UNDEFINED;
+ *typ = IGNITE_COLLECTION_UNDEFINED;
else
*typ = static_cast<CollectionType>(stream->ReadInt8());
@@ -421,17 +421,17 @@ namespace gridgain
if (fieldLen > 0)
{
- int32_t id = StartContainerSession(false, GG_TYPE_COLLECTION, size);
+ int32_t id = StartContainerSession(false, IGNITE_TYPE_COLLECTION, size);
if (*size == -1)
- *typ = GG_COLLECTION_UNDEFINED;
+ *typ = IGNITE_COLLECTION_UNDEFINED;
else
*typ = static_cast<CollectionType>(stream->ReadInt8());
return id;
}
else {
- *typ = GG_COLLECTION_UNDEFINED;
+ *typ = IGNITE_COLLECTION_UNDEFINED;
*size = -1;
return ++elemIdGen;
@@ -440,10 +440,10 @@ namespace gridgain
int32_t PortableReaderImpl::ReadMap(MapType* typ, int32_t* size)
{
- int32_t id = StartContainerSession(true, GG_TYPE_MAP, size);
+ int32_t id = StartContainerSession(true, IGNITE_TYPE_MAP, size);
if (*size == -1)
- *typ = GG_MAP_UNDEFINED;
+ *typ = IGNITE_MAP_UNDEFINED;
else
*typ = static_cast<MapType>(stream->ReadInt8());
@@ -460,17 +460,17 @@ namespace gridgain
if (fieldLen > 0)
{
- int32_t id = StartContainerSession(false, GG_TYPE_MAP, size);
+ int32_t id = StartContainerSession(false, IGNITE_TYPE_MAP, size);
if (*size == -1)
- *typ = GG_MAP_UNDEFINED;
+ *typ = IGNITE_MAP_UNDEFINED;
else
*typ = static_cast<MapType>(stream->ReadInt8());
return id;
}
else {
- *typ = GG_MAP_UNDEFINED;
+ *typ = IGNITE_MAP_UNDEFINED;
*size = -1;
return ++elemIdGen;
@@ -494,49 +494,49 @@ namespace gridgain
template <>
int8_t PortableReaderImpl::ReadTopObject<int8_t>()
{
- return ReadTopObject0(GG_TYPE_BYTE, PortableUtils::ReadInt8, static_cast<int8_t>(0));
+ return ReadTopObject0(IGNITE_TYPE_BYTE, PortableUtils::ReadInt8, static_cast<int8_t>(0));
}
template <>
bool PortableReaderImpl::ReadTopObject<bool>()
{
- return ReadTopObject0(GG_TYPE_BOOL, PortableUtils::ReadBool, static_cast<bool>(0));
+ return ReadTopObject0(IGNITE_TYPE_BOOL, PortableUtils::ReadBool, static_cast<bool>(0));
}
template <>
int16_t PortableReaderImpl::ReadTopObject<int16_t>()
{
- return ReadTopObject0(GG_TYPE_SHORT, PortableUtils::ReadInt16, static_cast<int16_t>(0));
+ return ReadTopObject0(IGNITE_TYPE_SHORT, PortableUtils::ReadInt16, static_cast<int16_t>(0));
}
template <>
uint16_t PortableReaderImpl::ReadTopObject<uint16_t>()
{
- return ReadTopObject0(GG_TYPE_CHAR, PortableUtils::ReadUInt16, static_cast<uint16_t>(0));
+ return ReadTopObject0(IGNITE_TYPE_CHAR, PortableUtils::ReadUInt16, static_cast<uint16_t>(0));
}
template <>
int32_t PortableReaderImpl::ReadTopObject<int32_t>()
{
- return ReadTopObject0(GG_TYPE_INT, PortableUtils::ReadInt32, static_cast<int32_t>(0));
+ return ReadTopObject0(IGNITE_TYPE_INT, PortableUtils::ReadInt32, static_cast<int32_t>(0));
}
template <>
int64_t PortableReaderImpl::ReadTopObject<int64_t>()
{
- return ReadTopObject0(GG_TYPE_LONG, PortableUtils::ReadInt64, static_cast<int64_t>(0));
+ return ReadTopObject0(IGNITE_TYPE_LONG, PortableUtils::ReadInt64, static_cast<int64_t>(0));
}
template <>
float PortableReaderImpl::ReadTopObject<float>()
{
- return ReadTopObject0(GG_TYPE_FLOAT, PortableUtils::ReadFloat, static_cast<float>(0));
+ return ReadTopObject0(IGNITE_TYPE_FLOAT, PortableUtils::ReadFloat, static_cast<float>(0));
}
template <>
double PortableReaderImpl::ReadTopObject<double>()
{
- return ReadTopObject0(GG_TYPE_DOUBLE, PortableUtils::ReadDouble, static_cast<double>(0));
+ return ReadTopObject0(IGNITE_TYPE_DOUBLE, PortableUtils::ReadDouble, static_cast<double>(0));
}
template <>
@@ -544,14 +544,14 @@ namespace gridgain
{
int8_t typeId = stream->ReadInt8();
- if (typeId == GG_TYPE_UUID)
+ if (typeId == IGNITE_TYPE_UUID)
return PortableUtils::ReadGuid(stream);
- else if (typeId == GG_HDR_NULL)
+ else if (typeId == IGNITE_HDR_NULL)
return Guid();
else {
int32_t pos = stream->Position() - 1;
- GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", GG_TYPE_UUID, "actual", typeId)
+ IGNITE_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", IGNITE_TYPE_UUID, "actual", typeId)
}
}
@@ -603,20 +603,20 @@ namespace gridgain
void PortableReaderImpl::CheckRawMode(bool expected)
{
if (expected && !rawMode) {
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only in raw mode.")
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only in raw mode.")
}
else if (!expected && rawMode) {
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed in raw mode.")
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed in raw mode.")
}
}
void PortableReaderImpl::CheckSingleMode(bool expected)
{
if (expected && elemId != 0) {
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed when container is being read.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation cannot be performed when container is being read.");
}
else if (!expected && elemId == 0) {
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only when container is being read.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Operation can be performed only when container is being read.");
}
}
@@ -648,7 +648,7 @@ namespace gridgain
return ++elemIdGen;
}
}
- else if (hdr == GG_HDR_NULL) {
+ else if (hdr == IGNITE_HDR_NULL) {
*size = -1;
return ++elemIdGen;
@@ -663,13 +663,13 @@ namespace gridgain
void PortableReaderImpl::CheckSession(int32_t expSes)
{
if (elemId != expSes) {
- GG_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Containter read session has been finished or is not started yet.");
+ IGNITE_ERROR_1(GridError::IGNITE_ERR_PORTABLE, "Containter read session has been finished or is not started yet.");
}
}
void PortableReaderImpl::ThrowOnInvalidHeader(int32_t pos, int8_t expHdr, int8_t hdr)
{
- GG_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", hdr)
+ IGNITE_ERROR_FORMATTED_3(GridError::IGNITE_ERR_PORTABLE, "Invalid header", "position", pos, "expected", expHdr, "actual", hdr)
}
void PortableReaderImpl::ThrowOnInvalidHeader(int8_t expHdr, int8_t hdr)