Skip to content

Commit 11b7af6

Browse files
committed
TO REVERT LATER set engine=python to query
because of a bug in pandas/numexpr. Once fixed: pandas-dev/pandas#25369 revert the change
1 parent 6d17a64 commit 11b7af6

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

mptcpanalyzer/connection.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ def filter_ds(data, **kwargs):
398398
query = "{field} == '{value}'".format(field=field, value=value)
399399

400400
log.debug("Running query %s" % query)
401-
dat = data.query(query)
401+
dat = data.query(query, engine="python")
402402
return dat
403403

404404

mptcpanalyzer/data.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ def mptcpdest_from_connections(df, con: MpTcpConnection) -> pd.DataFrame:
514514

515515
log.debug("Looking at mptcp destination %s" % dest)
516516
q = con.generate_direction_query(dest)
517-
df_dest = df.query(q)
517+
df_dest = df.query(q, engine="python")
518518
print("mptcpdest %r" % dest)
519519
df.loc[df_dest.index, 'mptcpdest'] = dest
520520

@@ -527,7 +527,7 @@ def tcpdest_from_connections(df, con: TcpConnection) -> pd.DataFrame:
527527

528528
log.debug("Looking at destination %s" % dest)
529529
q = con.generate_direction_query(dest)
530-
df_dest = df.query(q)
530+
df_dest = df.query(q, engine="python")
531531
print("tcpdest %r" % dest)
532532
df.loc[df_dest.index, 'tcpdest'] = dest
533533

@@ -669,9 +669,9 @@ def merge_tcp_dataframes_known_streams(
669669

670670
log.debug("Looking at tcpdestination %s" % tcpdest)
671671
q = main_connection.generate_direction_query(tcpdest)
672-
h1_unidirectional_df = h1_df.query(q)
672+
h1_unidirectional_df = h1_df.query(q, engine="python")
673673
q = mapped_connection.generate_direction_query(tcpdest)
674-
h2_unidirectional_df = h2_df.query(q)
674+
h2_unidirectional_df = h2_df.query(q, engine="python")
675675

676676
res = map_tcp_packets(h1_unidirectional_df, h2_unidirectional_df)
677677

mptcpanalyzer/parser.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ def __call__(self, parser, namespace, values, option_string=None):
433433

434434
import pandas as pd
435435
print("use numexpr?", pd.get_option('compute.use_numexpr', False))
436-
df.query(query, inplace=True, )
436+
df.query(query, inplace=True, engine="python")
437437

438438

439439
def gen_bicap_parser(protocol, dest=False):

mptcpanalyzer/pdutils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def filter_dataframe(
139139
# throws when querying with an empty query
140140
if len(query) > 0:
141141
log.info("Running query:\n%s\n" % query)
142-
dataframe.query(query, inplace=True)
142+
dataframe.query(query, inplace=True, engine="python")
143143

144144
return dataframe
145145

mptcpanalyzer/statistics.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def mptcp_compute_throughput(
6060
con = MpTcpConnection.build_from_dataframe(df, mptcpstreamid)
6161
q = con.generate_direction_query(destination)
6262
print("query q= %r" % q)
63-
df = unidirectional_df = df.query(q)
63+
df = unidirectional_df = df.query(q, engine="python")
6464

6565
dsn_min = df.dss_dsn.min()
6666
dsn_max = df.dss_dsn.max()

0 commit comments

Comments
 (0)