Skip to content

ID as strings and Parsing array items #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 6, 2021
Merged

ID as strings and Parsing array items #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85a329a
Update entity_file.py
YaphetKG Dec 24, 2020
7db461c
Update entity_file.py
YaphetKG Dec 24, 2020
25493a4
Update relation_type.py
YaphetKG Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions redisgraph_bulk_loader/entity_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def typed_prop_to_binary(prop_val, prop_type):
prop_val = prop_val.strip()

# TODO allow ID type specification
if prop_type == Type.ID or prop_type == Type.LONG:
if prop_type == Type.LONG:
try:
numeric_prop = int(prop_val)
return struct.pack(format_str + "q", Type.LONG.value, numeric_prop)
Expand All @@ -75,7 +75,7 @@ def typed_prop_to_binary(prop_val, prop_type):
if prop_type == Type.LONG:
raise SchemaError("Could not parse '%s' as a long" % prop_val)

elif prop_type == Type.ID or prop_type == Type.DOUBLE:
elif prop_type == Type.DOUBLE:
try:
numeric_prop = float(prop_val)
if not math.isnan(numeric_prop) and not math.isinf(numeric_prop): # Don't accept non-finite values.
Expand All @@ -94,7 +94,7 @@ def typed_prop_to_binary(prop_val, prop_type):
else:
raise SchemaError("Could not parse '%s' as a boolean" % prop_val)

elif prop_type == Type.STRING:
elif prop_type== Type.ID or prop_type == Type.STRING:
# If we've reached this point, the property is a string
encoded_str = str.encode(prop_val) # struct.pack requires bytes objects as arguments
# Encoding len+1 adds a null terminator to the string
Expand Down Expand Up @@ -146,7 +146,10 @@ def inferred_prop_to_binary(prop_val):

# If the property string is bracket-interpolated, it is an array.
if prop_val[0] == '[' and prop_val[-1] == ']':
return array_prop_to_binary(format_str, prop_val)
try:
return array_prop_to_binary(format_str, prop_val)
except:
pass

# If we've reached this point, the property is a string.
encoded_str = str.encode(prop_val) # struct.pack requires bytes objects as arguments
Expand Down
2 changes: 2 additions & 0 deletions redisgraph_bulk_loader/relation_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ class RelationType(EntityFile):
def __init__(self, query_buffer, infile, type_str, config):
super(RelationType, self).__init__(infile, type_str, config)
self.query_buffer = query_buffer
self.start_namespace = None
self.end_namespace = None

def process_schemaless_header(self, header):
if self.column_count < 2:
Expand Down