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 2016/02/10 15:26:40 UTC
[1/3] ignite git commit: IGNITE-2543: Tables look up now return
tables from all caches.
Repository: ignite
Updated Branches:
refs/heads/ignite-1786 67730c4d9 -> e0226fc33
IGNITE-2543: Tables look up now return tables from all caches.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a383108b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a383108b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a383108b
Branch: refs/heads/ignite-1786
Commit: a383108bfe84d7552ceda94ef55a17733e715570
Parents: d55dc36
Author: isapego <is...@gridgain.com>
Authored: Wed Feb 3 22:27:16 2016 +0300
Committer: isapego <is...@gridgain.com>
Committed: Wed Feb 3 22:27:16 2016 +0300
----------------------------------------------------------------------
.../processors/odbc/OdbcCommandHandler.java | 26 ++++++++++++--------
1 file changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a383108b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcCommandHandler.java
index 48851ca..282f384 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcCommandHandler.java
@@ -256,20 +256,26 @@ public class OdbcCommandHandler {
String realSchema = removeQuotationMarksIfNeeded(req.schema());
- Collection<GridQueryTypeDescriptor> tablesMeta = ctx.query().types(realSchema);
-
- for (GridQueryTypeDescriptor table : tablesMeta) {
- if (!matches(table.name(), req.table()))
+ for (String cacheName : ctx.cache().cacheNames())
+ {
+ if (!matches(cacheName, realSchema))
continue;
- if (!matches("TABLE", req.tableType()))
- continue;
+ Collection<GridQueryTypeDescriptor> tablesMeta = ctx.query().types(cacheName);
+
+ for (GridQueryTypeDescriptor table : tablesMeta) {
+ if (!matches(table.name(), req.table()))
+ continue;
+
+ if (!matches("TABLE", req.tableType()))
+ continue;
- OdbcTableMeta tableMeta = new OdbcTableMeta(req.catalog(), req.schema(),
- table.name(), "TABLE");
+ OdbcTableMeta tableMeta = new OdbcTableMeta(req.catalog(), cacheName,
+ table.name(), "TABLE");
- if (!meta.contains(tableMeta))
- meta.add(tableMeta);
+ if (!meta.contains(tableMeta))
+ meta.add(tableMeta);
+ }
}
OdbcQueryGetTablesMetaResult res = new OdbcQueryGetTablesMetaResult(meta);
[3/3] ignite git commit: Merge branch 'ignite-2543' of
https://github.com/isapego/ignite into ignite-2543
Posted by vo...@apache.org.
Merge branch 'ignite-2543' of https://github.com/isapego/ignite into ignite-2543
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e0226fc3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e0226fc3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e0226fc3
Branch: refs/heads/ignite-1786
Commit: e0226fc338b4252ca2e268f37df6c9a09742b139
Parents: 0d1b07d a383108
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Feb 10 17:25:32 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Feb 10 17:25:32 2016 +0300
----------------------------------------------------------------------
.../processors/odbc/OdbcCommandHandler.java | 26 ++++++++++++--------
1 file changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e0226fc3/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcCommandHandler.java
----------------------------------------------------------------------
[2/3] ignite git commit: Minor styling fix.
Posted by vo...@apache.org.
Minor styling fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0d1b07d4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d1b07d4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d1b07d4
Branch: refs/heads/ignite-1786
Commit: 0d1b07d4b82334b3e9eeb2fb9937fc3e96e7d792
Parents: 67730c4
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Feb 10 17:25:23 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Feb 10 17:25:23 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/processors/odbc/OdbcParser.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d1b07d4/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcParser.java
index 6c7d205..4078063 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcParser.java
@@ -328,7 +328,6 @@ public class OdbcParser implements GridNioParser {
for (Object row0 : items0) {
if (row0 != null) {
-
Collection<?> row = (Collection<?>)row0;
writer.writeInt(row.size());