Version 2.0

.github/workflows/draft-release-notes-workflow.yml

@@ -16,6 +16,6 @@ jobs:
  with:
  config-name: draft-release-notes-config.yml
  tag: (None)
- version: 1.3.0.0
+ version: 2.0.0.0
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sql-odbc-release-workflow.yml

@@ -12,7 +12,7 @@ env:
  ODBC_BUILD_PATH: "./build/odbc/build"
  AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
  PLUGIN_NAME: opensearch-sql-odbc
- OD_VERSION: 1.3.0.0
+ OD_VERSION: 2.0.0.0
 
 jobs:
  build-mac:

.github/workflows/sql-odbc-rename-and-release-workflow.yml

@@ -8,7 +8,7 @@ on:
  - rename*
 
 env:
- OD_VERSION: 1.3.0.0
+ OD_VERSION: 2.0.0.0
 
 jobs:
  upload-odbc:

.github/workflows/sql-test-and-build-workflow.yml

@@ -3,14 +3,13 @@ name: SQL Java CI
 on: [push, pull_request]
 
 env:
- OPENSEARCH_VERSION: '1.3.0-SNAPSHOT'
+ OPENSEARCH_VERSION: '2.0.0-SNAPSHOT'
 
 jobs:
  build:
  strategy:
  matrix:
  java:
- - 8
  - 11
  - 14
  runs-on: ubuntu-latest

.github/workflows/sql-workbench-release-workflow.yml

@@ -7,8 +7,8 @@ on:
 
 env: 
  PLUGIN_NAME: query-workbench-dashboards
- OPENSEARCH_VERSION: '1.x'
- OPENSEARCH_PLUGIN_VERSION: 1.3.0.0
+ OPENSEARCH_VERSION: 'main'
+ OPENSEARCH_PLUGIN_VERSION: 2.0.0.0
 
 jobs:
 
@@ -38,7 +38,7 @@ jobs:
  - name: Setup Node
  uses: actions/setup-node@v1
  with:
- node-version: '10.24.1'
+ node-version: '14.18.2'
 
  - name: Move Workbench to Plugins Dir
  run: |

.github/workflows/sql-workbench-test-and-build-workflow.yml

@@ -4,8 +4,8 @@ on: [pull_request, push]
 
 env: 
  PLUGIN_NAME: query-workbench-dashboards
- OPENSEARCH_VERSION: '1.x'
- OPENSEARCH_PLUGIN_VERSION: 1.3.0.0
+ OPENSEARCH_VERSION: 'main'
+ OPENSEARCH_PLUGIN_VERSION: 2.0.0.0
 
 jobs:
 
@@ -27,7 +27,7 @@ jobs:
  - name: Setup Node
  uses: actions/setup-node@v1
  with:
- node-version: '10.24.1'
+ node-version: '14.18.2'
 
  - name: Move Workbench to Plugins Dir
  run: |

.gitignore

@@ -39,3 +39,4 @@ gen
 */.venv
 */__pycache__
 *.iml
+.DS_Store

bi-connectors/TableauConnector/opensearch_sql_jdbc/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 
-<connector-plugin class='opensearch_jdbc' superclass='jdbc' plugin-version='1.3.0.0' name='OpenSearch' version='18.1' min-version-tableau='2021.1'>
+<connector-plugin class='opensearch_jdbc' superclass='jdbc' plugin-version='2.0.0.0' name='OpenSearch' version='18.1' min-version-tableau='2021.1'>
  <vendor-information>
  <company name="OpenSearch Project"/>
  <support-link url="https:/opensearch-project/sql"/>

build.gradle

