Skip to content

Commit 06b3590

Browse files
committed
change distribution target for assemblies
1 parent aae180e commit 06b3590

File tree

24 files changed

+276
-342
lines changed

24 files changed

+276
-342
lines changed

.env

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
##Yang-DB image name
2+
TAG=latest
3+
4+
ELASTICSEARCH_EMBEDDED=true
5+
ELASTICSEARCH_HOST=localhost
6+
ELASTICSEARCH_PORT=9300
7+
ELASTICSEARCH_CLUSTER_NAME=knowledge

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Please note we have a code of conduct, please follow it in all your interactions
1212
2. Update the README.md with details of changes to the interface, this includes new environment
1313
variables, exposed ports, useful file locations and container parameters.
1414
3. Increase the version numbers in any examples files and the README.md to the new version that this
15-
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
15+
Pull Request would represent.
1616
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
1717
do not have permission to do that, you may request the second reviewer to merge it for you.
1818

docker-compose.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@ version: '3.3'
22

33
services:
44
fuse:
5-
image: yangdb/yang.db:latest
5+
image: yangdb/yang.db:${TAG}
66
ports:
77
- 8888:8888
8-
environment:
9-
- "ELASTICSEARCH_HOST=es"
10-
- "ELASTICSEARCH_CLUSTER_NAME=Knowledge"
118
networks:
129
- network
1310
es:

fuse-domain/fuse-domain-dragons/fuse-domain-dragons-test/src/test/java/com/yangdb/fuse/services/engine2/data/schema/TestRawSchema.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ public String getPrefix(String type) {
2525
return "";
2626
}
2727

28+
@Override
29+
public String getIdPrefix(String type) {
30+
return "";
31+
}
32+
2833
@Override
2934
public List<IndexPartitions.Partition> getPartitions(String type) {
3035
return Collections.emptyList();

fuse-domain/fuse-domain-knowledge/fuse-domain-knowledge-assembly/resources/assembly/Knowledge/config/application.test.engine3.m1.dfs.knowledge.public.conf

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ unipop.bulk.start = 1000
4242
unipop.bulk.multiplier = 1
4343

4444
assembly = Knowledge
45+
4546
Knowledge.physical_raw_schema = com.yangdb.fuse.assembly.knowledge.KnowledgeRawSchemaShort
4647
Knowledge.physical_schema_data_loader = com.yangdb.fuse.assembly.knowledge.KnowledgeDataLoader
4748
Knowledge.search_order_provider = com.yangdb.fuse.assembly.knowledge.KnowledgeSearchOrderProvider
@@ -59,4 +60,8 @@ Knowledge.cursor_factory = com.yangdb.fuse.assembly.knowledge.cursor.KnowledgeTr
5960
fuse.node_status_reporter = com.yangdb.fuse.executor.resource.PersistantNodeStatusResource
6061
fuse.plan_traversal_translator_class = com.yangdb.fuse.gta.translation.discrete.M1PlanTraversalTranslator
6162
fuse.ontology_provider_dir = ontology
62-
fuse.cursor.timeout = 1800000
63+
fuse.cursor.timeout = 1800000
64+
65+
fuse.id_bulk=10000000
66+
fuse.id_format="%08d"
67+
fuse.indices_count=10

fuse-domain/fuse-domain-knowledge/fuse-domain-knowledge-assembly/resources/assembly/Knowledge/config/application.test.engine3mock.m1.dfs.knowledge.public.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ fuse.ontology_provider_dir = ontology
5656
fuse.elasticsearch.mock = true
5757
fuse.cursor.timeout = 18000
5858

59+
fuse.id_bulk=10000000
60+
fuse.id_format="%08d"
61+
fuse.indices_count=10
5962

6063

6164

fuse-domain/fuse-domain-knowledge/fuse-domain-knowledge-ext/src/main/java/com/yangdb/fuse/assembly/knowledge/KnowledgeRawSchema.java

Lines changed: 0 additions & 140 deletions
This file was deleted.

fuse-domain/fuse-domain-knowledge/fuse-domain-knowledge-ext/src/main/java/com/yangdb/fuse/assembly/knowledge/KnowledgeRawSchemaProd.java

Lines changed: 0 additions & 141 deletions
This file was deleted.

0 commit comments

Comments
 (0)