Skip to content

Commit

Permalink
chore: add non-mirror benches
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikwrede
erikwrede committed May 21, 2024
1 parent 0845571 commit 423b533
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 29 deletions.
45 changes: 23 additions & 22 deletions src/ast/gql_core/converter.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ struct CoreOperationType {
}

impl CoreOperationType {
fn new(PyOperationType: &PyAny) -> CoreOperationType {
fn new(PyOperationType: Bound<PyAny>) -> CoreOperationType {
let query = PyOperationType.getattr("QUERY").unwrap();
let mutation = PyOperationType.getattr("MUTATION").unwrap();
let subscription = PyOperationType.getattr("SUBSCRIPTION").unwrap();
Expand Down Expand Up @@ -41,11 +41,12 @@ pub struct CoreConversionContext {
field_node: Py<PyAny>,
document_node: Py<PyAny>,
name_node: Py<PyAny>,

}

impl CoreConversionContext {
pub fn new(py: Python) -> Self {
let graphql_core_ast = PyModule::import(py, "graphql.language.ast").unwrap();
let graphql_core_ast = PyModule::import_bound(py, "graphql.language.ast").unwrap();
let PyDocumentNode = graphql_core_ast.getattr("DocumentNode").unwrap();
let PyOperationType = graphql_core_ast.getattr("OperationType").unwrap();
let PyOperationDefinitionNode = graphql_core_ast.getattr("OperationDefinitionNode").unwrap();
Expand All @@ -63,18 +64,18 @@ impl CoreConversionContext {
}
}

fn get_name_nome(&self, py: Python, name: &str) -> PyResult<PyObject> {
let name_node_kwargs = PyDict::new(py);
fn get_name_node(&self, py: Python, name: &str) -> PyResult<PyObject> {
let name_node_kwargs = PyDict::new_bound(py);

let name = PyString::new(py, name);
let name = PyString::new_bound(py, name);
name_node_kwargs.set_item("value", name)?;

self.name_node.call(py, (), Some(name_node_kwargs))
self.name_node.call_bound(py, (), Some(&name_node_kwargs))
}

fn convert_field_to_core_field(&self, py: Python, field: &Node<Field>) -> PyResult<PyObject> {
//println!("Converting field to core field...");
let field_node_kwargs = PyDict::new(py);
let field_node_kwargs = PyDict::new_bound(py);
if field.selection_set.selections.len() > 0 {
//println!("Field has selection set");
let selection_set = self.convert_selection_set_to_core_selection_set(py, &field.selection_set)?;
Expand All @@ -84,18 +85,18 @@ impl CoreConversionContext {

//println!("Alias");
if let Some(alias) = &field.alias {
field_node_kwargs.set_item("alias", PyString::new(py, alias.as_str()))?;
field_node_kwargs.set_item("alias", PyString::new_bound(py, alias.as_str()))?;
}

//println!("Name");
let name = self.get_name_nome(py, field.name.as_str())?;
let name = self.get_name_node(py, field.name.as_str())?;
field_node_kwargs.set_item("name", name)?;

//println!("Initing lists");

// init an empty list of pyobjects
let arguments = PyList::empty(py).to_object(py);
let directives = PyList::empty(py).to_object(py);
let arguments = PyList::empty_bound(py).to_object(py);
let directives = PyList::empty_bound(py).to_object(py);


field_node_kwargs.set_item("arguments", arguments)?;
Expand All @@ -104,14 +105,14 @@ impl CoreConversionContext {

//println!("Calling field constructor");

self.field_node.call(py, (), Some(field_node_kwargs))
self.field_node.call_bound(py, (), Some(&field_node_kwargs))
}

fn convert_selection_set_to_core_selection_set(&self, py: Python, selection_set: &SelectionSet) -> PyResult<PyObject> {
//println!("Converting selection set...");
let selection_set_kwargs = PyDict::new(py);
let selection_set_kwargs = PyDict::new_bound(py);
// FIXME do we NEED to use PyTuple here?
let selections = PyList::empty(py);
let selections = PyList::empty_bound(py);

for selection in &selection_set.selections {
let core_selection = match selection {
Expand All @@ -127,20 +128,20 @@ impl CoreConversionContext {
//println!("Done converting selections!");
selection_set_kwargs.set_item("selections", selections)?;
//println!("Appended selections to kwargs!");
self.selection_set_node.call(py, (), Some(selection_set_kwargs))
self.selection_set_node.call_bound(py, (), Some(&selection_set_kwargs))
}

pub fn convert_core_to_core_ast(self: &Self, py: Python, document: &ExecutableDocument) -> PyResult<PyObject> {
let operations = document.all_operations();
let fragments = &document.fragments;

let core_operations = PyList::empty(py);
let core_operations = PyList::empty_bound(py);

for operation in operations {
let operation_kwargs = PyDict::new(py);
let operation_kwargs = PyDict::new_bound(py);

if let Some(operation_name) = &operation.name{
let operation_name = self.get_name_nome(py, operation_name)?;
let operation_name = self.get_name_node(py, operation_name)?;
// FIXME is this necessary?
//println!("Trying to set name!");
operation_kwargs.set_item("name", operation_name)?;
Expand All @@ -162,21 +163,21 @@ impl CoreConversionContext {

//println!("Selection sett, directives, variables done!");

operation_kwargs.set_item("operation", operation_type.into_ref(py))?;
operation_kwargs.set_item("operation", operation_type.into_bound(py))?;

//println!("Operation type set kwarg!");
operation_kwargs.set_item("selection_set", self.convert_selection_set_to_core_selection_set(py, selection_set)?)?;
//println!("Selection Set converted!");

//println!("Creating Operation def node...");
core_operations.append(self.operation_definition.call(py, (), Some(operation_kwargs))?)?;
core_operations.append(self.operation_definition.call_bound(py, (), Some(&operation_kwargs))?)?;

//println!("Created Operation def node!");
}
let document_node_kwargs = PyDict::new(py);
let document_node_kwargs = PyDict::new_bound(py);
document_node_kwargs.set_item("definitions", core_operations)?;

//println!("Creating document node!");
self.document_node.call(py, (), Some(document_node_kwargs))
self.document_node.call_bound(py, (), Some(&document_node_kwargs))
}
}
5 changes: 5 additions & 0 deletions test_parser/benchmarks/test_parsing_validation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@ def test_validation_gitlab_query_rustberry():
document = compiler.parse(operation)
validation_success = compiler.validate(document)
query = compiler.gql_core_ast_mirror(document)
@pytest.mark.benchmark
def test_validation_gitlab_query_rustberry_no_mirror():
document = compiler.parse(operation)
validation_success = compiler.validate(document)
query = compiler.gql_core_ast(document)
79 changes: 72 additions & 7 deletions test_parser/full_schema-pycon.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,71 @@ def __init__(self):
}
}
"""
operation_large = """
query ConferenceQuery {
a: conference(id: "pycon-it-2024") {
name
description
talks {
title
speaker {
name
github
}
}
faqs {
question
answer
}
}
b: conference(id: "pycon-it-2024") {
name
description
talks {
title
speaker {
name
github
}
}
faqs {
question
answer
}
}
c: conference(id: "pycon-it-2024") {
name
description
talks {
title
speaker {
name
github
}
}
faqs {
question
answer
}
}
d: conference(id: "pycon-it-2024") {
name
description
talks {
title
speaker {
name
github
}
}
faqs {
question
answer
}
}
}
"""
from graphql.utilities import get_introspection_query, build_client_schema
from graphql import parse, print_schema
Expand All @@ -182,12 +247,12 @@ def __init__(self):


def validate_timing():
query = parse(operation3)
validation_errors = validate(schema, query)
#query = parse(operation_large)
#validation_errors = validate(schema, query)
# validation_success = not validation_errors
#query = compiler.parse(operation3)
#validation_success = compiler.validate(query)
#query = compiler.gql_core_ast_mirror(query)
query = compiler.parse(operation_large)
validation_success = compiler.validate(query)
query = compiler.gql_core_ast_mirror(query)
# if not validation_success:
# return ExecutionResult(data=None, errors=validation_errors)

Expand Down Expand Up @@ -217,5 +282,5 @@ def run_benchmarks(func, warmup_time=0.1):


# Example usage: benchmarking the built-in sum function
print(validate_timing())
#run_benchmarks(validate_timing, 1)
#print(validate_timing())
run_benchmarks(validate_timing, 1)

0 comments on commit 423b533

Please sign in to comment.