Private
Public Access
1
0
This commit is contained in:
Sander Roosendaal
2022-11-11 10:39:50 +01:00
parent ec012170f0
commit c21bf161d2

View File

@@ -1262,7 +1262,7 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True, comp
try: try:
df = pd.read_parquet(csvfilenames[0], columns=columns) df = pd.read_parquet(csvfilenames[0], columns=columns)
rowdata, row = getrowdata(id=ids[0]) rowdata, row = getrowdata(id=ids[0])
except (OSError, IndexError): except (OSError, IndexError, ArrowInvalid):
rowdata, row = getrowdata(id=ids[0]) rowdata, row = getrowdata(id=ids[0])
if rowdata and len(rowdata.df): # pragma: no cover if rowdata and len(rowdata.df): # pragma: no cover
data = dataprep( data = dataprep(
@@ -1280,12 +1280,10 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True, comp
if rowdata and len(rowdata.df): # pragma: no cover if rowdata and len(rowdata.df): # pragma: no cover
data = dataprep( data = dataprep(
rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True) rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True)
df = pd.read_parquet(csvfilenames[0], columns=columns) try:
# df = dd.read_parquet(csvfilenames[0], df = pd.read_parquet(csvfilenames[0], columns=columns)
# column=columns,engine='pyarrow', except:
# ) df = pd.DataFrame()
# df = df.loc[:,~df.columns.duplicated()]
else: else:
df = pd.DataFrame() df = pd.DataFrame()