From: <zep...@us...> - 2006-12-15 14:43:14
|
Revision: 223 http://svn.sourceforge.net/pzfilereader/?rev=223&view=rev Author: zepernick Date: 2006-12-15 06:43:13 -0800 (Fri, 15 Dec 2006) Log Message: ----------- fixed compilation errors from removal of LargeDataSet Modified Paths: -------------- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/Examples.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/fixedlengthdynamiccolumns/LargeFixedLengthWithPZMap.java trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/Examples.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/Examples.java 2006-12-15 14:12:11 UTC (rev 222) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/Examples.java 2006-12-15 14:43:13 UTC (rev 223) @@ -19,7 +19,7 @@ import net.sf.pzfilereader.examples.lowlevelparse.LowLevelParse; import net.sf.pzfilereader.examples.multilinedelimitedrecord.DelimitedMultiLine; import net.sf.pzfilereader.examples.numericsanddates.NumericsAndDates; -import net.sf.pzfilereader.util.BXParser; +import net.sf.pzfilereader.util.PZConstants; import net.sf.pzfilereader.util.ParserUtils; /** @@ -71,7 +71,7 @@ menu.addMenuItem("NumericsAndDates", "doNumericsAndDates", false); menu.addMenuItem("Ask for GC", "doGC", false); menu.addMenuItem("Test StringBuffer", "doStringBuffer", false); - menu.addMenuItem("Test Parsers", "doTestParsers", false); + menu.addMenuItem("Test Delim Parser Perform", "doTestParsers", false); menu.addMenuItem("Who you gonna call?", "doCall", false); menu.displayMenu(); @@ -251,7 +251,7 @@ } public void doTestParsers() { - final int repeat = ConsoleMenu.getInt("How many times?", 1000); + final int repeat = ConsoleMenu.getInt("How many Rows?", 1000); final int numberOfCols = ConsoleMenu.getInt("How many columns?", 100); final boolean qualif = ConsoleMenu.getBoolean("With qualifier?", true); @@ -270,28 +270,12 @@ long start = System.currentTimeMillis(); for (int i = 0; i < repeat; i++) { - ParserUtils.splitLine(line, ',', '\"'); + ParserUtils.splitLine(line, ',', '\"', PZConstants.SPLITLINE_SIZE_INIT); } long stop = System.currentTimeMillis(); System.out.println("ParserUtil " + (stop - start) + " ms."); - start = System.currentTimeMillis(); - for (int i = 0; i < repeat; i++) { - BXParser.splitLine(line, ',', '\"', numberOfCols); - } - stop = System.currentTimeMillis(); - - System.out.println("BXParser " + (stop - start) + " ms."); - - start = System.currentTimeMillis(); - for (int i = 0; i < repeat; i++) { - BXParser.splitLineWithBuf(line, ',', '\"', numberOfCols); - } - stop = System.currentTimeMillis(); - - System.out.println("BXParser with buf " + (stop - start) + " ms."); - } } Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java 2006-12-15 14:12:11 UTC (rev 222) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/delimiteddynamiccolumns/LargeDelimitedWithPZMap.java 2006-12-15 14:43:13 UTC (rev 223) @@ -8,7 +8,9 @@ import java.io.File; import java.io.FileInputStream; -import net.sf.pzfilereader.LargeDataSet; +import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.brparse.BuffReaderDelimPZParser; +import net.sf.pzfilereader.brparse.BuffReaderPZParseFactory; /** * @author zepernick @@ -33,34 +35,41 @@ } public static void call(String mapping, String data) throws Exception { - LargeDataSet ds = null; String[] colNames = null; FileInputStream pzmap = null; FileInputStream fileToParse = null; - - pzmap = new FileInputStream(new File(mapping)); - fileToParse = new FileInputStream(new File(data)); - // delimited by a comma - // text qualified by double quotes - // ignore first record - ds = new LargeDataSet(pzmap, fileToParse, ',', '"', true, false); - - colNames = ds.getColumns(); - - while (ds.next()) { - for (int i = 0; i < colNames.length; i++) { - System.out.println("COLUMN NAME: " + colNames[i] + " VALUE: " + ds.getString(colNames[i])); + BuffReaderDelimPZParser pzparse = null; + try { + pzmap = new FileInputStream(new File(mapping)); + fileToParse = new FileInputStream(new File(data)); + // delimited by a comma + // text qualified by double quotes + // ignore first record + + pzparse = (BuffReaderDelimPZParser)BuffReaderPZParseFactory.getInstance().newDelimitedParser(pzmap, + fileToParse, ',', '"', true); + + final DataSet ds = pzparse.parse(); + + colNames = ds.getColumns(); + + while (ds.next()) { + for (int i = 0; i < colNames.length; i++) { + System.out.println("COLUMN NAME: " + colNames[i] + " VALUE: " + ds.getString(colNames[i])); + } + + System.out.println("==========================================================================="); } - - System.out.println("==========================================================================="); + + if (ds.getErrors() != null && ds.getErrors().size() > 0) { + System.out.println("FOUND ERRORS IN FILE"); + } + + } finally { + // free up the file readers + pzparse.close(); + } - if (ds.getErrors() != null && ds.getErrors().size() > 0) { - System.out.println("FOUND ERRORS IN FILE"); - } - - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); - } } Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/fixedlengthdynamiccolumns/LargeFixedLengthWithPZMap.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/fixedlengthdynamiccolumns/LargeFixedLengthWithPZMap.java 2006-12-15 14:12:11 UTC (rev 222) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/fixedlengthdynamiccolumns/LargeFixedLengthWithPZMap.java 2006-12-15 14:43:13 UTC (rev 223) @@ -8,7 +8,6 @@ import java.io.File; import java.io.FileInputStream; -import net.sf.pzfilereader.LargeDataSet; /** * @author zepernick @@ -32,7 +31,8 @@ } public static void call(String mapping, String data) throws Exception { - LargeDataSet ds = null; + System.out.println("Not Currently Available...Check back later."); + /* LargeDataSet ds = null; String[] colNames = null; ds = new LargeDataSet(new FileInputStream(new File(mapping)), new FileInputStream(new File(data)), false); @@ -48,7 +48,7 @@ } // clear out the DataSet object for the JVM to collect - ds.freeMemory(); + ds.freeMemory();*/ } } Modified: trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java =================================================================== --- trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java 2006-12-15 14:12:11 UTC (rev 222) +++ trunk/PZFileReaderSamples/src/main/java/net/sf/pzfilereader/examples/largedataset/largecsvperformancetest/CSVLarge.java 2006-12-15 14:43:13 UTC (rev 223) @@ -7,7 +7,9 @@ import java.util.Map; import net.sf.pzfilereader.DataError; -import net.sf.pzfilereader.LargeDataSet; +import net.sf.pzfilereader.DataSet; +import net.sf.pzfilereader.brparse.BuffReaderDelimPZParser; +import net.sf.pzfilereader.brparse.BuffReaderPZParseFactory; /* * Created on Dec 1, 2005 @@ -40,15 +42,17 @@ } public static void call(String data) throws Exception { - LargeDataSet ds = null; + BuffReaderDelimPZParser pzparse = null; try { // delimited by a comma // text qualified by double quotes // ignore first record - ds = new LargeDataSet(new File(data), ',', '"', false); - + pzparse = (BuffReaderDelimPZParser)BuffReaderPZParseFactory.getInstance().newDelimitedParser(new File(data), + ',', '"'); + + final DataSet ds = pzparse.parse(); final long timeStarted = System.currentTimeMillis(); int totalCount = 0; int tmpCount = 0; @@ -80,11 +84,10 @@ System.out.println("Error: " + de.getErrorDesc() + " Line: " + de.getLineNo()); } } - - // clear out the DataSet object for the JVM to collect - ds.freeMemory(); } catch (final Exception ex) { ex.printStackTrace(); + } finally { + pzparse.close(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |