Repository: jtablesaw/tablesaw
Pull request #403 (2018-10-30 07:37:23)

fix for #395 It's impossible to parse CSV file with more than 512 col…
Thanks for contributing.

- [X ] Tick to sign-off your agreement to the [Developer Certificate of Origin (DCO) 1.1](https://developercertificate.org)

## Description

Added setting for maximal columns in CVS file in CsvReaderOption

## Testing

Added positive and negative tests for CsvReader for 1000 columns csv file.



Patch:
diff --git a/core/src/main/java/tech/tablesaw/api/FloatColumn.java b/core/src/main/java/tech/tablesaw/api/FloatColumn.java
index 76842561..0142e1d7 100644
--- a/core/src/main/java/tech/tablesaw/api/FloatColumn.java
+++ b/core/src/main/java/tech/tablesaw/api/FloatColumn.java
@@ -163,7 +163,7 @@ public class FloatColumn extends NumberColumn<Float> {
     }
 
     public FloatColumn append(Float val) {
-        this.append(val.intValue());
+        this.append(val.floatValue());
         return this;
     }
 
diff --git a/core/src/main/java/tech/tablesaw/io/csv/CsvReadOptions.java b/core/src/main/java/tech/tablesaw/io/csv/CsvReadOptions.java
index e767f291..7dce5d80 100644
--- a/core/src/main/java/tech/tablesaw/io/csv/CsvReadOptions.java
+++ b/core/src/main/java/tech/tablesaw/io/csv/CsvReadOptions.java
@@ -41,6 +41,7 @@ public class CsvReadOptions {
     private final String timeFormat;
     private final Locale locale;
     private final String missingValueIndicator;
+    private final Integer maxNumberOfColumns;
 
     private CsvReadOptions(CsvReadOptions.Builder builder) {
         file = builder.file;
@@ -56,6 +57,7 @@ public class CsvReadOptions {
         dateTimeFormat = builder.dateTimeFormat;
         lineEnding = builder.lineEnding;
         missingValueIndicator = builder.missingValueIndicator;
+        maxNumberOfColumns = builder.maxNumberOfColumns;
 
         if (builder.locale == null) {
             locale = Locale.getDefault();
@@ -163,6 +165,10 @@ public class CsvReadOptions {
         return DateTimeFormatter.ofPattern(dateFormat, locale);
     }
 
+    public Integer maxNumberOfColumns() {
+        return maxNumberOfColumns;
+    }
+
     public static class Builder {
 
         private InputStream inputStream;
@@ -179,6 +185,7 @@ public class CsvReadOptions {
         private String dateTimeFormat;
         private Locale locale;
         private String missingValueIndicator;
+        private Integer maxNumberOfColumns;
 
         public Builder(File file) {
             this.file = file;
@@ -264,6 +271,15 @@ public class CsvReadOptions {
             return this;
         }
 
+        /**
+         * Defines maximal value of columns in csv file.
+         * @param maxNumberOfColumns - must be positive integer. Default is 512.         *
+         */
+        public Builder maxNumberOfColumns(Integer maxNumberOfColumns) {
+            this.maxNumberOfColumns = maxNumberOfColumns;
+            return this;
+        }
+
         public CsvReadOptions build() {
             return new CsvReadOptions(this);
         }
diff --git a/core/src/main/java/tech/tablesaw/io/csv/CsvReader.java b/core/src/main/java/tech/tablesaw/io/csv/CsvReader.java
index 4806b01d..c8e9fc2f 100644
--- a/core/src/main/java/tech/tablesaw/io/csv/CsvReader.java
+++ b/core/src/main/java/tech/tablesaw/io/csv/CsvReader.java
@@ -596,6 +596,9 @@ public class CsvReader {
     private CsvParser csvParser(CsvReadOptions options) {
         CsvParserSettings settings = new CsvParserSettings();
         settings.setFormat(csvFormat(options));
+        if (options.maxNumberOfColumns() != null) {
+            settings.setMaxColumns(options.maxNumberOfColumns());
+        }
         return new CsvParser(settings);
     }
 
diff --git a/data/1000_columns.csv b/data/1000_columns.csv
new file mode 100644
index 00000000..0af85446
--- /dev/null
+++ b/data/1000_columns.csv
@@ -0,0 +1,1 @@
+0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,615,616,617,618,619,620,621,622,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,638,639,640,641,642,643,644,645,646,647,648,649,650,651,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,672,673,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750,751,752,753,754,755,756,757,758,759,760,761,762,763,764,765,766,767,768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,879,880,881,882,883,884,885,886,887,888,889,890,891,892,893,894,895,896,897,898,899,900,901,902,903,904,905,906,907,908,909,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,930,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980,981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999


Test patch:
diff --git a/core/src/test/java/tech/tablesaw/api/FloatColumnTest.java b/core/src/test/java/tech/tablesaw/api/FloatColumnTest.java
new file mode 100644
index 00000000..81a22b93
--- /dev/null
+++ b/core/src/test/java/tech/tablesaw/api/FloatColumnTest.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed 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 tech.tablesaw.api;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FloatColumnTest {
+
+    @Test
+    public void testAppendFloat() {
+        final FloatColumn floatColumn = FloatColumn.create("floats");
+        final Float floatValue = 2.5f;
+        floatColumn.append(floatValue);
+        Assert.assertEquals(floatValue, floatColumn.get(0));
+    }
+
+    @Test
+    public void testAppendFloatObject() {
+        final FloatColumn floatColumn = FloatColumn.create("floats");
+        final Float floatObject = Float.valueOf(2.5f);
+        floatColumn.append(floatObject);
+        Assert.assertEquals(floatObject, floatColumn.get(0));
+    }
+}
diff --git a/core/src/test/java/tech/tablesaw/io/csv/CsvReaderTest.java b/core/src/test/java/tech/tablesaw/io/csv/CsvReaderTest.java
index 4203e638..b3251f5d 100644
--- a/core/src/test/java/tech/tablesaw/io/csv/CsvReaderTest.java
+++ b/core/src/test/java/tech/tablesaw/io/csv/CsvReaderTest.java
@@ -14,6 +14,7 @@
 
 package tech.tablesaw.io.csv;
 
+import com.univocity.parsers.common.TextParsingException;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -409,4 +410,20 @@ public class CsvReaderTest {
         assertEquals("0 rows X 0 cols", table1.shape());
     }
 
+    @Test(expected = TextParsingException.class)
+    public void testReadMaxColumnsExceeded() throws Exception {
+        Table.read().csv(CsvReadOptions
+                .builder("../data/1000_columns.csv")
+                .header(false));
+    }
+
+    @Test
+    public void testReadWithMaxColumnsSetting() throws Exception {
+        Table table1 = Table.read().csv(CsvReadOptions
+                .builder("../data/1000_columns.csv")
+                .maxNumberOfColumns(1000)
+                .header(false));
+        assertEquals("1 rows X 1000 cols", table1.shape());
+    }
+
 }