Repository: incubator-pirk Updated Branches: refs/heads/master 1509bd408 -> 0b5dcd852
Adding clearRegistry capability to query and data schema registries and clearing the registry before starting the QuerySchemaUtilsTest - attempt to fix the Jenkins instabilities Project: http://git-wip-us.apache.org/repos/asf/incubator-pirk/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-pirk/commit/0b5dcd85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-pirk/tree/0b5dcd85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-pirk/diff/0b5dcd85 Branch: refs/heads/master Commit: 0b5dcd8527f4aaebacfe587db3a39be64e97e294 Parents: 1509bd4 Author: eawilliams <[email protected]> Authored: Sun Jul 31 12:24:35 2016 -0400 Committer: eawilliams <[email protected]> Committed: Sun Jul 31 12:24:35 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/pirk/schema/data/DataSchemaRegistry.java | 8 ++++++++ .../org/apache/pirk/schema/query/QuerySchemaRegistry.java | 8 ++++++++ src/test/java/test/general/QueryParserUtilsTest.java | 4 ++++ 3 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/0b5dcd85/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java b/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java index 82fa1da..af90e8d 100644 --- a/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java +++ b/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java @@ -74,4 +74,12 @@ public class DataSchemaRegistry { return registry.keySet(); } + + /** + * Clear the registry + */ + public static void clearRegistry() + { + registry.clear(); + } } http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/0b5dcd85/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java b/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java index ce42d79..ce2a801 100644 --- a/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java +++ b/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java @@ -68,4 +68,12 @@ public class QuerySchemaRegistry { return registry.keySet(); } + + /** + * Clear the registry + */ + public static void clearRegistry() + { + registry.clear(); + } } http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/0b5dcd85/src/test/java/test/general/QueryParserUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/test/general/QueryParserUtilsTest.java b/src/test/java/test/general/QueryParserUtilsTest.java index 16d73bb..3591a74 100644 --- a/src/test/java/test/general/QueryParserUtilsTest.java +++ b/src/test/java/test/general/QueryParserUtilsTest.java @@ -27,6 +27,7 @@ import java.util.Map; import org.apache.hadoop.io.MapWritable; import org.apache.pirk.schema.data.DataSchema; import org.apache.pirk.schema.data.DataSchemaRegistry; +import org.apache.pirk.schema.query.QuerySchemaRegistry; import org.apache.pirk.test.utils.Inputs; import org.apache.pirk.utils.QueryParserUtils; import org.apache.pirk.utils.StringUtils; @@ -52,6 +53,9 @@ public class QueryParserUtilsTest { ArrayList<JSONObject> dataElementsJSON = Inputs.createJSONDataElements(); + DataSchemaRegistry.clearRegistry(); + QuerySchemaRegistry.clearRegistry(); + Inputs.createSchemaFiles(null, false, null); dSchema = DataSchemaRegistry.get(Inputs.TEST_DATA_SCHEMA_NAME);
