change distribution target for assemblies

YANG-DB · Oct 15, 2019 · 06b3590 · 06b3590
1 parent aae180e
commit 06b3590
Show file tree

Hide file tree

Showing 24 changed files with 276 additions and 342 deletions.
diff --git a/.env b/.env
@@ -0,0 +1,7 @@
+##Yang-DB image name
+TAG=latest
+
+ELASTICSEARCH_EMBEDDED=true
+ELASTICSEARCH_HOST=localhost
+ELASTICSEARCH_PORT=9300
+ELASTICSEARCH_CLUSTER_NAME=knowledge
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,7 +12,7 @@ Please note we have a code of conduct, please follow it in all your interactions
 2. Update the README.md with details of changes to the interface, this includes new environment 
    variables, exposed ports, useful file locations and container parameters.
 3. Increase the version numbers in any examples files and the README.md to the new version that this
-   Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
+   Pull Request would represent.
 4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you 
    do not have permission to do that, you may request the second reviewer to merge it for you.
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,12 +2,9 @@ version: '3.3'
 
 services:
   fuse:
-    image: yangdb/yang.db:latest
+    image: yangdb/yang.db:${TAG}
     ports:
       - 8888:8888
-    environment:
-      - "ELASTICSEARCH_HOST=es"
-      - "ELASTICSEARCH_CLUSTER_NAME=Knowledge"
     networks:
       - network
   es:

diff --git a/...ragons-test/src/test/java/com/yangdb/fuse/services/engine2/data/schema/TestRawSchema.java b/...ragons-test/src/test/java/com/yangdb/fuse/services/engine2/data/schema/TestRawSchema.java
@@ -25,6 +25,11 @@ public String getPrefix(String type) {
         return "";
     }
 
+    @Override
+    public String getIdPrefix(String type) {
+        return "";
+    }
+
     @Override
     public List<IndexPartitions.Partition> getPartitions(String type) {
         return Collections.emptyList();

diff --git a/...resources/assembly/Knowledge/config/application.test.engine3.m1.dfs.knowledge.public.conf b/...resources/assembly/Knowledge/config/application.test.engine3.m1.dfs.knowledge.public.conf
@@ -42,6 +42,7 @@ unipop.bulk.start = 1000
 unipop.bulk.multiplier = 1
 
 assembly = Knowledge
+
 Knowledge.physical_raw_schema = com.yangdb.fuse.assembly.knowledge.KnowledgeRawSchemaShort
 Knowledge.physical_schema_data_loader = com.yangdb.fuse.assembly.knowledge.KnowledgeDataLoader
 Knowledge.search_order_provider = com.yangdb.fuse.assembly.knowledge.KnowledgeSearchOrderProvider
@@ -59,4 +60,8 @@ Knowledge.cursor_factory = com.yangdb.fuse.assembly.knowledge.cursor.KnowledgeTr
 fuse.node_status_reporter = com.yangdb.fuse.executor.resource.PersistantNodeStatusResource
 fuse.plan_traversal_translator_class = com.yangdb.fuse.gta.translation.discrete.M1PlanTraversalTranslator
 fuse.ontology_provider_dir = ontology
-fuse.cursor.timeout = 1800000
+fuse.cursor.timeout = 1800000
+
+fuse.id_bulk=10000000
+fuse.id_format="%08d"
+fuse.indices_count=10
diff --git a/...urces/assembly/Knowledge/config/application.test.engine3mock.m1.dfs.knowledge.public.conf b/...urces/assembly/Knowledge/config/application.test.engine3mock.m1.dfs.knowledge.public.conf
@@ -56,6 +56,9 @@ fuse.ontology_provider_dir = ontology
 fuse.elasticsearch.mock = true
 fuse.cursor.timeout = 18000
 
+fuse.id_bulk=10000000
+fuse.id_format="%08d"
+fuse.indices_count=10
 
 
 

diff --git a/...in-knowledge-ext/src/main/java/com/yangdb/fuse/assembly/knowledge/KnowledgeRawSchema.java b/...in-knowledge-ext/src/main/java/com/yangdb/fuse/assembly/knowledge/KnowledgeRawSchema.java
diff --git a/...nowledge-ext/src/main/java/com/yangdb/fuse/assembly/knowledge/KnowledgeRawSchemaProd.java b/...nowledge-ext/src/main/java/com/yangdb/fuse/assembly/knowledge/KnowledgeRawSchemaProd.java