@@ -6,7 +6,7 @@
 
 buildscript {
  ext {
- opensearch_version = System.getProperty("opensearch.version", "1.3.0-SNAPSHOT")
+ opensearch_version = System.getProperty("opensearch.version", "2.0.0-SNAPSHOT")
  }
 
  repositories {

buildSrc/build.gradle

@@ -0,0 +1,12 @@
+apply plugin: 'groovy'
+apply plugin: 'java'
+
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ implementation gradleApi()
+ implementation localGroovy()
+}

buildSrc/src/main/groovy/com/wiredforcode/spawn/DefaultSpawnTask.groovy

@@ -0,0 +1,18 @@
+package com.wiredforcode.gradle.spawn
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Internal
+
+
+class DefaultSpawnTask extends DefaultTask {
+
+ @Internal
+ String pidLockFileName = '.pid.lock'
+ @Internal
+ String directory = '.'
+
+ @Internal
+ File getPidFile() {
+ return new File(directory, pidLockFileName)
+ }
+}

buildSrc/src/main/groovy/com/wiredforcode/spawn/KillProcessTask.groovy

@@ -0,0 +1,23 @@
+package com.wiredforcode.gradle.spawn
+
+import org.gradle.api.tasks.TaskAction
+
+class KillProcessTask extends DefaultSpawnTask {
+ @TaskAction
+ void kill() {
+ def pidFile = getPidFile()
+ if(!pidFile.exists()) {
+ logger.quiet "No server running!"
+ return
+ }
+
+ def pid = pidFile.text
+ def process = "kill $pid".execute()
+
+ try {
+ process.waitFor()
+ } finally {
+ pidFile.delete()
+ }
+ }
+}

buildSrc/src/main/groovy/com/wiredforcode/spawn/SpawnPlugin.groovy

@@ -0,0 +1,18 @@
+package com.wiredforcode.gradle.spawn
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+
+class SpawnPlugin implements Plugin<Project> {
+ @Override
+ void apply(Project project) {
+ project.with {
+ ext.SpawnProcessTask = SpawnProcessTask
+ ext.KillProcessTask = KillProcessTask
+
+ task('spawnProcess', type: SpawnProcessTask)
+ task('killProcess', type: KillProcessTask)
+ }
+ }
+}

buildSrc/src/main/groovy/com/wiredforcode/spawn/SpawnProcessTask.groovy

@@ -0,0 +1,103 @@
+package com.wiredforcode.gradle.spawn
+
+import org.gradle.api.GradleException
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.TaskAction
+
+class SpawnProcessTask extends DefaultSpawnTask {
+ @Input
+ String command
+ @Input
+ String ready
+ @Internal
+ List<Closure> outputActions = new ArrayList<Closure>()
+
+ @Input
+ Map<String, String> environmentVariables = new HashMap<String, String>()
+
+ void environmentVariable(String key, Object value) {
+ environmentVariables.put(key, String.valueOf(value))
+ }
+
+ SpawnProcessTask() {
+ description = "Spawn a new server process in the background."
+ }
+
+ void withOutput(Closure outputClosure) {
+ outputActions.add(outputClosure)
+ }
+
+ @TaskAction
+ void spawn() {
+ if (!(command && ready)) {
+ throw new GradleException("Ensure that mandatory fields command and ready are set.")
+ }
+
+ def pidFile = getPidFile()
+ if (pidFile.exists()) throw new GradleException("Server already running!")
+
+ def process = buildProcess(directory, command)
+ waitToProcessReadyOrClosed(process)
+ }
+
+ private void waitToProcessReadyOrClosed(Process process) {
+ boolean isReady = waitUntilIsReadyOrEnd(process)
+ if (isReady) {
+ stampLockFile(pidFile, process)
+ } else {
+ checkForAbnormalExit(process)
+ }
+ }
+
+ private void checkForAbnormalExit(Process process) {
+ try {
+ process.waitFor()
+ def exitValue = process.exitValue()
+ if (exitValue) {
+ throw new GradleException("The process terminated unexpectedly - status code ${exitValue}")
+ }
+ } catch (IllegalThreadStateException ignored) {
+ }
+ }
+
+ private boolean waitUntilIsReadyOrEnd(Process process) {
+ def line
+ def reader = new BufferedReader(new InputStreamReader(process.getInputStream()))
+ boolean isReady = false
+ while (!isReady && (line = reader.readLine()) != null) {
+ logger.quiet line
+ runOutputActions(line)
+ if (line.contains(ready)) {
+ logger.quiet "$command is ready."
+ isReady = true
+ }
+ }
+ isReady
+ }
+
+ def runOutputActions(String line) {
+ outputActions.each { Closure<String> outputAction ->
+ outputAction.call(line)
+ }
+ }
+
+ private Process buildProcess(String directory, String command) {
+ def builder = new ProcessBuilder(command.split(' '))
+ builder.redirectErrorStream(true)
+ builder.environment().putAll(environmentVariables)
+ builder.directory(new File(directory))
+ builder.start()
+ }
+
+ private File stampLockFile(File pidFile, Process process) {
+ pidFile << extractPidFromProcess(process)
+ }
+
+ private int extractPidFromProcess(Process process) {
+ def pidField = process.class.getDeclaredField('pid')
+ pidField.accessible = true
+
+ return pidField.getInt(process)
+ }
+}

buildSrc/src/main/resources/META-INF/gradle-plugins/com.wiredforcode.spawn.properties

@@ -0,0 +1 @@
+implementation-class=com.wiredforcode.gradle.spawn.SpawnPlugin

common/build.gradle

@@ -23,7 +23,7 @@
  */
 
 plugins {
- id 'java'
+ id 'java-library'
  id "io.freefair.lombok"
 }
 
@@ -32,9 +32,9 @@ repositories {
 }
 
 dependencies {
- compile "org.antlr:antlr4-runtime:4.7.1"
- compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
- compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
+ api "org.antlr:antlr4-runtime:4.7.1"
+ api group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
+ api group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
 
- testCompile group: 'junit', name: 'junit', version: '4.13.2'
+ testImplementation group: 'junit', name: 'junit', version: '4.13.2'
 }

core/build.gradle

@@ -23,7 +23,7 @@
  */
 
 plugins {
- id 'java'
+ id 'java-library'
  id "io.freefair.lombok"
  id 'jacoco'
 }
@@ -39,19 +39,19 @@ repositories {
 //}
 
 dependencies {
- compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
- compile group: 'org.springframework', name: 'spring-context', version: '5.2.19.RELEASE'
- compile group: 'org.springframework', name: 'spring-beans', version: '5.2.19.RELEASE'
- compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
- compile group: 'com.facebook.presto', name: 'presto-matching', version: '0.240'
- compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
- compile project(':common')
+ api group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
+ api group: 'org.springframework', name: 'spring-context', version: '5.2.19.RELEASE'
+ api group: 'org.springframework', name: 'spring-beans', version: '5.2.19.RELEASE'
+ api group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
+ api group: 'com.facebook.presto', name: 'presto-matching', version: '0.240'
+ api group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
+ api project(':common')
 
  testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
- testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
- testCompile group: 'org.springframework', name: 'spring-test', version: '5.2.19.RELEASE'
- testCompile group: 'org.mockito', name: 'mockito-core', version: '3.3.3'
- testCompile group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3'
+ testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
+ testImplementation group: 'org.springframework', name: 'spring-test', version: '5.2.19.RELEASE'
+ testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.3.3'
+ testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3'
 }
 
 test {

doctest/build.gradle

@@ -7,8 +7,8 @@ import java.util.concurrent.Callable
 import org.opensearch.gradle.testclusters.RunTask
 
 plugins {
- id "com.wiredforcode.spawn" version "0.8.2"
  id 'base'
+ id 'com.wiredforcode.spawn'
 }
 
 apply plugin: 'opensearch.testclusters'

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,7 @@
 # Copyright OpenSearch Contributors
 # SPDX-License-Identifier: Apache-2.0
-
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists