ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-3443 WIP.
Date Wed, 12 Oct 2016 02:38:14 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-3443 8811441fe -> 7c7c2a117


IGNITE-3443 WIP.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c7c2a11
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c7c2a11
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c7c2a11

Branch: refs/heads/ignite-3443
Commit: 7c7c2a1179a787a6fa32d8e56d319541e03fbb54
Parents: 8811441
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Wed Oct 12 09:35:39 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Oct 12 09:35:39 2016 +0700

----------------------------------------------------------------------
 .../GridCacheQueryDetailsMetricsAdapter.java    |   2 +
 .../cache/VisorCacheQueryDetailsMetrics.java    | 145 -------------------
 .../resources/META-INF/classnames.properties    |   1 -
 3 files changed, 2 insertions(+), 146 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7c7c2a11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryDetailsMetricsAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryDetailsMetricsAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryDetailsMetricsAdapter.java
index 935e340..eaa9546 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryDetailsMetricsAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryDetailsMetricsAdapter.java
@@ -205,6 +205,7 @@ public class GridCacheQueryDetailsMetricsAdapter implements QueryDetailsMetrics,
         out.writeLong(minTime);
         out.writeLong(maxTime);
         out.writeLong(totalTime);
+        out.writeLong(lastStartTime);
     }
 
     /** {@inheritDoc} */
@@ -216,6 +217,7 @@ public class GridCacheQueryDetailsMetricsAdapter implements QueryDetailsMetrics,
         minTime = in.readLong();
         maxTime = in.readLong();
         totalTime = in.readLong();
+        lastStartTime = in.readLong();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/7c7c2a11/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryDetailsMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryDetailsMetrics.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryDetailsMetrics.java
deleted file mode 100644
index a9248bb..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryDetailsMetrics.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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.ignite.internal.visor.cache;
-
-import java.io.Serializable;
-import org.apache.ignite.cache.query.QueryDetailsMetrics;
-import org.apache.ignite.internal.LessNamingBean;
-import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType;
-import org.apache.ignite.internal.util.typedef.internal.S;
-
-/**
- * Data transfer object for cache query metrics.
- */
-public class VisorCacheQueryDetailsMetrics implements Serializable, LessNamingBean {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Query type. */
-    private GridCacheQueryType qryType;
-
-    /** Textual representation of query. */
-    private String qry;
-
-    /** Minimum execution time of query. */
-    private long minTime;
-
-    /** Maximum execution time of query. */
-    private long maxTime;
-
-    /** Average execution time of query. */
-    private double avgTime;
-
-    /** Number of query executions. */
-    private int execs;
-
-    /** Number of failed queries. */
-    private int failures;
-
-    /** Number of completed queries. */
-    private int completions;
-
-    /** Latest time query was stared. */
-    private long lastStartTime;
-
-    /**
-     * @param m Cache query metrics.
-     * @return Data transfer object for given cache metrics.
-     */
-    public VisorCacheQueryDetailsMetrics from(QueryDetailsMetrics m) {
-        qryType = m.queryType();
-        qry = m.query();
-        minTime = m.minimumTime();
-        maxTime = m.maximumTime();
-        avgTime = m.averageTime();
-        execs = m.executions();
-        failures = m.failures();
-        completions = m.completions();
-        lastStartTime = m.lastStartTime();
-
-        return this;
-    }
-
-    /**
-     * @return Query type.
-     */
-    public GridCacheQueryType queryType() {
-        return qryType;
-    }
-
-    /**
-     * @return Textual representation of query.
-     */
-    public String query() {
-        return qry;
-    }
-
-    /**
-     * @return Minimum execution time of query.
-     */
-    public long minimumTime() {
-        return minTime;
-    }
-
-    /**
-     * @return Maximum execution time of query.
-     */
-    public long maximumTime() {
-        return maxTime;
-    }
-
-    /**
-     * @return Average execution time of query.
-     */
-    public double averageTime() {
-        return avgTime;
-    }
-
-    /**
-     * @return Number of executions.
-     */
-    public int executions() {
-        return execs;
-    }
-
-    /**
-     * @return Total number of times a query execution failed.
-     */
-    public int failures() {
-        return failures;
-    }
-
-    /**
-     * @return Total number of times a query execution completed.
-     */
-    public int completions() {
-        return completions;
-    }
-
-    /**
-     * @return Latest time query was stared.
-     */
-    public long lastStartTime() {
-        return lastStartTime;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(VisorCacheQueryDetailsMetrics.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/7c7c2a11/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 91b1051..a1f77d3 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -1660,7 +1660,6 @@ org.apache.ignite.internal.visor.cache.VisorCachePartitionsTask
 org.apache.ignite.internal.visor.cache.VisorCachePartitionsTask$VisorCachePartitionsJob
 org.apache.ignite.internal.visor.cache.VisorCacheQueryConfiguration
 org.apache.ignite.internal.visor.cache.VisorCacheQueryConfigurationV2
-org.apache.ignite.internal.visor.cache.VisorCacheQueryDetailsMetrics
 org.apache.ignite.internal.visor.cache.VisorCacheQueryMetrics
 org.apache.ignite.internal.visor.cache.VisorCacheQueryMetricsCollectorTask
 org.apache.ignite.internal.visor.cache.VisorCacheQueryMetricsCollectorTask$VisorCacheQueryMetricsCollectorJob


Mime
View raw message