Changeset: 057f0647794e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=057f0647794e
Modified Files:
        common/stream/stream.c
        sql/test/Skyserver/Skyserver_import.sql
Branch: Apr2019
Log Message:

Convert \r\n to just \n when uncompressing text files.
Do this not only on Windows but always.  The file could have been
compressed on Windows, after all.


diffs (truncated from 327 to 300 lines):

diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -968,9 +968,7 @@ stream_gzread(stream *restrict s, void *
                return 0;
 
        size = gzfread(buf, elmsize, cnt, fp);
-#ifdef WIN32
-       /* on Windows when in text mode, convert \r\n line
-        * endings to \n */
+       /* when in text mode, convert \r\n line endings to \n */
        if (!s->binary) {
                char *p1, *p2, *pe;
 
@@ -987,7 +985,6 @@ stream_gzread(stream *restrict s, void *
                        p1++;
                }
        }
-#endif
 
        return size == 0 ? -1 : (ssize_t) size;
 }
@@ -1190,9 +1187,7 @@ stream_bzread(stream *restrict s, void *
                s->errnr = MNSTR_READ_ERROR;
                return -1;
        }
-#ifdef WIN32
-       /* on Windows when in text mode, convert \r\n line endings to
-        * \n */
+       /* when in text mode, convert \r\n line endings to \n */
        if (!s->binary) {
                char *p1, *p2, *pe;
 
@@ -1209,7 +1204,6 @@ stream_bzread(stream *restrict s, void *
                        p1++;
                }
        }
-#endif
        return (ssize_t) (size / elmsize);
 }
 
@@ -1432,9 +1426,8 @@ stream_xzread(stream *restrict s, void *
                }
        }
        if (ressize) {
-#ifdef WIN32
-               /* on Windows when in text mode, convert \r\n line
-                * endings to \n */
+               /* when in text mode, convert \r\n line endings to
+                * \n */
                if (!s->binary) {
                        char *p1, *p2, *pe;
 
@@ -1451,7 +1444,6 @@ stream_xzread(stream *restrict s, void *
                                p1++;
                        }
                }
-#endif
                return (ssize_t) (ressize / elmsize);
        }
        return 0;
@@ -1719,8 +1711,7 @@ stream_lz4read(stream *restrict s, void 
                total_read += remaining_to_decompress;
        }
 
-#ifdef WIN32
-       /* on Windows when in text mode, convert \r\n line endings to \n */
+       /* when in text mode, convert \r\n line endings to \n */
        if (!s->binary) {
                char *p1, *p2, *pe;
 
@@ -1737,7 +1728,6 @@ stream_lz4read(stream *restrict s, void 
                        p1++;
                }
        }
-#endif
        return (ssize_t) (total_read / elmsize);
 }
 
diff --git a/sql/test/Skyserver/Skyserver_import.sql 
b/sql/test/Skyserver/Skyserver_import.sql
--- a/sql/test/Skyserver/Skyserver_import.sql
+++ b/sql/test/Skyserver/Skyserver_import.sql
@@ -1,33 +1,33 @@
 SET SCHEMA "skyserver";
 
-COPY 25000 RECORDS INTO RC3 FROM 'DATA/RC3.dat.bz2' USING DELIMITERS E'\t', 
E'\015\n', '"';
+COPY 25000 RECORDS INTO RC3 FROM 'DATA/RC3.dat.bz2' USING DELIMITERS E'\t', 
E'\n', '"';
 
-COPY 30000 RECORDS INTO Stetson FROM 'DATA/Stetson.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"' NULL as '';
+COPY 30000 RECORDS INTO Stetson FROM 'DATA/Stetson.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"' NULL as '';
 
-COPY 1000 RECORDS INTO QsoCatalogAll FROM 'DATA/QsoCatalogAll.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO QsoCatalogAll FROM 'DATA/QsoCatalogAll.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 100 RECORDS INTO QsoConcordance FROM 'DATA/QsoConcordance.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 100 RECORDS INTO QsoConcordance FROM 'DATA/QsoConcordance.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 3000 RECORDS INTO Target FROM 'DATA/Target.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 3000 RECORDS INTO Target FROM 'DATA/Target.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO TilingRun FROM 'DATA/TilingRun.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO TilingRun FROM 'DATA/TilingRun.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO TargetParam FROM 'DATA/TargetParam.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO TargetParam FROM 'DATA/TargetParam.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
 
