Skip to content

Commit

Permalink
Merge pull request #2887 from bamaer/2812
Browse files Browse the repository at this point in the history 
special characters in graph properties, exclude child hpl/hwf from samples IT #2812 #2237
  • Loading branch information
@hansva
hansva authored Apr 29, 2023
2 parents d289b88 + be8ed0b commit 381b39a
Show file tree
Hide file tree
Showing 8 changed files with 664 additions and 26 deletions.
4 changes: 2 additions & 2 deletions docker/integration-tests/integration-tests-neo4j.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ services:
- "7474"
- "7687"
environment:
- NEO4J_AUTH=neo4j/abcd
- NEO4J_AUTH=neo4j/abcdefgh
- NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
healthcheck:
test: perl -MIO::Socket::INET -e 'exit(! defined( IO::Socket::INET->new("localhost:7687")))'
interval: 20s
timeout: 10s
retries: 6
start_period: 120s
start_period: 120s
39 changes: 17 additions & 22 deletions integration-tests/neo4j/dev-env-config.json
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
{
"variables": [
{
"name": "NEO_HOSTNAME",
"value": "neo4j",
"description": "The neo4j hostname"
},
{
"name": "NEO_PORT",
"value": "7687",
"description": "The data port "
},
{
"name": "NEO_USERNAME",
"value": "neo4j",
"description": "Username: see the docker compose yml file"
},
{
"name": "NEO_PASSWORD",
"value": "abcd",
"description": "Password: see the docker compose yml file"
}
]
"variables" : [ {
"name" : "NEO_HOSTNAME",
"value" : "neo4j",
"description" : "The neo4j hostname"
}, {
"name" : "NEO_PORT",
"value" : "7687",
"description" : "The data port "
}, {
"name" : "NEO_USERNAME",
"value" : "neo4j",
"description" : "Username: see the docker compose yml file"
}, {
"name" : "NEO_PASSWORD",
"value" : "abcdefgh",
"description" : "Password: see the docker compose yml file"
} ]
}
70 changes: 70 additions & 0 deletions integration-tests/neo4j/metadata/neo4j-graph-model/model-2812.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"relationships": [
{
"nodeSource": "from node",
"name": "dummy relationship",
"description": "",
"nodeTarget": "to node",
"label": "REL",
"properties": [
{
"indexed": false,
"unique": false,
"name": "relationship property",
"description": "",
"type": "String",
"mandatory": false,
"primary": true
}
]
}
],
"nodes": [
{
"presentation": {
"x": 0,
"y": 0
},
"name": "from node",
"description": "",
"properties": [
{
"indexed": false,
"unique": false,
"name": "node id",
"description": "",
"type": "String",
"mandatory": false,
"primary": true
}
],
"labels": [
"FROM"
]
},
{
"presentation": {
"x": 642,
"y": 319
},
"name": "to node",
"description": "",
"properties": [
{
"indexed": false,
"unique": false,
"name": "node id",
"description": "",
"type": "String",
"mandatory": false,
"primary": true
}
],
"labels": [
"TO"
]
}
],
"name": "model-2812",
"description": ""
}
235 changes: 235 additions & 0 deletions ...on-tests/neo4j/tests/neo4j-2812-graph-model-with-spaces-in-key-names/2812-check-graph.hpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<pipeline>
<info>
<name>2812-check-graph</name>
<name_sync_with_filename>Y</name_sync_with_filename>
<description/>
<extended_description/>
<pipeline_version/>
<pipeline_type>Normal</pipeline_type>
<parameters>
</parameters>
<capture_transform_performance>N</capture_transform_performance>
<transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
<transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
<created_user>-</created_user>
<created_date>2023/04/29 09:46:27.700</created_date>
<modified_user>-</modified_user>
<modified_date>2023/04/29 09:46:27.700</modified_date>
</info>
<notepads>
</notepads>
<order>
<hop>
<from>read graph</from>
<to>check results</to>
<enabled>Y</enabled>
</hop>
<hop>
<from>check results</from>
<to>Ok</to>
<enabled>Y</enabled>
</hop>
<hop>
<from>check results</from>
<to>Abort</to>
<enabled>Y</enabled>
</hop>
</order>
<transform>
<name>read graph</name>
<type>Neo4jCypherOutput</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<batch_size/>
<connection>Test</connection>
<cypher>match(f:FROM)-[r:REL]-(t:TO) return count(f.`node id`) as from_node_ids, count(r.`relationship property`) as relationship_properties, count(t.`node id`) as to_node_ids; </cypher>
<cypher_field/>
<cypher_from_field>N</cypher_from_field>
<mappings>
</mappings>
<nr_retries_on_error/>
<read_only>N</read_only>
<retry>Y</retry>
<return_graph_field/>
<returning_graph>N</returning_graph>
<returns>
<return>
<name>from_node_ids</name>
<source_type/>
<type>Integer</type>
</return>
<return>
<name>to_node_ids</name>
<source_type/>
<type>Integer</type>
</return>
<return>
<name>relationship_properties</name>
<source_type/>
<type>Integer</type>
</return>
</returns>
<unwind>N</unwind>
<unwind_map/>
<attributes/>
<GUI>
<xloc>128</xloc>
<yloc>96</yloc>
</GUI>
</transform>
<transform>
<name>check results</name>
<type>FilterRows</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<compare>
<condition>
<conditions>
<condition>
<conditions>
</conditions>
<function>=</function>
<leftvalue>from_node_ids</leftvalue>
<negated>N</negated>
<operator>-</operator>
<value>
<isnull>N</isnull>
<length>-1</length>
<mask>####0;-####0</mask>
<name>constant</name>
<precision>0</precision>
<text>2</text>
<type>Integer</type>
</value>
</condition>
<condition>
<conditions>
</conditions>
<function>=</function>
<leftvalue>to_node_ids</leftvalue>
<negated>N</negated>
<operator>AND</operator>
<value>
<isnull>N</isnull>
<length>-1</length>
<mask>####0;-####0</mask>
<name>constant</name>
<precision>0</precision>
<text>2</text>
<type>Integer</type>
</value>
</condition>
<condition>
<conditions>
</conditions>
<function>=</function>
<leftvalue>relationship_properties</leftvalue>
<negated>N</negated>
<operator>AND</operator>
<value>
<isnull>N</isnull>
<length>-1</length>
<mask>####0;-####0</mask>
<name>constant</name>
<precision>0</precision>
<text>2</text>
<type>Integer</type>
</value>
</condition>
</conditions>
<function>=</function>
<leftvalue>from_node_ids</leftvalue>
<negated>N</negated>
<operator>-</operator>
<value>
<isnull>N</isnull>
<length>-1</length>
<mask>####0;-####0</mask>
<name>constant</name>
<precision>0</precision>
<text>2</text>
<type>Integer</type>
</value>
</condition>
</compare>
<send_false_to>Abort</send_false_to>
<send_true_to>Ok</send_true_to>
<attributes/>
<GUI>
<xloc>304</xloc>
<yloc>96</yloc>
</GUI>
</transform>
<transform>
<name>Ok</name>
<type>Dummy</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<attributes/>
<GUI>
<xloc>496</xloc>
<yloc>96</yloc>
</GUI>
</transform>
<transform>
<name>Abort</name>
<type>Abort</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<abort_option>ABORT_WITH_ERROR</abort_option>
<always_log_rows>Y</always_log_rows>
<message/>
<row_threshold>0</row_threshold>
<attributes/>
<GUI>
<xloc>304</xloc>
<yloc>240</yloc>
</GUI>
</transform>
<transform_error_handling>
</transform_error_handling>
<attributes/>
</pipeline>
Loading

0 comments on commit 381b39a

Please sign in to comment.