Repository: tajo Updated Branches: refs/heads/branch-0.11.0 9328619d3 -> 91e2d746b
TAJO-1923: Selecting on information_schema.table_stats throws an internal error. Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/91e2d746 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/91e2d746 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/91e2d746 Branch: refs/heads/branch-0.11.0 Commit: 91e2d746ba03855e45738a47fa15e5dacd563e95 Parents: 9328619 Author: Jihoon Son <[email protected]> Authored: Thu Oct 15 09:07:18 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Thu Oct 15 09:07:18 2015 +0900 ---------------------------------------------------------------------- CHANGES | 4 ++++ .../org/apache/tajo/catalog/CatalogServer.java | 1 + .../TestCatalogAgainstCaseSensitivity.java | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/91e2d746/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 3a5e7e8..04d4ab5 100644 --- a/CHANGES +++ b/CHANGES @@ -287,6 +287,10 @@ Release 0.11.0 - unreleased TAJO-1924: Repair partition need to calculate partition volume. (jaehwa) + + TAJO-1923: Selecting on information_schema.table_stats throws an internal + error. (jihoon) + TAJO-1917: Conflict on Parquet Libraries. (Contributed by Jongyoung Park. Committed by jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/91e2d746/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java index 3126943..552168d 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java @@ -815,6 +815,7 @@ public class CatalogServer extends AbstractService { rlock.lock(); try { return GetTableStatsResponse.newBuilder() + .setState(OK) .addAllStats(store.getAllTableStats()) .build(); http://git-wip-us.apache.org/repos/asf/tajo/blob/91e2d746/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalogAgainstCaseSensitivity.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalogAgainstCaseSensitivity.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalogAgainstCaseSensitivity.java index 58ec3fc..99a7b43 100644 --- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalogAgainstCaseSensitivity.java +++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalogAgainstCaseSensitivity.java @@ -143,6 +143,24 @@ public class TestCatalogAgainstCaseSensitivity { TableStats stats = catalog.getTableDesc("TestDatabase1", "TestTable1").getStats(); assertEquals(10000, stats.getNumBytes().longValue()); assertEquals(5000, stats.getNumRows().longValue()); + + ////////////////////////////////////////////////////////////////////////////// + // all table stats + ////////////////////////////////////////////////////////////////////////////// + + Map<Integer, String> allDatabases = new HashMap<>(); + for (DatabaseProto databaseProto : catalog.getAllDatabases()) { + allDatabases.put(databaseProto.getId(), databaseProto.getName()); + } + Map<Integer, TableStats> statsMap = new HashMap<>(); + for (TableDescriptorProto descriptorProto : catalog.getAllTables()) { + statsMap.put(descriptorProto.getTid(), + catalog.getTableDesc(allDatabases.get(descriptorProto.getDbId()), descriptorProto.getName()).getStats()); + } + + for (TableStatsProto statsProto : catalog.getAllTableStats()) { + assertEquals(statsMap.get(statsProto.getTid()), new TableStats(statsProto)); + } } // TODO: This should be added at TAJO-1891
