[CALCITE-2905] @packagemaker is no longer needed

hlld3344 · Nov 19, 2019 · c7c8ab1 · c7c8ab1
1 parent f2b437a
commit c7c8ab1
Show file tree

Hide file tree

Showing 87 changed files with 0 additions and 259 deletions.
diff --git a/babel/src/main/java/org/apache/calcite/sql/babel/package-info.java b/babel/src/main/java/org/apache/calcite/sql/babel/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Parse tree for SQL extensions used by the Babel parser.
  */
-@PackageMarker
 package org.apache.calcite.sql.babel;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/package-info.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/package-info.java
@@ -20,9 +20,6 @@
  *
  * <p>There is one table for each Cassandra column family.</p>
  */
-@PackageMarker
 package org.apache.calcite.adapter.cassandra;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/clone/package-info.java b/core/src/main/java/org/apache/calcite/adapter/clone/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Provides utility classes.
  */
-@PackageMarker
 package org.apache.calcite.adapter.clone;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/package-info.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Calcite-specific classes for implementation of regular and window aggregates.
  */
-@PackageMarker
 package org.apache.calcite.adapter.enumerable.impl;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/package-info.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Query optimizer rules for Java calling convention.
  */
-@PackageMarker
 package org.apache.calcite.adapter.enumerable;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/java/package-info.java b/core/src/main/java/org/apache/calcite/adapter/java/package-info.java
@@ -19,9 +19,6 @@
  * Query provider based on Java in-memory data
  * structures.
  */
-@PackageMarker
 package org.apache.calcite.adapter.java;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Query provider based on a JDBC data source.
  */
-@PackageMarker
 package org.apache.calcite.adapter.jdbc;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/adapter/package-info.java b/core/src/main/java/org/apache/calcite/adapter/package-info.java
@@ -37,9 +37,6 @@
  * </pre>
  * </blockquote>
  */
-@PackageMarker
 package org.apache.calcite.adapter;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/config/package-info.java b/core/src/main/java/org/apache/calcite/config/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Configuration.
  */
-@PackageMarker
 package org.apache.calcite.config;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/interpreter/package-info.java b/core/src/main/java/org/apache/calcite/interpreter/package-info.java
@@ -22,9 +22,6 @@
  * preparation time is less, and so the total prepare + execute time is
  * competitive for queries over small data sets.
  */
-@PackageMarker
 package org.apache.calcite.interpreter;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/jdbc/package-info.java b/core/src/main/java/org/apache/calcite/jdbc/package-info.java
@@ -18,9 +18,6 @@
 /**
  * JDBC driver for Calcite.
  */
-@PackageMarker
 package org.apache.calcite.jdbc;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/materialize/package-info.java b/core/src/main/java/org/apache/calcite/materialize/package-info.java
@@ -32,9 +32,6 @@
  * instantiating materializations from the intermediate results of queries, and
  * recognize what materializations would be useful based on actual query load.
  */
-@PackageMarker
 package org.apache.calcite.materialize;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/model/package-info.java b/core/src/main/java/org/apache/calcite/model/package-info.java
@@ -33,9 +33,6 @@
  * <p>There are several examples of schemas in the
  * <a href="https://calcite.apache.org/docs/tutorial.html">tutorial</a>.
  */
-@PackageMarker
 package org.apache.calcite.model;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/package-info.java b/core/src/main/java/org/apache/calcite/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Main package for Calcite, the dynamic data management platform.
  */
-@PackageMarker
 package org.apache.calcite;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/plan/hep/package-info.java b/core/src/main/java/org/apache/calcite/plan/hep/package-info.java
@@ -19,9 +19,6 @@
  * Provides a heuristic planner implementation for the interfaces in
  * {@link org.apache.calcite.plan}.
  */
-@PackageMarker
 package org.apache.calcite.plan.hep;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/plan/package-info.java b/core/src/main/java/org/apache/calcite/plan/package-info.java
@@ -19,9 +19,6 @@
  * Defines interfaces for constructing rule-based optimizers of
  * relational expressions.
  */
-@PackageMarker
 package org.apache.calcite.plan;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/package-info.java b/core/src/main/java/org/apache/calcite/plan/volcano/package-info.java
@@ -268,9 +268,6 @@
  *     McKenna
  *     (1993)</a>.</p>
  */
-@PackageMarker
 package org.apache.calcite.plan.volcano;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/prepare/package-info.java b/core/src/main/java/org/apache/calcite/prepare/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Preparation of queries (parsing, planning and implementation).
  */
-@PackageMarker
 package org.apache.calcite.prepare;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/profile/package-info.java b/core/src/main/java/org/apache/calcite/profile/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Utilities to analyze data sets.
  */
-@PackageMarker
 package org.apache.calcite.profile;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/convert/package-info.java b/core/src/main/java/org/apache/calcite/rel/convert/package-info.java
@@ -19,9 +19,6 @@
  * Defines relational expressions and rules for converting between calling
  * conventions.
  */
-@PackageMarker
 package org.apache.calcite.rel.convert;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/core/package-info.java b/core/src/main/java/org/apache/calcite/rel/core/package-info.java
@@ -31,9 +31,6 @@
  *
  * </ul>
  */
-@PackageMarker
 package org.apache.calcite.rel.core;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/externalize/package-info.java b/core/src/main/java/org/apache/calcite/rel/externalize/package-info.java