-COPY 1000 RECORDS INTO Rmatrix FROM 'DATA/Rmatrix.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO Rmatrix FROM 'DATA/Rmatrix.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
 select 'Region';
 COPY 28000 RECORDS INTO Region FROM 'DATA/Region1.dat.bz2' USING DELIMITERS 
E'\t', '|', '"';
 
-COPY 1000 RECORDS INTO SiteDBs FROM 'DATA/SiteDBs.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO SiteDBs FROM 'DATA/SiteDBs.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO QueryResults FROM 'DATA/QueryResults.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO QueryResults FROM 'DATA/QueryResults.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
 
-COPY 1000 RECORDS INTO RecentQueries FROM 'DATA/RecentQueries.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO RecentQueries FROM 'DATA/RecentQueries.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO SiteConstants FROM 'DATA/SiteConstants.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO SiteConstants FROM 'DATA/SiteConstants.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
 COPY 1000 RECORDS INTO Glossary FROM 'DATA/Glossary1.dat.bz2' USING DELIMITERS 
E'\t', '|'; 
 
@@ -35,136 +35,136 @@ COPY 1000 RECORDS INTO Algorithm FROM 'D
 
 COPY 1000 RECORDS INTO TableDesc FROM 'DATA/TableDesc1.dat.bz2' USING 
DELIMITERS E'\t', '|', '"';
 
-COPY 1000 RECORDS INTO DBObjects FROM 'DATA/DBObjects1.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO DBObjects FROM 'DATA/DBObjects1.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO History FROM 'DATA/History.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO History FROM 'DATA/History.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO Dependency FROM 'DATA/Dependency.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO Dependency FROM 'DATA/Dependency.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO PubHistory FROM 'DATA/PubHistory.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO PubHistory FROM 'DATA/PubHistory.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO LoadHistory FROM 'DATA/LoadHistory.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO LoadHistory FROM 'DATA/LoadHistory.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO "Diagnostics" FROM 'DATA/Diagnostics.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO "Diagnostics" FROM 'DATA/Diagnostics.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO SiteDiagnostics FROM 'DATA/SiteDiagnostics.dat.bz2' 
USING DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO SiteDiagnostics FROM 'DATA/SiteDiagnostics.dat.bz2' 
USING DELIMITERS E'\t', E'\n', '"';
 
 --select 'Versions';
-COPY 1000 RECORDS INTO Versions FROM 'DATA/Versions.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO Versions FROM 'DATA/Versions.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO PartitionMap FROM 'DATA/PartitionMap1.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO PartitionMap FROM 'DATA/PartitionMap1.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
 COPY 1000 RECORDS INTO DataConstants FROM 'DATA/DataConstants1.dat.bz2' USING 
DELIMITERS E'\t', '|', '"';
 
-COPY 1000 RECORDS INTO SDSSConstants FROM 'DATA/SDSSConstants1.dat.bz2' USING 
DELIMITERS '|', E'\015\n', '"';
+COPY 1000 RECORDS INTO SDSSConstants FROM 'DATA/SDSSConstants1.dat.bz2' USING 
DELIMITERS '|', E'\n', '"';
 
-COPY 1000 RECORDS INTO StripeDefs FROM 'DATA/StripeDefs1.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"' NULL as '';
+COPY 1000 RECORDS INTO StripeDefs FROM 'DATA/StripeDefs1.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"' NULL as '';
 
-COPY 1000 RECORDS INTO RunShift FROM 'DATA/RunShift.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO RunShift FROM 'DATA/RunShift.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO ProfileDefs FROM 'DATA/ProfileDefs.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO ProfileDefs FROM 'DATA/ProfileDefs.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
 --select 'Mask';
-COPY 20000 RECORDS INTO Mask FROM 'DATA/Mask.dat.bz2' USING DELIMITERS E'\t', 
E'\015\n', '"';
+COPY 20000 RECORDS INTO Mask FROM 'DATA/Mask.dat.bz2' USING DELIMITERS E'\t', 
E'\n', '"';
 
