Repository: incubator-geode Updated Branches: refs/heads/develop a5daa924a -> e25ba5c08
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/750996a0/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java index 1fc1d23..b87db46 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java @@ -21,7 +21,7 @@ import com.gemstone.gemfire.Statistics; import com.gemstone.gemfire.StatisticsType; import com.gemstone.gemfire.StatisticsTypeFactory; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl; +import com.gemstone.gemfire.internal.statistics.StatisticsTypeFactoryImpl; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.Test; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/750996a0/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MemberLevelStatsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MemberLevelStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MemberLevelStatsJUnitTest.java index dcbbaca..5ad58dc 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MemberLevelStatsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MemberLevelStatsJUnitTest.java @@ -32,7 +32,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionStats; import com.gemstone.gemfire.distributed.internal.locks.DLockStats; import com.gemstone.gemfire.internal.NanoTimer; import com.gemstone.gemfire.internal.OSProcess; -import com.gemstone.gemfire.internal.VMStatsContract; +import com.gemstone.gemfire.internal.statistics.VMStatsContract; import com.gemstone.gemfire.internal.cache.CachePerfStats; import com.gemstone.gemfire.internal.cache.DiskStoreStats; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/750996a0/geode-core/src/test/resources/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest_testWriteAfterSamplingBegins_expected.gfs ---------------------------------------------------------------------- diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest_testWriteAfterSamplingBegins_expected.gfs b/geode-core/src/test/resources/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest_testWriteAfterSamplingBegins_expected.gfs deleted file mode 100644 index 7fc8265..0000000 Binary files a/geode-core/src/test/resources/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest_testWriteAfterSamplingBegins_expected.gfs and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/750996a0/geode-core/src/test/resources/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest_testWriteWhenSamplingBegins_expected.gfs ---------------------------------------------------------------------- diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest_testWriteWhenSamplingBegins_expected.gfs b/geode-core/src/test/resources/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest_testWriteWhenSamplingBegins_expected.gfs deleted file mode 100644 index 15a01b0..0000000 Binary files a/geode-core/src/test/resources/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest_testWriteWhenSamplingBegins_expected.gfs and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/750996a0/geode-core/src/test/resources/com/gemstone/gemfire/internal/statistics/StatArchiveWriterReaderJUnitTest_testWriteAfterSamplingBegins_expected.gfs ---------------------------------------------------------------------- diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/internal/statistics/StatArchiveWriterReaderJUnitTest_testWriteAfterSamplingBegins_expected.gfs b/geode-core/src/test/resources/com/gemstone/gemfire/internal/statistics/StatArchiveWriterReaderJUnitTest_testWriteAfterSamplingBegins_expected.gfs new file mode 100644 index 0000000..ccd20b2 Binary files /dev/null and b/geode-core/src/test/resources/com/gemstone/gemfire/internal/statistics/StatArchiveWriterReaderJUnitTest_testWriteAfterSamplingBegins_expected.gfs differ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/750996a0/geode-core/src/test/resources/com/gemstone/gemfire/internal/statistics/StatArchiveWriterReaderJUnitTest_testWriteWhenSamplingBegins_expected.gfs ---------------------------------------------------------------------- diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/internal/statistics/StatArchiveWriterReaderJUnitTest_testWriteWhenSamplingBegins_expected.gfs b/geode-core/src/test/resources/com/gemstone/gemfire/internal/statistics/StatArchiveWriterReaderJUnitTest_testWriteWhenSamplingBegins_expected.gfs new file mode 100644 index 0000000..fd1e77a Binary files /dev/null and b/geode-core/src/test/resources/com/gemstone/gemfire/internal/statistics/StatArchiveWriterReaderJUnitTest_testWriteWhenSamplingBegins_expected.gfs differ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/750996a0/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java index 3327909..d1a703c 100644 --- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java +++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java @@ -23,15 +23,13 @@ import com.gemstone.gemfire.Statistics; import com.gemstone.gemfire.StatisticsFactory; import com.gemstone.gemfire.StatisticsType; import com.gemstone.gemfire.StatisticsTypeFactory; -import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.query.CqException; import com.gemstone.gemfire.cache.query.CqQuery; import com.gemstone.gemfire.cache.query.internal.DefaultQueryService; import com.gemstone.gemfire.internal.NanoTimer; -import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl; +import com.gemstone.gemfire.internal.statistics.StatisticsTypeFactoryImpl; import com.gemstone.gemfire.internal.cache.FilterProfile; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.logging.LogService; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/750996a0/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStats.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStats.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStats.java index 4f89fa7..220ae0e 100644 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStats.java +++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStats.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.StatisticsFactory; import com.gemstone.gemfire.StatisticsType; import com.gemstone.gemfire.StatisticsTypeFactory; import com.gemstone.gemfire.internal.CopyOnWriteHashSet; -import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl; +import com.gemstone.gemfire.internal.statistics.StatisticsTypeFactoryImpl; public class LuceneIndexStats { // statistics type http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/750996a0/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemStats.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemStats.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemStats.java index ee66850..e6bbf0d 100644 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemStats.java +++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemStats.java @@ -26,7 +26,7 @@ import com.gemstone.gemfire.Statistics; import com.gemstone.gemfire.StatisticsFactory; import com.gemstone.gemfire.StatisticsType; import com.gemstone.gemfire.StatisticsTypeFactory; -import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl; +import com.gemstone.gemfire.internal.statistics.StatisticsTypeFactoryImpl; public class FileSystemStats { private static final StatisticsType statsType; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/750996a0/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java index 5ab8d0e..cbd57eb 100755 --- a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java +++ b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java @@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.util.AutoBalancer.GeodeCacheFacade; import com.gemstone.gemfire.distributed.DistributedLockService; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.locks.DLockService; -import com.gemstone.gemfire.internal.HostStatSampler; +import com.gemstone.gemfire.internal.statistics.HostStatSampler; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.junit.After;