Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow null value in data loading #2845

Merged
merged 3 commits into from
Jun 9, 2023
Merged

allow null value in data loading #2845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27edb5d
allow null value in data loading
siyuan0322 Jun 8, 2023
090b4f9
update rocksdbjni version
siyuan0322 Jun 8, 2023
da7a7b0
update
siyuan0322 Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions charts/graphscope-store/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ data:
pegasus_hosts=""
i=0
while [ $i -ne $STORE_COUNT ]; do
pod=`echo $DNS_NAME_PREFIX_STORE | sed -e "s/{}/$i/g"`
# 60001 is fixed gaia engine port
pegasus_hosts="${pegasus_hosts},${pod}:60001"
pod=`echo $DNS_NAME_PREFIX_STORE | sed -e "s/{}/$i/g"`
# 60001 is fixed gaia engine port
pegasus_hosts="${pegasus_hosts},${pod}:60001"
i=$(($i+1))
done
pegasus_hosts=${pegasus_hosts:1}
Expand All @@ -120,7 +120,7 @@ data:
-e "s/STORE/${DNS_NAME_PREFIX_STORE}/g" \
-e "s/PEGASUS_HOSTS/${pegasus_hosts}/g" \
-e "s@LOG4RS_CONFIG@${GRAPHSCOPE_HOME}/groot/conf/log4rs.yml@g" \
/etc/groot/groot.config.tpl | sudo tee /etc/groot/groot.config
/etc/groot/groot.config.tpl | sudo tee -a /etc/groot/groot.config

export LOG_NAME=graphscope-store
export GROOT_CONF_FILE=/etc/groot/groot.config
Expand Down
11 changes: 7 additions & 4 deletions ...ol/src/main/java/com/alibaba/graphscope/groot/dataload/databuild/DataBuildMapperOdps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ public void map(long recordNum, Record record, TaskContext context) throws IOExc
String[] items = new String[columnCount];
for (int i = 0; i < columnCount; i++) {
if (record.get(i) == null) {
items[i] = "";
// items[i] = "";
items[i] = null;
} else {
items[i] = record.get(i).toString();
}
Expand Down Expand Up @@ -164,10 +165,12 @@ private Map<Integer, PropertyValue> buildPropertiesMap(
+ Arrays.toString(items)
+ "]");
}
DataType dataType = propertyDef.getDataType();

String val = items[colIdx];
PropertyValue propertyValue = new PropertyValue(dataType, val);
PropertyValue propertyValue = null;
if (val != null) {
DataType dataType = propertyDef.getDataType();
propertyValue = new PropertyValue(dataType, val);
}
operationProperties.put(propertyId, propertyValue);
});
return operationProperties;
Expand Down
2 changes: 1 addition & 1 deletion interactive_engine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<junit.jupiter.version>5.6.3</junit.jupiter.version>
<testng.version>6.9.9</testng.version>
<mockito.version>4.0.0</mockito.version>
<rocksdb.version>5.15.10</rocksdb.version>
<rocksdb.version>8.0.0</rocksdb.version>
<metrics.core.version>4.2.18</metrics.core.version>
<jgrapht.version>1.5.1</jgrapht.version>
<skip.tests>true</skip.tests>
Expand Down