Merge pull request #37 from KillrVideo/search_fix

fix Search + version + env variables + scripts to run locally

Author: clun

.travis.yml

@@ -10,7 +10,7 @@ services:
 # Build the app and a docker image
 script:
 - mvn clean install
-- docker build -t ${TRAVIS_COMMIT} --build-arg JAR_FILE=target/killrvideo-services-6.7.0.jar ./killrvideo-services
+- docker build -t ${TRAVIS_COMMIT} --build-arg JAR_FILE=target/killrvideo-services-3.0.0.jar ./killrvideo-services
 
 # If successful, see if we need to publish also
 after_success:
@@ -29,4 +29,4 @@ notifications:
   slack:
     rooms:
       secure: N6FrJ0l0gw2t1wnty/xPDKvLBZlzOAmkIbHjd4ZrtaC4vLU8iZP+YCRvQd7Vwzc97yDhHIZ41eGtjHjBIIeMX/3rfuS+6GA4VJgyNFGsP0f81YYHxiMOEUlVa2O6LBwbF3LokaFi3l7Iau1c5Op9c3LinhTdE0W6KG+2gxEqSKJkBcVJfK9SZGXg3+6qlq065BWx7xWlzoWgMFyipJJLW1BAqEzP5cc6hHozJ5H/8ucMaJbWQF+nOaIYUJdaop4ChSpe6EFyg0XNp+mIjJ2BxZ6hfYrAs69vwBapBepe4zEoR5xdN1dGUAIDqNY9rr4Npp8InFmBmnlL1xG6FeG73C2qfSr3Y2WziOtwececzmuQWI2Do9ioB5k0KtC4UAV42tpADUODrrwxE8S32tqgr0Pojg8FvgsM6O3twvF1UH3LLEyW7zDzuDpYdtvIROWZGerxyWqQIFI7MzragyL+ZiKKUOG1uKsA8DoeECcMHuUsDEsR/mHalmQGGl2ZNGpphAHg/1HtjB32VDCIuZpFHsqFG7BfMY2dg8Mm+ea4j9imOxM+2TFxbPhoIjIJq1o+/YvolrYviWgmQOpeFw0c1xXWSL5aXmBv2nUnlBaXxfzC9FTl0xmovJmKeYhqJ81TMa33gimsMeccZIDmzcMDsW82idsvtHeNDSX1wil5DXA=
-      
+      

docker-compose-kafka.yaml

@@ -1,102 +1,75 @@
 version: '3'
+
+#
+# docker-compose.yaml
+#   Simple compose file for running the Python services in Docker along with other containers comprising the
+#   KillrVideo.
+#   For more complex configuration options including metrics, external volumes, OpsCenter,
+#   etc., see https://github.com/KillrVideo/killrvideo-docker-common
+#
+#   Note: the default configuration here uses the LATEST version of the killrvideo-python
+#   Docker image, which can be built using scripts/docker_build.sh.
+#
+
 services:
 
-  # ---------------------------------- 
+  web: # Web Interface
+    image: killrvideo/killrvideo-web:3.0.1
+    ports:
+      - "3000:3000" # Exposes port to be available externally
+    depends_on:
+      - backend # Needs Backend to be running
+    environment:
+      KILLRVIDEO_LOGGING_LEVEL: debug # More logging
+
+  # Service implementation - use docker-compose-backend-external.yaml if running services in IDE
+  backend: # KillrVideo Backend 
+    image: killrvideo/killrvideo-java
+    ports:
+      - "50101:50101" # Exposes port to be available. Kompose tool needs that to create a k8s service and make backend available for other services.
+    depends_on:
+      - dse  # Needs DSE to be running
+    environment:
+      KILLRVIDEO_LOGGING_LEVEL: debug # More logging
+      KILLRVIDEO_DSE_CONTACT_POINTS: dse
+  
+  # Datastax Studio provides convenient web interface to work directly with DataStax Enterprise
+  studio:  
+    image: datastax/dse-studio:6.7.0
+    ports:
+      - "9091:9091" # Exposes port to be available externally
+    depends_on:
+      - dse # Needs DSE to be running
+    environment:
+      DS_LICENSE: accept
+
   # DataStax Enterprise Database
-  # ----------------------------------
   dse: 
-    image: datastax/dse-server:6.7.2
+    image: datastax/dse-server:6.7.4
     command: [ -s -g ] # Run with Search and Graph capabilities enabled
-    ports: # Exposes ports to be available. Kompose tool needs that to create a k8s service and make backend available for other services.
+    ports: # Exposes ports to be available.
       - "9042:9042" # Exposes DSE port
       - "8983:8983" # Exposes DSE Search port
       - "8182:8182" # Exposes DSE Graph port
     environment:
       DS_LICENSE: accept # Accept licence on start
-      DC: DC1
-      JVM_EXTRA_OPTS: -Xmx1g -Xms1g
-      NUM_TOKENS: 32
     cap_add:
       - IPC_LOCK # Allow DSE to lock memory with mlock
-    depends_on:
-    #  - opscenter  
     ulimits:
       memlock: -1
