ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From isap...@apache.org
Subject [1/8] ignite git commit: IGNITE-3581: Renaming
Date Thu, 13 Apr 2017 11:47:58 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-3581 [created] 869c9121e


IGNITE-3581: Renaming


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0da662f3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0da662f3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0da662f3

Branch: refs/heads/ignite-3581
Commit: 0da662f383893aa13dafa53e2ee84f4c2b56e55d
Parents: 5c4b7b0
Author: Igor Sapego <isapego@gridgain.com>
Authored: Wed Apr 12 18:05:05 2017 +0300
Committer: Igor Sapego <isapego@gridgain.com>
Committed: Thu Apr 13 14:40:02 2017 +0300

----------------------------------------------------------------------
 .../cpp/core/include/ignite/impl/interop/interop_target.h    | 6 +++---
 .../platforms/cpp/core/src/impl/interop/interop_target.cpp   | 8 ++++----
 modules/platforms/cpp/odbc-test/src/test_utils.cpp           | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0da662f3/modules/platforms/cpp/core/include/ignite/impl/interop/interop_target.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/impl/interop/interop_target.h b/modules/platforms/cpp/core/include/ignite/impl/interop/interop_target.h
index 2040c74..f9b2b7f 100644
--- a/modules/platforms/cpp/core/include/ignite/impl/interop/interop_target.h
+++ b/modules/platforms/cpp/core/include/ignite/impl/interop/interop_target.h
@@ -41,13 +41,13 @@ namespace ignite
                     enum Type
                     {
                         /** Null. */
-                        R_NULL = 0,
+                        AI_NULL = 0,
 
                         /** Success. */
-                        R_SUCCESS = 1,
+                        AI_SUCCESS = 1,
 
                         /** Error. */
-                        R_ERROR = -1
+                        AI_ERROR = -1
                     };
                 };
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/0da662f3/modules/platforms/cpp/core/src/impl/interop/interop_target.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/src/impl/interop/interop_target.cpp b/modules/platforms/cpp/core/src/impl/interop/interop_target.cpp
index 24dbb25..b0932e7 100644
--- a/modules/platforms/cpp/core/src/impl/interop/interop_target.cpp
+++ b/modules/platforms/cpp/core/src/impl/interop/interop_target.cpp
@@ -186,11 +186,11 @@ namespace ignite
 
                     IgniteError::SetError(jniErr.code, jniErr.errCls, jniErr.errMsg, err);
 
-                    if (jniErr.code == IGNITE_JNI_ERR_SUCCESS && res == OperationResult::R_SUCCESS)
+                    if (jniErr.code == IGNITE_JNI_ERR_SUCCESS && res == OperationResult::AI_SUCCESS)
                         ReadFrom(outInMem.Get(), outOp);
-                    else if (res == OperationResult::R_NULL)
+                    else if (res == OperationResult::AI_NULL)
                         outOp.SetNull();
-                    else if (res == OperationResult::R_ERROR)
+                    else if (res == OperationResult::AI_ERROR)
                         ReadError(outInMem.Get(), err);
                     else
                         assert(false);
@@ -213,7 +213,7 @@ namespace ignite
                     return static_cast<OperationResult::Type>(res);
                 }
 
-                return OperationResult::R_ERROR;
+                return OperationResult::AI_ERROR;
             }
 
             int64_t InteropTarget::OutInOpLong(int32_t opType, int64_t val, IgniteError&
err)

http://git-wip-us.apache.org/repos/asf/ignite/blob/0da662f3/modules/platforms/cpp/odbc-test/src/test_utils.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc-test/src/test_utils.cpp b/modules/platforms/cpp/odbc-test/src/test_utils.cpp
index 6fceb03..713601a 100644
--- a/modules/platforms/cpp/odbc-test/src/test_utils.cpp
+++ b/modules/platforms/cpp/odbc-test/src/test_utils.cpp
@@ -44,11 +44,11 @@ namespace ignite_test
         cfg.jvmOpts.push_back("-Xdebug");
         cfg.jvmOpts.push_back("-Xnoagent");
         cfg.jvmOpts.push_back("-Djava.compiler=NONE");
-        cfg.jvmOpts.push_back("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005");
+        cfg.jvmOpts.push_back("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005");
         cfg.jvmOpts.push_back("-XX:+HeapDumpOnOutOfMemoryError");
         cfg.jvmOpts.push_back("-Duser.timezone=GMT");
         cfg.jvmOpts.push_back("-DIGNITE_QUIET=false");
-        cfg.jvmOpts.push_back("-DIGNITE_CONSOLE_APPENDER=false");
+        //cfg.jvmOpts.push_back("-DIGNITE_CONSOLE_APPENDER=false");
         cfg.jvmOpts.push_back("-DIGNITE_UPDATE_NOTIFIER=false");
 
         std::string home;


Mime
View raw message