trappy: optimize merge_df by removing try/except
Change-Id: I238bb50ed1907def19b23b0610eec87234ef4d51
Signed-off-by: Joel Fernandes <joelaf@google.com>
diff --git a/trappy/utils.py b/trappy/utils.py
index 57b4ccd..47ef4ab 100644
--- a/trappy/utils.py
+++ b/trappy/utils.py
@@ -147,11 +147,9 @@
for key, value in data.iteritems():
if key == pivot:
continue
- try:
- if np.isnan(value):
- data[key] = pivot_map[data[pivot]][key]
- except:
- pass
+ # Fast check for if value is nan (faster than np.isnan + try/except)
+ if value != value and pivot_map.has_key(data[pivot]):
+ data[key] = pivot_map[data[pivot]][key]
# Get rid of primary/secondary labels
data['Time'] = data['Time'][1]
