You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by fj...@apache.org on 2019/04/12 04:57:55 UTC
[incubator-druid] branch master updated: SQLMetadataSegmentManager:
Comments, formatting adjustments (#7452)
This is an automated email from the ASF dual-hosted git repository.
fjy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new 3854cfd SQLMetadataSegmentManager: Comments, formatting adjustments (#7452)
3854cfd is described below
commit 3854cfd15efad634038b10b4c107ec0905710356
Author: Gian Merlino <gi...@gmail.com>
AuthorDate: Thu Apr 11 21:57:50 2019 -0700
SQLMetadataSegmentManager: Comments, formatting adjustments (#7452)
Follow up to #7447.
---
.../java/org/apache/druid/metadata/SQLMetadataSegmentManager.java | 4 +++-
.../java/org/apache/druid/metadata/SQLMetadataSegmentManagerTest.java | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManager.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManager.java
index 0bcf9fa..220c26b 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManager.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataSegmentManager.java
@@ -105,7 +105,9 @@ public class SQLMetadataSegmentManager implements MetadataSegmentManager
private final SQLMetadataConnector connector;
// Volatile since this reference is reassigned in "poll" and then read from in other threads.
- // Starts null so we can differentiate "never polled" (null) from "polled, but empty" (empty map)
+ // Starts null so we can differentiate "never polled" (null) from "polled, but empty" (empty map).
+ // Note that this is not simply a lazy-initialized variable: it starts off as null, and may transition between
+ // null and nonnull multiple times as stop() and start() are called.
@Nullable
private volatile ConcurrentHashMap<String, DruidDataSource> dataSources = null;
diff --git a/server/src/test/java/org/apache/druid/metadata/SQLMetadataSegmentManagerTest.java b/server/src/test/java/org/apache/druid/metadata/SQLMetadataSegmentManagerTest.java
index 242dc5e..7d1e178 100644
--- a/server/src/test/java/org/apache/druid/metadata/SQLMetadataSegmentManagerTest.java
+++ b/server/src/test/java/org/apache/druid/metadata/SQLMetadataSegmentManagerTest.java
@@ -133,8 +133,8 @@ public class SQLMetadataSegmentManagerTest
ImmutableSet.copyOf(manager.getDataSource("wikipedia").getSegments())
);
Assert.assertEquals(
- ImmutableSet.of(segment1, segment2),
- ImmutableSet.copyOf(manager.iterateAllSegments())
+ ImmutableSet.of(segment1, segment2),
+ ImmutableSet.copyOf(manager.iterateAllSegments())
);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org