Merge branch 'master' of https://github.com/0xdata/h2o

subramaniano · Aug 7, 2014 · b319a7e · b319a7e
2 parents 2fbb291 + 70501fb
commit b319a7e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/py/h2o_import.py b/py/h2o_import.py
@@ -160,7 +160,7 @@ def find_folder_and_filename(bucket, pathWithRegex, schema='put', returnFullPath
 # src_key= only used if for put file key name (optional)
 # path should point to a file or regex of files. (maybe folder works? but unnecessary
 def import_only(node=None, schema='local', bucket=None, path=None,
-    timeoutSecs=30, retryDelaySecs=0.5, initialDelaySecs=0.5, pollTimeoutSecs=180, noise=None,
+    timeoutSecs=30, retryDelaySecs=0.1, initialDelaySecs=0, pollTimeoutSecs=180, noise=None,
     benchmarkLogging=None, noPoll=False, doSummary=True, src_key=None, noPrint=False, 
     importParentDir=True, **kwargs):
 
@@ -329,7 +329,7 @@ def import_only(node=None, schema='local', bucket=None, path=None,
 #****************************************************************************************
 # can take header, header_from_file, exclude params
 def parse_only(node=None, pattern=None, hex_key=None,
-    timeoutSecs=30, retryDelaySecs=0.5, initialDelaySecs=0.5, pollTimeoutSecs=180, noise=None,
+    timeoutSecs=30, retryDelaySecs=0.1, initialDelaySecs=0, pollTimeoutSecs=180, noise=None,
     benchmarkLogging=None, noPoll=False, **kwargs):
 
     if not node: node = h2o.nodes[0]
@@ -346,7 +346,7 @@ def parse_only(node=None, pattern=None, hex_key=None,
 #****************************************************************************************
 def import_parse(node=None, schema='local', bucket=None, path=None,
     src_key=None, hex_key=None, 
-    timeoutSecs=30, retryDelaySecs=0.5, initialDelaySecs=0.5, pollTimeoutSecs=180, noise=None,
+    timeoutSecs=30, retryDelaySecs=0.1, initialDelaySecs=0, pollTimeoutSecs=180, noise=None,
     benchmarkLogging=None, noPoll=False, doSummary=True, noPrint=True, 
     importParentDir=True, **kwargs):
 

diff --git a/py/testdir_multi_jvm/test_parse_time_rand_fvec.py b/py/testdir_multi_jvm/test_parse_time_rand_fvec.py
@@ -70,16 +70,16 @@ def setUpClass(cls):
         localhost = h2o.decide_if_localhost()
         if (localhost):
             pass
-            h2o.build_cloud(2,java_heap_GB=10,use_flatfile=True)
+            h2o.build_cloud(1,java_heap_GB=2,use_flatfile=True)
         else:
             h2o_hosts.build_cloud_with_hosts()
-        h2b.browseTheCloud()
+        #h2b.browseTheCloud()
 
     @classmethod
     def tearDownClass(cls):
         h2o.tear_down_cloud(h2o.nodes)
 
-    def test_parse_time_rand_fvec(self):
+    def test_parse_time_rand_fvec_NOPASS(self):
         h2o.beta_features = True
         SYNDATASETS_DIR = h2o.make_syn_dir()
         csvFilename = "syn_time.csv"

diff --git a/py/testdir_single_jvm/test_parse_many_cases_fvec.py b/py/testdir_single_jvm/test_parse_many_cases_fvec.py
@@ -253,7 +253,7 @@ def tryThemAll(self, set, rows, enumsOnly=False):
                     else:
                         single_quotes = 0
                     parseResult = h2i.import_parse(path=csvPathname, schema='put', single_quotes=single_quotes,
-                        noPrint=not h2o.verbose)
+                        noPrint=not h2o.verbose, retryDelaySecs=0.1)
 
                     if DO_RF:
                         h2o_cmd.runRF(parseResult=parseResult, trees=1,

diff --git a/src/main/java/water/api/RequestArguments.java b/src/main/java/water/api/RequestArguments.java
@@ -1,21 +1,23 @@
 package water.api;
 
-import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Ints;
 import com.google.gson.JsonObject;
-
 import water.*;
 import water.Request2.TypeaheadKey;
 import water.api.Request.Filter;
 import water.api.Request.Validator;
 import water.fvec.Frame;
 import water.fvec.Vec;
-import water.util.*;
+import water.util.Check;
+import water.util.RString;
+import water.util.Utils;
 
 import java.io.File;
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Properties;
 
 /** All arguments related classes are defined in this guy.
  *
@@ -818,7 +820,7 @@ public MultipleSelect(String name) {
 
       StringBuilder sb = new StringBuilder();
       sb.append("<select multiple");
-      sb.append(" size='").append(Math.min(10, values.length)).append("'");
+      sb.append(" size='").append(Math.min(20, values.length)).append("'");
       sb.append(" id='").append(_name).append("' >");
       for (int i = 0 ; i < values.length; ++i) {
         sb.append("<option value='").append(values[i]).append("' ");