From d9ca598d9dd2924a4cb8f2b6e69a7cca65fee575 Mon Sep 17 00:00:00 2001 From: James Turton Date: Fri, 25 Aug 2023 08:40:36 +0200 Subject: [PATCH 1/4] Suppress checkstyle warnings of "Unable to locate Source XRef". --- distribution/pom.xml | 2 +- pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index d4c8e4ee4bc..dfb9d28484a 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -592,7 +592,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + 3.6.0 unpack-winutils diff --git a/pom.xml b/pom.xml index 5f25bef7f8b..ff391ceae00 100644 --- a/pom.xml +++ b/pom.xml @@ -475,6 +475,7 @@ true src/main/resources/checkstyle-config.xml src/main/resources/checkstyle-suppressions.xml + false From 664eb5d8b44db3a0080b64fa06b41091744939ea Mon Sep 17 00:00:00 2001 From: James Turton Date: Fri, 25 Aug 2023 13:08:51 +0200 Subject: [PATCH 2/4] Remove Drill's shaded Guava. --- drill-shaded/drill-shaded-guava/pom.xml | 73 ------------------------ drill-shaded/pom.xml | 2 +- exec/jdbc-all/pom.xml | 2 +- pom.xml | 11 ---- src/main/resources/checkstyle-config.xml | 7 ++- 5 files changed, 6 insertions(+), 89 deletions(-) delete mode 100644 drill-shaded/drill-shaded-guava/pom.xml diff --git a/drill-shaded/drill-shaded-guava/pom.xml b/drill-shaded/drill-shaded-guava/pom.xml deleted file mode 100644 index bd1943087f8..00000000000 --- a/drill-shaded/drill-shaded-guava/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - 4.0.0 - - - org.apache.drill - drill-shaded - 1.0 - - - drill-shaded-guava - 28.2-jre - drill-shaded/drill-shaded-guava - - - ${project.version} - - - - - com.google.guava - guava - ${guava.version} - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - - com.google.guava:guava - com.google.guava:failureaccess - - - - - com.google.common - org.apache.drill.shaded.guava.com.google.common - - - com.google.thirdparty.publicsuffix - org.apache.drill.shaded.guava.com.google.thirdparty.publicsuffix - - - - - - - - diff --git a/drill-shaded/pom.xml b/drill-shaded/pom.xml index e71abf471b7..5982df72955 100644 --- a/drill-shaded/pom.xml +++ b/drill-shaded/pom.xml @@ -67,7 +67,7 @@ - drill-shaded-guava + diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml index d66822b0fc8..f8c05c9b44d 100644 --- a/exec/jdbc-all/pom.xml +++ b/exec/jdbc-all/pom.xml @@ -33,7 +33,7 @@ "package.namespace.prefix" equals to "oadd.". It can be overridden if necessary within any profile --> oadd. - 46500000 + 40500000 diff --git a/pom.xml b/pom.xml index ff391ceae00..339bbb52d15 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,6 @@ 4.13.2 1.8.2 2.0.6 - 28.2-jre 30.1.1-jre 1 1.12.3 @@ -1081,11 +1080,6 @@ netty-common - - org.apache.drill - drill-shaded-guava - - org.slf4j slf4j-api @@ -1302,11 +1296,6 @@ - - org.apache.drill - drill-shaded-guava - ${shaded.guava.version} - com.google.guava guava diff --git a/src/main/resources/checkstyle-config.xml b/src/main/resources/checkstyle-config.xml index 488985d7db3..63ed81149ca 100644 --- a/src/main/resources/checkstyle-config.xml +++ b/src/main/resources/checkstyle-config.xml @@ -30,9 +30,10 @@ - - + + From 9d92471b4947cb04b73617540d732d57f7d5361b Mon Sep 17 00:00:00 2001 From: James Turton Date: Fri, 25 Aug 2023 11:00:03 +0200 Subject: [PATCH 3/4] Update org.apache.drill.shaded.guava.* import statements. --- .../org/apache/drill/common/DeferredException.java | 4 ++-- .../java/org/apache/drill/common/KerberosUtil.java | 4 ++-- .../main/java/org/apache/drill/common/Version.java | 4 ++-- .../drill/common/collections/Collectors.java | 2 +- .../drill/common/collections/ImmutableEntry.java | 4 ++-- .../drill/common/collections/MapWithOrdinal.java | 12 ++++++------ .../common/concurrent/AbstractCheckedFuture.java | 4 ++-- .../drill/common/concurrent/CheckedFuture.java | 4 ++-- .../apache/drill/common/config/DrillConfig.java | 8 ++++---- .../drill/common/config/DrillProperties.java | 4 ++-- .../drill/common/map/CaseInsensitiveMap.java | 4 ++-- .../drill/common/scanner/ClassPathScanner.java | 6 +++--- .../apache/drill/common/scanner/RunTimeScan.java | 2 +- .../scanner/persistence/AnnotationDescriptor.java | 2 +- .../common/scanner/persistence/ScanResult.java | 8 ++++---- .../apache/drill/common/util/DrillFileUtils.java | 4 ++-- .../org/apache/drill/common/util/GuavaPatcher.java | 2 +- .../org/apache/drill/test/SubDirTestWatcher.java | 4 ++-- .../exec/store/msaccess/MSAccessFormatConfig.java | 2 +- .../exec/store/msaccess/MSAccessFormatPlugin.java | 2 +- .../drill/exec/store/delta/DeltaGroupScan.java | 4 ++-- .../drill/exec/store/delta/DeltaRowGroupScan.java | 2 +- .../store/delta/read/DeltaScanBatchCreator.java | 2 +- .../drill/exec/store/esri/ShpFormatConfig.java | 2 +- .../drill/exec/store/excel/ExcelFormatConfig.java | 2 +- .../drill/exec/store/hdf5/HDF5FormatConfig.java | 2 +- .../exec/store/httpd/HttpdLogBatchReader.java | 2 +- .../exec/store/httpd/HttpdLogFormatConfig.java | 2 +- .../drill/exec/store/httpd/HttpdLogRecord.java | 2 +- .../apache/drill/exec/store/httpd/HttpdParser.java | 2 +- .../exec/store/iceberg/IcebergBlockMapBuilder.java | 6 +++--- .../drill/exec/store/iceberg/IcebergGroupScan.java | 4 ++-- .../drill/exec/store/iceberg/IcebergSubScan.java | 2 +- .../iceberg/read/IcebergScanBatchCreator.java | 2 +- .../store/iceberg/snapshot/SnapshotFactory.java | 2 +- .../drill/exec/store/image/ImageFormatConfig.java | 2 +- .../drill/exec/store/log/LogBatchReader.java | 2 +- .../drill/exec/store/log/LogFormatConfig.java | 4 ++-- .../drill/exec/store/log/LogFormatField.java | 2 +- .../drill/exec/store/log/LogFormatPlugin.java | 2 +- .../apache/drill/exec/store/log/TestLogReader.java | 2 +- .../drill/exec/store/log/TestLogReaderIssue.java | 2 +- .../drill/exec/store/ltsv/LTSVBatchReader.java | 2 +- .../exec/store/ltsv/LTSVFormatPluginConfig.java | 2 +- .../planner/index/MapRDBFunctionalIndexInfo.java | 4 ++-- .../exec/planner/index/MapRDBIndexDescriptor.java | 8 ++++---- .../exec/planner/index/MapRDBIndexDiscover.java | 2 +- .../drill/exec/planner/index/MapRDBStatistics.java | 8 ++++---- .../drill/exec/store/mapr/TableFormatPlugin.java | 2 +- .../exec/store/mapr/db/MapRDBFormatPlugin.java | 2 +- .../drill/exec/store/mapr/db/MapRDBGroupScan.java | 10 +++++----- .../store/mapr/db/MapRDBPushFilterIntoScan.java | 2 +- .../mapr/db/MapRDBRestrictedScanBatchCreator.java | 4 ++-- .../exec/store/mapr/db/MapRDBScanBatchCreator.java | 2 +- .../drill/exec/store/mapr/db/MapRDBSubScan.java | 2 +- .../drill/exec/store/mapr/db/MapRDBTableCache.java | 10 +++++----- .../store/mapr/db/binary/BinaryTableGroupScan.java | 2 +- .../store/mapr/db/binary/MapRDBFilterBuilder.java | 2 +- .../db/binary/MaprDBCompareFunctionsProcessor.java | 2 +- .../mapr/db/json/CompareFunctionsProcessor.java | 4 ++-- .../store/mapr/db/json/JsonTableGroupScan.java | 2 +- .../db/json/JsonTableRangePartitionFunction.java | 4 ++-- .../store/mapr/db/json/MaprDBJsonRecordReader.java | 10 +++++----- .../store/mapr/db/json/OjaiFunctionsProcessor.java | 2 +- .../db/json/ProjectionPassthroughVectorWriter.java | 2 +- .../mapr/db/json/RestrictedJsonRecordReader.java | 2 +- .../mapr/db/json/RestrictedJsonTableGroupScan.java | 4 ++-- .../exec/store/mapr/db/util/FieldPathHelper.java | 2 +- .../maprdb/tests/json/TestEncodedFieldPaths.java | 2 +- .../drill/maprdb/tests/json/TestScanRanges.java | 2 +- .../drill/exec/store/pcap/PcapFormatUtils.java | 4 ++-- .../drill/exec/store/pcap/decoder/Packet.java | 2 +- .../exec/store/pcap/decoder/PacketDecoder.java | 2 +- .../exec/store/pcap/plugin/PcapFormatConfig.java | 2 +- .../exec/store/pcap/plugin/PcapngFormatConfig.java | 2 +- .../store/pcap/TestPcapWithPersistentStore.java | 4 ++-- .../drill/exec/store/pcap/TestPcapDecoder.java | 2 +- .../store/pcapng/TestPcapngStatRecordReader.java | 2 +- .../drill/exec/store/pdf/PdfBatchReader.java | 2 +- .../drill/exec/store/pdf/PdfFormatConfig.java | 2 +- .../drill/exec/store/sas/SasFormatConfig.java | 2 +- .../drill/exec/store/spss/SpssFormatConfig.java | 2 +- .../exec/store/syslog/SyslogFormatConfig.java | 2 +- .../drill/exec/store/xml/XMLFormatConfig.java | 2 +- .../org/apache/drill/exec/store/xml/XMLReader.java | 2 +- .../org/apache/drill/exec/store/xml/XMLUtils.java | 2 +- .../store/cassandra/CassandraStoragePlugin.java | 2 +- .../exec/store/drill/plugin/DrillRecordReader.java | 2 +- .../store/drill/plugin/DrillScanBatchCreator.java | 2 +- .../drill/plugin/DrillStoragePluginConfig.java | 4 ++-- .../exec/store/drill/plugin/DrillSubScan.java | 2 +- .../drill/plugin/plan/DrillPluginImplementor.java | 2 +- .../drill/plugin/schema/DrillSchemaFactory.java | 6 +++--- .../store/druid/DruidCompareFunctionProcessor.java | 4 ++-- .../drill/exec/store/druid/DruidGroupScan.java | 6 +++--- .../store/druid/DruidPushDownFilterForScan.java | 2 +- .../drill/exec/store/druid/DruidRecordReader.java | 6 +++--- .../exec/store/druid/DruidScanBatchCreator.java | 4 ++-- .../drill/exec/store/druid/DruidStoragePlugin.java | 2 +- .../drill/exec/store/druid/DruidSubScan.java | 2 +- .../store/druid/schema/DruidSchemaFactory.java | 4 ++-- .../store/druid/DruidStoragePluginConfigTest.java | 2 +- .../drill/exec/store/druid/DruidTestSuite.java | 2 +- .../drill/exec/store/druid/TestDataGenerator.java | 2 +- .../elasticsearch/ElasticsearchStorageConfig.java | 2 +- .../elasticsearch/ElasticComplexTypesTest.java | 2 +- .../store/elasticsearch/ElasticInfoSchemaTest.java | 2 +- .../store/elasticsearch/ElasticSearchPlanTest.java | 2 +- .../store/googlesheets/GoogleSheetsGroupScan.java | 2 +- .../googlesheets/GoogleSheetsScanBatchCreator.java | 2 +- .../googlesheets/GoogleSheetsStoragePlugin.java | 4 ++-- .../store/googlesheets/GoogleSheetsSubScan.java | 2 +- .../TestGoogleSheetsLimitPushdown.java | 4 ++-- .../googlesheets/TestGoogleSheetsQueries.java | 4 ++-- .../store/googlesheets/TestGoogleSheetsWriter.java | 4 ++-- .../store/hbase/CompareFunctionsProcessor.java | 6 +++--- .../exec/store/hbase/HBaseConnectionManager.java | 14 +++++++------- .../drill/exec/store/hbase/HBaseFilterBuilder.java | 2 +- .../drill/exec/store/hbase/HBaseGroupScan.java | 8 ++++---- .../exec/store/hbase/HBasePushFilterIntoScan.java | 2 +- .../drill/exec/store/hbase/HBaseRecordReader.java | 6 +++--- .../exec/store/hbase/HBaseScanBatchCreator.java | 2 +- .../drill/exec/store/hbase/HBaseSchemaFactory.java | 2 +- .../drill/exec/store/hbase/HBaseStoragePlugin.java | 2 +- .../exec/store/hbase/HBaseStoragePluginConfig.java | 6 +++--- .../drill/exec/store/hbase/HBaseSubScan.java | 2 +- .../apache/drill/exec/store/hbase/HBaseUtils.java | 2 +- .../store/hbase/config/HBasePersistentStore.java | 2 +- .../hbase/config/HBasePersistentStoreProvider.java | 2 +- .../java/org/apache/drill/hbase/BaseHBaseTest.java | 4 ++-- .../hbase/TestHBaseRegionScanAssignments.java | 4 ++-- .../apache/drill/hbase/TestHBaseTableProvider.java | 2 +- .../hbase/TestOrderedBytesConvertFunctions.java | 4 ++-- .../codegen/templates/ObjectInspectorHelper.java | 4 ++-- .../drill/exec/expr/fn/HiveFunctionRegistry.java | 8 ++++---- .../exec/planner/sql/HivePartitionDescriptor.java | 2 +- .../exec/planner/sql/HivePartitionLocation.java | 2 +- .../drill/exec/store/hive/ColumnListsCache.java | 4 ++-- .../hive/HiveDrillNativeParquetRowGroupScan.java | 2 +- .../store/hive/HiveDrillNativeParquetScan.java | 2 +- .../HiveDrillNativeParquetScanBatchCreator.java | 2 +- .../exec/store/hive/HiveMetadataProvider.java | 14 +++++++------- .../drill/exec/store/hive/HiveReadEntry.java | 2 +- .../drill/exec/store/hive/HiveStoragePlugin.java | 2 +- .../apache/drill/exec/store/hive/HiveSubScan.java | 6 +++--- .../drill/exec/store/hive/HiveTableWrapper.java | 2 +- .../drill/exec/store/hive/HiveUtilities.java | 4 ++-- .../store/hive/client/DatabaseNameCacheLoader.java | 2 +- .../store/hive/client/HiveAuthorizationHelper.java | 2 +- .../exec/store/hive/client/HiveMetadataCache.java | 6 +++--- .../store/hive/client/TableEntryCacheLoader.java | 2 +- .../store/hive/client/TableNameCacheLoader.java | 2 +- .../hive/readers/HiveDefaultRecordReader.java | 2 +- .../exec/store/hive/schema/DrillHiveViewTable.java | 2 +- .../exec/store/hive/schema/HiveSchemaFactory.java | 8 ++++---- .../apache/drill/exec/fn/hive/TestHiveUDFs.java | 4 ++-- .../drill/exec/fn/hive/TestInbuiltHiveUDFs.java | 2 +- .../exec/hive/TestInfoSchemaOnHiveStorage.java | 2 +- .../hive/TestSqlStdBasedAuthorization.java | 4 ++-- .../hive/TestStorageBasedHiveAuthorization.java | 6 +++--- .../exec/store/hive/HiveTestDataGenerator.java | 2 +- .../store/hive/schema/TestColumnListCache.java | 2 +- .../drill/exec/store/http/HttpApiConfig.java | 2 +- .../drill/exec/store/http/HttpBatchReader.java | 2 +- .../drill/exec/store/http/HttpCSVBatchReader.java | 2 +- .../drill/exec/store/http/HttpGroupScan.java | 2 +- .../exec/store/http/HttpScanBatchCreator.java | 2 +- .../drill/exec/store/http/HttpStoragePlugin.java | 4 ++-- .../drill/exec/store/http/TestHttpPlugin.java | 6 +++--- .../exec/store/http/TestHttpUDFFunctions.java | 6 +++--- .../exec/store/http/TestHttpUDFWithAliases.java | 6 +++--- .../drill/exec/store/http/TestOAuthProcess.java | 4 ++-- .../drill/exec/store/http/TestPagination.java | 4 ++-- .../drill/exec/store/http/TestProvidedSchema.java | 6 +++--- .../http/TestUserTranslationInHttpPlugin.java | 4 ++-- .../drill/exec/store/jdbc/DrillJdbcConvention.java | 4 ++-- .../drill/exec/store/jdbc/JdbcBatchReader.java | 2 +- .../exec/store/jdbc/JdbcConventionFactory.java | 4 ++-- .../exec/store/jdbc/JdbcScanBatchCreator.java | 2 +- .../drill/exec/store/jdbc/JdbcStorageConfig.java | 2 +- .../drill/exec/store/jdbc/JdbcStoragePlugin.java | 4 ++-- .../jdbc/clickhouse/ClickhouseJdbcImplementor.java | 4 ++-- .../exec/store/jdbc/writers/JdbcVarcharWriter.java | 2 +- .../exec/store/jdbc/TestJdbcPluginWithMSSQL.java | 2 +- .../drill/exec/store/kafka/KafkaGroupScan.java | 10 +++++----- .../drill/exec/store/kafka/KafkaNodeProcessor.java | 4 ++-- .../store/kafka/KafkaPartitionScanSpecBuilder.java | 10 +++++----- .../store/kafka/KafkaPushDownFilterIntoScan.java | 2 +- .../exec/store/kafka/KafkaScanBatchCreator.java | 2 +- .../drill/exec/store/kafka/KafkaStoragePlugin.java | 2 +- .../drill/exec/store/kafka/KafkaSubScan.java | 2 +- .../drill/exec/store/kafka/MessageIterator.java | 2 +- .../exec/store/kafka/KafkaMessageGenerator.java | 2 +- .../drill/exec/store/kafka/KafkaTestBase.java | 2 +- .../main/codegen/templates/KuduRecordWriter.java | 2 +- .../drill/exec/store/kudu/DrillKuduTable.java | 2 +- .../drill/exec/store/kudu/KuduGroupScan.java | 10 +++++----- .../drill/exec/store/kudu/KuduRecordReader.java | 6 +++--- .../exec/store/kudu/KuduScanBatchCreator.java | 2 +- .../drill/exec/store/kudu/KuduSchemaFactory.java | 2 +- .../apache/drill/exec/store/kudu/KuduSubScan.java | 4 ++-- .../drill/exec/store/bson/BsonRecordReader.java | 2 +- .../store/mongo/MongoCompareFunctionProcessor.java | 4 ++-- .../drill/exec/store/mongo/MongoGroupScan.java | 14 +++++++------- .../drill/exec/store/mongo/MongoRecordReader.java | 8 ++++---- .../exec/store/mongo/MongoScanBatchCreator.java | 2 +- .../drill/exec/store/mongo/MongoStoragePlugin.java | 12 ++++++------ .../drill/exec/store/mongo/MongoSubScan.java | 2 +- .../apache/drill/exec/store/mongo/MongoUtils.java | 4 ++-- .../store/mongo/config/MongoPersistentStore.java | 2 +- .../store/mongo/plan/RexToMongoTranslator.java | 2 +- .../store/mongo/schema/MongoDatabaseSchema.java | 4 ++-- .../store/mongo/schema/MongoSchemaFactory.java | 10 +++++----- .../drill/exec/store/mongo/MongoTestSuite.java | 4 ++-- .../exec/store/mongo/TestMongoChunkAssignment.java | 6 +++--- .../exec/store/openTSDB/DrillOpenTSDBTable.java | 2 +- .../exec/store/openTSDB/OpenTSDBGroupScan.java | 4 ++-- .../exec/store/openTSDB/OpenTSDBRecordReader.java | 4 ++-- .../drill/exec/store/openTSDB/OpenTSDBSubScan.java | 2 +- .../drill/exec/store/openTSDB/SizeEstimator.java | 2 +- .../org/apache/drill/exec/store/openTSDB/Util.java | 2 +- .../exec/store/phoenix/PhoenixBatchReader.java | 2 +- .../exec/store/phoenix/PhoenixDataSource.java | 2 +- .../drill/exec/store/phoenix/PhoenixReader.java | 2 +- .../exec/store/phoenix/PhoenixStoragePlugin.java | 6 +++--- .../drill/exec/store/phoenix/PhoenixSubScan.java | 2 +- .../store/phoenix/rules/PhoenixConvention.java | 2 +- .../drill/exec/store/phoenix/PhoenixBaseTest.java | 2 +- .../phoenix/secured/SecuredPhoenixBaseTest.java | 2 +- .../drill/exec/store/splunk/SplunkBatchReader.java | 4 ++-- .../drill/exec/store/splunk/SplunkGroupScan.java | 2 +- .../exec/store/splunk/SplunkQueryBuilder.java | 2 +- .../exec/store/splunk/SplunkScanBatchCreator.java | 2 +- .../drill/exec/store/splunk/SplunkSchema.java | 2 +- .../exec/store/splunk/SplunkStoragePlugin.java | 2 +- .../drill/exec/store/splunk/SplunkSubScan.java | 2 +- distribution/src/assemble/component.xml | 9 --------- .../drill/yarn/appMaster/http/WebServer.java | 2 +- .../apache/drill/yarn/zk/ZKClusterCoordinator.java | 6 +++--- .../java/org/apache/drill/yarn/zk/ZKRegistry.java | 2 +- .../src/main/codegen/includes/vv_imports.ftl | 14 +++++++------- .../codegen/templates/EventBasedRecordWriter.java | 4 ++-- .../templates/ParquetOutputRecordWriter.java | 6 +++--- .../codegen/templates/RecordValueAccessor.java | 2 +- .../templates/StringOutputRecordWriter.java | 2 +- .../org/apache/drill/exec/TestMemoryRetention.java | 2 +- .../exec/cache/VectorAccessibleSerializable.java | 4 ++-- .../apache/drill/exec/cache/VectorSerializer.java | 2 +- .../org/apache/drill/exec/client/DrillClient.java | 12 ++++++------ .../drill/exec/client/DrillSqlLineApplication.java | 2 +- .../java/org/apache/drill/exec/client/DumpCat.java | 2 +- .../drill/exec/client/LoggingResultsListener.java | 2 +- .../apache/drill/exec/client/QuerySubmitter.java | 6 +++--- .../org/apache/drill/exec/client/ServerMethod.java | 8 ++++---- .../apache/drill/exec/compile/ByteCodeLoader.java | 8 ++++---- .../drill/exec/compile/CachedClassLoader.java | 2 +- .../drill/exec/compile/ClassTransformer.java | 10 +++++----- .../apache/drill/exec/compile/CodeCompiler.java | 10 +++++----- .../drill/exec/compile/DrillJavaFileManager.java | 4 ++-- .../drill/exec/compile/DrillJavaFileObject.java | 2 +- .../org/apache/drill/exec/compile/FsmCursor.java | 2 +- .../apache/drill/exec/compile/FsmDescriptor.java | 2 +- .../drill/exec/compile/JDKClassCompiler.java | 4 ++-- .../org/apache/drill/exec/compile/LogWriter.java | 2 +- .../drill/exec/compile/QueryClassLoader.java | 2 +- .../exec/compile/bytecode/InstructionModifier.java | 2 +- .../compile/bytecode/ReplacingInterpreter.java | 4 ++-- .../compile/bytecode/ScalarReplacementTypes.java | 2 +- .../exec/compile/bytecode/ValueHolderIden.java | 2 +- .../exec/compile/sig/CodeGeneratorMethod.java | 4 ++-- .../compile/sig/ConstantExpressionIdentifier.java | 2 +- .../drill/exec/compile/sig/GeneratorMapping.java | 2 +- .../apache/drill/exec/compile/sig/MappingSet.java | 2 +- .../drill/exec/compile/sig/SignatureHolder.java | 8 ++++---- .../exec/coord/local/LocalClusterCoordinator.java | 2 +- .../drill/exec/coord/local/MapBackedStore.java | 2 +- .../drill/exec/coord/store/BaseTransientStore.java | 8 ++++---- .../coord/store/CachingTransientStoreFactory.java | 6 +++--- .../exec/coord/store/TransientStoreConfig.java | 6 +++--- .../coord/store/TransientStoreConfigBuilder.java | 2 +- .../exec/coord/store/TransientStoreEvent.java | 4 ++-- .../drill/exec/coord/zk/EventDispatcher.java | 4 ++-- .../org/apache/drill/exec/coord/zk/PathUtils.java | 2 +- .../drill/exec/coord/zk/ZKACLProviderDelegate.java | 2 +- .../drill/exec/coord/zk/ZKACLProviderFactory.java | 2 +- .../drill/exec/coord/zk/ZKClusterCoordinator.java | 6 +++--- .../drill/exec/coord/zk/ZKSecureACLProvider.java | 2 +- .../drill/exec/coord/zk/ZkEphemeralStore.java | 6 +++--- .../exec/coord/zk/ZkTransientStoreFactory.java | 2 +- .../drill/exec/coord/zk/ZookeeperClient.java | 8 ++++---- .../apache/drill/exec/dotdrill/DotDrillFile.java | 2 +- .../apache/drill/exec/dotdrill/DotDrillUtil.java | 2 +- .../org/apache/drill/exec/expr/BatchReference.java | 2 +- .../org/apache/drill/exec/expr/ClassGenerator.java | 8 ++++---- .../org/apache/drill/exec/expr/CloneVisitor.java | 2 +- .../org/apache/drill/exec/expr/CodeGenerator.java | 2 +- .../apache/drill/exec/expr/EqualityVisitor.java | 2 +- .../apache/drill/exec/expr/EvaluationVisitor.java | 4 ++-- .../exec/expr/ExpressionTreeMaterializer.java | 8 ++++---- .../org/apache/drill/exec/expr/FilterBuilder.java | 2 +- .../org/apache/drill/exec/expr/IsPredicate.java | 2 +- .../drill/exec/expr/SingleClassStringWriter.java | 2 +- .../drill/exec/expr/ValueVectorReadExpression.java | 2 +- .../exec/expr/ValueVectorWriteExpression.java | 2 +- .../drill/exec/expr/fn/DrillAggFuncHolder.java | 6 +++--- .../exec/expr/fn/DrillComplexWriterFuncHolder.java | 2 +- .../apache/drill/exec/expr/fn/DrillFuncHolder.java | 4 ++-- .../drill/exec/expr/fn/DrillSimpleFuncHolder.java | 2 +- .../drill/exec/expr/fn/FunctionConverter.java | 4 ++-- .../exec/expr/fn/FunctionGenerationHelper.java | 2 +- .../expr/fn/FunctionImplementationRegistry.java | 8 ++++---- .../drill/exec/expr/fn/FunctionInitializer.java | 2 +- .../apache/drill/exec/expr/fn/ValueReference.java | 2 +- .../drill/exec/expr/fn/WorkspaceReference.java | 2 +- .../expr/fn/impl/AbstractSqlPatternMatcher.java | 2 +- .../drill/exec/expr/fn/impl/MappifyUtility.java | 2 +- .../exec/expr/fn/impl/StringFunctionHelpers.java | 2 +- .../expr/fn/interpreter/InterpreterEvaluator.java | 4 ++-- .../expr/fn/output/DefaultReturnTypeInference.java | 2 +- .../fn/output/StringCastReturnTypeInference.java | 2 +- .../expr/fn/registry/FunctionRegistryHolder.java | 4 ++-- .../expr/fn/registry/LocalFunctionRegistry.java | 8 ++++---- .../expr/fn/registry/RemoteFunctionRegistry.java | 4 ++-- .../drill/exec/memory/RootAllocatorFactory.java | 2 +- .../exec/metastore/analyze/AnalyzeColumnUtils.java | 2 +- .../analyze/FileMetadataInfoCollector.java | 8 ++++---- .../metastore/analyze/MetadataInfoCollector.java | 2 +- .../MetastoreParquetTableMetadataProvider.java | 4 ++-- .../store/parquet/ParquetMetadataProvider.java | 2 +- .../apache/drill/exec/ops/BaseOperatorContext.java | 2 +- .../org/apache/drill/exec/ops/FragmentContext.java | 2 +- .../apache/drill/exec/ops/FragmentContextImpl.java | 4 ++-- .../org/apache/drill/exec/ops/OperatorContext.java | 2 +- .../apache/drill/exec/ops/OperatorContextImpl.java | 6 +++--- .../org/apache/drill/exec/ops/OperatorStats.java | 2 +- .../org/apache/drill/exec/ops/QueryContext.java | 6 +++--- .../org/apache/drill/exec/ops/UdfUtilities.java | 4 ++-- .../drill/exec/ops/ViewExpansionContext.java | 2 +- .../drill/exec/physical/EndpointAffinity.java | 2 +- .../apache/drill/exec/physical/PhysicalPlan.java | 2 +- .../drill/exec/physical/base/AbstractBase.java | 2 +- .../drill/exec/physical/base/AbstractExchange.java | 6 +++--- .../exec/physical/base/AbstractGroupScan.java | 2 +- .../drill/exec/physical/base/AbstractJoinPop.java | 2 +- .../drill/exec/physical/base/AbstractReceiver.java | 4 ++-- .../drill/exec/physical/base/AbstractSender.java | 2 +- .../drill/exec/physical/base/AbstractSingle.java | 4 ++-- .../apache/drill/exec/physical/base/GroupScan.java | 2 +- .../drill/exec/physical/base/SchemalessScan.java | 2 +- .../physical/config/AbstractDeMuxExchange.java | 10 +++++----- .../exec/physical/config/AbstractMuxExchange.java | 10 +++++----- .../drill/exec/physical/config/FlattenPOP.java | 2 +- .../drill/exec/physical/config/HashJoinPOP.java | 6 +++--- .../drill/exec/physical/config/LateralJoinPOP.java | 2 +- .../drill/exec/physical/config/MergeJoinPOP.java | 4 ++-- .../physical/config/MetadataControllerPOP.java | 2 +- .../exec/physical/config/MetadataHashAggPOP.java | 2 +- .../exec/physical/config/NestedLoopJoinPOP.java | 2 +- .../physical/config/OrderedPartitionExchange.java | 2 +- .../physical/config/OrderedPartitionSender.java | 2 +- .../drill/exec/physical/config/RowKeyJoinPOP.java | 4 ++-- .../exec/physical/config/SingleMergeExchange.java | 2 +- .../exec/physical/config/StatisticsAggregate.java | 2 +- .../exec/physical/config/StatisticsMerge.java | 2 +- .../drill/exec/physical/config/UnionExchange.java | 2 +- .../drill/exec/physical/impl/ImplCreator.java | 8 ++++---- .../apache/drill/exec/physical/impl/ScanBatch.java | 4 ++-- .../drill/exec/physical/impl/ScreenCreator.java | 2 +- .../physical/impl/TopN/PriorityQueueTemplate.java | 2 +- .../drill/exec/physical/impl/TopN/TopNBatch.java | 2 +- .../physical/impl/TopN/TopNSortBatchCreator.java | 2 +- .../drill/exec/physical/impl/TraceInjector.java | 2 +- .../exec/physical/impl/aggregate/HashAggBatch.java | 2 +- .../impl/aggregate/HashAggBatchCreator.java | 2 +- .../impl/aggregate/HashAggSpilledPartition.java | 2 +- .../physical/impl/aggregate/StreamingAggBatch.java | 4 ++-- .../impl/aggregate/StreamingAggBatchCreator.java | 2 +- .../broadcastsender/BroadcastSenderCreator.java | 2 +- .../broadcastsender/BroadcastSenderRootExec.java | 2 +- .../impl/common/CodeGenMemberInjector.java | 2 +- .../exec/physical/impl/common/HashPartition.java | 4 ++-- .../impl/common/HashTableAllocationTracker.java | 2 +- .../physical/impl/common/HashTableTemplate.java | 2 +- .../exec/physical/impl/common/SpilledState.java | 2 +- .../physical/impl/filter/FilterBatchCreator.java | 2 +- .../physical/impl/filter/FilterRecordBatch.java | 2 +- .../impl/filter/ReturnValueExpression.java | 2 +- .../impl/filter/RuntimeFilterBatchCreator.java | 2 +- .../physical/impl/flatten/FlattenBatchCreator.java | 2 +- .../physical/impl/flatten/FlattenTemplate.java | 2 +- .../impl/join/AbstractHashBinaryRecordBatch.java | 6 +++--- .../physical/impl/join/BatchSizePredictorImpl.java | 2 +- .../exec/physical/impl/join/HashJoinBatch.java | 4 ++-- .../physical/impl/join/HashJoinBatchCreator.java | 2 +- .../join/HashJoinHelperSizeCalculatorImpl.java | 2 +- .../impl/join/HashJoinHelperUnusedSizeImpl.java | 2 +- .../join/HashJoinMechanicalMemoryCalculator.java | 2 +- .../impl/join/HashJoinMemoryCalculator.java | 4 ++-- .../impl/join/HashJoinMemoryCalculatorImpl.java | 4 ++-- .../HashTableSizeCalculatorConservativeImpl.java | 2 +- .../impl/join/HashTableSizeCalculatorLeanImpl.java | 2 +- .../drill/exec/physical/impl/join/JoinStatus.java | 2 +- .../exec/physical/impl/join/LateralJoinBatch.java | 4 ++-- .../exec/physical/impl/join/MergeJoinBatch.java | 2 +- .../exec/physical/impl/join/MergeJoinCreator.java | 2 +- .../physical/impl/join/NestedLoopJoinBatch.java | 4 ++-- .../exec/physical/impl/join/RowKeyJoinBatch.java | 4 ++-- .../physical/impl/join/RowKeyJoinBatchCreator.java | 2 +- .../physical/impl/limit/LimitBatchCreator.java | 2 +- .../exec/physical/impl/limit/LimitRecordBatch.java | 4 ++-- .../impl/limit/PartitionLimitBatchCreator.java | 2 +- .../impl/limit/PartitionLimitRecordBatch.java | 2 +- .../impl/mergereceiver/MergingRecordBatch.java | 4 ++-- .../impl/metadata/MetadataAggregateHelper.java | 2 +- .../impl/metadata/MetadataControllerBatch.java | 6 +++--- .../metadata/MetadataControllerBatchCreator.java | 2 +- .../impl/metadata/MetadataHandlerBatch.java | 2 +- .../impl/metadata/MetadataHandlerBatchCreator.java | 2 +- .../impl/metadata/MetadataHashAggBatchCreator.java | 2 +- .../metadata/MetadataStreamAggBatchCreator.java | 2 +- .../OrderedPartitionProjectorTemplate.java | 2 +- .../OrderedPartitionRecordBatch.java | 4 ++-- .../OrderedPartitionSenderCreator.java | 2 +- .../partitionsender/PartitionSenderRootExec.java | 2 +- .../impl/partitionsender/PartitionerDecorator.java | 6 +++--- .../impl/partitionsender/PartitionerTemplate.java | 2 +- .../producer/ProducerConsumerBatchCreator.java | 2 +- .../impl/project/ComplexToJsonBatchCreator.java | 2 +- .../physical/impl/project/OutputWidthVisitor.java | 2 +- .../physical/impl/project/ProjectBatchBuilder.java | 4 ++-- .../physical/impl/project/ProjectBatchCreator.java | 2 +- .../impl/project/ProjectMemoryManager.java | 2 +- .../impl/project/ProjectionMaterializer.java | 2 +- .../physical/impl/project/ProjectorTemplate.java | 2 +- .../impl/protocol/IndirectContainerAccessor.java | 2 +- .../RangePartitionRecordBatch.java | 2 +- .../RangePartitionSenderCreator.java | 2 +- .../exec/physical/impl/scan/ScanOperatorExec.java | 2 +- .../impl/scan/columns/ColumnsArrayManager.java | 2 +- .../impl/scan/columns/ColumnsArrayParser.java | 2 +- .../scan/convert/AbstractConvertFromString.java | 2 +- .../impl/scan/file/ImplicitColumnManager.java | 4 ++-- .../impl/scan/project/NullColumnBuilder.java | 2 +- .../scan/project/ReaderSchemaOrchestrator.java | 2 +- .../physical/impl/scan/project/ResolvedTuple.java | 2 +- .../impl/scan/project/ScanLevelProjection.java | 2 +- .../impl/scan/project/ScanSchemaOrchestrator.java | 2 +- .../impl/scan/v3/ScanLifecycleBuilder.java | 2 +- .../physical/impl/scan/v3/file/FileDescrip.java | 2 +- .../scan/v3/file/FileScanLifecycleBuilder.java | 2 +- .../impl/scan/v3/file/ImplicitColumnResolver.java | 2 +- .../impl/scan/v3/lifecycle/OutputBatchBuilder.java | 2 +- .../impl/scan/v3/lifecycle/ReaderLifecycle.java | 2 +- .../impl/scan/v3/schema/MutableTupleSchema.java | 2 +- .../impl/scan/v3/schema/ScanProjectionParser.java | 2 +- .../impl/scan/v3/schema/ScanSchemaTracker.java | 2 +- .../impl/scan/v3/schema/SchemaBasedTracker.java | 2 +- .../physical/impl/scan/v3/schema/SchemaUtils.java | 2 +- .../physical/impl/setop/HashSetOpRecordBatch.java | 2 +- .../physical/impl/setop/SetOpBatchCreator.java | 2 +- .../exec/physical/impl/sort/RecordBatchData.java | 2 +- .../exec/physical/impl/sort/SortBatchCreator.java | 2 +- .../physical/impl/sort/SortRecordBatchBuilder.java | 4 ++-- .../exec/physical/impl/sort/SortTemplate.java | 4 ++-- .../drill/exec/physical/impl/spill/SpillSet.java | 6 +++--- .../impl/statistics/StatisticsAggBatch.java | 2 +- .../impl/statistics/StatisticsAggBatchCreator.java | 2 +- .../impl/statistics/StatisticsMergeBatch.java | 2 +- .../statistics/StatisticsMergeBatchCreator.java | 2 +- .../physical/impl/svremover/SVRemoverCreator.java | 2 +- .../physical/impl/svremover/StraightCopier.java | 2 +- .../physical/impl/union/UnionAllBatchCreator.java | 2 +- .../physical/impl/union/UnionAllRecordBatch.java | 2 +- .../physical/impl/union/UnionAllerTemplate.java | 2 +- .../exec/physical/impl/unnest/UnnestImpl.java | 4 ++-- .../physical/impl/unnest/UnnestRecordBatch.java | 4 ++-- .../impl/unpivot/UnpivotMapsBatchCreator.java | 2 +- .../impl/unpivot/UnpivotMapsRecordBatch.java | 4 ++-- .../impl/validate/IteratorValidatorCreator.java | 2 +- .../impl/validate/IteratorValidatorInjector.java | 2 +- .../exec/physical/impl/window/WindowDataBatch.java | 2 +- .../impl/window/WindowFrameBatchCreator.java | 2 +- .../impl/window/WindowFrameRecordBatch.java | 2 +- .../exec/physical/impl/xsort/BufferedBatches.java | 2 +- .../impl/xsort/ExternalSortBatchCreator.java | 2 +- .../exec/physical/impl/xsort/MSortTemplate.java | 4 ++-- .../impl/xsort/PriorityQueueCopierWrapper.java | 2 +- .../impl/xsort/SingleBatchSorterTemplate.java | 4 ++-- .../drill/exec/physical/impl/xsort/SortImpl.java | 2 +- .../physical/impl/xsort/SortMemoryManager.java | 2 +- .../drill/exec/physical/impl/xsort/SpilledRun.java | 2 +- .../exec/physical/impl/xsort/SpilledRuns.java | 2 +- .../resultSet/impl/PullResultSetReaderImpl.java | 4 ++-- .../resultSet/impl/PushResultSetReaderImpl.java | 2 +- .../physical/resultSet/impl/RepeatedListState.java | 2 +- .../resultSet/impl/ResultSetCopierImpl.java | 2 +- .../apache/drill/exec/physical/rowSet/RowSet.java | 2 +- .../exec/planner/DFSDirPartitionLocation.java | 2 +- .../planner/FileSystemPartitionDescriptor.java | 6 +++--- .../exec/planner/ParquetPartitionDescriptor.java | 6 +++--- .../drill/exec/planner/PhysicalPlanReader.java | 2 +- .../apache/drill/exec/planner/PlannerPhase.java | 6 +++--- .../apache/drill/exec/planner/RuleInstance.java | 2 +- .../exec/planner/SimplePartitionLocation.java | 2 +- .../exec/planner/common/DrillJoinRelBase.java | 2 +- .../planner/common/DrillLateralJoinRelBase.java | 4 ++-- .../exec/planner/common/DrillProjectRelBase.java | 2 +- .../drill/exec/planner/common/DrillRelOptUtil.java | 6 +++--- .../exec/planner/common/DrillWriterRelBase.java | 4 ++-- .../planner/common/NumericEquiDepthHistogram.java | 8 ++++---- .../cost/DrillDefaultRelMetadataProvider.java | 2 +- .../drill/exec/planner/fragment/Fragment.java | 2 +- .../fragment/HardAffinityFragmentParallelizer.java | 4 ++-- .../drill/exec/planner/fragment/Materializer.java | 2 +- .../exec/planner/fragment/MemoryCalculator.java | 2 +- .../exec/planner/fragment/ParallelizationInfo.java | 8 ++++---- .../drill/exec/planner/fragment/PlanningSet.java | 2 +- .../exec/planner/fragment/SimpleParallelizer.java | 8 ++++---- .../fragment/SoftAffinityFragmentParallelizer.java | 6 +++--- .../exec/planner/fragment/StatsCollector.java | 2 +- .../drill/exec/planner/fragment/Wrapper.java | 6 +++--- .../contrib/ExchangeRemoverMaterializer.java | 2 +- .../fragment/contrib/SplittingParallelizer.java | 4 ++-- .../planner/index/AbstractIndexCollection.java | 2 +- .../exec/planner/index/DrillIndexDefinition.java | 2 +- .../planner/index/FindFiltersForCollation.java | 6 +++--- .../exec/planner/index/FunctionalIndexHelper.java | 6 +++--- .../exec/planner/index/IndexConditionInfo.java | 8 ++++---- .../drill/exec/planner/index/IndexGroup.java | 2 +- .../planner/index/IndexLogicalPlanCallContext.java | 2 +- .../index/IndexPhysicalPlanCallContext.java | 2 +- .../drill/exec/planner/index/IndexPlanUtils.java | 8 ++++---- .../drill/exec/planner/index/IndexSelector.java | 8 ++++---- .../exec/planner/index/IndexableExprMarker.java | 6 +++--- .../drill/exec/planner/index/PathInExpr.java | 2 +- .../drill/exec/planner/index/RexSeparator.java | 2 +- .../drill/exec/planner/index/RexToExpression.java | 4 ++-- .../drill/exec/planner/index/SimpleRexRemap.java | 4 ++-- .../generators/AbstractIndexPlanGenerator.java | 4 ++-- .../generators/CoveringIndexPlanGenerator.java | 4 ++-- .../generators/CoveringPlanNoFilterGenerator.java | 4 ++-- .../generators/IndexIntersectPlanGenerator.java | 6 +++--- .../generators/NonCoveringIndexPlanGenerator.java | 6 +++--- .../planner/index/rules/DbScanSortRemovalRule.java | 6 +++--- .../index/rules/DbScanToIndexScanPrule.java | 4 ++-- .../logical/ConvertCountToDirectScanRule.java | 2 +- .../ConvertMetadataAggregateToDirectScanRule.java | 6 +++--- .../exec/planner/logical/DrillAggregateRel.java | 2 +- .../exec/planner/logical/DrillConstExecutor.java | 2 +- .../exec/planner/logical/DrillImplementor.java | 2 +- .../drill/exec/planner/logical/DrillJoinRule.java | 2 +- .../drill/exec/planner/logical/DrillOptiq.java | 4 ++-- .../exec/planner/logical/DrillProjectRel.java | 2 +- .../logical/DrillPushFilterPastProjectRule.java | 2 +- .../planner/logical/DrillPushLimitToScanRule.java | 2 +- .../logical/DrillPushRowKeyJoinToScanRule.java | 2 +- .../planner/logical/DrillReduceAggregatesRule.java | 6 +++--- .../logical/DrillReduceExpressionsRule.java | 2 +- .../drill/exec/planner/logical/DrillScanRel.java | 2 +- .../exec/planner/logical/DrillSemiJoinRel.java | 4 ++-- .../drill/exec/planner/logical/DrillSortRel.java | 4 ++-- .../drill/exec/planner/logical/DrillWindowRel.java | 2 +- .../drill/exec/planner/logical/DrillWriterRel.java | 4 ++-- .../planner/logical/MetadataControllerRel.java | 2 +- .../exec/planner/logical/PreProcessLogicalRel.java | 2 +- .../drill/exec/planner/logical/RowKeyJoinRel.java | 2 +- .../exec/planner/logical/ScanFieldDeterminer.java | 6 +++--- .../logical/partition/FindPartitionConditions.java | 2 +- .../planner/logical/partition/PruneScanRule.java | 2 +- .../partition/RewriteAsBinaryOperators.java | 4 ++-- .../partition/RewriteCombineBinaryOperators.java | 4 ++-- .../drill/exec/planner/physical/AggPrelBase.java | 2 +- .../drill/exec/planner/physical/AggPruleBase.java | 2 +- .../drill/exec/planner/physical/AnalyzePrule.java | 6 +++--- .../physical/ConvertCountToDirectScanPrule.java | 2 +- .../drill/exec/planner/physical/HashAggPrule.java | 4 ++-- .../drill/exec/planner/physical/HashJoinPrel.java | 4 ++-- .../drill/exec/planner/physical/HashPrelUtil.java | 4 ++-- .../planner/physical/HashToRandomExchangePrel.java | 2 +- .../drill/exec/planner/physical/JoinPrel.java | 2 +- .../drill/exec/planner/physical/JoinPruleBase.java | 4 ++-- .../exec/planner/physical/LateralJoinPrel.java | 4 ++-- .../physical/LimitExchangeTransposeRule.java | 2 +- .../drill/exec/planner/physical/MergeJoinPrel.java | 2 +- .../exec/planner/physical/MergeJoinPrule.java | 2 +- .../exec/planner/physical/MetadataAggPrule.java | 2 +- .../planner/physical/MetadataControllerPrel.java | 2 +- .../exec/planner/physical/MetadataHandlerPrel.java | 2 +- .../exec/planner/physical/MetadataHashAggPrel.java | 2 +- .../planner/physical/MetadataStreamAggPrel.java | 2 +- .../exec/planner/physical/NestedLoopJoinPrule.java | 2 +- .../exec/planner/physical/PhysicalPlanCreator.java | 2 +- .../drill/exec/planner/physical/PrelFactories.java | 2 +- .../exec/planner/physical/ProjectAllowDupPrel.java | 2 +- .../drill/exec/planner/physical/ProjectPrel.java | 2 +- .../drill/exec/planner/physical/ProjectPrule.java | 4 ++-- .../exec/planner/physical/RowKeyJoinPrel.java | 2 +- .../drill/exec/planner/physical/SetOpPrel.java | 2 +- .../drill/exec/planner/physical/SetOpPrule.java | 6 +++--- .../drill/exec/planner/physical/SortPrel.java | 2 +- .../drill/exec/planner/physical/SortPrule.java | 4 ++-- .../drill/exec/planner/physical/StatsAggPrel.java | 2 +- .../exec/planner/physical/StatsMergePrel.java | 2 +- .../exec/planner/physical/StreamAggPrule.java | 4 ++-- .../exec/planner/physical/SubsetTransformer.java | 2 +- .../drill/exec/planner/physical/TopNPrel.java | 2 +- .../drill/exec/planner/physical/UnionAllPrel.java | 2 +- .../drill/exec/planner/physical/UnionAllPrule.java | 6 +++--- .../exec/planner/physical/UnionDistinctPrel.java | 2 +- .../exec/planner/physical/UnionDistinctPrule.java | 2 +- .../drill/exec/planner/physical/WindowPrel.java | 4 ++-- .../drill/exec/planner/physical/WindowPrule.java | 8 ++++---- .../drill/exec/planner/physical/WriterPrule.java | 4 ++-- .../physical/explain/NumberingRelWriter.java | 2 +- .../planner/physical/explain/PrelSequencer.java | 4 ++-- .../visitor/AdjustOperatorsSchemaVisitor.java | 4 ++-- .../visitor/ExcessiveExchangeIdentifier.java | 2 +- .../physical/visitor/FinalColumnReorderer.java | 2 +- .../visitor/InsertLocalExchangeVisitor.java | 2 +- .../visitor/LateralUnnestRowIDVisitor.java | 2 +- .../visitor/ProducerConsumerPrelVisitor.java | 2 +- .../planner/physical/visitor/RelUniqifier.java | 4 ++-- .../physical/visitor/RewriteProjectToFlatten.java | 2 +- .../physical/visitor/RuntimeFilterVisitor.java | 4 ++-- .../visitor/SelectionVectorPrelVisitor.java | 2 +- .../visitor/SplitUpComplexExpressions.java | 4 ++-- .../physical/visitor/StarColumnConverter.java | 2 +- .../physical/visitor/SwapHashJoinVisitor.java | 2 +- .../org/apache/drill/exec/planner/sql/Checker.java | 2 +- .../exec/planner/sql/DrillConvertletTable.java | 2 +- .../drill/exec/planner/sql/DrillOperatorTable.java | 6 +++--- .../drill/exec/planner/sql/DrillSqlOperator.java | 2 +- .../sql/DrillSqlOperatorWithoutInference.java | 2 +- .../drill/exec/planner/sql/DrillSqlWorker.java | 2 +- .../exec/planner/sql/ExpandingConcurrentMap.java | 2 +- .../drill/exec/planner/sql/SchemaUtilities.java | 6 +++--- .../drill/exec/planner/sql/TypeInferenceUtils.java | 6 +++--- .../sql/conversion/DrillCalciteCatalogReader.java | 8 ++++---- .../exec/planner/sql/conversion/DrillTableKey.java | 2 +- .../planner/sql/conversion/DrillViewExpander.java | 2 +- .../planner/sql/handlers/ComplexUnnestVisitor.java | 2 +- .../sql/handlers/CreateFunctionHandler.java | 2 +- .../planner/sql/handlers/CreateTableHandler.java | 4 ++-- .../planner/sql/handlers/DefaultSqlHandler.java | 10 +++++----- .../sql/handlers/DescribeSchemaHandler.java | 2 +- .../exec/planner/sql/handlers/DrillTableInfo.java | 2 +- .../planner/sql/handlers/DropFunctionHandler.java | 2 +- .../exec/planner/sql/handlers/ExplainHandler.java | 2 +- .../planner/sql/handlers/FindLimit0Visitor.java | 4 ++-- .../sql/handlers/MetastoreAnalyzeTableHandler.java | 4 ++-- .../exec/planner/sql/handlers/SchemaHandler.java | 2 +- .../exec/planner/sql/handlers/SqlHandlerUtil.java | 4 ++-- .../sql/parser/CompoundIdentifierConverter.java | 2 +- .../sql/parser/DrillCompoundIdentifier.java | 6 +++--- .../exec/planner/sql/parser/SqlAnalyzeTable.java | 6 +++--- .../exec/planner/sql/parser/SqlCreateFunction.java | 2 +- .../exec/planner/sql/parser/SqlCreateTable.java | 4 ++-- .../exec/planner/sql/parser/SqlCreateView.java | 2 +- .../exec/planner/sql/parser/SqlDropFunction.java | 2 +- .../exec/planner/sql/parser/SqlDropTable.java | 2 +- .../drill/exec/planner/sql/parser/SqlDropView.java | 2 +- .../planner/sql/parser/SqlRefreshMetadata.java | 2 +- .../exec/planner/sql/parser/SqlShowSchemas.java | 2 +- .../exec/planner/sql/parser/SqlShowTables.java | 2 +- .../sql/parser/UnsupportedOperatorsVisitor.java | 2 +- .../sql/parser/impl/DrillSqlParseException.java | 2 +- .../planner/types/AbstractRelDataTypeHolder.java | 4 ++-- .../record/AbstractTableFunctionRecordBatch.java | 2 +- .../org/apache/drill/exec/record/BatchSchema.java | 4 ++-- .../drill/exec/record/HyperVectorWrapper.java | 2 +- .../drill/exec/record/RecordBatchLoader.java | 2 +- .../exec/record/RecordBatchMemoryManager.java | 2 +- .../apache/drill/exec/record/RecordBatchSizer.java | 2 +- .../apache/drill/exec/record/RecordIterator.java | 4 ++-- .../apache/drill/exec/record/SchemaBuilder.java | 2 +- .../org/apache/drill/exec/record/SchemaUtil.java | 8 ++++---- .../drill/exec/record/SimpleVectorWrapper.java | 2 +- .../org/apache/drill/exec/record/TypedFieldId.java | 2 +- .../apache/drill/exec/record/VectorContainer.java | 8 ++++---- .../drill/exec/record/VectorInitializer.java | 2 +- .../apache/drill/exec/record/WritableBatch.java | 2 +- .../record/selection/SelectionVector4Builder.java | 2 +- .../drill/exec/resolver/ExactFunctionResolver.java | 2 +- .../exec/resolver/ResolverTypePrecedence.java | 4 ++-- .../apache/drill/exec/resolver/TypeCastRules.java | 4 ++-- .../resourcemgr/config/QueueAssignmentResult.java | 2 +- .../exec/resourcemgr/config/ResourcePoolImpl.java | 4 ++-- .../resourcemgr/config/ResourcePoolTreeImpl.java | 2 +- .../resourcemgr/config/selectors/AclSelector.java | 4 ++-- .../config/selectors/NotEqualSelector.java | 2 +- .../drill/exec/rpc/AbstractClientConnection.java | 2 +- .../AbstractDisposableUserClientConnection.java | 2 +- .../drill/exec/rpc/AbstractServerConnection.java | 4 ++-- .../org/apache/drill/exec/rpc/BitRpcUtility.java | 2 +- .../rpc/control/ConnectionManagerRegistry.java | 2 +- .../drill/exec/rpc/control/ControlConnection.java | 2 +- .../exec/rpc/control/ControlConnectionConfig.java | 2 +- .../drill/exec/rpc/control/ControllerImpl.java | 2 +- .../exec/rpc/control/CustomHandlerRegistry.java | 2 +- .../drill/exec/rpc/control/WorkEventBus.java | 2 +- .../org/apache/drill/exec/rpc/data/AckSender.java | 2 +- .../drill/exec/rpc/data/DataConnectionCreator.java | 2 +- .../drill/exec/rpc/data/IncomingDataBatch.java | 2 +- .../drill/exec/rpc/security/AuthStringUtil.java | 6 +++--- .../rpc/security/AuthenticatorProviderImpl.java | 2 +- .../exec/rpc/security/FastSaslClientFactory.java | 6 +++--- .../exec/rpc/security/FastSaslServerFactory.java | 6 +++--- .../exec/rpc/security/SecurityConfiguration.java | 2 +- .../rpc/security/ServerAuthenticationHandler.java | 6 +++--- .../exec/rpc/user/BlockingResultsListener.java | 4 ++-- .../exec/rpc/user/InboundImpersonationManager.java | 4 ++-- .../drill/exec/rpc/user/QueryResultHandler.java | 4 ++-- .../org/apache/drill/exec/rpc/user/UserClient.java | 10 +++++----- .../apache/drill/exec/rpc/user/UserRpcConfig.java | 4 ++-- .../apache/drill/exec/rpc/user/UserRpcUtils.java | 2 +- .../apache/drill/exec/rpc/user/UserSession.java | 6 +++--- .../user/security/UserAuthenticatorFactory.java | 2 +- .../org/apache/drill/exec/schema/DataRecord.java | 6 +++--- .../org/apache/drill/exec/schema/DiffSchema.java | 2 +- .../java/org/apache/drill/exec/schema/Field.java | 4 ++-- .../org/apache/drill/exec/schema/ListSchema.java | 8 ++++---- .../org/apache/drill/exec/schema/NamedField.java | 2 +- .../org/apache/drill/exec/schema/ObjectSchema.java | 8 ++++---- .../org/apache/drill/exec/schema/OrderedField.java | 2 +- .../exec/serialization/JacksonSerializer.java | 2 +- .../drill/exec/serialization/ProtoSerializer.java | 4 ++-- .../org/apache/drill/exec/server/Drillbit.java | 4 ++-- .../apache/drill/exec/server/DrillbitContext.java | 2 +- .../exec/server/options/FallbackOptionManager.java | 2 +- .../exec/server/options/FragmentOptionManager.java | 2 +- .../exec/server/options/OptionDefinition.java | 2 +- .../drill/exec/server/options/OptionValue.java | 2 +- .../exec/server/options/PersistedOptionValue.java | 2 +- .../exec/server/options/SessionOptionManager.java | 4 ++-- .../exec/server/options/SystemOptionManager.java | 4 ++-- .../drill/exec/server/options/TypeValidators.java | 4 ++-- .../drill/exec/server/rest/DrillRestServer.java | 2 +- .../apache/drill/exec/server/rest/DrillRoot.java | 6 +++--- .../exec/server/rest/LogInLogOutResources.java | 2 +- .../drill/exec/server/rest/LogsResources.java | 4 ++-- .../drill/exec/server/rest/QueryResources.java | 6 +++--- .../drill/exec/server/rest/QueryWrapper.java | 4 ++-- .../exec/server/rest/ViewableWithPermissions.java | 2 +- .../drill/exec/server/rest/WebUserConnection.java | 6 +++--- .../auth/DrillHttpConstraintSecurityHandler.java | 2 +- .../auth/DrillHttpSecurityHandlerProvider.java | 2 +- .../exec/server/rest/auth/DrillUserPrincipal.java | 2 +- .../drill/exec/server/rest/profile/Filters.java | 4 ++-- .../exec/server/rest/profile/FragmentWrapper.java | 4 ++-- .../exec/server/rest/profile/OperatorWrapper.java | 2 +- .../exec/server/rest/profile/ProfileResources.java | 8 ++++---- .../exec/server/rest/profile/ProfileWrapper.java | 2 +- .../apache/drill/exec/service/ServiceEngine.java | 2 +- .../org/apache/drill/exec/ssl/SSLConfigServer.java | 2 +- .../drill/exec/store/AbstractRecordReader.java | 4 ++-- .../apache/drill/exec/store/AbstractSchema.java | 4 ++-- .../drill/exec/store/ClassPathFileSystem.java | 2 +- .../drill/exec/store/ClassicConnectorLocator.java | 6 +++--- .../apache/drill/exec/store/ColumnExplorer.java | 4 ++-- .../apache/drill/exec/store/ConnectorHandle.java | 2 +- .../exec/store/PluginBootstrapLoaderImpl.java | 6 +++--- .../org/apache/drill/exec/store/PluginHandle.java | 2 +- .../drill/exec/store/ResourceInputStream.java | 2 +- .../org/apache/drill/exec/store/SchemaConfig.java | 4 ++-- .../drill/exec/store/SchemaTreeProvider.java | 2 +- .../org/apache/drill/exec/store/StoragePlugin.java | 2 +- .../apache/drill/exec/store/StoragePluginMap.java | 2 +- .../exec/store/StoragePluginRegistryImpl.java | 8 ++++---- .../exec/store/StoragePluginRulesSupplier.java | 2 +- .../drill/exec/store/StoragePluginStoreImpl.java | 2 +- .../apache/drill/exec/store/StorageStrategy.java | 2 +- .../apache/drill/exec/store/SubSchemaWrapper.java | 2 +- .../org/apache/drill/exec/store/TimedCallable.java | 8 ++++---- .../store/avro/AvroColumnConverterFactory.java | 2 +- .../drill/exec/store/avro/AvroFormatConfig.java | 2 +- .../exec/store/base/filter/ConstantHolder.java | 2 +- .../drill/exec/store/base/filter/ExprNode.java | 2 +- .../store/base/filter/FilterPushDownStrategy.java | 2 +- .../drill/exec/store/dfs/BasicFormatMatcher.java | 2 +- .../exec/store/dfs/DrillFSDataInputStream.java | 2 +- .../drill/exec/store/dfs/DrillFileSystem.java | 4 ++-- .../apache/drill/exec/store/dfs/FileSelection.java | 6 +++--- .../drill/exec/store/dfs/FileSystemConfig.java | 4 ++-- .../drill/exec/store/dfs/FileSystemPlugin.java | 4 ++-- .../apache/drill/exec/store/dfs/FormatPlugin.java | 2 +- .../store/dfs/FormatPluginOptionExtractor.java | 2 +- .../drill/exec/store/dfs/MetadataContext.java | 2 +- .../exec/store/dfs/WorkspaceSchemaFactory.java | 8 ++++---- .../exec/store/dfs/easy/ClassicScanBuilder.java | 6 +++--- .../exec/store/dfs/easy/EasyFormatPlugin.java | 2 +- .../drill/exec/store/dfs/easy/EasyGroupScan.java | 8 ++++---- .../exec/store/easy/json/JSONFormatConfig.java | 2 +- .../exec/store/easy/json/JSONRecordReader.java | 4 ++-- .../exec/store/easy/json/JsonRecordWriter.java | 2 +- .../exec/store/easy/json/loader/FieldDefn.java | 2 +- .../easy/json/loader/InferredFieldFactory.java | 2 +- .../easy/json/loader/ProvidedFieldFactory.java | 2 +- .../easy/json/parser/JsonStructureParser.java | 2 +- .../exec/store/easy/json/parser/ObjectParser.java | 2 +- .../exec/store/easy/json/parser/RootParser.java | 2 +- .../easy/json/parser/SimpleMessageParser.java | 2 +- .../store/easy/json/reader/BaseJsonProcessor.java | 2 +- .../easy/sequencefile/SequenceFileBatchReader.java | 2 +- .../sequencefile/SequenceFileFormatConfig.java | 2 +- .../exec/store/easy/text/TextFormatConfig.java | 4 ++-- .../exec/store/easy/text/reader/HeaderBuilder.java | 2 +- .../exec/store/easy/text/reader/TextInput.java | 2 +- .../easy/text/reader/TextParsingSettings.java | 2 +- .../store/enumerable/EnumerableBatchCreator.java | 2 +- .../exec/store/enumerable/EnumerableGroupScan.java | 2 +- .../store/enumerable/EnumerableRecordReader.java | 2 +- .../store/enumerable/plan/DrillJdbcRuleBase.java | 6 +++--- .../drill/exec/store/ischema/FilterEvaluator.java | 2 +- .../drill/exec/store/ischema/InfoSchemaFilter.java | 4 ++-- .../store/ischema/InfoSchemaFilterBuilder.java | 2 +- .../exec/store/ischema/InfoSchemaGroupScan.java | 2 +- .../InfoSchemaPushFilterIntoRecordGenerator.java | 2 +- .../store/ischema/InfoSchemaStoragePlugin.java | 2 +- .../apache/drill/exec/store/ischema/Records.java | 2 +- .../drill/exec/store/mock/MockGroupScanPOP.java | 2 +- .../exec/store/mock/MockScanBatchCreator.java | 2 +- .../drill/exec/store/mock/MockStorageEngine.java | 6 +++--- .../drill/exec/store/mock/MockSubScanPOP.java | 2 +- .../store/parquet/AbstractParquetGroupScan.java | 10 +++++----- .../parquet/AbstractParquetScanBatchCreator.java | 6 +++--- .../store/parquet/BaseParquetMetadataProvider.java | 10 +++++----- .../exec/store/parquet/FilePushDownFilter.java | 2 +- .../drill/exec/store/parquet/FooterGatherer.java | 2 +- .../exec/store/parquet/ParquetFormatPlugin.java | 4 ++-- .../drill/exec/store/parquet/ParquetGroupScan.java | 2 +- .../store/parquet/ParquetGroupScanStatistics.java | 4 ++-- .../exec/store/parquet/ParquetReaderUtility.java | 2 +- .../exec/store/parquet/ParquetRowGroupScan.java | 2 +- .../store/parquet/ParquetScanBatchCreator.java | 2 +- .../store/parquet/ParquetTableMetadataUtils.java | 10 +++++----- .../parquet/columnreaders/AsyncPageReader.java | 2 +- .../store/parquet/columnreaders/BatchReader.java | 6 +++--- .../store/parquet/columnreaders/ColumnReader.java | 2 +- .../NullableFixedByteAlignedReaders.java | 4 ++-- .../store/parquet/columnreaders/PageReader.java | 4 ++-- .../ParquetFixedWidthDictionaryReaders.java | 4 ++-- .../parquet/columnreaders/ParquetRecordReader.java | 4 ++-- .../store/parquet/columnreaders/ParquetSchema.java | 2 +- .../columnreaders/ParquetToDrillTypeConverter.java | 2 +- .../parquet/columnreaders/VarLenBinaryReader.java | 6 +++--- .../columnreaders/VarLenBulkPageReader.java | 2 +- .../columnreaders/VarLenEntryDictionaryReader.java | 2 +- .../parquet/columnreaders/VarLenEntryReader.java | 2 +- .../columnreaders/VarLenFixedEntryReader.java | 2 +- .../VarLenNullableDictionaryReader.java | 2 +- .../columnreaders/VarLenNullableEntryReader.java | 2 +- .../VarLenNullableFixedEntryReader.java | 2 +- .../columnreaders/VarLenOverflowReader.java | 2 +- .../batchsizing/RecordBatchSizerManager.java | 2 +- .../decimal/Int32DecimalParquetValueWriter.java | 2 +- .../decimal/Int64DecimalParquetValueWriter.java | 2 +- .../exec/store/parquet/metadata/Metadata.java | 4 ++-- .../store/parquet/metadata/MetadataPathUtils.java | 2 +- .../store/parquet/metadata/MetadataVersion.java | 6 +++--- .../store/parquet2/DrillParquetGroupConverter.java | 4 ++-- .../exec/store/parquet2/DrillParquetReader.java | 2 +- .../exec/store/pojo/DynamicPojoRecordReader.java | 2 +- .../apache/drill/exec/store/pojo/PojoWriters.java | 2 +- .../drill/exec/store/schedule/AffinityCreator.java | 2 +- .../exec/store/schedule/AssignmentCreator.java | 12 ++++++------ .../drill/exec/store/schedule/BlockMapBuilder.java | 14 +++++++------- .../store/security/CredentialProviderUtils.java | 2 +- .../exec/store/sys/ExtendedOptionIterator.java | 2 +- .../drill/exec/store/sys/OptionIterator.java | 4 ++-- .../exec/store/sys/PersistentStoreConfig.java | 4 ++-- .../exec/store/sys/PersistentStoreRegistry.java | 2 +- .../drill/exec/store/sys/ProfileInfoIterator.java | 4 ++-- .../drill/exec/store/sys/ProfileJsonIterator.java | 4 ++-- .../exec/store/sys/SystemTableBatchCreator.java | 2 +- .../drill/exec/store/sys/SystemTableScan.java | 2 +- .../drill/exec/store/sys/VersionIterator.java | 2 +- .../drill/exec/store/sys/store/InMemoryStore.java | 2 +- .../store/sys/store/ZookeeperPersistentStore.java | 6 +++--- .../provider/ZookeeperPersistentStoreProvider.java | 2 +- .../exec/testing/CountDownLatchInjectionImpl.java | 2 +- .../drill/exec/testing/ExecutionControls.java | 2 +- .../exec/testing/ExecutionControlsInjector.java | 2 +- .../apache/drill/exec/testing/InjectionSite.java | 2 +- .../exec/testing/store/NoWriteLocalStore.java | 4 ++-- .../drill/exec/util/ArrayWrappedIntIntMap.java | 2 +- .../org/apache/drill/exec/util/BatchPrinter.java | 2 +- .../drill/exec/util/DrillFileSystemUtil.java | 2 +- .../drill/exec/util/EncodedSchemaPathSet.java | 8 ++++---- .../apache/drill/exec/util/ImpersonationUtil.java | 12 ++++++------ .../drill/exec/util/MemoryAllocationUtilities.java | 2 +- .../java/org/apache/drill/exec/util/Utilities.java | 2 +- .../org/apache/drill/exec/util/VectorUtil.java | 4 ++-- .../exec/util/concurrent/ExecutorServiceUtil.java | 2 +- .../filereader/BufferedDirectBufInputStream.java | 4 ++-- .../exec/util/filereader/DirectBufInputStream.java | 4 ++-- .../drill/exec/util/record/RecordBatchStats.java | 2 +- .../exec/vector/complex/fn/BasicJsonOutput.java | 2 +- .../exec/vector/complex/fn/FieldSelection.java | 2 +- .../drill/exec/vector/complex/fn/JsonReader.java | 6 +++--- .../exec/vector/complex/fn/WorkingBuffer.java | 2 +- .../org/apache/drill/exec/work/QueryWorkUnit.java | 2 +- .../org/apache/drill/exec/work/WorkManager.java | 6 +++--- .../exec/work/batch/AbstractDataCollector.java | 2 +- .../drill/exec/work/batch/IncomingBuffers.java | 4 ++-- .../drill/exec/work/batch/ResponseSenderQueue.java | 4 ++-- .../exec/work/batch/SpoolingRawBatchBuffer.java | 8 ++++---- .../exec/work/batch/UnlimitedRawBatchBuffer.java | 2 +- .../apache/drill/exec/work/filter/BloomFilter.java | 2 +- .../drill/exec/work/filter/RuntimeFilterSink.java | 2 +- .../exec/work/filter/RuntimeFilterWritable.java | 2 +- .../apache/drill/exec/work/foreman/Foreman.java | 4 ++-- .../drill/exec/work/foreman/FragmentsRunner.java | 8 ++++---- .../drill/exec/work/foreman/QueryManager.java | 6 +++--- .../exec/work/foreman/rm/EmbeddedQueryQueue.java | 2 +- .../work/foreman/rm/ThrottledResourceManager.java | 4 ++-- .../exec/work/fragment/NonRootFragmentManager.java | 2 +- .../drill/exec/work/metadata/MetadataProvider.java | 8 ++++---- .../exec/work/metadata/ServerMetaProvider.java | 4 ++-- .../work/prepare/PreparedStatementProvider.java | 2 +- .../apache/drill/exec/work/user/PlanSplitter.java | 2 +- .../test/java/org/apache/drill/PlanTestBase.java | 4 ++-- .../test/java/org/apache/drill/PlanningBase.java | 8 ++++---- .../test/java/org/apache/drill/TestBugFixes.java | 2 +- .../java/org/apache/drill/TestFrameworkTest.java | 2 +- .../drill/TestFunctionsWithTypeExpoQueries.java | 2 +- .../src/test/java/org/apache/drill/TestSetOp.java | 2 +- .../drill/TestTpchDistributedConcurrent.java | 2 +- .../test/java/org/apache/drill/TestUnionAll.java | 2 +- .../java/org/apache/drill/TestUnionDistinct.java | 2 +- .../drill/exec/DrillSeparatePlanningTest.java | 2 +- .../org/apache/drill/exec/DrillSystemTestBase.java | 2 +- .../java/org/apache/drill/exec/RunRootExec.java | 6 +++--- .../org/apache/drill/exec/TestEmptyInputSql.java | 2 +- .../org/apache/drill/exec/TestOpSerialization.java | 2 +- .../apache/drill/exec/TestQueriesOnLargeFile.java | 4 ++-- .../drill/exec/client/DrillClientSystemTest.java | 4 ++-- .../org/apache/drill/exec/client/DumpCatTest.java | 4 ++-- .../exec/compile/CodeCompilerTestFactory.java | 2 +- .../exec/compile/bytecode/ReplaceMethodInvoke.java | 4 ++-- .../drill/exec/coord/zk/TestZookeeperClient.java | 2 +- .../exec/expr/fn/FunctionInitializerTest.java | 2 +- .../exec/expr/fn/impl/TestStringFunctions.java | 2 +- .../fn/registry/FunctionRegistryHolderTest.java | 4 ++-- .../drill/exec/fn/impl/TestAggregateFunction.java | 4 ++-- .../drill/exec/fn/impl/TestAggregateFunctions.java | 8 ++++---- .../drill/exec/fn/impl/TestCastFunctions.java | 4 ++-- .../drill/exec/fn/impl/TestDateFunctions.java | 4 ++-- .../drill/exec/fn/impl/TestMathFunctions.java | 4 ++-- .../drill/exec/fn/impl/TestMultiInputAdd.java | 4 ++-- .../exec/fn/impl/TestNewAggregateFunctions.java | 4 ++-- .../drill/exec/fn/impl/TestNewMathFunctions.java | 4 ++-- .../drill/exec/fn/impl/TestRepeatedFunction.java | 4 ++-- .../exec/fn/interp/ExpressionInterpreterTest.java | 2 +- .../drill/exec/fn/interp/TestConstantFolding.java | 4 ++-- .../exec/impersonation/BaseTestImpersonation.java | 4 ++-- .../TestImpersonationDisabledWithMiniDFS.java | 2 +- .../impersonation/TestImpersonationMetadata.java | 4 ++-- .../impersonation/TestImpersonationQueries.java | 2 +- .../impersonation/TestInboundImpersonation.java | 2 +- .../TestInboundImpersonationPrivileges.java | 4 ++-- .../apache/drill/exec/memory/TestAllocators.java | 6 +++--- .../TestMetastoreWithEasyFormatPlugin.java | 4 ++-- .../physical/config/TestParsePhysicalPlan.java | 4 ++-- .../drill/exec/physical/impl/MockRecordBatch.java | 2 +- .../drill/exec/physical/impl/SimpleRootExec.java | 2 +- .../exec/physical/impl/TestBroadcastExchange.java | 4 ++-- .../exec/physical/impl/TestCastFunctions.java | 4 ++-- .../physical/impl/TestCastVarCharToBigInt.java | 4 ++-- .../physical/impl/TestComparisonFunctions.java | 4 ++-- .../exec/physical/impl/TestConvertFunctions.java | 4 ++-- .../drill/exec/physical/impl/TestDecimal.java | 4 ++-- .../physical/impl/TestDistributedFragmentRun.java | 4 ++-- .../exec/physical/impl/TestExtractFunctions.java | 4 ++-- .../physical/impl/TestHashToRandomExchange.java | 4 ++-- .../physical/impl/TestImplicitCastFunctions.java | 4 ++-- .../exec/physical/impl/TestLocalExchange.java | 6 +++--- .../physical/impl/TestReverseImplicitCast.java | 4 ++-- .../exec/physical/impl/TestSimpleFragmentRun.java | 4 ++-- .../exec/physical/impl/TestSimpleFunctions.java | 4 ++-- .../exec/physical/impl/TestStringFunctions.java | 4 ++-- .../exec/physical/impl/TestUnionExchange.java | 4 ++-- .../physical/impl/TopN/TestTopNEmitOutcome.java | 2 +- .../exec/physical/impl/TopN/TopNBatchTest.java | 2 +- .../drill/exec/physical/impl/agg/TestAgg.java | 4 ++-- .../exec/physical/impl/agg/TestHashAggBatch.java | 6 +++--- .../physical/impl/common/HashPartitionTest.java | 2 +- .../common/HashTableAllocationTrackerTest.java | 2 +- .../physical/impl/filter/TestSimpleFilter.java | 4 ++-- .../exec/physical/impl/flatten/TestFlatten.java | 2 +- .../exec/physical/impl/join/PartitionStatImpl.java | 4 ++-- .../impl/join/TestBuildSidePartitioningImpl.java | 2 +- .../exec/physical/impl/join/TestHashJoin.java | 4 ++-- .../exec/physical/impl/join/TestHashJoinJPPD.java | 2 +- .../physical/impl/join/TestHashJoinOutcome.java | 2 +- .../exec/physical/impl/join/TestHashJoinSpill.java | 2 +- ...estHashTableSizeCalculatorConservativeImpl.java | 2 +- .../join/TestHashTableSizeCalculatorLeanImpl.java | 2 +- .../impl/join/TestLateralJoinCorrectness.java | 2 +- .../TestLateralJoinCorrectnessBatchProcessing.java | 2 +- .../exec/physical/impl/join/TestMergeJoin.java | 6 +++--- .../impl/join/TestMergeJoinMulCondition.java | 4 ++-- .../impl/join/TestPostBuildCalculationsImpl.java | 4 ++-- .../impl/limit/TestEarlyLimit0Optimization.java | 2 +- .../physical/impl/limit/TestLimitOperator.java | 2 +- .../exec/physical/impl/limit/TestSimpleLimit.java | 4 ++-- .../impl/mergereceiver/TestMergingReceiver.java | 4 ++-- .../TestOrderedPartitionExchange.java | 6 +++--- .../impl/partitionsender/TestPartitionSender.java | 2 +- .../impl/project/TestSimpleProjection.java | 4 ++-- .../exec/physical/impl/scan/ScanTestUtils.java | 4 ++-- .../exec/physical/impl/scan/TestColumnsArray.java | 2 +- .../impl/scan/TestColumnsArrayFramework.java | 2 +- .../physical/impl/scan/TestColumnsArrayParser.java | 2 +- .../impl/scan/TestImplicitColumnParser.java | 2 +- .../impl/scan/TestImplicitColumnProjection.java | 2 +- .../scan/TestScanOrchestratorImplicitColumns.java | 2 +- .../impl/scan/project/TestSchemaSmoothing.java | 2 +- .../physical/impl/scan/v3/file/FileScanUtils.java | 2 +- .../scan/v3/lifecycle/TestOutputBatchBuilder.java | 2 +- .../exec/physical/impl/sort/TestSimpleSort.java | 4 ++-- .../impl/trace/TestTraceMultiRecordBatch.java | 4 ++-- .../physical/impl/trace/TestTraceOutputDump.java | 4 ++-- .../exec/physical/impl/union/TestSimpleUnion.java | 4 ++-- .../unnest/TestUnnestWithLateralCorrectness.java | 2 +- .../physical/impl/writer/TestParquetWriter.java | 4 ++-- .../exec/physical/impl/writer/TestWriter.java | 4 ++-- .../physical/impl/xsort/SortTestUtilities.java | 2 +- .../physical/impl/xsort/TestExternalSortExec.java | 2 +- .../physical/impl/xsort/TestSortEmitOutcome.java | 2 +- .../exec/physical/impl/xsort/TestSortImpl.java | 4 ++-- .../drill/exec/physical/impl/xsort/TestSorter.java | 2 +- .../impl/TestResultSetLoaderEmptyProject.java | 2 +- .../impl/TestResultSetLoaderOverflow.java | 2 +- .../impl/TestResultSetLoaderRepeatedList.java | 2 +- .../resultSet/impl/TestResultSetLoaderTorture.java | 2 +- .../resultSet/impl/TestResultSetLoaderUnions.java | 2 +- .../resultSet/impl/TestResultSetReader.java | 2 +- .../physical/rowSet/TestVariableWidthWriter.java | 2 +- .../physical/unit/BasicPhysicalOpUnitTest.java | 2 +- .../exec/physical/unit/MiniPlanUnitTestBase.java | 4 ++-- .../drill/exec/physical/unit/TestMiniPlan.java | 2 +- .../exec/physical/unit/TestNullInputMiniPlan.java | 2 +- .../exec/physical/unit/TestOutputBatchSize.java | 4 ++-- .../exec/planner/TestDirectoryExplorerUDFs.java | 6 +++--- .../common/TestNumericEquiDepthHistogram.java | 4 ++-- .../TestHardAffinityFragmentParallelizer.java | 4 ++-- .../planner/logical/DrillLogicalTestUtils.java | 2 +- .../drill/exec/planner/logical/DrillOptiqTest.java | 2 +- .../exec/planner/rm/TestMemoryCalculator.java | 2 +- .../org/apache/drill/exec/pop/PopUnitTestBase.java | 4 ++-- .../apache/drill/exec/pop/TestFragmentChecker.java | 2 +- .../apache/drill/exec/pop/TestInjectionValue.java | 4 ++-- .../record/ExpressionTreeMaterializerTest.java | 4 ++-- .../drill/exec/record/TestRecordIterator.java | 6 +++--- .../drill/exec/record/TestVectorContainer.java | 2 +- .../drill/exec/record/vector/TestDateTypes.java | 4 ++-- .../drill/exec/record/vector/TestValueVector.java | 4 ++-- .../drill/exec/rpc/data/TestBitBitKerberos.java | 6 +++--- .../org/apache/drill/exec/rpc/data/TestBitRpc.java | 4 ++-- .../rpc/user/security/TestUserBitKerberos.java | 2 +- .../security/TestUserBitKerberosEncryption.java | 2 +- .../security/TestUserBitSaslCompatibility.java | 2 +- .../drill/exec/server/TestDrillbitResilience.java | 2 +- .../drill/exec/server/TestOptionsAuthEnabled.java | 2 +- .../exec/server/rest/TestMainLoginPageModel.java | 2 +- .../drill/exec/server/rest/TestRestJson.java | 2 +- .../rest/spnego/TestDrillSpnegoAuthenticator.java | 2 +- .../rest/spnego/TestSpnegoAuthentication.java | 2 +- .../exec/server/rest/spnego/TestSpnegoConfig.java | 2 +- .../apache/drill/exec/sql/TestBaseViewSupport.java | 2 +- .../java/org/apache/drill/exec/sql/TestCTAS.java | 2 +- .../java/org/apache/drill/exec/sql/TestCTTAS.java | 2 +- .../drill/exec/sql/TestMetastoreCommands.java | 4 ++-- .../drill/exec/sql/TestSimpleCastFunctions.java | 4 ++-- .../drill/exec/store/StorageStrategyTest.java | 2 +- .../drill/exec/store/TestAffinityCalculator.java | 4 ++-- .../drill/exec/store/TestImplicitFileColumns.java | 4 ++-- .../apache/drill/exec/store/TestOutputMutator.java | 2 +- .../drill/exec/store/dfs/TestFileSelection.java | 2 +- .../store/easy/text/compliant/TestCsvHeader.java | 2 +- .../easy/text/compliant/TestHeaderBuilder.java | 2 +- .../exec/store/enumerable/plan/EnumMockPlugin.java | 2 +- .../drill/exec/store/json/TestJsonReader.java | 4 ++-- .../exec/store/json/TestJsonReaderQueries.java | 4 ++-- .../store/parquet/ParquetRecordReaderTest.java | 8 ++++---- .../exec/store/parquet/ParquetResultListener.java | 4 ++-- .../drill/exec/store/parquet/TestEmptyParquet.java | 2 +- .../store/parquet/TestParquetPhysicalPlan.java | 6 +++--- .../drill/exec/store/parquet/TestParquetScan.java | 2 +- .../drill/exec/store/store/TestAssignment.java | 8 ++++---- .../exec/store/sys/TestLocalPersistentStore.java | 2 +- .../org/apache/drill/exec/testing/Controls.java | 2 +- .../drill/exec/testing/TestResourceLeak.java | 4 ++-- .../exec/udf/dynamic/TestDynamicUDFSupport.java | 2 +- .../drill/exec/util/FileSystemUtilTestBase.java | 2 +- .../drill/exec/util/StoragePluginTestUtils.java | 2 +- .../org/apache/drill/exec/work/batch/FileTest.java | 2 +- .../drill/exec/work/batch/TestSpoolingBuffer.java | 4 ++-- .../TestLimit0VsRegularQueriesMetadata.java | 4 ++-- .../prepare/TestPreparedStatementProvider.java | 2 +- .../CredentialsProviderImplementationsTest.java | 2 +- .../storage/CredentialsProviderSerDeTest.java | 2 +- .../org/apache/drill/test/BaseDirTestWatcher.java | 2 +- .../java/org/apache/drill/test/BaseTestQuery.java | 6 +++--- .../drill/test/BufferingQueryEventListener.java | 2 +- .../java/org/apache/drill/test/ClusterFixture.java | 8 ++++---- .../apache/drill/test/ClusterFixtureBuilder.java | 2 +- .../java/org/apache/drill/test/ConfigBuilder.java | 2 +- .../org/apache/drill/test/DrillTestWrapper.java | 2 +- .../drill/test/LegacyOperatorTestBuilder.java | 4 ++-- .../org/apache/drill/test/OperatorFixture.java | 8 ++++---- .../org/apache/drill/test/OperatorTestBuilder.java | 2 +- .../java/org/apache/drill/test/ProfileParser.java | 2 +- .../org/apache/drill/test/QueryBatchIterator.java | 2 +- .../java/org/apache/drill/test/QueryBuilder.java | 2 +- .../org/apache/drill/test/RestClientFixture.java | 2 +- .../java/org/apache/drill/test/TestBuilder.java | 4 ++-- .../apache/drill/test/rowSet/RowSetComparison.java | 6 +++--- .../drill/test/rowSet/file/JsonFileBuilder.java | 2 +- .../drill/test/rowSet/test/PerformanceTool.java | 2 +- .../drill/jdbc/impl/DrillColumnMetaDataList.java | 2 +- .../drill/jdbc/impl/DrillConnectionImpl.java | 2 +- .../org/apache/drill/jdbc/impl/DrillCursor.java | 2 +- .../drill/jdbc/impl/DrillDatabaseMetaDataImpl.java | 6 +++--- .../org/apache/drill/jdbc/impl/DrillMetaImpl.java | 2 +- .../apache/drill/jdbc/impl/DrillResultSetImpl.java | 2 +- .../java/org/apache/drill/jdbc/ConnectionInfo.java | 6 +++--- .../java/org/apache/drill/jdbc/DriverTest.java | 2 +- .../java/org/apache/drill/jdbc/JdbcTestBase.java | 6 +++--- .../drill/jdbc/MultiConnectionCachingFactory.java | 2 +- .../apache/drill/jdbc/NonClosableConnection.java | 2 +- .../apache/drill/jdbc/PreparedStatementTest.java | 2 +- .../Bug1735ResultSetCloseReleasesBuffersTest.java | 2 +- .../test/java/org/apache/drill/jdbc/test/Hook.java | 2 +- .../org/apache/drill/jdbc/test/JdbcDataTest.java | 10 +++++----- .../apache/drill/jdbc/test/JdbcTestActionBase.java | 2 +- .../apache/drill/jdbc/test/JdbcTestQueryBase.java | 2 +- .../apache/drill/jdbc/test/TestJdbcDistQuery.java | 4 ++-- .../org/apache/drill/jdbc/test/TestJdbcQuery.java | 2 +- .../src/main/java/io/netty/buffer/DrillBuf.java | 2 +- .../org/apache/drill/exec/memory/Accountant.java | 4 ++-- .../drill/exec/memory/AllocationManager.java | 4 ++-- .../apache/drill/exec/memory/BaseAllocator.java | 2 +- .../apache/drill/exec/memory/BoundsChecking.java | 2 +- .../apache/drill/exec/memory/RootAllocator.java | 2 +- .../org/apache/drill/exec/rpc/BasicClient.java | 2 +- .../org/apache/drill/exec/rpc/BasicServer.java | 2 +- .../drill/exec/rpc/ChunkCreationHandler.java | 2 +- .../apache/drill/exec/rpc/DrillRpcFutureImpl.java | 2 +- .../apache/drill/exec/rpc/FutureBitCommand.java | 2 +- .../apache/drill/exec/rpc/OutboundRpcMessage.java | 2 +- .../drill/exec/rpc/ReconnectingConnection.java | 4 ++-- .../org/apache/drill/exec/rpc/RequestIdMap.java | 2 +- .../java/org/apache/drill/exec/rpc/RpcBus.java | 4 ++-- .../apache/drill/exec/rpc/RpcCheckedFuture.java | 2 +- .../java/org/apache/drill/exec/rpc/RpcConfig.java | 6 +++--- .../security/AuthenticationOutcomeListener.java | 6 +++--- .../src/main/codegen/includes/vv_imports.ftl | 14 +++++++------- .../main/codegen/templates/BasicTypeHelper.java | 2 +- .../main/codegen/templates/ColumnAccessors.java | 2 +- .../codegen/templates/NullableValueVectors.java | 2 +- .../src/main/codegen/templates/UnionVector.java | 4 ++-- .../exec/expr/fn/impl/ByteFunctionHelpers.java | 2 +- .../metadata/RepeatedListColumnMetadata.java | 2 +- .../drill/exec/record/metadata/TupleNameSpace.java | 4 ++-- .../drill/exec/record/metadata/VariantSchema.java | 2 +- .../metadata/schema/parser/SchemaVisitor.java | 2 +- .../org/apache/drill/exec/util/DecimalUtility.java | 2 +- .../apache/drill/exec/vector/AddOrGetResult.java | 2 +- .../apache/drill/exec/vector/BaseValueVector.java | 2 +- .../org/apache/drill/exec/vector/BitVector.java | 2 +- .../drill/exec/vector/UntypedNullVector.java | 2 +- .../drill/exec/vector/ValueHolderHelper.java | 2 +- .../apache/drill/exec/vector/VectorDescriptor.java | 2 +- .../exec/vector/accessor/impl/VectorPrinter.java | 2 +- .../vector/accessor/reader/ArrayReaderImpl.java | 2 +- .../exec/vector/accessor/writer/EmptyListShim.java | 2 +- .../vector/accessor/writer/ListWriterImpl.java | 2 +- .../vector/accessor/writer/SimpleListShim.java | 2 +- .../vector/complex/AbstractContainerVector.java | 8 ++++---- .../exec/vector/complex/AbstractMapVector.java | 4 ++-- .../vector/complex/BaseRepeatedValueVector.java | 4 ++-- .../exec/vector/complex/EmptyValuePopulator.java | 2 +- .../drill/exec/vector/complex/ListVector.java | 2 +- .../drill/exec/vector/complex/MapVector.java | 6 +++--- .../exec/vector/complex/RepeatedListVector.java | 4 ++-- .../exec/vector/complex/RepeatedMapVector.java | 2 +- .../vector/complex/impl/ComplexWriterImpl.java | 2 +- .../vector/complex/impl/SingleMapReaderImpl.java | 2 +- .../java/org/apache/drill/common/JSONOptions.java | 2 +- .../drill/common/expression/CastExpression.java | 2 +- .../drill/common/expression/ErrorCollector.java | 2 +- .../common/expression/ErrorCollectorImpl.java | 4 ++-- .../common/expression/ExpressionFunction.java | 4 ++-- .../common/expression/ExpressionStringBuilder.java | 2 +- .../drill/common/expression/FunctionCall.java | 4 ++-- .../common/expression/FunctionCallFactory.java | 4 ++-- .../expression/FunctionHolderExpression.java | 2 +- .../drill/common/expression/IfExpression.java | 6 +++--- .../apache/drill/common/expression/SchemaPath.java | 2 +- .../drill/common/expression/ValueExpressions.java | 2 +- .../common/expression/fn/JodaDateValidator.java | 2 +- .../visitors/ConditionalExprOptimizer.java | 2 +- .../apache/drill/common/graph/AdjacencyList.java | 6 +++--- .../drill/common/logical/LogicalPlanBuilder.java | 4 ++-- .../drill/common/logical/StoragePluginConfig.java | 2 +- .../common/logical/data/AbstractSingleBuilder.java | 2 +- .../apache/drill/common/logical/data/Except.java | 2 +- .../apache/drill/common/logical/data/Filter.java | 2 +- .../apache/drill/common/logical/data/Flatten.java | 2 +- .../common/logical/data/GroupingAggregate.java | 4 ++-- .../drill/common/logical/data/Intersect.java | 2 +- .../org/apache/drill/common/logical/data/Join.java | 6 +++--- .../drill/common/logical/data/LateralJoin.java | 2 +- .../apache/drill/common/logical/data/Limit.java | 2 +- .../drill/common/logical/data/LogicalSemiJoin.java | 2 +- .../apache/drill/common/logical/data/Order.java | 8 ++++---- .../apache/drill/common/logical/data/Project.java | 2 +- .../common/logical/data/RunningAggregate.java | 2 +- .../common/logical/data/SingleInputOperator.java | 2 +- .../apache/drill/common/logical/data/Store.java | 2 +- .../drill/common/logical/data/Transform.java | 2 +- .../apache/drill/common/logical/data/Union.java | 2 +- .../apache/drill/common/logical/data/Values.java | 2 +- .../apache/drill/common/logical/data/Window.java | 6 +++--- .../expression/fn/JodaDateValidatorTest.java | 2 +- .../drill/metastore/iceberg/IcebergMetastore.java | 4 ++-- .../metastore/iceberg/operate/IcebergRead.java | 2 +- .../iceberg/schema/IcebergTableSchema.java | 2 +- .../iceberg/transform/TestFilterTransformer.java | 2 +- .../iceberg/write/TestParquetFileWriter.java | 2 +- .../components/tables/BasicTablesRequests.java | 2 +- .../tables/TablesMetadataTypeValidator.java | 2 +- .../org/apache/drill/metastore/operate/Delete.java | 2 +- .../org/apache/drill/metastore/operate/Read.java | 2 +- .../drill/metastore/util/TableMetadataUtils.java | 2 +- .../tables/AbstractTablesMetastoreTest.java | 2 +- .../tables/TestTablesMetadataTypeValidator.java | 2 +- .../drill/metastore/mongo/operate/MongoRead.java | 2 +- .../mongo/transform/InputDataTransformer.java | 2 +- .../mongo/transform/OutputDataTransformer.java | 4 ++-- .../drill/metastore/mongo/MongoBaseTest.java | 2 +- .../tables/TestMongoBasicTablesRequests.java | 2 +- .../components/tables/TablesMetadataMapper.java | 2 +- .../rdbms/components/tables/TablesTransformer.java | 4 ++-- .../components/tables/TestTablesTransformer.java | 2 +- .../metastore/rdbms/util/TestConverterUtil.java | 2 +- .../java/org/apache/drill/fmpp/mojo/FMPPMojo.java | 2 +- 1248 files changed, 2002 insertions(+), 2011 deletions(-) diff --git a/common/src/main/java/org/apache/drill/common/DeferredException.java b/common/src/main/java/org/apache/drill/common/DeferredException.java index 0fa5d768d68..a38af21657a 100644 --- a/common/src/main/java/org/apache/drill/common/DeferredException.java +++ b/common/src/main/java/org/apache/drill/common/DeferredException.java @@ -17,8 +17,8 @@ */ package org.apache.drill.common; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Supplier; +import com.google.common.base.Preconditions; +import com.google.common.base.Supplier; /** * Collects one or more exceptions that may occur, using diff --git a/common/src/main/java/org/apache/drill/common/KerberosUtil.java b/common/src/main/java/org/apache/drill/common/KerberosUtil.java index 0dfce33ccdb..44403e92f9a 100644 --- a/common/src/main/java/org/apache/drill/common/KerberosUtil.java +++ b/common/src/main/java/org/apache/drill/common/KerberosUtil.java @@ -20,8 +20,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; public final class KerberosUtil { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(KerberosUtil.class); diff --git a/common/src/main/java/org/apache/drill/common/Version.java b/common/src/main/java/org/apache/drill/common/Version.java index a19802f422f..fdd9f841a86 100644 --- a/common/src/main/java/org/apache/drill/common/Version.java +++ b/common/src/main/java/org/apache/drill/common/Version.java @@ -21,8 +21,8 @@ import java.util.Locale; import java.util.Objects; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ComparisonChain; +import com.google.common.base.Preconditions; +import com.google.common.collect.ComparisonChain; /** * Encapsulates version information and provides ordering diff --git a/common/src/main/java/org/apache/drill/common/collections/Collectors.java b/common/src/main/java/org/apache/drill/common/collections/Collectors.java index 2547a2d5c07..3e80b2fe709 100644 --- a/common/src/main/java/org/apache/drill/common/collections/Collectors.java +++ b/common/src/main/java/org/apache/drill/common/collections/Collectors.java @@ -25,7 +25,7 @@ import java.util.function.Function; import java.util.function.Predicate; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class Collectors { private Collectors() { diff --git a/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java b/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java index 7b9bf52e50a..5353043b5dd 100644 --- a/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java +++ b/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java @@ -19,8 +19,8 @@ import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.base.Objects; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Objects; +import com.google.common.base.Preconditions; public class ImmutableEntry implements Map.Entry { private final K key; diff --git a/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java b/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java index 458d833da3b..97d3a13943f 100644 --- a/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java +++ b/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java @@ -22,12 +22,12 @@ import java.util.Map; import java.util.Set; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import io.netty.util.collection.IntObjectHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/org/apache/drill/common/concurrent/AbstractCheckedFuture.java b/common/src/main/java/org/apache/drill/common/concurrent/AbstractCheckedFuture.java index eafa0550be0..5d1e781bbfe 100644 --- a/common/src/main/java/org/apache/drill/common/concurrent/AbstractCheckedFuture.java +++ b/common/src/main/java/org/apache/drill/common/concurrent/AbstractCheckedFuture.java @@ -17,8 +17,8 @@ */ package org.apache.drill.common.concurrent; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.ForwardingListenableFuture; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ForwardingListenableFuture; +import com.google.common.util.concurrent.ListenableFuture; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/common/src/main/java/org/apache/drill/common/concurrent/CheckedFuture.java b/common/src/main/java/org/apache/drill/common/concurrent/CheckedFuture.java index 604b91a7e0b..0ffa0007007 100644 --- a/common/src/main/java/org/apache/drill/common/concurrent/CheckedFuture.java +++ b/common/src/main/java/org/apache/drill/common/concurrent/CheckedFuture.java @@ -17,8 +17,8 @@ */ package org.apache.drill.common.concurrent; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.Futures; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java index e9e8f70b385..7e1234a84ba 100644 --- a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java +++ b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java @@ -25,10 +25,10 @@ import org.apache.drill.common.exceptions.DrillConfigurationException; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.scanner.ClassPathScanner; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.ImmutableList; import org.reflections.util.ClasspathHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/org/apache/drill/common/config/DrillProperties.java b/common/src/main/java/org/apache/drill/common/config/DrillProperties.java index 0ea0fbb1c58..2ba886da982 100644 --- a/common/src/main/java/org/apache/drill/common/config/DrillProperties.java +++ b/common/src/main/java/org/apache/drill/common/config/DrillProperties.java @@ -17,8 +17,8 @@ */ package org.apache.drill.common.config; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableSet; import org.apache.drill.exec.proto.UserProtos.Property; import org.apache.drill.exec.proto.UserProtos.UserProperties; diff --git a/common/src/main/java/org/apache/drill/common/map/CaseInsensitiveMap.java b/common/src/main/java/org/apache/drill/common/map/CaseInsensitiveMap.java index 98c26f834c5..d64f42037e7 100644 --- a/common/src/main/java/org/apache/drill/common/map/CaseInsensitiveMap.java +++ b/common/src/main/java/org/apache/drill/common/map/CaseInsensitiveMap.java @@ -17,8 +17,8 @@ */ package org.apache.drill.common.map; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import java.util.Collection; import java.util.Map; diff --git a/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java b/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java index 6449b6f2942..a5fafe71bc3 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java +++ b/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java @@ -48,9 +48,9 @@ import org.reflections.util.FilterBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.HashMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; +import com.google.common.base.Stopwatch; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import javassist.bytecode.AccessFlag; import javassist.bytecode.AnnotationsAttribute; diff --git a/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java b/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java index b5033c779e0..5c78b3c1ea7 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java +++ b/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.drill.common.config.ConfigConstants; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.scanner.persistence.ScanResult; diff --git a/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java b/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java index 5f77e522705..67df91e70a1 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java +++ b/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; /** * a class annotation diff --git a/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java b/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java index cbc07e31997..d0c018fb685 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java +++ b/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java @@ -17,7 +17,7 @@ */ package org.apache.drill.common.scanner.persistence; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; import static java.lang.String.format; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; @@ -38,9 +38,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.HashMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; +import com.google.common.base.Stopwatch; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java b/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java index 0b5672d0c2c..145be2293b7 100644 --- a/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java +++ b/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.net.URL; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class DrillFileUtils { // These two separators are intentionally used instead of Path.SEPARATOR or File.separator diff --git a/common/src/main/java/org/apache/drill/common/util/GuavaPatcher.java b/common/src/main/java/org/apache/drill/common/util/GuavaPatcher.java index b6a7d47a15b..ec6c1cabfc8 100644 --- a/common/src/main/java/org/apache/drill/common/util/GuavaPatcher.java +++ b/common/src/main/java/org/apache/drill/common/util/GuavaPatcher.java @@ -19,7 +19,7 @@ import java.lang.reflect.Modifier; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java b/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java index a7aaf3ffdba..64393f345a7 100644 --- a/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java +++ b/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java @@ -17,8 +17,8 @@ */ package org.apache.drill.test; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.commons.io.FileUtils; import org.junit.rules.TestWatcher; import org.junit.runner.Description; diff --git a/contrib/format-access/src/main/java/org/apache/drill/exec/store/msaccess/MSAccessFormatConfig.java b/contrib/format-access/src/main/java/org/apache/drill/exec/store/msaccess/MSAccessFormatConfig.java index c291e752ef0..3a498f7b222 100644 --- a/contrib/format-access/src/main/java/org/apache/drill/exec/store/msaccess/MSAccessFormatConfig.java +++ b/contrib/format-access/src/main/java/org/apache/drill/exec/store/msaccess/MSAccessFormatConfig.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.Arrays; import java.util.List; diff --git a/contrib/format-access/src/main/java/org/apache/drill/exec/store/msaccess/MSAccessFormatPlugin.java b/contrib/format-access/src/main/java/org/apache/drill/exec/store/msaccess/MSAccessFormatPlugin.java index bfad78a7a68..16508acfa42 100644 --- a/contrib/format-access/src/main/java/org/apache/drill/exec/store/msaccess/MSAccessFormatPlugin.java +++ b/contrib/format-access/src/main/java/org/apache/drill/exec/store/msaccess/MSAccessFormatPlugin.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.store.msaccess; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.io.Files; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.logical.StoragePluginConfig; import org.apache.drill.common.types.TypeProtos; diff --git a/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaGroupScan.java b/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaGroupScan.java index 6e0ddd690df..67e875a665b 100644 --- a/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaGroupScan.java +++ b/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaGroupScan.java @@ -78,8 +78,8 @@ import org.apache.drill.metastore.metadata.Metadata; import org.apache.drill.metastore.statistics.ColumnStatistics; import org.apache.drill.metastore.statistics.TableStatisticsKind; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.hadoop.fs.Path; import java.io.IOException; diff --git a/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaRowGroupScan.java b/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaRowGroupScan.java index df675dfa329..d125fa96788 100644 --- a/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaRowGroupScan.java +++ b/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/DeltaRowGroupScan.java @@ -33,7 +33,7 @@ import org.apache.drill.exec.store.parquet.AbstractParquetRowGroupScan; import org.apache.drill.exec.store.parquet.ParquetReaderConfig; import org.apache.drill.exec.store.parquet.RowGroupReadEntry; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/read/DeltaScanBatchCreator.java b/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/read/DeltaScanBatchCreator.java index 78cac378922..95009dbcfea 100644 --- a/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/read/DeltaScanBatchCreator.java +++ b/contrib/format-deltalake/src/main/java/org/apache/drill/exec/store/delta/read/DeltaScanBatchCreator.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.store.parquet.AbstractParquetScanBatchCreator; import org.apache.drill.exec.store.parquet.ParquetScanBatchCreator; import org.apache.drill.exec.store.parquet.RowGroupReadEntry; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; import java.util.Map; diff --git a/contrib/format-esri/src/main/java/org/apache/drill/exec/store/esri/ShpFormatConfig.java b/contrib/format-esri/src/main/java/org/apache/drill/exec/store/esri/ShpFormatConfig.java index 4921045cf4e..a5cbdcf2bcf 100644 --- a/contrib/format-esri/src/main/java/org/apache/drill/exec/store/esri/ShpFormatConfig.java +++ b/contrib/format-esri/src/main/java/org/apache/drill/exec/store/esri/ShpFormatConfig.java @@ -25,7 +25,7 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Objects; diff --git a/contrib/format-excel/src/main/java/org/apache/drill/exec/store/excel/ExcelFormatConfig.java b/contrib/format-excel/src/main/java/org/apache/drill/exec/store/excel/ExcelFormatConfig.java index 61221cef760..a010bdc1eb7 100644 --- a/contrib/format-excel/src/main/java/org/apache/drill/exec/store/excel/ExcelFormatConfig.java +++ b/contrib/format-excel/src/main/java/org/apache/drill/exec/store/excel/ExcelFormatConfig.java @@ -27,7 +27,7 @@ import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.logical.FormatPluginConfig; import org.apache.drill.exec.store.excel.ExcelBatchReader.ExcelReaderConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.poi.ss.SpreadsheetVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/format-hdf5/src/main/java/org/apache/drill/exec/store/hdf5/HDF5FormatConfig.java b/contrib/format-hdf5/src/main/java/org/apache/drill/exec/store/hdf5/HDF5FormatConfig.java index f018c37c0bf..c5bd202d98f 100644 --- a/contrib/format-hdf5/src/main/java/org/apache/drill/exec/store/hdf5/HDF5FormatConfig.java +++ b/contrib/format-hdf5/src/main/java/org/apache/drill/exec/store/hdf5/HDF5FormatConfig.java @@ -25,7 +25,7 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; diff --git a/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogBatchReader.java b/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogBatchReader.java index 664fd7c54c4..947978f39ee 100644 --- a/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogBatchReader.java +++ b/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogBatchReader.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.record.metadata.MetadataUtils; import org.apache.drill.exec.store.dfs.easy.EasySubScan; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.apache.hadoop.fs.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogFormatConfig.java b/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogFormatConfig.java index aa40e959543..d0f9a5a20e4 100644 --- a/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogFormatConfig.java +++ b/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogFormatConfig.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; diff --git a/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogRecord.java b/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogRecord.java index 90f27487d8b..0e16f411d6d 100644 --- a/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogRecord.java +++ b/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogRecord.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.TupleWriter; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import java.util.HashMap; import java.util.Map; diff --git a/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdParser.java b/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdParser.java index 19a0b35b85a..985b2ca23fe 100644 --- a/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdParser.java +++ b/contrib/format-httpd/src/main/java/org/apache/drill/exec/store/httpd/HttpdParser.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.dfs.easy.EasySubScan; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import nl.basjes.parse.core.Casts; import nl.basjes.parse.core.Parser; import nl.basjes.parse.core.exceptions.DissectionFailure; diff --git a/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergBlockMapBuilder.java b/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergBlockMapBuilder.java index 7972f9e656b..7ab1807e076 100644 --- a/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergBlockMapBuilder.java +++ b/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergBlockMapBuilder.java @@ -21,9 +21,9 @@ import org.apache.drill.exec.store.TimedCallable; import org.apache.drill.exec.store.schedule.EndpointByteMap; import org.apache.drill.exec.store.schedule.EndpointByteMapImpl; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableRangeMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Range; -import org.apache.drill.shaded.guava.com.google.common.collect.RangeMap; +import com.google.common.collect.ImmutableRangeMap; +import com.google.common.collect.Range; +import com.google.common.collect.RangeMap; import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergGroupScan.java b/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergGroupScan.java index 5944b8210cf..4beedd4fd0d 100644 --- a/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergGroupScan.java +++ b/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergGroupScan.java @@ -43,8 +43,8 @@ import org.apache.drill.exec.store.schedule.AffinityCreator; import org.apache.drill.exec.store.schedule.AssignmentCreator; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; +import com.google.common.base.Preconditions; +import com.google.common.collect.ListMultimap; import org.apache.iceberg.TableScan; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.hadoop.HadoopTables; diff --git a/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergSubScan.java b/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergSubScan.java index 1ceada7ec9a..c72f5295485 100644 --- a/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergSubScan.java +++ b/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/IcebergSubScan.java @@ -33,7 +33,7 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.exec.store.iceberg.format.IcebergFormatPlugin; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.iceberg.TableScan; import java.util.Collections; diff --git a/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/read/IcebergScanBatchCreator.java b/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/read/IcebergScanBatchCreator.java index fe62b30cf62..a3dd6f8c5a0 100644 --- a/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/read/IcebergScanBatchCreator.java +++ b/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/read/IcebergScanBatchCreator.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.store.iceberg.IcebergSubScan; import org.apache.drill.exec.store.iceberg.IcebergWork; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.iceberg.TableScan; import java.util.List; diff --git a/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/snapshot/SnapshotFactory.java b/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/snapshot/SnapshotFactory.java index 9f738440928..e4dcc0a6adc 100644 --- a/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/snapshot/SnapshotFactory.java +++ b/contrib/format-iceberg/src/main/java/org/apache/drill/exec/store/iceberg/snapshot/SnapshotFactory.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.iceberg.snapshot; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class SnapshotFactory { diff --git a/contrib/format-image/src/main/java/org/apache/drill/exec/store/image/ImageFormatConfig.java b/contrib/format-image/src/main/java/org/apache/drill/exec/store/image/ImageFormatConfig.java index 9519130604c..a76ef37cbbd 100644 --- a/contrib/format-image/src/main/java/org/apache/drill/exec/store/image/ImageFormatConfig.java +++ b/contrib/format-image/src/main/java/org/apache/drill/exec/store/image/ImageFormatConfig.java @@ -22,7 +22,7 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogBatchReader.java b/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogBatchReader.java index 91e97a6dd75..94209842034 100644 --- a/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogBatchReader.java +++ b/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogBatchReader.java @@ -30,7 +30,7 @@ import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.TupleWriter; import org.apache.drill.exec.vector.accessor.ValueWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatConfig.java b/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatConfig.java index 02bd29aa23a..0a4493a6793 100644 --- a/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatConfig.java +++ b/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatConfig.java @@ -22,8 +22,8 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.base.Objects; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableList; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatField.java b/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatField.java index f8f2b8c45be..eca514aa283 100644 --- a/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatField.java +++ b/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatField.java @@ -20,7 +20,7 @@ import java.util.Objects; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatPlugin.java b/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatPlugin.java index c75efdf461c..fc5cfe16c1f 100644 --- a/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatPlugin.java +++ b/contrib/format-log/src/main/java/org/apache/drill/exec/store/log/LogFormatPlugin.java @@ -36,7 +36,7 @@ import org.apache.drill.exec.store.dfs.easy.EasyFormatPlugin; import org.apache.drill.exec.store.dfs.easy.EasySubScan; import org.apache.drill.exec.store.log.LogBatchReader.LogReaderConfig; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.apache.hadoop.conf.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/format-log/src/test/java/org/apache/drill/exec/store/log/TestLogReader.java b/contrib/format-log/src/test/java/org/apache/drill/exec/store/log/TestLogReader.java index 7d55f59cd9f..e8e18ab265f 100644 --- a/contrib/format-log/src/test/java/org/apache/drill/exec/store/log/TestLogReader.java +++ b/contrib/format-log/src/test/java/org/apache/drill/exec/store/log/TestLogReader.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.rpc.RpcException; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseDirTestWatcher; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; diff --git a/contrib/format-log/src/test/java/org/apache/drill/exec/store/log/TestLogReaderIssue.java b/contrib/format-log/src/test/java/org/apache/drill/exec/store/log/TestLogReaderIssue.java index db9aff818c2..9d2205663fd 100644 --- a/contrib/format-log/src/test/java/org/apache/drill/exec/store/log/TestLogReaderIssue.java +++ b/contrib/format-log/src/test/java/org/apache/drill/exec/store/log/TestLogReaderIssue.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.rpc.RpcException; import org.apache.drill.exec.store.easy.text.compliant.BaseCsvTest; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.QueryBuilder; import org.apache.drill.test.rowSet.RowSetComparison; import org.hamcrest.MatcherAssert; diff --git a/contrib/format-ltsv/src/main/java/org/apache/drill/exec/store/ltsv/LTSVBatchReader.java b/contrib/format-ltsv/src/main/java/org/apache/drill/exec/store/ltsv/LTSVBatchReader.java index f25e6728bb0..53b700f0857 100644 --- a/contrib/format-ltsv/src/main/java/org/apache/drill/exec/store/ltsv/LTSVBatchReader.java +++ b/contrib/format-ltsv/src/main/java/org/apache/drill/exec/store/ltsv/LTSVBatchReader.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.record.metadata.MetadataUtils; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/format-ltsv/src/main/java/org/apache/drill/exec/store/ltsv/LTSVFormatPluginConfig.java b/contrib/format-ltsv/src/main/java/org/apache/drill/exec/store/ltsv/LTSVFormatPluginConfig.java index 79c7f4b0cdf..de957721382 100644 --- a/contrib/format-ltsv/src/main/java/org/apache/drill/exec/store/ltsv/LTSVFormatPluginConfig.java +++ b/contrib/format-ltsv/src/main/java/org/apache/drill/exec/store/ltsv/LTSVFormatPluginConfig.java @@ -25,7 +25,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Objects; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBFunctionalIndexInfo.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBFunctionalIndexInfo.java index 564a0370bc4..67938f3e8db 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBFunctionalIndexInfo.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBFunctionalIndexInfo.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.index; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.drill.common.expression.CastExpression; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.SchemaPath; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBIndexDescriptor.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBIndexDescriptor.java index 18a22f92e2f..e16f138881b 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBIndexDescriptor.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBIndexDescriptor.java @@ -36,10 +36,10 @@ import org.apache.drill.exec.util.EncodedSchemaPathSet; import org.apache.drill.common.expression.LogicalExpression; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; public class MapRDBIndexDescriptor extends DrillIndexDescriptor { diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBIndexDiscover.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBIndexDiscover.java index 040b5e9a028..255afe9e3e6 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBIndexDiscover.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBIndexDiscover.java @@ -60,7 +60,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; public class MapRDBIndexDiscover extends IndexDiscoverBase implements IndexDiscover { diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBStatistics.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBStatistics.java index 5f5930de5b0..6cdf9492cae 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBStatistics.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/planner/index/MapRDBStatistics.java @@ -54,10 +54,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Charsets; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; public class MapRDBStatistics implements Statistics { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(MapRDBStatistics.class); diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java index 8f5717c1d67..24440196aab 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java @@ -36,7 +36,7 @@ import org.apache.hadoop.conf.Configuration; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import com.mapr.fs.MapRFileSystem; public abstract class TableFormatPlugin implements FormatPlugin { diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBFormatPlugin.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBFormatPlugin.java index e8cdbd33cbe..516f15724f1 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBFormatPlugin.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBFormatPlugin.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.client.ConnectionFactory; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import com.mapr.db.index.IndexDesc; import com.mapr.fs.tables.TableProperties; import org.slf4j.Logger; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java index 126326e1068..18a5968415f 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java @@ -50,11 +50,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.drill.metastore.metadata.TableMetadata; import org.apache.drill.metastore.metadata.TableMetadataProvider; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; public abstract class MapRDBGroupScan extends AbstractDbGroupScan { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(MapRDBGroupScan.class); diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java index d5afbdb065c..69f0ab1d317 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java @@ -38,7 +38,7 @@ import org.apache.drill.exec.store.mapr.db.json.JsonScanSpec; import org.apache.drill.exec.store.mapr.db.json.JsonTableGroupScan; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public abstract class MapRDBPushFilterIntoScan extends StoragePluginOptimizerRule { diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBRestrictedScanBatchCreator.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBRestrictedScanBatchCreator.java index bdea6e8a89a..9238d1d3591 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBRestrictedScanBatchCreator.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBRestrictedScanBatchCreator.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.store.mapr.db; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.ops.ExecutorFragmentContext; import org.apache.drill.exec.physical.impl.BatchCreator; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBScanBatchCreator.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBScanBatchCreator.java index 6fe467fd3fa..190f535aed7 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBScanBatchCreator.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBScanBatchCreator.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.store.mapr.db.binary.BinaryTableGroupScan; import org.apache.drill.exec.store.mapr.db.json.MaprDBJsonRecordReader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class MapRDBScanBatchCreator implements BatchCreator { diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScan.java index 9b352c63f3e..e9ed7db8342 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScan.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; // Class containing information for reading a single HBase region @JsonTypeName("maprdb-sub-scan") diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableCache.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableCache.java index 281fd6d23d8..e74c13776b7 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableCache.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableCache.java @@ -29,11 +29,11 @@ import java.io.IOException; import java.security.PrivilegedExceptionAction; import java.util.concurrent.TimeUnit; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; -import org.apache.drill.shaded.guava.com.google.common.cache.RemovalListener; -import org.apache.drill.shaded.guava.com.google.common.cache.RemovalNotification; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.cache.RemovalListener; +import com.google.common.cache.RemovalNotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/BinaryTableGroupScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/BinaryTableGroupScan.java index 7ebb1a7941f..a53177bcb64 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/BinaryTableGroupScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/BinaryTableGroupScan.java @@ -62,7 +62,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/MapRDBFilterBuilder.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/MapRDBFilterBuilder.java index 4cdf4048f37..6f0c4a7115a 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/MapRDBFilterBuilder.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/MapRDBFilterBuilder.java @@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.filter.RowFilter; import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; public class MapRDBFilterBuilder extends AbstractExprVisitor implements DrillHBaseConstants { diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/MaprDBCompareFunctionsProcessor.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/MaprDBCompareFunctionsProcessor.java index 6cfa9dab5a5..5e17c275632 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/MaprDBCompareFunctionsProcessor.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/MaprDBCompareFunctionsProcessor.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.mapr.db.binary; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import io.netty.buffer.ByteBuf; import org.apache.drill.common.expression.FunctionCall; import org.apache.drill.common.expression.LogicalExpression; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java index 204ddae124d..cc56bc35b6c 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java @@ -41,8 +41,8 @@ import org.ojai.types.ODate; import org.ojai.types.OTime; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.mapr.db.util.SqlHelper; import org.ojai.types.OTimestamp; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableGroupScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableGroupScan.java index 67cf7ab363f..b59267b37a0 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableGroupScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableGroupScan.java @@ -74,7 +74,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.mapr.db.MetaTable; import com.mapr.db.Table; import com.mapr.db.impl.TabletInfoImpl; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableRangePartitionFunction.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableRangePartitionFunction.java index 4fe656cf7b5..3b438189f48 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableRangePartitionFunction.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableRangePartitionFunction.java @@ -33,8 +33,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.mapr.db.Table; import com.mapr.db.impl.ConditionImpl; import com.mapr.db.impl.IdCodec; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/MaprDBJsonRecordReader.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/MaprDBJsonRecordReader.java index 9819ba5207b..287c764fc1b 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/MaprDBJsonRecordReader.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/MaprDBJsonRecordReader.java @@ -58,11 +58,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; import java.time.Instant; import java.time.ZoneId; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/OjaiFunctionsProcessor.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/OjaiFunctionsProcessor.java index 151e21d98f8..2a43797cf42 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/OjaiFunctionsProcessor.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/OjaiFunctionsProcessor.java @@ -26,7 +26,7 @@ import org.apache.drill.common.expression.ValueExpressions.LongExpression; import org.apache.drill.common.expression.ValueExpressions.QuotedString; import org.apache.drill.common.expression.visitors.AbstractExprVisitor; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.ojai.Value; import org.ojai.store.QueryCondition; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/ProjectionPassthroughVectorWriter.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/ProjectionPassthroughVectorWriter.java index cafd5f74f3f..9d819e8a6fa 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/ProjectionPassthroughVectorWriter.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/ProjectionPassthroughVectorWriter.java @@ -31,7 +31,7 @@ import org.ojai.DocumentReader.EventType; import org.ojai.util.DocumentReaderWithProjection; import org.ojai.util.FieldProjector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.mapr.db.DBConstants; import com.mapr.db.ojai.DBDocumentReaderBase; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonRecordReader.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonRecordReader.java index a3821636b87..4c6649a9ecc 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonRecordReader.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonRecordReader.java @@ -42,7 +42,7 @@ import org.apache.drill.exec.store.mapr.db.MapRDBSubScanSpec; import org.apache.drill.exec.store.mapr.db.RestrictedMapRDBSubScanSpec; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import com.mapr.db.impl.IdCodec; import com.mapr.db.ojai.DBDocumentReaderBase; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonTableGroupScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonTableGroupScan.java index f590f3b54cb..790700638a7 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonTableGroupScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonTableGroupScan.java @@ -26,8 +26,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.metastore.store.FileSystemMetadataProviderManager; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.base.GroupScan; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/FieldPathHelper.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/FieldPathHelper.java index 37d393ea8d1..16a5b68aab1 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/FieldPathHelper.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/FieldPathHelper.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.mapr.db.util; -import org.apache.drill.shaded.guava.com.google.common.collect.Queues; +import com.google.common.collect.Queues; import org.apache.drill.common.expression.PathSegment; import org.apache.drill.common.expression.SchemaPath; import org.ojai.FieldPath; diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/TestEncodedFieldPaths.java b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/TestEncodedFieldPaths.java index 0275f54c6e7..ccad57d918a 100644 --- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/TestEncodedFieldPaths.java +++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/TestEncodedFieldPaths.java @@ -29,7 +29,7 @@ import org.ojai.DocumentStream; import org.ojai.json.Json; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import com.mapr.db.Table; import com.mapr.db.tests.utils.DBTests; diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/TestScanRanges.java b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/TestScanRanges.java index efb70aa1b6d..7ad44d1d8c8 100644 --- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/TestScanRanges.java +++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/TestScanRanges.java @@ -38,7 +38,7 @@ import org.ojai.DocumentStream; import org.ojai.json.Json; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import com.mapr.db.Table; import com.mapr.db.tests.utils.DBTests; import com.mapr.drill.maprdb.tests.MaprDBTestsSuite; diff --git a/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatUtils.java b/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatUtils.java index 83e7dc2f28d..73887361d9c 100644 --- a/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatUtils.java +++ b/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatUtils.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.store.pcap; -import org.apache.drill.shaded.guava.com.google.common.primitives.Ints; -import org.apache.drill.shaded.guava.com.google.common.primitives.Shorts; +import com.google.common.primitives.Ints; +import com.google.common.primitives.Shorts; import java.nio.charset.StandardCharsets; diff --git a/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/decoder/Packet.java b/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/decoder/Packet.java index a1d188cf33f..7c0fc92724f 100644 --- a/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/decoder/Packet.java +++ b/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/decoder/Packet.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.pcap.decoder; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/decoder/PacketDecoder.java b/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/decoder/PacketDecoder.java index 977e465ab1c..1794eea4c98 100644 --- a/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/decoder/PacketDecoder.java +++ b/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/decoder/PacketDecoder.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.pcap.decoder; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/plugin/PcapFormatConfig.java b/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/plugin/PcapFormatConfig.java index b5f8d533c64..37226b11807 100644 --- a/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/plugin/PcapFormatConfig.java +++ b/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/plugin/PcapFormatConfig.java @@ -22,7 +22,7 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/plugin/PcapngFormatConfig.java b/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/plugin/PcapngFormatConfig.java index 082840a73c7..0874f33ba84 100644 --- a/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/plugin/PcapngFormatConfig.java +++ b/contrib/format-pcapng/src/main/java/org/apache/drill/exec/store/pcap/plugin/PcapngFormatConfig.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.List; diff --git a/contrib/format-pcapng/src/test/java/org/apache/drill/exec/persistent/store/pcap/TestPcapWithPersistentStore.java b/contrib/format-pcapng/src/test/java/org/apache/drill/exec/persistent/store/pcap/TestPcapWithPersistentStore.java index b44d297cd71..a1fc296d819 100644 --- a/contrib/format-pcapng/src/test/java/org/apache/drill/exec/persistent/store/pcap/TestPcapWithPersistentStore.java +++ b/contrib/format-pcapng/src/test/java/org/apache/drill/exec/persistent/store/pcap/TestPcapWithPersistentStore.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.drill.common.util.JacksonUtils; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import org.apache.curator.framework.CuratorFramework; import org.apache.drill.common.logical.FormatPluginConfig; import org.apache.drill.common.util.DrillFileUtils; diff --git a/contrib/format-pcapng/src/test/java/org/apache/drill/exec/store/pcap/TestPcapDecoder.java b/contrib/format-pcapng/src/test/java/org/apache/drill/exec/store/pcap/TestPcapDecoder.java index d171c31228f..2522bd4f72e 100644 --- a/contrib/format-pcapng/src/test/java/org/apache/drill/exec/store/pcap/TestPcapDecoder.java +++ b/contrib/format-pcapng/src/test/java/org/apache/drill/exec/store/pcap/TestPcapDecoder.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.pcap; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Resources; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.exec.store.pcap.decoder.Packet; import org.apache.drill.exec.store.pcap.decoder.PacketDecoder; diff --git a/contrib/format-pcapng/src/test/java/org/apache/drill/exec/store/pcapng/TestPcapngStatRecordReader.java b/contrib/format-pcapng/src/test/java/org/apache/drill/exec/store/pcapng/TestPcapngStatRecordReader.java index c202fdeabb6..185a7b6d089 100644 --- a/contrib/format-pcapng/src/test/java/org/apache/drill/exec/store/pcapng/TestPcapngStatRecordReader.java +++ b/contrib/format-pcapng/src/test/java/org/apache/drill/exec/store/pcapng/TestPcapngStatRecordReader.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.pcap.plugin.PcapFormatConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.apache.drill.test.QueryBuilder; diff --git a/contrib/format-pdf/src/main/java/org/apache/drill/exec/store/pdf/PdfBatchReader.java b/contrib/format-pdf/src/main/java/org/apache/drill/exec/store/pdf/PdfBatchReader.java index 05dd3b4a525..8a7e9d51fe0 100644 --- a/contrib/format-pdf/src/main/java/org/apache/drill/exec/store/pdf/PdfBatchReader.java +++ b/contrib/format-pdf/src/main/java/org/apache/drill/exec/store/pdf/PdfBatchReader.java @@ -19,7 +19,7 @@ package org.apache.drill.exec.store.pdf; import org.apache.drill.exec.record.MaterializedField; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.apache.drill.common.AutoCloseables; import org.apache.drill.common.exceptions.CustomErrorContext; import org.apache.drill.common.exceptions.UserException; diff --git a/contrib/format-pdf/src/main/java/org/apache/drill/exec/store/pdf/PdfFormatConfig.java b/contrib/format-pdf/src/main/java/org/apache/drill/exec/store/pdf/PdfFormatConfig.java index 4c909f4cc25..37897355fe2 100644 --- a/contrib/format-pdf/src/main/java/org/apache/drill/exec/store/pdf/PdfFormatConfig.java +++ b/contrib/format-pdf/src/main/java/org/apache/drill/exec/store/pdf/PdfFormatConfig.java @@ -28,7 +28,7 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import technology.tabula.extractors.BasicExtractionAlgorithm; diff --git a/contrib/format-sas/src/main/java/org/apache/drill/exec/store/sas/SasFormatConfig.java b/contrib/format-sas/src/main/java/org/apache/drill/exec/store/sas/SasFormatConfig.java index 0647a2fe2a6..03c20f7f497 100644 --- a/contrib/format-sas/src/main/java/org/apache/drill/exec/store/sas/SasFormatConfig.java +++ b/contrib/format-sas/src/main/java/org/apache/drill/exec/store/sas/SasFormatConfig.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; diff --git a/contrib/format-spss/src/main/java/org/apache/drill/exec/store/spss/SpssFormatConfig.java b/contrib/format-spss/src/main/java/org/apache/drill/exec/store/spss/SpssFormatConfig.java index ad35cd83fca..784cb6865cf 100644 --- a/contrib/format-spss/src/main/java/org/apache/drill/exec/store/spss/SpssFormatConfig.java +++ b/contrib/format-spss/src/main/java/org/apache/drill/exec/store/spss/SpssFormatConfig.java @@ -25,7 +25,7 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.exec.store.spss.SpssBatchReader.SpssReaderConfig; import java.util.Collections; diff --git a/contrib/format-syslog/src/main/java/org/apache/drill/exec/store/syslog/SyslogFormatConfig.java b/contrib/format-syslog/src/main/java/org/apache/drill/exec/store/syslog/SyslogFormatConfig.java index 8f2fc3f0d40..4a5d553843d 100644 --- a/contrib/format-syslog/src/main/java/org/apache/drill/exec/store/syslog/SyslogFormatConfig.java +++ b/contrib/format-syslog/src/main/java/org/apache/drill/exec/store/syslog/SyslogFormatConfig.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; diff --git a/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLFormatConfig.java b/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLFormatConfig.java index 51b87c548c7..2946d3d9d2d 100644 --- a/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLFormatConfig.java +++ b/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLFormatConfig.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; diff --git a/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLReader.java b/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLReader.java index d1467e13757..fac7b11fead 100644 --- a/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLReader.java +++ b/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLReader.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.store.ImplicitColumnUtils.ImplicitColumns; import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.TupleWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLUtils.java b/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLUtils.java index dcf9c464a63..a421c452d7e 100644 --- a/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLUtils.java +++ b/contrib/format-xml/src/main/java/org/apache/drill/exec/store/xml/XMLUtils.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.store.xml; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.events.XMLEvent; diff --git a/contrib/storage-cassandra/src/main/java/org/apache/drill/exec/store/cassandra/CassandraStoragePlugin.java b/contrib/storage-cassandra/src/main/java/org/apache/drill/exec/store/cassandra/CassandraStoragePlugin.java index b55f956d3c0..e91c29f079c 100644 --- a/contrib/storage-cassandra/src/main/java/org/apache/drill/exec/store/cassandra/CassandraStoragePlugin.java +++ b/contrib/storage-cassandra/src/main/java/org/apache/drill/exec/store/cassandra/CassandraStoragePlugin.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.store.SchemaFactory; import org.apache.drill.exec.store.cassandra.schema.CassandraRootDrillSchemaFactory; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillRecordReader.java b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillRecordReader.java index d6806575115..a025b39d377 100644 --- a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillRecordReader.java +++ b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillRecordReader.java @@ -43,7 +43,7 @@ import org.apache.drill.exec.testing.ControlsInjector; import org.apache.drill.exec.testing.ControlsInjectorFactory; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillScanBatchCreator.java b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillScanBatchCreator.java index 6837831f4e7..c8ba1865e99 100644 --- a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillScanBatchCreator.java +++ b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillScanBatchCreator.java @@ -22,7 +22,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.CloseableRecordBatch; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; diff --git a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillStoragePluginConfig.java b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillStoragePluginConfig.java index 3dfb72216b9..902e95a959d 100644 --- a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillStoragePluginConfig.java +++ b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillStoragePluginConfig.java @@ -33,8 +33,8 @@ import org.apache.drill.exec.proto.UserBitShared.UserCredentials; import org.apache.drill.exec.rpc.RpcException; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillSubScan.java b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillSubScan.java index bd7061651f5..35a564d454d 100644 --- a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillSubScan.java +++ b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/DrillSubScan.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.physical.base.PhysicalVisitor; import org.apache.drill.exec.physical.base.SubScan; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.Collections; import java.util.Iterator; diff --git a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/plan/DrillPluginImplementor.java b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/plan/DrillPluginImplementor.java index 7f1cb16903f..271f3a0d8bd 100644 --- a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/plan/DrillPluginImplementor.java +++ b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/plan/DrillPluginImplementor.java @@ -45,7 +45,7 @@ import org.apache.drill.exec.store.plan.rel.PluginSortRel; import org.apache.drill.exec.store.plan.rel.PluginUnionRel; import org.apache.drill.exec.store.plan.rel.StoragePluginTableScan; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.io.IOException; import java.util.List; diff --git a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/schema/DrillSchemaFactory.java b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/schema/DrillSchemaFactory.java index ee68ec3b253..b617efb1980 100644 --- a/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/schema/DrillSchemaFactory.java +++ b/contrib/storage-drill/src/main/java/org/apache/drill/exec/store/drill/plugin/schema/DrillSchemaFactory.java @@ -24,9 +24,9 @@ import org.apache.drill.exec.store.SchemaConfig; import org.apache.drill.exec.store.drill.plugin.DrillStoragePlugin; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import java.util.Optional; import java.util.concurrent.ExecutionException; diff --git a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidCompareFunctionProcessor.java b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidCompareFunctionProcessor.java index 2c4449065b5..69c22de0079 100755 --- a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidCompareFunctionProcessor.java +++ b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidCompareFunctionProcessor.java @@ -33,8 +33,8 @@ import org.apache.drill.common.expression.ValueExpressions.QuotedString; import org.apache.drill.common.expression.ValueExpressions.TimeExpression; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; public class DruidCompareFunctionProcessor extends AbstractExprVisitor { diff --git a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidGroupScan.java b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidGroupScan.java index 710147d39b8..24dce99da6b 100755 --- a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidGroupScan.java +++ b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidGroupScan.java @@ -38,9 +38,9 @@ import org.apache.drill.exec.store.schedule.CompleteWork; import org.apache.drill.exec.store.schedule.EndpointByteMap; import org.apache.drill.exec.store.schedule.EndpointByteMapImpl; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidPushDownFilterForScan.java b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidPushDownFilterForScan.java index 2c5fcee32fc..ba5ab9dc3b8 100644 --- a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidPushDownFilterForScan.java +++ b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidPushDownFilterForScan.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.planner.physical.PrelUtil; import org.apache.drill.exec.planner.physical.ScanPrel; import org.apache.drill.exec.store.StoragePluginOptimizerRule; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public class DruidPushDownFilterForScan extends StoragePluginOptimizerRule { diff --git a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidRecordReader.java b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidRecordReader.java index 69ed0b9ead7..5c437c3e681 100755 --- a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidRecordReader.java +++ b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidRecordReader.java @@ -35,9 +35,9 @@ import org.apache.drill.exec.vector.BaseValueVector; import org.apache.drill.exec.vector.complex.fn.JsonReader; import org.apache.drill.exec.vector.complex.impl.VectorContainerWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Stopwatch; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidScanBatchCreator.java b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidScanBatchCreator.java index 98ae5a3aad6..45bac99adf5 100755 --- a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidScanBatchCreator.java +++ b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidScanBatchCreator.java @@ -25,8 +25,8 @@ import org.apache.drill.exec.record.CloseableRecordBatch; import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.store.RecordReader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidStoragePlugin.java b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidStoragePlugin.java index b7479fb632a..f702f1a2904 100755 --- a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidStoragePlugin.java +++ b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidStoragePlugin.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.store.druid.rest.RestClient; import org.apache.drill.exec.store.druid.rest.RestClientWrapper; import org.apache.drill.exec.store.druid.schema.DruidSchemaFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.util.Set; diff --git a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidSubScan.java b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidSubScan.java index 6eff2eac183..05405126141 100644 --- a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidSubScan.java +++ b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/DruidSubScan.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.physical.base.SubScan; import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.exec.store.druid.common.DruidFilter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.Iterator; import java.util.LinkedList; diff --git a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/schema/DruidSchemaFactory.java b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/schema/DruidSchemaFactory.java index 7de77f41e70..095bd454e05 100755 --- a/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/schema/DruidSchemaFactory.java +++ b/contrib/storage-druid/src/main/java/org/apache/drill/exec/store/druid/schema/DruidSchemaFactory.java @@ -30,8 +30,8 @@ import org.apache.drill.exec.store.druid.DruidStoragePlugin; import org.apache.drill.exec.store.druid.DruidStoragePluginConfig; import org.apache.drill.exec.store.druid.druid.SimpleDatasourceInfo; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/DruidStoragePluginConfigTest.java b/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/DruidStoragePluginConfigTest.java index 3e3f5495d04..dd76a64ed37 100644 --- a/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/DruidStoragePluginConfigTest.java +++ b/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/DruidStoragePluginConfigTest.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.drill.common.util.JacksonUtils; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Resources; import org.junit.Test; import java.io.File; diff --git a/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/DruidTestSuite.java b/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/DruidTestSuite.java index d35f0c1ee5a..3c09ce9d20a 100644 --- a/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/DruidTestSuite.java +++ b/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/DruidTestSuite.java @@ -24,7 +24,7 @@ import org.apache.drill.categories.SlowTest; import org.apache.drill.common.util.JacksonUtils; import org.apache.drill.exec.store.druid.rest.DruidQueryClientTest; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Resources; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; diff --git a/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/TestDataGenerator.java b/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/TestDataGenerator.java index 2d009f7787c..bb3c4bef513 100644 --- a/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/TestDataGenerator.java +++ b/contrib/storage-druid/src/test/java/org/apache/drill/exec/store/druid/TestDataGenerator.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.drill.common.util.JacksonUtils; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Resources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-elasticsearch/src/main/java/org/apache/drill/exec/store/elasticsearch/ElasticsearchStorageConfig.java b/contrib/storage-elasticsearch/src/main/java/org/apache/drill/exec/store/elasticsearch/ElasticsearchStorageConfig.java index 23be77f5439..2832dbb70f5 100644 --- a/contrib/storage-elasticsearch/src/main/java/org/apache/drill/exec/store/elasticsearch/ElasticsearchStorageConfig.java +++ b/contrib/storage-elasticsearch/src/main/java/org/apache/drill/exec/store/elasticsearch/ElasticsearchStorageConfig.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.store.security.CredentialProviderUtils; import org.apache.drill.common.logical.security.CredentialsProvider; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import java.util.HashMap; import java.util.List; diff --git a/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticComplexTypesTest.java b/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticComplexTypesTest.java index 32e9c9eca6d..f1054e8c9e2 100644 --- a/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticComplexTypesTest.java +++ b/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticComplexTypesTest.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.store.elasticsearch; import org.apache.drill.common.logical.StoragePluginConfig.AuthMode; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.json.simple.JSONObject; diff --git a/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticInfoSchemaTest.java b/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticInfoSchemaTest.java index 01e416820a4..7856aa57b41 100644 --- a/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticInfoSchemaTest.java +++ b/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticInfoSchemaTest.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.store.elasticsearch; import org.apache.drill.common.logical.StoragePluginConfig.AuthMode; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.json.simple.JSONObject; diff --git a/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticSearchPlanTest.java b/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticSearchPlanTest.java index ceebb2cfb17..0ad6adb2052 100644 --- a/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticSearchPlanTest.java +++ b/contrib/storage-elasticsearch/src/test/java/org/apache/drill/exec/store/elasticsearch/ElasticSearchPlanTest.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.store.elasticsearch; import org.apache.drill.common.logical.StoragePluginConfig.AuthMode; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.json.simple.JSONObject; diff --git a/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsGroupScan.java b/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsGroupScan.java index dc04837cc4f..2faf6ef8a30 100644 --- a/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsGroupScan.java +++ b/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsGroupScan.java @@ -39,7 +39,7 @@ import org.apache.drill.exec.util.Utilities; import org.apache.drill.metastore.metadata.TableMetadata; import org.apache.drill.metastore.metadata.TableMetadataProvider; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.io.IOException; import java.util.List; diff --git a/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsScanBatchCreator.java b/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsScanBatchCreator.java index e6163cd5c0c..881b3872930 100644 --- a/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsScanBatchCreator.java +++ b/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsScanBatchCreator.java @@ -33,7 +33,7 @@ import org.apache.drill.exec.server.options.OptionManager; import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.exec.store.StoragePluginRegistry.PluginException; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsStoragePlugin.java b/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsStoragePlugin.java index eba000374b2..8e531917b3d 100644 --- a/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsStoragePlugin.java +++ b/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsStoragePlugin.java @@ -44,8 +44,8 @@ import org.apache.drill.exec.store.base.filter.FilterPushDownUtils; import org.apache.drill.exec.store.googlesheets.schema.GoogleSheetsSchemaFactory; import org.apache.drill.exec.store.googlesheets.utils.GoogleSheetsUtils; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsSubScan.java b/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsSubScan.java index 88c8df0a9ad..c3d15b5c11e 100644 --- a/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsSubScan.java +++ b/contrib/storage-googlesheets/src/main/java/org/apache/drill/exec/store/googlesheets/GoogleSheetsSubScan.java @@ -30,7 +30,7 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.base.filter.ExprNode; import org.apache.drill.exec.store.base.filter.ExprNode.ColRelOpConstNode; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import java.util.Iterator; import java.util.List; diff --git a/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsLimitPushdown.java b/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsLimitPushdown.java index 0b6f95b037c..9ce49c02008 100644 --- a/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsLimitPushdown.java +++ b/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsLimitPushdown.java @@ -25,8 +25,8 @@ import org.apache.drill.exec.oauth.PersistentTokenTable; import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.exec.store.StoragePluginRegistry.PluginException; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.ClusterTest; import org.junit.BeforeClass; diff --git a/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsQueries.java b/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsQueries.java index df72b01efda..80f80b361ea 100644 --- a/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsQueries.java +++ b/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsQueries.java @@ -30,8 +30,8 @@ import org.apache.drill.exec.rpc.user.QueryDataBatch; import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.exec.store.StoragePluginRegistry.PluginException; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.ClusterTest; import org.apache.drill.test.rowSet.RowSetComparison; diff --git a/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsWriter.java b/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsWriter.java index d819cce66d9..83a5affdb31 100644 --- a/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsWriter.java +++ b/contrib/storage-googlesheets/src/test/java/org/apache/drill/exec/store/googlesheets/TestGoogleSheetsWriter.java @@ -29,8 +29,8 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.exec.store.StoragePluginRegistry.PluginException; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.apache.drill.test.QueryBuilder.QuerySummary; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/CompareFunctionsProcessor.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/CompareFunctionsProcessor.java index 6adbb44a8a5..d1d9f250680 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/CompareFunctionsProcessor.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/CompareFunctionsProcessor.java @@ -49,9 +49,9 @@ import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.PrefixFilter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.base.Charsets; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; public class CompareFunctionsProcessor extends AbstractExprVisitor { diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseConnectionManager.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseConnectionManager.java index bb3e2a89b8a..87755e6df2e 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseConnectionManager.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseConnectionManager.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.hbase; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -28,12 +28,12 @@ import org.apache.hadoop.hbase.client.ConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; -import org.apache.drill.shaded.guava.com.google.common.cache.RemovalListener; -import org.apache.drill.shaded.guava.com.google.common.cache.RemovalNotification; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.UncheckedExecutionException; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.cache.RemovalListener; +import com.google.common.cache.RemovalNotification; +import com.google.common.util.concurrent.UncheckedExecutionException; /** *

A singleton class which manages the lifecycle of HBase connections.

diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java index 19e8758837d..dbc503f32c9 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseFilterBuilder.java @@ -36,7 +36,7 @@ import org.apache.hadoop.hbase.filter.RowFilter; import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; public class HBaseFilterBuilder extends AbstractExprVisitor implements DrillHBaseConstants { diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseGroupScan.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseGroupScan.java index cef696ed034..1ad879f7eb6 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseGroupScan.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseGroupScan.java @@ -64,10 +64,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Maps; @JsonTypeName("hbase-scan") public class HBaseGroupScan extends AbstractGroupScan implements DrillHBaseConstants { diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java index 517baec45fb..abe0a456783 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.planner.physical.ScanPrel; import org.apache.drill.exec.store.StoragePluginOptimizerRule; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public abstract class HBasePushFilterIntoScan extends StoragePluginOptimizerRule { diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseRecordReader.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseRecordReader.java index 8083c0fd3e3..4421166bf16 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseRecordReader.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseRecordReader.java @@ -52,9 +52,9 @@ import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Sets; public class HBaseRecordReader extends AbstractRecordReader implements DrillHBaseConstants { private static final Logger logger = LoggerFactory.getLogger(HBaseRecordReader.class); diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanBatchCreator.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanBatchCreator.java index a0fe3bde629..35657ba9e4b 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanBatchCreator.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanBatchCreator.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.store.RecordReader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class HBaseScanBatchCreator implements BatchCreator { diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSchemaFactory.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSchemaFactory.java index 3cd1e0b45b3..24587f16130 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSchemaFactory.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSchemaFactory.java @@ -30,7 +30,7 @@ import org.apache.hadoop.hbase.client.Admin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; public class HBaseSchemaFactory extends AbstractSchemaFactory { private static final Logger logger = LoggerFactory.getLogger(HBaseSchemaFactory.class); diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePlugin.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePlugin.java index 4d1e05ed735..f7c15ebde93 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePlugin.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePlugin.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.store.AbstractStoragePlugin; import org.apache.drill.exec.store.SchemaConfig; import org.apache.drill.exec.store.StoragePluginOptimizerRule; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.Connection; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePluginConfig.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePluginConfig.java index ac7186c1099..9209a194722 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePluginConfig.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePluginConfig.java @@ -30,9 +30,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; @JsonTypeName(HBaseStoragePluginConfig.NAME) public class HBaseStoragePluginConfig extends StoragePluginConfig implements DrillHBaseConstants { diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSubScan.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSubScan.java index 75bf85f49ad..6dd4a7bb938 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSubScan.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSubScan.java @@ -37,7 +37,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Information for reading a single HBase region diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseUtils.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseUtils.java index 89e16237d88..8834b3a35c2 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseUtils.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseUtils.java @@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class HBaseUtils { static final ParseFilter FILTER_PARSEER = new ParseFilter(); diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStore.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStore.java index 36680f9bbfd..ef6bbfea1df 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStore.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStore.java @@ -38,7 +38,7 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; public class HBasePersistentStore extends BasePersistentStore { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(HBasePersistentStore.class); diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStoreProvider.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStoreProvider.java index 9893151ec56..1f3a53d4532 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStoreProvider.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStoreProvider.java @@ -39,7 +39,7 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; public class HBasePersistentStoreProvider extends BasePersistentStoreProvider { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(HBasePersistentStoreProvider.class); diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java index 402e2d211e4..1121c8b94f1 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java @@ -33,8 +33,8 @@ import org.junit.Assert; import org.junit.BeforeClass; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class BaseHBaseTest extends BaseTestQuery { diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java index af6790994ff..216eb9104c5 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java @@ -39,8 +39,8 @@ import org.junit.BeforeClass; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.junit.experimental.categories.Category; @Category({SlowTest.class, HbaseStorageTest.class}) diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseTableProvider.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseTableProvider.java index 592479ef1d9..661470ce517 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseTableProvider.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseTableProvider.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.categories.HbaseStorageTest; import org.apache.drill.common.config.LogicalPlanPersistence; import org.apache.drill.exec.exception.StoreException; diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java index 1807e4c8cb0..74173cafc17 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java @@ -36,8 +36,8 @@ import org.apache.drill.exec.vector.VarCharVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.io.Resources; import org.junit.experimental.categories.Category; @Category({SlowTest.class, HbaseStorageTest.class}) diff --git a/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectorHelper.java b/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectorHelper.java index 3e1ec4e7dce..c1b0af393d6 100644 --- a/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectorHelper.java +++ b/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectorHelper.java @@ -39,8 +39,8 @@ import java.sql.Timestamp; import java.util.HashMap; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; +import com.google.common.collect.ArrayListMultimap; public class ObjectInspectorHelper { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ObjectInspectorHelper.class); diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java index 99c999f5f57..d1075d45a05 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java @@ -41,8 +41,8 @@ import org.apache.drill.exec.planner.sql.HiveUDFOperator; import org.apache.drill.exec.planner.sql.HiveUDFOperatorWithoutInference; import org.apache.drill.exec.planner.sql.TypeInferenceUtils; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Multimap; import org.apache.hadoop.hive.ql.exec.Description; import org.apache.hadoop.hive.ql.exec.UDF; import org.apache.hadoop.hive.ql.udf.UDFType; @@ -51,8 +51,8 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Sets; public class HiveFunctionRegistry implements PluggableFunctionRegistry { private static final Logger logger = LoggerFactory.getLogger(HiveFunctionRegistry.class); diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionDescriptor.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionDescriptor.java index a52b48ded17..b5dde06e60c 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionDescriptor.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionDescriptor.java @@ -48,7 +48,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; // Partition descriptor for hive tables public class HivePartitionDescriptor extends AbstractPartitionDescriptor { diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionLocation.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionLocation.java index 25821f58a12..ef90fe0ca6d 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionLocation.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionLocation.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.sql; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.exec.planner.SimplePartitionLocation; import org.apache.hadoop.fs.Path; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/ColumnListsCache.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/ColumnListsCache.java index 6a5e1c6d212..587c5e549a0 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/ColumnListsCache.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/ColumnListsCache.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.Table; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetRowGroupScan.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetRowGroupScan.java index 6de82a20c29..b0caaffa33a 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetRowGroupScan.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetRowGroupScan.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.parquet.ParquetReaderConfig; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.SchemaPath; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetScan.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetScan.java index ce3d704fec9..ad24a02e41f 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetScan.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetScan.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.parquet.ParquetReaderConfig; import org.apache.drill.metastore.metadata.LocationProvider; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.expression.ValueExpressions; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetScanBatchCreator.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetScanBatchCreator.java index be906febe25..864a1b48ca4 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetScanBatchCreator.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveDrillNativeParquetScanBatchCreator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.hive; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.ops.ExecutorFragmentContext; import org.apache.drill.exec.ops.OperatorContext; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveMetadataProvider.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveMetadataProvider.java index 35dca628ace..fadc3cc5346 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveMetadataProvider.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveMetadataProvider.java @@ -17,13 +17,13 @@ */ package org.apache.drill.exec.store.hive; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Ordering; -import org.apache.drill.shaded.guava.com.google.common.collect.TreeMultimap; -import org.apache.drill.shaded.guava.com.google.common.io.ByteArrayDataOutput; -import org.apache.drill.shaded.guava.com.google.common.io.ByteStreams; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Multimap; +import com.google.common.collect.Ordering; +import com.google.common.collect.TreeMultimap; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; import org.apache.commons.codec.binary.Base64; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.exec.util.ImpersonationUtil; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveReadEntry.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveReadEntry.java index 7710a2b42a0..40ba9f425d9 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveReadEntry.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveReadEntry.java @@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class HiveReadEntry implements DrillTableSelection { diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java index 863f96aa0c6..2bd58563e79 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java @@ -52,7 +52,7 @@ import org.apache.drill.exec.store.StoragePluginOptimizerRule; import org.apache.drill.exec.store.dfs.FormatPlugin; import org.apache.drill.exec.store.hive.schema.HiveSchemaFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveSubScan.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveSubScan.java index ba3a04ae91e..b3ec4de5099 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveSubScan.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveSubScan.java @@ -25,7 +25,7 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JacksonInject; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.commons.codec.binary.Base64; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.SchemaPath; @@ -41,8 +41,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.io.ByteArrayDataInput; -import org.apache.drill.shaded.guava.com.google.common.io.ByteStreams; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteStreams; @JsonTypeName("hive-sub-scan") public class HiveSubScan extends AbstractBase implements SubScan { diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWrapper.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWrapper.java index b6f21c5218e..e6178b2a4ac 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWrapper.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWrapper.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; @JsonTypeName("table") public class HiveTableWrapper { diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveUtilities.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveUtilities.java index 0d82f1c7d6a..9c18e6d4203 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveUtilities.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveUtilities.java @@ -21,8 +21,8 @@ import org.apache.drill.exec.physical.impl.scan.v3.schema.SchemaUtils; import org.apache.drill.exec.planner.types.HiveToRelDataTypeConverter; import org.apache.drill.exec.record.metadata.ColumnMetadata; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import io.netty.buffer.DrillBuf; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.drill.common.exceptions.DrillRuntimeException; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/DatabaseNameCacheLoader.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/DatabaseNameCacheLoader.java index c017399a3cd..d5ec0e6f784 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/DatabaseNameCacheLoader.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/DatabaseNameCacheLoader.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.drill.common.AutoCloseables; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; +import com.google.common.cache.CacheLoader; import org.apache.hadoop.hive.metastore.api.MetaException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/HiveAuthorizationHelper.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/HiveAuthorizationHelper.java index e2dad5a106c..857febdf9e2 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/HiveAuthorizationHelper.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/HiveAuthorizationHelper.java @@ -21,7 +21,7 @@ import java.util.List; import org.apache.drill.common.exceptions.DrillRuntimeException; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.IMetaStoreClient; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/HiveMetadataCache.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/HiveMetadataCache.java index fe83bb09a2a..15e90962886 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/HiveMetadataCache.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/HiveMetadataCache.java @@ -24,9 +24,9 @@ import org.apache.calcite.schema.Schema; import org.apache.drill.exec.store.hive.HiveReadEntry; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; +import com.google.common.base.Strings; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.LoadingCache; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.thrift.TException; import org.slf4j.Logger; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/TableEntryCacheLoader.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/TableEntryCacheLoader.java index 1a19ff9057d..ed753223b40 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/TableEntryCacheLoader.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/TableEntryCacheLoader.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.store.hive.HiveTableWithColumnCache; import org.apache.drill.exec.store.hive.HiveTableWrapper; import org.apache.drill.exec.store.hive.HiveUtilities; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; +import com.google.common.cache.CacheLoader; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; import org.apache.hadoop.hive.metastore.api.Partition; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/TableNameCacheLoader.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/TableNameCacheLoader.java index 19de2aab123..b9a2b7e2972 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/TableNameCacheLoader.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/client/TableNameCacheLoader.java @@ -27,7 +27,7 @@ import org.apache.calcite.schema.Schema.TableType; import org.apache.drill.common.AutoCloseables; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; +import com.google.common.cache.CacheLoader; import org.apache.hadoop.hive.metastore.api.MetaException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveDefaultRecordReader.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveDefaultRecordReader.java index 8598643a75f..535fa2f0871 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveDefaultRecordReader.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveDefaultRecordReader.java @@ -51,7 +51,7 @@ import org.apache.drill.exec.vector.AllocationHelper; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.complex.impl.VectorContainerWriter; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListenableFuture; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.StorageDescriptor; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java index 967f7344af2..400b668b914 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java @@ -33,7 +33,7 @@ import org.apache.drill.exec.store.SchemaConfig; import org.apache.drill.exec.store.hive.HiveReadEntry; import org.apache.drill.exec.store.hive.HiveTableWithColumnCache; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import static java.util.stream.Collectors.toList; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java index e82274eaad9..60a2f1a3bfc 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java @@ -39,10 +39,10 @@ import org.apache.drill.exec.store.hive.HiveStoragePluginConfig; import org.apache.drill.exec.store.hive.client.DrillHiveMetaStoreClient; import org.apache.drill.exec.store.hive.client.DrillHiveMetaStoreClientFactory; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; -import org.apache.drill.shaded.guava.com.google.common.cache.RemovalListener; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.cache.RemovalListener; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.api.MetaException; diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java index 60263661ea5..7843b3fe41a 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java @@ -35,8 +35,8 @@ import org.apache.drill.exec.vector.VarCharVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.io.Resources; import org.junit.experimental.categories.Category; @Category({SlowTest.class, HiveStorageTest.class}) diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestInbuiltHiveUDFs.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestInbuiltHiveUDFs.java index eb2c3e6053c..70deb79a61d 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestInbuiltHiveUDFs.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestInbuiltHiveUDFs.java @@ -36,7 +36,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; @Category({SlowTest.class, HiveStorageTest.class}) public class TestInbuiltHiveUDFs extends HiveTestBase { diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestInfoSchemaOnHiveStorage.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestInfoSchemaOnHiveStorage.java index a34a05a32d1..1d4c96e4985 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestInfoSchemaOnHiveStorage.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestInfoSchemaOnHiveStorage.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.hive; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.apache.drill.categories.HiveStorageTest; import org.apache.drill.test.TestBuilder; import org.apache.drill.categories.SlowTest; diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java index 0e3c59f5dc0..ff1b07c65ab 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.impersonation.hive; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import org.apache.drill.test.ClientFixture; import org.apache.drill.categories.HiveStorageTest; import org.apache.drill.categories.SlowTest; diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java index c4691642eb6..11917ef7f32 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java @@ -25,8 +25,8 @@ import org.apache.calcite.schema.Schema.TableType; import org.apache.drill.categories.HiveStorageTest; import org.apache.drill.categories.SlowTest; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import org.apache.drill.test.ClientFixture; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; @@ -41,7 +41,7 @@ import org.junit.experimental.categories.Category; import static org.apache.drill.exec.hive.HiveTestUtilities.executeQuery; -import static org.apache.drill.shaded.guava.com.google.common.collect.Lists.newArrayList; +import static com.google.common.collect.Lists.newArrayList; import static org.apache.hadoop.fs.FileSystem.FS_DEFAULT_NAME_KEY; import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.DYNAMICPARTITIONINGMODE; import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.HIVE_CBO_ENABLED; diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java index 376b49d59f6..ac8a133f26c 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java @@ -26,7 +26,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.drill.exec.hive.HiveTestUtilities; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Resources; import org.apache.drill.test.BaseDirTestWatcher; import org.apache.drill.test.BaseTestQuery; import org.apache.hadoop.hive.ql.Driver; diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java index bdec1320526..1cbdfc0aabf 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.hive.schema; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.store.hive.ColumnListsCache; import org.apache.drill.categories.SlowTest; import org.apache.drill.test.BaseTest; diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpApiConfig.java b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpApiConfig.java index 1d8f49b0bc6..43bc2308bbf 100644 --- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpApiConfig.java +++ b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpApiConfig.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.store.security.CredentialProviderUtils; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; import org.apache.drill.exec.store.security.UsernamePasswordWithProxyCredentials; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpBatchReader.java b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpBatchReader.java index df7dff5b1a3..a265c697b1a 100644 --- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpBatchReader.java +++ b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpBatchReader.java @@ -45,7 +45,7 @@ import org.apache.drill.exec.store.http.util.SimpleHttp; import org.apache.drill.exec.store.ImplicitColumnUtils.ImplicitColumns; import org.apache.drill.exec.store.security.UsernamePasswordWithProxyCredentials; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpCSVBatchReader.java b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpCSVBatchReader.java index ab710e9463f..f12cbfaf5e2 100644 --- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpCSVBatchReader.java +++ b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpCSVBatchReader.java @@ -36,7 +36,7 @@ import org.apache.drill.exec.store.http.paginator.Paginator; import org.apache.drill.exec.store.http.util.SimpleHttp; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpGroupScan.java b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpGroupScan.java index e22a1b0011e..da94919ff67 100644 --- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpGroupScan.java +++ b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpGroupScan.java @@ -44,7 +44,7 @@ import org.apache.drill.exec.util.Utilities; import org.apache.drill.metastore.metadata.TableMetadata; import org.apache.drill.metastore.metadata.TableMetadataProvider; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; @JsonTypeName("http-scan") diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpScanBatchCreator.java b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpScanBatchCreator.java index d5f277fe5fb..ebccc8fe42c 100644 --- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpScanBatchCreator.java +++ b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpScanBatchCreator.java @@ -39,7 +39,7 @@ import org.apache.drill.exec.store.http.paginator.OffsetPaginator; import org.apache.drill.exec.store.http.paginator.PagePaginator; import org.apache.drill.exec.store.http.paginator.Paginator; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePlugin.java b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePlugin.java index c86c2c7d22a..7b65310d76c 100644 --- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePlugin.java +++ b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePlugin.java @@ -35,8 +35,8 @@ import org.apache.drill.exec.store.SchemaConfig; import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.exec.store.base.filter.FilterPushDownUtils; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableSet; import com.fasterxml.jackson.core.type.TypeReference; import java.io.IOException; diff --git a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpPlugin.java b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpPlugin.java index a6f1843d69b..4ef5e45ee21 100644 --- a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpPlugin.java +++ b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpPlugin.java @@ -33,9 +33,9 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Files; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.apache.drill.test.rowSet.RowSetUtilities; diff --git a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpUDFFunctions.java b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpUDFFunctions.java index 9df72c53940..67b5d277cfb 100644 --- a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpUDFFunctions.java +++ b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpUDFFunctions.java @@ -39,9 +39,9 @@ import org.apache.drill.exec.store.http.udfs.HttpUdfUtils; import org.apache.drill.exec.store.http.util.SimpleHttp; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Files; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.apache.drill.test.LogFixture; diff --git a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpUDFWithAliases.java b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpUDFWithAliases.java index 3b22571b5c3..d1ae722663e 100644 --- a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpUDFWithAliases.java +++ b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpUDFWithAliases.java @@ -33,9 +33,9 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.rpc.user.security.testing.UserAuthenticatorTestImpl; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Files; import org.apache.drill.test.ClientFixture; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; diff --git a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestOAuthProcess.java b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestOAuthProcess.java index c4be7e15279..f70a5f0c386 100644 --- a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestOAuthProcess.java +++ b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestOAuthProcess.java @@ -38,8 +38,8 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.security.oauth.OAuthTokenCredentials; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.ClusterTest; import org.apache.drill.test.rowSet.RowSetUtilities; diff --git a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestPagination.java b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestPagination.java index 8363c13e094..055b781abc2 100644 --- a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestPagination.java +++ b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestPagination.java @@ -31,8 +31,8 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.rpc.user.QueryDataBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.apache.drill.test.QueryRowSetIterator; diff --git a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestProvidedSchema.java b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestProvidedSchema.java index 8c9a9b68e70..5ecaed1458b 100644 --- a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestProvidedSchema.java +++ b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestProvidedSchema.java @@ -33,9 +33,9 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Files; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.apache.drill.test.rowSet.RowSetUtilities; diff --git a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestUserTranslationInHttpPlugin.java b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestUserTranslationInHttpPlugin.java index b167a4b6a75..b05581c748a 100644 --- a/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestUserTranslationInHttpPlugin.java +++ b/contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestUserTranslationInHttpPlugin.java @@ -42,8 +42,8 @@ import org.apache.drill.exec.store.StoragePlugin; import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.exec.store.security.oauth.OAuthTokenCredentials; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.apache.drill.test.BaseDirTestWatcher; import org.apache.drill.test.ClientFixture; import org.apache.drill.test.ClusterFixtureBuilder; diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcConvention.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcConvention.java index ecf946a3809..6aa12cfc59a 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcConvention.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcConvention.java @@ -43,8 +43,8 @@ import org.apache.drill.exec.store.enumerable.plan.VertexDrelConverterRule; import org.apache.drill.exec.store.jdbc.rules.JdbcLimitRule; import org.apache.drill.exec.store.jdbc.rules.JdbcSortRule; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; /** * Convention with set of rules to register for jdbc plugin diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchReader.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchReader.java index 30270d6664f..161a3dc9775 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchReader.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchReader.java @@ -41,7 +41,7 @@ import org.apache.drill.exec.store.jdbc.writers.JdbcVarbinaryWriter; import org.apache.drill.exec.store.jdbc.writers.JdbcVarcharWriter; import org.apache.drill.exec.store.jdbc.writers.JdbcVardecimalWriter; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcConventionFactory.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcConventionFactory.java index af20823c9e7..87484b43c4c 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcConventionFactory.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcConventionFactory.java @@ -21,8 +21,8 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.exec.proto.UserBitShared.UserCredentials; -import org.apache.drill.shaded.guava.com.google.common.cache.Cache; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import java.time.Duration; diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcScanBatchCreator.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcScanBatchCreator.java index 01ee329f5b6..c02ef270876 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcScanBatchCreator.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcScanBatchCreator.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.physical.impl.scan.framework.SchemaNegotiator; import org.apache.drill.exec.record.CloseableRecordBatch; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java index dbddce3a531..b800c44b84a 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java @@ -35,7 +35,7 @@ import org.apache.drill.common.logical.StoragePluginConfig; import org.apache.drill.common.logical.security.CredentialsProvider; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java index c968d518ec9..027c99b258c 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java @@ -42,8 +42,8 @@ import org.apache.drill.exec.store.SchemaConfig; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/clickhouse/ClickhouseJdbcImplementor.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/clickhouse/ClickhouseJdbcImplementor.java index dd9e862aa6f..c1a2f2323b6 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/clickhouse/ClickhouseJdbcImplementor.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/clickhouse/ClickhouseJdbcImplementor.java @@ -22,8 +22,8 @@ import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.TableScan; import org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.adapter.jdbc.JdbcImplementor; import org.apache.calcite.sql.SqlDialect; diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/writers/JdbcVarcharWriter.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/writers/JdbcVarcharWriter.java index 95e2cd2ab73..1dec1a799a3 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/writers/JdbcVarcharWriter.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/writers/JdbcVarcharWriter.java @@ -19,7 +19,7 @@ package org.apache.drill.exec.store.jdbc.writers; import org.apache.drill.exec.physical.resultSet.RowSetLoader; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java b/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java index fb590266eed..7eb8c67df2b 100644 --- a/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java +++ b/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.rowSet.RowSet; import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.apache.drill.test.rowSet.RowSetUtilities; diff --git a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaGroupScan.java b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaGroupScan.java index 45c75890a3a..9db073ce668 100644 --- a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaGroupScan.java +++ b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaGroupScan.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; import org.apache.drill.exec.ExecConstants; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.commons.lang3.StringUtils; import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.exceptions.ExecutionSetupException; @@ -61,10 +61,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Preconditions; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; @JsonTypeName("kafka-scan") public class KafkaGroupScan extends AbstractGroupScan { diff --git a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaNodeProcessor.java b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaNodeProcessor.java index 6d267c147fc..28e6bb48fd4 100644 --- a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaNodeProcessor.java +++ b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaNodeProcessor.java @@ -32,8 +32,8 @@ import org.apache.drill.common.expression.ValueExpressions.TimeStampExpression; import org.apache.drill.common.expression.visitors.AbstractExprVisitor; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; class KafkaNodeProcessor extends AbstractExprVisitor { diff --git a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaPartitionScanSpecBuilder.java b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaPartitionScanSpecBuilder.java index 5c34dc6cc2d..6ad088380d9 100644 --- a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaPartitionScanSpecBuilder.java +++ b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaPartitionScanSpecBuilder.java @@ -22,11 +22,11 @@ import org.apache.drill.common.expression.FunctionCall; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.visitors.AbstractExprVisitor; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.consumer.OffsetAndTimestamp; import org.apache.kafka.common.TopicPartition; diff --git a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaPushDownFilterIntoScan.java b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaPushDownFilterIntoScan.java index 443650e0d9c..2c1072a3f0f 100644 --- a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaPushDownFilterIntoScan.java +++ b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaPushDownFilterIntoScan.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.kafka; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptRuleOperand; import org.apache.calcite.rex.RexNode; diff --git a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaScanBatchCreator.java b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaScanBatchCreator.java index 4adfdca26a3..019a539d71a 100644 --- a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaScanBatchCreator.java +++ b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaScanBatchCreator.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.server.options.OptionManager; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class KafkaScanBatchCreator implements BatchCreator { diff --git a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaStoragePlugin.java b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaStoragePlugin.java index d376bb2fb98..9a24154c915 100644 --- a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaStoragePlugin.java +++ b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaStoragePlugin.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; public class KafkaStoragePlugin extends AbstractStoragePlugin { diff --git a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaSubScan.java b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaSubScan.java index c05ddd01d75..6adcf95eb60 100644 --- a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaSubScan.java +++ b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/KafkaSubScan.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; @JsonTypeName("kafka-partition-scan") public class KafkaSubScan extends AbstractBase implements SubScan { diff --git a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/MessageIterator.java b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/MessageIterator.java index 7282147ee82..c70a192d9b0 100644 --- a/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/MessageIterator.java +++ b/contrib/storage-kafka/src/main/java/org/apache/drill/exec/store/kafka/MessageIterator.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; public class MessageIterator implements Iterator>, AutoCloseable { diff --git a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaMessageGenerator.java b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaMessageGenerator.java index ef2ea8fc7fe..184f5be3bd4 100644 --- a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaMessageGenerator.java +++ b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaMessageGenerator.java @@ -39,7 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; diff --git a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaTestBase.java b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaTestBase.java index 0af48213a41..dd4ab30af4d 100644 --- a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaTestBase.java +++ b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaTestBase.java @@ -33,7 +33,7 @@ import org.junit.Assume; import org.junit.BeforeClass; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import static org.apache.drill.exec.store.kafka.KafkaMessageGenerator.SCHEMA_REGISTRY_URL; diff --git a/contrib/storage-kudu/src/main/codegen/templates/KuduRecordWriter.java b/contrib/storage-kudu/src/main/codegen/templates/KuduRecordWriter.java index d5ea1acac08..6a1a911b724 100644 --- a/contrib/storage-kudu/src/main/codegen/templates/KuduRecordWriter.java +++ b/contrib/storage-kudu/src/main/codegen/templates/KuduRecordWriter.java @@ -39,7 +39,7 @@ import org.apache.drill.exec.vector.*; import org.apache.drill.exec.vector.complex.reader.FieldReader; import org.apache.drill.exec.vector.complex.fn.JsonOutput; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.kudu.client.*; import org.apache.parquet.io.api.RecordConsumer; diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/DrillKuduTable.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/DrillKuduTable.java index 4ed239444b3..7eb3fccb233 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/DrillKuduTable.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/DrillKuduTable.java @@ -27,7 +27,7 @@ import org.apache.kudu.Schema; import org.apache.kudu.Type; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class DrillKuduTable extends DynamicDrillTable { diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduGroupScan.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduGroupScan.java index 7655f802909..cd667c02799 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduGroupScan.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduGroupScan.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.EndpointAffinity; @@ -42,8 +42,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; import org.apache.drill.exec.store.schedule.AffinityCreator; import org.apache.drill.exec.store.schedule.AssignmentCreator; import org.apache.drill.exec.store.schedule.CompleteWork; diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduRecordReader.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduRecordReader.java index 972afad92b2..a573f07cc12 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduRecordReader.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduRecordReader.java @@ -63,9 +63,9 @@ import org.apache.kudu.client.RowResultIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; public class KuduRecordReader extends AbstractRecordReader { private static final Logger logger = LoggerFactory.getLogger(KuduRecordReader.class); diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanBatchCreator.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanBatchCreator.java index f2a95c6d3eb..b88d60bf372 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanBatchCreator.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanBatchCreator.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.store.RecordReader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class KuduScanBatchCreator implements BatchCreator{ diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSchemaFactory.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSchemaFactory.java index a4d7d3b2bf4..e29c5738544 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSchemaFactory.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSchemaFactory.java @@ -36,7 +36,7 @@ import org.apache.kudu.client.ListTablesResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; public class KuduSchemaFactory extends AbstractSchemaFactory { private static final Logger logger = LoggerFactory.getLogger(KuduSchemaFactory.class); diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSubScan.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSubScan.java index a4f99bc3588..fe3b0f178d2 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSubScan.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSubScan.java @@ -21,7 +21,7 @@ import java.util.LinkedList; import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.base.AbstractBase; @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Information for reading a single Kudu tablet diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/bson/BsonRecordReader.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/bson/BsonRecordReader.java index 5b35b5bb6ce..0ca1d03354f 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/bson/BsonRecordReader.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/bson/BsonRecordReader.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.vector.complex.writer.BaseWriter; import org.apache.drill.exec.vector.complex.writer.BaseWriter.ComplexWriter; import org.apache.drill.exec.vector.complex.writer.TimeStampWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.bson.BsonBinary; import org.bson.BsonReader; import org.bson.BsonType; diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCompareFunctionProcessor.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCompareFunctionProcessor.java index 33e5d008d00..80a1e30de06 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCompareFunctionProcessor.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCompareFunctionProcessor.java @@ -34,8 +34,8 @@ import org.apache.drill.common.expression.ValueExpressions.VarDecimalExpression; import org.apache.drill.common.expression.visitors.AbstractExprVisitor; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; public class MongoCompareFunctionProcessor extends AbstractExprVisitor { diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoGroupScan.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoGroupScan.java index e14379d092a..2622703ceca 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoGroupScan.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoGroupScan.java @@ -60,13 +60,13 @@ import org.bson.types.MaxKey; import org.bson.types.MinKey; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.mongodb.ReadPreference; import com.mongodb.ServerAddress; import com.mongodb.client.FindIterable; diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoRecordReader.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoRecordReader.java index 93b2d1610a7..6548187a129 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoRecordReader.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoRecordReader.java @@ -50,10 +50,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Charsets; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import com.mongodb.client.MongoClient; import com.mongodb.ServerAddress; import com.mongodb.client.MongoCollection; diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanBatchCreator.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanBatchCreator.java index 350cb28c1ca..2fd09661920 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanBatchCreator.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanBatchCreator.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class MongoScanBatchCreator implements BatchCreator { static final Logger logger = LoggerFactory diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePlugin.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePlugin.java index 7b78e24b541..bc3845c5a88 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePlugin.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePlugin.java @@ -44,12 +44,12 @@ import org.apache.drill.exec.store.security.HadoopCredentialsProvider; import org.apache.drill.common.logical.security.PlainCredentialsProvider; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; -import org.apache.drill.shaded.guava.com.google.common.cache.Cache; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.RemovalListener; -import org.apache.drill.shaded.guava.com.google.common.cache.RemovalNotification; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.RemovalListener; +import com.google.common.cache.RemovalNotification; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java index 1bac6579c80..85e2470e0b6 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java @@ -39,7 +39,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; @JsonTypeName("mongo-shard-read") public class MongoSubScan extends AbstractBase implements SubScan { diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoUtils.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoUtils.java index 58b4bfe864f..28c6c69e6e6 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoUtils.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoUtils.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.bson.Document; public class MongoUtils { diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/config/MongoPersistentStore.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/config/MongoPersistentStore.java index da35e1c103f..73ff31de5cb 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/config/MongoPersistentStore.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/config/MongoPersistentStore.java @@ -22,7 +22,7 @@ import java.util.Map.Entry; import java.util.NoSuchElementException; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.exec.store.mongo.DrillMongoConstants; import org.apache.drill.exec.store.sys.BasePersistentStore; diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/plan/RexToMongoTranslator.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/plan/RexToMongoTranslator.java index 16a51d455f5..f06fd2a3e1d 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/plan/RexToMongoTranslator.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/plan/RexToMongoTranslator.java @@ -30,7 +30,7 @@ import org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.apache.calcite.sql.type.SqlTypeName; import org.apache.drill.exec.store.mongo.common.MongoOp; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.bson.BsonArray; import org.bson.BsonDocument; import org.bson.BsonInt32; diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoDatabaseSchema.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoDatabaseSchema.java index 42497256a45..4f51b25976a 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoDatabaseSchema.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoDatabaseSchema.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Set; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.calcite.schema.Table; import org.apache.drill.exec.planner.logical.DrillTable; @@ -29,7 +29,7 @@ import org.apache.drill.exec.store.mongo.MongoStoragePluginConfig; import org.apache.drill.exec.store.mongo.schema.MongoSchemaFactory.MongoSchema; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; public class MongoDatabaseSchema extends AbstractSchema { diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoSchemaFactory.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoSchemaFactory.java index 29f14ce8169..efa4ab1b964 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoSchemaFactory.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoSchemaFactory.java @@ -39,11 +39,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.mongodb.MongoException; import com.mongodb.client.MongoDatabase; diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuite.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuite.java index 94bad0bac68..543cc370b7a 100644 --- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuite.java +++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestSuite.java @@ -26,8 +26,8 @@ import com.mongodb.client.model.Indexes; import org.apache.drill.categories.MongoStorageTest; import org.apache.drill.categories.SlowTest; -import org.apache.drill.shaded.guava.com.google.common.io.Files; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Files; +import com.google.common.io.Resources; import org.apache.drill.test.BaseTest; import org.apache.hadoop.conf.Configuration; import org.bson.Document; diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java index eb706d68498..e2cf3fab610 100644 --- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java +++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java @@ -31,9 +31,9 @@ import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; import org.apache.drill.exec.store.mongo.common.ChunkInfo; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.drill.test.BaseTest; import org.junit.Before; import org.junit.Test; diff --git a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/DrillOpenTSDBTable.java b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/DrillOpenTSDBTable.java index e89343a191e..bdbb670fbab 100644 --- a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/DrillOpenTSDBTable.java +++ b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/DrillOpenTSDBTable.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.openTSDB; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.sql.type.SqlTypeName; diff --git a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBGroupScan.java b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBGroupScan.java index 8969a2d1b1e..7ab4b4d6bc8 100644 --- a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBGroupScan.java +++ b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBGroupScan.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.base.AbstractGroupScan; diff --git a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBRecordReader.java b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBRecordReader.java index 00d510080a4..57c9cfdf45d 100644 --- a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBRecordReader.java +++ b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBRecordReader.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.store.openTSDB; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.expression.SchemaPath; diff --git a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBSubScan.java b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBSubScan.java index 554494238f1..d8c01871bf5 100644 --- a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBSubScan.java +++ b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/OpenTSDBSubScan.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.base.AbstractBase; diff --git a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/SizeEstimator.java b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/SizeEstimator.java index 89fd96f8894..37f4e67758e 100644 --- a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/SizeEstimator.java +++ b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/SizeEstimator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.openTSDB; -import org.apache.drill.shaded.guava.com.google.common.collect.MapMaker; +import com.google.common.collect.MapMaker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/Util.java b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/Util.java index f85a52f9c3d..6e0ef05f70f 100644 --- a/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/Util.java +++ b/contrib/storage-opentsdb/src/main/java/org/apache/drill/exec/store/openTSDB/Util.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.openTSDB; -import org.apache.drill.shaded.guava.com.google.common.base.Splitter; +import com.google.common.base.Splitter; import org.apache.drill.common.exceptions.UserException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixBatchReader.java b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixBatchReader.java index db48603f3c7..5fb0e81f643 100644 --- a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixBatchReader.java +++ b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixBatchReader.java @@ -50,7 +50,7 @@ import org.apache.drill.exec.store.phoenix.PhoenixReader.GenericTimeDefn; import org.apache.drill.exec.store.phoenix.PhoenixReader.GenericTimestampDefn; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixDataSource.java b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixDataSource.java index 806317fcced..f98a04049a5 100644 --- a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixDataSource.java +++ b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixDataSource.java @@ -33,7 +33,7 @@ import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.common.util.function.CheckedSupplier; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixReader.java b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixReader.java index 1d702761d71..ada1e3c70e2 100644 --- a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixReader.java +++ b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixReader.java @@ -36,7 +36,7 @@ import org.apache.drill.exec.vector.accessor.ColumnWriter; import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.writer.ScalarArrayWriter; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; public class PhoenixReader implements AutoCloseable { diff --git a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixStoragePlugin.java b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixStoragePlugin.java index 6beb6b3711f..daf4e480fa7 100644 --- a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixStoragePlugin.java +++ b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixStoragePlugin.java @@ -44,9 +44,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import org.apache.hadoop.security.UserGroupInformation; import org.apache.tephra.shaded.com.google.common.collect.ImmutableSet; diff --git a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixSubScan.java b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixSubScan.java index a57d5e3a367..5345ffa8c21 100644 --- a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixSubScan.java +++ b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixSubScan.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.physical.base.PhysicalVisitor; import org.apache.drill.exec.physical.base.SubScan; import org.apache.drill.exec.store.StoragePluginRegistry; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/rules/PhoenixConvention.java b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/rules/PhoenixConvention.java index b0b785dc1df..c4a91748063 100644 --- a/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/rules/PhoenixConvention.java +++ b/contrib/storage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/rules/PhoenixConvention.java @@ -41,7 +41,7 @@ import org.apache.drill.exec.store.enumerable.plan.DrillJdbcRuleBase; import org.apache.drill.exec.store.enumerable.plan.VertexDrelConverterRule; import org.apache.drill.exec.store.phoenix.PhoenixStoragePlugin; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; public class PhoenixConvention extends JdbcConvention { diff --git a/contrib/storage-phoenix/src/test/java/org/apache/drill/exec/store/phoenix/PhoenixBaseTest.java b/contrib/storage-phoenix/src/test/java/org/apache/drill/exec/store/phoenix/PhoenixBaseTest.java index 35887eb8634..744e18db0be 100644 --- a/contrib/storage-phoenix/src/test/java/org/apache/drill/exec/store/phoenix/PhoenixBaseTest.java +++ b/contrib/storage-phoenix/src/test/java/org/apache/drill/exec/store/phoenix/PhoenixBaseTest.java @@ -38,7 +38,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.drill.exec.store.StoragePluginRegistry; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.ClusterTest; diff --git a/contrib/storage-phoenix/src/test/java/org/apache/drill/exec/store/phoenix/secured/SecuredPhoenixBaseTest.java b/contrib/storage-phoenix/src/test/java/org/apache/drill/exec/store/phoenix/secured/SecuredPhoenixBaseTest.java index 852a33650be..193b7ba9544 100644 --- a/contrib/storage-phoenix/src/test/java/org/apache/drill/exec/store/phoenix/secured/SecuredPhoenixBaseTest.java +++ b/contrib/storage-phoenix/src/test/java/org/apache/drill/exec/store/phoenix/secured/SecuredPhoenixBaseTest.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.store.phoenix.PhoenixDataSource; import org.apache.drill.exec.store.phoenix.PhoenixStoragePluginConfig; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.ClusterTest; diff --git a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkBatchReader.java b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkBatchReader.java index 11a0ce9fff3..8c3fb45bf6d 100644 --- a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkBatchReader.java +++ b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkBatchReader.java @@ -37,8 +37,8 @@ import org.apache.drill.exec.store.base.filter.ExprNode; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Stopwatch; +import com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkGroupScan.java b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkGroupScan.java index 47ad6933773..9ab7de6d471 100644 --- a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkGroupScan.java +++ b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkGroupScan.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.store.base.filter.ExprNode; import org.apache.drill.exec.util.Utilities; import org.apache.drill.metastore.metadata.TableMetadataProvider; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.io.IOException; import java.util.List; diff --git a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkQueryBuilder.java b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkQueryBuilder.java index 0d83fddee92..0c6b0632c8d 100644 --- a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkQueryBuilder.java +++ b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkQueryBuilder.java @@ -21,7 +21,7 @@ import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.store.base.filter.ExprNode; import org.apache.drill.exec.store.base.filter.RelOp; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import java.util.Map; diff --git a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkScanBatchCreator.java b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkScanBatchCreator.java index 0b501246187..68114678a68 100644 --- a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkScanBatchCreator.java +++ b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkScanBatchCreator.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.record.CloseableRecordBatch; import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.server.options.OptionManager; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; diff --git a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkSchema.java b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkSchema.java index 875d052a317..c8cecab5d02 100644 --- a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkSchema.java +++ b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkSchema.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.planner.logical.ModifyTableEntry; import org.apache.drill.exec.store.AbstractSchema; import org.apache.drill.exec.store.StorageStrategy; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkStoragePlugin.java b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkStoragePlugin.java index e8eead6e1fb..5f1cac34184 100644 --- a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkStoragePlugin.java +++ b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkStoragePlugin.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.store.SchemaConfig; import org.apache.drill.exec.store.base.filter.FilterPushDownUtils; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkSubScan.java b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkSubScan.java index e90bd2aa9d2..951e05bb178 100644 --- a/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkSubScan.java +++ b/contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkSubScan.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.physical.base.PhysicalVisitor; import org.apache.drill.exec.physical.base.SubScan; import org.apache.drill.exec.store.base.filter.ExprNode; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import java.util.Iterator; import java.util.List; diff --git a/distribution/src/assemble/component.xml b/distribution/src/assemble/component.xml index 6e6473a79e9..7cf3066e51d 100644 --- a/distribution/src/assemble/component.xml +++ b/distribution/src/assemble/component.xml @@ -96,15 +96,6 @@ false - - jars - false - false - - org.apache.drill:drill-shaded-guava:jar - - - jars/classb false diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebServer.java b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebServer.java index 29a38e4fbff..bc7ae1ec728 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebServer.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebServer.java @@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.drill.exec.server.rest.CsrfTokenInjectFilter; import org.apache.drill.exec.server.rest.CsrfTokenValidateFilter; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.drill.yarn.appMaster.Dispatcher; import org.apache.drill.yarn.core.DrillOnYarnConfig; import org.bouncycastle.asn1.x500.X500NameBuilder; diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKClusterCoordinator.java b/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKClusterCoordinator.java index fd54a43c7fe..fd49c638e30 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKClusterCoordinator.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKClusterCoordinator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.yarn.zk; -import static org.apache.drill.shaded.guava.com.google.common.collect.Collections2.transform; +import static com.google.common.collect.Collections2.transform; import java.io.IOException; import java.util.Collection; @@ -27,7 +27,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.drill.shaded.guava.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.curator.RetryPolicy; @@ -56,7 +56,7 @@ import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.State; -import org.apache.drill.shaded.guava.com.google.common.base.Function; +import com.google.common.base.Function; /** * Manages cluster coordination utilizing zookeeper. diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKRegistry.java b/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKRegistry.java index d20c40eb414..d05c5628b47 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKRegistry.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKRegistry.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; diff --git a/exec/java-exec/src/main/codegen/includes/vv_imports.ftl b/exec/java-exec/src/main/codegen/includes/vv_imports.ftl index 37fde7dfa04..586c78988eb 100644 --- a/exec/java-exec/src/main/codegen/includes/vv_imports.ftl +++ b/exec/java-exec/src/main/codegen/includes/vv_imports.ftl @@ -17,15 +17,15 @@ limitations under the License. --> -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkArgument; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkState; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.ObjectArrays; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.ObjectArrays; +import com.google.common.collect.Lists; +import com.google.common.collect.ObjectArrays; +import com.google.common.base.Charsets; +import com.google.common.collect.ObjectArrays; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import io.netty.buffer.*; import org.apache.commons.lang3.ArrayUtils; diff --git a/exec/java-exec/src/main/codegen/templates/EventBasedRecordWriter.java b/exec/java-exec/src/main/codegen/templates/EventBasedRecordWriter.java index 0d2672e8617..3b231fddaca 100644 --- a/exec/java-exec/src/main/codegen/templates/EventBasedRecordWriter.java +++ b/exec/java-exec/src/main/codegen/templates/EventBasedRecordWriter.java @@ -22,8 +22,8 @@ package org.apache.drill.exec.store; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.record.VectorAccessible; diff --git a/exec/java-exec/src/main/codegen/templates/ParquetOutputRecordWriter.java b/exec/java-exec/src/main/codegen/templates/ParquetOutputRecordWriter.java index 3658ecc82ff..c28cd87cf43 100644 --- a/exec/java-exec/src/main/codegen/templates/ParquetOutputRecordWriter.java +++ b/exec/java-exec/src/main/codegen/templates/ParquetOutputRecordWriter.java @@ -27,9 +27,9 @@ package org.apache.drill.exec.store; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.primitives.Ints; -import org.apache.drill.shaded.guava.com.google.common.primitives.Longs; +import com.google.common.collect.Lists; +import com.google.common.primitives.Ints; +import com.google.common.primitives.Longs; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.expr.TypeHelper; import org.apache.drill.exec.expr.holders.*; diff --git a/exec/java-exec/src/main/codegen/templates/RecordValueAccessor.java b/exec/java-exec/src/main/codegen/templates/RecordValueAccessor.java index 64d03a25a0a..aa65d381b92 100644 --- a/exec/java-exec/src/main/codegen/templates/RecordValueAccessor.java +++ b/exec/java-exec/src/main/codegen/templates/RecordValueAccessor.java @@ -21,7 +21,7 @@ package org.apache.drill.exec.record; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.types.TypeProtos; import org.apache.drill.exec.expr.TypeHelper; diff --git a/exec/java-exec/src/main/codegen/templates/StringOutputRecordWriter.java b/exec/java-exec/src/main/codegen/templates/StringOutputRecordWriter.java index 017fda4936e..183bd049e64 100644 --- a/exec/java-exec/src/main/codegen/templates/StringOutputRecordWriter.java +++ b/exec/java-exec/src/main/codegen/templates/StringOutputRecordWriter.java @@ -26,7 +26,7 @@ package org.apache.drill.exec.store; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.expr.TypeHelper; import org.apache.drill.exec.expr.holders.*; import org.apache.drill.exec.memory.BufferAllocator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/TestMemoryRetention.java b/exec/java-exec/src/main/java/org/apache/drill/exec/TestMemoryRetention.java index c9a87a37eff..c87cd509879 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/TestMemoryRetention.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/TestMemoryRetention.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.memory.RootAllocatorFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class TestMemoryRetention { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestMemoryRetention.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java index 46fc72f0163..d0f4c0345f4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java @@ -39,8 +39,8 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; /** * A wrapper around a VectorAccessible. Will serialize a VectorAccessible and diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorSerializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorSerializer.java index 2a186416e25..5efb47f734b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorSerializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorSerializer.java @@ -39,7 +39,7 @@ import io.netty.buffer.DrillBuf; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; /** * Serializes vector containers to an output stream or from diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java index 62d04e39635..b9d89bdb68c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java @@ -17,9 +17,9 @@ */ package org.apache.drill.exec.client; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkArgument; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; import static org.apache.drill.exec.proto.UserProtos.QueryResultsMode.STREAM_FULL; import static org.apache.drill.exec.proto.UserProtos.RunQuery.newBuilder; @@ -93,9 +93,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.SettableFuture; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Strings; +import com.google.common.util.concurrent.SettableFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillSqlLineApplication.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillSqlLineApplication.java index 6cce7287c73..fa710986dc8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillSqlLineApplication.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillSqlLineApplication.java @@ -21,7 +21,7 @@ import com.typesafe.config.ConfigFactory; import org.apache.drill.common.scanner.ClassPathScanner; import org.apache.drill.common.util.DrillVersionInfo; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.jline.reader.impl.completer.StringsCompleter; import sqlline.Application; import sqlline.CommandHandler; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DumpCat.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DumpCat.java index c751897d8c0..b356e004432 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DumpCat.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DumpCat.java @@ -37,7 +37,7 @@ import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class DumpCat { private final static DrillConfig drillConfig = DrillConfig.create(); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/LoggingResultsListener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/LoggingResultsListener.java index 2fa1af0bf15..765463a5836 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/LoggingResultsListener.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/LoggingResultsListener.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.rpc.user.UserResultsListener; import org.apache.drill.exec.util.VectorUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/QuerySubmitter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/QuerySubmitter.java index 5a5f72565e1..f19eef8b750 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/QuerySubmitter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/QuerySubmitter.java @@ -33,9 +33,9 @@ import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Charsets; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; public class QuerySubmitter { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/ServerMethod.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/ServerMethod.java index 1d9db5821b0..77d5a9d35a4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/ServerMethod.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/ServerMethod.java @@ -25,10 +25,10 @@ import org.apache.drill.exec.proto.UserProtos.RpcType; import org.apache.drill.exec.rpc.user.UserRpcUtils; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; /** * A enumeration of server methods, and the version they were introduced diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java index d4a21b3108f..801675454ba 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java @@ -24,10 +24,10 @@ import org.apache.drill.exec.exception.ClassTransformationException; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.io.Resources; class ByteCodeLoader { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ByteCodeLoader.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CachedClassLoader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CachedClassLoader.java index e1b6a7a0660..196cc521755 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CachedClassLoader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CachedClassLoader.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; /** * Class loader for "plain-old Java" generated classes. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java index 640cd0ebbff..e777a883d1f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassTransformer.java @@ -35,11 +35,11 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.tree.ClassNode; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; /** * Compiles generated code, merges the resulting class with the diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CodeCompiler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CodeCompiler.java index 4c8999428c4..01a3c9cff0e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CodeCompiler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CodeCompiler.java @@ -24,11 +24,11 @@ import org.apache.drill.exec.expr.CodeGenerator; import org.apache.drill.exec.server.options.OptionSet; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.collect.Lists; /** * Global code compiler mechanism shared by all threads and operators. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileManager.java index 98571f527dd..d6d5667ac33 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileManager.java @@ -26,8 +26,8 @@ import javax.tools.JavaFileObject; import javax.tools.JavaFileObject.Kind; -import org.apache.drill.shaded.guava.com.google.common.base.Predicate; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Predicate; +import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileObject.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileObject.java index 465e2310995..5e6145e5758 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileObject.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileObject.java @@ -29,7 +29,7 @@ import javax.tools.SimpleJavaFileObject; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; /* package */ final class DrillJavaFileObject extends SimpleJavaFileObject { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmCursor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmCursor.java index 4c9cc35fc2e..84104668418 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmCursor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmCursor.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.compile; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Maintains state while traversing a finite state machine described by diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmDescriptor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmDescriptor.java index a6727dc8514..6b168333a77 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmDescriptor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmDescriptor.java @@ -23,7 +23,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Describes a finite state machine in terms of a mapping of tokens to diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java index 01b3b265453..518bf492175 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java @@ -32,8 +32,8 @@ import org.apache.drill.exec.compile.ClassTransformer.ClassNames; import org.codehaus.commons.compiler.CompileException; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Charsets; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/LogWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/LogWriter.java index b4d628e8d59..cfc1986358d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/LogWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/LogWriter.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.Writer; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.log4j.Level; import org.slf4j.Logger; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/QueryClassLoader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/QueryClassLoader.java index 0c1b931877d..a9858b28472 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/QueryClassLoader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/QueryClassLoader.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.server.options.OptionSet; import org.codehaus.commons.compiler.CompileException; -import org.apache.drill.shaded.guava.com.google.common.collect.MapMaker; +import com.google.common.collect.MapMaker; /** * Per-compilation unit class loader that holds both caching and compilation diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java index 291cf6baae7..a6892d10e48 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java @@ -32,7 +32,7 @@ import com.carrotsearch.hppc.IntObjectHashMap; import com.carrotsearch.hppc.cursors.IntIntCursor; import com.carrotsearch.hppc.cursors.IntObjectCursor; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class InstructionModifier extends MethodVisitor { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(InstructionModifier.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingInterpreter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingInterpreter.java index 5f313f915da..d594044d676 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingInterpreter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingInterpreter.java @@ -30,8 +30,8 @@ import org.objectweb.asm.tree.analysis.BasicInterpreter; import org.objectweb.asm.tree.analysis.BasicValue; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; public class ReplacingInterpreter extends BasicInterpreter { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ReplacingInterpreter.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementTypes.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementTypes.java index c5e0aa58452..e1cc745f3df 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementTypes.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementTypes.java @@ -57,7 +57,7 @@ import org.apache.drill.exec.expr.holders.VarBinaryHolder; import org.apache.drill.exec.expr.holders.VarCharHolder; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.drill.exec.expr.holders.VarDecimalHolder; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java index 78eea8feff0..b2c34c954fc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java @@ -26,7 +26,7 @@ import com.carrotsearch.hppc.ObjectIntHashMap; import com.carrotsearch.hppc.cursors.ObjectIntCursor; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; class ValueHolderIden { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ValueHolderIden.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorMethod.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorMethod.java index 60f60ff221f..f15c01a02fd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorMethod.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorMethod.java @@ -21,8 +21,8 @@ import java.util.Arrays; import java.util.Iterator; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterators; import com.thoughtworks.paranamer.AnnotationParanamer; import com.thoughtworks.paranamer.Paranamer; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java index f28bcdc7603..63058d3e18e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java @@ -51,7 +51,7 @@ import org.apache.drill.common.expression.ValueExpressions.VarDecimalExpression; import org.apache.drill.common.expression.visitors.ExprVisitor; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class ConstantExpressionIdentifier implements ExprVisitor, RuntimeException> { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/GeneratorMapping.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/GeneratorMapping.java index 1fbedca80d1..f8aafccdc9f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/GeneratorMapping.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/GeneratorMapping.java @@ -19,7 +19,7 @@ import org.apache.drill.exec.expr.ClassGenerator.BlockType; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * The code generator works with four conceptual methods which can diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/MappingSet.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/MappingSet.java index 23048969d8f..7214c578e47 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/MappingSet.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/MappingSet.java @@ -21,7 +21,7 @@ import org.apache.drill.exec.expr.DirectExpression; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class MappingSet { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/SignatureHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/SignatureHolder.java index fc9d8213119..7363c5020ed 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/SignatureHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/SignatureHolder.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; public class SignatureHolder implements Iterable { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SignatureHolder.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java index 16a7e9d35cb..d74c3314972 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.State; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; public class LocalClusterCoordinator extends ClusterCoordinator { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(LocalClusterCoordinator.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/MapBackedStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/MapBackedStore.java index 4086334a018..9f259c1bca1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/MapBackedStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/MapBackedStore.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.exec.coord.store.BaseTransientStore; import org.apache.drill.exec.coord.store.TransientStoreConfig; import org.apache.drill.exec.coord.store.TransientStoreEvent; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/BaseTransientStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/BaseTransientStore.java index 941883c1977..4930f5ace78 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/BaseTransientStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/BaseTransientStore.java @@ -24,10 +24,10 @@ import javax.annotation.Nullable; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterators; +import com.google.common.collect.Maps; public abstract class BaseTransientStore implements TransientStore { private final Set listeners = Collections.newSetFromMap( diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/CachingTransientStoreFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/CachingTransientStoreFactory.java index ce95c58c75a..6a2efb79b7d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/CachingTransientStoreFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/CachingTransientStoreFactory.java @@ -20,9 +20,9 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.drill.common.AutoCloseables; public class CachingTransientStoreFactory implements TransientStoreFactory { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfig.java index 9622a779bc6..3f9e9fcce1d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfig.java @@ -19,9 +19,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.protostuff.Schema; -import org.apache.drill.shaded.guava.com.google.common.base.Objects; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Objects; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import com.google.protobuf.Message; import org.apache.drill.exec.serialization.JacksonSerializer; import org.apache.drill.exec.serialization.ProtoSerializer; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfigBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfigBuilder.java index 07ec23f0fbd..7acfae69283 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfigBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfigBuilder.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.coord.store; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.serialization.InstanceSerializer; public class TransientStoreConfigBuilder { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEvent.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEvent.java index 6de69ad7141..59a2677d99b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEvent.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEvent.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.coord.store; -import org.apache.drill.shaded.guava.com.google.common.base.Objects; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Objects; +import com.google.common.base.Preconditions; /** * Represents an event created as a result of an operation over a particular (key, value) entry in a diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/EventDispatcher.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/EventDispatcher.java index 7eb72eeb13e..8dc0e129181 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/EventDispatcher.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/EventDispatcher.java @@ -19,8 +19,8 @@ import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent; import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/PathUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/PathUtils.java index 001e968ee22..d56b84134bd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/PathUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/PathUtils.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.coord.zk; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.parquet.Strings; import java.net.URL; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderDelegate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderDelegate.java index a3f7ee3bc8e..89a6aa52eb9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderDelegate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderDelegate.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.coord.zk; import org.apache.curator.framework.api.ACLProvider; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.zookeeper.data.ACL; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderFactory.java index f43aec0093d..a4f3e2e688d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderFactory.java @@ -24,7 +24,7 @@ import org.apache.drill.common.scanner.persistence.ScanResult; import org.apache.drill.exec.exception.DrillbitStartupException; import org.apache.drill.exec.server.BootStrapContext; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import java.lang.reflect.Constructor; import java.util.Collection; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java index 108ca770c61..6ee72fe3d0b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.coord.zk; -import static org.apache.drill.shaded.guava.com.google.common.collect.Collections2.transform; +import static com.google.common.collect.Collections2.transform; import java.io.IOException; import java.util.Collection; import java.util.Collections; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; import org.apache.curator.framework.imps.DefaultACLProvider; -import org.apache.drill.shaded.guava.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import org.apache.zookeeper.data.Stat; import org.apache.commons.collections.keyvalue.MultiKey; import org.apache.curator.RetryPolicy; @@ -60,7 +60,7 @@ import org.apache.drill.exec.coord.store.TransientStoreFactory; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.State; -import org.apache.drill.shaded.guava.com.google.common.base.Function; +import com.google.common.base.Function; /** * Manages cluster coordination utilizing zookeeper. * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKSecureACLProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKSecureACLProvider.java index c36e65cb107..cfd89faffab 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKSecureACLProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKSecureACLProvider.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.coord.zk; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.zookeeper.ZooDefs.Ids; import org.apache.zookeeper.data.ACL; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkEphemeralStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkEphemeralStore.java index 8f9d4457b28..34475a9cad4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkEphemeralStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkEphemeralStore.java @@ -23,9 +23,9 @@ import javax.annotation.Nullable; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Function; +import com.google.common.collect.Iterators; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener; import org.apache.drill.common.collections.ImmutableEntry; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkTransientStoreFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkTransientStoreFactory.java index 59fcf0ce53e..8fe26e139c9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkTransientStoreFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkTransientStoreFactory.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.coord.zk; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.curator.framework.CuratorFramework; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.exec.coord.store.TransientStoreConfig; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZookeeperClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZookeeperClient.java index ec98453e053..deaef1025df 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZookeeperClient.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZookeeperClient.java @@ -22,10 +22,10 @@ import javax.annotation.Nullable; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; +import com.google.common.collect.Iterables; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.ChildData; import org.apache.curator.framework.recipes.cache.PathChildrenCache; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillFile.java b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillFile.java index 24edd247fcc..36abcaa92d7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillFile.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillFile.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.io.IOException; import java.io.InputStream; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillUtil.java index 32759d2a8df..99fd14ab11c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillUtil.java @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.List; import org.apache.drill.exec.store.dfs.DrillFileSystem; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.GlobPattern; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BatchReference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BatchReference.java index 6b8bd2d5f17..dae5e172936 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BatchReference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BatchReference.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.expr; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Holder class that contains batch naming, batch and record index. Batch index is used when batch is hyper container. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ClassGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ClassGenerator.java index 8082bfc17fe..d133a885d07 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ClassGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ClassGenerator.java @@ -44,10 +44,10 @@ import org.apache.drill.exec.expr.fn.WorkspaceReference; import org.apache.drill.exec.expr.holders.ValueHolder; import org.apache.drill.exec.record.TypedFieldId; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCatchBlock; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CloneVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CloneVisitor.java index d661a77e488..76449d1d046 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CloneVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CloneVisitor.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.expr; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.expression.BooleanOperator; import org.apache.drill.common.expression.CastExpression; import org.apache.drill.common.expression.ConvertExpression; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CodeGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CodeGenerator.java index 47e562d1c31..76d68e22df6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CodeGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CodeGenerator.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.compile.sig.MappingSet; import org.apache.drill.exec.server.options.OptionSet; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.sun.codemodel.JClassAlreadyExistsException; import com.sun.codemodel.JCodeModel; import com.sun.codemodel.JDefinedClass; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EqualityVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EqualityVisitor.java index b268d6b59bf..94f8b79489f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EqualityVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EqualityVisitor.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.expr; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.expression.BooleanOperator; import org.apache.drill.common.expression.CastExpression; import org.apache.drill.common.expression.ConvertExpression; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EvaluationVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EvaluationVisitor.java index 93cb664d245..a2e5fcfd189 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EvaluationVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EvaluationVisitor.java @@ -78,8 +78,8 @@ import org.apache.drill.exec.vector.ValueHolderHelper; import org.apache.drill.exec.vector.complex.reader.FieldReader; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Function; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java index c5b3443ba2a..f1bf5b59569 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java @@ -83,10 +83,10 @@ import org.apache.drill.exec.resolver.TypeCastRules; import org.apache.drill.exec.util.DecimalUtility; import org.apache.drill.metastore.util.SchemaPathUtils; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/FilterBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/FilterBuilder.java index a2afe12c586..fc4557b67b8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/FilterBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/FilterBuilder.java @@ -20,7 +20,7 @@ import org.apache.drill.common.expression.fn.FunctionReplacementUtils; import org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers; import org.apache.drill.exec.expr.holders.VarCharHolder; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.drill.common.FunctionNames; import org.apache.drill.common.expression.BooleanOperator; import org.apache.drill.common.expression.FunctionHolderExpression; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/IsPredicate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/IsPredicate.java index 1f2369ed588..1c53e78db53 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/IsPredicate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/IsPredicate.java @@ -26,7 +26,7 @@ import org.apache.drill.metastore.statistics.ColumnStatistics; import org.apache.drill.metastore.statistics.ColumnStatisticsKind; import org.apache.drill.metastore.statistics.Statistic; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java index 80ecb26368d..dd820082d08 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java @@ -22,7 +22,7 @@ import java.io.StringWriter; import java.io.Writer; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.sun.codemodel.CodeWriter; import com.sun.codemodel.JPackage; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorReadExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorReadExpression.java index 0c18b02d245..611c0e11603 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorReadExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorReadExpression.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.expr; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.drill.common.expression.ExpressionPosition; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java index 5dbbdc0f22a..b0cd912ee73 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.expr; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.visitors.ExprVisitor; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillAggFuncHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillAggFuncHolder.java index 5f8c6c871fa..8e2148d4647 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillAggFuncHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillAggFuncHolder.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.expr.fn; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkArgument; import org.apache.drill.common.expression.FieldReference; import org.apache.drill.common.expression.FunctionHolderExpression; @@ -31,8 +31,8 @@ import org.apache.drill.exec.expr.annotations.FunctionTemplate.NullHandling; import org.apache.drill.exec.record.TypedFieldId; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import com.sun.codemodel.JBlock; import com.sun.codemodel.JClass; import com.sun.codemodel.JExpr; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillComplexWriterFuncHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillComplexWriterFuncHolder.java index c95415ef811..4f6491c0920 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillComplexWriterFuncHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillComplexWriterFuncHolder.java @@ -34,7 +34,7 @@ import com.sun.codemodel.JInvocation; import com.sun.codemodel.JVar; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkArgument; public class DrillComplexWriterFuncHolder extends DrillSimpleFuncHolder { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillFuncHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillFuncHolder.java index cf3c0ed9e05..b601ef0b4e8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillFuncHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillFuncHolder.java @@ -43,8 +43,8 @@ import org.apache.drill.exec.expr.holders.ValueHolder; import org.apache.drill.exec.ops.UdfUtilities; import org.apache.drill.exec.vector.complex.reader.FieldReader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillSimpleFuncHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillSimpleFuncHolder.java index 580c3d2f36d..c5866ab6841 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillSimpleFuncHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillSimpleFuncHolder.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.expr.fn; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionConverter.java index 865f196c020..eaa2839f588 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionConverter.java @@ -39,8 +39,8 @@ import org.apache.drill.exec.vector.complex.reader.FieldReader; import org.apache.drill.exec.vector.complex.writer.BaseWriter.ComplexWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Joiner; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionGenerationHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionGenerationHelper.java index 95827d8e0e5..465a6a0c04c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionGenerationHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionGenerationHelper.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.FunctionNames; import org.apache.drill.common.expression.ErrorCollector; import org.apache.drill.common.expression.ErrorCollectorImpl; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionImplementationRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionImplementationRegistry.java index f8a2d468f73..54024e1be86 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionImplementationRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionImplementationRegistry.java @@ -34,8 +34,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.drill.common.expression.fn.FunctionReplacementUtils; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; import com.typesafe.config.ConfigFactory; import org.apache.commons.io.FileUtils; import org.apache.drill.common.config.ConfigConstants; @@ -65,8 +65,8 @@ import org.apache.drill.exec.server.options.OptionManager; import org.apache.drill.exec.server.options.OptionSet; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Stopwatch; import org.apache.drill.exec.store.sys.store.DataChangeVersion; import org.apache.drill.exec.util.JarUtil; import org.apache.hadoop.fs.FileSystem; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionInitializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionInitializer.java index 442c158f823..a0f47bf489b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionInitializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionInitializer.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.util.DrillFileUtils; import org.codehaus.commons.compiler.CompileException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ValueReference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ValueReference.java index 32761ad8fd8..c6f9d218cc3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ValueReference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ValueReference.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.expr.fn; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.common.types.Types; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/WorkspaceReference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/WorkspaceReference.java index 076284634cf..e2ba449b99f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/WorkspaceReference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/WorkspaceReference.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.expr.fn; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.Types; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/AbstractSqlPatternMatcher.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/AbstractSqlPatternMatcher.java index 8f1bc036bea..b8e35d72cd2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/AbstractSqlPatternMatcher.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/AbstractSqlPatternMatcher.java @@ -23,7 +23,7 @@ import java.nio.charset.CharsetEncoder; import org.apache.drill.common.exceptions.UserException; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MappifyUtility.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MappifyUtility.java index 25c3ba4c802..34acacaa558 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MappifyUtility.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MappifyUtility.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.vector.complex.reader.FieldReader; import org.apache.drill.exec.vector.complex.writer.BaseWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionHelpers.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionHelpers.java index 02b053f5ff2..4e2cfa7b0a1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionHelpers.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionHelpers.java @@ -21,7 +21,7 @@ import org.apache.drill.exec.expr.holders.NullableVarCharHolder; import org.apache.drill.exec.expr.holders.VarCharHolder; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.joda.time.chrono.ISOChronology; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/interpreter/InterpreterEvaluator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/interpreter/InterpreterEvaluator.java index 19cc0f2de25..7a7ce342899 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/interpreter/InterpreterEvaluator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/interpreter/InterpreterEvaluator.java @@ -26,7 +26,7 @@ import javax.inject.Inject; import org.apache.drill.exec.expr.BasicTypeHelper; -import org.apache.drill.shaded.guava.com.google.common.base.Function; +import com.google.common.base.Function; import org.apache.drill.common.FunctionNames; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.common.expression.BooleanOperator; @@ -59,7 +59,7 @@ import org.apache.drill.exec.vector.ValueHolderHelper; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DefaultReturnTypeInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DefaultReturnTypeInference.java index 8099ffda74d..bdd2c12915f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DefaultReturnTypeInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DefaultReturnTypeInference.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.expr.fn.FunctionAttributes; import org.apache.drill.exec.expr.fn.FunctionUtils; import org.apache.drill.exec.expr.fn.ValueReference; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; /** * Return type calculation implementation for functions with return type set as diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/StringCastReturnTypeInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/StringCastReturnTypeInference.java index aa1447e51a2..f15d660e9fd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/StringCastReturnTypeInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/StringCastReturnTypeInference.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.expr.fn.output; -import org.apache.drill.shaded.guava.com.google.common.primitives.Ints; +import com.google.common.primitives.Ints; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.ValueExpressions; import org.apache.drill.common.types.TypeProtos; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolder.java index ff13a44fc2a..90b1272c6ba 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolder.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.expr.fn.registry; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ListMultimap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.drill.common.AutoCloseables.Closeable; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/LocalFunctionRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/LocalFunctionRegistry.java index 10db1758aaa..d3969685091 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/LocalFunctionRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/LocalFunctionRegistry.java @@ -28,9 +28,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.drill.exec.store.sys.store.DataChangeVersion; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.calcite.sql.SqlOperator; @@ -48,7 +48,7 @@ import org.apache.drill.exec.planner.sql.DrillSqlAggOperatorWithoutInference; import org.apache.drill.exec.planner.sql.DrillSqlOperator; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ArrayListMultimap; import org.apache.drill.exec.planner.sql.DrillSqlOperatorWithoutInference; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/RemoteFunctionRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/RemoteFunctionRegistry.java index 076227b5e6a..12d025023b1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/RemoteFunctionRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/RemoteFunctionRegistry.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.drill.common.util.JacksonUtils; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; import org.apache.drill.common.AutoCloseables; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.exceptions.DrillRuntimeException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/memory/RootAllocatorFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/memory/RootAllocatorFactory.java index 115656b2911..5b42b3d2e0c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/memory/RootAllocatorFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/memory/RootAllocatorFactory.java @@ -19,7 +19,7 @@ import org.apache.drill.common.config.DrillConfig; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; public class RootAllocatorFactory { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/AnalyzeColumnUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/AnalyzeColumnUtils.java index 1f973995336..a4acd3d8ec4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/AnalyzeColumnUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/AnalyzeColumnUtils.java @@ -24,7 +24,7 @@ import org.apache.drill.metastore.statistics.ExactStatisticsConstants; import org.apache.drill.metastore.statistics.StatisticsKind; import org.apache.drill.metastore.statistics.TableStatisticsKind; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/FileMetadataInfoCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/FileMetadataInfoCollector.java index 1866f03e400..c2141286530 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/FileMetadataInfoCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/FileMetadataInfoCollector.java @@ -38,10 +38,10 @@ import org.apache.drill.metastore.metadata.MetadataType; import org.apache.drill.metastore.metadata.TableInfo; import org.apache.drill.metastore.statistics.TableStatisticsKind; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Streams; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; +import com.google.common.collect.Streams; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/MetadataInfoCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/MetadataInfoCollector.java index 07f223735b6..e2eca992e27 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/MetadataInfoCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/analyze/MetadataInfoCollector.java @@ -19,7 +19,7 @@ import org.apache.calcite.rel.core.TableScan; import org.apache.drill.metastore.metadata.MetadataInfo; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; +import com.google.common.collect.Multimap; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/store/parquet/MetastoreParquetTableMetadataProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/store/parquet/MetastoreParquetTableMetadataProvider.java index 599cd6294a2..91f54918dba 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/store/parquet/MetastoreParquetTableMetadataProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/store/parquet/MetastoreParquetTableMetadataProvider.java @@ -29,8 +29,8 @@ import org.apache.drill.exec.util.DrillFileSystemUtil; import org.apache.drill.metastore.metadata.RowGroupMetadata; import org.apache.drill.metastore.metadata.TableMetadataProvider; -import org.apache.drill.shaded.guava.com.google.common.collect.LinkedListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; +import com.google.common.collect.LinkedListMultimap; +import com.google.common.collect.Multimap; import org.apache.hadoop.fs.Path; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/store/parquet/ParquetMetadataProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/store/parquet/ParquetMetadataProvider.java index 098ca186180..a7153e755a1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/store/parquet/ParquetMetadataProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/store/parquet/ParquetMetadataProvider.java @@ -20,7 +20,7 @@ import org.apache.drill.exec.store.dfs.ReadEntryWithPath; import org.apache.drill.metastore.metadata.RowGroupMetadata; import org.apache.drill.metastore.metadata.TableMetadataProvider; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; +import com.google.common.collect.Multimap; import org.apache.hadoop.fs.Path; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/BaseOperatorContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/BaseOperatorContext.java index 0228a8ad647..dfa41e803ff 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/BaseOperatorContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/BaseOperatorContext.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.physical.base.PhysicalOperator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java index 84a3b4549ea..a21cc21c6c2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.alias.AliasRegistryProvider; import org.apache.drill.metastore.MetastoreRegistry; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.calcite.schema.SchemaPlus; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.exec.compile.CodeCompiler; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContextImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContextImpl.java index 87dbcb4cabc..4978f0622a8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContextImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContextImpl.java @@ -81,8 +81,8 @@ import org.apache.drill.exec.work.batch.IncomingBuffers; import org.apache.drill.exec.work.filter.RuntimeFilterWritable; import org.apache.drill.metastore.MetastoreRegistry; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Function; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorContext.java index 330c4e70e71..e6ea5b06125 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorContext.java @@ -29,7 +29,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListenableFuture; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorContextImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorContextImpl.java index 9e50f12014e..6831fda4231 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorContextImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorContextImpl.java @@ -24,9 +24,9 @@ import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.hadoop.security.UserGroupInformation; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.ListenableFuture; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.ListeningExecutorService; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.MoreExecutors; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; class OperatorContextImpl extends BaseOperatorContext implements AutoCloseable { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(OperatorContextImpl.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorStats.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorStats.java index 9ed6d8f8dbd..6824978893d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorStats.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorStats.java @@ -32,7 +32,7 @@ import com.carrotsearch.hppc.procedures.IntDoubleProcedure; import com.carrotsearch.hppc.procedures.IntLongProcedure; import org.apache.drill.exec.server.rest.profile.CoreOperatorType; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; public class OperatorStats { protected final int operatorId; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java index 9ac1df0bae6..7d6309eb016 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java @@ -58,9 +58,9 @@ import org.apache.drill.exec.util.Utilities; import org.apache.drill.metastore.MetastoreRegistry; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/UdfUtilities.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/UdfUtilities.java index 98637610c1f..c768cbc192f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/UdfUtilities.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/UdfUtilities.java @@ -24,8 +24,8 @@ import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.server.options.OptionManager; import org.apache.drill.exec.store.PartitionExplorer; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableMap; /** * Defines the query state and shared resources available to UDFs through diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java index 97bdde68612..bf7657f43cb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.store.SchemaConfig.SchemaConfigInfoProvider; import com.carrotsearch.hppc.ObjectIntHashMap; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Contains context information about view expansion(s) in a query. Part of {@link org.apache.drill.exec.ops diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/EndpointAffinity.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/EndpointAffinity.java index b17f6913c27..687c5f8e70b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/EndpointAffinity.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/EndpointAffinity.java @@ -19,7 +19,7 @@ import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.google.protobuf.TextFormat; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/PhysicalPlan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/PhysicalPlan.java index 9d8831edd81..02ef61ab092 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/PhysicalPlan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/PhysicalPlan.java @@ -34,7 +34,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.ObjectWriter; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; @JsonPropertyOrder({ "head", "graph" }) public class PhysicalPlan { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractBase.java index dc8f7af8ee7..ec9c84ee982 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractBase.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.planner.cost.PrelCostEstimates; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public abstract class AbstractBase implements PhysicalOperator { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractExchange.java index e77dbcbf927..8f460af10f6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractExchange.java @@ -26,9 +26,9 @@ import org.apache.drill.exec.planner.fragment.ParallelizationInfo; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; public abstract class AbstractExchange extends AbstractSingle implements Exchange { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java index 6779d0d3f7a..69bb189b6e9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.metastore.analyze.AnalyzeInfoProvider; import org.apache.drill.metastore.metadata.TableMetadata; import org.apache.drill.metastore.metadata.TableMetadataProvider; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.SchemaPath; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractJoinPop.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractJoinPop.java index 628dde7f086..d3a851f9547 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractJoinPop.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractJoinPop.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.base; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.logical.data.JoinCondition; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractReceiver.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractReceiver.java index 7789ae52e5a..debb865e651 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractReceiver.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractReceiver.java @@ -23,8 +23,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; import org.apache.drill.exec.physical.MinorFragmentEndpoint; public abstract class AbstractReceiver extends AbstractBase implements Receiver { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSender.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSender.java index cc6bc04af73..8c077f7a1d1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSender.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSender.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.exec.physical.MinorFragmentEndpoint; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSingle.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSingle.java index 7e48f1e7fa2..9f3654e8ee8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSingle.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSingle.java @@ -21,8 +21,8 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterators; /** * Describes an operator that expects a single child operator as its input. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java index 2c6ff4e1f25..bfaa4cee19e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.server.options.OptionManager; import org.apache.drill.metastore.metadata.TableMetadata; import org.apache.drill.metastore.metadata.TableMetadataProvider; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.hadoop.fs.Path; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java index fb60ddddbb8..c73b99d06d4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.proto.CoordinationProtos; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.hadoop.fs.Path; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractDeMuxExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractDeMuxExchange.java index b087a7d6301..078e3487754 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractDeMuxExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractDeMuxExchange.java @@ -20,11 +20,11 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Preconditions; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.exec.physical.EndpointAffinity; import org.apache.drill.exec.physical.MinorFragmentEndpoint; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractMuxExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractMuxExchange.java index 7bdb4e72ed9..96529bd9383 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractMuxExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractMuxExchange.java @@ -20,11 +20,11 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Preconditions; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.drill.exec.physical.EndpointAffinity; import org.apache.drill.exec.physical.MinorFragmentEndpoint; import org.apache.drill.exec.physical.base.AbstractExchange; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java index 4e371b13365..e02404ed6e5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.base.AbstractSingle; import org.apache.drill.exec.physical.base.PhysicalOperator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java index 8b1ae3cf614..6e5ae6b49c9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java @@ -19,7 +19,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.drill.common.logical.data.JoinCondition; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.ops.QueryContext; @@ -31,8 +31,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.drill.exec.physical.base.AbstractJoinPop; import org.apache.drill.exec.work.filter.RuntimeFilterDef; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/LateralJoinPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/LateralJoinPOP.java index 2be30b3f0f6..25616b571e8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/LateralJoinPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/LateralJoinPOP.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.base.AbstractJoinPop; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java index 266ee4d7a9c..874feac6287 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java @@ -20,8 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.common.logical.data.JoinCondition; import org.apache.drill.exec.physical.base.AbstractJoinPop; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MetadataControllerPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MetadataControllerPOP.java index adad9756262..1c89170966f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MetadataControllerPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MetadataControllerPOP.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.physical.base.PhysicalVisitor; import org.apache.drill.exec.metastore.analyze.MetadataControllerContext; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.Arrays; import java.util.Iterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MetadataHashAggPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MetadataHashAggPOP.java index 35990c814e6..82fc4a2f44c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MetadataHashAggPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MetadataHashAggPOP.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.metastore.analyze.MetadataAggregateContext; import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.planner.physical.AggPrelBase.OperatorPhase; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.Collections; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/NestedLoopJoinPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/NestedLoopJoinPOP.java index 4d6aca4b928..8a89e532294 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/NestedLoopJoinPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/NestedLoopJoinPOP.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.exec.physical.base.AbstractJoinPop; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionExchange.java index cade66c95ed..888fb598d77 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionExchange.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; @JsonTypeName("ordered-partition-exchange") public class OrderedPartitionExchange extends AbstractExchange { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionSender.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionSender.java index 7b180361fda..6473dfd6b5d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionSender.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionSender.java @@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; @JsonTypeName("OrderedPartitionSender") public class OrderedPartitionSender extends AbstractSender { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/RowKeyJoinPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/RowKeyJoinPOP.java index 3690dfaec69..aee7bd71d76 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/RowKeyJoinPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/RowKeyJoinPOP.java @@ -29,8 +29,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterators; @JsonTypeName("rowkey-join") public class RowKeyJoinPOP extends AbstractBase { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleMergeExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleMergeExchange.java index 4fb162e5cb7..6068f3e503b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleMergeExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleMergeExchange.java @@ -19,7 +19,7 @@ import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.logical.data.Order.Ordering; import org.apache.drill.exec.physical.PhysicalOperatorSetupException; import org.apache.drill.exec.physical.base.AbstractExchange; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StatisticsAggregate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StatisticsAggregate.java index c6709c1cdc3..e0b6ffc6e49 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StatisticsAggregate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StatisticsAggregate.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.config; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.physical.base.PhysicalVisitor; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StatisticsMerge.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StatisticsMerge.java index 16595d15d88..4760f574491 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StatisticsMerge.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StatisticsMerge.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.physical.base.AbstractSingle; import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.physical.base.PhysicalVisitor; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; @JsonTypeName("statistics-merge") public class StatisticsMerge extends AbstractSingle { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnionExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnionExchange.java index 32144c49cf2..c825fcb4034 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnionExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnionExchange.java @@ -19,7 +19,7 @@ import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.physical.PhysicalOperatorSetupException; import org.apache.drill.exec.physical.base.AbstractExchange; import org.apache.drill.exec.physical.base.PhysicalOperator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ImplCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ImplCreator.java index cf0112d45f9..c4e41cf4b9c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ImplCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ImplCreator.java @@ -34,10 +34,10 @@ import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.util.AssertionUtil; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScanBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScanBatch.java index 6ffe4516657..a06a20b655a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScanBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScanBatch.java @@ -60,8 +60,8 @@ import org.apache.drill.exec.vector.NullableVarCharVector; import org.apache.drill.exec.vector.SchemaChangeCallBack; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java index 3f71cbd9884..1ef8d847644 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.testing.ControlsInjector; import org.apache.drill.exec.testing.ControlsInjectorFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/PriorityQueueTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/PriorityQueueTemplate.java index 0719f0cc913..a9854ced2bb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/PriorityQueueTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/PriorityQueueTemplate.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.record.selection.SelectionVector4; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNBatch.java index e094d568360..f0c29eea22b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNBatch.java @@ -65,7 +65,7 @@ import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.complex.AbstractContainerVector; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNSortBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNSortBatchCreator.java index 7714976dcb9..94631880a28 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNSortBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNSortBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class TopNSortBatchCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TraceInjector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TraceInjector.java index 86830ad3ec9..026326363e9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TraceInjector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TraceInjector.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.physical.config.Trace; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class TraceInjector extends AbstractPhysicalVisitor { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatch.java index cc1494d46eb..15da8e51854 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatch.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.vector.UntypedNullHolder; import org.apache.drill.exec.vector.UntypedNullVector; import org.apache.drill.exec.vector.complex.writer.BaseWriter; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.expression.ErrorCollector; import org.apache.drill.common.expression.ErrorCollectorImpl; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatchCreator.java index 4da7057aa57..85bbdeccf0b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class HashAggBatchCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggSpilledPartition.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggSpilledPartition.java index e5e82e0d3bb..5026de76b4d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggSpilledPartition.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggSpilledPartition.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.physical.impl.aggregate; import org.apache.drill.exec.physical.impl.common.AbstractSpilledPartitionMetadata; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class HashAggSpilledPartition extends AbstractSpilledPartitionMetadata { private final int spilledBatches; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatch.java index b1e332ed2a0..25774880027 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatch.java @@ -64,8 +64,8 @@ import org.apache.drill.exec.vector.UntypedNullVector; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.complex.writer.BaseWriter; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatchCreator.java index 62e94b90049..64a0872856c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class StreamingAggBatchCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderCreator.java index cbaa12cfc7c..837bade8f9b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderCreator.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.physical.impl.RootExec; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; public class BroadcastSenderCreator implements RootCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderRootExec.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderRootExec.java index 73e464efb0e..09281ffac60 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderRootExec.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderRootExec.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.record.WritableBatch; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ArrayListMultimap; /** * Broadcast Sender broadcasts incoming batches to all receivers (one or more). diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/CodeGenMemberInjector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/CodeGenMemberInjector.java index 195f002b30d..1bd390433aa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/CodeGenMemberInjector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/CodeGenMemberInjector.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.expr.ClassGenerator; import org.apache.drill.exec.expr.holders.ValueHolder; import org.apache.drill.exec.ops.FragmentContext; -import org.apache.drill.shaded.guava.com.google.common.base.Function; +import com.google.common.base.Function; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashPartition.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashPartition.java index 2b21831f348..5c845573ad6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashPartition.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashPartition.java @@ -55,8 +55,8 @@ import org.apache.drill.exec.vector.ObjectVector; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.VariableWidthVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableAllocationTracker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableAllocationTracker.java index feb134db780..7f38ee624f8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableAllocationTracker.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableAllocationTracker.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.common; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * A helper class used by {@link HashTableTemplate} in order to pre-allocate {@link HashTableTemplate.BatchHolder}s of the appropriate size. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableTemplate.java index da6e5e08613..a9bc1c3e69c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableTemplate.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.expr.ClassGenerator; import org.apache.drill.exec.ops.FragmentContext; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.commons.lang3.tuple.Pair; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.common.types.Types; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/SpilledState.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/SpilledState.java index a1762877349..a80adf18393 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/SpilledState.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/SpilledState.java @@ -20,7 +20,7 @@ import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.ops.OperatorStats; import org.apache.drill.exec.physical.impl.join.HashJoinBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.LinkedList; import java.util.Queue; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterBatchCreator.java index 1e162730a08..d79379ec168 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class FilterBatchCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterRecordBatch.java index 295cfd5f18d..3462fcd81b2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterRecordBatch.java @@ -37,7 +37,7 @@ import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.record.selection.SelectionVector4; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/ReturnValueExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/ReturnValueExpression.java index baf2cc977f5..b6587894aad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/ReturnValueExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/ReturnValueExpression.java @@ -25,7 +25,7 @@ import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.Types; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; public class ReturnValueExpression implements LogicalExpression{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ReturnValueExpression.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/RuntimeFilterBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/RuntimeFilterBatchCreator.java index 89449b6cb73..a088c149927 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/RuntimeFilterBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/RuntimeFilterBatchCreator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.filter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.ops.ExecutorFragmentContext; import org.apache.drill.exec.physical.config.RuntimeFilterPOP; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenBatchCreator.java index 02bea719533..d369ff6bff8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class FlattenBatchCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenTemplate.java index f2eb611fcee..16d9706b82a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenTemplate.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.record.TransferPair; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.complex.RepeatedValueVector; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/AbstractHashBinaryRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/AbstractHashBinaryRecordBatch.java index bf9e3eee8fd..41217ca208d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/AbstractHashBinaryRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/AbstractHashBinaryRecordBatch.java @@ -69,9 +69,9 @@ import org.apache.drill.exec.work.filter.BloomFilterDef; import org.apache.drill.exec.work.filter.RuntimeFilterDef; import org.apache.drill.exec.work.filter.RuntimeFilterReporter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/BatchSizePredictorImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/BatchSizePredictorImpl.java index 1e3f76174ef..bbebd2bd7eb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/BatchSizePredictorImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/BatchSizePredictorImpl.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.record.RecordBatchSizer; import org.apache.drill.exec.vector.IntVector; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatch.java index 60de29091f0..10a9fee354a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatch.java @@ -39,8 +39,8 @@ import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatchCreator.java index 183f97194cb..c9347705192 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatchCreator.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class HashJoinBatchCreator implements BatchCreator { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelperSizeCalculatorImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelperSizeCalculatorImpl.java index 61f8729c774..f804277c5d4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelperSizeCalculatorImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelperSizeCalculatorImpl.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.record.RecordBatchSizer; import org.apache.drill.exec.vector.IntVector; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelperUnusedSizeImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelperUnusedSizeImpl.java index 25a985bf348..2631340e3d3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelperUnusedSizeImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelperUnusedSizeImpl.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * This calculator class is used when the Hash-Join_helper is not used (i.e., return size of zero) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMechanicalMemoryCalculator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMechanicalMemoryCalculator.java index 07408a180f4..59496d95268 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMechanicalMemoryCalculator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMechanicalMemoryCalculator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.record.RecordBatch; import javax.annotation.Nullable; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMemoryCalculator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMemoryCalculator.java index eddb398936e..723474e0006 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMemoryCalculator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMemoryCalculator.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.commons.io.FileUtils; import org.apache.drill.exec.record.RecordBatch; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMemoryCalculatorImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMemoryCalculatorImpl.java index dea15d2669e..71b1da061e2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMemoryCalculatorImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinMemoryCalculatorImpl.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; import org.apache.drill.common.map.CaseInsensitiveMap; import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.record.RecordBatchSizer; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashTableSizeCalculatorConservativeImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashTableSizeCalculatorConservativeImpl.java index 43efceb696e..a366eeafcbd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashTableSizeCalculatorConservativeImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashTableSizeCalculatorConservativeImpl.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.record.RecordBatchSizer; import org.apache.drill.exec.vector.IntVector; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashTableSizeCalculatorLeanImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashTableSizeCalculatorLeanImpl.java index 9f9755c061b..265b0e33768 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashTableSizeCalculatorLeanImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashTableSizeCalculatorLeanImpl.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.record.RecordBatchSizer; import org.apache.drill.exec.vector.IntVector; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinStatus.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinStatus.java index 08b7c0960ce..f390cb9a080 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinStatus.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinStatus.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.physical.impl.join.JoinWorker.JoinOutcome; import org.apache.drill.exec.record.RecordBatch.IterOutcome; import org.apache.drill.exec.record.RecordIterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/LateralJoinBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/LateralJoinBatch.java index 7e453c45ec0..9843c497c33 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/LateralJoinBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/LateralJoinBatch.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.calcite.rel.core.JoinRelType; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java index 5e032647c55..cd1ba748c93 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinCreator.java index 3b038e36713..db077e68a0f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinCreator.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.record.RecordBatch; import org.apache.calcite.rel.core.JoinRelType; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class MergeJoinCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/NestedLoopJoinBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/NestedLoopJoinBatch.java index a55ecd301ad..4e45f7fea78 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/NestedLoopJoinBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/NestedLoopJoinBatch.java @@ -21,7 +21,7 @@ import java.util.LinkedList; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.calcite.rel.core.JoinRelType; @@ -56,7 +56,7 @@ import org.apache.drill.exec.util.record.RecordBatchStats; import org.apache.drill.exec.util.record.RecordBatchStats.RecordBatchIOType; import org.apache.drill.exec.record.JoinBatchMemoryManager; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.sun.codemodel.JExpr; import com.sun.codemodel.JExpression; import com.sun.codemodel.JVar; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/RowKeyJoinBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/RowKeyJoinBatch.java index 3f48264ade7..4c416dbbc44 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/RowKeyJoinBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/RowKeyJoinBatch.java @@ -33,8 +33,8 @@ import org.apache.drill.exec.vector.SchemaChangeCallBack; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/RowKeyJoinBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/RowKeyJoinBatchCreator.java index 68aaec28670..328264b5eaf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/RowKeyJoinBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/RowKeyJoinBatchCreator.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class RowKeyJoinBatchCreator implements BatchCreator { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitBatchCreator.java index af1de83fe10..d30d4db69c4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; +import com.google.common.collect.Iterables; public class LimitBatchCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java index 5783e8c24df..b0a998dfbf6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java @@ -19,7 +19,7 @@ import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.exception.OutOfMemoryException; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.config.Limit; @@ -31,7 +31,7 @@ import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.record.selection.SelectionVector2; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/PartitionLimitBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/PartitionLimitBatchCreator.java index 523911ec444..9c7ebd20e43 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/PartitionLimitBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/PartitionLimitBatchCreator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.limit; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; +import com.google.common.collect.Iterables; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.ops.ExecutorFragmentContext; import org.apache.drill.exec.physical.config.PartitionLimit; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/PartitionLimitRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/PartitionLimitRecordBatch.java index a466e434ed5..f4a6c0579e5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/PartitionLimitRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/PartitionLimitRecordBatch.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.vector.IntVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java index 2d34fffc0e3..0367a6b8b0e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java @@ -71,8 +71,8 @@ import org.apache.drill.exec.vector.CopyUtil; import org.apache.drill.exec.vector.FixedWidthVector; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataAggregateHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataAggregateHelper.java index 4caf30e5f18..9f4c9da2eb0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataAggregateHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataAggregateHelper.java @@ -38,7 +38,7 @@ import org.apache.drill.exec.record.BatchSchema; import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.metastore.metadata.MetadataType; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.Collection; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataControllerBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataControllerBatch.java index 2fb46ed6963..5ec26498d10 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataControllerBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataControllerBatch.java @@ -89,9 +89,9 @@ import org.apache.drill.metastore.statistics.StatisticsHolder; import org.apache.drill.metastore.statistics.StatisticsKind; import org.apache.drill.metastore.statistics.TableStatisticsKind; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; +import com.google.common.base.Preconditions; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; import org.apache.hadoop.fs.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataControllerBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataControllerBatchCreator.java index 46238bc8b78..50ee7dd7d19 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataControllerBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataControllerBatchCreator.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.CloseableRecordBatch; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHandlerBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHandlerBatch.java index 855777b616e..997345514e4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHandlerBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHandlerBatch.java @@ -52,7 +52,7 @@ import org.apache.drill.metastore.metadata.SegmentMetadata; import org.apache.drill.metastore.statistics.ExactStatisticsConstants; import org.apache.drill.metastore.statistics.StatisticsKind; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.hadoop.fs.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHandlerBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHandlerBatchCreator.java index d2d3ff51f9c..aca5381b24b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHandlerBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHandlerBatchCreator.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.CloseableRecordBatch; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHashAggBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHashAggBatchCreator.java index 2563b0eac22..6acb1325f90 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHashAggBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataHashAggBatchCreator.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.CloseableRecordBatch; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataStreamAggBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataStreamAggBatchCreator.java index 15c494b1f33..5b3b86f70ad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataStreamAggBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/metadata/MetadataStreamAggBatchCreator.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.CloseableRecordBatch; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionProjectorTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionProjectorTemplate.java index e9e7bf4f656..ac058fc5cda 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionProjectorTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionProjectorTemplate.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.vector.IntVector; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionRecordBatch.java index 37b8826a8c6..187adf437e9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionRecordBatch.java @@ -69,8 +69,8 @@ import org.apache.drill.exec.vector.AllocationHelper; import org.apache.drill.exec.vector.IntVector; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionSenderCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionSenderCreator.java index 14ae6b08a9f..ca8b96befc6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionSenderCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionSenderCreator.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.physical.impl.partitionsender.PartitionSenderRootExec; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** *
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java index fc5da1501a9..0818075fe20 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java @@ -54,7 +54,7 @@ import org.apache.drill.exec.vector.CopyUtil; import com.carrotsearch.hppc.IntArrayList; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerDecorator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerDecorator.java index ec9b5502b84..8dcac2894e8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerDecorator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerDecorator.java @@ -36,9 +36,9 @@ import org.apache.drill.exec.testing.ControlsInjectorFactory; import org.apache.drill.exec.testing.CountDownLatchInjection; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.MoreExecutors; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.util.concurrent.MoreExecutors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerTemplate.java index 95e62e05195..484e24e41a2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerTemplate.java @@ -51,7 +51,7 @@ import org.apache.drill.exec.record.WritableBatch; import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.record.selection.SelectionVector4; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatchCreator.java index e6bcc05cddf..5212f4235eb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; +import com.google.common.collect.Iterables; public class ProducerConsumerBatchCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ComplexToJsonBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ComplexToJsonBatchCreator.java index f02d272294a..899628e60e8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ComplexToJsonBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ComplexToJsonBatchCreator.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class ComplexToJsonBatchCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/OutputWidthVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/OutputWidthVisitor.java index 4fa7a89f94a..de2a911cd34 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/OutputWidthVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/OutputWidthVisitor.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.physical.impl.project; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.expression.FunctionHolderExpression; import org.apache.drill.common.expression.IfExpression; import org.apache.drill.common.expression.LogicalExpression; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchBuilder.java index d4a7e69d192..056f4c09a75 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchBuilder.java @@ -31,8 +31,8 @@ import org.apache.drill.exec.vector.SchemaChangeCallBack; import org.apache.drill.exec.vector.UntypedNullHolder; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchCreator.java index 0c86db5186b..5b61eb44a0d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class ProjectBatchCreator implements BatchCreator{ @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectMemoryManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectMemoryManager.java index 1391d644806..a136817992b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectMemoryManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectMemoryManager.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.project; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.drill.common.expression.LogicalExpression; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectionMaterializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectionMaterializer.java index 55c630ac236..239d4368a91 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectionMaterializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectionMaterializer.java @@ -55,7 +55,7 @@ import org.apache.drill.exec.server.options.OptionManager; import org.apache.drill.exec.store.ColumnExplorer; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectorTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectorTemplate.java index 9c1aced107e..890276a57e6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectorTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectorTemplate.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.record.TransferPair; import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.record.selection.SelectionVector4; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public abstract class ProjectorTemplate implements Projector { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/protocol/IndirectContainerAccessor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/protocol/IndirectContainerAccessor.java index 45f141dac37..cd2f4962c92 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/protocol/IndirectContainerAccessor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/protocol/IndirectContainerAccessor.java @@ -20,7 +20,7 @@ import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.record.selection.SelectionVector4; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Extension of the container accessor that holds an optional selection diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/rangepartitioner/RangePartitionRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/rangepartitioner/RangePartitionRecordBatch.java index 6d8f2a6ef8a..5fd596d1dcb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/rangepartitioner/RangePartitionRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/rangepartitioner/RangePartitionRecordBatch.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.record.VectorAccessible; import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.vector.IntVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/rangepartitioner/RangePartitionSenderCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/rangepartitioner/RangePartitionSenderCreator.java index 082eaf4c876..d3f32b40ae0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/rangepartitioner/RangePartitionSenderCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/rangepartitioner/RangePartitionSenderCreator.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.physical.impl.partitionsender.PartitionSenderRootExec; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class RangePartitionSenderCreator implements RootCreator { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/ScanOperatorExec.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/ScanOperatorExec.java index c0ac30bc179..9df12c05a0e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/ScanOperatorExec.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/ScanOperatorExec.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.physical.impl.protocol.BatchAccessor; import org.apache.drill.exec.physical.impl.protocol.OperatorExec; import org.apache.drill.exec.physical.impl.protocol.VectorContainerAccessor; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsArrayManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsArrayManager.java index 50a34bcf9a9..30dfde61d5c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsArrayManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsArrayManager.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.physical.resultSet.ResultSetLoader; import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Handles the special case in which the entire row is returned as a diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsArrayParser.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsArrayParser.java index 778ef8e8cf0..d1cb4ee0e3b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsArrayParser.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsArrayParser.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.resultSet.project.RequestedColumn; import org.apache.drill.exec.physical.resultSet.project.RequestedColumnImpl; import org.apache.drill.exec.store.easy.text.TextFormatPlugin; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/convert/AbstractConvertFromString.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/convert/AbstractConvertFromString.java index 76d261646ab..2f07cfe1ce3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/convert/AbstractConvertFromString.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/convert/AbstractConvertFromString.java @@ -23,7 +23,7 @@ import org.apache.drill.common.types.Types; import org.apache.drill.exec.record.metadata.ColumnMetadata; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/file/ImplicitColumnManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/file/ImplicitColumnManager.java index d6576b723ce..9ec0d608efd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/file/ImplicitColumnManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/file/ImplicitColumnManager.java @@ -37,11 +37,11 @@ import org.apache.drill.exec.store.ColumnExplorer; import org.apache.drill.exec.store.ColumnExplorer.ImplicitFileColumn; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Manages the insertion of file metadata (AKA "implicit" and partition) columns. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/NullColumnBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/NullColumnBuilder.java index 41c575baf2d..7138505b2fc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/NullColumnBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/NullColumnBuilder.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Manages null columns by creating a null column loader for each diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ReaderSchemaOrchestrator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ReaderSchemaOrchestrator.java index 6e36cf56a4c..11d199d2782 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ReaderSchemaOrchestrator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ReaderSchemaOrchestrator.java @@ -30,7 +30,7 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.ColumnExplorer.ImplicitInternalFileColumns; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ResolvedTuple.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ResolvedTuple.java index ec079c7dfe8..33b86c72b2a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ResolvedTuple.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ResolvedTuple.java @@ -33,7 +33,7 @@ import org.apache.drill.exec.vector.complex.RepeatedDictVector; import org.apache.drill.exec.vector.complex.RepeatedMapVector; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Drill rows are made up of a tree of tuples, with the row being the root diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ScanLevelProjection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ScanLevelProjection.java index 934f32f9b89..8b1b402794d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ScanLevelProjection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ScanLevelProjection.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.physical.resultSet.project.RequestedColumn; import org.apache.drill.exec.record.metadata.ColumnMetadata; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Parses and analyzes the projection list passed to the scanner. The diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ScanSchemaOrchestrator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ScanSchemaOrchestrator.java index 4f761322dd1..3ddd6a25ebf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ScanSchemaOrchestrator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/project/ScanSchemaOrchestrator.java @@ -36,7 +36,7 @@ import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Performs projection of a record reader, along with a set of static diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/ScanLifecycleBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/ScanLifecycleBuilder.java index c3bd1f67747..da8e5d22b01 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/ScanLifecycleBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/ScanLifecycleBuilder.java @@ -36,7 +36,7 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.server.options.OptionSet; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Gathers options for the {@link ScanLifecycle} then builds a scan lifecycle diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileDescrip.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileDescrip.java index c6fff11aca0..c71689a5be5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileDescrip.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileDescrip.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.store.ColumnExplorer; import org.apache.drill.exec.store.dfs.DrillFileSystem; import org.apache.drill.exec.store.dfs.easy.FileWork; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.FileSplit; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileScanLifecycleBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileScanLifecycleBuilder.java index 85f9dbf569d..c262d0898ad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileScanLifecycleBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileScanLifecycleBuilder.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.scan.v3.lifecycle.ScanLifecycle; import org.apache.drill.exec.store.dfs.easy.FileWork; import org.apache.drill.exec.store.schedule.CompleteFileWork.FileWorkImpl; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/ImplicitColumnResolver.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/ImplicitColumnResolver.java index 766e104bef8..50a7155716e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/ImplicitColumnResolver.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/file/ImplicitColumnResolver.java @@ -50,7 +50,7 @@ import org.apache.drill.exec.store.ColumnExplorer.ImplicitFileColumns; import org.apache.drill.exec.store.ColumnExplorer.ImplicitInternalFileColumns; import org.apache.drill.exec.store.dfs.DrillFileSystem; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/OutputBatchBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/OutputBatchBuilder.java index 683722c8ce3..3ba58daa0ad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/OutputBatchBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/OutputBatchBuilder.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.complex.AbstractMapVector; import org.apache.drill.exec.vector.complex.MapVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Builds an output batch based on an output schema and one or more input diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/ReaderLifecycle.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/ReaderLifecycle.java index 4cb5ad8356e..11a23372208 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/ReaderLifecycle.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/ReaderLifecycle.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.physical.resultSet.impl.ResultSetOptionBuilder; import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/MutableTupleSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/MutableTupleSchema.java index e17a1d32b27..71a465b8e5d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/MutableTupleSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/MutableTupleSchema.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.record.metadata.ColumnMetadata; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.record.metadata.TupleSchema; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * A mutable form of a tuple schema. Allows insertions (at the wildcard position), diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/ScanProjectionParser.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/ScanProjectionParser.java index 03033bfe49e..a37cb7bcb7d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/ScanProjectionParser.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/ScanProjectionParser.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.record.metadata.Propertied; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.record.metadata.TupleSchema; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Parse the projection list into a dynamic tuple schema. Using diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/ScanSchemaTracker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/ScanSchemaTracker.java index af5efa45922..c4394b2039d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/ScanSchemaTracker.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/ScanSchemaTracker.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.physical.resultSet.impl.ProjectionFilter; import org.apache.drill.exec.record.metadata.ColumnMetadata; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Computes scan output schema from a variety of sources. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/SchemaBasedTracker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/SchemaBasedTracker.java index 8e5d6ca8a94..4a9affeeaa2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/SchemaBasedTracker.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/SchemaBasedTracker.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.physical.resultSet.impl.ProjectionFilter; import org.apache.drill.exec.record.metadata.ColumnMetadata; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Simple "tracker" based on a defined, fixed schema. The only resolution diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/SchemaUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/SchemaUtils.java index 802a0b32b2e..3aee1e8cedd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/SchemaUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/v3/schema/SchemaUtils.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.record.metadata.Propertied; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.record.metadata.TupleSchema; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/setop/HashSetOpRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/setop/HashSetOpRecordBatch.java index 516788d76f9..959461be76f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/setop/HashSetOpRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/setop/HashSetOpRecordBatch.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.record.BatchSchema; import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import java.util.Iterator; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/setop/SetOpBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/setop/SetOpBatchCreator.java index 58338eb60ec..89a1bcdc5eb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/setop/SetOpBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/setop/SetOpBatchCreator.java @@ -22,7 +22,7 @@ import org.apache.drill.exec.physical.config.SetOp; import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/RecordBatchData.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/RecordBatchData.java index 6cc723c4f8f..472e3577035 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/RecordBatchData.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/RecordBatchData.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Holds the data for a particular record batch for later manipulation. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatchCreator.java index e29bfbb0d83..50b5f387a4d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class SortBatchCreator implements BatchCreator{ @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortRecordBatchBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortRecordBatchBuilder.java index 240ee530ad6..35df414ec22 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortRecordBatchBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortRecordBatchBuilder.java @@ -38,8 +38,8 @@ import org.apache.drill.exec.record.selection.SelectionVector4; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortTemplate.java index b3c6a7f69ab..621bc4b3e4c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortTemplate.java @@ -29,8 +29,8 @@ import org.apache.hadoop.util.IndexedSortable; import org.apache.hadoop.util.QuickSort; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; public abstract class SortTemplate implements Sorter, IndexedSortable{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SortTemplate.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/spill/SpillSet.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/spill/SpillSet.java index a06ce09db11..6f47aff65e2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/spill/SpillSet.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/spill/SpillSet.java @@ -48,9 +48,9 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Joiner; +import com.google.common.collect.Iterators; +import com.google.common.collect.Sets; /** * Generates the set of spill files for this sort session. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsAggBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsAggBatch.java index 36de4df2a9f..99ea58ba05c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsAggBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsAggBatch.java @@ -50,7 +50,7 @@ import org.apache.drill.exec.vector.complex.FieldIdUtil; import org.apache.drill.exec.vector.complex.MapVector; import org.apache.drill.metastore.statistics.Statistic; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsAggBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsAggBatchCreator.java index 252b73818dd..08f114d2f6e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsAggBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsAggBatchCreator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.statistics; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.ops.ExecutorFragmentContext; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsMergeBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsMergeBatch.java index 967209bb74b..a8cdbbb839e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsMergeBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsMergeBatch.java @@ -44,7 +44,7 @@ import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.complex.MapVector; import org.apache.drill.metastore.statistics.Statistic; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Example input and output: diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsMergeBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsMergeBatchCreator.java index 7599ab0d972..b3c60bcfbb0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsMergeBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/statistics/StatisticsMergeBatchCreator.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.CloseableRecordBatch; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; @SuppressWarnings("unused") public class StatisticsMergeBatchCreator implements BatchCreator{ diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/SVRemoverCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/SVRemoverCreator.java index 7ba41fac73a..c49634097a7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/SVRemoverCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/SVRemoverCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class SVRemoverCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/StraightCopier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/StraightCopier.java index 96d11d4a60a..cecfc5af793 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/StraightCopier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/StraightCopier.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.svremover; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.record.TransferPair; import org.apache.drill.exec.record.VectorAccessible; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllBatchCreator.java index 69d7c03b034..0084e12be42 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class UnionAllBatchCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllRecordBatch.java index 07d916d5864..fad14184fa5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllRecordBatch.java @@ -59,7 +59,7 @@ import org.apache.drill.exec.vector.FixedWidthVector; import org.apache.drill.exec.vector.SchemaChangeCallBack; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllerTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllerTemplate.java index 3ec45a83809..8b22ef2f150 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllerTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllerTemplate.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.record.TransferPair; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public abstract class UnionAllerTemplate implements UnionAller { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unnest/UnnestImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unnest/UnnestImpl.java index a9c95983460..40192c5b351 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unnest/UnnestImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unnest/UnnestImpl.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.physical.impl.unnest; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; import org.apache.drill.exec.exception.SchemaChangeException; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unnest/UnnestRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unnest/UnnestRecordBatch.java index 5e6ef479f06..ffa2a2670ac 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unnest/UnnestRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unnest/UnnestRecordBatch.java @@ -46,8 +46,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.complex.RepeatedMapVector; import org.apache.drill.exec.vector.complex.RepeatedValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unpivot/UnpivotMapsBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unpivot/UnpivotMapsBatchCreator.java index e86a92785f6..397248ea489 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unpivot/UnpivotMapsBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unpivot/UnpivotMapsBatchCreator.java @@ -19,7 +19,7 @@ import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.ops.ExecutorFragmentContext; import org.apache.drill.exec.physical.config.UnpivotMaps; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unpivot/UnpivotMapsRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unpivot/UnpivotMapsRecordBatch.java index 1fb44f5374f..5943e74544e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unpivot/UnpivotMapsRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/unpivot/UnpivotMapsRecordBatch.java @@ -35,8 +35,8 @@ import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.complex.MapVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorCreator.java index b7be8ab6668..754b8e740f5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorCreator.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class IteratorValidatorCreator implements BatchCreator{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(IteratorValidatorCreator.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorInjector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorInjector.java index 6d86fb3d26b..4440df247af 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorInjector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorInjector.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.physical.config.IteratorValidator; import org.apache.drill.exec.physical.config.RowKeyJoinPOP; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class IteratorValidatorInjector extends AbstractPhysicalVisitor { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowDataBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowDataBatch.java index a9baea9596c..4f74b7912fa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowDataBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowDataBatch.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.window; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.ops.OperatorContext; import org.apache.drill.exec.record.BatchSchema; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameBatchCreator.java index 47d27d436f1..b1d267dbbe8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class WindowFrameBatchCreator implements BatchCreator { @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameRecordBatch.java index 587377966f1..10ca6cee70b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameRecordBatch.java @@ -44,7 +44,7 @@ import org.apache.drill.exec.record.VectorAccessible; import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; +import com.google.common.collect.Iterables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/BufferedBatches.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/BufferedBatches.java index 1b0aa106a3d..23b5daa6c01 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/BufferedBatches.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/BufferedBatches.java @@ -33,7 +33,7 @@ import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.record.selection.SelectionVector2; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Represents the set of in-memory batches accumulated by diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/ExternalSortBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/ExternalSortBatchCreator.java index 42ab17b1e75..ec8e33d65ff 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/ExternalSortBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/ExternalSortBatchCreator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.impl.BatchCreator; import org.apache.drill.exec.record.AbstractRecordBatch; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class ExternalSortBatchCreator implements BatchCreator{ diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/MSortTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/MSortTemplate.java index e503c5db2b0..78400c3729e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/MSortTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/MSortTemplate.java @@ -30,8 +30,8 @@ import org.apache.drill.exec.record.selection.SelectionVector4; import org.apache.hadoop.util.IndexedSortable; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Queues; +import com.google.common.base.Preconditions; +import com.google.common.collect.Queues; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierWrapper.java index 1e246c104b4..dfdc11f6484 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierWrapper.java @@ -45,7 +45,7 @@ import org.apache.drill.exec.vector.CopyUtil; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SingleBatchSorterTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SingleBatchSorterTemplate.java index 57d2ec3512e..3a7710bb5cf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SingleBatchSorterTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SingleBatchSorterTemplate.java @@ -29,8 +29,8 @@ import org.apache.hadoop.util.IndexedSortable; import org.apache.hadoop.util.QuickSort; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; public abstract class SingleBatchSorterTemplate implements SingleBatchSorter, IndexedSortable{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SingleBatchSorterTemplate.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SortImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SortImpl.java index cc8f6bb9fd3..28c83bef355 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SortImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SortImpl.java @@ -37,7 +37,7 @@ import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.record.selection.SelectionVector4; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.drill.exec.vector.ValueVector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SortMemoryManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SortMemoryManager.java index 7bfc1d3c315..9f81b4f0e86 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SortMemoryManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SortMemoryManager.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.xsort; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SpilledRun.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SpilledRun.java index 9a3bf695ec3..3aa557ed947 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SpilledRun.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SpilledRun.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.record.TransferPair; import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.VectorWrapper; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; /** * Holds a set of spilled batches, represented by a file on disk. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SpilledRuns.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SpilledRuns.java index ccd31852f0a..9701caa6ed6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SpilledRuns.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/SpilledRuns.java @@ -30,7 +30,7 @@ import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.VectorInitializer; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/PullResultSetReaderImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/PullResultSetReaderImpl.java index dc803de58c2..0568f56787f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/PullResultSetReaderImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/PullResultSetReaderImpl.java @@ -21,8 +21,8 @@ import org.apache.drill.exec.physical.resultSet.PullResultSetReader; import org.apache.drill.exec.physical.rowSet.RowSetReader; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; /** *

Protocol

diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/PushResultSetReaderImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/PushResultSetReaderImpl.java index 7fc1156313f..e71093d35db 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/PushResultSetReaderImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/PushResultSetReaderImpl.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.physical.rowSet.RowSetReader; import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.selection.SelectionVector2; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class PushResultSetReaderImpl implements PushResultSetReader { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/RepeatedListState.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/RepeatedListState.java index 9037cc9de23..f12cbfe3bcd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/RepeatedListState.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/RepeatedListState.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.vector.accessor.writer.AbstractObjectWriter; import org.apache.drill.exec.vector.accessor.writer.RepeatedListWriter; import org.apache.drill.exec.vector.complex.RepeatedListVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Represents the internal state of a RepeatedList vector. The repeated list diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/ResultSetCopierImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/ResultSetCopierImpl.java index 1dd8d5498a5..ac37c236cb7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/ResultSetCopierImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/resultSet/impl/ResultSetCopierImpl.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.accessor.ColumnReader; import org.apache.drill.exec.vector.accessor.ColumnWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class ResultSetCopierImpl implements ResultSetCopier { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/RowSet.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/RowSet.java index bdbe5c2cf25..5d1fc0d1e89 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/RowSet.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/RowSet.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.record.selection.SelectionVector4; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * A row set is a collection of rows stored as value vectors. Elsewhere in diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSDirPartitionLocation.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSDirPartitionLocation.java index 67278f61ca5..350fcbe13ac 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSDirPartitionLocation.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSDirPartitionLocation.java @@ -22,7 +22,7 @@ import org.apache.drill.exec.util.DrillFileSystemUtil; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.hadoop.fs.Path; import java.util.Collection; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/FileSystemPartitionDescriptor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/FileSystemPartitionDescriptor.java index 5e3068324d8..4c99f3b10c8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/FileSystemPartitionDescriptor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/FileSystemPartitionDescriptor.java @@ -29,9 +29,9 @@ import org.apache.calcite.plan.RelOptTable; import org.apache.commons.lang3.tuple.Pair; import org.apache.drill.common.util.GuavaUtils; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Charsets; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.calcite.prepare.RelOptTableImpl; import org.apache.calcite.rel.core.TableScan; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionDescriptor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionDescriptor.java index c3a032bde99..8e28b5d9463 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionDescriptor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionDescriptor.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner; -import org.apache.drill.shaded.guava.com.google.common.primitives.Ints; -import org.apache.drill.shaded.guava.com.google.common.primitives.Longs; +import com.google.common.primitives.Ints; +import com.google.common.primitives.Longs; import org.apache.calcite.rel.core.TableScan; import org.apache.calcite.util.BitSets; import org.apache.drill.common.expression.SchemaPath; @@ -51,7 +51,7 @@ import org.apache.drill.exec.vector.NullableVarDecimalVector; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.hadoop.fs.Path; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java index 22813e82c5f..96c29162fd8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java @@ -44,7 +44,7 @@ import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.deser.std.StdDelegatingDeserializer; import com.fasterxml.jackson.databind.module.SimpleModule; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.fs.Path; public class PhysicalPlanReader { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerPhase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerPhase.java index 2c2215eacd6..4a32b3a9bdd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerPhase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerPhase.java @@ -27,9 +27,9 @@ import org.apache.drill.exec.planner.physical.MetadataHandlerPrule; import org.apache.drill.exec.planner.physical.TableModifyPrule; import org.apache.drill.exec.planner.physical.SetOpPrule; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet.Builder; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet.Builder; +import com.google.common.collect.Lists; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.rel.core.RelFactories; import org.apache.calcite.rel.rules.JoinToMultiJoinRule; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java index 66628bb4b75..baa39dba236 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java @@ -41,7 +41,7 @@ import org.apache.calcite.rel.rules.UnionToDistinctRule; import org.apache.drill.exec.planner.logical.DrillConditions; import org.apache.drill.exec.planner.logical.DrillRelFactories; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Contains rule instances which use custom RelBuilder. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/SimplePartitionLocation.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/SimplePartitionLocation.java index ca00446fc4d..5ad897874f7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/SimplePartitionLocation.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/SimplePartitionLocation.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.hadoop.fs.Path; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillJoinRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillJoinRelBase.java index 03dd4877ebe..f63d2eae270 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillJoinRelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillJoinRelBase.java @@ -43,7 +43,7 @@ import org.apache.drill.exec.planner.cost.DrillCostBase.DrillCostFactory; import org.apache.drill.exec.planner.logical.DrillJoin; import org.apache.drill.exec.planner.physical.PrelUtil; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Base class for logical and physical Joins implemented in Drill. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillLateralJoinRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillLateralJoinRelBase.java index f86e9ece560..ce622f59b7c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillLateralJoinRelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillLateralJoinRelBase.java @@ -18,8 +18,8 @@ package org.apache.drill.exec.planner.common; import org.apache.calcite.rel.core.JoinRelType; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelOptCost; import org.apache.calcite.plan.RelOptPlanner; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillProjectRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillProjectRelBase.java index 782c95eaeec..6c1b1433074 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillProjectRelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillProjectRelBase.java @@ -53,7 +53,7 @@ import org.apache.calcite.rex.RexNode; import org.apache.calcite.util.Pair; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java index 134554ce41f..7b484afcf8c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java @@ -64,9 +64,9 @@ import org.apache.drill.exec.planner.physical.PlannerSettings; import org.apache.drill.exec.resolver.TypeCastRules; import org.apache.drill.exec.util.Utilities; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java index 59c96a33808..1c6f51350c1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java @@ -28,8 +28,8 @@ import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.sql.type.SqlTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; /** Base class for logical and physical Writer implemented in Drill. */ public abstract class DrillWriterRelBase extends SingleRel implements DrillRelNode { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/NumericEquiDepthHistogram.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/NumericEquiDepthHistogram.java index 69ec289d0cf..873862e459f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/NumericEquiDepthHistogram.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/NumericEquiDepthHistogram.java @@ -32,10 +32,10 @@ import com.tdunning.math.stats.MergingDigest; import org.apache.calcite.sql.SqlOperator; import org.apache.drill.metastore.statistics.Histogram; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.BoundType; -import org.apache.drill.shaded.guava.com.google.common.collect.Range; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.collect.BoundType; +import com.google.common.collect.Range; /** * A column specific equi-depth histogram which is meant for numeric data types diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillDefaultRelMetadataProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillDefaultRelMetadataProvider.java index fad0018cd71..19f991030cc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillDefaultRelMetadataProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillDefaultRelMetadataProvider.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.cost; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.calcite.rel.metadata.ChainedRelMetadataProvider; import org.apache.calcite.rel.metadata.DefaultRelMetadataProvider; import org.apache.calcite.rel.metadata.RelMetadataProvider; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java index 35e5095f0ea..cef90eb3f47 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.work.foreman.ForemanSetupException; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class Fragment implements Iterable { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Fragment.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/HardAffinityFragmentParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/HardAffinityFragmentParallelizer.java index 752b081ece2..3271e117dc9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/HardAffinityFragmentParallelizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/HardAffinityFragmentParallelizer.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.fragment; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.drill.exec.physical.EndpointAffinity; import org.apache.drill.exec.physical.PhysicalOperatorSetupException; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Materializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Materializer.java index fd040e91122..96afe22cfad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Materializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Materializer.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.physical.base.Store; import org.apache.drill.exec.physical.base.SubScan; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.physical.config.LateralJoinPOP; import org.apache.drill.exec.physical.config.UnnestPOP; import org.apache.drill.exec.physical.config.RowKeyJoinPOP; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/MemoryCalculator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/MemoryCalculator.java index e8dd4af916b..48463729410 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/MemoryCalculator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/MemoryCalculator.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.planner.AbstractOpWrapperVisitor; import org.apache.drill.exec.planner.cost.NodeResource; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationInfo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationInfo.java index b6b41b0f588..62953e08052 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationInfo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationInfo.java @@ -17,10 +17,10 @@ */ package org.apache.drill.exec.planner.fragment; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import org.apache.drill.exec.physical.EndpointAffinity; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/PlanningSet.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/PlanningSet.java index be30971a9bd..c80b990e3ed 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/PlanningSet.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/PlanningSet.java @@ -20,7 +20,7 @@ import java.util.Iterator; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java index e56af096e85..448412d6513 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java @@ -48,10 +48,10 @@ import org.apache.drill.exec.rpc.user.UserSession; import org.apache.drill.exec.server.options.OptionList; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.drill.exec.server.options.OptionManager; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SoftAffinityFragmentParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SoftAffinityFragmentParallelizer.java index 45e507e587f..434cb2fd6db 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SoftAffinityFragmentParallelizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SoftAffinityFragmentParallelizer.java @@ -17,9 +17,9 @@ */ package org.apache.drill.exec.planner.fragment; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Ordering; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; +import com.google.common.collect.Ordering; import org.apache.drill.exec.physical.EndpointAffinity; import org.apache.drill.exec.physical.PhysicalOperatorSetupException; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/StatsCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/StatsCollector.java index 49af366ce2e..a800175905e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/StatsCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/StatsCollector.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.fragment; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.physical.base.Exchange; import org.apache.drill.exec.physical.base.GroupScan; import org.apache.drill.exec.physical.base.HasAffinity; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java index 687f0249ebe..2377056bcc2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; import org.apache.drill.exec.planner.cost.NodeResource; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.exec.physical.PhysicalOperatorSetupException; import org.apache.drill.exec.physical.base.AbstractPhysicalVisitor; import org.apache.drill.exec.physical.base.Exchange; @@ -35,8 +35,8 @@ import org.apache.drill.exec.planner.fragment.Fragment.ExchangeFragmentPair; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; /** * Wrapper class that allows us to add additional information to each fragment diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/ExchangeRemoverMaterializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/ExchangeRemoverMaterializer.java index 8b2c666ee75..94fa752b6dd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/ExchangeRemoverMaterializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/ExchangeRemoverMaterializer.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.planner.fragment.Materializer; import org.apache.drill.exec.planner.fragment.Materializer.IndexedFragmentNode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Materializer visitor to remove exchange(s) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java index 11e0a27e5d5..f51258fe671 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java @@ -46,8 +46,8 @@ import org.apache.drill.exec.work.QueryWorkUnit.MinorFragmentDefn; import org.apache.drill.exec.work.foreman.ForemanSetupException; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/AbstractIndexCollection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/AbstractIndexCollection.java index 9894b326322..5df97e8f9f0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/AbstractIndexCollection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/AbstractIndexCollection.java @@ -21,7 +21,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rex.RexNode; import org.apache.drill.common.expression.SchemaPath; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/DrillIndexDefinition.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/DrillIndexDefinition.java index bc6fe2d7679..91b284cf842 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/DrillIndexDefinition.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/DrillIndexDefinition.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.calcite.rel.RelCollation; import org.apache.calcite.rel.RelCollations; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/FindFiltersForCollation.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/FindFiltersForCollation.java index 3328ee2f716..2bfb98c2356 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/FindFiltersForCollation.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/FindFiltersForCollation.java @@ -55,9 +55,9 @@ import org.apache.calcite.sql.SqlOperator; import org.apache.calcite.sql.fun.SqlStdOperatorTable; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/FunctionalIndexHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/FunctionalIndexHelper.java index 41de5dd5a3e..2184d2c2b6e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/FunctionalIndexHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/FunctionalIndexHelper.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.planner.index; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexConditionInfo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexConditionInfo.java index dd7f9fcb0d6..5eabab5a302 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexConditionInfo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexConditionInfo.java @@ -18,10 +18,10 @@ package org.apache.drill.exec.planner.index; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexNode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexGroup.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexGroup.java index 3d3aeeb1770..943c4fe073d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexGroup.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexGroup.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.index; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexLogicalPlanCallContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexLogicalPlanCallContext.java index 697150f3541..d3e636e7757 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexLogicalPlanCallContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexLogicalPlanCallContext.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.index; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.rel.RelCollation; import org.apache.calcite.rex.RexNode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexPhysicalPlanCallContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexPhysicalPlanCallContext.java index 0e842fd7466..38e05f1f2b5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexPhysicalPlanCallContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexPhysicalPlanCallContext.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.index; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.rel.RelCollation; import org.apache.calcite.rel.RelNode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexPlanUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexPlanUtils.java index 7e122d65b0e..31360b3b85c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexPlanUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexPlanUtils.java @@ -23,10 +23,10 @@ import java.util.Map; import java.util.Set; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.plan.volcano.RelSubset; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexSelector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexSelector.java index b071cb6d6ab..ae857e0be9d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexSelector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexSelector.java @@ -40,10 +40,10 @@ import org.apache.drill.exec.planner.physical.ScanPrel; import org.apache.drill.exec.planner.common.DrillScanRelBase; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; public class IndexSelector { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(IndexSelector.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexableExprMarker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexableExprMarker.java index eb91833ec18..51bc918e22c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexableExprMarker.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/IndexableExprMarker.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.planner.index; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexCorrelVariable; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/PathInExpr.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/PathInExpr.java index 4cb4eeb7780..72e30803ac6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/PathInExpr.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/PathInExpr.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.index; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.drill.common.expression.CastExpression; import org.apache.drill.common.expression.FunctionCall; import org.apache.drill.common.expression.FunctionHolderExpression; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/RexSeparator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/RexSeparator.java index 8047724efbf..7f89b8bd8e8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/RexSeparator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/RexSeparator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.index; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexCall; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/RexToExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/RexToExpression.java index 6b143fb9a2e..2c48aea8b9a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/RexToExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/RexToExpression.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.index; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeField; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/SimpleRexRemap.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/SimpleRexRemap.java index 946b1185623..ded425cea23 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/SimpleRexRemap.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/SimpleRexRemap.java @@ -18,8 +18,8 @@ package org.apache.drill.exec.planner.index; import org.apache.drill.exec.util.Utilities; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeField; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/AbstractIndexPlanGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/AbstractIndexPlanGenerator.java index c4b6c729329..2f7365220d5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/AbstractIndexPlanGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/AbstractIndexPlanGenerator.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.calcite.plan.RelTrait; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/CoveringIndexPlanGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/CoveringIndexPlanGenerator.java index 87dd77c060f..d6df12f8b40 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/CoveringIndexPlanGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/CoveringIndexPlanGenerator.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.index.generators; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rel.RelCollation; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/CoveringPlanNoFilterGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/CoveringPlanNoFilterGenerator.java index 548fa31cd69..b7b90e94cde 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/CoveringPlanNoFilterGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/CoveringPlanNoFilterGenerator.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.index.generators; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.base.Preconditions; import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rel.InvalidRelException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/IndexIntersectPlanGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/IndexIntersectPlanGenerator.java index 2d17586a460..638016c1479 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/IndexIntersectPlanGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/IndexIntersectPlanGenerator.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.planner.index.generators; import org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.plan.RelTraitSet; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/NonCoveringIndexPlanGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/NonCoveringIndexPlanGenerator.java index ec8899a8397..2636f140803 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/NonCoveringIndexPlanGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/generators/NonCoveringIndexPlanGenerator.java @@ -55,9 +55,9 @@ import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexInputRef; import org.apache.calcite.rex.RexNode; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; /** * Generate a non-covering index plan that is equivalent to the original plan. The non-covering plan consists diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanSortRemovalRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanSortRemovalRule.java index dc4054c64cb..6b48fe40e0e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanSortRemovalRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanSortRemovalRule.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.index.rules; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptRuleOperand; @@ -44,7 +44,7 @@ import org.apache.drill.exec.planner.physical.Prel; import org.apache.drill.exec.planner.physical.HashToRandomExchangePrel; import org.apache.calcite.rel.RelNode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanToIndexScanPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanToIndexScanPrule.java index 61191bc8d96..9f1d8fa888b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanToIndexScanPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/index/rules/DbScanToIndexScanPrule.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.index.rules; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ConvertCountToDirectScanRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ConvertCountToDirectScanRule.java index 14a69fce8c8..9e6fcaff8e8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ConvertCountToDirectScanRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ConvertCountToDirectScanRule.java @@ -48,7 +48,7 @@ import org.apache.drill.exec.store.parquet.metadata.Metadata; import org.apache.drill.exec.store.parquet.metadata.Metadata_V4; import org.apache.drill.exec.store.pojo.DynamicPojoRecordReader; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.hadoop.fs.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ConvertMetadataAggregateToDirectScanRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ConvertMetadataAggregateToDirectScanRule.java index f9b266ee583..1530d06a20f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ConvertMetadataAggregateToDirectScanRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ConvertMetadataAggregateToDirectScanRule.java @@ -51,9 +51,9 @@ import org.apache.drill.metastore.statistics.ExactStatisticsConstants; import org.apache.drill.metastore.statistics.StatisticsKind; import org.apache.drill.metastore.statistics.TableStatisticsKind; -import org.apache.drill.shaded.guava.com.google.common.collect.HashBasedTable; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Table; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Multimap; +import com.google.common.collect.Table; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillAggregateRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillAggregateRel.java index 80d604391d5..1246f22a09f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillAggregateRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillAggregateRel.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.logical; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.linq4j.Ord; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelOptCost; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java index cefd727aaf5..f732ceffb43 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.planner.logical; import org.apache.calcite.rel.type.RelDataType; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import io.netty.buffer.DrillBuf; import org.apache.calcite.rex.RexExecutor; import org.apache.calcite.util.DateString; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java index db29c31a7a6..47232372245 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java @@ -27,7 +27,7 @@ import org.apache.drill.common.logical.data.LogicalOperator; import org.apache.drill.common.logical.data.visitors.AbstractLogicalVisitor; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; /** * Context for converting a tree of {@link DrillRel} nodes into a Drill logical plan. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRule.java index 3ad824f89c3..058188bbc7a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRule.java @@ -35,7 +35,7 @@ import org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.apache.calcite.util.trace.CalciteTrace; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillOptiq.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillOptiq.java index a350ba04887..9cf1b26d45f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillOptiq.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillOptiq.java @@ -71,8 +71,8 @@ import org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.apache.calcite.util.NlsString; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.drill.exec.planner.physical.PlannerSettings; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectRel.java index 8afc3046f06..be9eeac7c9e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectRel.java @@ -35,7 +35,7 @@ import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.type.SqlTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Project implemented in Drill. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java index 146d0f209f3..fb6a415945c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.planner.logical; import org.apache.drill.exec.planner.common.DrillProjectRelBase; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptUtil; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java index 9e2c0e5c6b2..c20d74ff6bf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.logical; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.calcite.plan.RelOptRule; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushRowKeyJoinToScanRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushRowKeyJoinToScanRule.java index 835fdf182de..56ece174d93 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushRowKeyJoinToScanRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushRowKeyJoinToScanRule.java @@ -38,7 +38,7 @@ import org.apache.drill.exec.planner.index.rules.MatchFunction; import org.apache.drill.exec.planner.physical.PrelUtil; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java index b386361adf9..1b67da275a8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.planner.logical; import org.apache.drill.exec.planner.sql.DrillCalciteSqlSumEmptyIsZeroAggFunctionWrapper; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.calcite.plan.Convention; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelOptRule; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceExpressionsRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceExpressionsRule.java index 7dd294516b1..b2f6a90f500 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceExpressionsRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceExpressionsRule.java @@ -44,7 +44,7 @@ import org.apache.calcite.rex.RexUtil; import org.apache.calcite.sql.SqlKind; import org.apache.calcite.util.Util; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillScanRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillScanRel.java index 61f06e712cc..1c13773ac88 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillScanRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillScanRel.java @@ -39,7 +39,7 @@ import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rel.type.RelDataType; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.util.Utilities; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSemiJoinRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSemiJoinRel.java index 8861f4d26bb..d07cee50245 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSemiJoinRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSemiJoinRel.java @@ -34,8 +34,8 @@ import org.apache.drill.common.logical.data.LogicalOperator; import org.apache.drill.common.logical.data.LogicalSemiJoin; import org.apache.drill.exec.planner.common.DrillJoinRelBase; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSortRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSortRel.java index 0fb7b8a60db..f4940b40711 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSortRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSortRel.java @@ -35,8 +35,8 @@ import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rex.RexNode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; /** * Sort implemented in Drill. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRel.java index 1fa9ae5f666..44a1fed4b3c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRel.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.logical; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.linq4j.Ord; import org.apache.calcite.util.BitSets; import org.apache.drill.common.expression.ExpressionPosition; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWriterRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWriterRel.java index d2c7dcf5e97..72e4a11289d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWriterRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWriterRel.java @@ -19,8 +19,8 @@ import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeField; import org.apache.drill.common.logical.data.LogicalOperator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/MetadataControllerRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/MetadataControllerRel.java index ee1f2f14166..65fa4aea9fc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/MetadataControllerRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/MetadataControllerRel.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.metastore.analyze.MetastoreAnalyzeConstants; import org.apache.drill.exec.planner.cost.DrillCostBase; import org.apache.drill.exec.metastore.analyze.MetadataControllerContext; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/PreProcessLogicalRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/PreProcessLogicalRel.java index 4cdff4feac6..932c7b30bfd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/PreProcessLogicalRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/PreProcessLogicalRel.java @@ -22,7 +22,7 @@ import org.apache.calcite.rel.logical.LogicalIntersect; import org.apache.calcite.rel.logical.LogicalMinus; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.logical.LogicalFilter; import org.apache.calcite.rel.logical.LogicalJoin; import org.apache.calcite.rex.RexShuttle; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/RowKeyJoinRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/RowKeyJoinRel.java index 10520291290..5a0b48d1591 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/RowKeyJoinRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/RowKeyJoinRel.java @@ -34,7 +34,7 @@ import org.apache.drill.common.logical.data.Join; import org.apache.drill.common.logical.data.LogicalOperator; import org.apache.drill.exec.planner.torel.ConversionContext; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public class RowKeyJoinRel extends DrillJoinRel implements DrillRel { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ScanFieldDeterminer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ScanFieldDeterminer.java index 29f26c93051..a6f117a320b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ScanFieldDeterminer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ScanFieldDeterminer.java @@ -43,9 +43,9 @@ import org.apache.drill.common.logical.data.visitors.AbstractLogicalVisitor; import org.apache.drill.exec.store.parquet.FilterEvaluatorUtils.FieldReferenceFinder; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; /** * This visitor will walk a logical plan and record in a map the list of field references associated to each scan. These diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/FindPartitionConditions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/FindPartitionConditions.java index 094d2dc687f..957f514960a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/FindPartitionConditions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/FindPartitionConditions.java @@ -40,7 +40,7 @@ import org.apache.calcite.sql.fun.SqlRowOperator; import org.apache.calcite.util.Util; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class FindPartitionConditions extends RexVisitorImpl { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java index 9e6917be207..3ad740f54ea 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java @@ -30,7 +30,7 @@ import org.apache.drill.exec.planner.common.DrillRelOptUtil; import org.apache.drill.exec.planner.logical.SelectionBasedTableScan; import org.apache.drill.exec.util.DrillFileSystemUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rel.core.Aggregate; import org.apache.calcite.rel.core.Filter; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteAsBinaryOperators.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteAsBinaryOperators.java index 3b86178cfe4..09da1fabe49 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteAsBinaryOperators.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteAsBinaryOperators.java @@ -36,8 +36,8 @@ import org.apache.calcite.sql.SqlKind; import org.apache.calcite.sql.SqlOperator; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; /** * Rewrites an expression tree, replacing OR and AND operators with more than 2 operands with a chained operators diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteCombineBinaryOperators.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteCombineBinaryOperators.java index ddea3eb5f78..5bbeceab76e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteCombineBinaryOperators.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteCombineBinaryOperators.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.logical.partition; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rex.RexBuilder; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java index a8619aa8d39..ed236f7cdab 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java @@ -19,7 +19,7 @@ import org.apache.drill.common.expression.IfExpression; import org.apache.drill.common.expression.NullExpression; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.linq4j.Ord; import org.apache.calcite.util.BitSets; import org.apache.calcite.util.ImmutableBitSet; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPruleBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPruleBase.java index b373ff449d1..1518a5bbfe6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPruleBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPruleBase.java @@ -29,7 +29,7 @@ import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptRuleOperand; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; // abstract base class for the aggregation physical rules public abstract class AggPruleBase extends Prule { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AnalyzePrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AnalyzePrule.java index 7efa0cc6bb5..b5536d9a4ae 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AnalyzePrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AnalyzePrule.java @@ -34,9 +34,9 @@ import org.apache.drill.exec.planner.logical.DrillAnalyzeRel; import org.apache.drill.exec.planner.logical.DrillRel; import org.apache.drill.exec.planner.logical.RelOptHelper; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; public class AnalyzePrule extends Prule { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ConvertCountToDirectScanPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ConvertCountToDirectScanPrule.java index b335b6caf8b..82e9da66ae5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ConvertCountToDirectScanPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ConvertCountToDirectScanPrule.java @@ -42,7 +42,7 @@ import org.apache.drill.exec.store.ColumnExplorer; import org.apache.drill.exec.store.direct.MetadataDirectGroupScan; import org.apache.drill.exec.store.pojo.DynamicPojoRecordReader; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrule.java index fdc03ef0e5b..a61db99510c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashAggPrule.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.physical; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.util.ImmutableBitSet; import org.apache.drill.exec.planner.logical.DrillAggregateRel; import org.apache.drill.exec.planner.logical.RelOptHelper; @@ -30,7 +30,7 @@ import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.util.trace.CalciteTrace; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.slf4j.Logger; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashJoinPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashJoinPrel.java index 25ceccd65be..5036a6f4451 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashJoinPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashJoinPrel.java @@ -43,8 +43,8 @@ import org.apache.calcite.plan.RelOptPlanner; import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rex.RexNode; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.drill.exec.work.filter.RuntimeFilterDef; public class HashJoinPrel extends JoinPrel { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashPrelUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashPrelUtil.java index 2e3a253bef5..840e60c59e5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashPrelUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashPrelUtil.java @@ -18,8 +18,8 @@ package org.apache.drill.exec.planner.physical; import org.apache.drill.exec.planner.physical.DrillDistributionTrait.NamedDistributionField; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexNode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashToRandomExchangePrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashToRandomExchangePrel.java index 75331f677b0..7618edfe32e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashToRandomExchangePrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashToRandomExchangePrel.java @@ -21,7 +21,7 @@ import java.math.BigDecimal; import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.linq4j.Ord; import org.apache.calcite.rel.type.RelDataType; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPrel.java index f6e18b98180..1fe28ad39cd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPrel.java @@ -43,7 +43,7 @@ import org.apache.calcite.rex.RexUtil; import org.apache.calcite.sql.SqlKind; import org.apache.calcite.util.Pair; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPruleBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPruleBase.java index 56787987471..b636e32d949 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPruleBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPruleBase.java @@ -41,8 +41,8 @@ import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rex.RexNode; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; // abstract base class for the join physical rules public abstract class JoinPruleBase extends Prule { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LateralJoinPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LateralJoinPrel.java index f01d187a799..f8047dcc5a0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LateralJoinPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LateralJoinPrel.java @@ -18,8 +18,8 @@ package org.apache.drill.exec.planner.physical; import org.apache.calcite.rel.core.JoinRelType; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rel.RelNode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitExchangeTransposeRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitExchangeTransposeRule.java index 817d6b3e36a..161e29821f0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitExchangeTransposeRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitExchangeTransposeRule.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.physical; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.hep.HepRelVertex; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrel.java index 195abbb5d71..b1e2f167f20 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrel.java @@ -39,7 +39,7 @@ import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rex.RexNode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class MergeJoinPrel extends JoinPrel { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrule.java index f06b66d2bc5..13abc26ade1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MergeJoinPrule.java @@ -31,7 +31,7 @@ import org.apache.calcite.plan.RelOptRuleOperand; import org.apache.calcite.util.trace.CalciteTrace; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; public class MergeJoinPrule extends JoinPruleBase { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataAggPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataAggPrule.java index 9a9e11c19fa..009d773251e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataAggPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataAggPrule.java @@ -33,7 +33,7 @@ import org.apache.drill.exec.planner.physical.AggPrelBase.OperatorPhase; import org.apache.drill.exec.planner.physical.DrillDistributionTrait.NamedDistributionField; import org.apache.drill.exec.store.parquet.FilterEvaluatorUtils.FieldReferenceFinder; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.Collections; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataControllerPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataControllerPrel.java index b5691e3169f..b899c27d253 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataControllerPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataControllerPrel.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.planner.physical.visitor.PrelVisitor; import org.apache.drill.exec.metastore.analyze.MetadataControllerContext; import org.apache.drill.exec.record.BatchSchema; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.io.IOException; import java.util.Iterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataHandlerPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataHandlerPrel.java index 42cc9fbf780..7680b73b48c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataHandlerPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataHandlerPrel.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.planner.physical.visitor.PrelVisitor; import org.apache.drill.exec.metastore.analyze.MetadataHandlerContext; import org.apache.drill.exec.record.BatchSchema; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.io.IOException; import java.util.Iterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataHashAggPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataHashAggPrel.java index 8f454f2fb42..457ee906869 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataHashAggPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataHashAggPrel.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.planner.common.DrillRelNode; import org.apache.drill.exec.planner.physical.visitor.PrelVisitor; import org.apache.drill.exec.record.BatchSchema; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.io.IOException; import java.util.Iterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataStreamAggPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataStreamAggPrel.java index 5da89170c33..73d53c5e317 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataStreamAggPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/MetadataStreamAggPrel.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.planner.physical.visitor.PrelVisitor; import org.apache.drill.exec.metastore.analyze.MetadataAggregateContext; import org.apache.drill.exec.record.BatchSchema; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.io.IOException; import java.util.Iterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/NestedLoopJoinPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/NestedLoopJoinPrule.java index d7b3df5b4fa..a084c0eeaa4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/NestedLoopJoinPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/NestedLoopJoinPrule.java @@ -30,7 +30,7 @@ import org.apache.drill.exec.planner.logical.DrillJoin; import org.apache.drill.exec.planner.logical.DrillJoinRel; import org.apache.drill.exec.planner.logical.RelOptHelper; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java index 1a7d18cfd98..659955f8f12 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.planner.cost.PrelCostEstimates; import org.apache.drill.exec.planner.physical.explain.PrelSequencer.OpId; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class PhysicalPlanCreator { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelFactories.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelFactories.java index 9080c3c27f3..202a2d60200 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelFactories.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PrelFactories.java @@ -20,7 +20,7 @@ import org.apache.calcite.rel.core.CorrelationId; import org.apache.calcite.rel.hint.RelHint; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.RelFactories; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectAllowDupPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectAllowDupPrel.java index 07936f3b482..3d4927f7c2f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectAllowDupPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectAllowDupPrel.java @@ -34,7 +34,7 @@ import org.apache.calcite.rex.RexNode; import org.apache.calcite.util.Pair; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class ProjectAllowDupPrel extends ProjectPrel { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java index 395e7783659..9f014d8992e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.rel.type.RelDataTypeField; import org.apache.calcite.rex.RexBuilder; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrule.java index 26b02b9cd2e..a6d9719fa23 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrule.java @@ -40,8 +40,8 @@ import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.SqlKind; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; public class ProjectPrule extends Prule { public static final RelOptRule INSTANCE = new ProjectPrule(); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/RowKeyJoinPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/RowKeyJoinPrel.java index eb9834cabd1..b42c3266511 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/RowKeyJoinPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/RowKeyJoinPrel.java @@ -36,7 +36,7 @@ import org.apache.calcite.plan.RelOptPlanner; import org.apache.calcite.plan.RelTraitSet; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class RowKeyJoinPrel extends JoinPrel implements Prel { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SetOpPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SetOpPrel.java index 70d4fc66698..a9cff0f050f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SetOpPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SetOpPrel.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.planner.physical.visitor.PrelVisitor; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import java.io.IOException; import java.util.Iterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SetOpPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SetOpPrule.java index 58614bf9e2f..9c6e513780e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SetOpPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SetOpPrule.java @@ -37,9 +37,9 @@ import org.apache.drill.exec.planner.logical.DrillIntersectRel; import org.apache.drill.exec.planner.logical.RelOptHelper; import org.apache.drill.exec.planner.physical.DrillDistributionTrait.DistributionField; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.slf4j.Logger; import java.util.Arrays; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrel.java index 3e68d7d225f..50f6260f267 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrel.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.drill.exec.planner.common.DrillSortRelBase; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.RelCollationImpl; import org.apache.calcite.rel.RelFieldCollation; import org.apache.drill.exec.ExecConstants; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrule.java index d211d329047..42d698df317 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrule.java @@ -29,8 +29,8 @@ import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelTraitSet; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; /** * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StatsAggPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StatsAggPrel.java index 3c3aeda926b..b600d0cae9f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StatsAggPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StatsAggPrel.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.planner.common.DrillRelNode; import org.apache.drill.exec.planner.physical.visitor.PrelVisitor; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public class StatsAggPrel extends SingleRel implements DrillRelNode, Prel { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StatsMergePrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StatsMergePrel.java index 5c8d4f9e206..111f85efda8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StatsMergePrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StatsMergePrel.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.planner.common.DrillRelNode; import org.apache.drill.exec.planner.physical.visitor.PrelVisitor; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import java.io.IOException; import java.util.Iterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java index 0b68014415b..cbed109d19b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java @@ -35,8 +35,8 @@ import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.util.trace.CalciteTrace; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.slf4j.Logger; public class StreamAggPrule extends AggPruleBase { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SubsetTransformer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SubsetTransformer.java index 043ce4ea6cd..c6679cc1da2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SubsetTransformer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SubsetTransformer.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.physical; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.calcite.rel.RelNode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/TopNPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/TopNPrel.java index b608e3d0b9f..bf5c76bca4f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/TopNPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/TopNPrel.java @@ -21,7 +21,7 @@ import java.math.BigDecimal; import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.RelCollations; import org.apache.calcite.rel.RelFieldCollation; import org.apache.calcite.rex.RexNode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionAllPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionAllPrel.java index 77b594e968d..460346fa118 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionAllPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionAllPrel.java @@ -35,7 +35,7 @@ import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rel.core.Union; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class UnionAllPrel extends UnionPrel { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionAllPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionAllPrule.java index 0a3cdc66492..8e094604cf1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionAllPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionAllPrule.java @@ -30,9 +30,9 @@ import org.apache.drill.exec.planner.logical.RelOptHelper; import org.apache.drill.exec.planner.physical.DrillDistributionTrait.DistributionField; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.slf4j.Logger; public class UnionAllPrule extends Prule { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionDistinctPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionDistinctPrel.java index 992950164ba..06aa1d31212 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionDistinctPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionDistinctPrel.java @@ -34,7 +34,7 @@ import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rel.core.Union; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class UnionDistinctPrel extends UnionPrel { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionDistinctPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionDistinctPrule.java index 91a10215057..2c4498e200a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionDistinctPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionDistinctPrule.java @@ -28,7 +28,7 @@ import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.util.trace.CalciteTrace; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; public class UnionDistinctPrule extends Prule { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java index 5a6cafe90b7..275dd48697a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.physical; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.FieldReference; @@ -50,7 +50,7 @@ import java.util.Iterator; import java.util.List; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkState; public class WindowPrel extends DrillWindowRelBase implements Prel { public WindowPrel(RelOptCluster cluster, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java index 0af9310572e..d41a1473b42 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java @@ -17,10 +17,10 @@ */ package org.apache.drill.exec.planner.physical; -import org.apache.drill.shaded.guava.com.google.common.base.Predicate; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import org.apache.calcite.linq4j.Ord; import org.apache.calcite.rel.RelCollations; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrule.java index 300acdefcb0..959d9c98b97 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrule.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.physical; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.apache.calcite.rel.RelCollation; import org.apache.calcite.rel.RelCollations; import org.apache.calcite.rel.RelFieldCollation; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/NumberingRelWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/NumberingRelWriter.java index 335605c140a..8c78e7c75a7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/NumberingRelWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/NumberingRelWriter.java @@ -37,7 +37,7 @@ import org.apache.drill.exec.planner.physical.UnnestPrel; import org.apache.drill.exec.planner.physical.explain.PrelSequencer.OpId; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; /** * Copied mostly from RelWriterImpl but customized to create user useful ids. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/PrelSequencer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/PrelSequencer.java index cdc93293a9b..88c705a4be2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/PrelSequencer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/PrelSequencer.java @@ -30,8 +30,8 @@ import org.apache.calcite.rel.RelWriter; import org.apache.calcite.sql.SqlExplainLevel; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; public class PrelSequencer extends BasePrelVisitor { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/AdjustOperatorsSchemaVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/AdjustOperatorsSchemaVisitor.java index f683d42e560..c46b7255a28 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/AdjustOperatorsSchemaVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/AdjustOperatorsSchemaVisitor.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeField; import org.apache.calcite.rex.RexBuilder; @@ -29,7 +29,7 @@ import org.apache.drill.exec.planner.physical.Prel; import org.apache.calcite.rel.RelNode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.planner.physical.UnnestPrel; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ExcessiveExchangeIdentifier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ExcessiveExchangeIdentifier.java index 18a34b77c63..a449900533a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ExcessiveExchangeIdentifier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ExcessiveExchangeIdentifier.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.planner.physical.HashToMergeExchangePrel; import org.apache.calcite.rel.RelNode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.planner.physical.UnnestPrel; public class ExcessiveExchangeIdentifier extends BasePrelVisitor { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/FinalColumnReorderer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/FinalColumnReorderer.java index b0debc8ef07..1ab37ed98f4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/FinalColumnReorderer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/FinalColumnReorderer.java @@ -31,7 +31,7 @@ import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexNode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class FinalColumnReorderer extends BasePrelVisitor { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/InsertLocalExchangeVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/InsertLocalExchangeVisitor.java index 899417c8dfb..ce17479d69a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/InsertLocalExchangeVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/InsertLocalExchangeVisitor.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.physical.visitor; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.planner.physical.ExchangePrel; import org.apache.drill.exec.planner.physical.PlannerSettings; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/LateralUnnestRowIDVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/LateralUnnestRowIDVisitor.java index 3cb4093f178..b9e767b6a8e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/LateralUnnestRowIDVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/LateralUnnestRowIDVisitor.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.physical.visitor; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.CorrelationId; import org.apache.calcite.rel.rules.ProjectCorrelateTransposeRule; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ProducerConsumerPrelVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ProducerConsumerPrelVisitor.java index 39fb43cb177..b46263853cd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ProducerConsumerPrelVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ProducerConsumerPrelVisitor.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.planner.physical.ScanPrel; import org.apache.calcite.rel.RelNode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class ProducerConsumerPrelVisitor extends BasePrelVisitor{ diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RelUniqifier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RelUniqifier.java index ee1e6db85e7..334a55cc974 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RelUniqifier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RelUniqifier.java @@ -23,8 +23,8 @@ import org.apache.drill.exec.planner.physical.Prel; import org.apache.calcite.rel.RelNode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; public class RelUniqifier extends BasePrelVisitor, RuntimeException>{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(RelUniqifier.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RewriteProjectToFlatten.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RewriteProjectToFlatten.java index 0b64a8cb969..cf37ccdf498 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RewriteProjectToFlatten.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RewriteProjectToFlatten.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.planner.types.RelDataTypeDrillImpl; import org.apache.drill.exec.planner.types.RelDataTypeHolder; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class RewriteProjectToFlatten extends BasePrelVisitor { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RuntimeFilterVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RuntimeFilterVisitor.java index 427044d8ee9..63a1814ae93 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RuntimeFilterVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RuntimeFilterVisitor.java @@ -41,8 +41,8 @@ import org.apache.drill.exec.work.filter.BloomFilter; import org.apache.drill.exec.work.filter.BloomFilterDef; import org.apache.drill.exec.work.filter.RuntimeFilterDef; -import org.apache.drill.shaded.guava.com.google.common.collect.HashMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SelectionVectorPrelVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SelectionVectorPrelVisitor.java index d56d3d7e3a4..9132cbda543 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SelectionVectorPrelVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SelectionVectorPrelVisitor.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; import org.apache.calcite.rel.RelNode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class SelectionVectorPrelVisitor extends BasePrelVisitor{ diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SplitUpComplexExpressions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SplitUpComplexExpressions.java index d319cb0697c..c813be2316a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SplitUpComplexExpressions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SplitUpComplexExpressions.java @@ -40,8 +40,8 @@ import org.apache.drill.exec.planner.types.RelDataTypeDrillImpl; import org.apache.drill.exec.planner.types.RelDataTypeHolder; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; public class SplitUpComplexExpressions extends BasePrelVisitor { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java index 03a72a619a8..8e4dff6e415 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java @@ -41,7 +41,7 @@ import org.apache.calcite.rex.RexUtil; import org.apache.calcite.util.Pair; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class StarColumnConverter extends BasePrelVisitor { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java index 0fe0f92b018..d88a7c59487 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.physical.visitor; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.metadata.RelMetadataQuery; import org.apache.drill.exec.planner.physical.HashJoinPrel; import org.apache.drill.exec.planner.physical.JoinPrel; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java index 12fbe3827d7..384ac0f7825 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.sql; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.calcite.sql.SqlCallBinding; import org.apache.calcite.sql.SqlOperandCountRange; import org.apache.calcite.sql.SqlOperator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillConvertletTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillConvertletTable.java index a802ec8bf19..f4dfb38e8c3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillConvertletTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillConvertletTable.java @@ -43,7 +43,7 @@ import org.apache.calcite.sql2rel.SqlRexConvertletTable; import org.apache.calcite.sql2rel.StandardConvertletTable; import org.apache.drill.exec.planner.sql.parser.DrillCalciteWrapperUtility; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; /** * Convertlet table which allows to plug-in custom rex conversion of calls to diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillOperatorTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillOperatorTable.java index 0b112eba4ec..8138c101f76 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillOperatorTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillOperatorTable.java @@ -19,9 +19,9 @@ import org.apache.calcite.sql.fun.SqlSumEmptyIsZeroAggFunction; import org.apache.calcite.sql.validate.SqlNameMatcher; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.calcite.sql.SqlAggFunction; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.fun.SqlBetweenOperator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperator.java index e75c68ce3cb..f4af9bf89cf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperator.java @@ -23,7 +23,7 @@ import org.apache.calcite.sql.type.OperandTypes; import org.apache.calcite.sql.type.SqlOperandTypeChecker; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.sql.SqlFunctionCategory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperatorWithoutInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperatorWithoutInference.java index 3a82e0422da..5850aaa8267 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperatorWithoutInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperatorWithoutInference.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.planner.sql; import org.apache.calcite.sql.type.OperandTypes; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.sql.SqlCall; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java index 96155158c90..c706f8f3733 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlWorker.java @@ -59,7 +59,7 @@ import org.apache.drill.exec.util.Pointer; import org.apache.drill.exec.work.foreman.ForemanSetupException; import org.apache.drill.exec.work.foreman.SqlUnsupportedException; -import org.apache.drill.shaded.guava.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import org.apache.hadoop.security.AccessControlException; public class DrillSqlWorker { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/ExpandingConcurrentMap.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/ExpandingConcurrentMap.java index 68be67609c7..9d495966387 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/ExpandingConcurrentMap.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/ExpandingConcurrentMap.java @@ -23,7 +23,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; /** * A special type of concurrent map which attempts to create an object before returning that it does not exist. It will also provide the same functionality on it's keyset. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SchemaUtilities.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SchemaUtilities.java index 5afbf06f2a7..00ff15b2e18 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SchemaUtilities.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SchemaUtilities.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.planner.sql; import org.apache.calcite.sql.SqlIdentifier; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Joiner; +import com.google.common.base.Strings; +import com.google.common.collect.Lists; import org.apache.calcite.schema.SchemaPlus; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.exceptions.UserException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/TypeInferenceUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/TypeInferenceUtils.java index 41a6b3bd8a1..2b4e5a38b87 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/TypeInferenceUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/TypeInferenceUtils.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.planner.sql; import org.apache.calcite.sql.fun.SqlStdOperatorTable; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.calcite.avatica.util.TimeUnit; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillCalciteCatalogReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillCalciteCatalogReader.java index 1b6434536e4..53644d4c094 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillCalciteCatalogReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillCalciteCatalogReader.java @@ -35,10 +35,10 @@ import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.planner.sql.SchemaUtilities; import org.apache.drill.exec.rpc.user.UserSession; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.collect.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillTableKey.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillTableKey.java index c6d4aa8e701..4bd83f240f5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillTableKey.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillTableKey.java @@ -23,7 +23,7 @@ import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.exec.planner.logical.DrillTable; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; +import com.google.common.cache.LoadingCache; /** * Key for storing / obtaining {@link MetadataProviderManager} instance from {@link LoadingCache}. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillViewExpander.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillViewExpander.java index 2f4f3fc2afe..d9c3c0273d8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillViewExpander.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillViewExpander.java @@ -25,7 +25,7 @@ import org.apache.calcite.schema.SchemaPlus; import org.apache.calcite.sql.SqlNode; import org.apache.drill.common.exceptions.UserException; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; +import com.google.common.base.Joiner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ComplexUnnestVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ComplexUnnestVisitor.java index 03c333a9e6c..aed9cee3b6a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ComplexUnnestVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ComplexUnnestVisitor.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.sql.handlers; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.RelShuttleImpl; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateFunctionHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateFunctionHandler.java index f304d3d9acf..0c9fd7905f0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateFunctionHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateFunctionHandler.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.sql.handlers; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.sql.SqlCharStringLiteral; import org.apache.calcite.sql.SqlNode; import org.apache.commons.io.FileUtils; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateTableHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateTableHandler.java index 689e9cc6eb3..dde067a1130 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateTableHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateTableHandler.java @@ -60,8 +60,8 @@ import org.apache.drill.exec.work.foreman.ForemanSetupException; import org.apache.drill.exec.work.foreman.SqlUnsupportedException; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; public class CreateTableHandler extends DefaultSqlHandler { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(CreateTableHandler.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java index d3d7ab9c989..6cc4d3bc4bc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java @@ -27,8 +27,8 @@ import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; import org.apache.drill.exec.util.Utilities; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; import org.apache.calcite.plan.RelOptCostImpl; import org.apache.calcite.plan.RelOptPlanner; import org.apache.calcite.plan.RelOptRule; @@ -108,9 +108,9 @@ import org.apache.drill.exec.work.foreman.SqlUnsupportedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; public class DefaultSqlHandler extends AbstractSqlHandler { private static final Logger logger = LoggerFactory.getLogger(DefaultSqlHandler.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeSchemaHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeSchemaHandler.java index 515d130c911..cfd45856bff 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeSchemaHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeSchemaHandler.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.drill.common.util.JacksonUtils; import org.apache.drill.exec.store.SchemaFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; +import com.google.common.base.Joiner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.calcite.schema.SchemaPlus; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DrillTableInfo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DrillTableInfo.java index 924e536d0d1..da1bce6b9c9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DrillTableInfo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DrillTableInfo.java @@ -33,7 +33,7 @@ import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.planner.sql.SchemaUtilities; import org.apache.drill.exec.store.AbstractSchema; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DropFunctionHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DropFunctionHandler.java index 7b0fad6e15f..72a56c6c92c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DropFunctionHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DropFunctionHandler.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.sql.handlers; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.sql.SqlCharStringLiteral; import org.apache.calcite.sql.SqlNode; import org.apache.drill.common.exceptions.DrillRuntimeException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ExplainHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ExplainHandler.java index 49aa26e78b8..0bfcd2639b2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ExplainHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ExplainHandler.java @@ -41,7 +41,7 @@ import org.apache.drill.exec.planner.sql.DirectPlan; import org.apache.drill.exec.util.Pointer; import org.apache.drill.exec.work.foreman.ForemanSetupException; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/FindLimit0Visitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/FindLimit0Visitor.java index 362993eb0f5..474fc1de11f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/FindLimit0Visitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/FindLimit0Visitor.java @@ -18,8 +18,8 @@ package org.apache.drill.exec.planner.sql.handlers; import org.apache.drill.exec.planner.common.DrillSetOpRel; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/MetastoreAnalyzeTableHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/MetastoreAnalyzeTableHandler.java index cadc26b7f95..b92b4eabaa6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/MetastoreAnalyzeTableHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/MetastoreAnalyzeTableHandler.java @@ -68,8 +68,8 @@ import org.apache.drill.metastore.metadata.MetadataInfo; import org.apache.drill.metastore.metadata.MetadataType; import org.apache.drill.metastore.metadata.TableInfo; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SchemaHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SchemaHandler.java index cee6c11bacc..364cc912157 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SchemaHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SchemaHandler.java @@ -42,7 +42,7 @@ import org.apache.drill.exec.store.StorageStrategy; import org.apache.drill.exec.store.dfs.WorkspaceSchemaFactory; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerUtil.java index 9773f37c5ad..d0e6a872c49 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerUtil.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.sql.handlers; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.calcite.rel.type.RelDataTypeField; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java index 2d006d38c9b..d8e6ba87da5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/CompoundIdentifierConverter.java @@ -30,7 +30,7 @@ import org.apache.calcite.sql.util.SqlShuttle; import org.apache.calcite.sql.util.SqlVisitor; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; /** * Implementation of {@link SqlVisitor} that converts bracketed compound {@link SqlIdentifier} diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCompoundIdentifier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCompoundIdentifier.java index 7da5d7297eb..3647ee31cef 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCompoundIdentifier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCompoundIdentifier.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.base.Function; +import com.google.common.base.Function; import org.apache.calcite.sql.SqlBasicCall; import org.apache.calcite.sql.SqlIdentifier; import org.apache.calcite.sql.SqlLiteral; @@ -28,8 +28,8 @@ import org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; public class DrillCompoundIdentifier extends SqlIdentifier { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlAnalyzeTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlAnalyzeTable.java index a3837033f3d..722afc63c33 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlAnalyzeTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlAnalyzeTable.java @@ -34,9 +34,9 @@ import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; import org.apache.drill.exec.util.Pointer; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; /** * SQL tree for ANALYZE statement. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateFunction.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateFunction.java index 88618879223..59abbb6dc2b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateFunction.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateFunction.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.sql.parser; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.sql.SqlCall; import org.apache.calcite.sql.SqlKind; import org.apache.calcite.sql.SqlLiteral; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateTable.java index 047b10730fc..1db03ea0b7b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateTable.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.drill.exec.planner.sql.SchemaUtilities; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.CreateTableHandler; @@ -36,7 +36,7 @@ import org.apache.calcite.sql.SqlWriter; import org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerUtil; import org.apache.drill.exec.util.Pointer; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java index 68e146d94c1..f1f231840c8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.planner.sql.parser; import org.apache.drill.exec.planner.sql.SchemaUtilities; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerUtil; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropFunction.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropFunction.java index 94839f30c90..8de08bfc68e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropFunction.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropFunction.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.sql.parser; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.sql.SqlCall; import org.apache.calcite.sql.SqlKind; import org.apache.calcite.sql.SqlLiteral; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropTable.java index 0ca518f1264..342f3e18db7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropTable.java @@ -33,7 +33,7 @@ import org.apache.calcite.sql.SqlWriter; import org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public class SqlDropTable extends DrillSqlCall { public static final SqlSpecialOperator OPERATOR = new SqlSpecialOperator("DROP_TABLE", SqlKind.DROP_TABLE) { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java index dc15cc41e87..38df9a6054b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java @@ -33,7 +33,7 @@ import org.apache.calcite.sql.SqlWriter; import org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public class SqlDropView extends DrillSqlCall { public static final SqlSpecialOperator OPERATOR = new SqlSpecialOperator("DROP_VIEW", SqlKind.DROP_VIEW) { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlRefreshMetadata.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlRefreshMetadata.java index 91df7cdba24..97d7a5f7d19 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlRefreshMetadata.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlRefreshMetadata.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.planner.sql.handlers.RefreshMetadataHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Sql parse tree node to represent statement: diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java index 8396f73afd0..dff4d7648ed 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java @@ -31,7 +31,7 @@ import org.apache.calcite.sql.SqlWriter; import org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Sql parse tree node to represent statement: diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java index 8a08a638db0..7deb5868e5d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.planner.sql.parser; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.planner.sql.handlers.AbstractSqlHandler; import org.apache.drill.exec.planner.sql.handlers.ShowTablesHandler; import org.apache.drill.exec.planner.sql.handlers.SqlHandlerConfig; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java index 8beefb73628..f433308ac24 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java @@ -43,7 +43,7 @@ import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class UnsupportedOperatorsVisitor extends SqlShuttle { private QueryContext context; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillSqlParseException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillSqlParseException.java index b55afedba47..b99f5dc3457 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillSqlParseException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillSqlParseException.java @@ -21,7 +21,7 @@ import org.apache.calcite.sql.parser.SqlParserPos; import org.apache.commons.lang3.StringUtils; import org.apache.drill.exec.planner.sql.parser.DrillParserUtil; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Customized {@link SqlParseException} class diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/AbstractRelDataTypeHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/AbstractRelDataTypeHolder.java index 3cfb204a1d3..3eea5399794 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/AbstractRelDataTypeHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/AbstractRelDataTypeHolder.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.types; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.rel.type.RelDataTypeField; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractTableFunctionRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractTableFunctionRecordBatch.java index 8341b95cccd..7cfc8678d94 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractTableFunctionRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractTableFunctionRecordBatch.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.record; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.exception.OutOfMemoryException; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.base.LateralContract; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/BatchSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/BatchSchema.java index fcffeea8aad..5a3b8b6b1f2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/BatchSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/BatchSchema.java @@ -21,8 +21,8 @@ import java.util.Iterator; import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import org.apache.drill.common.types.TypeProtos.MajorType; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/HyperVectorWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/HyperVectorWrapper.java index 86fa0bf2252..50b6b42fa05 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/HyperVectorWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/HyperVectorWrapper.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.vector.complex.AbstractMapVector; import org.apache.drill.exec.vector.complex.FieldIdUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.lang.reflect.Array; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java index c0209321a35..fcdb2436aad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java @@ -40,7 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java index 29f4fc8f77f..fbd38ae0f94 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.record; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.vector.UInt4Vector; import org.apache.drill.exec.vector.ValueVector; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java index 70f874dfab5..cf652b18718 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java @@ -42,7 +42,7 @@ import org.apache.drill.exec.vector.complex.RepeatedValueVector; import org.apache.drill.exec.vector.VariableWidthVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.drill.exec.vector.complex.RepeatedVariableWidthVectorLike; import org.bouncycastle.util.Strings; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordIterator.java index 6d4e74575fe..6bbbeca823c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordIterator.java @@ -25,8 +25,8 @@ import org.apache.drill.exec.physical.impl.sort.RecordBatchData; import org.apache.drill.exec.record.RecordBatch.IterOutcome; -import org.apache.drill.shaded.guava.com.google.common.collect.Range; -import org.apache.drill.shaded.guava.com.google.common.collect.TreeRangeMap; +import com.google.common.collect.Range; +import com.google.common.collect.TreeRangeMap; import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.record.selection.SelectionVector4; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaBuilder.java index dc06e08fbf3..701ec8d039e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaBuilder.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.proto.UserBitShared.SerializedField; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * A reusable builder that supports the creation of BatchSchemas. Can have a supporting expected object. If the expected Schema object is defined, the diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaUtil.java index c68170f080b..da395034eae 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaUtil.java @@ -39,10 +39,10 @@ import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.complex.UnionVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; /** * Utility class for dealing with changing schemas diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleVectorWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleVectorWrapper.java index efd2d0bd971..8287ac938db 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleVectorWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleVectorWrapper.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.vector.complex.AbstractMapVector; import org.apache.drill.exec.vector.complex.FieldIdUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class SimpleVectorWrapper implements VectorWrapper{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SimpleVectorWrapper.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/TypedFieldId.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/TypedFieldId.java index e5a22ff749f..05eebd04429 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/TypedFieldId.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/TypedFieldId.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.vector.ValueVector; import com.carrotsearch.hppc.IntArrayList; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Declares a value vector field, providing metadata about the field. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorContainer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorContainer.java index 551971b5924..a81344981ab 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorContainer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorContainer.java @@ -33,10 +33,10 @@ import org.apache.drill.exec.vector.AllocationHelper; import org.apache.drill.exec.vector.SchemaChangeCallBack; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; public class VectorContainer implements VectorAccessible { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorInitializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorInitializer.java index 9dc15c1a7f5..8e726d6edbf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorInitializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorInitializer.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.vector.complex.AbstractRepeatedMapVector; import org.apache.drill.common.map.CaseInsensitiveMap; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Prototype mechanism to allocate vectors based on expected diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/WritableBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/WritableBatch.java index 1b30d78cde7..7e29e8c1707 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/WritableBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/WritableBatch.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * A specialized version of record batch that can moves out buffers and preps diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/selection/SelectionVector4Builder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/selection/SelectionVector4Builder.java index d46795e53ac..3f1de330ea1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/selection/SelectionVector4Builder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/selection/SelectionVector4Builder.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.record.BatchSchema; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class SelectionVector4Builder { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SelectionVector4Builder.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ExactFunctionResolver.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ExactFunctionResolver.java index 478aeee18c1..90d73b3bb31 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ExactFunctionResolver.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ExactFunctionResolver.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.resolver; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.expression.FunctionCall; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.types.TypeProtos; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ResolverTypePrecedence.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ResolverTypePrecedence.java index bb7c256c6a3..8111ba2acfe 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ResolverTypePrecedence.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ResolverTypePrecedence.java @@ -24,8 +24,8 @@ import java.util.TreeSet; import org.apache.drill.common.types.TypeProtos.MinorType; -import org.apache.drill.shaded.guava.com.google.common.graph.ImmutableValueGraph; -import org.apache.drill.shaded.guava.com.google.common.graph.ValueGraphBuilder; +import com.google.common.graph.ImmutableValueGraph; +import com.google.common.graph.ValueGraphBuilder; public class ResolverTypePrecedence { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/TypeCastRules.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/TypeCastRules.java index 1f82592fba3..d2c864683af 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/TypeCastRules.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/TypeCastRules.java @@ -32,8 +32,8 @@ import org.apache.drill.exec.expr.annotations.FunctionTemplate.NullHandling; import org.apache.drill.exec.expr.fn.DrillFuncHolder; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import static org.apache.drill.exec.planner.types.DrillRelDataTypeSystem.DRILL_REL_DATATYPE_SYSTEM; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/QueueAssignmentResult.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/QueueAssignmentResult.java index 5de2e34fe01..34d8e659561 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/QueueAssignmentResult.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/QueueAssignmentResult.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.resourcemgr.config; import org.apache.drill.exec.ops.QueryContext; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/ResourcePoolImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/ResourcePoolImpl.java index 79cf6c82ff1..08ac12d9cb3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/ResourcePoolImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/ResourcePoolImpl.java @@ -24,8 +24,8 @@ import org.apache.drill.exec.resourcemgr.config.selectors.DefaultSelector; import org.apache.drill.exec.resourcemgr.config.selectors.ResourcePoolSelector; import org.apache.drill.exec.resourcemgr.config.selectors.ResourcePoolSelectorFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import java.util.List; import java.util.Map; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/ResourcePoolTreeImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/ResourcePoolTreeImpl.java index 91b81f79606..bde33cc189f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/ResourcePoolTreeImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/ResourcePoolTreeImpl.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.resourcemgr.config.selectionpolicy.QueueSelectionPolicy; import org.apache.drill.exec.resourcemgr.config.selectionpolicy.QueueSelectionPolicy.SelectionPolicy; import org.apache.drill.exec.resourcemgr.config.selectionpolicy.QueueSelectionPolicyFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import java.util.List; import java.util.Map; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/AclSelector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/AclSelector.java index 9c6d7c540e4..304eae54140 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/AclSelector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/AclSelector.java @@ -17,12 +17,12 @@ */ package org.apache.drill.exec.resourcemgr.config.selectors; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import com.typesafe.config.Config; import org.apache.drill.exec.ops.QueryContext; import org.apache.drill.exec.resourcemgr.config.exception.RMConfigException; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.hadoop.security.UserGroupInformation; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/NotEqualSelector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/NotEqualSelector.java index bb6da022861..37357195522 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/NotEqualSelector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resourcemgr/config/selectors/NotEqualSelector.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.resourcemgr.config.selectors; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import com.typesafe.config.Config; import org.apache.drill.exec.ops.QueryContext; import org.apache.drill.exec.resourcemgr.config.exception.RMConfigException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractClientConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractClientConnection.java index 77fb37b693c..4e891c73171 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractClientConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractClientConnection.java @@ -23,7 +23,7 @@ import javax.security.sasl.SaslClient; import javax.security.sasl.SaslException; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkState; public abstract class AbstractClientConnection extends AbstractRemoteConnection implements ClientConnection { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractClientConnection.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractDisposableUserClientConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractDisposableUserClientConnection.java index 0fd286220c7..f96e88ae9d1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractDisposableUserClientConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractDisposableUserClientConnection.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.rpc; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.drill.exec.proto.GeneralRPCProtos.Ack; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractServerConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractServerConnection.java index bbf94fc91f0..00a3c64be40 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractServerConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractServerConnection.java @@ -29,8 +29,8 @@ import javax.security.sasl.SaslServer; import java.io.IOException; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; public abstract class AbstractServerConnection> extends AbstractRemoteConnection diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitRpcUtility.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitRpcUtility.java index 58bdd9bbfc1..a1ccf1f44f5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitRpcUtility.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitRpcUtility.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.rpc; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import com.google.protobuf.Internal.EnumLite; import com.google.protobuf.MessageLite; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ConnectionManagerRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ConnectionManagerRegistry.java index 0a69c338cb4..e27729c1f4e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ConnectionManagerRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ConnectionManagerRegistry.java @@ -22,7 +22,7 @@ import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.exec.rpc.BitRpcUtility; public class ConnectionManagerRegistry implements Iterable { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnection.java index 897c9418949..7f414b5300d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnection.java @@ -38,7 +38,7 @@ import javax.security.sasl.SaslException; import java.util.UUID; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkState; public class ControlConnection extends AbstractServerConnection implements ClientConnection { private static final Logger logger = org.slf4j.LoggerFactory.getLogger(ControlConnection.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnectionConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnectionConfig.java index 03992d774d2..f114af44def 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnectionConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnectionConfig.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.rpc.control; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.drill.exec.exception.DrillbitStartupException; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.rpc.BitConnectionConfig; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControllerImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControllerImpl.java index d6a8108b920..21b850cc979 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControllerImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControllerImpl.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.server.BootStrapContext; import org.apache.drill.exec.work.batch.ControlMessageHandler; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import com.google.protobuf.Message; import com.google.protobuf.MessageLite; import com.google.protobuf.Parser; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java index fd86c17eb30..04ff9a0c270 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.rpc.control.Controller.CustomResponse; import com.carrotsearch.hppc.IntObjectHashMap; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.google.protobuf.ByteString; public class CustomHandlerRegistry { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java index a05ceb0c637..1df08935c58 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.work.foreman.ForemanSetupException; import org.apache.drill.exec.work.fragment.FragmentManager; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; public class WorkEventBus { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(WorkEventBus.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/AckSender.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/AckSender.java index 70251be2a32..9b655e96e57 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/AckSender.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/AckSender.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.rpc.Response; import org.apache.drill.exec.rpc.ResponseSender; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Utility class that allows a group of receivers to confirm reception of a record batch as a single unit. Response diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java index 995535dd328..8eeb01d3948 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.server.BootStrapContext; import org.apache.drill.exec.work.WorkManager.WorkerBee; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; /** * Manages a connection for each endpoint. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/IncomingDataBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/IncomingDataBatch.java index 71bed0240e0..e19ca8298a4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/IncomingDataBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/IncomingDataBatch.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.proto.BitData.FragmentRecordBatch; import org.apache.drill.exec.record.RawFragmentBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * An incoming batch of data. The data is held by the original allocator. Any use of the associated data must be diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthStringUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthStringUtil.java index 327c5022701..698ba9a51e7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthStringUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthStringUtil.java @@ -17,9 +17,9 @@ */ package org.apache.drill.exec.rpc.security; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Function; +import com.google.common.collect.Iterators; +import com.google.common.collect.Sets; import javax.annotation.Nullable; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthenticatorProviderImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthenticatorProviderImpl.java index 178a185ead1..ac97c1cea27 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthenticatorProviderImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthenticatorProviderImpl.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.rpc.security; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.AutoCloseables; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.map.CaseInsensitiveMap; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslClientFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslClientFactory.java index ea95040cd05..3a45b640e82 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslClientFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslClientFactory.java @@ -17,9 +17,9 @@ */ package org.apache.drill.exec.rpc.security; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import javax.security.auth.callback.CallbackHandler; import javax.security.sasl.Sasl; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslServerFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslServerFactory.java index 2139e7d0713..3a499348d1f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslServerFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslServerFactory.java @@ -17,9 +17,9 @@ */ package org.apache.drill.exec.rpc.security; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import javax.security.auth.callback.CallbackHandler; import javax.security.sasl.Sasl; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/SecurityConfiguration.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/SecurityConfiguration.java index 0c6e3112ed3..fb1bb7c15e4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/SecurityConfiguration.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/SecurityConfiguration.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.rpc.security; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ServerAuthenticationHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ServerAuthenticationHandler.java index 11fed40a9e4..42e3d15c02f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ServerAuthenticationHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ServerAuthenticationHandler.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.rpc.security; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import com.google.protobuf.ByteString; import com.google.protobuf.Internal.EnumLite; import com.google.protobuf.InvalidProtocolBufferException; @@ -42,7 +42,7 @@ import java.util.EnumMap; import java.util.Map; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; /** * Handles SASL exchange, on the server-side. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/BlockingResultsListener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/BlockingResultsListener.java index 976904b3237..6813c228904 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/BlockingResultsListener.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/BlockingResultsListener.java @@ -21,8 +21,8 @@ import org.apache.drill.exec.proto.UserBitShared; import org.apache.drill.exec.proto.helper.QueryIdHelper; import org.apache.drill.exec.rpc.ConnectionThrottle; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Queues; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Queues; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/InboundImpersonationManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/InboundImpersonationManager.java index 69acf7823c4..dd32cbe2540 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/InboundImpersonationManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/InboundImpersonationManager.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.drill.common.util.JacksonUtils; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Sets; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.ExecConstants; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryResultHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryResultHandler.java index 063b840c37f..461d4273021 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryResultHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryResultHandler.java @@ -41,8 +41,8 @@ import org.apache.drill.exec.rpc.RpcException; import org.apache.drill.exec.rpc.RpcOutcomeListener; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Queues; +import com.google.common.collect.Maps; +import com.google.common.collect.Queues; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserClient.java index 48c61e160c9..3f12a1e1d6d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserClient.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserClient.java @@ -19,11 +19,11 @@ import org.apache.drill.common.concurrent.AbstractCheckedFuture; import org.apache.drill.common.concurrent.CheckedFuture; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; -import org.apache.drill.shaded.guava.com.google.common.base.Throwables; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.SettableFuture; +import com.google.common.base.Strings; +import com.google.common.base.Throwables; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; +import com.google.common.util.concurrent.SettableFuture; import com.google.protobuf.MessageLite; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelPipeline; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcConfig.java index ec334e1e4f6..4f4ed264f0b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcConfig.java @@ -47,8 +47,8 @@ import org.apache.drill.exec.proto.UserProtos.UserToBitHandshake; import org.apache.drill.exec.rpc.RpcConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; public class UserRpcConfig { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(UserRpcConfig.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcUtils.java index b169d2d4ff0..43e1c7f6f39 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcUtils.java @@ -23,7 +23,7 @@ import org.apache.drill.common.util.DrillVersionInfo; import org.apache.drill.exec.proto.UserProtos.RpcEndpointInfos; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Utility class for User RPC diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserSession.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserSession.java index 1179ea6da09..fc632df06d9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserSession.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserSession.java @@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.drill.exec.ExecConstants; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import org.apache.calcite.schema.Schema; import org.apache.calcite.schema.SchemaPlus; @@ -42,7 +42,7 @@ import org.apache.drill.exec.server.options.OptionManager; import org.apache.drill.exec.server.options.SessionOptionManager; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.exec.store.AbstractSchema; import org.apache.drill.exec.store.StorageStrategy; import org.apache.drill.exec.store.dfs.DrillFileSystem; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorFactory.java index c7f56ff4cbe..8d34d86dde8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorFactory.java @@ -26,7 +26,7 @@ import org.apache.drill.common.scanner.persistence.ScanResult; import org.apache.drill.exec.exception.DrillbitStartupException; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; /** * Factory class which provides {@link UserAuthenticator} implementation based on the BOOT options. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DataRecord.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DataRecord.java index b21aa7129ef..5e6f7eb4570 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DataRecord.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DataRecord.java @@ -20,9 +20,9 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; public class DataRecord { private final Map dataMap; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DiffSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DiffSchema.java index 799b0c38cd3..3fbb1007609 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DiffSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DiffSchema.java @@ -19,7 +19,7 @@ import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class DiffSchema { List addedFields; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Field.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Field.java index eee235cef27..602bbd775f5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Field.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Field.java @@ -19,8 +19,8 @@ import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.shaded.guava.com.google.common.base.MoreObjects; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.MoreObjects; +import com.google.common.base.Strings; import java.util.Objects; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ListSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ListSchema.java index a7676412093..a45a17d90a5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ListSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ListSchema.java @@ -17,16 +17,16 @@ */ package org.apache.drill.exec.schema; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkArgument; import java.util.List; import java.util.Objects; import org.apache.drill.common.types.TypeProtos.DataMode; -import org.apache.drill.shaded.guava.com.google.common.base.Predicate; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; public class ListSchema implements RecordSchema { private List fields; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/NamedField.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/NamedField.java index ad8a7fe6d8f..b37b53b1ad2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/NamedField.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/NamedField.java @@ -20,7 +20,7 @@ import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.exec.schema.json.jackson.JacksonHelper; -import org.apache.drill.shaded.guava.com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects; public class NamedField extends Field { final MajorType keyType; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ObjectSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ObjectSchema.java index 8ab4454a391..3d9d058b819 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ObjectSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ObjectSchema.java @@ -20,10 +20,10 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.base.Predicate; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; public class ObjectSchema implements RecordSchema { private final Map fields; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/OrderedField.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/OrderedField.java index 1d1865ce6e4..bd9cb9faead 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/OrderedField.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/OrderedField.java @@ -19,7 +19,7 @@ import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.shaded.guava.com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects; public class OrderedField extends Field { private final int index; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/JacksonSerializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/JacksonSerializer.java index 99ccbe6288f..675311c1c6b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/JacksonSerializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/JacksonSerializer.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.ObjectWriter; import org.apache.drill.common.util.JacksonUtils; -import org.apache.drill.shaded.guava.com.google.common.base.Objects; +import com.google.common.base.Objects; public class JacksonSerializer implements InstanceSerializer { private static final ObjectMapper DEFAULT_MAPPER = JacksonUtils.createObjectMapper(); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/ProtoSerializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/ProtoSerializer.java index 0124292058d..157f4113a0f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/ProtoSerializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/ProtoSerializer.java @@ -22,8 +22,8 @@ import io.protostuff.JsonIOUtil; import io.protostuff.Schema; -import org.apache.drill.shaded.guava.com.google.common.base.Objects; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Objects; +import com.google.common.base.Preconditions; import com.google.protobuf.Message; public class ProtoSerializer implements InstanceSerializer { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/Drillbit.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/Drillbit.java index ad68a60a6aa..cb78340f7e4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/Drillbit.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/Drillbit.java @@ -50,8 +50,8 @@ import org.apache.drill.common.util.GuavaPatcher; import org.apache.drill.common.util.ProtobufPatcher; import org.apache.drill.exec.work.WorkManager; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Stopwatch; import org.apache.zookeeper.Environment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java index 64d6e392776..7daa5d26959 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java @@ -55,7 +55,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; public class DrillbitContext implements AutoCloseable { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FallbackOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FallbackOptionManager.java index be90f44812d..259eeb7c9a4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FallbackOptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FallbackOptionManager.java @@ -19,7 +19,7 @@ import java.util.Iterator; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; +import com.google.common.collect.Iterables; /** * An {@link OptionManager} which allows for falling back onto another diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FragmentOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FragmentOptionManager.java index 478cb1e7e97..501e2b58c1f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FragmentOptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FragmentOptionManager.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.server.options; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.common.map.CaseInsensitiveMap; import java.util.Map; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionDefinition.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionDefinition.java index b306447770e..4e992701298 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionDefinition.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionDefinition.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.server.options; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * This holds all the information about an option. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java index b00cfce13b6..8be05d0ce0e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.drill.common.exceptions.UserException; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/PersistedOptionValue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/PersistedOptionValue.java index 6a35f19967f..f101c32a80a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/PersistedOptionValue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/PersistedOptionValue.java @@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import org.apache.drill.common.util.JacksonUtils; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java index d719567bee6..bb37186e22b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java @@ -24,8 +24,8 @@ import org.apache.drill.common.map.CaseInsensitiveMap; import org.apache.drill.exec.rpc.user.UserSession; -import org.apache.drill.shaded.guava.com.google.common.base.Predicate; -import org.apache.drill.shaded.guava.com.google.common.collect.Collections2; +import com.google.common.base.Predicate; +import com.google.common.collect.Collections2; /** * {@link OptionManager} that holds options within {@link org.apache.drill.exec.rpc.user.UserSession} context. Options diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java index 659b3d3c073..707cec90b63 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java @@ -30,8 +30,8 @@ import org.apache.drill.exec.store.sys.PersistentStoreProvider; import org.apache.drill.exec.store.sys.store.provider.InMemoryStoreProvider; import org.apache.drill.exec.util.AssertionUtil; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/TypeValidators.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/TypeValidators.java index 88dc115ab28..cf57fdbc39b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/TypeValidators.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/TypeValidators.java @@ -20,8 +20,8 @@ import java.time.format.DateTimeFormatter; import java.util.Set; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Joiner; +import com.google.common.collect.Sets; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.util.DrillStringUtils; import org.apache.drill.exec.ExecConstants; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRestServer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRestServer.java index cbe7128b938..54e3244dcec 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRestServer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRestServer.java @@ -26,7 +26,7 @@ import io.swagger.v3.oas.annotations.info.Info; import io.swagger.v3.oas.annotations.info.License; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import freemarker.cache.ClassTemplateLoader; import freemarker.cache.FileTemplateLoader; import freemarker.cache.MultiTemplateLoader; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java index 3815e59d6da..6cdba717c20 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java @@ -38,9 +38,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Joiner; +import com.google.common.base.Strings; +import com.google.common.collect.Sets; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogInLogOutResources.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogInLogOutResources.java index 31050128817..1392a16730f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogInLogOutResources.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogInLogOutResources.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.server.rest.auth.AuthDynamicFeature; import org.apache.drill.exec.server.rest.auth.DrillHttpSecurityHandlerProvider; import org.apache.drill.exec.work.WorkManager; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.eclipse.jetty.security.authentication.FormAuthenticator; import org.eclipse.jetty.security.authentication.SessionAuthentication; import org.eclipse.jetty.util.security.Constraint; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java index e4661d34fae..ff77563ff3b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.work.WorkManager; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryResources.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryResources.java index fa1fc54316a..1c4b2c53ccb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryResources.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryResources.java @@ -19,9 +19,9 @@ import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.server.rest.DrillRestServer.UserAuthEnabled; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java index be4c3318c7a..6d765222ea9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java @@ -23,8 +23,8 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.exec.proto.UserBitShared.QueryType; -import org.apache.drill.shaded.guava.com.google.common.base.CharMatcher; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.CharMatcher; +import com.google.common.base.Preconditions; import org.apache.parquet.Strings; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ViewableWithPermissions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ViewableWithPermissions.java index e678a7cf3a8..77c8e20411b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ViewableWithPermissions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ViewableWithPermissions.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.server.rest; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.drill.exec.server.rest.auth.AuthDynamicFeature; import org.apache.drill.exec.server.rest.auth.DrillUserPrincipal; import org.glassfish.jersey.server.mvc.Viewable; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebUserConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebUserConnection.java index 5e5f57e88f4..006108c57e6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebUserConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebUserConnection.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.server.rest; import org.apache.drill.exec.util.ValueVectorElementFormatter; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.drill.common.types.TypeProtos; import org.apache.drill.exec.physical.impl.materialize.QueryDataPackage; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpConstraintSecurityHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpConstraintSecurityHandler.java index 1807b7b37fa..6446e53c79a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpConstraintSecurityHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpConstraintSecurityHandler.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.server.rest.auth; import org.apache.drill.exec.rpc.security.plain.PlainFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.drill.common.exceptions.DrillException; import org.apache.drill.exec.server.DrillbitContext; import org.eclipse.jetty.security.ConstraintMapping; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpSecurityHandlerProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpSecurityHandlerProvider.java index fb10ac11c53..d87af4b3f92 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpSecurityHandlerProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpSecurityHandlerProvider.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.server.rest.auth; import org.apache.drill.exec.server.rest.header.ResponseHeadersSettingFilter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.exceptions.DrillException; import org.apache.drill.common.map.CaseInsensitiveMap; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillUserPrincipal.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillUserPrincipal.java index 815ada36c65..65484add78b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillUserPrincipal.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillUserPrincipal.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.server.rest.auth; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.eclipse.jetty.security.AbstractLoginService.RolePrincipal; import java.security.Principal; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Filters.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Filters.java index a5eeb0f6e91..ac0d53960ec 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Filters.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Filters.java @@ -19,8 +19,8 @@ import org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile; -import org.apache.drill.shaded.guava.com.google.common.base.Predicate; -import org.apache.drill.shaded.guava.com.google.common.base.Predicates; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; interface Filters { final static Predicate hasOperators = new Predicate() { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/FragmentWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/FragmentWrapper.java index aead9e0a435..a44fc515f66 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/FragmentWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/FragmentWrapper.java @@ -30,8 +30,8 @@ import org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile; import org.apache.drill.exec.proto.UserBitShared.OperatorProfile; import org.apache.drill.exec.proto.UserBitShared.StreamProfile; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Collections2; +import com.google.common.base.Preconditions; +import com.google.common.collect.Collections2; /** * Wrapper class for a major fragment profile. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java index 0e93d4310f9..5efce70738c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java @@ -36,7 +36,7 @@ import org.apache.drill.exec.proto.UserBitShared.MetricValue; import org.apache.drill.exec.proto.UserBitShared.OperatorProfile; import org.apache.drill.exec.proto.UserBitShared.StreamProfile; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Wrapper class for profiles of ALL operator instances of the same operator type within a major fragment. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileResources.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileResources.java index 95c4d8b3d91..692b72bf60b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileResources.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileResources.java @@ -66,10 +66,10 @@ import org.glassfish.jersey.server.mvc.Viewable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.cache.Cache; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; +import com.google.common.base.Joiner; +import com.google.common.collect.Lists; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import static org.owasp.encoder.Encode.forHtml; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileWrapper.java index 8576d2f3f0e..d942a6772cb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/ProfileWrapper.java @@ -42,7 +42,7 @@ import org.apache.drill.exec.server.options.OptionValue; import org.apache.drill.exec.server.rest.WebServer; import org.apache.drill.exec.server.rest.WebUtils; -import org.apache.drill.shaded.guava.com.google.common.base.CaseFormat; +import com.google.common.base.CaseFormat; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java b/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java index 06daf6a653d..ae06569751b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java @@ -44,7 +44,7 @@ import org.apache.drill.exec.server.BootStrapContext; import org.apache.drill.exec.work.WorkManager; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; public class ServiceEngine implements AutoCloseable { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ServiceEngine.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java index e3a1ca65162..8d3e7e2fa01 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.ssl; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslProvider; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractRecordReader.java index 324c2877fe2..16514d257c5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractRecordReader.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.drill.common.expression.PathSegment; @@ -31,7 +31,7 @@ import org.apache.drill.exec.util.Utilities; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public abstract class AbstractRecordReader implements RecordReader { private static final Logger logger = LoggerFactory.getLogger(AbstractRecordReader.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java index b8d68537b11..0812d9c1b7c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java @@ -36,7 +36,7 @@ import org.apache.drill.exec.store.table.function.TableParamDef; import org.apache.drill.exec.store.table.function.TableSignature; import org.apache.drill.exec.store.table.function.WithOptionsTableMacro; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.calcite.linq4j.tree.DefaultExpression; @@ -51,7 +51,7 @@ import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.dotdrill.View; import org.apache.drill.exec.planner.logical.CreateTableEntry; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; +import com.google.common.base.Joiner; public abstract class AbstractSchema implements Schema, SchemaPartitionExplorer, AutoCloseable { static final Logger logger = LoggerFactory.getLogger(AbstractSchema.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java index d842d8e1e24..a942d6cc4df 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java @@ -32,7 +32,7 @@ import org.apache.hadoop.util.Progressable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Resources; public class ClassPathFileSystem extends FileSystem { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassicConnectorLocator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassicConnectorLocator.java index 8d99d1e770e..e29b4967bb3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassicConnectorLocator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassicConnectorLocator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; import java.io.IOException; import java.lang.reflect.Constructor; @@ -35,8 +35,8 @@ import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.planner.logical.StoragePlugins; import org.apache.drill.exec.server.DrillbitContext; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Joiner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ColumnExplorer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ColumnExplorer.java index 8fe4ebd9452..06764b55d49 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ColumnExplorer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ColumnExplorer.java @@ -40,8 +40,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.collect.Lists; +import com.google.common.io.Files; public class ColumnExplorer { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ConnectorHandle.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ConnectorHandle.java index 63db41538d1..83872f57761 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ConnectorHandle.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ConnectorHandle.java @@ -19,7 +19,7 @@ import org.apache.drill.common.logical.StoragePluginConfig; import org.apache.drill.exec.store.PluginHandle.PluginType; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginBootstrapLoaderImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginBootstrapLoaderImpl.java index 8f27869cbc4..8d01650bf18 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginBootstrapLoaderImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginBootstrapLoaderImpl.java @@ -36,9 +36,9 @@ import org.apache.drill.exec.planner.logical.StoragePlugins; import org.apache.drill.exec.store.dfs.FileSystemConfig; import org.apache.drill.exec.util.ActionOnFile; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Charsets; +import com.google.common.io.Resources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginHandle.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginHandle.java index 6ea1a980371..6e01ebf6cd8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginHandle.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginHandle.java @@ -19,7 +19,7 @@ import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.logical.StoragePluginConfig; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ResourceInputStream.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ResourceInputStream.java index 6e3f44ca82c..a81c81ff84b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ResourceInputStream.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ResourceInputStream.java @@ -25,7 +25,7 @@ import org.apache.hadoop.fs.Seekable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class ResourceInputStream extends ByteArrayInputStream implements Seekable, PositionedReadable { static final Logger logger = LoggerFactory.getLogger(ResourceInputStream.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaConfig.java index 71b93044184..79b08160694 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaConfig.java @@ -22,8 +22,8 @@ import org.apache.drill.exec.proto.UserBitShared.UserCredentials; import org.apache.drill.exec.server.options.OptionValue; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; /** * Contains information needed by diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaTreeProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaTreeProvider.java index 5c698ec74b5..05efc67b54e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaTreeProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaTreeProvider.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.store.SchemaConfig.SchemaConfigInfoProvider; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePlugin.java index 9a51ddcb7c8..b3bf92813c9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePlugin.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.exec.server.options.SessionOptionManager; import org.apache.drill.exec.store.dfs.FormatPlugin; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; /** Interface for all implementations of the storage plugins. Different implementations of the storage * formats will implement methods that indicate if Drill can write or read its tables from that format, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginMap.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginMap.java index 9968a0b8c07..86a732bc315 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginMap.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginMap.java @@ -26,7 +26,7 @@ import org.apache.drill.common.logical.StoragePluginConfig; import org.apache.drill.common.map.CaseInsensitiveMap; import org.apache.drill.exec.store.StoragePluginRegistry.PluginException; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Holds maps to storage plugins. Supports name => plugin and config => plugin diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistryImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistryImpl.java index c636612f3ec..31059005831 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistryImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistryImpl.java @@ -41,10 +41,10 @@ import org.apache.drill.exec.store.PluginHandle.PluginType; import org.apache.drill.exec.store.dfs.FileSystemConfig; import org.apache.drill.exec.store.dfs.FormatPlugin; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; -import org.apache.drill.shaded.guava.com.google.common.cache.RemovalListener; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.cache.RemovalListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRulesSupplier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRulesSupplier.java index 2dc14ac5cc4..c62d2ae5127 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRulesSupplier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRulesSupplier.java @@ -19,7 +19,7 @@ import org.apache.calcite.plan.Convention; import org.apache.calcite.plan.RelOptRule; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginStoreImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginStoreImpl.java index a185638affc..a9836a88f7e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginStoreImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginStoreImpl.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Iterator; import java.util.Map; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StorageStrategy.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StorageStrategy.java index 0d9f999b6b7..9e35cdf3d05 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StorageStrategy.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StorageStrategy.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SubSchemaWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SubSchemaWrapper.java index 3735229f0b1..f7f63f5c84c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SubSchemaWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SubSchemaWrapper.java @@ -27,7 +27,7 @@ import org.apache.calcite.schema.Table; import org.apache.drill.exec.planner.logical.CreateTableEntry; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public class SubSchemaWrapper extends AbstractSchema { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/TimedCallable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/TimedCallable.java index 09a0a8e48f7..99b11825bd9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/TimedCallable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/TimedCallable.java @@ -36,10 +36,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.MoreExecutors; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.util.concurrent.MoreExecutors; +import com.google.common.util.concurrent.ThreadFactoryBuilder; /** * Allows parallel executions of tasks in a simplified way. Also maintains and diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroColumnConverterFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroColumnConverterFactory.java index 152d4bda6c8..a59aa3a1ef5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroColumnConverterFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroColumnConverterFactory.java @@ -38,7 +38,7 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.accessor.TupleWriter; import org.apache.drill.exec.vector.accessor.ValueWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.joda.time.DateTimeConstants; import org.joda.time.Period; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroFormatConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroFormatConfig.java index 8ba85e20321..f3d1642f2b1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroFormatConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroFormatConfig.java @@ -24,7 +24,7 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ConstantHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ConstantHolder.java index 0d7bc013d1b..c62c38e9c69 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ConstantHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ConstantHolder.java @@ -21,7 +21,7 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.types.TypeProtos.MinorType; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ExprNode.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ExprNode.java index c331b16b802..635c766f0ff 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ExprNode.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ExprNode.java @@ -22,7 +22,7 @@ import org.apache.calcite.rex.RexNode; import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.types.TypeProtos.MinorType; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownStrategy.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownStrategy.java index 6ec025712b0..01357faaa6c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownStrategy.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownStrategy.java @@ -44,7 +44,7 @@ import org.apache.drill.exec.store.StoragePluginOptimizerRule; import org.apache.drill.exec.store.base.filter.ExprNode.AndNode; import org.apache.drill.exec.store.base.filter.FilterPushDownListener.ScanPushDownListener; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; /** * Generalized filter push-down strategy which performs all the tree-walking diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/BasicFormatMatcher.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/BasicFormatMatcher.java index 78cb4e668e5..f6e8363b0fc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/BasicFormatMatcher.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/BasicFormatMatcher.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.planner.logical.DynamicDrillTable; import org.apache.drill.exec.store.SchemaConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.Range; +import com.google.common.collect.Range; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileStatus; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFSDataInputStream.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFSDataInputStream.java index 7c3c913dcb8..11ccd4315e1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFSDataInputStream.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFSDataInputStream.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.store.dfs; import org.apache.drill.exec.ops.OperatorStats; -import org.apache.drill.shaded.guava.com.google.common.io.ByteStreams; +import com.google.common.io.ByteStreams; import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.PositionedReadable; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFileSystem.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFileSystem.java index d0c049d787f..524b7b0fb12 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFileSystem.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFileSystem.java @@ -59,8 +59,8 @@ import org.apache.hadoop.util.Progressable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Maps; /** * DrillFileSystem is the wrapper around the actual FileSystem implementation. The {@link DrillFileSystem} is diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java index e13237ea2c5..947662ece07 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSelection.java @@ -21,9 +21,9 @@ import org.apache.drill.common.util.DrillStringUtils; import org.apache.drill.exec.planner.logical.DrillTableSelection; import org.apache.drill.exec.util.DrillFileSystemUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.Path; import org.slf4j.Logger; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemConfig.java index eb80abebbeb..ef2165ca9e0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemConfig.java @@ -39,8 +39,8 @@ import org.apache.drill.common.map.CaseInsensitiveMap; import org.apache.drill.common.logical.security.CredentialsProvider; import org.apache.drill.common.logical.security.PlainCredentialsProvider; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap.Builder; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; @JsonTypeName(FileSystemConfig.NAME) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java index 3a9260c5ba8..5665ae72a4a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java @@ -57,8 +57,8 @@ import org.apache.drill.exec.store.ClassPathFileSystem; import org.apache.drill.exec.store.LocalSyncableFileSystem; import org.apache.drill.exec.store.SchemaConfig; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Strings; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.fs.FileSystem; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java index cbe71678f85..364af39bc6c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.planner.common.DrillStatsTable.TableStatistics; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.server.options.OptionManager; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionExtractor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionExtractor.java index edecc199c0e..087cca4a11d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionExtractor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionExtractor.java @@ -39,7 +39,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Manages format plugins options to define table macros. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/MetadataContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/MetadataContext.java index e629b18d3f1..c49a2194cc0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/MetadataContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/MetadataContext.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.hadoop.fs.Path; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java index 63d73a33ef1..bd25a97781a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java @@ -89,10 +89,10 @@ import org.slf4j.LoggerFactory; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Joiner; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; public class WorkspaceSchemaFactory { private static final Logger logger = LoggerFactory.getLogger(WorkspaceSchemaFactory.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/ClassicScanBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/ClassicScanBuilder.java index 08442c75de5..0b4d2907f11 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/ClassicScanBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/ClassicScanBuilder.java @@ -31,9 +31,9 @@ import org.apache.drill.exec.store.ColumnExplorer; import org.apache.drill.exec.store.RecordReader; import org.apache.drill.exec.store.dfs.DrillFileSystem; -import org.apache.drill.shaded.guava.com.google.common.base.Functions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Functions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; /** * Build the original scanner based on the {@link RecordReader} interface. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java index 681bf4ed06b..aaf48b1066c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java @@ -59,7 +59,7 @@ import org.apache.drill.exec.store.dfs.FormatMatcher; import org.apache.drill.exec.store.dfs.FormatPlugin; import org.apache.drill.exec.store.schedule.CompleteFileWork; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java index 512289eb2dd..299682648d8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java @@ -66,10 +66,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.metastore.util.TableMetadataUtils; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterators; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Lists; import org.apache.hadoop.fs.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONFormatConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONFormatConfig.java index 0ec66ce9672..86989e3d739 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONFormatConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONFormatConfig.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Objects; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader.java index 535f24f2431..860e60939fb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader.java @@ -39,8 +39,8 @@ import org.apache.drill.exec.vector.BaseValueVector; import org.apache.drill.exec.vector.complex.fn.JsonReader; import org.apache.drill.exec.vector.complex.impl.VectorContainerWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; import org.apache.hadoop.fs.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JsonRecordWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JsonRecordWriter.java index 160ad8f8d62..8c1b1a250da 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JsonRecordWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JsonRecordWriter.java @@ -41,7 +41,7 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class JsonRecordWriter extends JSONOutputRecordWriter implements RecordWriter { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/FieldDefn.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/FieldDefn.java index 945496129b1..353e534b00f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/FieldDefn.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/FieldDefn.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.vector.accessor.ObjectWriter; import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.TupleWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Describes a new field within an object. Allows the listener to control diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/InferredFieldFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/InferredFieldFactory.java index 6a9da7235fb..b850370429a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/InferredFieldFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/InferredFieldFactory.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.store.easy.json.values.VarCharListener; import org.apache.drill.exec.store.easy.json.parser.ValueParser; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/ProvidedFieldFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/ProvidedFieldFactory.java index f6346081058..0c232baeca3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/ProvidedFieldFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/ProvidedFieldFactory.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.store.easy.json.parser.ValueParser; import org.apache.drill.exec.store.easy.json.values.VarCharListener; import org.apache.drill.exec.vector.accessor.ObjectWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Create a Drill field listener based on a provided schema. The schema diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/JsonStructureParser.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/JsonStructureParser.java index f9bc515fa04..8c579fe7358 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/JsonStructureParser.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/JsonStructureParser.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.store.easy.json.parser.RootParser.RootArrayParser; import org.apache.drill.exec.store.easy.json.parser.RootParser.RootObjectParser; import org.apache.drill.exec.store.easy.json.parser.TokenIterator.RecoverableJsonException; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/ObjectParser.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/ObjectParser.java index 7c68e401cfb..ad405c16417 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/ObjectParser.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/ObjectParser.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.drill.common.map.CaseInsensitiveMap; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/RootParser.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/RootParser.java index 36ac2f86773..4f88ab9769d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/RootParser.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/RootParser.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.store.easy.json.parser; import org.apache.drill.exec.store.easy.json.parser.MessageParser.MessageContextException; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/SimpleMessageParser.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/SimpleMessageParser.java index 3db8a4c8910..01769f8f53f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/SimpleMessageParser.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/parser/SimpleMessageParser.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.easy.json.parser; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.fasterxml.jackson.core.JsonToken; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/BaseJsonProcessor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/BaseJsonProcessor.java index b842d77b727..5f44a781f33 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/BaseJsonProcessor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/BaseJsonProcessor.java @@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.TreeTraversingParser; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.exceptions.UserException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileBatchReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileBatchReader.java index e00e73525b6..2143aa7a283 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileBatchReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileBatchReader.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.store.dfs.easy.EasySubScan; import org.apache.drill.exec.util.ImpersonationUtil; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.mapred.InputFormat; import org.apache.hadoop.mapred.JobConf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatConfig.java index 3e9b570577d..91293ef494e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatConfig.java @@ -22,7 +22,7 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatConfig.java index 01ce072aee4..1e674f739b0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatConfig.java @@ -22,8 +22,8 @@ import org.apache.drill.common.PlanStringBuilder; import org.apache.drill.common.logical.FormatPluginConfig; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/HeaderBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/HeaderBuilder.java index 5ac3451d153..702443732cb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/HeaderBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/HeaderBuilder.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.store.easy.text.reader; import org.apache.drill.common.exceptions.UserException; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.apache.hadoop.fs.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/TextInput.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/TextInput.java index 51ed78fa394..6d8b6e7411f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/TextInput.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/TextInput.java @@ -24,7 +24,7 @@ import java.io.InputStream; import java.nio.ByteBuffer; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.hadoop.fs.ByteBufferReadable; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.Seekable; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/TextParsingSettings.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/TextParsingSettings.java index 0a28b1f9b3d..5bddd90fd3a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/TextParsingSettings.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/reader/TextParsingSettings.java @@ -20,7 +20,7 @@ import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.easy.text.TextFormatPlugin; import org.apache.drill.exec.store.easy.text.TextFormatConfig; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import java.nio.charset.StandardCharsets; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableBatchCreator.java index 9930484a2b1..f341b089ca1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableBatchCreator.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.physical.impl.scan.framework.SchemaNegotiator; import org.apache.drill.exec.record.CloseableRecordBatch; import org.apache.drill.exec.record.RecordBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableGroupScan.java index e74a97f9700..18f8b2e30e2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableGroupScan.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.physical.base.SubScan; import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; import java.util.Map; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableRecordReader.java index e0441ba2a77..fa4d10faf2a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/EnumerableRecordReader.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.record.ColumnConverterFactory; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.record.metadata.TupleSchema; -import org.apache.drill.shaded.guava.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import org.codehaus.commons.compiler.CompileException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/plan/DrillJdbcRuleBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/plan/DrillJdbcRuleBase.java index 18fe9ff75c0..139a5f2c272 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/plan/DrillJdbcRuleBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/plan/DrillJdbcRuleBase.java @@ -34,9 +34,9 @@ import org.apache.calcite.rex.RexNode; import org.apache.drill.exec.planner.common.DrillLimitRelBase; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import org.apache.drill.exec.planner.logical.DrillRelFactories; public abstract class DrillJdbcRuleBase extends ConverterRule { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/FilterEvaluator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/FilterEvaluator.java index 5fce27c457b..5f94302a24d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/FilterEvaluator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/FilterEvaluator.java @@ -21,7 +21,7 @@ import org.apache.calcite.schema.SchemaPlus; import org.apache.drill.exec.store.AbstractSchema; import org.apache.drill.exec.store.dfs.WorkspaceSchemaFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilter.java index ebf6c19e477..07e975ee2fe 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilter.java @@ -27,8 +27,8 @@ import org.apache.drill.exec.expr.fn.impl.RegexpUtil; import org.apache.drill.exec.expr.fn.impl.RegexpUtil.SqlPatternType; import org.apache.drill.exec.store.ischema.InfoSchemaFilter.ExprNode.Type; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Joiner; +import com.google.common.base.Strings; import java.util.List; import java.util.Map; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilterBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilterBuilder.java index 7cdbbd7d348..27d15d7fe75 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilterBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilterBuilder.java @@ -30,7 +30,7 @@ import org.apache.drill.exec.store.ischema.InfoSchemaFilter.ExprNode; import org.apache.drill.exec.store.ischema.InfoSchemaFilter.FieldExprNode; import org.apache.drill.exec.store.ischema.InfoSchemaFilter.FunctionExprNode; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java index 8ae95cf0e7a..48271faf193 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.physical.base.ScanStats.GroupScanProperty; import org.apache.drill.exec.physical.base.SubScan; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java index e53f7fb2983..efac7b31ce6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.planner.physical.ProjectPrel; import org.apache.drill.exec.planner.physical.ScanPrel; import org.apache.drill.exec.store.StoragePluginOptimizerRule; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public abstract class InfoSchemaPushFilterIntoRecordGenerator extends StoragePluginOptimizerRule { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java index da2560edbfb..4f4f73b9db4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.store.SchemaConfig; import org.apache.drill.exec.store.StoragePluginOptimizerRule; import org.apache.drill.exec.store.SystemPlugin; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import java.util.Arrays; import java.util.Collections; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java index acb7cb7d30a..064f66b7256 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java @@ -33,7 +33,7 @@ import org.apache.drill.metastore.statistics.ColumnStatisticsKind; import org.apache.drill.metastore.statistics.Statistic; import org.apache.drill.metastore.statistics.TableStatisticsKind; -import org.apache.drill.shaded.guava.com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.Path; import org.slf4j.Logger; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockGroupScanPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockGroupScanPOP.java index 7c6dbb8b482..29ce724629a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockGroupScanPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockGroupScanPOP.java @@ -42,7 +42,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Describes a "group" scan of a (logical) mock table. The mock table has a diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockScanBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockScanBatchCreator.java index 5bcfeaa5444..f0dc87c7637 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockScanBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockScanBatchCreator.java @@ -37,7 +37,7 @@ import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.store.RecordReader; import org.apache.drill.exec.store.mock.MockTableDef.MockScanEntry; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class MockScanBatchCreator implements BatchCreator { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockStorageEngine.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockStorageEngine.java index 53240d80010..8320fbf3042 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockStorageEngine.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockStorageEngine.java @@ -46,9 +46,9 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.collect.ImmutableList; +import com.google.common.io.Resources; public class MockStorageEngine extends AbstractStoragePlugin { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockSubScanPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockSubScanPOP.java index 980187f69b4..ec126c7b9fe 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockSubScanPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/mock/MockSubScanPOP.java @@ -31,7 +31,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Describes a physical scan operation for the mock data source. Each operator diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetGroupScan.java index cf1fd967a19..c54f1bdaf77 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetGroupScan.java @@ -65,11 +65,11 @@ import org.apache.drill.metastore.statistics.Statistic; import org.apache.drill.metastore.statistics.TableStatisticsKind; import org.apache.drill.metastore.util.TableMetadataUtils; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.LinkedListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; +import com.google.common.base.Preconditions; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.LinkedListMultimap; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Multimap; import org.apache.hadoop.fs.Path; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetScanBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetScanBatchCreator.java index f5c252c6178..9bc53d6e788 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetScanBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetScanBatchCreator.java @@ -44,9 +44,9 @@ import org.apache.drill.exec.store.parquet2.DrillParquetReader; import org.apache.drill.metastore.statistics.ColumnStatistics; import org.apache.drill.metastore.util.SchemaPathUtils; -import org.apache.drill.shaded.guava.com.google.common.base.Functions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Functions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Maps; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/BaseParquetMetadataProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/BaseParquetMetadataProvider.java index 1b6752bac61..f21c0504f34 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/BaseParquetMetadataProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/BaseParquetMetadataProvider.java @@ -36,11 +36,11 @@ import org.apache.drill.metastore.statistics.StatisticsHolder; import org.apache.drill.metastore.metadata.TableMetadata; import org.apache.drill.metastore.util.TableMetadataUtils; -import org.apache.drill.shaded.guava.com.google.common.collect.HashBasedTable; -import org.apache.drill.shaded.guava.com.google.common.collect.HashMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.LinkedListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Table; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.LinkedListMultimap; +import com.google.common.collect.Multimap; +import com.google.common.collect.Table; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.types.TypeProtos; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/FilePushDownFilter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/FilePushDownFilter.java index 1fb307e36a0..6780bfba77b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/FilePushDownFilter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/FilePushDownFilter.java @@ -20,7 +20,7 @@ import org.apache.calcite.rel.core.Filter; import org.apache.drill.exec.physical.base.AbstractGroupScanWithMetadata; import org.apache.drill.exec.expr.FilterPredicate; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptRuleOperand; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/FooterGatherer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/FooterGatherer.java index 54d3d91f97d..645f9f7c1ac 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/FooterGatherer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/FooterGatherer.java @@ -39,7 +39,7 @@ import org.apache.parquet.hadoop.ParquetFileWriter; import org.apache.parquet.hadoop.metadata.ParquetMetadata; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import static org.apache.commons.lang3.builder.ToStringStyle.SHORT_PREFIX_STYLE; import static org.apache.parquet.format.converter.ParquetMetadataConverter.NO_FILTER; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFormatPlugin.java index b1a614fbaeb..f3cfea082c1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFormatPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFormatPlugin.java @@ -67,8 +67,8 @@ import org.apache.drill.exec.store.parquet.metadata.Metadata; import org.apache.drill.exec.store.parquet.metadata.ParquetTableMetadataDirs; import org.apache.drill.exec.util.DrillFileSystemUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.base.Stopwatch; +import com.google.common.collect.ImmutableSet; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileStatus; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java index 1af28d3b13b..ed777c62b32 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java @@ -53,7 +53,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; @JsonTypeName("parquet-scan") public class ParquetGroupScan extends AbstractParquetGroupScan { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScanStatistics.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScanStatistics.java index 52bddba1a38..25f2519f3cd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScanStatistics.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScanStatistics.java @@ -30,8 +30,8 @@ import org.apache.drill.metastore.statistics.ColumnStatistics; import org.apache.drill.metastore.statistics.ColumnStatisticsKind; import org.apache.drill.metastore.metadata.LocationProvider; -import org.apache.drill.shaded.guava.com.google.common.collect.HashBasedTable; -import org.apache.drill.shaded.guava.com.google.common.collect.Table; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Table; import java.util.ArrayList; import java.util.Collection; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetReaderUtility.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetReaderUtility.java index 16fd9fcbdbf..b2dde9a27a0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetReaderUtility.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetReaderUtility.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.store.parquet.metadata.MetadataVersion; import org.apache.drill.exec.util.Utilities; import org.apache.drill.exec.work.ExecErrorConstants; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.apache.hadoop.util.VersionUtil; import org.apache.parquet.SemanticVersion; import org.apache.parquet.VersionParser; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRowGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRowGroupScan.java index 94780610a45..f15856e8635 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRowGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRowGroupScan.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetScanBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetScanBatchCreator.java index d6fade86b12..6bf656283bd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetScanBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetScanBatchCreator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.ops.ExecutorFragmentContext; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetTableMetadataUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetTableMetadataUtils.java index a25b1fb5c17..72420c29fd2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetTableMetadataUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetTableMetadataUtils.java @@ -48,11 +48,11 @@ import org.apache.drill.metastore.util.TableMetadataUtils; import org.apache.drill.metastore.statistics.ExactStatisticsConstants; import org.apache.drill.exec.expr.StatisticsProvider; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.LinkedListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; -import org.apache.drill.shaded.guava.com.google.common.primitives.Longs; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.LinkedListMultimap; +import com.google.common.collect.Multimap; +import com.google.common.primitives.Longs; import org.apache.hadoop.fs.Path; import org.apache.parquet.io.api.Binary; import org.apache.parquet.schema.OriginalType; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/AsyncPageReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/AsyncPageReader.java index a38c34dc5ed..d1d8ad8ac11 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/AsyncPageReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/AsyncPageReader.java @@ -45,7 +45,7 @@ import org.apache.parquet.format.Util; import org.apache.parquet.hadoop.metadata.CompressionCodecName; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import io.netty.buffer.DrillBuf; import org.slf4j.Logger; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/BatchReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/BatchReader.java index ea618184b8f..95fc8ce0aeb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/BatchReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/BatchReader.java @@ -21,9 +21,9 @@ import java.util.ArrayList; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; /** * Base strategy for reading a batch of Parquet records. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReader.java index 3cd63aeea48..290b4799eed 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReader.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.vector.BaseDataValueVector; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.Encoding; import org.apache.parquet.format.SchemaElement; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableFixedByteAlignedReaders.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableFixedByteAlignedReaders.java index b678bb8b61a..1d961d0514f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableFixedByteAlignedReaders.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableFixedByteAlignedReaders.java @@ -34,8 +34,8 @@ import org.apache.drill.exec.vector.NullableVarBinaryVector; import org.apache.drill.exec.vector.NullableVarDecimalVector; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.primitives.Ints; -import org.apache.drill.shaded.guava.com.google.common.primitives.Longs; +import com.google.common.primitives.Ints; +import com.google.common.primitives.Longs; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.values.ValuesReader; import org.apache.parquet.format.SchemaElement; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/PageReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/PageReader.java index 8f6f0b53daf..738d13c4a82 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/PageReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/PageReader.java @@ -20,8 +20,8 @@ import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.store.parquet.DataPageHeaderInfoProvider; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; import io.netty.buffer.ByteBufUtil; import org.apache.drill.exec.util.filereader.BufferedDirectBufInputStream; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java index 2a916ba007d..2f18a728ba3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java @@ -28,8 +28,8 @@ import org.apache.drill.exec.vector.UInt8Vector; import org.apache.drill.exec.vector.VarBinaryVector; import org.apache.drill.exec.vector.VarDecimalVector; -import org.apache.drill.shaded.guava.com.google.common.primitives.Ints; -import org.apache.drill.shaded.guava.com.google.common.primitives.Longs; +import com.google.common.primitives.Ints; +import com.google.common.primitives.Longs; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.values.ValuesReader; import org.apache.parquet.format.SchemaElement; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetRecordReader.java index 1a8e6f27a03..eeca2cabfe6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetRecordReader.java @@ -18,8 +18,8 @@ package org.apache.drill.exec.store.parquet.columnreaders; import org.apache.drill.exec.store.CommonParquetRecordReader; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Stopwatch; +import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetSchema.java index 2ace8101a5e..53bced71012 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetSchema.java @@ -41,7 +41,7 @@ import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData; import org.apache.parquet.hadoop.metadata.ParquetMetadata; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Mapping from the schema of the Parquet file to that of the record reader diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java index dbf31995203..3ad906b4eca 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java @@ -28,7 +28,7 @@ import org.apache.parquet.format.SchemaElement; import org.apache.parquet.schema.PrimitiveType; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkArgument; public class ParquetToDrillTypeConverter { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBinaryReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBinaryReader.java index 183e5a244cc..00faccb1a44 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBinaryReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBinaryReader.java @@ -17,9 +17,9 @@ */ package org.apache.drill.exec.store.parquet.columnreaders; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Stopwatch; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBulkPageReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBulkPageReader.java index 7f7f9975e63..cc1fafeeca7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBulkPageReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBulkPageReader.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet.columnreaders; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenEntryDictionaryReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenEntryDictionaryReader.java index d731450eb52..e003d8dd3ae 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenEntryDictionaryReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenEntryDictionaryReader.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet.columnreaders; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.nio.ByteBuffer; import org.apache.drill.exec.store.parquet.columnreaders.VarLenColumnBulkInput.ColumnPrecisionInfo; import org.apache.drill.exec.store.parquet.columnreaders.VarLenColumnBulkInput.ValuesReaderWrapper; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenEntryReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenEntryReader.java index 88f5676979a..cec0c7ff634 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenEntryReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenEntryReader.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet.columnreaders; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.nio.ByteBuffer; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.exec.store.parquet.columnreaders.VarLenColumnBulkInput.ColumnPrecisionInfo; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenFixedEntryReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenFixedEntryReader.java index b8c883d76c0..e66bd051163 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenFixedEntryReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenFixedEntryReader.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet.columnreaders; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.nio.ByteBuffer; import org.apache.drill.exec.store.parquet.columnreaders.VarLenColumnBulkInput.ColumnPrecisionInfo; import org.apache.drill.exec.store.parquet.columnreaders.VarLenColumnBulkInput.PageDataInfo; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableDictionaryReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableDictionaryReader.java index 9a0a249bbf9..5bfcb7d025a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableDictionaryReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableDictionaryReader.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet.columnreaders; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.nio.ByteBuffer; import org.apache.drill.exec.store.parquet.columnreaders.VarLenColumnBulkInput.ColumnPrecisionInfo; import org.apache.drill.exec.store.parquet.columnreaders.VarLenColumnBulkInput.ValuesReaderWrapper; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableEntryReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableEntryReader.java index e29b14c8b95..ce39859ad5d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableEntryReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableEntryReader.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet.columnreaders; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.nio.ByteBuffer; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.exec.store.parquet.columnreaders.VarLenColumnBulkInput.ColumnPrecisionInfo; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableFixedEntryReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableFixedEntryReader.java index 19f7b258aa2..2c52dfb06cb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableFixedEntryReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenNullableFixedEntryReader.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet.columnreaders; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.nio.ByteBuffer; import org.apache.drill.exec.store.parquet.columnreaders.VarLenColumnBulkInput.ColumnPrecisionInfo; import org.apache.drill.exec.store.parquet.columnreaders.VarLenColumnBulkInput.PageDataInfo; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenOverflowReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenOverflowReader.java index 7848028d58f..06e2b7924cf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenOverflowReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenOverflowReader.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet.columnreaders; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.nio.ByteBuffer; import org.apache.drill.exec.store.parquet.columnreaders.VarLenColumnBulkInput.VarLenColumnBulkInputCallback; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/batchsizing/RecordBatchSizerManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/batchsizing/RecordBatchSizerManager.java index 8b0e34a9718..281d1aa79b2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/batchsizing/RecordBatchSizerManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/batchsizing/RecordBatchSizerManager.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.util.record.RecordBatchStats.RecordBatchStatsContext; import org.apache.drill.exec.vector.AllocationHelper; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * This class is tasked with managing all aspects of flat Parquet reader record batch sizing logic. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/decimal/Int32DecimalParquetValueWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/decimal/Int32DecimalParquetValueWriter.java index 87f55f05461..1dc90a09b31 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/decimal/Int32DecimalParquetValueWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/decimal/Int32DecimalParquetValueWriter.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet.decimal; -import org.apache.drill.shaded.guava.com.google.common.primitives.Ints; +import com.google.common.primitives.Ints; import io.netty.buffer.DrillBuf; import org.apache.parquet.io.api.RecordConsumer; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/decimal/Int64DecimalParquetValueWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/decimal/Int64DecimalParquetValueWriter.java index 1987c86a896..f6b83970ec2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/decimal/Int64DecimalParquetValueWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/decimal/Int64DecimalParquetValueWriter.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet.decimal; -import org.apache.drill.shaded.guava.com.google.common.primitives.Longs; +import com.google.common.primitives.Longs; import io.netty.buffer.DrillBuf; import org.apache.parquet.io.api.RecordConsumer; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/Metadata.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/Metadata.java index a9202bc1dea..e9850dae3ad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/Metadata.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/Metadata.java @@ -36,8 +36,8 @@ import org.apache.drill.exec.store.parquet.ParquetReaderConfig; import org.apache.drill.exec.util.DrillFileSystemUtil; import org.apache.drill.exec.util.ImpersonationUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/MetadataPathUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/MetadataPathUtils.java index 2efc2ec888b..7718be66c9c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/MetadataPathUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/MetadataPathUtils.java @@ -19,7 +19,7 @@ import org.apache.commons.io.FileUtils; import org.apache.drill.common.util.DrillVersionInfo; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.fs.Path; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/MetadataVersion.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/MetadataVersion.java index 041130ecd5f..38891d16703 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/MetadataVersion.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/metadata/MetadataVersion.java @@ -17,9 +17,9 @@ */ package org.apache.drill.exec.store.parquet.metadata; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ComparisonChain; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSortedSet; +import com.google.common.base.Preconditions; +import com.google.common.collect.ComparisonChain; +import com.google.common.collect.ImmutableSortedSet; import org.apache.drill.common.exceptions.DrillRuntimeException; import java.util.SortedSet; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetGroupConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetGroupConverter.java index d10aa4674f4..55bd1891521 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetGroupConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetGroupConverter.java @@ -66,8 +66,8 @@ import org.apache.drill.exec.vector.complex.writer.VarBinaryWriter; import org.apache.drill.exec.vector.complex.writer.VarCharWriter; import org.apache.drill.exec.vector.complex.writer.VarDecimalWriter; -import org.apache.drill.shaded.guava.com.google.common.primitives.Ints; -import org.apache.drill.shaded.guava.com.google.common.primitives.Longs; +import com.google.common.primitives.Ints; +import com.google.common.primitives.Longs; import org.apache.parquet.io.api.Binary; import org.apache.parquet.io.api.Converter; import org.apache.parquet.io.api.GroupConverter; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetReader.java index 8fe61aa99fa..ae76971a373 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetReader.java @@ -37,7 +37,7 @@ import org.apache.drill.exec.vector.AllocationHelper; import org.apache.drill.exec.vector.NullableIntVector; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.compression.CompressionCodecFactory; import org.apache.parquet.hadoop.ColumnChunkIncReadStore; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java index 149779ddc75..7656ca0e8d3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.pojo; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.physical.impl.OutputMutator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoWriters.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoWriters.java index d71899cfd4a..09418463b7f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoWriters.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoWriters.java @@ -39,7 +39,7 @@ import org.apache.drill.exec.vector.NullableTimeStampVector; import org.apache.drill.exec.vector.NullableVarCharVector; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.apache.drill.exec.vector.VarDecimalVector; public class PojoWriters { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java index ff4f20e0c02..aea6d0a20c8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java @@ -22,7 +22,7 @@ import com.carrotsearch.hppc.cursors.ObjectLongCursor; import org.apache.drill.exec.physical.EndpointAffinity; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AssignmentCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AssignmentCreator.java index a22c4f7285f..ff2d454fc36 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AssignmentCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AssignmentCreator.java @@ -30,12 +30,12 @@ import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; import com.carrotsearch.hppc.cursors.ObjectLongCursor; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Stopwatch; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Iterators; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java index 6bc7bb02a93..32bc01d3d53 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java @@ -42,13 +42,13 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableRangeMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Range; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableRangeMap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Range; import static org.apache.commons.lang3.builder.ToStringStyle.SHORT_PREFIX_STYLE; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/security/CredentialProviderUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/security/CredentialProviderUtils.java index f42f057ad77..54af6dbd727 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/security/CredentialProviderUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/security/CredentialProviderUtils.java @@ -20,7 +20,7 @@ import org.apache.drill.common.logical.security.CredentialsProvider; import org.apache.drill.common.logical.security.PlainCredentialsProvider; import org.apache.drill.exec.store.security.oauth.OAuthTokenCredentials; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; public class CredentialProviderUtils { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ExtendedOptionIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ExtendedOptionIterator.java index a2a136f1610..f5a37c79b91 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ExtendedOptionIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ExtendedOptionIterator.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.server.options.OptionValue.OptionScope; import org.apache.drill.exec.store.pojo.NonNullable; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Extends the original Option iterator. The idea is to hide the implementation details and present the diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/OptionIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/OptionIterator.java index 8887592a31f..119426b2014 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/OptionIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/OptionIterator.java @@ -30,8 +30,8 @@ import org.apache.drill.exec.server.options.OptionValue.OptionScope; import org.apache.drill.exec.store.pojo.NonNullable; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; public class OptionIterator implements Iterator { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(OptionIterator.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreConfig.java index da48c6e0b64..bb756967427 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreConfig.java @@ -18,8 +18,8 @@ package org.apache.drill.exec.store.sys; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.drill.shaded.guava.com.google.common.base.Objects; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Objects; +import com.google.common.base.Preconditions; import com.google.protobuf.Message; import com.google.protobuf.Message.Builder; import io.protostuff.Schema; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreRegistry.java index a515a600854..7338ccc6ab9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreRegistry.java @@ -20,7 +20,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.typesafe.config.ConfigException; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.exceptions.ExecutionSetupException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileInfoIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileInfoIterator.java index a5a01aab362..4b798053a67 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileInfoIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileInfoIterator.java @@ -28,8 +28,8 @@ import org.apache.drill.exec.proto.UserBitShared.QueryProfile; import org.apache.drill.exec.store.pojo.NonNullable; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.base.Function; +import com.google.common.collect.Iterators; /** * System table listing completed profiles diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileJsonIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileJsonIterator.java index b1587636795..4ac2b122dd2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileJsonIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileJsonIterator.java @@ -29,8 +29,8 @@ import org.apache.drill.exec.serialization.InstanceSerializer; import org.apache.drill.exec.store.pojo.NonNullable; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.base.Function; +import com.google.common.collect.Iterators; /** * System table listing completed profiles as JSON documents diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableBatchCreator.java index 078c409ce9d..facf084ed36 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableBatchCreator.java @@ -21,7 +21,7 @@ import java.util.Iterator; import java.util.List; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.ops.ExecutorFragmentContext; import org.apache.drill.exec.physical.impl.BatchCreator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableScan.java index 150ed1a2329..6c42892aa5c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableScan.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.EndpointAffinity; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java index 816185f33ee..1f67c9341c8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.Properties; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Resources; import org.apache.drill.common.util.DrillVersionInfo; public class VersionIterator implements Iterator{ diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/InMemoryStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/InMemoryStore.java index abf317dc165..cdd5f646bdc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/InMemoryStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/InMemoryStore.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.store.sys.BasePersistentStore; import org.apache.drill.exec.store.sys.PersistentStoreMode; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; +import com.google.common.collect.Iterables; public class InMemoryStore extends BasePersistentStore { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/ZookeeperPersistentStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/ZookeeperPersistentStore.java index 9af6a7f68a2..599a5db1a1a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/ZookeeperPersistentStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/ZookeeperPersistentStore.java @@ -23,9 +23,9 @@ import javax.annotation.Nullable; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterators; import org.apache.curator.framework.CuratorFramework; import org.apache.drill.common.collections.ImmutableEntry; import org.apache.drill.common.exceptions.DrillRuntimeException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/ZookeeperPersistentStoreProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/ZookeeperPersistentStoreProvider.java index de7221e8681..3425a61853a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/ZookeeperPersistentStoreProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/ZookeeperPersistentStoreProvider.java @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.curator.framework.CuratorFramework; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.exec.coord.zk.ZKClusterCoordinator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjectionImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjectionImpl.java index 7e551aa6a86..abb6b1c0494 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjectionImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjectionImpl.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.concurrent.ExtendedLatch; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControls.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControls.java index 728c26c0b1d..e1ef0a586ed 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControls.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControls.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.apache.drill.common.util.JacksonUtils; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.ExecConstants; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControlsInjector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControlsInjector.java index cca3c0f090e..9029b827f81 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControlsInjector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControlsInjector.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java index 95ce19daf31..9946639b529 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.KeyDeserializer; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/store/NoWriteLocalStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/store/NoWriteLocalStore.java index be81beb9b51..4c5f48620a4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/store/NoWriteLocalStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/store/NoWriteLocalStore.java @@ -21,8 +21,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; import org.apache.drill.exec.store.sys.BasePersistentStore; import org.apache.drill.exec.store.sys.PersistentStoreMode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ArrayWrappedIntIntMap.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ArrayWrappedIntIntMap.java index a26a7a50082..034c143775c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ArrayWrappedIntIntMap.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ArrayWrappedIntIntMap.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.util; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.Arrays; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/BatchPrinter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/BatchPrinter.java index 3562eaf100c..549c42b6b3e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/BatchPrinter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/BatchPrinter.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.record.selection.SelectionVector4; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Tool for printing the content of record batches to screen. Used for debugging. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/DrillFileSystemUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/DrillFileSystemUtil.java index 6806aa2460d..d401743adff 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/DrillFileSystemUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/DrillFileSystemUtil.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.util; import org.apache.drill.exec.store.dfs.DrillFileSystem; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/EncodedSchemaPathSet.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/EncodedSchemaPathSet.java index 5f9eef80190..108c2124b8e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/EncodedSchemaPathSet.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/EncodedSchemaPathSet.java @@ -18,10 +18,10 @@ package org.apache.drill.exec.util; -import org.apache.drill.shaded.guava.com.google.common.io.BaseEncoding; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.io.BaseEncoding; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.planner.physical.PlannerSettings; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ImpersonationUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ImpersonationUtil.java index d6854be1081..174aa66a359 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ImpersonationUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ImpersonationUtil.java @@ -29,12 +29,12 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; -import org.apache.drill.shaded.guava.com.google.common.base.Splitter; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheBuilder; -import org.apache.drill.shaded.guava.com.google.common.cache.CacheLoader; -import org.apache.drill.shaded.guava.com.google.common.cache.LoadingCache; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Splitter; +import com.google.common.base.Strings; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.collect.Sets; /** * Utilities for impersonation purpose. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/MemoryAllocationUtilities.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/MemoryAllocationUtilities.java index 008c9dfc0dc..8237ef1007f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/MemoryAllocationUtilities.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/MemoryAllocationUtilities.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.server.options.OptionManager; import org.apache.drill.exec.server.options.OptionSet; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; public class MemoryAllocationUtilities { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/Utilities.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/Utilities.java index 1d160d07ed4..cfc967829e6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/Utilities.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/Utilities.java @@ -33,7 +33,7 @@ import org.apache.drill.exec.proto.BitControl.QueryContextInformation; import org.apache.drill.exec.proto.ExecProtos; import org.apache.drill.exec.proto.helper.QueryIdHelper; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class Utilities { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/VectorUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/VectorUtil.java index c1af9e0afe5..0a8c31056a8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/VectorUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/VectorUtil.java @@ -33,8 +33,8 @@ import org.joda.time.format.DateTimeFormat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Joiner; +import com.google.common.collect.Lists; public class VectorUtil { private static final Logger logger = LoggerFactory.getLogger(VectorUtil.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/concurrent/ExecutorServiceUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/concurrent/ExecutorServiceUtil.java index 163b6baf475..d71db4df9bb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/concurrent/ExecutorServiceUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/concurrent/ExecutorServiceUtil.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.util.concurrent; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/BufferedDirectBufInputStream.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/BufferedDirectBufInputStream.java index a0effe8f732..029f95701a9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/BufferedDirectBufInputStream.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/BufferedDirectBufInputStream.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.util.filereader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; import io.netty.buffer.DrillBuf; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.parquet.hadoop.util.HadoopStreams; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/DirectBufInputStream.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/DirectBufInputStream.java index c0d2bb65c6f..ea2542eb804 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/DirectBufInputStream.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/DirectBufInputStream.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.util.filereader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; import io.netty.buffer.DrillBuf; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.hadoop.fs.ByteBufferReadable; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/record/RecordBatchStats.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/record/RecordBatchStats.java index 5e90520658c..122b0c247c0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/record/RecordBatchStats.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/record/RecordBatchStats.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.util.record; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.ops.FragmentContext; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/BasicJsonOutput.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/BasicJsonOutput.java index d571af5214f..25ea8dd45fd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/BasicJsonOutput.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/BasicJsonOutput.java @@ -28,7 +28,7 @@ import org.joda.time.format.ISOPeriodFormat; import com.fasterxml.jackson.core.JsonGenerator; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * A JSON output class that generates standard JSON. By default, literals are diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/FieldSelection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/FieldSelection.java index 6df6ec67865..dfc15e0aecc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/FieldSelection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/FieldSelection.java @@ -26,7 +26,7 @@ import org.apache.drill.common.expression.PathSegment; import org.apache.drill.common.expression.SchemaPath; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java index 222906224cf..5a6c211b8b9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java @@ -30,9 +30,9 @@ import org.apache.drill.exec.vector.complex.writer.BaseWriter.ComplexWriter; import org.apache.drill.exec.vector.complex.writer.BaseWriter.ListWriter; import org.apache.drill.exec.vector.complex.writer.BaseWriter.MapWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Charsets; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/WorkingBuffer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/WorkingBuffer.java index 36f5b719469..9e5f8d0a9c0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/WorkingBuffer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/WorkingBuffer.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.expr.holders.VarBinaryHolder; import org.apache.drill.exec.expr.holders.VarCharHolder; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; class WorkingBuffer { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(WorkingBuffer.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/QueryWorkUnit.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/QueryWorkUnit.java index 54fee8c7955..83cd2014837 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/QueryWorkUnit.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/QueryWorkUnit.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.proto.ExecProtos; import org.apache.drill.exec.server.options.OptionList; import org.apache.drill.exec.work.foreman.ForemanSetupException; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class QueryWorkUnit { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java index 5fcdac15a3f..a58603164e3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.work; import com.codahale.metrics.Gauge; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.drill.common.SelfCleaningRunnable; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/AbstractDataCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/AbstractDataCollector.java index ceb59442054..a81dea21252 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/AbstractDataCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/AbstractDataCollector.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.record.RawFragmentBatch; import org.apache.drill.exec.util.ArrayWrappedIntIntMap; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public abstract class AbstractDataCollector implements DataCollector { private final int oppositeMajorFragmentId; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/IncomingBuffers.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/IncomingBuffers.java index f3e014ddb08..2d1b4f2f0c2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/IncomingBuffers.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/IncomingBuffers.java @@ -34,8 +34,8 @@ import org.apache.drill.exec.record.RawFragmentBatch; import org.apache.drill.exec.rpc.data.IncomingDataBatch; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; /** * Determines when a particular fragment has enough data for each of its receiving exchanges to commence execution. Also monitors whether we've collected all incoming data. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ResponseSenderQueue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ResponseSenderQueue.java index e70306fa0a0..9ae3256015e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ResponseSenderQueue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ResponseSenderQueue.java @@ -21,8 +21,8 @@ import org.apache.drill.exec.rpc.data.AckSender; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.Queues; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Queues; public class ResponseSenderQueue { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ResponseSenderQueue.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java index 4e7e251e726..6544c9426d0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java @@ -43,10 +43,10 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Queues; +import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Queues; /** * This implementation of RawBatchBuffer starts writing incoming batches to disk once the buffer size reaches a threshold. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java index f6380b7ae83..8283f9ef945 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.record.RawFragmentBatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Queues; +import com.google.common.collect.Queues; public class UnlimitedRawBatchBuffer extends BaseRawBatchBuffer { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(UnlimitedRawBatchBuffer.class); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/BloomFilter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/BloomFilter.java index 14b84f774de..b89665cb792 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/BloomFilter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/BloomFilter.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.work.filter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import io.netty.buffer.DrillBuf; import org.apache.drill.exec.memory.BufferAllocator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterSink.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterSink.java index 9009484e66f..a5f2fd9b868 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterSink.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterSink.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.rpc.RpcOutcomeListener; import org.apache.drill.exec.rpc.data.DataTunnel; import org.apache.drill.exec.server.DrillbitContext; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterWritable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterWritable.java index 566781bb5cb..ddb6cfd6e06 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterWritable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterWritable.java @@ -22,7 +22,7 @@ import org.apache.drill.common.AutoCloseables; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.proto.BitData; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java index 3cdc9616f0b..a099b96b123 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java @@ -20,8 +20,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.drill.common.util.JacksonUtils; import org.apache.drill.exec.work.filter.RuntimeFilterRouter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.protobuf.InvalidProtocolBufferException; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentsRunner.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentsRunner.java index 6c49d6ef893..e08dc56b972 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentsRunner.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentsRunner.java @@ -17,10 +17,10 @@ */ package org.apache.drill.exec.work.foreman; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; import io.netty.buffer.ByteBuf; import org.apache.drill.common.concurrent.ExtendedLatch; import org.apache.drill.common.exceptions.ExecutionSetupException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java index 10679b061cd..a919ed90059 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryManager.java @@ -57,9 +57,9 @@ import com.carrotsearch.hppc.IntObjectHashMap; import com.carrotsearch.hppc.predicates.IntObjectPredicate; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/EmbeddedQueryQueue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/EmbeddedQueryQueue.java index 8b19c71f3b6..a042f8bb631 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/EmbeddedQueryQueue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/EmbeddedQueryQueue.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.proto.helper.QueryIdHelper; import org.apache.drill.exec.server.DrillbitContext; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Query queue to be used in an embedded Drillbit. This queue has scope of only diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/ThrottledResourceManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/ThrottledResourceManager.java index 5d1a1709dd0..b03aa5a9b71 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/ThrottledResourceManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/rm/ThrottledResourceManager.java @@ -39,8 +39,8 @@ import org.apache.drill.exec.work.foreman.rm.QueryQueue.QueueLease; import org.apache.drill.exec.work.foreman.rm.QueryQueue.QueueTimeoutException; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimap; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; /** * Global resource manager that provides basic admission control (AC) via a diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java index d57cd51b4f7..57714731cf5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.work.fragment; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.proto.BitControl.PlanFragment; import org.apache.drill.exec.proto.ExecProtos.FragmentHandle; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/MetadataProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/MetadataProvider.java index f9c01958edb..8d9f491716e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/MetadataProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/MetadataProvider.java @@ -77,10 +77,10 @@ import org.apache.drill.exec.store.pojo.PojoRecordReader; import org.apache.drill.metastore.MetastoreRegistry; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ComparisonChain; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Ordering; +import com.google.common.base.Preconditions; +import com.google.common.collect.ComparisonChain; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Ordering; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/ServerMetaProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/ServerMetaProvider.java index 71a7f665ce7..c21b74e6276 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/ServerMetaProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/ServerMetaProvider.java @@ -46,8 +46,8 @@ import org.apache.drill.exec.rpc.user.UserSession; import org.apache.drill.exec.server.DrillbitContext; -import org.apache.drill.shaded.guava.com.google.common.base.Splitter; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Splitter; +import com.google.common.collect.ImmutableList; /** * Contains worker {@link Runnable} for returning server meta information diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/prepare/PreparedStatementProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/prepare/PreparedStatementProvider.java index 9368a54cdf0..d8f9110d60a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/prepare/PreparedStatementProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/prepare/PreparedStatementProvider.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.work.prepare; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import io.netty.util.concurrent.Future; import org.apache.drill.common.exceptions.ErrorHelper; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/user/PlanSplitter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/user/PlanSplitter.java index e907c54bd58..5cf976e7fb4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/user/PlanSplitter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/user/PlanSplitter.java @@ -40,7 +40,7 @@ import org.apache.drill.exec.work.QueryWorkUnit; import org.apache.drill.exec.work.foreman.rm.QueryResourceAllocator; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Helper class to return PlanFragments based on the query plan diff --git a/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java index a71c6b70949..b14d1fa5863 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java @@ -27,8 +27,8 @@ import org.apache.drill.exec.store.parquet.metadata.Metadata; import org.apache.drill.exec.vector.NullableVarCharVector; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.test.QueryTestUtil; diff --git a/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java b/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java index e5f9badc39c..64b0087ecb1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java @@ -23,7 +23,7 @@ import org.apache.calcite.jdbc.DynamicSchema; import org.apache.drill.exec.alias.AliasRegistryProvider; import org.apache.drill.exec.ops.ViewExpansionContext; -import org.apache.drill.shaded.guava.com.google.common.base.Function; +import com.google.common.base.Function; import io.netty.buffer.DrillBuf; import org.apache.calcite.schema.SchemaPlus; import org.apache.drill.common.config.DrillConfig; @@ -58,9 +58,9 @@ import org.junit.rules.TestRule; import com.codahale.metrics.MetricRegistry; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.collect.ImmutableList; +import com.google.common.io.Resources; import org.mockito.Matchers; import static org.mockito.ArgumentMatchers.anyString; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestBugFixes.java b/exec/java-exec/src/test/java/org/apache/drill/TestBugFixes.java index 5f7f5fe18a3..9ae92434ec4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestBugFixes.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestBugFixes.java @@ -30,7 +30,7 @@ import org.apache.drill.common.types.Types; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.planner.physical.PlannerSettings; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.junit.Assert; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java b/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java index 1acfecdd26f..b5b9a746582 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java @@ -38,7 +38,7 @@ import org.apache.drill.common.types.Types; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.planner.physical.PlannerSettings; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.test.TestBuilder; import org.hamcrest.CoreMatchers; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsWithTypeExpoQueries.java b/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsWithTypeExpoQueries.java index 0c892dafd9a..1a9569eeac9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsWithTypeExpoQueries.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsWithTypeExpoQueries.java @@ -17,7 +17,7 @@ */ package org.apache.drill; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.commons.lang3.tuple.Pair; import org.apache.drill.categories.SqlFunctionTest; import org.apache.drill.common.expression.SchemaPath; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestSetOp.java b/exec/java-exec/src/test/java/org/apache/drill/TestSetOp.java index bb1d10ffe68..7f8126441dc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestSetOp.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestSetOp.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.util.StoragePluginTestUtils; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.commons.lang3.tuple.Pair; import org.apache.drill.categories.OperatorTest; import org.apache.drill.categories.SqlTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java index 74732fec73c..78c6313eef8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java @@ -43,7 +43,7 @@ import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java b/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java index 0121bdf0f3c..994fde858ac 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java @@ -18,7 +18,7 @@ package org.apache.drill; import org.apache.drill.exec.record.BatchSchemaBuilder; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.commons.lang3.tuple.Pair; import org.apache.drill.categories.OperatorTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestUnionDistinct.java b/exec/java-exec/src/test/java/org/apache/drill/TestUnionDistinct.java index 86271cd0639..4a1c9340b01 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestUnionDistinct.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestUnionDistinct.java @@ -18,7 +18,7 @@ package org.apache.drill; import org.apache.drill.exec.record.BatchSchemaBuilder; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSeparatePlanningTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSeparatePlanningTest.java index 5ee2435a71e..a0bbdc9d8fc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSeparatePlanningTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSeparatePlanningTest.java @@ -43,7 +43,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Class to test different planning use cases (separate from query execution) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java index 032756917a4..a421cde15a5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.server.Drillbit; import org.slf4j.Logger; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; /** * Base class for Drill system tests. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/RunRootExec.java b/exec/java-exec/src/test/java/org/apache/drill/exec/RunRootExec.java index 283a3af3290..36f8beebb54 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/RunRootExec.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/RunRootExec.java @@ -35,9 +35,9 @@ import org.apache.drill.exec.server.RemoteServiceSet; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.base.Stopwatch; +import com.google.common.io.Files; public class RunRootExec { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(RunRootExec.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestEmptyInputSql.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestEmptyInputSql.java index a82a3e23d18..293cd292eda 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestEmptyInputSql.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestEmptyInputSql.java @@ -18,7 +18,7 @@ package org.apache.drill.exec; import org.apache.drill.exec.record.BatchSchemaBuilder; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.commons.lang3.tuple.Pair; import org.apache.drill.exec.planner.physical.PlannerSettings; import org.apache.drill.test.ClusterFixture; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java index f8d79828fd7..6b91c89e8b1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java @@ -49,7 +49,7 @@ import org.junit.Test; import com.fasterxml.jackson.databind.ObjectWriter; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class TestOpSerialization extends BaseTest { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestOpSerialization.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java index f17e0534f43..eb6ce3961be 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java @@ -32,8 +32,8 @@ import org.junit.BeforeClass; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category({SlowTest.class}) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientSystemTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientSystemTest.java index 5b42d606053..1b226e71834 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientSystemTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientSystemTest.java @@ -28,8 +28,8 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.io.Resources; @Ignore diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java index 77145adc894..5fc28eb73ce 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java @@ -43,8 +43,8 @@ import org.apache.hadoop.fs.Path; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/CodeCompilerTestFactory.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/CodeCompilerTestFactory.java index a5c7aaf1e5f..3bab1887b79 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/CodeCompilerTestFactory.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/CodeCompilerTestFactory.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.compile; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.config.LogicalPlanPersistence; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java index c43408c3d57..879dc4d1561 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java @@ -34,8 +34,8 @@ import org.objectweb.asm.util.Textifier; import org.objectweb.asm.util.TraceClassVisitor; -import org.apache.drill.shaded.guava.com.google.common.io.Files; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Files; +import com.google.common.io.Resources; public class ReplaceMethodInvoke { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ReplaceMethodInvoke.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestZookeeperClient.java b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestZookeeperClient.java index 35029693403..73470b8cada 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestZookeeperClient.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestZookeeperClient.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/FunctionInitializerTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/FunctionInitializerTest.java index d34fcb52351..1766a365d7e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/FunctionInitializerTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/FunctionInitializerTest.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.expr.fn; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.categories.SqlFunctionTest; import org.apache.drill.exec.udf.dynamic.JarBuilder; import org.apache.drill.exec.util.JarUtil; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java index 1abe4f1f467..a266bda880f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.util.Text; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.junit.experimental.categories.Category; import java.io.BufferedWriter; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolderTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolderTest.java index 6004b96931d..1c6add26724 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolderTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolderTest.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.expr.fn.registry; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ListMultimap; import org.apache.drill.categories.SqlFunctionTest; import org.apache.drill.exec.expr.fn.DrillFuncHolder; import org.apache.drill.test.BaseTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunction.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunction.java index 6b703c70537..144107c14ea 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunction.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunction.java @@ -35,8 +35,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category(OperatorTest.class) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java index 3477d4122bc..b7dd11089fd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java @@ -19,10 +19,10 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.commons.lang3.tuple.Pair; import org.apache.drill.common.exceptions.UserRemoteException; import org.apache.drill.common.types.Types; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCastFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCastFunctions.java index 0644c2c7430..e747913669d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCastFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCastFunctions.java @@ -48,8 +48,8 @@ import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import static org.apache.drill.common.types.TypeProtos.MinorType.BIGINT; import static org.apache.drill.common.types.TypeProtos.MinorType.BIT; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateFunctions.java index 1c8b079982d..db417c16ee5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateFunctions.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.fn.impl; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.apache.drill.categories.SqlFunctionTest; import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.common.util.DrillFileUtils; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctions.java index f7130708f5e..01696d1d06c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctions.java @@ -41,8 +41,8 @@ import org.apache.drill.exec.vector.IntVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java index bffdc8a6f6e..4d706c7e47e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java @@ -34,8 +34,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category(OperatorTest.class) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewAggregateFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewAggregateFunctions.java index 52287af2dd9..6a98b3946b8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewAggregateFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewAggregateFunctions.java @@ -35,8 +35,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category(OperatorTest.class) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewMathFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewMathFunctions.java index e8340a14376..b7078f7615b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewMathFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewMathFunctions.java @@ -51,8 +51,8 @@ import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.io.Resources; import java.io.File; import java.math.BigDecimal; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java index 62aed9d8974..53a29a717bb 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java @@ -41,8 +41,8 @@ import org.apache.drill.exec.vector.IntVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/ExpressionInterpreterTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/ExpressionInterpreterTest.java index 66e12f95981..e3e87fe7836 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/ExpressionInterpreterTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/ExpressionInterpreterTest.java @@ -51,7 +51,7 @@ import org.apache.drill.exec.store.mock.MockSubScanPOP; import org.apache.drill.exec.store.mock.MockTableDef; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.joda.time.DateTimeZone; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/TestConstantFolding.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/TestConstantFolding.java index 879dc4b3461..470f9bf38bd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/TestConstantFolding.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/TestConstantFolding.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.fn.interp; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Joiner; +import com.google.common.collect.Lists; import org.apache.drill.PlanTestBase; import org.apache.drill.categories.SqlTest; import org.apache.drill.exec.planner.physical.PlannerSettings; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/BaseTestImpersonation.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/BaseTestImpersonation.java index 37ae508c37c..b2487383408 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/BaseTestImpersonation.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/BaseTestImpersonation.java @@ -24,8 +24,8 @@ import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.exec.store.dfs.FileSystemConfig; import org.apache.drill.exec.store.dfs.WorkspaceConfig; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import org.apache.drill.test.ClientFixture; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterFixtureBuilder; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java index 49e1b4a3a82..4926ed4f63d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.impersonation; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.categories.SecurityTest; import org.apache.drill.exec.store.dfs.WorkspaceConfig; import org.apache.drill.categories.SlowTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java index ed25a6453ab..b7ed6a11a02 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java @@ -26,8 +26,8 @@ import org.apache.drill.exec.rpc.user.QueryDataBatch; import org.apache.drill.exec.store.StoragePluginRegistry.PluginException; import org.apache.drill.exec.store.dfs.WorkspaceConfig; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Joiner; +import com.google.common.collect.Maps; import org.apache.drill.test.ClientFixture; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java index fcaeac246cf..1dc34c4e312 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.store.StoragePluginRegistry.PluginException; import org.apache.drill.exec.store.avro.AvroDataGenerator; import org.apache.drill.exec.store.dfs.WorkspaceConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.test.ClientFixture; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java index 3a2bc8e9077..2934fd77958 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.dotdrill.DotDrillType; import org.apache.drill.exec.proto.UserBitShared; import org.apache.drill.exec.store.dfs.WorkspaceConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.test.ClientFixture; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.hadoop.fs.FileStatus; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java index 00ac0abaed6..57cc1c05f90 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.impersonation; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.apache.drill.categories.SecurityTest; import org.apache.drill.common.util.DrillFileUtils; import org.apache.drill.exec.ExecConstants; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/memory/TestAllocators.java b/exec/java-exec/src/test/java/org/apache/drill/exec/memory/TestAllocators.java index 061a86c8fdd..45b2d5883ce 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/memory/TestAllocators.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/memory/TestAllocators.java @@ -56,9 +56,9 @@ import org.apache.drill.test.DrillTest; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.collect.Lists; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category(MemoryTest.class) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/metastore/TestMetastoreWithEasyFormatPlugin.java b/exec/java-exec/src/test/java/org/apache/drill/exec/metastore/TestMetastoreWithEasyFormatPlugin.java index d0cb8954a1b..9aaf6fcb3d1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/metastore/TestMetastoreWithEasyFormatPlugin.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/metastore/TestMetastoreWithEasyFormatPlugin.java @@ -37,8 +37,8 @@ import org.apache.drill.metastore.statistics.ColumnStatisticsKind; import org.apache.drill.metastore.statistics.StatisticsHolder; import org.apache.drill.metastore.statistics.TableStatisticsKind; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.ClusterTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java index 2c176737033..255c8996d4a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java @@ -31,8 +31,8 @@ import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.ObjectWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category(PlannerTest.class) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/MockRecordBatch.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/MockRecordBatch.java index 6e1ce9b3ebc..05167478ac7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/MockRecordBatch.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/MockRecordBatch.java @@ -41,7 +41,7 @@ import org.apache.drill.exec.record.WritableBatch; import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.record.selection.SelectionVector4; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class MockRecordBatch implements CloseableRecordBatch { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java index eb48f08c0a2..5aefa9e222a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.record.selection.SelectionVector4; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; @Deprecated public class SimpleRootExec implements RootExec, Iterable { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java index 17f529f7733..55fede836d0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java @@ -32,8 +32,8 @@ import org.apache.drill.exec.server.RemoteServiceSet; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category({OperatorTest.class, SlowTest.class}) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastFunctions.java index c714282ea35..a0aac19c76f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastFunctions.java @@ -57,8 +57,8 @@ import org.apache.drill.exec.vector.VarCharVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastVarCharToBigInt.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastVarCharToBigInt.java index 0867078cdde..6c7c97f0d8d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastVarCharToBigInt.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastVarCharToBigInt.java @@ -33,8 +33,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class TestCastVarCharToBigInt extends PopUnitTestBase { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java index 8f3a72fc44f..8237cc4f640 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java @@ -33,8 +33,8 @@ import org.apache.drill.exec.server.DrillbitContext; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.io.Resources; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestConvertFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestConvertFunctions.java index 40595dfd192..03229bed14c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestConvertFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestConvertFunctions.java @@ -50,8 +50,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.io.Resources; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java index ba2d5f5200b..bca327b5050 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java @@ -37,8 +37,8 @@ import org.apache.drill.categories.SlowTest; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category({SlowTest.class}) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java index d3f6b0b57cf..1aad9f4cae0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java @@ -31,8 +31,8 @@ import org.apache.drill.exec.server.RemoteServiceSet; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category({SlowTest.class}) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java index ec157e8dade..9d6bb9fe1a1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java @@ -34,8 +34,8 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; /* This class tests the existing date types. Simply using date types diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java index 425e1739b68..9bcf13d8450 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java @@ -30,8 +30,8 @@ import org.apache.drill.exec.server.RemoteServiceSet; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category(OperatorTest.class) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestImplicitCastFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestImplicitCastFunctions.java index 1c80130eb75..ae4a7818d97 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestImplicitCastFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestImplicitCastFunctions.java @@ -34,8 +34,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.io.Resources; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestLocalExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestLocalExchange.java index 37cae3e92d1..2feda0a950e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestLocalExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestLocalExchange.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.physical.impl; import org.apache.drill.exec.planner.fragment.DefaultQueryParallelizer; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import org.apache.drill.PlanTestBase; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestReverseImplicitCast.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestReverseImplicitCast.java index 6dd52da5edb..a0a30e75f60 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestReverseImplicitCast.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestReverseImplicitCast.java @@ -34,8 +34,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class TestReverseImplicitCast extends PopUnitTestBase { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFragmentRun.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFragmentRun.java index 946482693e3..64b9843ecee 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFragmentRun.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFragmentRun.java @@ -36,8 +36,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class TestSimpleFragmentRun extends PopUnitTestBase { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleFragmentRun.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java index 227d6c27e2d..08392fbf869 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java @@ -53,8 +53,8 @@ import org.apache.drill.exec.vector.NullableVarCharVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import com.sun.codemodel.JClassAlreadyExistsException; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java index eabb39bcb18..e7aac978748 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java @@ -36,8 +36,8 @@ import org.apache.drill.exec.vector.VarCharVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.io.Resources; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java index 0be22db3e4e..e34598cd0ad 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java @@ -30,8 +30,8 @@ import org.apache.drill.exec.server.RemoteServiceSet; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category(OperatorTest.class) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNEmitOutcome.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNEmitOutcome.java index 8fe34d172c1..27c198ce26f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNEmitOutcome.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNEmitOutcome.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.TopN; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.RelFieldCollation; import org.apache.drill.categories.OperatorTest; import org.apache.drill.exec.physical.config.TopN; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java index 3d2b6a718cf..9b75b16ac78 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.ops.FragmentContextImpl; import org.apache.drill.exec.proto.BitControl; import org.apache.drill.exec.server.DrillbitContext; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseDirTestWatcher; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.TestBuilder; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java index 882ccaf816e..5b6343abaf2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java @@ -41,8 +41,8 @@ import org.apache.drill.exec.vector.NullableBigIntVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggBatch.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggBatch.java index ac3ccc150f9..7c9a431b296 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggBatch.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggBatch.java @@ -17,9 +17,9 @@ */ package org.apache.drill.exec.physical.impl.agg; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.FieldReference; import org.apache.drill.common.expression.FunctionCall; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/common/HashPartitionTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/common/HashPartitionTest.java index 16759190525..3d83ad50f07 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/common/HashPartitionTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/common/HashPartitionTest.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.common; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.expression.FieldReference; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/common/HashTableAllocationTrackerTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/common/HashTableAllocationTrackerTest.java index 246084dd6c7..78124077848 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/common/HashTableAllocationTrackerTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/common/HashTableAllocationTrackerTest.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.common; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseTest; import org.junit.Assert; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java index 5b89dd70661..726463048a1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java @@ -38,8 +38,8 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java index d2485f10a9b..5bd399bef30 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java @@ -33,7 +33,7 @@ import org.apache.drill.exec.fn.interp.TestConstantFolding; import org.apache.drill.exec.store.easy.json.JSONRecordReader; import org.apache.drill.exec.util.JsonStringHashMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.test.SubDirTestWatcher; import org.apache.drill.test.TestBuilder; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/PartitionStatImpl.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/PartitionStatImpl.java index 0236dfe0ef7..43e02b69116 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/PartitionStatImpl.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/PartitionStatImpl.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import java.util.Collections; import java.util.LinkedList; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestBuildSidePartitioningImpl.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestBuildSidePartitioningImpl.java index 1ccc2cd5442..2215d7ba02f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestBuildSidePartitioningImpl.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestBuildSidePartitioningImpl.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.map.CaseInsensitiveMap; import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.test.BaseTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java index ccc996a0ece..1f562986402 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java @@ -52,8 +52,8 @@ import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinJPPD.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinJPPD.java index a5fc5ba49af..c89175b28c5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinJPPD.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinJPPD.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.categories.OperatorTest; import org.apache.drill.categories.SlowTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinOutcome.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinOutcome.java index 9c2cff89c89..5ead28549ed 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinOutcome.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinOutcome.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.physical.impl.join; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.core.JoinRelType; import org.apache.calcite.sql.SqlKind; import org.apache.drill.categories.OperatorTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinSpill.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinSpill.java index ed4154262e8..67d214f8b92 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinSpill.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinSpill.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.categories.OperatorTest; import org.apache.drill.categories.SlowTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashTableSizeCalculatorConservativeImpl.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashTableSizeCalculatorConservativeImpl.java index e00f935235d..92e90a7ed7f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashTableSizeCalculatorConservativeImpl.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashTableSizeCalculatorConservativeImpl.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.exec.record.RecordBatchSizer; import org.apache.drill.exec.vector.UInt4Vector; import org.apache.drill.test.BaseTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashTableSizeCalculatorLeanImpl.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashTableSizeCalculatorLeanImpl.java index b2260d4fc7f..e4f46856f18 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashTableSizeCalculatorLeanImpl.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashTableSizeCalculatorLeanImpl.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.exec.record.RecordBatchSizer; import org.apache.drill.exec.vector.UInt4Vector; import org.apache.drill.test.BaseTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectness.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectness.java index b3add2f9c00..116cdd9ff4f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectness.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectness.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.exceptions.UserException; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectnessBatchProcessing.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectnessBatchProcessing.java index bd67320ea72..761f0e69d4d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectnessBatchProcessing.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestLateralJoinCorrectnessBatchProcessing.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.common.types.TypeProtos; import org.apache.drill.exec.ops.OperatorContext; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java index 5034ed771ee..e7f71e9a434 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java @@ -48,9 +48,9 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.collect.Lists; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java index b61adc90375..6c25c13ffd9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java @@ -35,8 +35,8 @@ import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; @Category({SlowTest.class, OperatorTest.class}) public class TestMergeJoinMulCondition extends PopUnitTestBase { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestPostBuildCalculationsImpl.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestPostBuildCalculationsImpl.java index 74448ff5a27..28256f4c4b8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestPostBuildCalculationsImpl.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestPostBuildCalculationsImpl.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.physical.impl.join; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseTest; import org.junit.Assert; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java index c87865f1bf8..3c7d656403a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java @@ -37,7 +37,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; @Category(PlannerTest.class) public class TestEarlyLimit0Optimization extends BaseTestQuery { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitOperator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitOperator.java index e234ac6b6e2..3dbd1cca937 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitOperator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitOperator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.limit; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.exec.physical.config.Limit; import org.apache.drill.test.PhysicalOpUnitTestBase; import org.apache.drill.test.BaseDirTestWatcher; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java index e63a8781042..7900eb63ac6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java @@ -39,8 +39,8 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java index 69798af6630..07c82fcf7b5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java @@ -37,8 +37,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category({OperatorTest.class, SlowTest.class}) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java index 661401a8418..2a0b8fe4b33 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java @@ -44,9 +44,9 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.collect.Lists; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/partitionsender/TestPartitionSender.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/partitionsender/TestPartitionSender.java index 9e47915c955..f5fc6aa0dea 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/partitionsender/TestPartitionSender.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/partitionsender/TestPartitionSender.java @@ -78,7 +78,7 @@ import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * PartitionerSenderRootExec test to cover mostly part that deals with multithreaded diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java index 2bf3271c976..f5d0b5e2e5e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java @@ -41,8 +41,8 @@ import org.apache.drill.exec.vector.NullableBigIntVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/ScanTestUtils.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/ScanTestUtils.java index 4cfca2ff975..a982c6cf5a2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/ScanTestUtils.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/ScanTestUtils.java @@ -39,8 +39,8 @@ import org.apache.drill.exec.record.metadata.ColumnMetadata; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.record.metadata.TupleSchema; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.apache.drill.test.OperatorFixture; public class ScanTestUtils { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArray.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArray.java index 9346aaea905..9542d1e0702 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArray.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArray.java @@ -37,7 +37,7 @@ import org.apache.drill.exec.physical.resultSet.ResultSetLoader; import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.exec.physical.rowSet.RowSetTestUtils; import org.apache.drill.exec.physical.rowSet.RowSet.SingleRowSet; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayFramework.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayFramework.java index 90ed824b57b..b04624e6459 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayFramework.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayFramework.java @@ -38,7 +38,7 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.store.dfs.easy.FileWork; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.SubOperatorTest; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayParser.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayParser.java index 835b0185fde..d6024f7afa5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayParser.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayParser.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.physical.impl.scan.file.ImplicitColumnManager.ImplicitColumnOptions; import org.apache.drill.exec.physical.impl.scan.project.ScanLevelProjection; import org.apache.drill.exec.physical.rowSet.RowSetTestUtils; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.SubOperatorTest; import org.apache.hadoop.fs.Path; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestImplicitColumnParser.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestImplicitColumnParser.java index cb8c8887d4a..d461628518f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestImplicitColumnParser.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestImplicitColumnParser.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.physical.rowSet.RowSetTestUtils; import org.apache.drill.exec.physical.impl.scan.project.ColumnProjection; import org.apache.drill.exec.physical.impl.scan.project.ScanLevelProjection; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.SubOperatorTest; import org.apache.hadoop.fs.Path; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestImplicitColumnProjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestImplicitColumnProjection.java index 62bfd964989..0ae4a624a66 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestImplicitColumnProjection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestImplicitColumnProjection.java @@ -46,7 +46,7 @@ import org.apache.drill.exec.physical.impl.scan.project.ScanLevelProjection; import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.SubOperatorTest; import org.apache.hadoop.fs.Path; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestScanOrchestratorImplicitColumns.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestScanOrchestratorImplicitColumns.java index 7c7573ca9d9..1c39f5d7a51 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestScanOrchestratorImplicitColumns.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestScanOrchestratorImplicitColumns.java @@ -52,7 +52,7 @@ import org.apache.hadoop.fs.Path; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * Tests the scan orchestrator's ability to merge table schemas diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java index 7b251ceef95..3325124e1aa 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java @@ -39,7 +39,7 @@ import org.apache.drill.exec.physical.resultSet.ResultSetLoader; import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.exec.physical.rowSet.RowSetTestUtils; import org.apache.drill.exec.physical.rowSet.RowSet.SingleRowSet; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileScanUtils.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileScanUtils.java index d0b1d7f0727..cc0338aeeec 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileScanUtils.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/v3/file/FileScanUtils.java @@ -21,7 +21,7 @@ import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.rowSet.RowSetTestUtils; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class FileScanUtils { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/TestOutputBatchBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/TestOutputBatchBuilder.java index ab1ba161261..56ffa977ea2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/TestOutputBatchBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/v3/lifecycle/TestOutputBatchBuilder.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java index ee67affa749..0e99f8c38dc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java @@ -42,8 +42,8 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java index 5586d03de0a..c21513e029b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java @@ -37,8 +37,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java index c40246ceba0..a266b0273e8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java @@ -47,8 +47,8 @@ import org.apache.hadoop.fs.Path; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/union/TestSimpleUnion.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/union/TestSimpleUnion.java index b2ee43b737f..e0f060bc217 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/union/TestSimpleUnion.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/union/TestSimpleUnion.java @@ -37,8 +37,8 @@ import org.apache.drill.exec.server.DrillbitContext; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/unnest/TestUnnestWithLateralCorrectness.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/unnest/TestUnnestWithLateralCorrectness.java index 3540ef15a80..f6d961dc39e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/unnest/TestUnnestWithLateralCorrectness.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/unnest/TestUnnestWithLateralCorrectness.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.unnest; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.exceptions.DrillException; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java index 002edf2aeda..076bb2b45b6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java @@ -30,8 +30,8 @@ import org.apache.drill.exec.store.dfs.FileSystemConfig; import org.apache.drill.exec.store.parquet.ParquetFormatConfig; import org.apache.drill.exec.util.JsonStringArrayList; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableList; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.apache.drill.test.TestBuilder; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestWriter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestWriter.java index 5881ad540e7..9c27d081487 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestWriter.java @@ -34,8 +34,8 @@ import org.apache.drill.exec.vector.VarCharVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class TestWriter extends BaseTestQuery { private static final String ROOT_DIR_REPLACEMENT = "%ROOT_DIR%"; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/SortTestUtilities.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/SortTestUtilities.java index 18529cad272..1c1344216c9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/SortTestUtilities.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/SortTestUtilities.java @@ -40,7 +40,7 @@ import org.apache.drill.exec.physical.rowSet.RowSet; import org.apache.drill.exec.physical.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetUtilities; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class SortTestUtilities { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSortExec.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSortExec.java index d567fe8dbcf..4fb4f6a383a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSortExec.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSortExec.java @@ -36,7 +36,7 @@ import org.apache.drill.test.DrillTest; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.junit.experimental.categories.Category; @Category(OperatorTest.class) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortEmitOutcome.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortEmitOutcome.java index 7f932c66f62..920a7ff9df1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortEmitOutcome.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortEmitOutcome.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.physical.impl.xsort; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.expression.FieldReference; import org.apache.drill.common.logical.data.Order; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortImpl.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortImpl.java index bc9f3a1064c..b7e94d969b4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortImpl.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortImpl.java @@ -56,8 +56,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSorter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSorter.java index 1cf62603fc1..4a8008cbfb0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSorter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSorter.java @@ -39,7 +39,7 @@ import org.apache.drill.exec.physical.rowSet.RowSetWriter; import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseDirTestWatcher; import org.apache.drill.test.DrillTest; import org.apache.drill.test.OperatorFixture; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderEmptyProject.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderEmptyProject.java index 86a25f2cbc5..5e5f671da7a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderEmptyProject.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderEmptyProject.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.exec.physical.rowSet.RowSetBuilder; import org.apache.drill.test.rowSet.RowSetUtilities; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderOverflow.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderOverflow.java index 143ef0c2548..f179e123111 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderOverflow.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderOverflow.java @@ -42,7 +42,7 @@ import org.apache.drill.exec.vector.accessor.ArrayReader; import org.apache.drill.exec.vector.accessor.ScalarReader; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.apache.drill.test.SubOperatorTest; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderRepeatedList.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderRepeatedList.java index 59696cf5e10..b4f756e5740 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderRepeatedList.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderRepeatedList.java @@ -43,7 +43,7 @@ import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.ValueType; import org.apache.drill.exec.vector.accessor.writer.RepeatedListWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderTorture.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderTorture.java index d5c404dc69e..4f946d36982 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderTorture.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderTorture.java @@ -42,7 +42,7 @@ import org.apache.drill.exec.physical.rowSet.RowSetReader; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; /** * Runs a worst-case scenario test that combines aspects of all diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderUnions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderUnions.java index d63a3f8c9af..4e796a39ba8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderUnions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetLoaderUnions.java @@ -67,7 +67,7 @@ import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; /** * Tests the result set loader support for union vectors. Union vectors diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetReader.java index 08ad5ac6b61..3882cbd0498 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/resultSet/impl/TestResultSetReader.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.record.selection.SelectionVector2; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.test.SubOperatorTest; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/TestVariableWidthWriter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/TestVariableWidthWriter.java index b66376a12a6..9ef4b87499d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/TestVariableWidthWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/TestVariableWidthWriter.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.ValueType; import org.apache.drill.exec.vector.accessor.writer.WriterEvents.ColumnWriterListener; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.apache.drill.test.SubOperatorTest; import org.bouncycastle.util.Arrays; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/BasicPhysicalOpUnitTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/BasicPhysicalOpUnitTest.java index 19850660744..ac7d3d2a213 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/BasicPhysicalOpUnitTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/BasicPhysicalOpUnitTest.java @@ -43,7 +43,7 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class BasicPhysicalOpUnitTest extends PhysicalOpUnitTestBase { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/MiniPlanUnitTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/MiniPlanUnitTestBase.java index 3ea25b20a04..784a1820292 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/MiniPlanUnitTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/MiniPlanUnitTestBase.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.physical.unit; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.drill.test.DrillTestWrapper; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.base.PhysicalOperator; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java index 7f5632e1663..30866c2fa5d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java @@ -38,7 +38,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; /** * This class contains examples to show how to use MiniPlanTestBuilder to test a diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestNullInputMiniPlan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestNullInputMiniPlan.java index 81ab644f66e..c7cb10cdbf2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestNullInputMiniPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestNullInputMiniPlan.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.physical.unit; import org.apache.drill.exec.record.BatchSchemaBuilder; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.calcite.rel.RelFieldCollation; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.common.expression.SchemaPath; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java index d1562ee0715..0ca78218844 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java @@ -18,8 +18,8 @@ package org.apache.drill.exec.physical.unit; import org.apache.commons.lang3.StringUtils; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.apache.calcite.rel.core.JoinRelType; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.SchemaPath; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java index b8cbb7c652e..92fffe23e0a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.commons.io.FileUtils; import org.apache.drill.PlanTestBase; import org.apache.drill.categories.PlannerTest; @@ -39,8 +39,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/common/TestNumericEquiDepthHistogram.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/common/TestNumericEquiDepthHistogram.java index 965cb4a05f6..c09aa5a670c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/common/TestNumericEquiDepthHistogram.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/common/TestNumericEquiDepthHistogram.java @@ -19,12 +19,12 @@ import org.apache.drill.categories.PlannerTest; -import org.apache.drill.shaded.guava.com.google.common.collect.BoundType; +import com.google.common.collect.BoundType; import org.apache.drill.test.BaseTest; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.Assert; -import org.apache.drill.shaded.guava.com.google.common.collect.Range; +import com.google.common.collect.Range; @Category(PlannerTest.class) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java index c7be3ffbeaf..6b1399c513a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.planner.fragment; -import org.apache.drill.shaded.guava.com.google.common.collect.HashMultiset; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.HashMultiset; +import com.google.common.collect.ImmutableList; import org.apache.drill.categories.PlannerTest; import org.apache.drill.exec.physical.EndpointAffinity; import org.apache.drill.exec.physical.base.PhysicalOperator; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillLogicalTestUtils.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillLogicalTestUtils.java index d65cb3e6ebd..7afa97a3cb0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillLogicalTestUtils.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillLogicalTestUtils.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.planner.logical; import org.apache.drill.common.parser.LogicalExpressionParser; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.calcite.rel.RelFieldCollation; import org.apache.drill.common.expression.FieldReference; import org.apache.drill.common.expression.PathSegment; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillOptiqTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillOptiqTest.java index dcaed580b17..87bdf83ef66 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillOptiqTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillOptiqTest.java @@ -19,7 +19,7 @@ import org.apache.calcite.rex.RexWindowBounds; import org.apache.drill.common.util.GuavaUtils; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/rm/TestMemoryCalculator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/rm/TestMemoryCalculator.java index d27bec118b3..ed6c1e2e62f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/rm/TestMemoryCalculator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/rm/TestMemoryCalculator.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.rpc.user.UserSession; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.work.foreman.rm.EmbeddedQueryQueue; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; +import com.google.common.collect.Iterables; import org.apache.drill.test.ClientFixture; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterFixtureBuilder; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java index 604ad67ee45..33c840cee8b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java @@ -35,8 +35,8 @@ import org.apache.drill.exec.work.foreman.ForemanSetupException; import org.junit.BeforeClass; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public abstract class PopUnitTestBase extends ExecTest{ // static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(PopUnitTestBase.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java index c01143b26bb..b1f739e94b9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.work.QueryWorkUnit; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java index 33af0b76b38..0773bc61f97 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java @@ -34,8 +34,8 @@ import org.junit.BeforeClass; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; @Category(PlannerTest.class) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/ExpressionTreeMaterializerTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/ExpressionTreeMaterializerTest.java index 5caaaa188aa..3abd8cba7d5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/ExpressionTreeMaterializerTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/ExpressionTreeMaterializerTest.java @@ -46,8 +46,8 @@ import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Range; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Range; import org.junit.experimental.categories.Category; import org.slf4j.Logger; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java index e85dd1ba94a..befca792239 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java @@ -23,7 +23,7 @@ import static org.junit.Assert.fail; import org.apache.drill.exec.store.mock.MockSubScanPOP; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.categories.VectorTest; import org.apache.drill.common.config.DrillConfig; @@ -47,8 +47,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.experimental.categories.Category; import org.mockito.Mockito; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java index 35b2e7fbaf1..7412906d5f8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java @@ -20,7 +20,7 @@ import static org.junit.Assert.fail; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.categories.VectorTest; import org.apache.drill.common.types.TypeProtos; import org.apache.drill.common.types.TypeProtos.MinorType; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java index 0a89557f1b6..c2a0fd74090 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java @@ -34,8 +34,8 @@ import org.apache.drill.exec.server.Drillbit; import org.apache.drill.exec.server.RemoteServiceSet; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java index b81a60567c8..5342dc7d427 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java @@ -64,8 +64,8 @@ import org.apache.drill.exec.vector.complex.MapVector; import org.apache.drill.exec.vector.complex.RepeatedListVector; import org.apache.drill.exec.vector.complex.RepeatedMapVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java index a00401c9f71..8fb60ad3fcf 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java @@ -18,9 +18,9 @@ package org.apache.drill.exec.rpc.data; import org.apache.drill.exec.proto.BitData; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseDirTestWatcher; import org.apache.drill.test.ClientFixture; import org.apache.drill.test.ClusterFixture; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitRpc.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitRpc.java index 4b145dfb049..c162a7625fb 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitRpc.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitRpc.java @@ -18,8 +18,8 @@ package org.apache.drill.exec.rpc.data; import org.apache.drill.exec.proto.BitData; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.scanner.ClassPathScanner; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java index 0777ebdbe90..0783b44982b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.rpc.user.security; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.categories.SecurityTest; import org.apache.drill.common.config.DrillProperties; import org.apache.drill.exec.ExecConstants; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java index 7324af4692e..5f7b0f39caa 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.rpc.user.security; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseDirTestWatcher; import org.apache.drill.test.ClientFixture; import org.apache.drill.test.ClusterFixture; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java index 54b633b8d5a..828ded7c562 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.rpc.user.security; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import com.typesafe.config.ConfigValueFactory; import org.apache.drill.categories.SecurityTest; import org.apache.drill.common.config.DrillConfig; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java index a71ea313c21..cc23a06b5f5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java @@ -95,7 +95,7 @@ import org.junit.jupiter.api.extension.TestInstantiationException; import org.slf4j.Logger; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** *

Test how resilient drillbits are to throwing exceptions during various phases of query diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptionsAuthEnabled.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptionsAuthEnabled.java index a1a34c9c7fa..3f7f97c2b50 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptionsAuthEnabled.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptionsAuthEnabled.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.server; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; +import com.google.common.base.Joiner; import com.typesafe.config.ConfigValueFactory; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.common.config.DrillProperties; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestMainLoginPageModel.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestMainLoginPageModel.java index 29bf97f90e9..db1638ef52f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestMainLoginPageModel.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestMainLoginPageModel.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.server.rest; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import com.typesafe.config.ConfigValueFactory; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.exec.ExecConstants; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestRestJson.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestRestJson.java index b4325112e88..c8603903053 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestRestJson.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestRestJson.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.proto.UserBitShared.QueryType; import org.apache.drill.exec.store.easy.text.TextFormatConfig; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.ClusterTest; import org.junit.BeforeClass; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestDrillSpnegoAuthenticator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestDrillSpnegoAuthenticator.java index ad93742dc36..854cb79a3b7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestDrillSpnegoAuthenticator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestDrillSpnegoAuthenticator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.server.rest.spnego; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import com.typesafe.config.ConfigValueFactory; import org.apache.commons.codec.binary.Base64; import org.apache.drill.categories.SecurityTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java index 0d3ae96e0a3..8a48662803c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.server.rest.spnego; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import com.typesafe.config.ConfigValueFactory; import org.apache.commons.codec.binary.Base64; import org.apache.drill.categories.SecurityTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoConfig.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoConfig.java index baaac985dc2..da39c7c9842 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoConfig.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoConfig.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.server.rest.spnego; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import com.typesafe.config.ConfigValueFactory; import org.apache.drill.categories.SecurityTest; import org.apache.drill.common.config.DrillConfig; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java index 8569d2fb28e..3acc0b2ebd7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.sql; import org.apache.drill.PlanTestBase; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.apache.drill.test.TestBuilder; import java.util.Arrays; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTAS.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTAS.java index ddbdb258729..1ca9631a4f9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTAS.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTAS.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.proto.UserBitShared; import org.apache.drill.exec.rpc.user.QueryDataBatch; import org.apache.drill.exec.store.StorageStrategy; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.test.BaseTestQuery; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java index 41ed71e3d5e..32f61fbd193 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.store.dfs.FileSystemConfig; import org.apache.drill.exec.store.dfs.WorkspaceConfig; import org.apache.drill.common.logical.security.PlainCredentialsProvider; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseTestQuery; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestMetastoreCommands.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestMetastoreCommands.java index 7f42403c9f5..19c96119577 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestMetastoreCommands.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestMetastoreCommands.java @@ -45,8 +45,8 @@ import org.apache.drill.metastore.statistics.ExactStatisticsConstants; import org.apache.drill.metastore.statistics.StatisticsHolder; import org.apache.drill.metastore.statistics.TableStatisticsKind; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.ClusterTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java index 6267e30f83f..92e2bf16346 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.sql; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Function; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.categories.SqlTest; import org.apache.drill.common.exceptions.UserRemoteException; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/StorageStrategyTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/StorageStrategyTest.java index 0da939def63..d648e76af80 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/StorageStrategyTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/StorageStrategyTest.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.common.util.DrillFileUtils; import org.apache.drill.exec.ExecTest; import org.apache.drill.test.BaseTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java index 6ba4d8cfccf..2b2c00fedfa 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java @@ -21,8 +21,8 @@ import org.apache.hadoop.fs.BlockLocation; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableRangeMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Range; +import com.google.common.collect.ImmutableRangeMap; +import com.google.common.collect.Range; public class TestAffinityCalculator extends ExecTest { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestAffinityCalculator.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestImplicitFileColumns.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestImplicitFileColumns.java index d533c7d268e..7084c8ec6b4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestImplicitFileColumns.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestImplicitFileColumns.java @@ -27,8 +27,8 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.util.JsonStringArrayList; import org.apache.drill.exec.util.Text; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.apache.drill.test.BaseTestQuery; import org.junit.BeforeClass; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java index cc08e864d25..781d1b61d9b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java @@ -32,7 +32,7 @@ import org.apache.drill.exec.util.CallBack; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestFileSelection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestFileSelection.java index 9ab4aeac8b5..524ef7d4c2e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestFileSelection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestFileSelection.java @@ -24,7 +24,7 @@ import org.apache.drill.common.util.DrillStringUtils; import org.apache.drill.exec.util.DrillFileSystemUtil; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.test.BaseTestQuery; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestCsvHeader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestCsvHeader.java index 31758e456b5..c4fc7f66140 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestCsvHeader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestCsvHeader.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.drill.categories.EvfTest; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.test.TestBuilder; import org.junit.Before; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestHeaderBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestHeaderBuilder.java index 42b687b77f9..640af9c09b6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestHeaderBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestHeaderBuilder.java @@ -26,7 +26,7 @@ import org.apache.hadoop.fs.Path; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; /** * Test the mechanism that builds column names from a set of CSV diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/enumerable/plan/EnumMockPlugin.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/enumerable/plan/EnumMockPlugin.java index 90a6c48f3ed..245f765f377 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/enumerable/plan/EnumMockPlugin.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/enumerable/plan/EnumMockPlugin.java @@ -29,7 +29,7 @@ import org.apache.drill.exec.store.AbstractStoragePlugin; import org.apache.drill.exec.store.SchemaConfig; import org.apache.drill.exec.store.SchemaFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.util.Collections; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonReader.java index cdb57809696..b9ca4dde1e6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonReader.java @@ -36,8 +36,8 @@ import org.apache.drill.exec.store.easy.json.JSONRecordReader; import org.apache.drill.exec.util.JsonStringHashMap; import org.apache.drill.exec.util.Text; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.apache.drill.test.BaseTestQuery; import org.junit.BeforeClass; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonReaderQueries.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonReaderQueries.java index f8dff11f54c..0b9d345e0ba 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonReaderQueries.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonReaderQueries.java @@ -45,8 +45,8 @@ import org.apache.drill.exec.physical.rowSet.RowSet; import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.QueryBuilder.QuerySummary; import org.apache.drill.test.QueryResultSet; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java index 4526381fc30..02c1b8b14ee 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java @@ -76,10 +76,10 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; +import com.google.common.io.Files; @Ignore public class ParquetRecordReaderTest extends BaseTestQuery { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetResultListener.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetResultListener.java index c31807bf4f1..7b1b6ce0e50 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetResultListener.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetResultListener.java @@ -37,8 +37,8 @@ import org.apache.drill.exec.rpc.user.UserResultsListener; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.SettableFuture; +import com.google.common.base.Strings; +import com.google.common.util.concurrent.SettableFuture; public class ParquetResultListener implements UserResultsListener { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ParquetResultListener.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestEmptyParquet.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestEmptyParquet.java index 80602ab2510..f6e55110fc3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestEmptyParquet.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestEmptyParquet.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Resources; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterFixtureBuilder; import org.apache.drill.test.ClusterTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java index 53ff664ba93..68c1fceb223 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java @@ -38,9 +38,9 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.base.Stopwatch; +import com.google.common.io.Resources; public class TestParquetPhysicalPlan extends ExecTest { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestParquetPhysicalPlan.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetScan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetScan.java index 26372bed765..ebecc694dd3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetScan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetScan.java @@ -19,7 +19,7 @@ import org.apache.drill.categories.ParquetTest; import org.apache.drill.categories.UnlikelyTest; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Resources; import org.apache.commons.io.FileUtils; import org.apache.drill.test.BaseTestQuery; import org.junit.Test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/store/TestAssignment.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/store/TestAssignment.java index 853f2ce4b0b..7250cb57b44 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/store/TestAssignment.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/store/TestAssignment.java @@ -17,10 +17,10 @@ */ package org.apache.drill.exec.store.store; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Iterators; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; import org.apache.drill.exec.store.schedule.AssignmentCreator; import org.apache.drill.exec.store.schedule.CompleteFileWork; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestLocalPersistentStore.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestLocalPersistentStore.java index 42dbf922a33..6611344eacd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestLocalPersistentStore.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestLocalPersistentStore.java @@ -21,7 +21,7 @@ import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.exec.store.dfs.DrillFileSystem; import org.apache.drill.exec.store.sys.store.LocalPersistentStore; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.drill.test.BaseTest; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/Controls.java b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/Controls.java index 5add50ccc14..9e81c4849d4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/Controls.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/Controls.java @@ -21,7 +21,7 @@ import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import static org.apache.drill.exec.testing.ExecutionControls.EMPTY_CONTROLS; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestResourceLeak.java b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestResourceLeak.java index c2bc2816072..1f5ee9f46f0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestResourceLeak.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestResourceLeak.java @@ -48,8 +48,8 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.io.Resources; /* * TODO(DRILL-3170) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/udf/dynamic/TestDynamicUDFSupport.java b/exec/java-exec/src/test/java/org/apache/drill/exec/udf/dynamic/TestDynamicUDFSupport.java index 0d9ec29aa7e..15567685050 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/udf/dynamic/TestDynamicUDFSupport.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/udf/dynamic/TestDynamicUDFSupport.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.udf.dynamic; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.reflect.FieldUtils; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTestBase.java index d6b7f450d04..36a5fcfb254 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTestBase.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.util; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.apache.commons.io.FileUtils; import org.apache.drill.common.util.DrillFileUtils; import org.apache.drill.exec.ExecTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/util/StoragePluginTestUtils.java b/exec/java-exec/src/test/java/org/apache/drill/exec/util/StoragePluginTestUtils.java index 2d48dbfbb16..821a99e3a08 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/util/StoragePluginTestUtils.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/util/StoragePluginTestUtils.java @@ -23,7 +23,7 @@ import java.util.Optional; import org.apache.drill.common.logical.security.PlainCredentialsProvider; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.common.logical.FormatPluginConfig; import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.exec.store.StoragePluginRegistry.PluginException; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/FileTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/FileTest.java index 2bd475398a4..74a2f0d17d0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/FileTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/FileTest.java @@ -30,7 +30,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; public class FileTest { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FileTest.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java index 8354ceabe07..b01fcf710d3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java @@ -30,8 +30,8 @@ import org.apache.drill.exec.server.RemoteServiceSet; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.io.Files; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class TestSpoolingBuffer extends BaseTestQuery { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSpoolingBuffer.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestLimit0VsRegularQueriesMetadata.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestLimit0VsRegularQueriesMetadata.java index 54fc2eaf0c6..f8e553db1f4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestLimit0VsRegularQueriesMetadata.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestLimit0VsRegularQueriesMetadata.java @@ -21,8 +21,8 @@ import org.apache.drill.common.types.Types; import org.apache.drill.exec.ExecConstants; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.junit.Test; public class TestLimit0VsRegularQueriesMetadata extends PreparedStatementTestBase { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestPreparedStatementProvider.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestPreparedStatementProvider.java index 2d0bc7e4866..40a46c71e1c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestPreparedStatementProvider.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestPreparedStatementProvider.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.proto.UserProtos.PreparedStatement; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; /** * Tests for creating and executing prepared statements. diff --git a/exec/java-exec/src/test/java/org/apache/drill/storage/CredentialsProviderImplementationsTest.java b/exec/java-exec/src/test/java/org/apache/drill/storage/CredentialsProviderImplementationsTest.java index c49df893e9c..5c2feb1bdce 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/storage/CredentialsProviderImplementationsTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/storage/CredentialsProviderImplementationsTest.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.store.security.HadoopCredentialsProvider; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; import org.apache.drill.exec.store.security.vault.VaultCredentialsProvider; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.apache.hadoop.conf.Configuration; diff --git a/exec/java-exec/src/test/java/org/apache/drill/storage/CredentialsProviderSerDeTest.java b/exec/java-exec/src/test/java/org/apache/drill/storage/CredentialsProviderSerDeTest.java index ab4946b5a35..ac95705da8c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/storage/CredentialsProviderSerDeTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/storage/CredentialsProviderSerDeTest.java @@ -27,7 +27,7 @@ import org.apache.drill.common.logical.security.PlainCredentialsProvider; import org.apache.drill.exec.store.security.UsernamePasswordCredentials; import org.apache.drill.exec.store.security.vault.VaultCredentialsProvider; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.ClusterTest; import org.junit.BeforeClass; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java b/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java index 7654b1971c8..daf73837b13 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java @@ -24,7 +24,7 @@ import org.apache.commons.io.FileUtils; import org.apache.drill.exec.store.StoragePluginRegistry; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import org.junit.runner.Description; /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java b/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java index c666f394a13..9e6270874be 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java @@ -64,9 +64,9 @@ import org.apache.drill.exec.util.StoragePluginTestUtils; import org.apache.drill.exec.util.VectorUtil; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.base.Preconditions; +import com.google.common.io.Resources; import org.apache.drill.test.DrillTestWrapper.TestServices; import org.apache.hadoop.fs.FileSystem; import org.junit.AfterClass; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/BufferingQueryEventListener.java b/exec/java-exec/src/test/java/org/apache/drill/test/BufferingQueryEventListener.java index 7618456c8bd..1f88fee47e0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/BufferingQueryEventListener.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/BufferingQueryEventListener.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.rpc.user.QueryDataBatch; import org.apache.drill.exec.rpc.user.UserResultsListener; -import org.apache.drill.shaded.guava.com.google.common.collect.Queues; +import com.google.common.collect.Queues; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java index 60951060c88..3b5014d27f0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java @@ -60,10 +60,10 @@ import org.apache.drill.common.logical.security.PlainCredentialsProvider; import org.apache.drill.exec.store.sys.store.provider.ZookeeperPersistentStoreProvider; import org.apache.drill.exec.util.StoragePluginTestUtils; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Resources; import org.apache.drill.test.DrillTestWrapper.TestServices; import org.apache.hadoop.fs.FileSystem; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixtureBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixtureBuilder.java index a510c5834f7..e3b76822928 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixtureBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixtureBuilder.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.ZookeeperHelper; import org.apache.drill.exec.server.options.OptionDefinition; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Build a Drillbit and client with the options provided. The simplest diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/ConfigBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/ConfigBuilder.java index 7f7280e50f9..86e1bb320da 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/ConfigBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/ConfigBuilder.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.physical.impl.BaseRootExec; import org.apache.drill.exec.server.options.OptionDefinition; import org.apache.drill.exec.server.options.SystemOptionManager; -import org.apache.drill.shaded.guava.com.google.common.primitives.Primitives; +import com.google.common.primitives.Primitives; import java.util.Map.Entry; import java.util.Properties; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/DrillTestWrapper.java b/exec/java-exec/src/test/java/org/apache/drill/test/DrillTestWrapper.java index f644822cb02..3876bde0fe5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/DrillTestWrapper.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/DrillTestWrapper.java @@ -35,7 +35,7 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.commons.lang3.tuple.Pair; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.types.TypeProtos; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/LegacyOperatorTestBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/LegacyOperatorTestBuilder.java index 85bd8c96880..4bde0e213b7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/LegacyOperatorTestBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/LegacyOperatorTestBuilder.java @@ -17,8 +17,8 @@ */ package org.apache.drill.test; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.SchemaPath; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/OperatorFixture.java b/exec/java-exec/src/test/java/org/apache/drill/test/OperatorFixture.java index 4d945c3df67..2101da53aed 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/OperatorFixture.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/OperatorFixture.java @@ -23,10 +23,10 @@ import org.apache.drill.exec.physical.resultSet.impl.ResultSetLoaderImpl.ResultSetOptions; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.metastore.MetastoreRegistry; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.ListenableFuture; +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/OperatorTestBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/OperatorTestBuilder.java index 58733d4f641..1fdfb280e5e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/OperatorTestBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/OperatorTestBuilder.java @@ -17,7 +17,7 @@ */ package org.apache.drill.test; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.drill.exec.physical.base.AbstractBase; import org.apache.drill.exec.physical.base.PhysicalOperator; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/ProfileParser.java b/exec/java-exec/src/test/java/org/apache/drill/test/ProfileParser.java index e7d4f037b0e..879f05594ad 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/ProfileParser.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/ProfileParser.java @@ -38,7 +38,7 @@ import javax.json.JsonValue; import org.apache.drill.exec.server.rest.profile.CoreOperatorType; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/QueryBatchIterator.java b/exec/java-exec/src/test/java/org/apache/drill/test/QueryBatchIterator.java index d127ac40bd0..e2fcb9699b0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/QueryBatchIterator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/QueryBatchIterator.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.exec.rpc.user.QueryDataBatch; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.test.BufferingQueryEventListener.QueryEvent; /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/QueryBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/QueryBuilder.java index 9e6d57a8441..670f79a6a80 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/QueryBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/QueryBuilder.java @@ -61,7 +61,7 @@ import org.apache.drill.exec.vector.NullableVarCharVector; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.ScalarReader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.test.BufferingQueryEventListener.QueryEvent; import org.joda.time.Period; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/RestClientFixture.java b/exec/java-exec/src/test/java/org/apache/drill/test/RestClientFixture.java index 2c5e4a87c43..016ce8e9568 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/RestClientFixture.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/RestClientFixture.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import org.apache.drill.exec.server.rest.PluginConfigWrapper; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.server.rest.StatusResources; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.JerseyClientBuilder; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/TestBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/TestBuilder.java index 80ee9ac6020..fcfbd406170 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/TestBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/TestBuilder.java @@ -49,8 +49,8 @@ import org.apache.drill.test.DrillTestWrapper.TestServices; import org.joda.time.DateTimeZone; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; public class TestBuilder { diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetComparison.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetComparison.java index 86e9e63901f..4e7b9a225d1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetComparison.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetComparison.java @@ -31,9 +31,9 @@ import org.apache.drill.exec.physical.rowSet.RowSet; import org.apache.drill.exec.physical.rowSet.RowSetReader; -import org.apache.drill.shaded.guava.com.google.common.base.Optional; -import org.apache.drill.shaded.guava.com.google.common.collect.HashMultiset; -import org.apache.drill.shaded.guava.com.google.common.collect.Multiset; +import com.google.common.base.Optional; +import com.google.common.collect.HashMultiset; +import com.google.common.collect.Multiset; import org.apache.drill.exec.vector.accessor.ArrayReader; import org.apache.drill.exec.vector.accessor.ObjectReader; import org.apache.drill.exec.vector.accessor.ScalarReader; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/file/JsonFileBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/file/JsonFileBuilder.java index 11e6604a997..1d3bbbd70e2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/file/JsonFileBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/file/JsonFileBuilder.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.physical.resultSet.util.JsonWriter; import org.apache.drill.exec.physical.rowSet.RowSet; import org.apache.drill.exec.physical.rowSet.RowSetReader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** *

Overview

diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/PerformanceTool.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/PerformanceTool.java index f0f0228a133..07f870f8ac0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/PerformanceTool.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/PerformanceTool.java @@ -34,7 +34,7 @@ import org.apache.drill.exec.vector.accessor.writer.AbstractArrayWriter.ArrayObjectWriter; import org.apache.drill.exec.vector.accessor.writer.NullableScalarWriter; import org.apache.drill.exec.vector.accessor.writer.ScalarArrayWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.apache.drill.test.OperatorFixture; /** diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillColumnMetaDataList.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillColumnMetaDataList.java index 104a8ec0b56..27132f655bd 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillColumnMetaDataList.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillColumnMetaDataList.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.record.BatchSchema; import org.apache.drill.exec.record.MaterializedField; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public class DrillColumnMetaDataList extends BasicList{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillColumnMetaDataList.class); diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillConnectionImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillConnectionImpl.java index 63f2f77929b..f4cae625c08 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillConnectionImpl.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillConnectionImpl.java @@ -65,7 +65,7 @@ import org.apache.drill.jdbc.JdbcApiSqlException; import org.slf4j.Logger; -import org.apache.drill.shaded.guava.com.google.common.base.Throwables; +import com.google.common.base.Throwables; import org.slf4j.LoggerFactory; /** diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillCursor.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillCursor.java index f627b3ffcdb..284911baed2 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillCursor.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillCursor.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.rpc.user.BlockingResultsListener; import org.apache.drill.jdbc.DrillStatement; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import org.apache.calcite.avatica.AvaticaStatement; import org.apache.calcite.avatica.ColumnMetaData; import org.apache.calcite.avatica.Meta; diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillDatabaseMetaDataImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillDatabaseMetaDataImpl.java index e080721a1ac..554d4c15f7c 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillDatabaseMetaDataImpl.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillDatabaseMetaDataImpl.java @@ -49,9 +49,9 @@ import org.apache.drill.jdbc.AlreadyClosedSqlException; import org.apache.drill.jdbc.DrillDatabaseMetaData; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.base.Throwables; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.base.Joiner; +import com.google.common.base.Throwables; +import com.google.common.collect.ImmutableSet; /** * Drill's implementation of {@link java.sql.DatabaseMetaData}. diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillMetaImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillMetaImpl.java index 8e21a7f2111..ed80321a2c2 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillMetaImpl.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillMetaImpl.java @@ -62,7 +62,7 @@ import org.apache.drill.exec.rpc.DrillRpcFuture; import org.apache.drill.exec.rpc.RpcException; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; public class DrillMetaImpl extends MetaImpl { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillMetaImpl.class); diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetImpl.java index 86dac42adf8..92fb53fe2cb 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetImpl.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetImpl.java @@ -50,7 +50,7 @@ import org.apache.drill.jdbc.DrillResultSet; import org.apache.drill.jdbc.ExecutionCanceledSqlException; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; /** * Drill's implementation of {@link java.sql.ResultSet}. diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfo.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfo.java index 04b0c5defd3..6b7c3fac2d1 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfo.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfo.java @@ -20,9 +20,9 @@ import java.util.Map; import java.util.Properties; -import org.apache.drill.shaded.guava.com.google.common.base.Objects; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.base.Objects; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; /** * An immutable bag of parameters that describes a {@link java.sql.Connection}. diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java index 14dacdfa7e5..86bc648972f 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java @@ -38,7 +38,7 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.io.Resources; import org.junit.experimental.categories.Category; /** diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java index 6234bde45c3..4951ea60ed5 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/JdbcTestBase.java @@ -37,10 +37,10 @@ import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.jdbc.impl.DrillConnectionImpl; import org.apache.drill.jdbc.impl.DrillConnectionUtils; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Function; +import com.google.common.base.Strings; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import org.apache.calcite.linq4j.Ord; import org.apache.drill.categories.JdbcTest; import org.apache.drill.common.config.DrillConfig; diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/MultiConnectionCachingFactory.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/MultiConnectionCachingFactory.java index 695c3c19ef5..7a99ddf7613 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/MultiConnectionCachingFactory.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/MultiConnectionCachingFactory.java @@ -21,7 +21,7 @@ import java.sql.SQLException; import java.util.Map; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/NonClosableConnection.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/NonClosableConnection.java index 3c4be477cc0..725c53d1b1b 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/NonClosableConnection.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/NonClosableConnection.java @@ -17,7 +17,7 @@ */ package org.apache.drill.jdbc; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.sql.Array; import java.sql.Blob; diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementTest.java index 43fe2dffa46..7312197fae5 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementTest.java @@ -62,7 +62,7 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.junit.experimental.categories.Category; /** diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ResultSetCloseReleasesBuffersTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ResultSetCloseReleasesBuffersTest.java index 106d3732a17..bccfac9f668 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ResultSetCloseReleasesBuffersTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ResultSetCloseReleasesBuffersTest.java @@ -28,7 +28,7 @@ import org.junit.BeforeClass; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Function; +import com.google.common.base.Function; import org.junit.experimental.categories.Category; @Category(JdbcTest.class) diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Hook.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Hook.java index 79e94298600..264a57a9e15 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Hook.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Hook.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.apache.drill.shaded.guava.com.google.common.base.Function; +import com.google.common.base.Function; public enum Hook { /** Called with the logical plan. */ diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java index 08aa0f9fb33..388f939765d 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java @@ -46,11 +46,11 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.base.Predicate; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; -import org.apache.drill.shaded.guava.com.google.common.io.Resources; +import com.google.common.base.Charsets; +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import com.google.common.io.Resources; import org.junit.experimental.categories.Category; /** Unit tests for Drill's JDBC driver. */ diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java index d7357842a7c..b711d902d67 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java @@ -33,7 +33,7 @@ import org.junit.Rule; import org.junit.rules.TestRule; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; public class JdbcTestActionBase extends JdbcTestBase { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(JdbcTestActionBase.class); diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java index 3bfefed7e51..65691d90c99 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java @@ -30,7 +30,7 @@ import org.junit.Rule; import org.junit.rules.TestRule; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; public class JdbcTestQueryBase extends JdbcTestBase { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(JdbcTestQueryBase.class); diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java index 6c8dc233084..94e44f5e5fe 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java @@ -38,8 +38,8 @@ import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; @Category(JdbcTest.class) public class TestJdbcDistQuery extends JdbcTestBase { diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java index bb8cacae31e..75704a746a1 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java @@ -33,7 +33,7 @@ import org.junit.Ignore; import org.junit.Test; -import org.apache.drill.shaded.guava.com.google.common.base.Function; +import com.google.common.base.Function; import org.junit.experimental.categories.Category; @Category(JdbcTest.class) diff --git a/exec/memory/base/src/main/java/io/netty/buffer/DrillBuf.java b/exec/memory/base/src/main/java/io/netty/buffer/DrillBuf.java index 1f5fc7b730d..160f542b598 100644 --- a/exec/memory/base/src/main/java/io/netty/buffer/DrillBuf.java +++ b/exec/memory/base/src/main/java/io/netty/buffer/DrillBuf.java @@ -37,7 +37,7 @@ import org.apache.drill.exec.memory.BoundsChecking; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.ops.BufferManager; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/Accountant.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/Accountant.java index cf55f5f51cc..b94a6f05359 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/Accountant.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/Accountant.java @@ -24,8 +24,8 @@ import org.apache.drill.exec.exception.OutOfMemoryException; import org.apache.drill.exec.util.AssertionUtil; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; /** * Provides a concurrent way to manage account for memory usage without locking. Used as basis for Allocators. All diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationManager.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationManager.java index d0c19220189..f542d95cc11 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationManager.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationManager.java @@ -35,8 +35,8 @@ import org.apache.drill.exec.metrics.DrillMetrics; import org.apache.drill.exec.ops.BufferManager; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; /** * Manages the relationship between one or more allocators and a particular diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BaseAllocator.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BaseAllocator.java index a9270423ad4..5d2632c8f38 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BaseAllocator.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BaseAllocator.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.memory.AllocationManager.BufferLedger; import org.apache.drill.exec.ops.BufferManager; import org.apache.drill.exec.util.AssertionUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BoundsChecking.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BoundsChecking.java index 098b20aa544..4e7410d386e 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BoundsChecking.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BoundsChecking.java @@ -21,7 +21,7 @@ import java.util.Formatter; import org.apache.drill.exec.util.AssertionUtil; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/RootAllocator.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/RootAllocator.java index 4aeb3628e0b..ea0288630b9 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/RootAllocator.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/RootAllocator.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.memory; import com.codahale.metrics.Gauge; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import org.apache.drill.exec.metrics.DrillMetrics; /** diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BasicClient.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BasicClient.java index bd4c0ef1d05..c47f49786b5 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BasicClient.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BasicClient.java @@ -42,7 +42,7 @@ import org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode; import org.apache.drill.exec.rpc.security.AuthenticationOutcomeListener; import org.apache.drill.exec.rpc.security.AuthenticatorFactory; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.hadoop.security.UserGroupInformation; import javax.security.sasl.SaslClient; diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BasicServer.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BasicServer.java index 2870d6672f6..74469cc9d14 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BasicServer.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BasicServer.java @@ -39,7 +39,7 @@ import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import com.google.protobuf.Internal.EnumLite; import com.google.protobuf.MessageLite; import com.google.protobuf.Parser; diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChunkCreationHandler.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChunkCreationHandler.java index eef92da956b..6bfa4a311c3 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChunkCreationHandler.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChunkCreationHandler.java @@ -25,7 +25,7 @@ import java.util.List; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkArgument; import static java.lang.Math.min; /** diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFutureImpl.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFutureImpl.java index c274cb1c351..ec85ff98aa1 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFutureImpl.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFutureImpl.java @@ -20,7 +20,7 @@ import io.netty.buffer.ByteBuf; import org.apache.drill.common.concurrent.AbstractCheckedFuture; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.AbstractFuture; +import com.google.common.util.concurrent.AbstractFuture; class DrillRpcFutureImpl extends AbstractCheckedFuture implements DrillRpcFuture, RpcOutcomeListener { diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/FutureBitCommand.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/FutureBitCommand.java index ab8a7aa8227..2437ddb7a36 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/FutureBitCommand.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/FutureBitCommand.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.rpc; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.SettableFuture; +import com.google.common.util.concurrent.SettableFuture; import com.google.protobuf.Internal.EnumLite; import com.google.protobuf.MessageLite; import io.netty.buffer.ByteBuf; diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutboundRpcMessage.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutboundRpcMessage.java index 5554f723519..97836eabef8 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutboundRpcMessage.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutboundRpcMessage.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import com.google.protobuf.Internal.EnumLite; import com.google.protobuf.MessageLite; diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java index 2efb6f5c5b2..c648a169e27 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java @@ -27,8 +27,8 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.AbstractFuture; +import com.google.common.base.Preconditions; +import com.google.common.util.concurrent.AbstractFuture; import com.google.protobuf.MessageLite; /** diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RequestIdMap.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RequestIdMap.java index cc2d9b974ad..11b829ef200 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RequestIdMap.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RequestIdMap.java @@ -22,7 +22,7 @@ import org.apache.drill.common.exceptions.UserRemoteException; import org.apache.drill.exec.proto.UserBitShared.DrillPBError; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcBus.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcBus.java index c296f398aad..69c1bb33118 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcBus.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcBus.java @@ -33,8 +33,8 @@ import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode; import org.apache.drill.exec.proto.UserBitShared.DrillPBError; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; import java.io.Closeable; import java.net.SocketAddress; diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCheckedFuture.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCheckedFuture.java index bb74c842a71..2ad0b0c1199 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCheckedFuture.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCheckedFuture.java @@ -20,7 +20,7 @@ import io.netty.buffer.ByteBuf; import org.apache.drill.common.concurrent.AbstractCheckedFuture; -import org.apache.drill.shaded.guava.com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListenableFuture; public class RpcCheckedFuture extends AbstractCheckedFuture implements DrillRpcFuture { diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConfig.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConfig.java index f7eb17a8df9..192f965844f 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConfig.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConfig.java @@ -20,9 +20,9 @@ import java.util.Map; import java.util.concurrent.Executor; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import com.google.protobuf.Internal.EnumLite; import com.google.protobuf.MessageLite; diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/AuthenticationOutcomeListener.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/AuthenticationOutcomeListener.java index 42172c9237f..fd3316c462a 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/AuthenticationOutcomeListener.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/AuthenticationOutcomeListener.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.rpc.security; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import com.google.protobuf.ByteString; import com.google.protobuf.Internal.EnumLite; import com.google.protobuf.MessageLite; @@ -40,7 +40,7 @@ import java.util.EnumMap; import java.util.Map; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; /** * Handles SASL exchange, on the client-side. diff --git a/exec/vector/src/main/codegen/includes/vv_imports.ftl b/exec/vector/src/main/codegen/includes/vv_imports.ftl index b7bb2b9e125..c12a29172a8 100644 --- a/exec/vector/src/main/codegen/includes/vv_imports.ftl +++ b/exec/vector/src/main/codegen/includes/vv_imports.ftl @@ -17,15 +17,15 @@ limitations under the License. --> -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkArgument; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkState; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.ObjectArrays; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; -import org.apache.drill.shaded.guava.com.google.common.collect.ObjectArrays; +import com.google.common.collect.Lists; +import com.google.common.collect.ObjectArrays; +import com.google.common.base.Charsets; +import com.google.common.collect.ObjectArrays; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import io.netty.buffer.*; import org.apache.commons.lang3.ArrayUtils; diff --git a/exec/vector/src/main/codegen/templates/BasicTypeHelper.java b/exec/vector/src/main/codegen/templates/BasicTypeHelper.java index 39345377c07..a34649fe377 100644 --- a/exec/vector/src/main/codegen/templates/BasicTypeHelper.java +++ b/exec/vector/src/main/codegen/templates/BasicTypeHelper.java @@ -38,7 +38,7 @@ import org.apache.drill.exec.vector.complex.DictVector; import org.apache.drill.exec.util.CallBack; import org.apache.drill.common.types.Types; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; import java.util.List; diff --git a/exec/vector/src/main/codegen/templates/ColumnAccessors.java b/exec/vector/src/main/codegen/templates/ColumnAccessors.java index 8b968981c64..259c6df8ce8 100644 --- a/exec/vector/src/main/codegen/templates/ColumnAccessors.java +++ b/exec/vector/src/main/codegen/templates/ColumnAccessors.java @@ -142,7 +142,7 @@ public ValueType extendedType() { import org.apache.drill.exec.vector.accessor.writer.AbstractFixedWidthWriter.BaseIntWriter; import org.apache.drill.exec.vector.accessor.writer.BaseVarWidthWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; import io.netty.buffer.DrillBuf; diff --git a/exec/vector/src/main/codegen/templates/NullableValueVectors.java b/exec/vector/src/main/codegen/templates/NullableValueVectors.java index d92cb5d92ac..7e6cdc466c0 100644 --- a/exec/vector/src/main/codegen/templates/NullableValueVectors.java +++ b/exec/vector/src/main/codegen/templates/NullableValueVectors.java @@ -30,7 +30,7 @@ package org.apache.drill.exec.vector; <#include "/@includes/vv_imports.ftl" /> -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * Nullable${minor.class} implements a vector of values which could be null. Elements in the vector diff --git a/exec/vector/src/main/codegen/templates/UnionVector.java b/exec/vector/src/main/codegen/templates/UnionVector.java index d4581cb1c35..d817f72d972 100644 --- a/exec/vector/src/main/codegen/templates/UnionVector.java +++ b/exec/vector/src/main/codegen/templates/UnionVector.java @@ -33,14 +33,14 @@ import org.apache.drill.exec.vector.complex.impl.ComplexCopier; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.exec.util.CallBack; import org.apache.drill.exec.expr.BasicTypeHelper; import org.apache.drill.exec.memory.AllocationManager.BufferLedger; import org.apache.drill.exec.record.MaterializedField; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /* * This class is generated using freemarker and the ${.template_name} template. diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteFunctionHelpers.java b/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteFunctionHelpers.java index 59077a41b97..2bdbb5128aa 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteFunctionHelpers.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteFunctionHelpers.java @@ -22,7 +22,7 @@ import org.apache.drill.exec.util.DecimalUtility; -import org.apache.drill.shaded.guava.com.google.common.primitives.UnsignedLongs; +import com.google.common.primitives.UnsignedLongs; import static org.apache.drill.exec.memory.BoundsChecking.rangeCheck; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/RepeatedListColumnMetadata.java b/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/RepeatedListColumnMetadata.java index 501f62ef63a..7192d4eb812 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/RepeatedListColumnMetadata.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/RepeatedListColumnMetadata.java @@ -21,7 +21,7 @@ import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.MaterializedField; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class RepeatedListColumnMetadata extends AbstractColumnMetadata { diff --git a/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/TupleNameSpace.java b/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/TupleNameSpace.java index 4c37311a789..09dfe425096 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/TupleNameSpace.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/TupleNameSpace.java @@ -23,8 +23,8 @@ import java.util.Map; import org.apache.drill.common.map.CaseInsensitiveMap; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; /** * Implementation of a tuple name space. Tuples allow both indexed and diff --git a/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/VariantSchema.java b/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/VariantSchema.java index f84bb48e8c0..bb72877ca1d 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/VariantSchema.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/VariantSchema.java @@ -27,7 +27,7 @@ import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.MaterializedField; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class VariantSchema implements VariantMetadata { diff --git a/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/schema/parser/SchemaVisitor.java b/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/schema/parser/SchemaVisitor.java index 9c5ff61ac74..09a1953fcff 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/schema/parser/SchemaVisitor.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/record/metadata/schema/parser/SchemaVisitor.java @@ -30,7 +30,7 @@ import org.apache.drill.exec.record.metadata.TupleSchema; import org.apache.drill.exec.record.metadata.VariantColumnMetadata; import org.apache.drill.exec.vector.complex.DictVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import java.util.LinkedHashMap; import java.util.List; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/util/DecimalUtility.java b/exec/vector/src/main/java/org/apache/drill/exec/util/DecimalUtility.java index de388cb6280..fa9b2d5489e 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/util/DecimalUtility.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/util/DecimalUtility.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.util; -import org.apache.drill.shaded.guava.com.google.common.math.BigIntegerMath; +import com.google.common.math.BigIntegerMath; import io.netty.buffer.ByteBuf; import io.netty.buffer.DrillBuf; import io.netty.buffer.UnpooledByteBufAllocator; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/AddOrGetResult.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/AddOrGetResult.java index ad76ffcc96b..a133d3b82c3 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/AddOrGetResult.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/AddOrGetResult.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.vector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class AddOrGetResult { private final V vector; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java index 6f86d049ff6..864d8e4372f 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/BaseValueVector.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.TransferPair; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import io.netty.buffer.DrillBuf; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/BitVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/BitVector.java index 9676f447af5..e0ef5f91574 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/BitVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/BitVector.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.record.TransferPair; import org.apache.drill.exec.vector.complex.impl.BitReaderImpl; import org.apache.drill.exec.vector.complex.reader.FieldReader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullVector.java index 5d53b18068e..f7dcb580d74 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullVector.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.vector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import io.netty.buffer.DrillBuf; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.proto.UserBitShared.SerializedField; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueHolderHelper.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueHolderHelper.java index 1f5abd5b3c4..56dc06dbdac 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueHolderHelper.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueHolderHelper.java @@ -44,7 +44,7 @@ import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.util.DecimalUtility; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; public class ValueHolderHelper { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ValueHolderHelper.class); diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/VectorDescriptor.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/VectorDescriptor.java index 0bc64992853..7f1a3a66db4 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/VectorDescriptor.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/VectorDescriptor.java @@ -19,7 +19,7 @@ import java.util.Collection; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import org.apache.drill.common.types.TypeProtos; import org.apache.drill.exec.record.MaterializedField; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/impl/VectorPrinter.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/impl/VectorPrinter.java index 5830b3012bd..66ebc0b8a4e 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/impl/VectorPrinter.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/impl/VectorPrinter.java @@ -20,7 +20,7 @@ import org.apache.drill.exec.vector.UInt4Vector; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.VarCharVector; -import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +import com.google.common.base.Charsets; /** * Handy tool to visualize string and offset vectors for diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ArrayReaderImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ArrayReaderImpl.java index 1313a3297ba..2af5cbd4756 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ArrayReaderImpl.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ArrayReaderImpl.java @@ -31,7 +31,7 @@ import org.apache.drill.exec.vector.accessor.ScalarReader; import org.apache.drill.exec.vector.accessor.TupleReader; import org.apache.drill.exec.vector.accessor.VariantReader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Reader for an array-valued column. This reader provides access to specific diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/EmptyListShim.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/EmptyListShim.java index d8c8947ca82..f3e2590dc54 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/EmptyListShim.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/EmptyListShim.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.vector.accessor.ObjectWriter; import org.apache.drill.exec.vector.accessor.impl.HierarchicalFormatter; import org.apache.drill.exec.vector.accessor.writer.UnionWriterImpl.UnionShim; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Internal implementation for a list of (possible) variants when diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/ListWriterImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/ListWriterImpl.java index 485abb06a0c..cb26daa2514 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/ListWriterImpl.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/ListWriterImpl.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.vector.accessor.ColumnAccessors.UInt1ColumnWriter; import org.apache.drill.exec.vector.complex.ListVector; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * List writer, which is basically an array writer, with the addition diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/SimpleListShim.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/SimpleListShim.java index 66b81f9763a..a6a1e6c7bb7 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/SimpleListShim.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/SimpleListShim.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.vector.accessor.ObjectWriter; import org.apache.drill.exec.vector.accessor.impl.HierarchicalFormatter; import org.apache.drill.exec.vector.accessor.writer.UnionWriterImpl.UnionShim; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Shim for a list that holds a single type, but may eventually become a diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/AbstractContainerVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/AbstractContainerVector.java index 88d2a4ed903..57d9a38944c 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/AbstractContainerVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/AbstractContainerVector.java @@ -30,10 +30,10 @@ import org.apache.drill.exec.util.CallBack; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Function; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterables; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/AbstractMapVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/AbstractMapVector.java index a2ccf3ddf3c..dc8242e3ace 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/AbstractMapVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/AbstractMapVector.java @@ -33,8 +33,8 @@ import org.apache.drill.exec.util.CallBack; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/BaseRepeatedValueVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/BaseRepeatedValueVector.java index 17a2e739201..34f964f0096 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/BaseRepeatedValueVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/BaseRepeatedValueVector.java @@ -36,8 +36,8 @@ import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.VectorDescriptor; import org.apache.drill.exec.vector.ZeroVector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.ObjectArrays; +import com.google.common.base.Preconditions; +import com.google.common.collect.ObjectArrays; import io.netty.buffer.DrillBuf; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/EmptyValuePopulator.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/EmptyValuePopulator.java index 511c202a384..5d11620823c 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/EmptyValuePopulator.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/EmptyValuePopulator.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.vector.complex; import org.apache.drill.exec.vector.UInt4Vector; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * Tracks and populate empty values in repeated value vectors. diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ListVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ListVector.java index 8bef58d5939..f0e567e457e 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ListVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ListVector.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.vector.complex; -import org.apache.drill.shaded.guava.com.google.common.collect.ObjectArrays; +import com.google.common.collect.ObjectArrays; import io.netty.buffer.DrillBuf; import java.util.List; import java.util.Set; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java index e791757d6f8..d6bb08960ef 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java @@ -41,9 +41,9 @@ import org.apache.drill.exec.vector.complex.RepeatedMapVector.MapSingleCopier; import org.apache.drill.exec.vector.complex.impl.SingleMapReaderImpl; import org.apache.drill.exec.vector.complex.reader.FieldReader; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Ordering; -import org.apache.drill.shaded.guava.com.google.common.primitives.Ints; +import com.google.common.base.Preconditions; +import com.google.common.collect.Ordering; +import com.google.common.primitives.Ints; import io.netty.buffer.DrillBuf; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedListVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedListVector.java index c0b61580e80..c201c766d47 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedListVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedListVector.java @@ -17,8 +17,8 @@ */ package org.apache.drill.exec.vector.complex; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import io.netty.buffer.DrillBuf; import java.util.Iterator; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java index 311fe928211..174c769d343 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java @@ -38,7 +38,7 @@ import org.apache.drill.exec.vector.complex.impl.RepeatedMapReaderImpl; import org.apache.drill.exec.vector.complex.reader.FieldReader; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; public class RepeatedMapVector extends AbstractRepeatedMapVector { diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java index 8a2ffeab025..0d5f6b370b7 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java @@ -24,7 +24,7 @@ import org.apache.drill.exec.vector.complex.StateTool; import org.apache.drill.exec.vector.complex.writer.BaseWriter.ComplexWriter; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public class ComplexWriterImpl extends AbstractFieldWriter implements ComplexWriter { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ComplexWriterImpl.class); diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleMapReaderImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleMapReaderImpl.java index 98b5ab5cce5..928ff2dd5d5 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleMapReaderImpl.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleMapReaderImpl.java @@ -27,7 +27,7 @@ import org.apache.drill.exec.vector.complex.reader.FieldReader; import org.apache.drill.exec.vector.complex.writer.BaseWriter.MapWriter; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; @SuppressWarnings("unused") public class SingleMapReaderImpl extends AbstractFieldReader { diff --git a/logical/src/main/java/org/apache/drill/common/JSONOptions.java b/logical/src/main/java/org/apache/drill/common/JSONOptions.java index 9bdafaa15d1..a5fc9c00be6 100644 --- a/logical/src/main/java/org/apache/drill/common/JSONOptions.java +++ b/logical/src/main/java/org/apache/drill/common/JSONOptions.java @@ -45,7 +45,7 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.node.TreeTraversingParser; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; @JsonSerialize(using = Se.class) @JsonDeserialize(using = De.class) diff --git a/logical/src/main/java/org/apache/drill/common/expression/CastExpression.java b/logical/src/main/java/org/apache/drill/common/expression/CastExpression.java index fd38071fbbd..51c64e1af35 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/CastExpression.java +++ b/logical/src/main/java/org/apache/drill/common/expression/CastExpression.java @@ -23,7 +23,7 @@ import org.apache.drill.common.expression.visitors.ExprVisitor; import org.apache.drill.common.types.TypeProtos.MajorType; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; public class CastExpression extends LogicalExpressionBase implements Iterable{ diff --git a/logical/src/main/java/org/apache/drill/common/expression/ErrorCollector.java b/logical/src/main/java/org/apache/drill/common/expression/ErrorCollector.java index 21429ac7f84..d780d331f83 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/ErrorCollector.java +++ b/logical/src/main/java/org/apache/drill/common/expression/ErrorCollector.java @@ -19,7 +19,7 @@ import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.shaded.guava.com.google.common.collect.Range; +import com.google.common.collect.Range; import org.slf4j.Logger; public interface ErrorCollector { diff --git a/logical/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java b/logical/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java index 383bd8d52fa..69926175e71 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java +++ b/logical/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java @@ -25,8 +25,8 @@ import org.apache.drill.common.expression.visitors.ExpressionValidationError; import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.shaded.guava.com.google.common.base.Joiner; -import org.apache.drill.shaded.guava.com.google.common.collect.Range; +import com.google.common.base.Joiner; +import com.google.common.collect.Range; import org.slf4j.Logger; public class ErrorCollectorImpl implements ErrorCollector { diff --git a/logical/src/main/java/org/apache/drill/common/expression/ExpressionFunction.java b/logical/src/main/java/org/apache/drill/common/expression/ExpressionFunction.java index 8021a43b00b..fd16b3c7fe4 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/ExpressionFunction.java +++ b/logical/src/main/java/org/apache/drill/common/expression/ExpressionFunction.java @@ -25,8 +25,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.reflect.TypeToken; +import com.google.common.collect.ImmutableMap; +import com.google.common.reflect.TypeToken; @SuppressWarnings("unchecked") public class ExpressionFunction { diff --git a/logical/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java b/logical/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java index de345ee9b27..4133f174a9d 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java +++ b/logical/src/main/java/org/apache/drill/common/expression/ExpressionStringBuilder.java @@ -41,7 +41,7 @@ import org.apache.drill.common.types.TypeProtos.MajorType; import org.joda.time.Period; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; public class ExpressionStringBuilder extends AbstractExprVisitor{ diff --git a/logical/src/main/java/org/apache/drill/common/expression/FunctionCall.java b/logical/src/main/java/org/apache/drill/common/expression/FunctionCall.java index 6be3feda1f0..4c74e52335c 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/FunctionCall.java +++ b/logical/src/main/java/org/apache/drill/common/expression/FunctionCall.java @@ -23,8 +23,8 @@ import org.apache.drill.common.expression.visitors.ExprVisitor; import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; public class FunctionCall extends LogicalExpressionBase implements Iterable { diff --git a/logical/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java b/logical/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java index e0aa4b0fd37..d8b715389c5 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java +++ b/logical/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java @@ -25,8 +25,8 @@ import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; public class FunctionCallFactory { diff --git a/logical/src/main/java/org/apache/drill/common/expression/FunctionHolderExpression.java b/logical/src/main/java/org/apache/drill/common/expression/FunctionHolderExpression.java index 5d86d82d26d..4e36ae7ab54 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/FunctionHolderExpression.java +++ b/logical/src/main/java/org/apache/drill/common/expression/FunctionHolderExpression.java @@ -21,7 +21,7 @@ import org.apache.drill.common.expression.fn.FuncHolder; import org.apache.drill.common.expression.visitors.ExprVisitor; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; /** * Represents an actual call (a reference) to a declared function. diff --git a/logical/src/main/java/org/apache/drill/common/expression/IfExpression.java b/logical/src/main/java/org/apache/drill/common/expression/IfExpression.java index 7b04c743f65..4492945e429 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/IfExpression.java +++ b/logical/src/main/java/org/apache/drill/common/expression/IfExpression.java @@ -26,9 +26,9 @@ import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.common.types.Types; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; public class IfExpression extends LogicalExpressionBase { diff --git a/logical/src/main/java/org/apache/drill/common/expression/SchemaPath.java b/logical/src/main/java/org/apache/drill/common/expression/SchemaPath.java index 1f4cfee9f95..be497b28a24 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/SchemaPath.java +++ b/logical/src/main/java/org/apache/drill/common/expression/SchemaPath.java @@ -35,7 +35,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; /** * This is the path for the column in the table diff --git a/logical/src/main/java/org/apache/drill/common/expression/ValueExpressions.java b/logical/src/main/java/org/apache/drill/common/expression/ValueExpressions.java index 0d4587c8950..2f04a588ccd 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/ValueExpressions.java +++ b/logical/src/main/java/org/apache/drill/common/expression/ValueExpressions.java @@ -22,7 +22,7 @@ import java.util.GregorianCalendar; import java.util.Iterator; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.apache.drill.common.expression.visitors.ExprVisitor; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; diff --git a/logical/src/main/java/org/apache/drill/common/expression/fn/JodaDateValidator.java b/logical/src/main/java/org/apache/drill/common/expression/fn/JodaDateValidator.java index 986ba4a4fc2..515890f180d 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/fn/JodaDateValidator.java +++ b/logical/src/main/java/org/apache/drill/common/expression/fn/JodaDateValidator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.common.expression.fn; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import java.util.Comparator; diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/ConditionalExprOptimizer.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/ConditionalExprOptimizer.java index eb2177b1c7b..c103bf560c4 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/ConditionalExprOptimizer.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/ConditionalExprOptimizer.java @@ -31,7 +31,7 @@ import org.apache.drill.common.expression.IfExpression.IfCondition; import org.apache.drill.common.expression.LogicalExpression; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; public class ConditionalExprOptimizer extends AbstractExprVisitor { diff --git a/logical/src/main/java/org/apache/drill/common/graph/AdjacencyList.java b/logical/src/main/java/org/apache/drill/common/graph/AdjacencyList.java index fd5f6712550..b5bcfd0603f 100644 --- a/logical/src/main/java/org/apache/drill/common/graph/AdjacencyList.java +++ b/logical/src/main/java/org/apache/drill/common/graph/AdjacencyList.java @@ -17,9 +17,9 @@ */ package org.apache.drill.common.graph; -import org.apache.drill.shaded.guava.com.google.common.collect.ArrayListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.ListMultimap; -import org.apache.drill.shaded.guava.com.google.common.collect.Multimaps; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Multimaps; import java.util.ArrayList; import java.util.Collection; diff --git a/logical/src/main/java/org/apache/drill/common/logical/LogicalPlanBuilder.java b/logical/src/main/java/org/apache/drill/common/logical/LogicalPlanBuilder.java index cbbcb400c05..9bb0754f4cb 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/LogicalPlanBuilder.java +++ b/logical/src/main/java/org/apache/drill/common/logical/LogicalPlanBuilder.java @@ -21,8 +21,8 @@ import org.apache.drill.common.logical.PlanProperties.PlanType; import org.apache.drill.common.logical.data.LogicalOperator; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; /** * A programmatic builder for logical plans. diff --git a/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java b/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java index 87c4229e939..13a5e156511 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java +++ b/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java @@ -28,7 +28,7 @@ import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.logical.security.CredentialsProvider; import org.apache.drill.common.logical.security.PlainCredentialsProvider; -import org.apache.drill.shaded.guava.com.google.common.base.Strings; +import com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/AbstractSingleBuilder.java b/logical/src/main/java/org/apache/drill/common/logical/data/AbstractSingleBuilder.java index f3a8818335c..75bdbd47905 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/AbstractSingleBuilder.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/AbstractSingleBuilder.java @@ -17,7 +17,7 @@ */ package org.apache.drill.common.logical.data; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; public abstract class AbstractSingleBuilder> extends AbstractBuilder { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractSingleBuilder.class); diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Except.java b/logical/src/main/java/org/apache/drill/common/logical/data/Except.java index b060a16054d..a9b6a7f3f90 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Except.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Except.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.common.logical.data.visitors.LogicalVisitor; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import java.util.Iterator; import java.util.List; diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Filter.java b/logical/src/main/java/org/apache/drill/common/logical/data/Filter.java index d16e80f065b..0c4144979b3 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Filter.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Filter.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; @JsonTypeName("filter") public class Filter extends SingleInputOperator { diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Flatten.java b/logical/src/main/java/org/apache/drill/common/logical/data/Flatten.java index 5a3e2e893ed..192d587b136 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Flatten.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Flatten.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; @JsonTypeName("flatten") public class Flatten extends SingleInputOperator { diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/GroupingAggregate.java b/logical/src/main/java/org/apache/drill/common/logical/data/GroupingAggregate.java index 48e449a9866..7701c9da08e 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/GroupingAggregate.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/GroupingAggregate.java @@ -26,8 +26,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; @JsonTypeName("groupingaggregate") public class GroupingAggregate extends SingleInputOperator{ diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Intersect.java b/logical/src/main/java/org/apache/drill/common/logical/data/Intersect.java index ec0a1df70e5..257f867815c 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Intersect.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Intersect.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.common.logical.data.visitors.LogicalVisitor; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import java.util.Iterator; import java.util.List; diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Join.java b/logical/src/main/java/org/apache/drill/common/logical/data/Join.java index b648a449e5a..2a363485789 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Join.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Join.java @@ -29,9 +29,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; @JsonTypeName("join") public class Join extends LogicalOperatorBase { diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/LateralJoin.java b/logical/src/main/java/org/apache/drill/common/logical/data/LateralJoin.java index f30bee9bbd9..55334221e74 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/LateralJoin.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/LateralJoin.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; import org.apache.drill.common.logical.data.visitors.LogicalVisitor; import java.util.Iterator; diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Limit.java b/logical/src/main/java/org/apache/drill/common/logical/data/Limit.java index 36ae6407ad0..ad2fcd6ddeb 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Limit.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Limit.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; @JsonTypeName("limit") public class Limit extends SingleInputOperator { diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/LogicalSemiJoin.java b/logical/src/main/java/org/apache/drill/common/logical/data/LogicalSemiJoin.java index a44ec9fc92f..b79585949ba 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/LogicalSemiJoin.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/LogicalSemiJoin.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.calcite.rel.core.JoinRelType; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; import org.apache.drill.common.logical.data.visitors.LogicalVisitor; import java.util.Iterator; diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Order.java b/logical/src/main/java/org/apache/drill/common/logical/data/Order.java index 85fc75fbdcb..5cd3f841e53 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Order.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Order.java @@ -31,10 +31,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; @JsonTypeName("order") public class Order extends SingleInputOperator { diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Project.java b/logical/src/main/java/org/apache/drill/common/logical/data/Project.java index a2d5a750183..662c8e6a26b 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Project.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Project.java @@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; @JsonTypeName("project") public class Project extends SingleInputOperator { diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/RunningAggregate.java b/logical/src/main/java/org/apache/drill/common/logical/data/RunningAggregate.java index abcfdeed7d4..1ffaeeafa9c 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/RunningAggregate.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/RunningAggregate.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; @JsonTypeName("runningaggregate") public class RunningAggregate extends SingleInputOperator{ diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/SingleInputOperator.java b/logical/src/main/java/org/apache/drill/common/logical/data/SingleInputOperator.java index 457d3da4461..0e9c078d1a0 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/SingleInputOperator.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/SingleInputOperator.java @@ -22,7 +22,7 @@ import org.apache.drill.common.logical.UnexpectedOperatorType; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; /** * SimpleOperator is an operator that has one inputs at most. diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Store.java b/logical/src/main/java/org/apache/drill/common/logical/data/Store.java index 65b8773ce90..961cb8d023b 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Store.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Store.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; @JsonTypeName("store") public class Store extends SinkOperator{ diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Transform.java b/logical/src/main/java/org/apache/drill/common/logical/data/Transform.java index a7d169381ae..f669e1df937 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Transform.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Transform.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; +import com.google.common.collect.Iterators; @JsonTypeName("transform") public class Transform extends SingleInputOperator { diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Union.java b/logical/src/main/java/org/apache/drill/common/logical/data/Union.java index 995f1ac6172..e7a7ab6ab7d 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Union.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Union.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; @JsonTypeName("union") public class Union extends LogicalOperatorBase { diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Values.java b/logical/src/main/java/org/apache/drill/common/logical/data/Values.java index 25b760272a1..413071c5cc8 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Values.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Values.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; @JsonTypeName("values") public class Values extends SourceOperator { diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Window.java b/logical/src/main/java/org/apache/drill/common/logical/data/Window.java index 5fd10af789b..ce9506b0845 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Window.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Window.java @@ -17,8 +17,8 @@ */ package org.apache.drill.common.logical.data; -import org.apache.drill.shaded.guava.com.google.common.collect.Iterators; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; import org.apache.drill.common.expression.FieldReference; import com.fasterxml.jackson.annotation.JsonCreator; @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.List; -import static org.apache.drill.shaded.guava.com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Preconditions.checkState; @JsonTypeName("window") public class Window extends SingleInputOperator { diff --git a/logical/src/test/java/org/apache/drill/common/expression/fn/JodaDateValidatorTest.java b/logical/src/test/java/org/apache/drill/common/expression/fn/JodaDateValidatorTest.java index 16df588159d..4853730e0af 100644 --- a/logical/src/test/java/org/apache/drill/common/expression/fn/JodaDateValidatorTest.java +++ b/logical/src/test/java/org/apache/drill/common/expression/fn/JodaDateValidatorTest.java @@ -17,7 +17,7 @@ */ package org.apache.drill.common.expression.fn; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.test.BaseTest; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/IcebergMetastore.java b/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/IcebergMetastore.java index 94bc6bf9e82..b94e7eea037 100644 --- a/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/IcebergMetastore.java +++ b/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/IcebergMetastore.java @@ -26,8 +26,8 @@ import org.apache.drill.metastore.iceberg.config.IcebergConfigConstants; import org.apache.drill.metastore.iceberg.exceptions.IcebergMetastoreException; import org.apache.drill.metastore.iceberg.schema.IcebergTableSchema; -import org.apache.drill.shaded.guava.com.google.common.collect.MapDifference; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.MapDifference; +import com.google.common.collect.Maps; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/operate/IcebergRead.java b/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/operate/IcebergRead.java index 1ce9a4b4c1c..b3bb14ea169 100644 --- a/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/operate/IcebergRead.java +++ b/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/operate/IcebergRead.java @@ -23,7 +23,7 @@ import org.apache.drill.metastore.operate.AbstractRead; import org.apache.drill.metastore.operate.MetadataTypeValidator; import org.apache.drill.metastore.operate.Read; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.iceberg.data.IcebergGenerics; import org.apache.iceberg.data.Record; import org.apache.iceberg.expressions.Expression; diff --git a/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/schema/IcebergTableSchema.java b/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/schema/IcebergTableSchema.java index 11ebd85275d..c4dc6b158b9 100644 --- a/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/schema/IcebergTableSchema.java +++ b/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/schema/IcebergTableSchema.java @@ -20,7 +20,7 @@ import org.apache.drill.metastore.MetastoreColumn; import org.apache.drill.metastore.MetastoreFieldDefinition; import org.apache.drill.metastore.iceberg.exceptions.IcebergMetastoreException; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; import org.apache.iceberg.types.Types; diff --git a/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/transform/TestFilterTransformer.java b/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/transform/TestFilterTransformer.java index 633b894db0d..fea560b9a10 100644 --- a/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/transform/TestFilterTransformer.java +++ b/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/transform/TestFilterTransformer.java @@ -21,7 +21,7 @@ import org.apache.drill.metastore.expressions.FilterExpression; import org.apache.drill.metastore.iceberg.IcebergBaseTest; import org.apache.drill.metastore.metadata.MetadataType; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.Expressions; import org.junit.BeforeClass; diff --git a/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/write/TestParquetFileWriter.java b/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/write/TestParquetFileWriter.java index 4a9211a6f2f..385d6337073 100644 --- a/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/write/TestParquetFileWriter.java +++ b/metastore/iceberg-metastore/src/test/java/org/apache/drill/metastore/iceberg/write/TestParquetFileWriter.java @@ -19,7 +19,7 @@ import org.apache.drill.metastore.iceberg.IcebergBaseTest; import org.apache.drill.metastore.iceberg.exceptions.IcebergMetastoreException; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.hadoop.fs.Path; import org.apache.iceberg.FileFormat; import org.apache.iceberg.Schema; diff --git a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/BasicTablesRequests.java b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/BasicTablesRequests.java index ad0118a4168..9f4bd77d156 100644 --- a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/BasicTablesRequests.java +++ b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/BasicTablesRequests.java @@ -27,7 +27,7 @@ import org.apache.drill.metastore.metadata.RowGroupMetadata; import org.apache.drill.metastore.metadata.SegmentMetadata; import org.apache.drill.metastore.metadata.TableInfo; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import java.util.ArrayList; import java.util.Arrays; diff --git a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/TablesMetadataTypeValidator.java b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/TablesMetadataTypeValidator.java index 857d04e91ba..1f9020cee59 100644 --- a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/TablesMetadataTypeValidator.java +++ b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/TablesMetadataTypeValidator.java @@ -19,7 +19,7 @@ import org.apache.drill.metastore.metadata.MetadataType; import org.apache.drill.metastore.operate.MetadataTypeValidator; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/operate/Delete.java b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/operate/Delete.java index a879d261a28..ba517b7ee60 100644 --- a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/operate/Delete.java +++ b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/operate/Delete.java @@ -19,7 +19,7 @@ import org.apache.drill.metastore.expressions.FilterExpression; import org.apache.drill.metastore.metadata.MetadataType; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import java.util.HashSet; import java.util.Set; diff --git a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/operate/Read.java b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/operate/Read.java index ccbcd4a25cc..051e982ea94 100644 --- a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/operate/Read.java +++ b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/operate/Read.java @@ -20,7 +20,7 @@ import org.apache.drill.metastore.MetastoreColumn; import org.apache.drill.metastore.expressions.FilterExpression; import org.apache.drill.metastore.metadata.MetadataType; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import java.util.Arrays; import java.util.List; diff --git a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/util/TableMetadataUtils.java b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/util/TableMetadataUtils.java index 2443663a27f..dfc94f969ee 100644 --- a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/util/TableMetadataUtils.java +++ b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/util/TableMetadataUtils.java @@ -26,7 +26,7 @@ import org.apache.drill.metastore.statistics.ColumnStatisticsKind; import org.apache.drill.metastore.statistics.StatisticsHolder; import org.apache.drill.metastore.statistics.TableStatisticsKind; -import org.apache.drill.shaded.guava.com.google.common.primitives.UnsignedBytes; +import com.google.common.primitives.UnsignedBytes; import java.util.ArrayList; import java.util.Collection; diff --git a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/AbstractTablesMetastoreTest.java b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/AbstractTablesMetastoreTest.java index f8bae4956ed..9286913185a 100644 --- a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/AbstractTablesMetastoreTest.java +++ b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/AbstractTablesMetastoreTest.java @@ -29,7 +29,7 @@ import org.apache.drill.metastore.metadata.MetadataType; import org.apache.drill.metastore.metadata.TableInfo; import org.apache.drill.metastore.operate.Delete; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.drill.test.BaseTest; import org.junit.After; import org.junit.ClassRule; diff --git a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTablesMetadataTypeValidator.java b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTablesMetadataTypeValidator.java index b0f02acffd5..98fbd702441 100644 --- a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTablesMetadataTypeValidator.java +++ b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTablesMetadataTypeValidator.java @@ -20,7 +20,7 @@ import org.apache.drill.categories.MetastoreTest; import org.apache.drill.metastore.exceptions.MetastoreException; import org.apache.drill.metastore.metadata.MetadataType; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.drill.test.BaseTest; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/operate/MongoRead.java b/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/operate/MongoRead.java index a1d7d427738..eb7ccaec0b4 100644 --- a/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/operate/MongoRead.java +++ b/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/operate/MongoRead.java @@ -23,7 +23,7 @@ import org.apache.drill.metastore.operate.AbstractRead; import org.apache.drill.metastore.operate.MetadataTypeValidator; import org.apache.drill.metastore.operate.Read; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.bson.Document; import org.bson.conversions.Bson; diff --git a/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/transform/InputDataTransformer.java b/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/transform/InputDataTransformer.java index 0238952bd69..0430fa3658b 100644 --- a/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/transform/InputDataTransformer.java +++ b/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/transform/InputDataTransformer.java @@ -21,7 +21,7 @@ import org.apache.drill.metastore.MetastoreColumn; import org.apache.drill.metastore.mongo.config.MongoConfigConstants; import org.apache.drill.metastore.mongo.exception.MongoMetastoreException; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.bson.Document; import java.lang.invoke.MethodHandle; diff --git a/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/transform/OutputDataTransformer.java b/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/transform/OutputDataTransformer.java index 2681750d274..e691ab4a864 100644 --- a/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/transform/OutputDataTransformer.java +++ b/metastore/mongo-metastore/src/main/java/org/apache/drill/metastore/mongo/transform/OutputDataTransformer.java @@ -17,8 +17,8 @@ */ package org.apache.drill.metastore.mongo.transform; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Lists; import org.bson.Document; import java.lang.invoke.MethodHandle; diff --git a/metastore/mongo-metastore/src/test/java/org/apache/drill/metastore/mongo/MongoBaseTest.java b/metastore/mongo-metastore/src/test/java/org/apache/drill/metastore/mongo/MongoBaseTest.java index 2a7f677ca26..7a388629509 100644 --- a/metastore/mongo-metastore/src/test/java/org/apache/drill/metastore/mongo/MongoBaseTest.java +++ b/metastore/mongo-metastore/src/test/java/org/apache/drill/metastore/mongo/MongoBaseTest.java @@ -23,7 +23,7 @@ import org.apache.drill.common.config.DrillConfig; import org.apache.drill.metastore.components.tables.AbstractBasicTablesRequestsTest; import org.apache.drill.metastore.mongo.config.MongoConfigConstants; -import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; diff --git a/metastore/mongo-metastore/src/test/java/org/apache/drill/metastore/mongo/components/tables/TestMongoBasicTablesRequests.java b/metastore/mongo-metastore/src/test/java/org/apache/drill/metastore/mongo/components/tables/TestMongoBasicTablesRequests.java index 91b4fe7eba6..137d87fd1ba 100644 --- a/metastore/mongo-metastore/src/test/java/org/apache/drill/metastore/mongo/components/tables/TestMongoBasicTablesRequests.java +++ b/metastore/mongo-metastore/src/test/java/org/apache/drill/metastore/mongo/components/tables/TestMongoBasicTablesRequests.java @@ -18,7 +18,7 @@ package org.apache.drill.metastore.mongo.components.tables; import com.clearspring.analytics.util.Lists; -import org.apache.drill.shaded.guava.com.google.common.collect.Maps; +import com.google.common.collect.Maps; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.record.SchemaUtil; import org.apache.drill.metastore.components.tables.BasicTablesTransformer; diff --git a/metastore/rdbms-metastore/src/main/java/org/apache/drill/metastore/rdbms/components/tables/TablesMetadataMapper.java b/metastore/rdbms-metastore/src/main/java/org/apache/drill/metastore/rdbms/components/tables/TablesMetadataMapper.java index 9ecbf39f922..0f08bba59da 100644 --- a/metastore/rdbms-metastore/src/main/java/org/apache/drill/metastore/rdbms/components/tables/TablesMetadataMapper.java +++ b/metastore/rdbms-metastore/src/main/java/org/apache/drill/metastore/rdbms/components/tables/TablesMetadataMapper.java @@ -22,7 +22,7 @@ import org.apache.drill.metastore.rdbms.transform.AbstractMetadataMapper; import org.apache.drill.metastore.rdbms.transform.RdbmsFilterExpressionVisitor; import org.apache.drill.metastore.rdbms.util.ConverterUtil; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.jooq.Condition; import org.jooq.Field; import org.jooq.Record; diff --git a/metastore/rdbms-metastore/src/main/java/org/apache/drill/metastore/rdbms/components/tables/TablesTransformer.java b/metastore/rdbms-metastore/src/main/java/org/apache/drill/metastore/rdbms/components/tables/TablesTransformer.java index 314a8cdc108..b1a16939b31 100644 --- a/metastore/rdbms-metastore/src/main/java/org/apache/drill/metastore/rdbms/components/tables/TablesTransformer.java +++ b/metastore/rdbms-metastore/src/main/java/org/apache/drill/metastore/rdbms/components/tables/TablesTransformer.java @@ -23,8 +23,8 @@ import org.apache.drill.metastore.rdbms.operate.RdbmsOperation; import org.apache.drill.metastore.rdbms.transform.AbstractTransformer; import org.apache.drill.metastore.rdbms.transform.MetadataMapper; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Sets; import org.jooq.Record; import java.util.List; diff --git a/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesTransformer.java b/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesTransformer.java index c9926551342..33994c0e7c8 100644 --- a/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesTransformer.java +++ b/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesTransformer.java @@ -26,7 +26,7 @@ import org.apache.drill.metastore.rdbms.exception.RdbmsMetastoreException; import org.apache.drill.metastore.rdbms.operate.RdbmsOperation; import org.apache.drill.metastore.rdbms.transform.MetadataMapper; -import org.apache.drill.shaded.guava.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.jooq.Record; import org.jooq.generated.Tables; import org.jooq.impl.DSL; diff --git a/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/util/TestConverterUtil.java b/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/util/TestConverterUtil.java index 1d4e0729770..eb4505e4501 100644 --- a/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/util/TestConverterUtil.java +++ b/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/util/TestConverterUtil.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import org.apache.drill.metastore.rdbms.RdbmsBaseTest; import org.apache.drill.metastore.rdbms.exception.RdbmsMetastoreException; -import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap; import org.junit.Test; import java.util.Arrays; diff --git a/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java b/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java index ea181b68dff..92247bddd91 100644 --- a/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java +++ b/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java @@ -31,7 +31,7 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; -import org.apache.drill.shaded.guava.com.google.common.base.Stopwatch; +import com.google.common.base.Stopwatch; import fmpp.Engine; import fmpp.ProgressListener; From 048c219836ff7c525e42d4f0d211b5fcc1231d17 Mon Sep 17 00:00:00 2001 From: James Turton Date: Fri, 25 Aug 2023 10:52:00 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Upgrade=20guava=2030.1.1=20=E2=86=92=2032.1?= =?UTF-8?q?.2-jre.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 339bbb52d15..90a53f6b142 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 4.13.2 1.8.2 2.0.6 - 30.1.1-jre + 32.1.2-jre 1 1.12.3 2.9.0