Changeset: 9e64c4358e86 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9e64c4358e86
Modified Files:
sql/backends/monet5/sql_bincopyconvert.c
sql/test/bincopy/Tests/bincopy_big_endians_on_client.SQL.py
sql/test/copy/Tests/compressed-on-client-bz2.SQL.py
sql/test/copy/Tests/compressed-on-client-gz.SQL.py
sql/test/copy/Tests/compressed-on-client-lz4.SQL.py
sql/test/copy/Tests/compressed-on-client-xz.SQL.py
Branch: copyfaster
Log Message:
Fixing issues on Windows.
diffs (68 lines):
diff --git a/sql/backends/monet5/sql_bincopyconvert.c
b/sql/backends/monet5/sql_bincopyconvert.c
--- a/sql/backends/monet5/sql_bincopyconvert.c
+++ b/sql/backends/monet5/sql_bincopyconvert.c
@@ -676,7 +676,7 @@ process_blobs(bstream *bs, BAT *bat, boo
} else {
// Copy it to scratch.
// We can't use it in-place because it's probably
misaligned.
- size = header;
+ size = (size_t) header;
size_t needed = size + sizeof(empty_value);
if (*scratch == NULL || *scratch_len < needed) {
// Reallocate the buffer. Do not use realloc,
we don't
diff --git a/sql/test/bincopy/Tests/bincopy_big_endians_on_client.SQL.py
b/sql/test/bincopy/Tests/bincopy_big_endians_on_client.SQL.py
--- a/sql/test/bincopy/Tests/bincopy_big_endians_on_client.SQL.py
+++ b/sql/test/bincopy/Tests/bincopy_big_endians_on_client.SQL.py
@@ -7,3 +7,4 @@ from bincopy_support import run_test
from bincopy_support import BIG_ENDIANS as testcode
run_test('client', testcode)
+from compressed_on_client import test_compressed_onclient
diff --git a/sql/test/copy/Tests/compressed-on-client-bz2.SQL.py
b/sql/test/copy/Tests/compressed-on-client-bz2.SQL.py
--- a/sql/test/copy/Tests/compressed-on-client-bz2.SQL.py
+++ b/sql/test/copy/Tests/compressed-on-client-bz2.SQL.py
@@ -1,5 +1,8 @@
#!/usr/bin/env python3
+import sys
+import os
+sys.path.append(os.getenv('TSTSRCDIR'))
from io import BytesIO
from compressed_on_client import test_compressed_onclient
diff --git a/sql/test/copy/Tests/compressed-on-client-gz.SQL.py
b/sql/test/copy/Tests/compressed-on-client-gz.SQL.py
--- a/sql/test/copy/Tests/compressed-on-client-gz.SQL.py
+++ b/sql/test/copy/Tests/compressed-on-client-gz.SQL.py
@@ -1,5 +1,8 @@
#!/usr/bin/env python3
+import sys
+import os
+sys.path.append(os.getenv('TSTSRCDIR'))
from io import BytesIO
from compressed_on_client import test_compressed_onclient
diff --git a/sql/test/copy/Tests/compressed-on-client-lz4.SQL.py
b/sql/test/copy/Tests/compressed-on-client-lz4.SQL.py
--- a/sql/test/copy/Tests/compressed-on-client-lz4.SQL.py
+++ b/sql/test/copy/Tests/compressed-on-client-lz4.SQL.py
@@ -1,5 +1,8 @@
#!/usr/bin/env python3
+import sys
+import os
+sys.path.append(os.getenv('TSTSRCDIR'))
from io import BytesIO
from compressed_on_client import test_compressed_onclient
diff --git a/sql/test/copy/Tests/compressed-on-client-xz.SQL.py
b/sql/test/copy/Tests/compressed-on-client-xz.SQL.py
--- a/sql/test/copy/Tests/compressed-on-client-xz.SQL.py
+++ b/sql/test/copy/Tests/compressed-on-client-xz.SQL.py
@@ -1,5 +1,8 @@
#!/usr/bin/env python3
+import sys
+import os
+sys.path.append(os.getenv('TSTSRCDIR'))
from io import BytesIO
from compressed_on_client import test_compressed_onclient
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