-  
-  # ----------------------------------     
-  # DataStax Studio
-  # ----------------------------------
-  studio:
-    image: datastax/dse-studio:6.7.0
-    ports:
-     - "9091:9091"
-    depends_on:
-     - dse
-    environment:
-      SERVICE_9091_NAME: studio
-      DS_LICENSE: accept
-    volumes:
-       - "/tmp/docker/studio-notebooks:/var/lib/datastax-studio"  
-   
-  # ----------------------------------
-  # OpsCenter
-  # ----------------------------------
-  #opscenter:
-  #  image: "datastax/dse-opscenter:6.7.0"
-  #  ports:
-  #    - 8888:8888
-  #  environment:
-  #    - DS_LICENSE=accept
-  
-  # ----------------------------------
-  # Killrvideo
-  # ----------------------------------
-  
-  # ----------------------------------
-  # Web Interface (No ETCD)
-  # ----------------------------------
-  web: 
-    image: killrvideo/killrvideo-web:3.0.0
-    ports:
-      - "3000:3000" # Exposes port to be available externally
-    depends_on:
-      - backend # Needs Backend to be running
-    environment:
-      KILLRVIDEO_LOGGING_LEVEL: debug # More logging
-    labels:
-      kompose.service.type: nodeport # Adds a label for Kompose to expose service externally
 
-  # ----------------------------------
-  # Backend exposing GRPC services
-  # ----------------------------------
-  backend:
-    # JAVA IMPLEMENTATION
-    image: killrvideo/killrvideo-java:latest
-    # Exposes port to be available. Kompose tool needs that to create a k8s service and make backend available for other services.
-    ports:
-      - "50101:50101" 
-    depends_on:
-      - dse 
-    environment:
-      KILLRVIDEO_LOGGING_LEVEL: debug
-      KILLRVIDEO_DSE_USERNAME: $KILLRVIDEO_DSE_USERNAME
-      KILLRVIDEO_DSE_PASSWORD: $KILLRVIDEO_DSE_PASSWORD
-      KILLRVIDEO_ENABLE_SSL: $KILLRVIDEO_ENABLE_SSL
-    volumes:
-      - "../../cassandra.cert:/usr/src/app/cassandra.cert"     
-
-  dse-config: # One-Time Bootstrap Container, configures DSE to have required keyspaces etc.
+  # One-Time Bootstrap Container, configures DSE to have required keyspaces etc.
+  dse-config: 
     image: killrvideo/killrvideo-dse-config:3.0.0
-    environment:
-      KILLRVIDEO_SERVICE_DISCOVERY_DISABLED: 'true' # Backward Compatibility Requirement
     depends_on:
       - dse # Needs DSE to be running
-    restart: on-failure # Kompose needs that to create dse-config as a pod, not a deployment. DSE-Config deployment is not needed as we run it only once.
 
-  generator:
-    image: killrvideo/killrvideo-generator:3.0.0
+  # Sample Data Generator, imitates behaviour of users on the killrVideo website. 
+  # Adds comments and rates videos, upload new videos and so on.
+  generator: 
+    image: killrvideo/killrvideo-generator:3.0.1
     depends_on:
-      - backend
+      - backend # Needs Backend to be running
     environment:
-      KILLRVIDEO_LOGGING_LEVEL: debug
-      
+      KILLRVIDEO_LOGGING_LEVEL: debug # More logging
+

docker-compose-old.yaml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.datastax</groupId>
 		<artifactId>killrvideo-parent</artifactId>
-		<version>6.7.0</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<dependencies>

docker-compose.yml

@@ -36,7 +36,7 @@ public interface MessagingDao {
      * @param t
      */
     default CompletableFuture<Object> sendErrorEvent(String serviceName, Throwable t) {
-        return sendEvent(getErrorDestination(), mapError(t));  
+        return sendEvent(getErrorDestination(), mapError(t)); 
     }
 
     /**

killrvideo-commons/pom.xml

@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>com.datastax</groupId>
 		<artifactId>killrvideo-parent</artifactId>
-		<version>6.7.0</version>
+		<version>3.0.0</version>
 	</parent>
 
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->

killrvideo-commons/src/main/java/com/killrvideo/messaging/dao/MessagingDao.java

@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>com.datastax</groupId>
 		<artifactId>killrvideo-parent</artifactId>
-		<version>6.7.0</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->

killrvideo-service-comments/pom.xml

@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>com.datastax</groupId>
 		<artifactId>killrvideo-parent</artifactId>
-		<version>6.7.0</version>
+		<version>3.0.0</version>
 	</parent>
 
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->

killrvideo-service-ratings/pom.xml

@@ -147,12 +147,14 @@ public ResultListPage<Video> searchVideos(String query, int fetchSize, Optional<
      * https://docs.datastax.com/en/dse/5.1/dse-dev/datastax_enterprise/search/cursorsDeepPaging.html#cursorsDeepPaging__srchCursorCQL
      */
     private BoundStatement createStatementToQuerySuggestions(String query, int fetchSize) {
-        
-        final StringBuilder solrQuery = new StringBuilder();
-        solrQuery.append("{\"q\":\"search_suggestions:");
-        solrQuery.append(query);
-        solrQuery.append("*\", \"paging\":\"driver\"}");
-
+        final StringBuilder solrQuery = new StringBuilder()
+                .append(pagingDriverStart)
+                .append("name:(").append(query).append("*) OR ")
+                .append("tags:(").append(query).append("*) OR ")
+                .append("description:(").append(query).append("*)")
+                .append(pagingDriverEnd);    
+       LOGGER.debug("getQuerySuggestions() solr_query is : {}", solrQuery.toString());
+      
         BoundStatement stmt = findSuggestedTags.bind().setString("solr_query", solrQuery.toString());
         stmt.setFetchSize(fetchSize);
         LOGGER.debug("getQuerySuggestions: {} with solr_query: {}", stmt.preparedStatement().getQueryString(), solrQuery);