Use avatica-core 1.9.0-SNAPSHOT for dependency issues

lucene/default-nested-ivy-settings.xml

@@ -32,6 +32,7 @@
   <caches lockStrategy="${ivy.lock-strategy}" resolutionCacheDir="${ivy.resolution-cache.dir}" />
 
   <resolvers>
+    <ibiblio name="apache-snapshot" root="https://repository.apache.org/content/repositories/snapshots" m2compatible="true" />
     <ibiblio name="sonatype-releases" root="https://oss.sonatype.org/content/repositories/releases" m2compatible="true" />
     <ibiblio name="maven.restlet.org" root="http://maven.restlet.org" m2compatible="true" />
     <ibiblio name="releases.cloudera.com" root="http://repository.cloudera.com/content/repositories/releases" m2compatible="true" />
@@ -50,6 +51,7 @@
       <resolver ref="local"/>
       <!-- <resolver ref="local-maven-2" /> -->
       <resolver ref="main"/>
+      <resolver ref="apache-snapshot" />
       <resolver ref="maven.restlet.org" />
       <resolver ref="sonatype-releases" />
       <resolver ref="releases.cloudera.com"/>

lucene/ivy-versions.properties

@@ -34,7 +34,7 @@ com.google.inject.guice.version = 3.0
 /com.google.inject.extensions/guice-servlet = ${com.google.inject.guice.version}
 /com.google.inject/guice = ${com.google.inject.guice.version}
 
-/com.google.protobuf/protobuf-java = 2.5.0
+/com.google.protobuf/protobuf-java = 3.1.0
 /com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
 /com.googlecode.mp4parser/isoparser = 1.1.18
 /com.healthmarketscience.jackcess/jackcess = 2.1.3
@@ -88,6 +88,7 @@ io.netty.netty-all.version = 4.0.36.Final
 /mecab/mecab-ipadic = 2.7.0-20070801
 /mecab/mecab-naist-jdic = 0.6.3b-20111013
 /net.arnx/jsonic = 1.2.7
+/net.hydromatic/eigenbase-properties = 1.1.5
 /net.sf.ehcache/ehcache-core = 2.4.4
 /net.sf.saxon/Saxon-HE = 9.6.0-2
 /net.sourceforge.argparse4j/argparse4j = 0.4.3
@@ -99,8 +100,8 @@ io.netty.netty-all.version = 4.0.36.Final
 /org.apache.avro/avro = 1.7.5
 
 org.apache.calcite.version = 1.10.0
-org.apache.calcite.avatica.version = 1.8.0
-/org.apache.calcite.avatica/avatica = ${org.apache.calcite.avatica.version}
+org.apache.calcite.avatica.version = 1.9.0-SNAPSHOT
+/org.apache.calcite.avatica/avatica-core = ${org.apache.calcite.avatica.version}
 /org.apache.calcite/calcite-core = ${org.apache.calcite.version}
 /org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}
 
@@ -241,6 +242,10 @@ org.codehaus.jackson.version = 1.9.13
 /org.codehaus.jackson/jackson-jaxrs = ${org.codehaus.jackson.version}
 /org.codehaus.jackson/jackson-mapper-asl = ${org.codehaus.jackson.version}
 
+org.codehaus.janino.version = 2.7.6
+/org.codehaus.janino/janino = ${org.codehaus.janino.version}
+/org.codehaus.janino/commons-compiler = ${org.codehaus.janino.version}
+
 /org.codehaus.woodstox/stax2-api = 3.1.4
 /org.codehaus.woodstox/woodstox-core-asl = 4.4.1
 /org.easymock/easymock = 3.0

solr/core/ivy.xml

@@ -58,8 +58,8 @@
     <dependency org="org.mockito" name="mockito-core" rev="${/org.mockito/mockito-core}" conf="test"/>
 
     <dependency org="com.fasterxml.jackson.core" name="jackson-core" rev="${/com.fasterxml.jackson.core/jackson-core}" conf="compile"/>
-    <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="${/com.fasterxml.jackson.core/jackson-databind}" conf="test"/>
-    <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="${/com.fasterxml.jackson.core/jackson-annotations}" conf="test"/>
+    <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="${/com.fasterxml.jackson.core/jackson-databind}" conf="compile"/>
+    <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="${/com.fasterxml.jackson.core/jackson-annotations}" conf="compile"/>
     <dependency org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" rev="${/com.fasterxml.jackson.dataformat/jackson-dataformat-smile}" conf="compile"/>
 
 
@@ -142,12 +142,13 @@
     <dependency org="com.tdunning" name="t-digest" rev="${/com.tdunning/t-digest}" conf="compile->*"/>
 
     <!-- SQL Parser -->
