[19/54] [abbrv] ignite git commit: IGNITE-7927 Web Console: Fixed demo for non-collocated joins.

2018-04-13 Thread agoncharuk
IGNITE-7927 Web Console: Fixed demo for non-collocated joins.


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

Branch: refs/heads/ignite-6083
Commit: 647620b3ccf204c7bf11c4ff540584d0c99d9a15
Parents: 139c2af
Author: Vasiliy Sisko 
Authored: Tue Apr 10 17:48:52 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 10 17:48:52 2018 +0700

--
 modules/web-console/backend/routes/demo.js  |  2 ++
 .../demo/service/DemoCachesLoadService.java | 22 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/647620b3/modules/web-console/backend/routes/demo.js
--
diff --git a/modules/web-console/backend/routes/demo.js 
b/modules/web-console/backend/routes/demo.js
index a18fa7a..b081d0c 100644
--- a/modules/web-console/backend/routes/demo.js
+++ b/modules/web-console/backend/routes/demo.js
@@ -95,10 +95,12 @@ module.exports.factory = (errors, settings, mongo, 
spacesService) => {
 
 domain.space = cacheDoc.space;
 domain.caches.push(cacheDoc._id);
+domain.clusters.push(cluster._id);
 
 return domain.save()
 .then((domainDoc) => {
 
cacheDoc.domains.push(domainDoc._id);
+
cluster.models.push(domainDoc._id);
 
 return cacheDoc.save();
 });

http://git-wip-us.apache.org/repos/asf/ignite/blob/647620b3/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
--
diff --git 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
index 6691d1d..2aace06 100644
--- 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
+++ 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
@@ -269,6 +269,14 @@ public class DemoCachesLoadService implements Service {
 
 type.setFields(qryFlds);
 
+// Indexes for DEPARTMENT.
+
+ArrayList indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("countryId", QueryIndexType.SORTED, false, 
"DEP_COUNTRY"));
+
+type.setIndexes(indexes);
+
 ccfg.setQueryEntities(qryEntities);
 
 return ccfg;
@@ -312,6 +320,11 @@ public class DemoCachesLoadService implements Service {
 
 // Indexes for EMPLOYEE.
 
+Collection indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("departmentId", QueryIndexType.SORTED, 
false, "EMP_DEPARTMENT"));
+indexes.add(new QueryIndex("managerId", QueryIndexType.SORTED, false, 
"EMP_MANAGER"));
+
 QueryIndex idx = new QueryIndex();
 
 idx.setName("EMP_NAMES");
@@ -323,8 +336,6 @@ public class DemoCachesLoadService implements Service {
 
 idx.setFields(indFlds);
 
-Collection indexes = new ArrayList<>();
-
 indexes.add(idx);
 indexes.add(new QueryIndex("salary", QueryIndexType.SORTED, false, 
"EMP_SALARY"));
 
@@ -392,6 +403,13 @@ public class DemoCachesLoadService implements Service {
 
 type.setFields(qryFlds);
 
+// Indexes for CAR.
+
+ArrayList indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("parkingId", QueryIndexType.SORTED, false, 
"CAR_PARKING"));
+type.setIndexes(indexes);
+
 ccfg.setQueryEntities(qryEntities);
 
 return ccfg;



[07/14] ignite git commit: IGNITE-7927 Web Console: Fixed demo for non-collocated joins.

2018-04-11 Thread akuznetsov
IGNITE-7927 Web Console: Fixed demo for non-collocated joins.


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

Branch: refs/heads/ignite-8201
Commit: 647620b3ccf204c7bf11c4ff540584d0c99d9a15
Parents: 139c2af
Author: Vasiliy Sisko 
Authored: Tue Apr 10 17:48:52 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 10 17:48:52 2018 +0700

--
 modules/web-console/backend/routes/demo.js  |  2 ++
 .../demo/service/DemoCachesLoadService.java | 22 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/647620b3/modules/web-console/backend/routes/demo.js
--
diff --git a/modules/web-console/backend/routes/demo.js 
b/modules/web-console/backend/routes/demo.js
index a18fa7a..b081d0c 100644
--- a/modules/web-console/backend/routes/demo.js
+++ b/modules/web-console/backend/routes/demo.js
@@ -95,10 +95,12 @@ module.exports.factory = (errors, settings, mongo, 
spacesService) => {
 
 domain.space = cacheDoc.space;
 domain.caches.push(cacheDoc._id);
+domain.clusters.push(cluster._id);
 
 return domain.save()
 .then((domainDoc) => {
 
cacheDoc.domains.push(domainDoc._id);
+
cluster.models.push(domainDoc._id);
 
 return cacheDoc.save();
 });

http://git-wip-us.apache.org/repos/asf/ignite/blob/647620b3/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
--
diff --git 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
index 6691d1d..2aace06 100644
--- 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
+++ 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
@@ -269,6 +269,14 @@ public class DemoCachesLoadService implements Service {
 
 type.setFields(qryFlds);
 
+// Indexes for DEPARTMENT.
+
+ArrayList indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("countryId", QueryIndexType.SORTED, false, 
"DEP_COUNTRY"));
+
+type.setIndexes(indexes);
+
 ccfg.setQueryEntities(qryEntities);
 
 return ccfg;
@@ -312,6 +320,11 @@ public class DemoCachesLoadService implements Service {
 
 // Indexes for EMPLOYEE.
 
+Collection indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("departmentId", QueryIndexType.SORTED, 
false, "EMP_DEPARTMENT"));
+indexes.add(new QueryIndex("managerId", QueryIndexType.SORTED, false, 
"EMP_MANAGER"));
+
 QueryIndex idx = new QueryIndex();
 
 idx.setName("EMP_NAMES");
@@ -323,8 +336,6 @@ public class DemoCachesLoadService implements Service {
 
 idx.setFields(indFlds);
 
-Collection indexes = new ArrayList<>();
-
 indexes.add(idx);
 indexes.add(new QueryIndex("salary", QueryIndexType.SORTED, false, 
"EMP_SALARY"));
 
@@ -392,6 +403,13 @@ public class DemoCachesLoadService implements Service {
 
 type.setFields(qryFlds);
 
+// Indexes for CAR.
+
+ArrayList indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("parkingId", QueryIndexType.SORTED, false, 
"CAR_PARKING"));
+type.setIndexes(indexes);
+
 ccfg.setQueryEntities(qryEntities);
 
 return ccfg;



ignite git commit: IGNITE-7927 Web Console: Fixed demo for non-collocated joins.

2018-04-10 Thread akuznetsov
Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 82a4c024f -> c1745de37


IGNITE-7927 Web Console: Fixed demo for non-collocated joins.

(cherry picked from commit 647620b)


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

Branch: refs/heads/ignite-2.5
Commit: c1745de37891026e0a719f0c1d1afe768dfccbf3
Parents: 82a4c02
Author: Vasiliy Sisko 
Authored: Tue Apr 10 17:48:52 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 10 17:50:31 2018 +0700

--
 modules/web-console/backend/routes/demo.js  |  2 ++
 .../demo/service/DemoCachesLoadService.java | 22 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c1745de3/modules/web-console/backend/routes/demo.js
--
diff --git a/modules/web-console/backend/routes/demo.js 
b/modules/web-console/backend/routes/demo.js
index a18fa7a..b081d0c 100644
--- a/modules/web-console/backend/routes/demo.js
+++ b/modules/web-console/backend/routes/demo.js
@@ -95,10 +95,12 @@ module.exports.factory = (errors, settings, mongo, 
spacesService) => {
 
 domain.space = cacheDoc.space;
 domain.caches.push(cacheDoc._id);
+domain.clusters.push(cluster._id);
 
 return domain.save()
 .then((domainDoc) => {
 
cacheDoc.domains.push(domainDoc._id);
+
cluster.models.push(domainDoc._id);
 
 return cacheDoc.save();
 });

http://git-wip-us.apache.org/repos/asf/ignite/blob/c1745de3/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
--
diff --git 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
index 6691d1d..2aace06 100644
--- 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
+++ 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
@@ -269,6 +269,14 @@ public class DemoCachesLoadService implements Service {
 
 type.setFields(qryFlds);
 
+// Indexes for DEPARTMENT.
+
+ArrayList indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("countryId", QueryIndexType.SORTED, false, 
"DEP_COUNTRY"));
+
+type.setIndexes(indexes);
+
 ccfg.setQueryEntities(qryEntities);
 
 return ccfg;
@@ -312,6 +320,11 @@ public class DemoCachesLoadService implements Service {
 
 // Indexes for EMPLOYEE.
 
+Collection indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("departmentId", QueryIndexType.SORTED, 
false, "EMP_DEPARTMENT"));
+indexes.add(new QueryIndex("managerId", QueryIndexType.SORTED, false, 
"EMP_MANAGER"));
+
 QueryIndex idx = new QueryIndex();
 
 idx.setName("EMP_NAMES");
@@ -323,8 +336,6 @@ public class DemoCachesLoadService implements Service {
 
 idx.setFields(indFlds);
 
-Collection indexes = new ArrayList<>();
-
 indexes.add(idx);
 indexes.add(new QueryIndex("salary", QueryIndexType.SORTED, false, 
"EMP_SALARY"));
 
@@ -392,6 +403,13 @@ public class DemoCachesLoadService implements Service {
 
 type.setFields(qryFlds);
 
+// Indexes for CAR.
+
+ArrayList indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("parkingId", QueryIndexType.SORTED, false, 
"CAR_PARKING"));
+type.setIndexes(indexes);
+
 ccfg.setQueryEntities(qryEntities);
 
 return ccfg;



ignite git commit: IGNITE-7927 Web Console: Fixed demo for non-collocated joins.

2018-04-10 Thread akuznetsov
Repository: ignite
Updated Branches:
  refs/heads/master 139c2af66 -> 647620b3c


IGNITE-7927 Web Console: Fixed demo for non-collocated joins.


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

Branch: refs/heads/master
Commit: 647620b3ccf204c7bf11c4ff540584d0c99d9a15
Parents: 139c2af
Author: Vasiliy Sisko 
Authored: Tue Apr 10 17:48:52 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 10 17:48:52 2018 +0700

--
 modules/web-console/backend/routes/demo.js  |  2 ++
 .../demo/service/DemoCachesLoadService.java | 22 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/647620b3/modules/web-console/backend/routes/demo.js
--
diff --git a/modules/web-console/backend/routes/demo.js 
b/modules/web-console/backend/routes/demo.js
index a18fa7a..b081d0c 100644
--- a/modules/web-console/backend/routes/demo.js
+++ b/modules/web-console/backend/routes/demo.js
@@ -95,10 +95,12 @@ module.exports.factory = (errors, settings, mongo, 
spacesService) => {
 
 domain.space = cacheDoc.space;
 domain.caches.push(cacheDoc._id);
+domain.clusters.push(cluster._id);
 
 return domain.save()
 .then((domainDoc) => {
 
cacheDoc.domains.push(domainDoc._id);
+
cluster.models.push(domainDoc._id);
 
 return cacheDoc.save();
 });

http://git-wip-us.apache.org/repos/asf/ignite/blob/647620b3/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
--
diff --git 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
index 6691d1d..2aace06 100644
--- 
a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
+++ 
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
@@ -269,6 +269,14 @@ public class DemoCachesLoadService implements Service {
 
 type.setFields(qryFlds);
 
+// Indexes for DEPARTMENT.
+
+ArrayList indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("countryId", QueryIndexType.SORTED, false, 
"DEP_COUNTRY"));
+
+type.setIndexes(indexes);
+
 ccfg.setQueryEntities(qryEntities);
 
 return ccfg;
@@ -312,6 +320,11 @@ public class DemoCachesLoadService implements Service {
 
 // Indexes for EMPLOYEE.
 
+Collection indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("departmentId", QueryIndexType.SORTED, 
false, "EMP_DEPARTMENT"));
+indexes.add(new QueryIndex("managerId", QueryIndexType.SORTED, false, 
"EMP_MANAGER"));
+
 QueryIndex idx = new QueryIndex();
 
 idx.setName("EMP_NAMES");
@@ -323,8 +336,6 @@ public class DemoCachesLoadService implements Service {
 
 idx.setFields(indFlds);
 
-Collection indexes = new ArrayList<>();
-
 indexes.add(idx);
 indexes.add(new QueryIndex("salary", QueryIndexType.SORTED, false, 
"EMP_SALARY"));
 
@@ -392,6 +403,13 @@ public class DemoCachesLoadService implements Service {
 
 type.setFields(qryFlds);
 
+// Indexes for CAR.
+
+ArrayList indexes = new ArrayList<>();
+
+indexes.add(new QueryIndex("parkingId", QueryIndexType.SORTED, false, 
"CAR_PARKING"));
+type.setIndexes(indexes);
+
 ccfg.setQueryEntities(qryEntities);
 
 return ccfg;