-COPY 26000 RECORDS INTO "Match" FROM 'DATA/Match.dat.bz2'  USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 26000 RECORDS INTO "Match" FROM 'DATA/Match.dat.bz2'  USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO SpecObjAll FROM 'DATA/SpecObjAll.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO SpecObjAll FROM 'DATA/SpecObjAll.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO HoleObj FROM 'DATA/HoleObj.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO HoleObj FROM 'DATA/HoleObj.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO SpecPhotoAll FROM 'DATA/SpecPhotoAll.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO SpecPhotoAll FROM 'DATA/SpecPhotoAll.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO QuasarCatalog FROM 'DATA/QuasarCatalog.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO QuasarCatalog FROM 'DATA/QuasarCatalog.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
---COPY 28000 RECORDS INTO SpecLineIndex FROM 'DATA/SpecLineIndex1.dat.bz2' 
USING DELIMITERS E'\t', E'\015\n', '"';
+--COPY 28000 RECORDS INTO SpecLineIndex FROM 'DATA/SpecLineIndex1.dat.bz2' 
USING DELIMITERS E'\t', E'\n', '"';
 
-COPY 39000 RECORDS INTO SpecLineAll FROM 'DATA/SpecLineAll.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 39000 RECORDS INTO SpecLineAll FROM 'DATA/SpecLineAll.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 41000 RECORDS INTO XCRedshift FROM 'DATA/XCRedshift.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 41000 RECORDS INTO XCRedshift FROM 'DATA/XCRedshift.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO ELRedShift FROM 'DATA/ELRedShift.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO ELRedShift FROM 'DATA/ELRedShift.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 3000 RECORDS INTO TargetInfo FROM 'DATA/TargetInfo.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 3000 RECORDS INTO TargetInfo FROM 'DATA/TargetInfo.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
 select 'TiledTargetAll';
-COPY 815000 RECORDS INTO TiledTargetAll FROM 'DATA/TiledTargetAll.dat.bz2' 
USING DELIMITERS E'\t', E'\015\n', '"';
+COPY 815000 RECORDS INTO TiledTargetAll FROM 'DATA/TiledTargetAll.dat.bz2' 
USING DELIMITERS E'\t', E'\n', '"';
 
-COPY 2000 RECORDS INTO PlateX FROM 'DATA/PlateX.dat.bz2'  USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 2000 RECORDS INTO PlateX FROM 'DATA/PlateX.dat.bz2'  USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 80000 RECORDS INTO Sector2Tile FROM 'DATA/Sector2Tile.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 80000 RECORDS INTO Sector2Tile FROM 'DATA/Sector2Tile.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 760000 RECORDS INTO TilingInfo FROM 'DATA/TilingInfo.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 760000 RECORDS INTO TilingInfo FROM 'DATA/TilingInfo.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 2000 RECORDS INTO TileAll FROM 'DATA/TileAll.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 2000 RECORDS INTO TileAll FROM 'DATA/TileAll.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO TilingNote FROM 'DATA/TilingNote.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO TilingNote FROM 'DATA/TilingNote.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO TilingGeometry FROM 'DATA/TilingGeometry.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO TilingGeometry FROM 'DATA/TilingGeometry.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 40000 RECORDS INTO RegionConvex FROM 'DATA/RegionConvex.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 40000 RECORDS INTO RegionConvex FROM 'DATA/RegionConvex.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 21000 RECORDS INTO Region2Box FROM 'DATA/Region2Box.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 21000 RECORDS INTO Region2Box FROM 'DATA/Region2Box.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 130000 RECORDS INTO RegionArcs FROM 'DATA/RegionArcs.dat.bz2'  USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 130000 RECORDS INTO RegionArcs FROM 'DATA/RegionArcs.dat.bz2'  USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 10000 RECORDS INTO Sector FROM 'DATA/Sector1.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 10000 RECORDS INTO Sector FROM 'DATA/Sector1.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 130000 RECORDS INTO HalfSpace FROM 'DATA/HalfSpace.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 130000 RECORDS INTO HalfSpace FROM 'DATA/HalfSpace.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO Inventory FROM 'DATA/Inventory.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO Inventory FROM 'DATA/Inventory.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 3000 RECORDS INTO DBColumns FROM 'DATA/DBColumns1.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"' NULL as '';
+COPY 3000 RECORDS INTO DBColumns FROM 'DATA/DBColumns1.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"' NULL as '';
 