@@ -19,9 +19,6 @@
  * Facilities to externalize {@link org.apache.calcite.rel.RelNode}s to and from
  * XML and JSON format.
  */
-@PackageMarker
 package org.apache.calcite.rel.externalize;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/hint/package-info.java b/core/src/main/java/org/apache/calcite/rel/hint/package-info.java
@@ -89,9 +89,6 @@
  * <h2>Design Doc</h2>
  * <a href="https://docs.google.com/document/d/1mykz-w2t1Yw7CH6NjUWpWqCAf_6YNKxSc59gXafrNCs/edit?usp=sharing">Calcite SQL and Planner Hints Design</a>.
  */
-@PackageMarker
 package org.apache.calcite.rel.hint;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/package-info.java b/core/src/main/java/org/apache/calcite/rel/logical/package-info.java
@@ -31,9 +31,6 @@
  *
  * </ul>
  */
-@PackageMarker
 package org.apache.calcite.rel.logical;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/package-info.java b/core/src/main/java/org/apache/calcite/rel/metadata/package-info.java
@@ -19,9 +19,6 @@
  * Defines metadata interfaces and utilities for relational
  * expressions.
  */
-@PackageMarker
 package org.apache.calcite.rel.metadata;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/mutable/package-info.java b/core/src/main/java/org/apache/calcite/rel/mutable/package-info.java
@@ -31,9 +31,6 @@
  *
  * </ul>
  */
-@PackageMarker
 package org.apache.calcite.rel.mutable;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/package-info.java b/core/src/main/java/org/apache/calcite/rel/package-info.java
@@ -35,9 +35,6 @@
  *
  * </ul>
  */
-@PackageMarker
 package org.apache.calcite.rel;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rel2sql/package-info.java b/core/src/main/java/org/apache/calcite/rel/rel2sql/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Translates a relational expression to SQL parse tree.
  */
-@PackageMarker
 package org.apache.calcite.rel.rel2sql;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/package-info.java b/core/src/main/java/org/apache/calcite/rel/rules/package-info.java
@@ -47,9 +47,6 @@
  *        provides an optimizer interface.</li>
  * </ul>
  */
-@PackageMarker
 package org.apache.calcite.rel.rules;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/stream/package-info.java b/core/src/main/java/org/apache/calcite/rel/stream/package-info.java
@@ -27,9 +27,6 @@
  *
  * </ul>
  */
-@PackageMarker
 package org.apache.calcite.rel.stream;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rel/type/package-info.java b/core/src/main/java/org/apache/calcite/rel/type/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Defines a type system for relational expressions.
  */
-@PackageMarker
 package org.apache.calcite.rel.type;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/rex/package-info.java b/core/src/main/java/org/apache/calcite/rex/package-info.java
@@ -79,9 +79,6 @@
  *
  * </ul>
  */
-@PackageMarker
 package org.apache.calcite.rex;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/runtime/package-info.java b/core/src/main/java/org/apache/calcite/runtime/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Utilities required at runtime.
  */
-@PackageMarker
 package org.apache.calcite.runtime;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/package-info.java b/core/src/main/java/org/apache/calcite/schema/impl/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Utilities to help implement Calcite's SPIs.
  */
-@PackageMarker
 package org.apache.calcite.schema.impl;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/schema/package-info.java b/core/src/main/java/org/apache/calcite/schema/package-info.java
@@ -22,9 +22,6 @@
  * SQL validator to validate SQL abstract syntax trees and resolve
  * identifiers to objects.
  */
-@PackageMarker
 package org.apache.calcite.schema;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/server/package-info.java b/core/src/main/java/org/apache/calcite/server/package-info.java
@@ -18,9 +18,6 @@
 /**
  * Provides a server for hosting Calcite connections.
  */
-@PackageMarker
 package org.apache.calcite.server;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/sql/advise/package-info.java b/core/src/main/java/org/apache/calcite/sql/advise/package-info.java
@@ -24,9 +24,6 @@
  * <p>The advisor uses the validation and parser framework set up in
  * <code>org.apache.calcite.sql.validate</code> package.
 */
-@PackageMarker
 package org.apache.calcite.sql.advise;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/sql/dialect/package-info.java b/core/src/main/java/org/apache/calcite/sql/dialect/package-info.java
@@ -18,9 +18,6 @@
 /**
  * SQL unparsers for JDBC dialects.
  */
-@PackageMarker
 package org.apache.calcite.sql.dialect;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/package-info.java b/core/src/main/java/org/apache/calcite/sql/fun/package-info.java
@@ -27,9 +27,6 @@
  * which are not row-level (e.g. select and join) should be defined in package
  * {@link org.apache.calcite.sql} instead.</p>
  */
-@PackageMarker
 package org.apache.calcite.sql.fun;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java
diff --git a/core/src/main/java/org/apache/calcite/sql/package-info.java b/core/src/main/java/org/apache/calcite/sql/package-info.java
@@ -91,9 +91,6 @@
  * {@link org.apache.calcite.sql.SqlNode}s into a SQL string. A
  * {@link org.apache.calcite.sql.SqlDialect} defines how this happens.</p>
  */
-@PackageMarker
 package org.apache.calcite.sql;
 
-import org.apache.calcite.avatica.util.PackageMarker;
-
 // End package-info.java