You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2016/05/11 10:54:31 UTC
[4/5] ignite git commit: RAT fix
RAT fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49c51244
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49c51244
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49c51244
Branch: refs/heads/master
Commit: 49c512446588cb71bf661db2d48bc9a15ec8499c
Parents: bd6a67f
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed May 11 13:52:38 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed May 11 13:52:38 2016 +0300
----------------------------------------------------------------------
modules/yardstick/config/benchmark-cache-load-win.properties | 2 +-
modules/yardstick/config/benchmark-cache-load.properties | 4 ++--
modules/yardstick/config/queries.sql | 2 ++
modules/yardstick/config/queries.txt | 2 --
parent/pom.xml | 1 +
5 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/49c51244/modules/yardstick/config/benchmark-cache-load-win.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-cache-load-win.properties b/modules/yardstick/config/benchmark-cache-load-win.properties
index 7469c01..1903bf4 100644
--- a/modules/yardstick/config/benchmark-cache-load-win.properties
+++ b/modules/yardstick/config/benchmark-cache-load-win.properties
@@ -54,5 +54,5 @@ set DRIVER_HOSTS=localhost
:: Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
set CONFIGS=^
-cfg %SCRIPT_DIR%\..\config\ignite-cache-load-config.xml -r 10000 -pa 500 -bs 50 -b 1 -w 20 -d 30 -t 64 -sm PRIMARY_SYNC -dn IgniteCacheRandomOperationBenchmark -sn IgniteNode -ds cache-random-benchmark-1-backup -nn 1^
- -qf config\queries.txt --allow-operation PUT --allow-operation PUT_ALL --allow-operation GET --allow-operation GET_ALL --allow-operation INVOKE --allow-operation INVOKE_ALL --allow-operation REMOVE^
+ -qf config\queries.sql --allow-operation PUT --allow-operation PUT_ALL --allow-operation GET --allow-operation GET_ALL --allow-operation INVOKE --allow-operation INVOKE_ALL --allow-operation REMOVE^
--allow-operation REMOVE_ALL --allow-operation PUT_IF_ABSENT --allow-operation REPLACE --allow-operation SCAN_QUERY --allow-operation SQL_QUERY --allow-operation CONTINUOUS_QUERIE
http://git-wip-us.apache.org/repos/asf/ignite/blob/49c51244/modules/yardstick/config/benchmark-cache-load.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-cache-load.properties b/modules/yardstick/config/benchmark-cache-load.properties
index 3d9d4a6..7c7b8ab 100644
--- a/modules/yardstick/config/benchmark-cache-load.properties
+++ b/modules/yardstick/config/benchmark-cache-load.properties
@@ -74,7 +74,7 @@ t=64
# Sync mode.
sm=PRIMARY_SYNC
-# Preload amount
+# Preload amount
pa=500000
# Key range
@@ -83,4 +83,4 @@ r=1000000
# Run configuration.
# Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60 seconds (1 minute).
CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-cache-load-config.xml -nn ${nodesNum} -b ${b} -r ${r} -w ${w} -d ${d} -pa ${pa} -t ${t} -sm ${sm} -dn IgniteCacheRandomOperationBenchmark -sn IgniteNode -ds cache-random-benchmark-1-backup -qf config\queries.txt"
\ No newline at end of file
+-cfg ${SCRIPT_DIR}/../config/ignite-cache-load-config.xml -nn ${nodesNum} -b ${b} -r ${r} -w ${w} -d ${d} -pa ${pa} -t ${t} -sm ${sm} -dn IgniteCacheRandomOperationBenchmark -sn IgniteNode -ds cache-random-benchmark-1-backup -qf config\queries.sql"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/49c51244/modules/yardstick/config/queries.sql
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/queries.sql b/modules/yardstick/config/queries.sql
new file mode 100644
index 0000000..8271100
--- /dev/null
+++ b/modules/yardstick/config/queries.sql
@@ -0,0 +1,2 @@
+SELECT Person.firstName FROM "query".Person, "orgCache".Organization WHERE Person.orgId = Organization.id AND lower(Organization.name) = lower('Organization 55')
+SELECT Organization.name FROM "orgCache".Organization WHERE lower(Organization.name) LIKE lower('%55%')
http://git-wip-us.apache.org/repos/asf/ignite/blob/49c51244/modules/yardstick/config/queries.txt
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/queries.txt b/modules/yardstick/config/queries.txt
deleted file mode 100644
index 8271100..0000000
--- a/modules/yardstick/config/queries.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT Person.firstName FROM "query".Person, "orgCache".Organization WHERE Person.orgId = Organization.id AND lower(Organization.name) = lower('Organization 55')
-SELECT Organization.name FROM "orgCache".Organization WHERE lower(Organization.name) LIKE lower('%55%')
http://git-wip-us.apache.org/repos/asf/ignite/blob/49c51244/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 676a107..37687a8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -770,6 +770,7 @@
<exclude>**/*.gar</exclude><!--bin-files-->
<exclude>**/licenses/*.txt</exclude><!--files of licenses-->
<exclude>**/*readme*.txt</exclude><!--readme files-->
+ <exclude>**/*.sql</exclude><!--sql files-->
<exclude>**/*README*.txt</exclude><!--readme files-->
<exclude>**/*README*.md</exclude><!--readme files-->
<exclude>**/*.timestamp</exclude><!--tmp-files-->