[build][sql] Make pulsar-trino-disto self-contained

bin/pulsar

@@ -33,7 +33,6 @@ DEFAULT_PROXY_CONF=$PULSAR_HOME/conf/proxy.conf
 DEFAULT_STANDALONE_CONF=$PULSAR_HOME/conf/standalone.conf
 DEFAULT_WEBSOCKET_CONF=$PULSAR_HOME/conf/websocket.conf
 DEFAULT_LOG_CONF=$PULSAR_HOME/conf/log4j2.yaml
-DEFAULT_PULSAR_PRESTO_CONF=${PULSAR_HOME}/conf/presto
 DEFAULT_FUNCTIONS_LOG_CONF=$PULSAR_HOME/conf/functions_log4j2.xml
 
 # functions related variables
@@ -47,6 +46,7 @@ DEFAULT_FUNCTIONS_EXTRA_DEPS_DIR=$PULSAR_HOME/instances/deps
 FUNCTIONS_EXTRA_DEPS_DIR=${PULSAR_FUNCTIONS_EXTRA_DEPS_DIR:-"${DEFAULT_FUNCTIONS_EXTRA_DEPS_DIR}"}
 SQL_HOME=$PULSAR_HOME/pulsar-sql
 PRESTO_HOME=${PULSAR_HOME}/lib/presto
+DEFAULT_PULSAR_PRESTO_CONF=${PRESTO_HOME}/conf
 
 pulsar_help() {
     cat <<EOF
@@ -90,7 +90,7 @@ Environment variables:
    PULSAR_PROXY_CONF             Configuration file for Pulsar proxy (default: $DEFAULT_PROXY_CONF)
    PULSAR_WORKER_CONF            Configuration file for functions worker (default: $DEFAULT_WORKER_CONF)
    PULSAR_STANDALONE_CONF        Configuration file for standalone (default: $DEFAULT_STANDALONE_CONF)
-   PULSAR_PRESTO_CONF            Configuration directory for Pulsar Presto (default: $DEFAULT_PULSAR_PRESTO_CONF)
+   PULSAR_PRESTO_CONF            Configuration directory for Pulsar SQL (default: $DEFAULT_PULSAR_PRESTO_CONF)
    PULSAR_EXTRA_OPTS             Extra options to be passed to the jvm
    PULSAR_EXTRA_CLASSPATH        Add extra paths to the pulsar classpath
    PULSAR_PID_DIR                Folder where the pulsar server PID file should be stored
@@ -180,14 +180,14 @@ fi
 # find pulsar sql presto distribution location
 check_presto_libraries() {
     if [ ! -d "${PRESTO_HOME}" ]; then
-
         BUILT_PRESTO_HOME="${SQL_HOME}/presto-distribution/target/pulsar-presto-distribution"
         if [ ! -d "${BUILT_PRESTO_HOME}" ]; then
             echo "\nCouldn't find presto distribution.";
             echo "Make sure you've run 'mvn package'\n";
             exit 1;
         fi
         PRESTO_HOME=${BUILT_PRESTO_HOME}
+        PULSAR_PRESTO_CONF=${BUILT_PRESTO_HOME}/conf
     fi
 }
 

buildtools/src/main/resources/pulsar/checkstyle.xml

@@ -39,6 +39,9 @@ page at http://checkstyle.sourceforge.net/config.html -->
         <property name="max" value="120"/>
         <property name="severity" value="error"/>
 
+        <!-- Checks only for Java files. -->
+        <property name="fileExtensions" value="java"/>
+
         <!--
           The default ignore pattern exempts the following elements:
             - import statements

distribution/server/src/assemble/bin.xml

@@ -23,6 +23,7 @@
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
   <id>bin</id>
   <formats>
+    <format>dir</format>
     <format>tar.gz</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>

docker-compose/kitchen-sink/docker-compose.yml

@@ -368,7 +368,7 @@ services:
     image: apachepulsar/pulsar-all:latest
     restart: on-failure
     command: >
-      bash -c "bin/apply-config-from-env-with-prefix.py SQL_PREFIX_ conf/presto/catalog/pulsar.properties && \
+      bash -c "bin/apply-config-from-env-with-prefix.py SQL_PREFIX_ lib/presto/conf/catalog/pulsar.properties && \
                bin/apply-config-from-env.py conf/pulsar_env.sh && \
                bin/watch-znode.py -z $$zookeeperServers -p /initialized-$$clusterName -w && \
                exec bin/pulsar sql-worker run"

pulsar-sql/presto-distribution/src/assembly/assembly.xml

@@ -46,6 +46,10 @@
             <directory>${basedir}/../presto-pulsar-plugin/target/pulsar-presto-connector/</directory>
             <outputDirectory>plugin/</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${basedir}/src/main/resources/conf/</directory>
+            <outputDirectory>conf/</outputDirectory>
+        </fileSet>
     </fileSets>
     <dependencySets>
         <dependencySet>

tests/docker-images/latest-version-image/Dockerfile

@@ -89,7 +89,7 @@ COPY scripts/init-cluster.sh scripts/run-global-zk.sh scripts/run-local-zk.sh \
      scripts/run-standalone.sh \
      /pulsar/bin/
 
-COPY conf/presto/jvm.config /pulsar/conf/presto/
+COPY conf/presto/jvm.config /pulsar/lib/presto/conf
 
 # copy python test examples
 RUN mkdir -p /pulsar/instances/deps

tests/docker-images/latest-version-image/scripts/run-presto-worker.sh

@@ -18,7 +18,7 @@
 # under the License.
 #
 
-bin/apply-config-from-env-with-prefix.py SQL_PREFIX_ conf/presto/catalog/pulsar.properties && \
+bin/apply-config-from-env-with-prefix.py SQL_PREFIX_ lib/presto/conf/catalog/pulsar.properties && \
     bin/apply-config-from-env.py conf/pulsar_env.sh
 
 if [ -z "$NO_AUTOSTART" ]; then

tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java

@@ -435,7 +435,7 @@ private PrestoWorkerContainer buildPrestoWorkerContainer(String hostName, boolea
                 .withEnv("pulsar.web-service-url", "http://pulsar-broker-0:8080")
                 .withEnv("SQL_PREFIX_pulsar.max-message-size", "" + spec.maxMessageSize)
                 .withClasspathResourceMapping(
-                        resourcePath, "/pulsar/conf/presto/config.properties", BindMode.READ_WRITE);
+                        resourcePath, "/pulsar/lib/presto/conf/config.properties", BindMode.READ_WRITE);
         if (spec.queryLastMessage) {
             container.withEnv("pulsar.bookkeeper-use-v2-protocol", "false")
                     .withEnv("pulsar.bookkeeper-explicit-interval", "10");