Added docker build and push action

julien · julien · commit 7770b768e00c · 2022-02-14T22:51:13.000-08:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,3 +39,13 @@ jobs:
           name: test-reports
           path: |
             build/reports/aggregate-tests/
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build/Push Docker image
+        run: |
+          ./gradlew dockerPush -x test -S
diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+    id 'com.palantir.docker' apply false 
+}
+
 config {
 	info {
 		description = 'SQL interface for RediSearch'
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,20 +1,8 @@
 version: '3.6'
 services:
-  trino:
-    image: trinodb/trino
-    hostname: trino
-    container_name: trino
-    ports:
-      - "8080:8080"
-    networks:
-      - localnet
-    volumes:
-      - ../subprojects/trino-redisearch/build/distributions/trino-redisearch:/usr/lib/trino/plugin/redisearch
-      - ./redisearch.properties:/etc/trino/catalog/redisearch.properties
 
-  # Redis Modules
   redismod:
-    image: "redislabs/redismod"
+    image: redislabs/redismod
     hostname: redismod
     container_name: redismod
     networks:
@@ -23,6 +11,27 @@ services:
       - "6379:6379"
     restart: always
 
+  trino:
+    image: jruaux/trino-redisearch
+    hostname: trino
+    container_name: trino
+    ports:
+      - "8080:8080"
+    networks:
+      - localnet
+    depends_on:
+      - redismod
+    environment:
+      REDISEARCH_URI: 'redis://redismod:6379'
+    
+  riot-file:
+    image: jruaux/riot-file
+    networks:
+      - localnet
+    command: -h redismod import http://developer.redis.com/riot/beers.json hset --keyspace beer --keys id
+    depends_on:
+      - redismod
+
 networks:
   localnet:
     attachable: true
diff --git a/docker/redisearch.properties b/docker/redisearch.properties
diff --git a/docker/run.sh b/docker/run.sh
@@ -12,13 +12,6 @@ if lsof -Pi :8080 -sTCP:LISTEN -t >/dev/null ; then
 fi
 )
 
-echo "Building the Trino connector for RediSearch"
-(
-cd ..
-./gradlew clean build -x test
-unzip -j ./subprojects/trino-redisearch/build/distributions/trino-redisearch-*.zip -d ./subprojects/trino-redisearch/build/distributions/trino-redisearch
-)
-
 echo "Starting docker ."
 docker-compose up -d
 
@@ -39,8 +32,6 @@ trap clean_up EXIT
 
 sleep 1
 
-redis-cli FT.CREATE beers ON HASH PREFIX 1 beer: SCHEMA id TAG SORTABLE brewery_id TAG SORTABLE name TEXT SORTABLE abv NUMERIC SORTABLE descript TEXT style_name TAG SORTABLE cat_name TAG SORTABLE
-
-riot-file import http://developer.redis.com/riot/beers.json hset --keyspace beer --keys id
+docker-compose exec redismod /usr/local/bin/redis-cli FT.CREATE beers ON HASH PREFIX 1 beer: SCHEMA id TAG SORTABLE brewery_id TAG SORTABLE name TEXT SORTABLE abv NUMERIC SORTABLE descript TEXT style_name TAG SORTABLE cat_name TAG SORTABLE
 
 docker exec -it trino trino --catalog redisearch --schema default
diff --git a/gradle.properties b/gradle.properties
@@ -2,11 +2,12 @@ group=com.redis
 
 bootPluginVersion=2.6.1
 dependencyPluginVersion=1.0.11.RELEASE
+dockerPluginVersion=0.32.0
 kordampBuildVersion=2.6.0
 kordampPluginVersion=0.47.0
 
 lettucemodVersion=1.8.1
 testcontainersRedisVersion=1.4.6
 jredisearchVersion=2.2.0
-trinoVersion=367
+trinoVersion=370
 ulidVersion=4.1.2
diff --git a/settings.gradle b/settings.gradle
@@ -9,6 +9,7 @@ buildscript {
         classpath "org.kordamp.gradle:java-project-gradle-plugin:$kordampPluginVersion"
         classpath "org.springframework.boot:spring-boot-gradle-plugin:$bootPluginVersion"
         classpath "io.spring.gradle:dependency-management-plugin:$dependencyPluginVersion"
+        classpath "com.palantir.gradle.docker:gradle-docker:$dockerPluginVersion"
     }
 }
 
diff --git a/subprojects/trino-redisearch/src/main/docker/Dockerfile b/subprojects/trino-redisearch/src/main/docker/Dockerfile
@@ -0,0 +1,24 @@
+ARG TRINO_VERSION
+
+FROM trinodb/trino:${TRINO_VERSION}
+
+ARG BUILD_VERSION
+
+COPY setup/trino-redisearch-${BUILD_VERSION}.tar /tmp/trino-redisearch.tar
+
+USER root:root
+RUN \
+    yum -y -q install gettext && \
+    tar xvf /tmp/trino-redisearch.tar -C /tmp && \
+    mkdir /usr/lib/trino/plugin/redisearch && \
+    find /tmp/trino-redisearch-* -type f -exec mv -i {} /usr/lib/trino/plugin/redisearch \; && \
+    chown -R trino:trino /usr/lib/trino/plugin/redisearch
+
+COPY --chown=trino:trino setup/etc /etc/trino
+COPY setup/template setup/setup.sh /tmp/
+
+RUN chmod 0777 /tmp/setup.sh
+
+USER trino:trino
+
+CMD ["/tmp/setup.sh"]
diff --git a/subprojects/trino-redisearch/src/main/docker/setup/etc/catalog/redisearch.properties b/subprojects/trino-redisearch/src/main/docker/setup/etc/catalog/redisearch.properties
@@ -0,0 +1,2 @@
+connector.name=redisearch
+redisearch.uri=redis://docker.for.mac.host.internal:6379
diff --git a/subprojects/trino-redisearch/src/main/docker/setup/etc/config.properties b/subprojects/trino-redisearch/src/main/docker/setup/etc/config.properties
@@ -0,0 +1,5 @@
+#single node install config
+coordinator=true
+node-scheduler.include-coordinator=true
+http-server.http.port=8080
+discovery.uri=http://localhost:8080
diff --git a/subprojects/trino-redisearch/src/main/docker/setup/etc/jvm.config b/subprojects/trino-redisearch/src/main/docker/setup/etc/jvm.config
@@ -0,0 +1,14 @@
+-server
+-Xmx1G
+-XX:-UseBiasedLocking
+-XX:+UseG1GC
+-XX:G1HeapRegionSize=32M
+-XX:+ExplicitGCInvokesConcurrent
+-XX:+HeapDumpOnOutOfMemoryError
+-XX:+UseGCOverheadLimit
+-XX:+ExitOnOutOfMemoryError
+-XX:ReservedCodeCacheSize=256M
+-XX:PerMethodRecompilationCutoff=10000
+-XX:PerBytecodeRecompilationCutoff=10000
+-Djdk.attach.allowAttachSelf=true
+-Djdk.nio.maxCachedBufferSize=2000000
diff --git a/subprojects/trino-redisearch/src/main/docker/setup/etc/log.properties b/subprojects/trino-redisearch/src/main/docker/setup/etc/log.properties
@@ -0,0 +1,2 @@
+# Enable verbose logging from Trino
+#io.trino=DEBUG
diff --git a/subprojects/trino-redisearch/src/main/docker/setup/etc/node.properties b/subprojects/trino-redisearch/src/main/docker/setup/etc/node.properties
@@ -0,0 +1,2 @@
+node.environment=docker
+node.data-dir=/data/trino
diff --git a/subprojects/trino-redisearch/src/main/docker/setup/etc/redisearch/.gitkeep b/subprojects/trino-redisearch/src/main/docker/setup/etc/redisearch/.gitkeep
diff --git a/subprojects/trino-redisearch/src/main/docker/setup/setup.sh b/subprojects/trino-redisearch/src/main/docker/setup/setup.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -e
+
+REDISEARCH_ENVS=0
+if [ ! -z "${REDISEARCH_URI}" ] ; then
+  REDISEARCH_ENVS=1
+fi
+
+export REDISEARCH_URI=${REDISEARCH_URI:-redis://docker.for.mac.host.internal:6379}
+
+if [ -f /tmp/redisearch.properties.template ] && [ $REDISEARCH_ENVS -eq 1 ]; then
+  envsubst < /tmp/redisearch.properties.template > /etc/trino/catalog/redisearch.properties
+fi
+
+export TRINO_NODE_ID=$(uuidgen)
+echo "TRINO_NODE_ID=$TRINO_NODE_ID"
+envsubst < /tmp/trino.node.properties.template > /etc/trino/node.properties
+
+export TRINO_DISCOVERY_URI=${TRINO_DISCOVERY_URI:-http://localhost:8080}
+if [[ -z "${TRINO_NODE_TYPE}" ]]; then
+    echo "Configuring a single-node Trino cluster"
+elif [[ $TRINO_NODE_TYPE == "coordinator" ]]; then
+    echo "Configuring a coordinator Trino node"
+    envsubst < /tmp/coordinator.config.properties.template > /etc/trino/config.properties
+elif [[ $TRINO_NODE_TYPE == "worker" ]]; then
+    echo "Configuring a worker Trino node"
+    envsubst < /tmp/worker.config.properties.template > /etc/trino/config.properties
+else 
+    printf '%s\n' "Invalid TRINO_NODE_TYPE parameter: $TRINO_NODE_TYPE" >&2
+    exit 1
+fi
+
+chown -R trino:trino /etc/trino
+
+/usr/lib/trino/bin/run-trino
diff --git a/subprojects/trino-redisearch/src/main/docker/setup/template/coordinator.config.properties.template b/subprojects/trino-redisearch/src/main/docker/setup/template/coordinator.config.properties.template
@@ -0,0 +1,7 @@
+coordinator=true
+node-scheduler.include-coordinator=false
+http-server.http.port=8080
+query.max-memory=1GB
+query.max-memory-per-node=500MB
+query.max-total-memory-per-node=500MB
+discovery.uri=${TRINO_DISCOVERY_URI}
diff --git a/subprojects/trino-redisearch/src/main/docker/setup/template/redisearch.properties.template b/subprojects/trino-redisearch/src/main/docker/setup/template/redisearch.properties.template
@@ -0,0 +1,2 @@
+connector.name=redisearch
+redisearch.uri=${REDISEARCH_URI}
diff --git a/subprojects/trino-redisearch/src/main/docker/setup/template/trino.node.properties.template b/subprojects/trino-redisearch/src/main/docker/setup/template/trino.node.properties.template
@@ -0,0 +1,3 @@
+node.environment=docker
+node.data-dir=/data/trino
+node.id=${TRINO_NODE_ID}
diff --git a/subprojects/trino-redisearch/src/main/docker/setup/template/worker.config.properties.template b/subprojects/trino-redisearch/src/main/docker/setup/template/worker.config.properties.template
@@ -0,0 +1,6 @@
+coordinator=false
+http-server.http.port=8080
+query.max-memory=1GB
+query.max-memory-per-node=500MB
+query.max-total-memory-per-node=500MB
+discovery.uri=${TRINO_DISCOVERY_URI}
diff --git a/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchConnector.java b/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchConnector.java
@@ -51,7 +51,7 @@ public ConnectorMetadata getMetadata(ConnectorTransactionHandle transaction) {
 		checkTransaction(metadata, transaction);
 		return metadata;
 	}
-
+	
 	private void checkTransaction(Object object, ConnectorTransactionHandle transaction) {
 		checkArgument(object != null, "no such transaction: %s", transaction);
 	}
diff --git a/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchConnectorFactory.java b/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchConnectorFactory.java
@@ -11,7 +11,6 @@
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.ConnectorFactory;
-import io.trino.spi.connector.ConnectorHandleResolver;
 import io.trino.spi.type.TypeManager;
 
 public class RediSearchConnectorFactory implements ConnectorFactory {
@@ -21,11 +20,6 @@ public String getName() {
 		return "redisearch";
 	}
 
-	@Override
-	public ConnectorHandleResolver getHandleResolver() {
-		return new RediSearchHandleResolver();
-	}
-
 	@Override
 	public Connector create(String catalogName, Map<String, String> config, ConnectorContext context) {
 		requireNonNull(config, "config is null");
diff --git a/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchHandleResolver.java b/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchHandleResolver.java
diff --git a/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchMetadata.java b/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchMetadata.java
@@ -98,7 +98,7 @@ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSess
 				// table disappeared during listing operation
 			}
 		}
-		return columns.build();
+		return columns.buildOrThrow();
 	}
 
 	private List<SchemaTableName> listTables(ConnectorSession session, SchemaTablePrefix prefix) {
@@ -164,11 +164,6 @@ public ColumnMetadata getColumnMetadata(ConnectorSession session, ConnectorTable
 //		return Optional.empty();
 //	}
 
-	@Override
-	public boolean usesLegacyTableLayouts() {
-		return false;
-	}
-
 	@Override
 	public ConnectorTableProperties getTableProperties(ConnectorSession session, ConnectorTableHandle table) {
 		RediSearchTableHandle tableHandle = (RediSearchTableHandle) table;
diff --git a/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchPageSource.java b/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchPageSource.java
@@ -84,7 +84,7 @@ public boolean isFinished() {
 	}
 
 	@Override
-	public long getSystemMemoryUsage() {
+	public long getMemoryUsage() {
 		return 0L;
 	}
 
@@ -160,7 +160,7 @@ private void writeSlice(BlockBuilder output, Type type, String value) {
 		} else if (type instanceof CharType) {
 			type.writeSlice(output, truncateToLengthAndTrimSpaces(utf8Slice(value), ((CharType) type)));
 		} else if (type instanceof DecimalType) {
-			type.writeSlice(output, encodeScaledValue(new BigDecimal(value), ((DecimalType) type).getScale()));
+			type.writeObject(output, encodeScaledValue(new BigDecimal(value), ((DecimalType) type).getScale()));
 		} else if (isJsonType(type)) {
 			type.writeSlice(output, jsonParse(utf8Slice(value)));
 		} else {
diff --git a/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchSplit.java b/subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchSplit.java
diff --git a/subprojects/trino-redisearch/trino-redisearch.gradle b/subprojects/trino-redisearch/trino-redisearch.gradle

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ buildscript {`
`9`	`9`	`classpath "org.kordamp.gradle:java-project-gradle-plugin:$kordampPluginVersion"`
`10`	`10`	`classpath "org.springframework.boot:spring-boot-gradle-plugin:$bootPluginVersion"`
`11`	`11`	`classpath "io.spring.gradle:dependency-management-plugin:$dependencyPluginVersion"`
	`12`	`+ classpath "com.palantir.gradle.docker:gradle-docker:$dockerPluginVersion"`
`12`	`13`	`}`
`13`	`14`	`}`
`14`	`15`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+connector.name=redisearch`
	`2`	`+redisearch.uri=redis://docker.for.mac.host.internal:6379`