ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [02/50] [abbrv] incubator-ignite git commit: Ignite-67 Tests properties names fix
Date Sat, 31 Jan 2015 12:35:39 GMT
Ignite-67 Tests properties names fix


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

Branch: refs/heads/ignite-140
Commit: 1719ab5b8691427396af02d53eff2e1ce90f4e9f
Parents: ffbf59c
Author: avinogradov <avinogradov@gridgain.com>
Authored: Wed Jan 28 16:14:35 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Wed Jan 28 16:14:35 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/cache/CacheConfiguration.java   |  3 +--
 .../GridContinuousOperationsLoadTest.java         | 18 +++++++++---------
 .../streamer/GridStreamerIndexLoadTest.java       |  2 +-
 .../ignite/loadtests/util/GridLoadTestArgs.java   |  8 ++++----
 .../testframework/config/GridTestProperties.java  |  2 +-
 5 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1719ab5b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
index ba33e74..d5edb86 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
@@ -1655,8 +1655,7 @@ public class CacheConfiguration extends MutableConfiguration {
      * is flushed to the notification queue. Greater buffer size may improve throughput,
      * but also may increase latency.
      * <p>
-     * Default value is either {@link #DFLT_CONT_QUERY_MAX_BUF_SIZE} or
-     * {@code GG_CONT_QUERY_MAX_BUF_SIZE} system property value (if specified).
+     * Default value is either {@link #DFLT_CONT_QUERY_MAX_BUF_SIZE}.
      *
      * @return Maximum buffer size for continuous queries.
      * @deprecated Ignored in current version.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1719ab5b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
index 7b86298..cd45bf1 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
@@ -55,7 +55,7 @@ public class GridContinuousOperationsLoadTest {
         final Integer threadsCnt = getIntProperty(THREADS_CNT, 8);
         final Integer testDurSec = getIntProperty(TEST_DUR_SEC, 180);
 
-        final Integer filterSkipProb = getIntProperty("GG_FILTER_SKIP_PROBABILITY", 10, new
C1<Integer, String>() {
+        final Integer filterSkipProb = getIntProperty("FILTER_SKIP_PROBABILITY", 10, new
C1<Integer, String>() {
             @Nullable @Override public String apply(Integer val) {
                 if (val < 0 || val > 100)
                     return "The value should be between 1 and 100.";
@@ -64,14 +64,14 @@ public class GridContinuousOperationsLoadTest {
             }
         });
 
-        final boolean useQry = getBooleanProperty("GG_USE_QUERIES", true);
-        final int bufSize = getIntProperty("GG_BUFFER_SIZE", 1);
-        final long timeInterval = getLongProperty("GG_TIME_INTERVAL", 0);
-        final int parallelCnt = getIntProperty("GG_PARALLEL_COUNT", 8);
-        final int keyRange = getIntProperty("GG_KEY_RANGE", 100000);
-        final long updSleepMs = getLongProperty("GG_UPDATE_SLEEP_MS", 0);
-        final long filterSleepMs = getLongProperty("GG_FILTER_SLEEP_MS", 0);
-        final long cbSleepMs = getLongProperty("GG_CALLBACK_SLEEP_MS", 0);
+        final boolean useQry = getBooleanProperty("IGNITE_USE_QUERIES", true);
+        final int bufSize = getIntProperty("IGNITE_BUFFER_SIZE", 1);
+        final long timeInterval = getLongProperty("IGNITE_TIME_INTERVAL", 0);
+        final int parallelCnt = getIntProperty("IGNITE_PARALLEL_COUNT", 8);
+        final int keyRange = getIntProperty("IGNITE_KEY_RANGE", 100000);
+        final long updSleepMs = getLongProperty("IGNITE_UPDATE_SLEEP_MS", 0);
+        final long filterSleepMs = getLongProperty("IGNITE_FILTER_SLEEP_MS", 0);
+        final long cbSleepMs = getLongProperty("IGNITE_CALLBACK_SLEEP_MS", 0);
 
         X.println("The test will start with the following parameters:");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1719ab5b/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java
index 7ae1add..0cff8fc 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/streamer/GridStreamerIndexLoadTest.java
@@ -101,7 +101,7 @@ public class GridStreamerIndexLoadTest {
     public static void runBenchmark(IndexConfiguration idxCfg) throws Exception {
         int thrCnt = getIntProperty(THREADS_CNT, 1);
         int dur = getIntProperty(TEST_DUR_SEC, 60);
-        int winSize = getIntProperty("GG_WIN_SIZE", 5000);
+        int winSize = getIntProperty("IGNITE_WIN_SIZE", 5000);
 
         dumpProperties(System.out);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1719ab5b/modules/core/src/test/java/org/apache/ignite/loadtests/util/GridLoadTestArgs.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/util/GridLoadTestArgs.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/util/GridLoadTestArgs.java
index bb1da33..51601ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/util/GridLoadTestArgs.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/util/GridLoadTestArgs.java
@@ -31,16 +31,16 @@ import java.util.*;
  */
 public class GridLoadTestArgs {
     /** Cache name. */
-    public static final String CACHE_NAME = "GG_CACHE_NAME";
+    public static final String CACHE_NAME = "IGNITE_CACHE_NAME";
 
     /** Threads count. */
-    public static final String THREADS_CNT = "GG_THREADS_COUNT";
+    public static final String THREADS_CNT = "IGNITE_THREADS_COUNT";
 
     /** Test duration in seconds. */
-    public static final String TEST_DUR_SEC = "GG_TEST_DUR_SEC";
+    public static final String TEST_DUR_SEC = "IGNITE_TEST_DUR_SEC";
 
     /** Value size. */
-    public static final String VALUE_SIZE = "GG_VALUE_SIZE";
+    public static final String VALUE_SIZE = "IGNITE_VALUE_SIZE";
 
     /** Properties map for dumping. */
     private static ThreadLocal<Map<String, String>> props = new ThreadLocal<Map<String,
String>>() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1719ab5b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
index 1551807..e5df607 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
@@ -104,7 +104,7 @@ public final class GridTestProperties {
      * @param user User name.
      */
     private static void configureLog4j(String user) {
-        String cfgFile = System.getProperty("GG_TEST_PROP_LOG4J_FILE");
+        String cfgFile = System.getProperty("IGNITE_TEST_PROP_LOG4J_FILE");
 
         if (cfgFile == null)
             cfgFile = "log4j-test.xml";


Mime
View raw message