Revision fda50d75 snf-pithos-backend/pithos/backends/lib/hashfiler/store.py

b/snf-pithos-backend/pithos/backends/lib/hashfiler/store.py
48 48
        if umask is not None:
49 49
            os.umask(umask)
50 50

  
51
        path = params['path']
52
        if path and not os.path.exists(path):
53
            os.makedirs(path)
54
        if not os.path.isdir(path):
55
            raise RuntimeError("Cannot open path '%s'" % (path,))
56

  
57
        p = {'blocksize': params['block_size'],
58
             'blockpath': os.path.join(path + '/blocks'),
51
        pb = {'blocksize': params['block_size'],
59 52
             'hashtype': params['hash_algorithm'],
60
             'blockpool': params['blockpool']}
61
        self.blocker = Blocker(**p)
62
        p = {'mappath': os.path.join(path + '/maps'),
63
             'namelen': self.blocker.hashlen,
64
             'mappool': params['mappool']}
65
        self.mapper = Mapper(**p)
53
            }
54
        self.blocker = Blocker(**pb)
55
        pm = {'namelen': self.blocker.hashlen,
56
            }
57
        self.mapper = Mapper(**pm)
66 58

  
67 59
    def map_get(self, name):
68 60
        return self.mapper.map_retr(name)
69 61

  
62
    def map_get_archipelago(self, name, size):
63
        return self.mapper.map_retr_archipelago(name, size)
64

  
70 65
    def map_put(self, name, map):
71 66
        self.mapper.map_stor(name, map)
72 67

  
......
79 74
            return None
80 75
        return blocks[0]
81 76

  
77
    def block_get_archipelago(self, hash):
78
        blocks = self.blocker.block_retr_archipelago((hash,))
79
        if not blocks:
80
            return None
81
        return blocks[0]
82

  
82 83
    def block_put(self, data):
83 84
        hashes, absent = self.blocker.block_stor((data,))
84 85
        return hashes[0]

Also available in: Unified diff