-    <dependency org="org.apache.calcite" name="calcite-core" rev="${/org.apache.calcite/calcite-core}"/>
-    <dependency org="org.apache.calcite" name="calcite-linq4j" rev="${/org.apache.calcite/calcite-linq4j}"/>
-    <dependency org="org.apache.calcite.avatica" name="avatica" rev="${/org.apache.calcite.avatica/avatica}"/>
-    <dependency org="net.hydromatic" name="eigenbase-properties" rev="1.1.5"/>
-    <dependency org="org.codehaus.janino" name="janino" rev="2.7.6"/>
-    <dependency org="org.codehaus.janino" name="commons-compiler" rev="2.7.6"/>
+    <dependency org="org.apache.calcite" name="calcite-core" rev="${/org.apache.calcite/calcite-core}" conf="compile"/>
+    <dependency org="org.apache.calcite" name="calcite-linq4j" rev="${/org.apache.calcite/calcite-linq4j}" conf="compile"/>
+    <dependency org="org.apache.calcite.avatica" name="avatica-core" rev="${/org.apache.calcite.avatica/avatica-core}" conf="compile"/>
+    <dependency org="net.hydromatic" name="eigenbase-properties" rev="${/net.hydromatic/eigenbase-properties}" conf="compile"/>
+    <dependency org="org.codehaus.janino" name="janino" rev="${/org.codehaus.janino/janino}" conf="compile"/>
+    <dependency org="org.codehaus.janino" name="commons-compiler" rev="${/org.codehaus.janino/commons-compiler}" conf="compile"/>
+    <dependency org="com.google.protobuf" name="protobuf-java" rev="${/com.google.protobuf/protobuf-java}" conf="compile"/>
 
     <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
   </dependencies>

solr/core/src/java/org/apache/calcite/config/CalciteConnectionProperty.java

