You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by xi...@apache.org on 2021/07/08 22:04:35 UTC
[incubator-pinot] branch master updated: Move minion metrics
definition to pinot-common package (#7107)
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 1a12510 Move minion metrics definition to pinot-common package (#7107)
1a12510 is described below
commit 1a12510df303af0774293f79e7b5caa91f329c19
Author: Liang Mingqiang <mi...@linkedin.com>
AuthorDate: Thu Jul 8 15:04:14 2021 -0700
Move minion metrics definition to pinot-common package (#7107)
* move minion metrics definition to pinot-common package
* fix format
---
.../main/java/org/apache/pinot/common}/metrics/MinionGauge.java | 3 +--
.../main/java/org/apache/pinot/common}/metrics/MinionMeter.java | 3 +--
.../main/java/org/apache/pinot/common}/metrics/MinionMetrics.java | 3 +--
.../java/org/apache/pinot/common}/metrics/MinionQueryPhase.java | 3 +--
.../main/java/org/apache/pinot/common}/metrics/MinionTimer.java | 3 +--
.../src/main/java/org/apache/pinot/minion/BaseMinionStarter.java | 4 ++--
.../src/main/java/org/apache/pinot/minion/MinionContext.java | 2 +-
.../org/apache/pinot/minion/taskfactory/TaskFactoryRegistry.java | 8 ++++----
8 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionGauge.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionGauge.java
similarity index 93%
rename from pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionGauge.java
rename to pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionGauge.java
index 8b20c29..b183bf3 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionGauge.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionGauge.java
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.minion.metrics;
+package org.apache.pinot.common.metrics;
import org.apache.pinot.common.Utils;
-import org.apache.pinot.common.metrics.AbstractMetrics;
public enum MinionGauge implements AbstractMetrics.Gauge {
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionMeter.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionMeter.java
similarity index 94%
rename from pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionMeter.java
rename to pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionMeter.java
index b2b5118..db25ca0 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionMeter.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionMeter.java
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.minion.metrics;
+package org.apache.pinot.common.metrics;
import org.apache.pinot.common.Utils;
-import org.apache.pinot.common.metrics.AbstractMetrics;
public enum MinionMeter implements AbstractMetrics.Meter {
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionMetrics.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionMetrics.java
similarity index 94%
rename from pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionMetrics.java
rename to pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionMetrics.java
index f6abeb5..9df006e 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionMetrics.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionMetrics.java
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.minion.metrics;
+package org.apache.pinot.common.metrics;
-import org.apache.pinot.common.metrics.AbstractMetrics;
import org.apache.pinot.spi.metrics.PinotMetricsRegistry;
import org.apache.pinot.spi.utils.CommonConstants;
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionQueryPhase.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionQueryPhase.java
similarity index 92%
rename from pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionQueryPhase.java
rename to pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionQueryPhase.java
index 65a16ad..d26ef4d 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionQueryPhase.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionQueryPhase.java
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.minion.metrics;
+package org.apache.pinot.common.metrics;
import org.apache.pinot.common.Utils;
-import org.apache.pinot.common.metrics.AbstractMetrics;
public enum MinionQueryPhase implements AbstractMetrics.QueryPhase {
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionTimer.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionTimer.java
similarity index 92%
rename from pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionTimer.java
rename to pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionTimer.java
index 6e6dbf3..0191d71 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/metrics/MinionTimer.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MinionTimer.java
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.minion.metrics;
+package org.apache.pinot.common.metrics;
import org.apache.pinot.common.Utils;
-import org.apache.pinot.common.metrics.AbstractMetrics;
public enum MinionTimer implements AbstractMetrics.Timer {
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java b/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java
index 595ab62..5083261 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java
@@ -33,6 +33,8 @@ import org.apache.helix.manager.zk.ZKHelixManager;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.task.TaskStateModelFactory;
import org.apache.pinot.common.Utils;
+import org.apache.pinot.common.metrics.MinionMeter;
+import org.apache.pinot.common.metrics.MinionMetrics;
import org.apache.pinot.common.metrics.PinotMetricUtils;
import org.apache.pinot.common.utils.ClientSSLContextGenerator;
import org.apache.pinot.common.utils.ServiceStatus;
@@ -47,8 +49,6 @@ import org.apache.pinot.minion.event.MinionEventObserverFactory;
import org.apache.pinot.minion.executor.MinionTaskZkMetadataManager;
import org.apache.pinot.minion.executor.PinotTaskExecutorFactory;
import org.apache.pinot.minion.executor.TaskExecutorFactoryRegistry;
-import org.apache.pinot.minion.metrics.MinionMeter;
-import org.apache.pinot.minion.metrics.MinionMetrics;
import org.apache.pinot.minion.taskfactory.TaskFactoryRegistry;
import org.apache.pinot.spi.crypt.PinotCrypterFactory;
import org.apache.pinot.spi.env.PinotConfiguration;
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java
index 6ba1d67..cc4b4e1 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionContext.java
@@ -22,8 +22,8 @@ import java.io.File;
import javax.net.ssl.SSLContext;
import org.apache.helix.ZNRecord;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.pinot.common.metrics.MinionMetrics;
import org.apache.pinot.core.minion.SegmentPurger;
-import org.apache.pinot.minion.metrics.MinionMetrics;
/**
diff --git a/pinot-minion/src/main/java/org/apache/pinot/minion/taskfactory/TaskFactoryRegistry.java b/pinot-minion/src/main/java/org/apache/pinot/minion/taskfactory/TaskFactoryRegistry.java
index 5bb99cd..1913858 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/taskfactory/TaskFactoryRegistry.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/taskfactory/TaskFactoryRegistry.java
@@ -28,6 +28,10 @@ import org.apache.helix.task.TaskConfig;
import org.apache.helix.task.TaskDriver;
import org.apache.helix.task.TaskFactory;
import org.apache.helix.task.TaskResult;
+import org.apache.pinot.common.metrics.MinionGauge;
+import org.apache.pinot.common.metrics.MinionMeter;
+import org.apache.pinot.common.metrics.MinionMetrics;
+import org.apache.pinot.common.metrics.MinionQueryPhase;
import org.apache.pinot.core.common.MinionConstants;
import org.apache.pinot.core.minion.PinotTaskConfig;
import org.apache.pinot.minion.MinionContext;
@@ -39,10 +43,6 @@ import org.apache.pinot.minion.exception.TaskCancelledException;
import org.apache.pinot.minion.executor.PinotTaskExecutor;
import org.apache.pinot.minion.executor.PinotTaskExecutorFactory;
import org.apache.pinot.minion.executor.TaskExecutorFactoryRegistry;
-import org.apache.pinot.minion.metrics.MinionGauge;
-import org.apache.pinot.minion.metrics.MinionMeter;
-import org.apache.pinot.minion.metrics.MinionMetrics;
-import org.apache.pinot.minion.metrics.MinionQueryPhase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org