-COPY 1000 RECORDS INTO DBViewCols FROM 'DATA/DBViewCols.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO DBViewCols FROM 'DATA/DBViewCols.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO IndexMap FROM 'DATA/IndexMap1.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO IndexMap FROM 'DATA/IndexMap1.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 10000 RECORDS INTO BestTarget2Sector FROM 
'DATA/BestTarget2Sector.dat.bz2' USING DELIMITERS E'\t', E'\015\n', '"';
+COPY 10000 RECORDS INTO BestTarget2Sector FROM 
'DATA/BestTarget2Sector.dat.bz2' USING DELIMITERS E'\t', E'\n', '"';
 
 --select 'Segment';
-COPY 2000 RECORDS INTO Segment FROM 'DATA/Segment.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 2000 RECORDS INTO Segment FROM 'DATA/Segment.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO Field FROM 'DATA/Field.dat.bz2' USING DELIMITERS E'\t', 
E'\015\n', '"';
+COPY 1000 RECORDS INTO Field FROM 'DATA/Field.dat.bz2' USING DELIMITERS E'\t', 
E'\n', '"';
 
-COPY 200300 RECORDS INTO PhotoObjAll FROM 'DATA/PhotoObjAll.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 200300 RECORDS INTO PhotoObjAll FROM 'DATA/PhotoObjAll.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 select count(*) from PhotoObjAll;
 
-COPY 200300 RECORDS INTO PhotoTag FROM 'DATA/PhotoTag.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 200300 RECORDS INTO PhotoTag FROM 'DATA/PhotoTag.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 2000 RECORDS INTO Frame FROM 'DATA/Frame.dat.bz2' USING DELIMITERS E'\t', 
E'\015\n', '"';
+COPY 2000 RECORDS INTO Frame FROM 'DATA/Frame.dat.bz2' USING DELIMITERS E'\t', 
E'\n', '"';
 
-COPY 1000 RECORDS INTO RunQA FROM 'DATA/RunQA.dat.bz2' USING DELIMITERS E'\t', 
E'\015\n', '"';
+COPY 1000 RECORDS INTO RunQA FROM 'DATA/RunQA.dat.bz2' USING DELIMITERS E'\t', 
E'\n', '"';
 
-COPY 13000 RECORDS INTO FieldProfile FROM 'DATA/FieldProfile.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 13000 RECORDS INTO FieldProfile FROM 'DATA/FieldProfile.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 7000000 RECORDS INTO PhotoProfile FROM 'DATA/PhotoProfile.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 7000000 RECORDS INTO PhotoProfile FROM 'DATA/PhotoProfile.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 26000 RECORDS INTO USNOB FROM 'DATA/USNOB.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 26000 RECORDS INTO USNOB FROM 'DATA/USNOB.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 22000 RECORDS INTO USNO FROM 'DATA/USNO.dat.bz2' USING DELIMITERS E'\t', 
E'\015\n', '"';
+COPY 22000 RECORDS INTO USNO FROM 'DATA/USNO.dat.bz2' USING DELIMITERS E'\t', 
E'\n', '"';
 
-COPY 200300 RECORDS INTO PhotoAuxAll FROM 'DATA/PhotoAuxAll.dat.bz2' USING 
DELIMITERS E'\t', E'\015\n', '"';
+COPY 200300 RECORDS INTO PhotoAuxAll FROM 'DATA/PhotoAuxAll.dat.bz2' USING 
DELIMITERS E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO Photoz FROM 'DATA/Photoz.dat.bz2' USING DELIMITERS 
E'\t', E'\015\n', '"';
+COPY 1000 RECORDS INTO Photoz FROM 'DATA/Photoz.dat.bz2' USING DELIMITERS 
E'\t', E'\n', '"';
 
-COPY 1000 RECORDS INTO First FROM 'DATA/First.dat.bz2' USING DELIMITERS E'\t', 
E'\015\n', '"';
+COPY 1000 RECORDS INTO First FROM 'DATA/First.dat.bz2' USING DELIMITERS E'\t', 
E'\n', '"';
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to