@@ -0,0 +1,182 @@
+/*
+ * 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.calcite.config;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.calcite.avatica.ConnectionProperty;
+import org.apache.calcite.avatica.util.Casing;
+import org.apache.calcite.avatica.util.Quoting;
+import org.apache.calcite.model.JsonSchema;
+import org.apache.calcite.sql.validate.SqlConformance;
+
+import static org.apache.calcite.avatica.ConnectionConfigImpl.PropEnv;
+import static org.apache.calcite.avatica.ConnectionConfigImpl.parse;
+
+/**
+ * Properties that may be specified on the JDBC connect string.
+ */
+public enum CalciteConnectionProperty implements ConnectionProperty {
+  /** Whether to store query results in temporary tables. */
+  AUTO_TEMP("autoTemp", Type.BOOLEAN, false, false),
+
+  /** Whether Calcite should use materializations. */
+  MATERIALIZATIONS_ENABLED("materializationsEnabled", Type.BOOLEAN, true,
+      false),
+
+  /** Whether Calcite should create materializations. */
+  CREATE_MATERIALIZATIONS("createMaterializations", Type.BOOLEAN, true, false),
+
+  /** How NULL values should be sorted if neither NULLS FIRST nor NULLS LAST are
+   * specified. The default, HIGH, sorts NULL values the same as Oracle. */
+  DEFAULT_NULL_COLLATION("defaultNullCollation", Type.ENUM, NullCollation.HIGH, NullCollation.class,
+      true),
+
+  /** How many rows the Druid adapter should fetch at a time when executing
+   * "select" queries. */
+  DRUID_FETCH("druidFetch", Type.NUMBER, 16384, false),
+
+  /** URI of the model. */
+  MODEL("model", Type.STRING, null, false),
+
+  /** Lexical policy. */
+  LEX("lex", Type.ENUM, Lex.ORACLE, Lex.class, false),
+
+  /** Collection of built-in functions and operators. Valid values include
+   * "standard" and "oracle". */
+  FUN("fun", Type.STRING, "standard", true),
+
+  /** How identifiers are quoted.
+   *  If not specified, value from {@link #LEX} is used. */
+  QUOTING("quoting", Type.ENUM, null, Quoting.class, false),
+
+  /** How identifiers are stored if they are quoted.
+   *  If not specified, value from {@link #LEX} is used. */
+  QUOTED_CASING("quotedCasing", Type.ENUM, null, Casing.class, false),
+
+  /** How identifiers are stored if they are not quoted.
+   *  If not specified, value from {@link #LEX} is used. */
+  UNQUOTED_CASING("unquotedCasing", Type.ENUM, null, Casing.class, false),
+
+  /** Whether identifiers are matched case-sensitively.
+   *  If not specified, value from {@link #LEX} is used. */
+  CASE_SENSITIVE("caseSensitive", Type.BOOLEAN, null, false),
+
+  /** Name of initial schema. */
+  SCHEMA("schema", Type.STRING, null, false),
+
+  /** Schema factory.
+   *
+   * <p>The name of a class that implements
+   * {@link org.apache.calcite.schema.SchemaFactory}.
+   *
+   * <p>Ignored if {@link #MODEL} is specified. */
+  SCHEMA_FACTORY("schemaFactory", Type.PLUGIN, null, false),
+
+  /** Schema type.
+   *
+   * <p>Value may be null, "MAP", "JDBC", or "CUSTOM"
+   * (implicit if {@link #SCHEMA_FACTORY} is specified).
+   * The value "NONE" is converted to null.
+   *
+   * <p>Ignored if {@link #MODEL} is specified. */
+  SCHEMA_TYPE("schemaType", Type.ENUM, JsonSchema.Type.NONE, JsonSchema.Type.class, false),
+
+  /** Specifies whether Spark should be used as the engine for processing that
+   * cannot be pushed to the source system. If false (the default), Calcite
+   * generates code that implements the Enumerable interface. */
+  SPARK("spark", Type.BOOLEAN, false, false),
+
+  /** Time zone, for example 'gmt-3'. Default is the JVM's time zone. */
+  TIME_ZONE("timeZone", Type.STRING, null, false),
+
+  /** If the planner should try de-correlating as much as it is possible.
+   * If true (the default), Calcite de-correlates the plan. */
+  FORCE_DECORRELATE("forceDecorrelate", Type.BOOLEAN, true, false),
+
+  /** Type system. The name of a class that implements
+   * {@link org.apache.calcite.rel.type.RelDataTypeSystem} and has a public
+   * default constructor or an {@code INSTANCE} constant. */
+  TYPE_SYSTEM("typeSystem", Type.PLUGIN, null, false),
+
+  /** SQL conformance level. */
+  CONFORMANCE("conformance", Type.ENUM, SqlConformance.DEFAULT, SqlConformance.class, false);
+
+  private final String camelName;
+  private final Type type;
+  private final Object defaultValue;
+  private final Class valueClass;
+  private final boolean required;
+
+  private static final Map<String, CalciteConnectionProperty> NAME_TO_PROPS;
+
+  /** Deprecated; use {@link #TIME_ZONE}. */
+  @Deprecated // to be removed before 2.0
+  public static final CalciteConnectionProperty TIMEZONE = TIME_ZONE;
+
+  static {
+    NAME_TO_PROPS = new HashMap<>();
+    for (CalciteConnectionProperty p : CalciteConnectionProperty.values()) {
+      NAME_TO_PROPS.put(p.camelName.toUpperCase(), p);
+      NAME_TO_PROPS.put(p.name(), p);
+    }
+  }
+
+  CalciteConnectionProperty(String camelName, Type type, Object defaultValue,
+                            boolean required) {
+    this(camelName, type, defaultValue, type.defaultValueClass(), required);
+  }
+
+  CalciteConnectionProperty(String camelName, Type type, Object defaultValue,
+                            Class valueClass, boolean required) {
+    this.camelName = camelName;
+    this.type = type;
+    this.defaultValue = defaultValue;
+    this.valueClass = valueClass;
+    this.required = required;
+    assert defaultValue == null || type.valid(defaultValue, valueClass);
+  }
+
+  public String camelName() {
+    return camelName;
+  }
+
+  public Object defaultValue() {
+    return defaultValue;
+  }
+
+  public Type type() {
+    return type;
+  }
+
+  public boolean required() {
+    return required;
+  }
+
+  public Class valueClass() {
+    return valueClass;
+  }
+
+  public PropEnv wrap(Properties properties) {
+    return new PropEnv(parse(properties, NAME_TO_PROPS), this);
+  }
+
+}
+
+// End CalciteConnectionProperty.java

solr/licenses/avatica-1.8.0.jar.sha1

@@ -1 +0,0 @@
-8e1ae87c3ff634d0ebeeae69bb715471f433381e

solr/licenses/avatica-core-1.9.0-SNAPSHOT.jar.sha1

@@ -0,0 +1 @@
+bbddcaa253f82976cde4f7db115731e96a05c00a

solr/licenses/protobuf-java-2.5.0.jar.sha1

@@ -1 +0,0 @@
-a10732c76bfacdbd633a7eb0f7968b1059a65dfa

solr/licenses/protobuf-java-3.1.0.jar.sha1

@@ -0,0 +1 @@
+e13484d9da178399d32d2d27ee21a77cfb4b7873