s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1202 from felixlohmeier/master

Browse Source 
added options for initial java heap space and autosave period
This commit is contained in:
Jacky 2017-06-23 19:58:13 -04:00 committed by GitHub
commit 315ef697bb
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/com/google/refine/RefineServlet.java
View File

@ -85,7 +85,7 @@ public class RefineServlet extends Butterfly {
static final Logger logger = LoggerFactory.getLogger("refine");
static final protected long AUTOSAVE_PERIOD = 5; // 5 minutes
static protected long AUTOSAVE_PERIOD = 5; // default: 5 minutes
static protected class AutoSaveTimerTask implements Runnable {
@Override
@ -131,6 +131,8 @@ public class RefineServlet extends Butterfly {
FileProjectManager.initialize(s_dataDir);
ImportingManager.initialize(this);
AUTOSAVE_PERIOD = Long.parseLong(getInitParameter("refine.autosave"));
service.scheduleWithFixedDelay(new AutoSaveTimerTask(), AUTOSAVE_PERIOD,
AUTOSAVE_PERIOD, TimeUnit.MINUTES);

9
refine
View File

@ -679,6 +679,10 @@ run() {
add_option "-Drefine.google_api_key=$REFINE_GOOGLE_API_KEY"
fi
if [ "$REFINE_AUTOSAVE_PERIOD" ] ; then
add_option "-Drefine.autosave=$REFINE_AUTOSAVE_PERIOD"
fi
CLASSPATH="$REFINE_CLASSES_DIR${SEP}$REFINE_LIB_DIR/*"
RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Refine"
@ -912,7 +916,10 @@ add_option "$JAVA_OPTIONS"
if [ -z "$REFINE_MEMORY" ] ; then
REFINE_MEMORY="1024M"
fi
add_option "-Xms256M -Xmx$REFINE_MEMORY -Drefine.memory=$REFINE_MEMORY"
if [ -z "$REFINE_MIN_MEMORY" ] ; then
REFINE_MIN_MEMORY="256M"
fi
add_option "-Xms$REFINE_MIN_MEMORY -Xmx$REFINE_MEMORY -Drefine.memory=$REFINE_MEMORY"
if [ -z "$REFINE_MAX_FORM_CONTENT_SIZE" ] ; then
REFINE_MAX_FORM_CONTENT_SIZE="1048576"

4
refine.bat
View File

@ -135,8 +135,10 @@ set OPTS=%OPTS% %JAVA_OPTIONS%
if not "%REFINE_MEMORY%" == "" goto gotMemory
set REFINE_MEMORY=1024M
if not "%REFINE_MIN_MEMORY%" == "" goto gotMemory
set REFINE_MIN_MEMORY=256M
:gotMemory
set OPTS=%OPTS% -Xms256M -Xmx%REFINE_MEMORY% -Drefine.memory=%REFINE_MEMORY%
set OPTS=%OPTS% -Xms%REFINE_MIN_MEMORY% -Xmx%REFINE_MEMORY% -Drefine.memory=%REFINE_MEMORY%
if not "%REFINE_MAX_FORM_CONTENT_SIZE%" == "" goto gotMaxFormContentSize
set REFINE_MAX_FORM_CONTENT_SIZE=1048576

6
refine.ini
View File

@ -15,3 +15,9 @@ REFINE_MEMORY=1400M
#JAVA_HOME=C:\Program Files\Java\jdk1.6.0_25
#JAVA_OPTIONS=-XX:+UseParallelGC -verbose:gc -Drefine.headless=true
#JAVA_OPTIONS=-Drefine.data_dir=C:\Users\user\AppData\Roaming\OpenRefine
# Set initial java heap space (default: 256M) for better performance with large datasets
#REFINE_MIN_MEMORY=1400M
# Increase autosave period (default: 5 minutes) for better performance of long-lasting transformations
#REFINE_AUTOSAVE_PERIOD=60

2
server/src/com/google/refine/Refine.java
View File

@ -285,11 +285,13 @@ class RefineServer extends Server {
// inject configuration parameters in the servlets
// NOTE: this is done *after* starting the server because jetty might override the init
// parameters if we set them in the webapp context upon reading the web.xml file
static private void configure(WebAppContext context) throws Exception {
ServletHolder servlet = context.getServletHandler().getServlet("refine");
if (servlet != null) {
servlet.setInitParameter("refine.data", getDataDir());
servlet.setInitParameter("butterfly.modules.path", getDataDir() + "/extensions");
servlet.setInitParameter("refine.autosave", Configurations.get("refine.autosave"));
servlet.setInitOrder(1);
servlet.doStart();
}