Skip to content

F
flink

doujutun3207 / flink
与 Fork 源项目一致

从无法访问的项目Fork

通知 24
Star 0
Fork 0
F
flink

体验新版 GitCode，发现更多精彩内容 >>

提交 b863b90c 编写于 作者: Z zentol
浏览文件
操作

[FLINK-6786] [metrics] Deduplicate QueryScopeIntoTest 

This closes #4034.
上级 1f6be837
隐藏空白更改
内联 并排
Showing with 111 addition and 190 deletion
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/dump/QueryScopeInfoTest.java
浏览文件 @ b863b90c
...@@ -20,11 +20,6 @@ package org.apache.flink.runtime.metrics.dump; ...@@ -20,11 +20,6 @@ package org.apache.flink.runtime.metrics.dump;
import org.junit.Test; import org.junit.Test;
import static org.apache.flink.runtime.metrics.dump.QueryScopeInfo.INFO_CATEGORY_JM;
import static org.apache.flink.runtime.metrics.dump.QueryScopeInfo.INFO_CATEGORY_JOB;
import static org.apache.flink.runtime.metrics.dump.QueryScopeInfo.INFO_CATEGORY_OPERATOR;
import static org.apache.flink.runtime.metrics.dump.QueryScopeInfo.INFO_CATEGORY_TASK;
import static org.apache.flink.runtime.metrics.dump.QueryScopeInfo.INFO_CATEGORY_TM;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
/** /**
...@@ -32,46 +27,133 @@ import static org.junit.Assert.assertEquals; ...@@ -32,46 +27,133 @@ import static org.junit.Assert.assertEquals;
*/ */
public class QueryScopeInfoTest { public class QueryScopeInfoTest {
@Test @Test
public void testJobManagerMetricInfo() { public void testJobManagerQueryScopeInfo() {
QueryScopeInfo.JobManagerQueryScopeInfo info = new QueryScopeInfo.JobManagerQueryScopeInfo("abc"); QueryScopeInfo.JobManagerQueryScopeInfo info = new QueryScopeInfo.JobManagerQueryScopeInfo();
assertEquals("abc", info.scope); assertEquals(QueryScopeInfo.INFO_CATEGORY_JM, info.getCategory());
assertEquals(INFO_CATEGORY_JM, info.getCategory()); assertEquals("", info.scope);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JM, info.getCategory());
assertEquals("world", info.scope);
info = new QueryScopeInfo.JobManagerQueryScopeInfo("hello");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JM, info.getCategory());
assertEquals("hello", info.scope);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JM, info.getCategory());
assertEquals("hello.world", info.scope);
} }
@Test @Test
public void testTaskManagerMetricInfo() { public void testTaskManagerQueryScopeInfo() {
QueryScopeInfo.TaskManagerQueryScopeInfo info = new QueryScopeInfo.TaskManagerQueryScopeInfo("tmid", "abc"); QueryScopeInfo.TaskManagerQueryScopeInfo info = new QueryScopeInfo.TaskManagerQueryScopeInfo("tmid");
assertEquals("abc", info.scope); assertEquals(QueryScopeInfo.INFO_CATEGORY_TM, info.getCategory());
assertEquals("", info.scope);
assertEquals("tmid", info.taskManagerID);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TM, info.getCategory());
assertEquals("world", info.scope);
assertEquals("tmid", info.taskManagerID);
info = new QueryScopeInfo.TaskManagerQueryScopeInfo("tmid", "hello");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TM, info.getCategory());
assertEquals("hello", info.scope);
assertEquals("tmid", info.taskManagerID);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TM, info.getCategory());
assertEquals("hello.world", info.scope);
assertEquals("tmid", info.taskManagerID); assertEquals("tmid", info.taskManagerID);
assertEquals(INFO_CATEGORY_TM, info.getCategory());
} }
@Test @Test
public void testJobMetricInfo() { public void testJobQueryScopeInfo() {
QueryScopeInfo.JobQueryScopeInfo info = new QueryScopeInfo.JobQueryScopeInfo("jobid", "abc"); QueryScopeInfo.JobQueryScopeInfo info = new QueryScopeInfo.JobQueryScopeInfo("jobid");
assertEquals("abc", info.scope); assertEquals(QueryScopeInfo.INFO_CATEGORY_JOB, info.getCategory());
assertEquals("", info.scope);
assertEquals("jobid", info.jobID);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JOB, info.getCategory());
assertEquals("world", info.scope);
assertEquals("jobid", info.jobID);
info = new QueryScopeInfo.JobQueryScopeInfo("jobid", "hello");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JOB, info.getCategory());
assertEquals("hello", info.scope);
assertEquals("jobid", info.jobID);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JOB, info.getCategory());
assertEquals("hello.world", info.scope);
assertEquals("jobid", info.jobID); assertEquals("jobid", info.jobID);
assertEquals(INFO_CATEGORY_JOB, info.getCategory());
} }
@Test @Test
public void testTaskMetricInfo() { public void testTaskQueryScopeInfo() {
QueryScopeInfo.TaskQueryScopeInfo info = new QueryScopeInfo.TaskQueryScopeInfo("jid", "vid", 2, "abc"); QueryScopeInfo.TaskQueryScopeInfo info = new QueryScopeInfo.TaskQueryScopeInfo("jobid", "taskid", 2);
assertEquals("abc", info.scope); assertEquals(QueryScopeInfo.INFO_CATEGORY_TASK, info.getCategory());
assertEquals("jid", info.jobID); assertEquals("", info.scope);
assertEquals("vid", info.vertexID); assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals(2, info.subtaskIndex);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TASK, info.getCategory());
assertEquals("world", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals(2, info.subtaskIndex);
info = new QueryScopeInfo.TaskQueryScopeInfo("jobid", "taskid", 2, "hello");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TASK, info.getCategory());
assertEquals("hello", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals(2, info.subtaskIndex);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TASK, info.getCategory());
assertEquals("hello.world", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals(2, info.subtaskIndex); assertEquals(2, info.subtaskIndex);
assertEquals(INFO_CATEGORY_TASK, info.getCategory());
} }
@Test @Test
public void testOperatorMetricInfo() { public void testOperatorQueryScopeInfo() {
QueryScopeInfo.OperatorQueryScopeInfo info = new QueryScopeInfo.OperatorQueryScopeInfo("jid", "vid", 2, "opname", "abc"); QueryScopeInfo.OperatorQueryScopeInfo info = new QueryScopeInfo.OperatorQueryScopeInfo("jobid", "taskid", 2, "opname");
assertEquals("abc", info.scope); assertEquals(QueryScopeInfo.INFO_CATEGORY_OPERATOR, info.getCategory());
assertEquals("jid", info.jobID); assertEquals("", info.scope);
assertEquals("vid", info.vertexID); assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals("opname", info.operatorName);
assertEquals(2, info.subtaskIndex);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_OPERATOR, info.getCategory());
assertEquals("world", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals("opname", info.operatorName);
assertEquals(2, info.subtaskIndex);
info = new QueryScopeInfo.OperatorQueryScopeInfo("jobid", "taskid", 2, "opname", "hello");
assertEquals(QueryScopeInfo.INFO_CATEGORY_OPERATOR, info.getCategory());
assertEquals("hello", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals("opname", info.operatorName);
assertEquals(2, info.subtaskIndex);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_OPERATOR, info.getCategory());
assertEquals("hello.world", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals("opname", info.operatorName); assertEquals("opname", info.operatorName);
assertEquals(2, info.subtaskIndex); assertEquals(2, info.subtaskIndex);
assertEquals(INFO_CATEGORY_OPERATOR, info.getCategory());
} }
} }
flink-runtime/src/test/java/org/apache/flink/runtime/metrics/groups/QueryScopeInfoTest.java 已删除 100644 → 0
浏览文件 @ 1f6be837
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.flink.runtime.metrics.groups;
import org.apache.flink.runtime.metrics.dump.QueryScopeInfo;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
* Tests for the {@link QueryScopeInfo} classes.
*/
public class QueryScopeInfoTest {
@Test
public void testJobManagerQueryScopeInfo() {
QueryScopeInfo.JobManagerQueryScopeInfo info = new QueryScopeInfo.JobManagerQueryScopeInfo();
assertEquals(QueryScopeInfo.INFO_CATEGORY_JM, info.getCategory());
assertEquals("", info.scope);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JM, info.getCategory());
assertEquals("world", info.scope);
info = new QueryScopeInfo.JobManagerQueryScopeInfo("hello");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JM, info.getCategory());
assertEquals("hello", info.scope);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JM, info.getCategory());
assertEquals("hello.world", info.scope);
}
@Test
public void testTaskManagerQueryScopeInfo() {
QueryScopeInfo.TaskManagerQueryScopeInfo info = new QueryScopeInfo.TaskManagerQueryScopeInfo("tmid");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TM, info.getCategory());
assertEquals("", info.scope);
assertEquals("tmid", info.taskManagerID);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TM, info.getCategory());
assertEquals("world", info.scope);
assertEquals("tmid", info.taskManagerID);
info = new QueryScopeInfo.TaskManagerQueryScopeInfo("tmid", "hello");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TM, info.getCategory());
assertEquals("hello", info.scope);
assertEquals("tmid", info.taskManagerID);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TM, info.getCategory());
assertEquals("hello.world", info.scope);
assertEquals("tmid", info.taskManagerID);
}
@Test
public void testJobQueryScopeInfo() {
QueryScopeInfo.JobQueryScopeInfo info = new QueryScopeInfo.JobQueryScopeInfo("jobid");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JOB, info.getCategory());
assertEquals("", info.scope);
assertEquals("jobid", info.jobID);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JOB, info.getCategory());
assertEquals("world", info.scope);
assertEquals("jobid", info.jobID);
info = new QueryScopeInfo.JobQueryScopeInfo("jobid", "hello");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JOB, info.getCategory());
assertEquals("hello", info.scope);
assertEquals("jobid", info.jobID);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_JOB, info.getCategory());
assertEquals("hello.world", info.scope);
assertEquals("jobid", info.jobID);
}
@Test
public void testTaskQueryScopeInfo() {
QueryScopeInfo.TaskQueryScopeInfo info = new QueryScopeInfo.TaskQueryScopeInfo("jobid", "taskid", 2);
assertEquals(QueryScopeInfo.INFO_CATEGORY_TASK, info.getCategory());
assertEquals("", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals(2, info.subtaskIndex);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TASK, info.getCategory());
assertEquals("world", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals(2, info.subtaskIndex);
info = new QueryScopeInfo.TaskQueryScopeInfo("jobid", "taskid", 2, "hello");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TASK, info.getCategory());
assertEquals("hello", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals(2, info.subtaskIndex);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_TASK, info.getCategory());
assertEquals("hello.world", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals(2, info.subtaskIndex);
}
@Test
public void testOperatorQueryScopeInfo() {
QueryScopeInfo.OperatorQueryScopeInfo info = new QueryScopeInfo.OperatorQueryScopeInfo("jobid", "taskid", 2, "opname");
assertEquals(QueryScopeInfo.INFO_CATEGORY_OPERATOR, info.getCategory());
assertEquals("", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals("opname", info.operatorName);
assertEquals(2, info.subtaskIndex);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_OPERATOR, info.getCategory());
assertEquals("world", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals("opname", info.operatorName);
assertEquals(2, info.subtaskIndex);
info = new QueryScopeInfo.OperatorQueryScopeInfo("jobid", "taskid", 2, "opname", "hello");
assertEquals(QueryScopeInfo.INFO_CATEGORY_OPERATOR, info.getCategory());
assertEquals("hello", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals("opname", info.operatorName);
assertEquals(2, info.subtaskIndex);
info = info.copy("world");
assertEquals(QueryScopeInfo.INFO_CATEGORY_OPERATOR, info.getCategory());
assertEquals("hello.world", info.scope);
assertEquals("jobid", info.jobID);
assertEquals("taskid", info.vertexID);
assertEquals("opname", info.operatorName);
assertEquals(2, info.subtaskIndex);
}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或