Script improvements

Author: jeffreylovitz

bulk_insert.py

@@ -104,6 +104,8 @@ class NodeFile(EntityFile):
     def __init__(self, infile):
         super(NodeFile, self).__init__(infile)
         self.process_header()
+        self.process_entities()
+        self.infile.close()
 
     def process_header(self):
         # Header format:
@@ -135,13 +137,14 @@ def process_entities(self):
             NODE_COUNT += 1
             self.entity_count += 1
             self.entities.append(self.pack_props(row))
-        self.infile.close()
 
 
 class RelationFile(EntityFile):
     def __init__(self, infile):
         super(RelationFile, self).__init__(infile)
         self.process_header()
+        self.process_entities()
+        self.infile.close()
 
     def process_header(self):
         # Header format:
@@ -175,22 +178,17 @@ def process_entities(self):
             self.entity_count += 1
             RELATION_COUNT += 1
             self.entities.append(struct.pack(fmt, src, dest) + self.pack_props(row))
-        self.infile.close()
 
 def process_node_csvs(csvs):
     nodefiles = []
     for in_csv in csvs:
-        nodefile = NodeFile(in_csv)
-        nodefile.process_entities()
-        nodefiles.append(nodefile)
+        nodefiles.append(NodeFile(in_csv))
     return nodefiles
 
 def process_relation_csvs(csvs):
     relfiles = []
     for in_csv in csvs:
-        relfile = RelationFile(in_csv)
-        relfile.process_entities()
-        relfiles.append(relfile)
+        relfiles.append(RelationFile(in_csv))
     return relfiles
 
 
@@ -203,7 +201,7 @@ def help():
 # Redis server connection settings
 @click.option('--host', '-h', default='127.0.0.1', help='Redis server host')
 @click.option('--port', '-p', default=6379, help='Redis server port')
-@click.option('--password', '-P', default=None, help='Redis server password')
+@click.option('--password', '-a', default=None, help='Redis server password')
 # CSV file paths
 @click.option('--nodes', '-n', required=True, multiple=True, help='path to node csv file')
 @click.option('--relations', '-r', multiple=True, help='path to relation csv file')