Skip to content

Commit

Permalink
Merge tag 'release-1.8.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Rayulu Villa authored and Rayulu Villa committed Jan 16, 2017
2 parents fb2cea5 + 8c3bb43 commit daac27f
Show file tree
Hide file tree
Showing 19 changed files with 429 additions and 60 deletions.
13 changes: 13 additions & 0 deletions docs/domain_model_v2/definitions/content_definition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1211,6 +1211,19 @@
"indexed": false,
"draft": false
},
{
"required": false,
"dataType": "external",
"propertyName": "oldBody",
"title": "Old Body",
"description": "",
"category": "Authoring",
"displayProperty": "Hidden",
"defaultValue": "",
"renderingHints": "{ 'inputType': 'textarea', 'order': 4 }",
"indexed": false,
"draft": false
},
{
"required": false,
"dataType": "Text",
Expand Down
24 changes: 24 additions & 0 deletions docs/domain_model_v2/definitions/item_definition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,30 @@
"renderingHints": "{ 'inputType': 'textarea', 'order': 4 }",
"indexed": true,
"draft": false
}, {
"required": false,
"dataType": "Text",
"propertyName": "question_audio",
"title": "Question Audio",
"description": "",
"category": "general",
"displayProperty": "Editable",
"defaultValue": "",
"renderingHints": "{ 'inputType': 'textarea', 'order': 4 }",
"indexed": true,
"draft": false
}, {
"required": false,
"dataType": "Text",
"propertyName": "question_image",
"title": "Question Image",
"description": "",
"category": "general",
"displayProperty": "Editable",
"defaultValue": "",
"renderingHints": "{ 'inputType': 'textarea', 'order': 4 }",
"indexed": true,
"draft": false
}, {
"required": false,
"dataType": "JSON",
Expand Down
13 changes: 11 additions & 2 deletions ...nterpreter/src/main/java/com/ilimi/orchestrator/interpreter/command/GetResponseValue.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.ilimi.orchestrator.interpreter.command;

import com.ilimi.common.dto.Response;
import com.ilimi.common.logger.LogHelper;
import com.ilimi.orchestrator.interpreter.ICommand;

import tcl.lang.Command;
Expand All @@ -11,6 +12,8 @@
import tcl.pkg.java.ReflectObject;

public class GetResponseValue implements ICommand, Command {

private static LogHelper LOGGER = LogHelper.getInstance(GetResponseValue.class.getName());

@Override
public String getCommandName() {
Expand All @@ -26,9 +29,15 @@ public void cmdProc(Interp interp, TclObject[] argv) throws TclException {
Response response = (Response) obj;
String param = argv[2].toString();
Object result = response.get(param);
TclObject tclResp = ReflectObject.newInstance(interp, result.getClass(), result);
interp.setResult(tclResp);
if (null != result) {
TclObject tclResp = ReflectObject.newInstance(interp, result.getClass(), result);
interp.setResult(tclResp);
} else {
TclObject tclResp = ReflectObject.newInstance(interp, Object.class, null);
interp.setResult(tclResp);
}
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
throw new TclException(interp, "Unable to read response: " + e.getMessage());
}
} else {
Expand Down
54 changes: 37 additions & 17 deletions ...h-engine/module/graph-dac-api/src/main/java/com/ilimi/graph/dac/model/SearchCriteria.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,34 +177,54 @@ public String getQuery() {
sb.append(rel.getCypher(this, null));
}
if (!countQuery) {
boolean returnNode = true;
if (null == fields || fields.isEmpty()) {
sb.append("RETURN DISTINCT ee ");
sb.append("WITH DISTINCT ee ");
if (null != sortOrder && sortOrder.size() > 0) {
sb.append("ORDER BY ");
for (int i = 0; i < sortOrder.size(); i++) {
Sort sort = sortOrder.get(i);
sb.append("ee.").append(sort.getSortField()).append(" ");
if (StringUtils.equals(Sort.SORT_DESC, sort.getSortOrder())) {
sb.append("DESC ");
}
if (i < sortOrder.size() - 1)
sb.append(", ");
}
}
if (startPosition > 0)
sb.append("SKIP ").append(startPosition).append(" ");
if (resultSize > 0)
sb.append("LIMIT ").append(resultSize).append(" ");
sb.append("OPTIONAL MATCH (ee)-[r]-() RETURN ee, r, startNode(r) as __startNode, endNode(r) as __endNode ");
} else {
returnNode = false;
sb.append("RETURN ");
for (int i = 0; i < fields.size(); i++) {
sb.append("ee.").append(fields.get(i)).append(" as ").append(fields.get(i)).append(" ");
if (i < fields.size() - 1)
sb.append(", ");
}
}
if (null != sortOrder && sortOrder.size() > 0) {
sb.append("ORDER BY ");
for (int i = 0; i < sortOrder.size(); i++) {
Sort sort = sortOrder.get(i);
sb.append("ee.").append(sort.getSortField()).append(" ");
if (StringUtils.equals(Sort.SORT_DESC, sort.getSortOrder())) {
sb.append("DESC ");
if (!returnNode) {
if (null != sortOrder && sortOrder.size() > 0) {
sb.append("ORDER BY ");
for (int i = 0; i < sortOrder.size(); i++) {
Sort sort = sortOrder.get(i);
sb.append("ee.").append(sort.getSortField()).append(" ");
if (StringUtils.equals(Sort.SORT_DESC, sort.getSortOrder())) {
sb.append("DESC ");
}
if (i < sortOrder.size() - 1)
sb.append(", ");
}
if (i < sortOrder.size() - 1)
sb.append(", ");
}
}

if (startPosition > 0) {
sb.append("SKIP ").append(startPosition).append(" ");
}
if (resultSize > 0) {
sb.append("LIMIT ").append(resultSize).append(" ");
if (startPosition > 0) {
sb.append("SKIP ").append(startPosition).append(" ");
}
if (resultSize > 0) {
sb.append("LIMIT ").append(resultSize).append(" ");
}
}
} else {
sb.append("RETURN count(ee) as __count");
Expand Down
36 changes: 25 additions & 11 deletions ...h-dac-api/src/main/java/org/ekstep/graph/service/operation/Neo4JBoltSearchOperations.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
Expand Down Expand Up @@ -37,7 +38,7 @@
public class Neo4JBoltSearchOperations {

/** The logger. */
private static Logger LOGGER = LogManager.getLogger(Neo4JEmbeddedSearchOperations.class.getName());
private static Logger LOGGER = LogManager.getLogger(Neo4JBoltSearchOperations.class.getName());

/**
* Gets the node by id.
Expand Down Expand Up @@ -862,7 +863,11 @@ public List<Node> searchNodes(String graphId, SearchCriteria searchCriteria, Boo
LOGGER.info("Driver Initialised. | [Graph Id: " + graphId + "]");
try (Session session = driver.session()) {
LOGGER.info("Session Initialised. | [Graph Id: " + graphId + "]");

List<String> fields = searchCriteria.getFields();
boolean returnNode = true;
if (null != fields && !fields.isEmpty())
returnNode = false;

LOGGER.info("Populating Parameter Map.");
Map<String, Object> parameterMap = new HashMap<String, Object>();
parameterMap.put(GraphDACParams.graphId.name(), graphId);
Expand All @@ -871,24 +876,33 @@ public List<Node> searchNodes(String graphId, SearchCriteria searchCriteria, Boo
parameterMap.put(GraphDACParams.request.name(), request);

String query = QueryUtil.getQuery(Neo4JOperation.SEARCH_NODES, parameterMap);
LOGGER.info("Search Query: " + query);
Map<String, Object> params = searchCriteria.getParams();
LOGGER.info("Search Params: " + params);
StatementResult result = session.run(query, params);
LOGGER.info("Initializing the Result Maps.");
Map<Long, Object> nodeMap = new HashMap<Long, Object>();
Map<Long, Object> nodeMap = new LinkedHashMap<Long, Object>();
Map<Long, Object> relationMap = new HashMap<Long, Object>();
Map<Long, Object> startNodeMap = new HashMap<Long, Object>();
Map<Long, Object> endNodeMap = new HashMap<Long, Object>();
if (null != result) {
LOGGER.debug("'Search Nodes' result: " + result);
for (Record record : result.list()) {
LOGGER.debug("'Get All Nodes' Operation Finished.", record);
if (null != record)
getRecordValues(record, nodeMap, relationMap, startNodeMap, endNodeMap);
LOGGER.debug("'Search Nodes' Operation Finished.", record);
if (null != record) {
if (returnNode)
getRecordValues(record, nodeMap, relationMap, startNodeMap, endNodeMap);
else {
Node node = new Node(graphId, record.asMap());
nodes.add(node);
}
}
}
}
LOGGER.info("Node Map: ", nodeMap);
LOGGER.info("Relation Map: ", relationMap);
LOGGER.info("Start Node Map: ", startNodeMap);
LOGGER.info("End Node Map: ", endNodeMap);
LOGGER.info("Node Map: " + nodeMap);
LOGGER.info("Relation Map: " + relationMap);
LOGGER.info("Start Node Map: " + startNodeMap);
LOGGER.info("End Node Map: " + endNodeMap);

LOGGER.info("Initializing Node.");
if (!nodeMap.isEmpty()) {
Expand All @@ -897,7 +911,7 @@ public List<Node> searchNodes(String graphId, SearchCriteria searchCriteria, Boo
startNodeMap, endNodeMap));
}
}
LOGGER.info("Returning Search Nodes: ", nodes);
LOGGER.info("Returning Search Nodes: " + nodes);
return nodes;
}

Expand Down
4 changes: 2 additions & 2 deletions platform-devops/ansible/group_vars/prod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ dbms_memory_heap_initial_size: 3072
dbms_memory_heap_max_size: 3072
dbms_memory_pagecache_size: 3g
graph_passport_key: oM2wLF8Eq3vRnt3qZ0+Y/sWQnH5pz3bHpciFo3EIifZIcP5RW4qHw8sZztCzv87M
learning_neo4j_bolt_url: bolt://internal-prod-learning-neo4j-elb-1077114289.ap-southeast-1.elb.amazonaws.com:7687
language_neo4j_bolt_url: bolt://internal-prod-language-neo4j-elb-1816657751.ap-southeast-1.elb.amazonaws.com:8687
learning_neo4j_bolt_url: bolt://10.10.1.254:7687
language_neo4j_bolt_url: bolt://10.10.1.254:8687
to_learning: 10.10.1.26
to_language: 10.10.1.30
to_total:
Expand Down
4 changes: 2 additions & 2 deletions platform-devops/ansible/group_vars/qa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ dbms_memory_heap_initial_size: 3072
dbms_memory_heap_max_size: 3072
dbms_memory_pagecache_size: 3g
graph_passport_key: TlRnwlWOW7t4dHBOlqLD0AGH373ssBk198maQL52/Z1IcP5RW4qHw8sZztCzv87M
learning_neo4j_bolt_url: bolt://internal-qa-learning-neo4j-elb-678743251.ap-southeast-1.elb.amazonaws.com:7687
language_neo4j_bolt_url: bolt://internal-qa-language-neo4j-elb-1022742769.ap-southeast-1.elb.amazonaws.com:8687
learning_neo4j_bolt_url: bolt://172.31.8.205:7687
language_neo4j_bolt_url: bolt://172.31.8.205:8687

to_learning: 172.31.20.28
to_language: 172.31.20.27
Expand Down
4 changes: 3 additions & 1 deletion platform-devops/ansible/roles/cassandra-db-update/templates/data.cql.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ CREATE TABLE IF NOT EXISTS content_store.content_data (
last_updated_on timestamp,
body blob,
PRIMARY KEY (content_id)
);
);

ALTER TABLE content_store.content_data ADD oldBody blob;
2 changes: 1 addition & 1 deletion ...orm-modules/actors/src/main/java/org/ekstep/contentstore/util/ContentStoreOperations.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

public enum ContentStoreOperations {

updateContentBody, getContentBody;
updateContentBody, getContentBody, getContentProperty, getContentProperties, updateContentProperty, updateContentProperties;
}
4 changes: 3 additions & 1 deletion platform-modules/actors/src/main/java/org/ekstep/contentstore/util/ContentStoreParams.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@

public enum ContentStoreParams {

ERR_BLANK_CONTENT_ID, ERR_BLANK_CONTENT_BODY, ERR_CONTENT_DATA_NOT_FOUND, content_id, body;
content_id, body, property, value, properties, values,
ERR_BLANK_CONTENT_ID, ERR_BLANK_CONTENT_BODY, ERR_CONTENT_DATA_NOT_FOUND,
ERR_INVALID_PROPERTY_NAME, ERR_SERVER_ERROR, ERR_INVALID_PROPERTY_VALUES;
}
Loading

0 comments on commit daac27f

Please sign in to comment.