alexott commented on a change in pull request #3840: URL: https://github.com/apache/zeppelin/pull/3840#discussion_r449853488
########## File path: kotlin/interpreter/src/main/java/org/apache/zeppelin/kotlin/repl/ClassWriter.kt ########## @@ -0,0 +1,87 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.zeppelin.kotlin.repl + +import org.slf4j.LoggerFactory +import java.io.BufferedOutputStream +import java.io.FileOutputStream +import java.io.IOException +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths +import kotlin.script.experimental.api.SourceCode +import kotlin.script.experimental.jvm.impl.KJvmCompiledModuleInMemory +import kotlin.script.experimental.jvm.impl.KJvmCompiledScript + + +/** + * Kotlin REPL compiler generates compiled classes consisting of + * compiled in-memory module and some other classes. + * Spark may need saving them somewhere to send them to the executors, + * so this class provides writing classes on disk. + */ +class ClassWriter(_outputDir: String?) { + val outputDir: Path = if(_outputDir == null) { + val tempDir = Files.createTempDirectory("kotlin-jupyter") Review comment: should be `kotlin-zeppelin` ? ;-) ########## File path: kotlin/interpreter/pom.xml ########## @@ -0,0 +1,211 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <artifactId>kotlin-parent</artifactId> + <groupId>org.apache.zeppelin</groupId> + <version>0.9.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.zeppelin</groupId> + <artifactId>zeppelin-kotlin</artifactId> + <packaging>jar</packaging> + <version>0.9.0-SNAPSHOT</version> + <name>Zeppelin: Kotlin Interpreter</name> + <description>Zeppelin Kotlin Interpreter</description> + + <properties> + <interpreter.name>kotlin</interpreter.name> + </properties> + + <repositories> + <repository> + <id>KotlinDev</id> + <url>https://dl.bintray.com/kotlin/kotlin-dev</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>KotlinDev</id> + <url>https://dl.bintray.com/kotlin/kotlin-dev</url> + </pluginRepository> + </pluginRepositories> + + <dependencies> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-scripting-ide-services</artifactId> + <version>${kotlin.version}</version> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-common</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-compiler-embeddable</artifactId> + <version>${kotlin.version}</version> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-scripting-jvm</artifactId> + <version>${kotlin.version}</version> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-scripting-compiler-embeddable</artifactId> + <version>${kotlin.version}</version> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId> + <version>${kotlin.version}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.zeppelin</groupId> + <artifactId>zeppelin-kotlin-script-dependencies</artifactId> + <version>0.9.0-SNAPSHOT</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + <version>${kotlin.version}</version> + </dependency> + + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-reflect</artifactId> + <version>${kotlin.version}</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + +<!-- <dependency>--> +<!-- <groupId>org.slf4j</groupId>--> +<!-- <artifactId>log4j-over-slf4j</artifactId>--> +<!-- <version>1.7.7</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.slf4j</groupId>--> +<!-- <artifactId>slf4j-nop</artifactId>--> +<!-- <version>1.6.1</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.slf4j</groupId>--> +<!-- <artifactId>slf4j-api</artifactId>--> +<!-- <version>1.7.21</version>--> +<!-- </dependency>--> + + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>download-sources</id> + <goals> + <goal>sources</goal> + </goals> + <configuration> + </configuration> + </execution> + </executions> + </plugin> Review comment: do we really need this? ########## File path: kotlin/interpreter/pom.xml ########## @@ -0,0 +1,211 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <artifactId>kotlin-parent</artifactId> + <groupId>org.apache.zeppelin</groupId> + <version>0.9.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.zeppelin</groupId> + <artifactId>zeppelin-kotlin</artifactId> + <packaging>jar</packaging> + <version>0.9.0-SNAPSHOT</version> + <name>Zeppelin: Kotlin Interpreter</name> + <description>Zeppelin Kotlin Interpreter</description> + + <properties> + <interpreter.name>kotlin</interpreter.name> + </properties> + + <repositories> + <repository> + <id>KotlinDev</id> + <url>https://dl.bintray.com/kotlin/kotlin-dev</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>KotlinDev</id> + <url>https://dl.bintray.com/kotlin/kotlin-dev</url> + </pluginRepository> + </pluginRepositories> + + <dependencies> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-scripting-ide-services</artifactId> + <version>${kotlin.version}</version> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-common</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-compiler-embeddable</artifactId> + <version>${kotlin.version}</version> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-scripting-jvm</artifactId> + <version>${kotlin.version}</version> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-scripting-compiler-embeddable</artifactId> + <version>${kotlin.version}</version> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId> + <version>${kotlin.version}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.zeppelin</groupId> + <artifactId>zeppelin-kotlin-script-dependencies</artifactId> + <version>0.9.0-SNAPSHOT</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + <version>${kotlin.version}</version> + </dependency> + + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-reflect</artifactId> + <version>${kotlin.version}</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + +<!-- <dependency>--> +<!-- <groupId>org.slf4j</groupId>--> +<!-- <artifactId>log4j-over-slf4j</artifactId>--> +<!-- <version>1.7.7</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.slf4j</groupId>--> +<!-- <artifactId>slf4j-nop</artifactId>--> +<!-- <version>1.6.1</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.slf4j</groupId>--> +<!-- <artifactId>slf4j-api</artifactId>--> +<!-- <version>1.7.21</version>--> +<!-- </dependency>--> Review comment: better to remove... ########## File path: kotlin/interpreter/src/main/java/org/apache/zeppelin/kotlin/repl/ClassWriter.kt ########## @@ -0,0 +1,87 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.zeppelin.kotlin.repl + +import org.slf4j.LoggerFactory +import java.io.BufferedOutputStream +import java.io.FileOutputStream +import java.io.IOException +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths +import kotlin.script.experimental.api.SourceCode +import kotlin.script.experimental.jvm.impl.KJvmCompiledModuleInMemory +import kotlin.script.experimental.jvm.impl.KJvmCompiledScript + + +/** + * Kotlin REPL compiler generates compiled classes consisting of + * compiled in-memory module and some other classes. + * Spark may need saving them somewhere to send them to the executors, + * so this class provides writing classes on disk. + */ +class ClassWriter(_outputDir: String?) { + val outputDir: Path = if(_outputDir == null) { + val tempDir = Files.createTempDirectory("kotlin-jupyter") + tempDir.toFile().deleteOnExit() + tempDir.toAbsolutePath() + } else { + Paths.get(_outputDir) + } + + init { + logger.info("Created ClassWriter with path <$outputDir>") + } + + fun writeClasses(code: SourceCode, classes: KJvmCompiledScript) { + writeModuleInMemory(code, classes) + } + + private fun writeModuleInMemory(code: SourceCode, classes: KJvmCompiledScript) { + try { + val moduleInMemory = classes.getCompiledModule() as KJvmCompiledModuleInMemory + moduleInMemory.compilerOutputFiles.forEach { (name, bytes) -> + if (name.contains("class")) { + writeClass(bytes, outputDir.resolve(name)) + } + } + } catch (e: ClassCastException) { + logger.info("Compiled line " + code.name + " has no in-memory modules") + } catch (e: NullPointerException) { + logger.info("Compiled line " + code.name + " has no in-memory modules") + } + } + + private fun writeClass(classBytes: ByteArray, path: Path) { + try { + FileOutputStream(path.toAbsolutePath().toString()).use { fos -> Review comment: just `Files.newOutputStream(path)` ? https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#newOutputStream(java.nio.file.Path,%20java.nio.file.OpenOption...) ########## File path: kotlin/interpreter/src/main/java/org/apache/zeppelin/kotlin/repl/ClassWriter.kt ########## @@ -0,0 +1,87 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.zeppelin.kotlin.repl + +import org.slf4j.LoggerFactory +import java.io.BufferedOutputStream +import java.io.FileOutputStream +import java.io.IOException +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths +import kotlin.script.experimental.api.SourceCode +import kotlin.script.experimental.jvm.impl.KJvmCompiledModuleInMemory +import kotlin.script.experimental.jvm.impl.KJvmCompiledScript + + +/** + * Kotlin REPL compiler generates compiled classes consisting of + * compiled in-memory module and some other classes. + * Spark may need saving them somewhere to send them to the executors, + * so this class provides writing classes on disk. + */ +class ClassWriter(_outputDir: String?) { + val outputDir: Path = if(_outputDir == null) { + val tempDir = Files.createTempDirectory("kotlin-jupyter") + tempDir.toFile().deleteOnExit() + tempDir.toAbsolutePath() + } else { + Paths.get(_outputDir) + } + + init { + logger.info("Created ClassWriter with path <$outputDir>") + } + + fun writeClasses(code: SourceCode, classes: KJvmCompiledScript) { + writeModuleInMemory(code, classes) + } + + private fun writeModuleInMemory(code: SourceCode, classes: KJvmCompiledScript) { + try { + val moduleInMemory = classes.getCompiledModule() as KJvmCompiledModuleInMemory + moduleInMemory.compilerOutputFiles.forEach { (name, bytes) -> + if (name.contains("class")) { + writeClass(bytes, outputDir.resolve(name)) + } + } + } catch (e: ClassCastException) { + logger.info("Compiled line " + code.name + " has no in-memory modules") + } catch (e: NullPointerException) { + logger.info("Compiled line " + code.name + " has no in-memory modules") Review comment: better to use `{}` placeholder in the string, to avoid string joining... ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
