You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2018/08/21 00:03:43 UTC
[geode] 02/02: fixing packages
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/Micrometer
in repository https://gitbox.apache.org/repos/asf/geode.git
commit a75357771ff240efd644948d773f719c324b4d8c
Author: Udo Kohlmeyer <uk...@pivotal.io>
AuthorDate: Mon Aug 20 17:03:21 2018 -0700
fixing packages
---
.../internal/cache/PartitionedRegionDataStore.java | 2 +-
geode-micrometer-stats/build.gradle.kts | 12 ++---
.../statistics/cache/MicrometerCCUStatsImpl.kt | 6 ---
geode-stats-common/build.gradle | 2 +-
.../geode/{ => distributed}/internal/DMStats.java | 0
.../internal/DistributionStats.java | 0
.../{ => distributed}/internal/LocatorStats.java | 0
.../{ => distributed}/internal/PoolStatHelper.java | 0
.../internal/QueueStatHelper.java | 0
.../internal/ThrottledMemQueueStatHelper.java | 0
.../internal/ThrottledQueueStatHelper.java | 0
.../internal/locks/DistributedLockStats.java | 0
.../{cache => }/internal/cache/CachePerfStats.java | 0
.../internal/cache/DiskDirectoryStats.java | 0
.../internal/cache/DiskRegionStats.java | 0
.../{cache => }/internal/cache/DiskStoreStats.java | 0
.../internal/cache/PartitionedRegionStats.java | 0
.../{cache => }/internal/cache/PoolStats.java | 0
.../internal/cache/RegionPerfStats.java | 0
.../cache/control/ResourceManagerStats.java | 0
.../cache/eviction/CountLRUEvictionStats.java | 0
.../internal/cache/eviction/EvictionStats.java | 0
.../cache/eviction/HeapLRUEvictionStats.java | 0
.../cache/eviction/MemoryLRUEvictionStats.java | 0
.../internal/cache/execute/FunctionStats.java | 0
.../internal/cache/ha/HARegionQueueStats.java | 0
.../internal/cache/tier/sockets/CCUStats.java | 0
.../tier/sockets/CacheClientNotifierStats.java | 0
.../cache/tier/sockets/CacheServerStats.java | 0
.../internal/cache/tier/sockets/MessageStats.java | 0
.../internal/cache/wan/GatewayReceiverStats.java | 0
.../internal/cache/wan/GatewaySenderStats.java | 0
.../internal/offheap/OffHeapStorageStats.java | 53 ++++++++++++++++++++++
33 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
index 903570e..00dbb95 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
@@ -211,7 +211,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
this.bucketStats =
StatsFactory.createRegionPerfStatsImpl(
pr.getCache().getInternalDistributedSystem().getStatisticsFactory(),
- pr.getCachePerfStats(), "partition-" + pr.getName());
+ pr.getCachePerfStats(), "dataStorRegion-" + pr.getName());
this.keysOfInterest = new ConcurrentHashMap();
}
diff --git a/geode-micrometer-stats/build.gradle.kts b/geode-micrometer-stats/build.gradle.kts
index 73aa56a..dc11a7b 100644
--- a/geode-micrometer-stats/build.gradle.kts
+++ b/geode-micrometer-stats/build.gradle.kts
@@ -15,12 +15,12 @@ repositories {
}
dependencies {
- implementation( project(":geode-common-stats"))
- implementation(kotlin("stdlib-jdk8"))
- implementation(group = "io.micrometer", name = "micrometer-core", version = "1.0.5")
- implementation(group = "io.micrometer", name = "micrometer-registry-influx", version = "1.0.5")
- implementation(group = "io.micrometer", name = "micrometer-registry-jmx", version = "1.0.5")
- implementation(group = "io.micrometer", name = "micrometer-registry-prometheus", version = "1.0.5")
+ compile( project(":geode-stats-common"))
+ compile(kotlin("stdlib-jdk8"))
+ compile(group = "io.micrometer", name = "micrometer-core", version = "1.0.6")
+ compile(group = "io.micrometer", name = "micrometer-registry-influx", version = "1.0.6")
+ compile(group = "io.micrometer", name = "micrometer-registry-jmx", version = "1.0.6")
+ compile(group = "io.micrometer", name = "micrometer-registry-prometheus", version = "1.0.6")
// implementation(group = "test", name = "micrometer-stats", version = "1.0-SNAPSHOT")
}
diff --git a/geode-micrometer-stats/src/main/kotlin/org/apache/geode/statistics/cache/MicrometerCCUStatsImpl.kt b/geode-micrometer-stats/src/main/kotlin/org/apache/geode/statistics/cache/MicrometerCCUStatsImpl.kt
index 3f74747..a0577f3 100644
--- a/geode-micrometer-stats/src/main/kotlin/org/apache/geode/statistics/cache/MicrometerCCUStatsImpl.kt
+++ b/geode-micrometer-stats/src/main/kotlin/org/apache/geode/statistics/cache/MicrometerCCUStatsImpl.kt
@@ -6,12 +6,6 @@ import org.apache.geode.statistics.internal.micrometer.impl.CounterStatisticMete
import org.apache.geode.statistics.internal.micrometer.impl.GaugeStatisticMeter
import org.apache.geode.statistics.internal.micrometer.impl.MicrometerMeterGroup
-/**
- * Stats for a CacheClientUpdater. Currently the only thing measured are incoming bytes on the
- * wire
- *
- * @since GemFire 5.7
- */
class MicrometerCCUStatsImpl internal constructor(statisticsFactory: StatisticsFactory?, private val serverLocation: String) :
CCUStats, MicrometerMeterGroup(statisticsFactory, "CacheClientUpdaterStats-$serverLocation") {
diff --git a/geode-stats-common/build.gradle b/geode-stats-common/build.gradle
index 60d2f82..e6e14dd 100644
--- a/geode-stats-common/build.gradle
+++ b/geode-stats-common/build.gradle
@@ -13,5 +13,5 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12'
- compile 'org.reflections:reflections:0.9.11'
+ implementation group: 'org.reflections', name: 'reflections', version: '0.9.11'
}
diff --git a/geode-stats-common/src/main/java/org/apache/geode/internal/DMStats.java b/geode-stats-common/src/main/java/org/apache/geode/distributed/internal/DMStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/internal/DMStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/distributed/internal/DMStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/internal/DistributionStats.java b/geode-stats-common/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/internal/DistributionStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/internal/LocatorStats.java b/geode-stats-common/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/internal/LocatorStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/internal/PoolStatHelper.java b/geode-stats-common/src/main/java/org/apache/geode/distributed/internal/PoolStatHelper.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/internal/PoolStatHelper.java
rename to geode-stats-common/src/main/java/org/apache/geode/distributed/internal/PoolStatHelper.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/internal/QueueStatHelper.java b/geode-stats-common/src/main/java/org/apache/geode/distributed/internal/QueueStatHelper.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/internal/QueueStatHelper.java
rename to geode-stats-common/src/main/java/org/apache/geode/distributed/internal/QueueStatHelper.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/internal/ThrottledMemQueueStatHelper.java b/geode-stats-common/src/main/java/org/apache/geode/distributed/internal/ThrottledMemQueueStatHelper.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/internal/ThrottledMemQueueStatHelper.java
rename to geode-stats-common/src/main/java/org/apache/geode/distributed/internal/ThrottledMemQueueStatHelper.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/internal/ThrottledQueueStatHelper.java b/geode-stats-common/src/main/java/org/apache/geode/distributed/internal/ThrottledQueueStatHelper.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/internal/ThrottledQueueStatHelper.java
rename to geode-stats-common/src/main/java/org/apache/geode/distributed/internal/ThrottledQueueStatHelper.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/internal/locks/DistributedLockStats.java b/geode-stats-common/src/main/java/org/apache/geode/distributed/internal/locks/DistributedLockStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/internal/locks/DistributedLockStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/distributed/internal/locks/DistributedLockStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/CachePerfStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/CachePerfStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/CachePerfStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/CachePerfStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/DiskDirectoryStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/DiskDirectoryStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/DiskDirectoryStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/DiskDirectoryStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/DiskRegionStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/DiskRegionStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/DiskRegionStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/DiskRegionStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/DiskStoreStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/DiskStoreStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/DiskStoreStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/DiskStoreStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/PartitionedRegionStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/PartitionedRegionStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/PoolStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/PoolStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/PoolStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/PoolStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/RegionPerfStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/RegionPerfStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/RegionPerfStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/RegionPerfStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/control/ResourceManagerStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/control/ResourceManagerStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/control/ResourceManagerStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/control/ResourceManagerStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/eviction/CountLRUEvictionStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/eviction/CountLRUEvictionStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/eviction/CountLRUEvictionStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/eviction/CountLRUEvictionStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/eviction/EvictionStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/eviction/EvictionStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/eviction/EvictionStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/eviction/EvictionStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/eviction/HeapLRUEvictionStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/eviction/HeapLRUEvictionStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/eviction/HeapLRUEvictionStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/eviction/HeapLRUEvictionStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/eviction/MemoryLRUEvictionStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/eviction/MemoryLRUEvictionStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/eviction/MemoryLRUEvictionStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/eviction/MemoryLRUEvictionStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/execute/FunctionStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/execute/FunctionStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/ha/HARegionQueueStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/ha/HARegionQueueStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/tier/sockets/CCUStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/tier/sockets/CCUStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/tier/sockets/CCUStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/tier/sockets/CCUStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/tier/sockets/CacheClientNotifierStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/tier/sockets/CacheClientNotifierStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/tier/sockets/CacheServerStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/tier/sockets/CacheServerStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/tier/sockets/MessageStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/tier/sockets/MessageStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/wan/GatewayReceiverStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/wan/GatewayReceiverStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/wan/GatewaySenderStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java
similarity index 100%
rename from geode-stats-common/src/main/java/org/apache/geode/cache/internal/cache/wan/GatewaySenderStats.java
rename to geode-stats-common/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java
diff --git a/geode-stats-common/src/main/java/org/apache/geode/internal/offheap/OffHeapStorageStats.java b/geode-stats-common/src/main/java/org/apache/geode/internal/offheap/OffHeapStorageStats.java
new file mode 100644
index 0000000..92d1470
--- /dev/null
+++ b/geode-stats-common/src/main/java/org/apache/geode/internal/offheap/OffHeapStorageStats.java
@@ -0,0 +1,53 @@
+package org.apache.geode.internal.offheap;
+
+import org.apache.geode.statistics.Statistics;
+
+public interface OffHeapStorageStats {
+ void incFreeMemory(long value);
+
+ void incMaxMemory(long value);
+
+ void incUsedMemory(long value);
+
+ void incObjects(int value);
+
+ void incReads();
+
+ void setFragments(long value);
+
+ void setLargestFragment(int value);
+
+ long startDefragmentation();
+
+ void endDefragmentation(long start);
+
+ void setFragmentation(int value);
+
+ long getFreeMemory();
+
+ long getMaxMemory();
+
+ long getUsedMemory();
+
+ long getReads();
+
+ int getObjects();
+
+ int getDefragmentations();
+
+ int getDefragmentationsInProgress();
+
+ long getFragments();
+
+ int getLargestFragment();
+
+ int getFragmentation();
+
+ long getDefragmentationTime();
+
+ Statistics getStats();
+
+ void close();
+
+ void initialize(OffHeapStorageStats stats);
+}