diff --git a/ql/src/test/org/apache/hadoop/hive/ql/parse/repl/metric/TestReplicationMetricSink.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/repl/metric/TestReplicationMetricSink.java index c75b51dddf..d3ad8fb963 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/parse/repl/metric/TestReplicationMetricSink.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/parse/repl/metric/TestReplicationMetricSink.java @@ -68,8 +68,10 @@ public void setup() throws Exception { @Test public void testSuccessBootstrapDumpMetrics() throws Exception { - ReplicationMetricCollector bootstrapDumpMetricCollector = new BootstrapDumpMetricCollector("db", - "staging", conf); + ReplicationMetricCollector bootstrapDumpMetricCollector = new BootstrapDumpMetricCollector( + "testAcidTablesReplLoadBootstrapIncr_1592205875387", + "hdfs://localhost:65158/tmp/org_apache_hadoop_hive_ql_parse_TestReplicationScenarios_245261428230295" + + "/hrepl0/dGVzdGFjaWR0YWJsZXNyZXBsbG9hZGJvb3RzdHJhcGluY3JfMTU5MjIwNTg3NTM4Nw==/0/hive", conf); Map metricMap = new HashMap<>(); metricMap.put(ReplUtils.MetricName.TABLES.name(), (long) 10); metricMap.put(ReplUtils.MetricName.FUNCTIONS.name(), (long) 1); @@ -80,7 +82,10 @@ public void testSuccessBootstrapDumpMetrics() throws Exception { bootstrapDumpMetricCollector.reportStageEnd("dump", Status.SUCCESS, 10); bootstrapDumpMetricCollector.reportEnd(Status.SUCCESS); - Metadata expectedMetadata = new Metadata("db", Metadata.ReplicationType.BOOTSTRAP, "staging"); + Metadata expectedMetadata = new Metadata("testAcidTablesReplLoadBootstrapIncr_1592205875387", + Metadata.ReplicationType.BOOTSTRAP, "hdfs://localhost:65158/tmp/org_apache_hadoop_hive_ql_" + + "parse_TestReplicationScenarios_245261428230295/hrepl0/dGVzdGFjaWR0YWJsZXNyZXBsbG9hZGJvb3RzdHJhcGlu" + + "Y3JfMTU5MjIwNTg3NTM4Nw==/0/hive"); expectedMetadata.setLastReplId(10); Progress expectedProgress = new Progress(); expectedProgress.setStatus(Status.SUCCESS); @@ -93,7 +98,8 @@ public void testSuccessBootstrapDumpMetrics() throws Exception { dumpStage.addMetric(expectedTableMetric); dumpStage.addMetric(expectedFuncMetric); expectedProgress.addStage(dumpStage); - ReplicationMetric expectedMetric = new ReplicationMetric(1, "repl", 0, expectedMetadata); + ReplicationMetric expectedMetric = new ReplicationMetric(1, "repl", 0, + expectedMetadata); expectedMetric.setProgress(expectedProgress); Thread.sleep(1000 * 20); GetReplicationMetricsRequest metricsRequest = new GetReplicationMetricsRequest(); diff --git a/standalone-metastore/metastore-server/src/main/resources/package.jdo b/standalone-metastore/metastore-server/src/main/resources/package.jdo index 626807e8c7..c88ed32a78 100644 --- a/standalone-metastore/metastore-server/src/main/resources/package.jdo +++ b/standalone-metastore/metastore-server/src/main/resources/package.jdo @@ -1534,10 +1534,10 @@ - + - +