Repository: tajo Updated Branches: refs/heads/branch-0.11.0 498769bde -> 1e1792700
TAJO-1819: Cannot find existing tables when pgsql catalog starts up. Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/1e179270 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/1e179270 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/1e179270 Branch: refs/heads/branch-0.11.0 Commit: 1e17927007ed177475fc4b0e5a2d777d841fd5cf Parents: 498769b Author: Jihoon Son <[email protected]> Authored: Tue Sep 8 15:51:39 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Tue Sep 8 15:51:39 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java | 4 ++-- .../apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/1e179270/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index f4556d7..d7f0bd4 100644 --- a/CHANGES +++ b/CHANGES @@ -247,6 +247,9 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1819: TAJO-1819: Cannot find existing tables when pgsql catalog starts up. + (jihoon) + TAJO-1821: Temporary data is not cleared after TestCatalog. (jihoon) TAJO-1805: In the 'Execute Query' page of web UI, default database http://git-wip-us.apache.org/repos/asf/tajo/blob/1e179270/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java index c36426e..0ecd90a 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/XMLCatalogSchemaManager.java @@ -239,14 +239,14 @@ public class XMLCatalogSchemaManager { } for (; paramIdx <= pstmt.getParameterMetaData().getParameterCount(); paramIdx++) { - pstmt.setString(paramIdx, params[paramIdx-1]); + pstmt.setString(paramIdx, params[paramIdx-1].toUpperCase()); } ResultSet rs = null; try { rs = pstmt.executeQuery(); while (rs.next()) { - if (rs.getString(1).equals(params[params.length - 1].toUpperCase())) { + if (rs.getString(1).toUpperCase().equals(params[params.length - 1].toUpperCase())) { result = true; break; } http://git-wip-us.apache.org/repos/asf/tajo/blob/1e179270/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java index d5b0403..f53beff 100644 --- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java +++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/store/TestXMLCatalogSchemaManager.java @@ -408,6 +408,7 @@ public class TestXMLCatalogSchemaManager { manager.createBaseSchema(conn); assertThat(manager.checkExistence(conn, DatabaseObjectType.TABLE, "TESTTABLE1"), is(true)); + assertThat(manager.checkExistence(conn, DatabaseObjectType.TABLE, "testtable2"), is(true)); assertThat(manager.checkExistence(conn, DatabaseObjectType.TABLE, "TESTTABLE3"), is(false)); assertThat(manager.checkExistence(conn, DatabaseObjectType.INDEX, "testtable1", "TESTINDEX1"), is(true)); assertThat(manager.checkExistence(conn, DatabaseObjectType.TRIGGER, "TESTTRIGGER1"), is(true));
