Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Further optimize memory for Travis jobs #6150

Merged
merged 3 commits into from
Aug 11, 2018
Merged

Further optimize memory for Travis jobs #6150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f81ff47
Further optimize memory for Travis jobs
jihoonson Aug 10, 2018
ca24e7a
fix build
jihoonson Aug 10, 2018
05f398f
sudo false
jihoonson Aug 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix build
  • Loading branch information
@jihoonson
jihoonson committed Aug 10, 2018
commit ca24e7a644e4a16b4b8e6e8ff1d86b1e4cb6196f
2 changes: 1 addition & 1 deletion server/src/test/java/io/druid/client/CachingClusteredClientFunctionalityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void setUp()
serverView = EasyMock.createNiceMock(TimelineServerView.class);
cache = MapCache.create(100000);
client = makeClient(
new ForegroundCachePopulator(CachingClusteredClientTest.jsonMapper, new CachePopulatorStats(), -1)
new ForegroundCachePopulator(OBJECT_MAPPER, new CachePopulatorStats(), -1)
);
}

Expand Down
8 changes: 4 additions & 4 deletions server/src/test/java/io/druid/client/CachingClusteredClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ public void setUp()
timeline = new VersionedIntervalTimeline<>(Ordering.natural());
serverView = EasyMock.createNiceMock(TimelineServerView.class);
cache = MapCache.create(100000);
client = makeClient(new ForegroundCachePopulator(jsonMapper, new CachePopulatorStats(), -1));
client = makeClient(new ForegroundCachePopulator(JSON_MAPPER, new CachePopulatorStats(), -1));

servers = new DruidServer[]{
new DruidServer("test1", "test1", null, 10, ServerType.HISTORICAL, "bye", 0),
Expand Down Expand Up @@ -398,7 +398,7 @@ public ListenableFuture<?> submit(Runnable task)
client = makeClient(
new BackgroundCachePopulator(
randomizingExecutorService,
jsonMapper,
JSON_MAPPER,
new CachePopulatorStats(),
-1
)
Expand Down Expand Up @@ -559,7 +559,7 @@ public void testCachingOverBulkLimitEnforcesLimit()
.andReturn(ImmutableMap.of())
.once();
EasyMock.replay(cache);
client = makeClient(new ForegroundCachePopulator(jsonMapper, new CachePopulatorStats(), -1), cache, limit);
client = makeClient(new ForegroundCachePopulator(JSON_MAPPER, new CachePopulatorStats(), -1), cache, limit);
final DruidServer lastServer = servers[random.nextInt(servers.length)];
final DataSegment dataSegment = EasyMock.createNiceMock(DataSegment.class);
EasyMock.expect(dataSegment.getIdentifier()).andReturn(DATA_SOURCE).anyTimes();
Expand All @@ -584,7 +584,7 @@ public void testCachingOverBulkLimitEnforcesLimit()
.andReturn(ImmutableMap.of())
.once();
EasyMock.replay(cache);
client = makeClient(new ForegroundCachePopulator(jsonMapper, new CachePopulatorStats(), -1), cache, 0);
client = makeClient(new ForegroundCachePopulator(JSON_MAPPER, new CachePopulatorStats(), -1), cache, 0);
getDefaultQueryRunner().run(QueryPlus.wrap(query), context);
EasyMock.verify(cache);
EasyMock.verify(dataSegment);
Expand Down