This is an archive of the discontinued Mercurial Phabricator instance.

Differential D629

cstore: pythonkeyiterator refactor
ClosedPublic

Authored by ms2316 on Sep 5 2017, 10:30 AM.
Tags
None
Subscribers
None

Details

Reviewers
ryanmce
durham
simonfar
Group Reviewers
Restricted Project
Commits
rFBHGX0763bbfdb666: cstore: pythonkeyiterator refactor
Summary

PythonKeyIterator has been moved to a separate file, because we will need to
include it in several places in future commits.

Test Plan
  • Ensure unit tests pass

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ms2316 created this revision.Sep 5 2017, 10:30 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 5 2017, 10:30 AM
ryanmce accepted this revision.Sep 5 2017, 10:57 AM

Sweet, trivial move. My favorite :-)

This revision is now accepted and ready to land.Sep 5 2017, 10:57 AM
Closed by commit rFBHGX0763bbfdb666: cstore: pythonkeyiterator refactor (authored by ms2316). · Explain WhySep 6 2017, 9:54 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1648

cstore/py-datapackstore.h

#include "cdatapack/cdatapack.h" #include "cdatapack/cdatapack.h"
} }
#include "cstore/datapackstore.h" #include "cstore/datapackstore.h"
#include "cstore/datastore.h" #include "cstore/datastore.h"
#include "cstore/key.h" #include "cstore/key.h"
#include "cstore/py-structs.h" #include "cstore/py-structs.h"
#include "cstore/pythonutil.h" #include "cstore/pythonutil.h"
#include "cstore/pythonkeyiterator.h"
#include "cstore/uniondatapackstore.h" #include "cstore/uniondatapackstore.h"
// --------- DatapackStore Implementation --------- // --------- DatapackStore Implementation ---------
/* /*
* Initializes the contents of a datapackstore * Initializes the contents of a datapackstore
*/ */
static int datapackstore_init(py_datapackstore *self, PyObject *args) { static int datapackstore_init(py_datapackstore *self, PyObject *args) {
PyErr_SetString(PyExc_KeyError, ex.what()); PyErr_SetString(PyExc_KeyError, ex.what());
return NULL; return NULL;
} catch (const std::exception &ex) { } catch (const std::exception &ex) {
PyErr_SetString(PyExc_RuntimeError, ex.what()); PyErr_SetString(PyExc_RuntimeError, ex.what());
return NULL; return NULL;
} }
} }
class PythonKeyIterator : public KeyIterator {
private:
PythonObj _input;
Key _current;
public:
PythonKeyIterator(PythonObj input) :
_input(input) {}
Key *next() {
PyObject *item;
while ((item = PyIter_Next((PyObject*)_input)) != NULL) {
PythonObj itemObj = item;
char *name;
Py_ssize_t namelen;
char *node;
Py_ssize_t nodelen;
if (!PyArg_ParseTuple(item, "s#s#", &name, &namelen, &node, &nodelen)) {
throw pyexception();
}
_current = Key(name, namelen, node, nodelen);
return &_current;
}
return NULL;
}
};
static PyObject *datapackstore_getmissing(py_datapackstore *self, PyObject *keys) { static PyObject *datapackstore_getmissing(py_datapackstore *self, PyObject *keys) {
try { try {
PythonObj result = PyList_New(0); PythonObj result = PyList_New(0);
PythonObj inputIterator = PyObject_GetIter(keys); PythonObj inputIterator = PyObject_GetIter(keys);
PythonKeyIterator keysIter(inputIterator); PythonKeyIterator keysIter(inputIterator);
std::shared_ptr<KeyIterator> missingIter = self->datapackstore.getMissing(keysIter); std::shared_ptr<KeyIterator> missingIter = self->datapackstore.getMissing(keysIter);

cstore/pythonkeyiterator.h

  • This file was added.
// pythonkeyiterator.h - c++ implementation of python key iterator
//
// Copyright 2017 Facebook, Inc.
//
// This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version.
//
// no-check-code
#ifndef FBHGEXT_PYTHONKEYITERATOR_H
#define FBHGEXT_PYTHONKEYITERATOR_H
#include "cstore/pythonutil.h"
class PythonKeyIterator : public KeyIterator {
private:
PythonObj _input;
Key _current;
public:
PythonKeyIterator(PythonObj input) :
_input(input) {}
Key *next() {
PyObject *item;
while ((item = PyIter_Next((PyObject*)_input)) != NULL) {
PythonObj itemObj = item;
char *name;
Py_ssize_t namelen;
char *node;
Py_ssize_t nodelen;
if (!PyArg_ParseTuple(item, "s#s#", &name, &namelen, &node, &nodelen)) {
throw pyexception();
}
_current = Key(name, namelen, node, nodelen);
return &_current;
}
return NULL;
}
};
#endif //FBHGEXT_PYTHONKEYITERATOR_H

tests/test-check-code-hg.t

Skipping cstore/datastore.h it has no-che?k-code (glob) Skipping cstore/datastore.h it has no-che?k-code (glob)
Skipping cstore/key.h it has no-che?k-code (glob) Skipping cstore/key.h it has no-che?k-code (glob)
Skipping cstore/match.h it has no-che?k-code (glob) Skipping cstore/match.h it has no-che?k-code (glob)
Skipping cstore/py-cdatapack.h it has no-che?k-code (glob) Skipping cstore/py-cdatapack.h it has no-che?k-code (glob)
Skipping cstore/py-cstore.cpp it has no-che?k-code (glob) Skipping cstore/py-cstore.cpp it has no-che?k-code (glob)
Skipping cstore/py-datapackstore.h it has no-che?k-code (glob) Skipping cstore/py-datapackstore.h it has no-che?k-code (glob)
Skipping cstore/py-structs.h it has no-che?k-code (glob) Skipping cstore/py-structs.h it has no-che?k-code (glob)
Skipping cstore/py-treemanifest.h it has no-che?k-code (glob) Skipping cstore/py-treemanifest.h it has no-che?k-code (glob)
Skipping cstore/pythonkeyiterator.h it has no-che?k-code (glob)
Skipping cstore/pythonutil.cpp it has no-che?k-code (glob) Skipping cstore/pythonutil.cpp it has no-che?k-code (glob)
Skipping cstore/pythonutil.h it has no-che?k-code (glob) Skipping cstore/pythonutil.h it has no-che?k-code (glob)
Skipping cstore/store.h it has no-che?k-code (glob) Skipping cstore/store.h it has no-che?k-code (glob)
Skipping cstore/uniondatapackstore.cpp it has no-che?k-code (glob) Skipping cstore/uniondatapackstore.cpp it has no-che?k-code (glob)
Skipping cstore/uniondatapackstore.h it has no-che?k-code (glob) Skipping cstore/uniondatapackstore.h it has no-che?k-code (glob)
Skipping ctreemanifest/manifest.cpp it has no-che?k-code (glob) Skipping ctreemanifest/manifest.cpp it has no-che?k-code (glob)
Skipping ctreemanifest/manifest.h it has no-che?k-code (glob) Skipping ctreemanifest/manifest.h it has no-che?k-code (glob)
Skipping ctreemanifest/manifest_entry.cpp it has no-che?k-code (glob) Skipping ctreemanifest/manifest_entry.cpp it has no-che?k-code (glob)