Skip to content

Commit

Permalink
[CALCITE-5748] Make redis tests passing on windows with guava 32
Browse files Browse the repository at this point in the history
  • Loading branch information
snuyanzin committed Jun 3, 2023
1 parent ed53df1 commit 2d91a22
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* 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.calcite.adapter.redis;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

import redis.embedded.RedisExecProvider;
import redis.embedded.RedisServer;

/**
* This is almost a copy of {@link RedisServer}.
* The difference is that it makes {@link CalciteRedisServer#CalciteRedisServer(List, int)} public.
*/
public class CalciteRedisServer extends RedisServer {
public CalciteRedisServer() throws IOException {
}

public CalciteRedisServer(Integer port) throws IOException {
super(port);
}

public CalciteRedisServer(File executable, Integer port) {
super(executable, port);
}

public CalciteRedisServer(RedisExecProvider redisExecProvider, Integer port) throws IOException {
super(redisExecProvider, port);
}

public CalciteRedisServer(List<String> args, int port) throws IOException {
super(port);
this.args = new ArrayList<String>(args);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import java.io.IOException;
import java.net.ServerSocket;
import java.util.Collections;
import java.util.logging.Logger;

import redis.embedded.RedisServer;
Expand Down Expand Up @@ -72,7 +73,7 @@ public static void startRedisContainer() {
public void createRedisServer() throws IOException {
if (!REDIS_CONTAINER.isRunning()) {
if (isWindows()) {
redisServer = RedisServer.builder().port(PORT).setting(MAX_HEAP).build();
redisServer = new CalciteRedisServer(Collections.singletonList(MAX_HEAP), PORT);
} else {
redisServer = new RedisServer(RedisExecProvider.defaultProvider().get(), PORT);
}
Expand Down

0 comments on commit 2d91a22

Please sign in to comment.