Revert "reformat code" This reverts commit c5b37744e7e6c5334788bd2d4b006876cf3b2924.
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/19585846 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/19585846 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/19585846 Branch: refs/heads/master Commit: 195858461c19d654faf3036df44d4d1f9889654a Parents: f955960 Author: Hongbin Ma <mahong...@apache.org> Authored: Fri May 26 20:15:46 2017 +0800 Committer: Roger Shi <rogershijich...@gmail.com> Committed: Fri May 26 20:41:41 2017 +0800 ---------------------------------------------------------------------- .../apache/kylin/RealizationRegistryTest.java | 8 +- .../kylin/job/DeployLocalMetaToRemoteTest.java | 3 +- .../java/org/apache/kylin/job/DeployUtil.java | 6 +- .../kylin/job/streaming/Kafka10DataLoader.java | 18 +- .../kylin/job/streaming/StreamDataLoader.java | 5 +- .../enumerable/EnumerableWindowBridge.java | 6 +- .../rel/rules/OLAPJoinPushThroughJoinRule.java | 21 +- .../rel/rules/OLAPJoinPushThroughJoinRule2.java | 30 +- .../apache/calcite/sql2rel/RelFieldTrimmer.java | 5 +- .../calcite/sql2rel/SqlToRelConverter.java | 2816 +++-- .../java/org/apache/calcite/tools/Programs.java | 582 +- .../common/BackwardCompatibilityConfig.java | 16 +- .../org/apache/kylin/common/KylinConfig.java | 12 +- .../apache/kylin/common/KylinConfigBase.java | 20 +- .../org/apache/kylin/common/KylinVersion.java | 6 +- .../org/apache/kylin/common/QueryContext.java | 2 +- .../kylin/common/lock/DistributedLock.java | 11 +- .../common/lock/DistributedLockFactory.java | 2 +- .../common/persistence/FileResourceStore.java | 12 +- .../kylin/common/persistence/ResourceStore.java | 33 +- .../kylin/common/persistence/ResourceTool.java | 6 +- .../kylin/common/persistence/StringEntity.java | 6 +- .../kylin/common/restclient/RestClient.java | 17 +- .../org/apache/kylin/common/util/Bytes.java | 89 +- .../apache/kylin/common/util/BytesSplitter.java | 3 +- .../org/apache/kylin/common/util/ClassUtil.java | 24 +- .../kylin/common/util/ClasspathScanner.java | 12 +- .../kylin/common/util/CompressionUtils.java | 6 +- .../org/apache/kylin/common/util/DBUtils.java | 2 +- .../apache/kylin/common/util/DateFormat.java | 2 +- .../apache/kylin/common/util/HadoopUtil.java | 8 +- .../kylin/common/util/ImplementationSwitch.java | 6 +- .../org/apache/kylin/common/util/JsonUtil.java | 21 +- .../apache/kylin/common/util/MailService.java | 8 +- .../common/util/MemoryBudgetController.java | 9 +- .../kylin/common/util/OrderedProperties.java | 3 +- .../org/apache/kylin/common/util/Primes.java | 31 +- .../org/apache/kylin/common/util/RangeUtil.java | 3 +- .../org/apache/kylin/common/util/SortUtil.java | 3 +- .../apache/kylin/common/util/ZipFileUtils.java | 10 +- .../org/apache/kylin/common/StorageURLTest.java | 2 +- .../persistence/LocalFileResourceStoreTest.java | 6 +- .../kylin/common/restclient/RestClientTest.java | 4 +- .../org/apache/kylin/common/util/BasicTest.java | 6 +- .../kylin/common/util/CacheBuilderTest.java | 13 +- .../apache/kylin/common/util/ClassUtilTest.java | 6 +- .../kylin/common/util/HiveCmdBuilderTest.java | 13 +- .../util/HotLoadKylinPropertiesTestCase.java | 8 +- .../common/util/InstallJarIntoMavenTest.java | 4 +- .../apache/kylin/common/util/JacksonTest.java | 9 +- .../common/util/LocalFileMetadataTestCase.java | 2 +- .../org/apache/kylin/common/util/RangeTest.java | 6 +- .../apache/kylin/common/util/TimeUtilTest.java | 6 +- .../org/apache/kylin/GTForwardingScanner.java | 8 +- .../kylin/cube/CubeCapabilityChecker.java | 25 +- .../org/apache/kylin/cube/CubeDescManager.java | 18 +- .../org/apache/kylin/cube/CubeInstance.java | 6 +- .../java/org/apache/kylin/cube/CubeManager.java | 100 +- .../java/org/apache/kylin/cube/CubeSegment.java | 6 +- .../apache/kylin/cube/RawQueryLastHacker.java | 3 +- .../kylin/cube/cli/CubeSignatureRefresher.java | 3 +- .../kylin/cube/cli/DictionaryGeneratorCLI.java | 14 +- .../cube/cuboid/AggregationGroupScheduler.java | 2 +- .../org/apache/kylin/cube/cuboid/Cuboid.java | 22 +- .../org/apache/kylin/cube/cuboid/CuboidCLI.java | 6 +- .../kylin/cube/cuboid/CuboidScheduler.java | 10 +- .../gridtable/AsymmetricRecordComparator.java | 4 +- .../kylin/cube/gridtable/CubeCodeSystem.java | 3 +- .../kylin/cube/gridtable/CubeGridTable.java | 3 +- .../cube/gridtable/ScanRangePlannerBase.java | 9 +- .../inmemcubing/AbstractInMemCubeBuilder.java | 6 +- .../cube/inmemcubing/ConcurrentDiskStore.java | 3 +- .../cube/inmemcubing/DoggedCubeBuilder.java | 17 +- .../cube/inmemcubing/InMemCubeBuilder.java | 54 +- .../InMemCubeBuilderInputConverter.java | 3 +- .../cube/inmemcubing/InMemCubeBuilderUtils.java | 11 +- .../kylin/cube/inmemcubing/MemDiskStore.java | 18 +- .../kylin/cube/kv/AbstractRowKeyEncoder.java | 4 +- .../org/apache/kylin/cube/kv/CubeDimEncMap.java | 8 +- .../apache/kylin/cube/kv/FuzzyMaskEncoder.java | 3 +- .../apache/kylin/cube/kv/RowKeyColumnIO.java | 3 +- .../org/apache/kylin/cube/kv/RowKeyEncoder.java | 26 +- .../kylin/cube/model/AggregationGroup.java | 3 +- .../org/apache/kylin/cube/model/CubeDesc.java | 72 +- .../cube/model/CubeJoinedFlatTableDesc.java | 6 +- .../cube/model/CubeJoinedFlatTableEnrich.java | 4 +- .../apache/kylin/cube/model/DimensionDesc.java | 6 +- .../kylin/cube/model/HBaseColumnDesc.java | 9 +- .../kylin/cube/model/HBaseColumnFamilyDesc.java | 7 +- .../kylin/cube/model/HBaseMappingDesc.java | 7 +- .../apache/kylin/cube/model/RowKeyColDesc.java | 2 +- .../kylin/cube/model/v1_4_0/CubeDesc.java | 22 +- .../kylin/cube/model/v1_4_0/DimensionDesc.java | 7 +- .../kylin/cube/model/v1_4_0/RowKeyColDesc.java | 3 +- .../kylin/cube/model/v1_4_0/RowKeyDesc.java | 6 +- .../model/validation/CubeMetadataValidator.java | 3 +- .../validation/rule/AggregationGroupRule.java | 34 +- .../model/validation/rule/DictionaryRule.java | 4 +- .../model/validation/rule/FunctionRule.java | 25 +- .../validation/rule/StreamingCubeRule.java | 9 +- .../upgrade/V1_5_1/CubeDescUpgrade_v_1_5_1.java | 9 +- .../V1_5_1/CubeMetadataUpgrade_v_1_5_1.java | 17 +- .../upgrade/common/CubeMetadataUpgrade.java | 10 +- .../common/MetadataVersionRefresher.java | 3 +- .../entry/CubeMetadataUpgradeEntry_v_1_5_1.java | 13 +- .../v1_4_0/CubeMetadataUpgrade_v_1_4_0.java | 3 +- .../org/apache/kylin/cube/util/CubingUtils.java | 15 +- .../kylin/gridtable/GTAggregateScanner.java | 15 +- .../java/org/apache/kylin/gridtable/GTInfo.java | 6 +- .../org/apache/kylin/gridtable/GTRecord.java | 3 +- .../org/apache/kylin/gridtable/GTRowBlock.java | 3 +- .../apache/kylin/gridtable/GTScanRequest.java | 24 +- .../kylin/gridtable/GTScanRequestBuilder.java | 12 +- .../gridtable/GTStreamAggregateScanner.java | 13 +- .../java/org/apache/kylin/gridtable/GTUtil.java | 13 +- .../apache/kylin/gridtable/UnitTestSupport.java | 18 +- .../gridtable/benchmark/GTScannerBenchmark.java | 7 +- .../benchmark/GTScannerBenchmark2.java | 7 +- .../kylin/cube/AggregationGroupRuleTest.java | 32 +- .../org/apache/kylin/cube/CubeDescTest.java | 59 +- .../org/apache/kylin/cube/CubeManagerTest.java | 59 +- .../kylin/cube/CubeSpecificConfigTest.java | 4 +- .../apache/kylin/cube/RowKeyAttrRuleTest.java | 4 +- .../kylin/cube/common/BytesSplitterTest.java | 15 +- .../kylin/cube/common/RowKeySplitterTest.java | 6 +- .../kylin/cube/cuboid/CombinationTest.java | 3 +- .../kylin/cube/cuboid/CuboidSchedulerTest.java | 26 +- .../inmemcubing/ConcurrentDiskStoreTest.java | 3 +- .../cube/inmemcubing/MemDiskStoreTest.java | 3 +- .../apache/kylin/cube/kv/RowKeyDecoderTest.java | 15 +- .../apache/kylin/cube/kv/RowKeyEncoderTest.java | 24 +- .../validation/rule/DictionaryRuleTest.java | 18 +- .../model/validation/rule/FunctionRuleTest.java | 3 +- .../kylin/cube/project/ProjectManagerTest.java | 6 +- .../gridtable/AggregationCacheMemSizeTest.java | 48 +- .../gridtable/AggregationCacheSpillTest.java | 12 +- .../gridtable/DimEncodingPreserveOrderTest.java | 10 +- .../kylin/gridtable/GTScanReqSerDerTest.java | 3 +- .../kylin/gridtable/SimpleGridTableTest.java | 7 +- .../metadata/measure/MeasureCodecTest.java | 3 +- .../metadata/measure/TopNMeasureTypeTest.java | 9 +- .../apache/kylin/dict/AppendTrieDictionary.java | 64 +- .../kylin/dict/BuiltInFunctionTransformer.java | 18 +- .../org/apache/kylin/dict/ByteComparator.java | 4 +- .../org/apache/kylin/dict/CacheDictionary.java | 4 +- .../apache/kylin/dict/DateStrDictionary.java | 5 +- .../apache/kylin/dict/DictionaryGenerator.java | 30 +- .../org/apache/kylin/dict/DictionaryInfo.java | 10 +- .../apache/kylin/dict/DictionaryManager.java | 51 +- .../kylin/dict/GlobalDictionaryBuilder.java | 3 +- .../apache/kylin/dict/IDictionaryBuilder.java | 4 +- .../kylin/dict/IDictionaryValueEnumerator.java | 2 +- .../dict/IterableDictionaryValueEnumerator.java | 2 +- .../dict/MultipleDictionaryValueEnumerator.java | 2 +- .../kylin/dict/Number2BytesConverter.java | 16 +- .../org/apache/kylin/dict/NumberDictionary.java | 8 +- .../kylin/dict/NumberDictionaryBuilder.java | 3 + .../dict/NumberDictionaryForestBuilder.java | 6 +- .../kylin/dict/TableColumnValueEnumerator.java | 3 +- .../dict/TableColumnValueSortedEnumerator.java | 7 +- .../org/apache/kylin/dict/TrieDictionary.java | 11 +- .../kylin/dict/TrieDictionaryBuilder.java | 27 +- .../apache/kylin/dict/TrieDictionaryForest.java | 17 +- .../kylin/dict/TrieDictionaryForestBuilder.java | 13 +- .../kylin/dict/global/AppendDictNode.java | 27 +- .../kylin/dict/global/AppendDictSlice.java | 21 +- .../kylin/dict/global/AppendDictSliceKey.java | 4 +- .../global/AppendTrieDictionaryBuilder.java | 27 +- .../global/AppendTrieDictionaryChecker.java | 4 +- .../kylin/dict/global/GlobalDictHDFSStore.java | 31 +- .../kylin/dict/global/GlobalDictMetadata.java | 10 +- .../kylin/dict/global/GlobalDictStore.java | 8 +- .../apache/kylin/dict/lookup/LookupTable.java | 6 +- .../apache/kylin/dict/lookup/SnapshotCLI.java | 3 +- .../kylin/dict/lookup/SnapshotManager.java | 9 +- .../apache/kylin/dict/lookup/SnapshotTable.java | 7 +- .../kylin/dict/DictionaryManagerTest.java | 33 +- .../kylin/dict/DictionaryProviderTest.java | 17 +- .../apache/kylin/dict/MockupReadableTable.java | 2 +- .../MultipleDictionaryValueEnumeratorTest.java | 45 +- .../apache/kylin/dict/NumberDictionaryTest.java | 9 +- .../dict/TrieDictionaryForestBenchmark.java | 16 +- .../kylin/dict/TrieDictionaryForestTest.java | 25 +- .../apache/kylin/dict/TrieDictionaryTest.java | 19 +- .../dict/global/AppendTrieDictionaryTest.java | 37 +- .../kylin/dict/lookup/LookupTableTest.java | 8 +- .../org/apache/kylin/engine/EngineFactory.java | 4 +- .../apache/kylin/engine/IBatchCubingEngine.java | 4 +- .../java/org/apache/kylin/job/JobInstance.java | 3 +- .../org/apache/kylin/job/JoinedFlatTable.java | 15 +- .../kylin/job/common/PatternedLogger.java | 10 +- .../kylin/job/common/ShellExecutable.java | 7 +- .../kylin/job/constant/ExecutableConstants.java | 8 +- .../kylin/job/constant/JobStatusEnum.java | 3 +- .../kylin/job/constant/JobStepStatusEnum.java | 3 +- .../org/apache/kylin/job/dao/ExecutableDao.java | 12 +- .../kylin/job/engine/JobEngineConfig.java | 3 +- .../exception/IllegalStateTranferException.java | 3 +- .../kylin/job/execution/AbstractExecutable.java | 9 +- .../job/execution/DefaultChainedExecutable.java | 7 +- .../kylin/job/execution/ExecutableManager.java | 17 +- .../kylin/job/execution/ExecutableState.java | 16 +- .../job/impl/threadpool/DefaultScheduler.java | 12 +- .../impl/threadpool/DistributedScheduler.java | 19 +- .../java/org/apache/kylin/job/lock/JobLock.java | 2 +- .../apache/kylin/job/ExecutableManagerTest.java | 3 +- .../apache/kylin/job/JobEngineConfigTest.java | 8 +- .../apache/kylin/job/SelfStopExecutable.java | 4 +- .../job/impl/threadpool/BaseSchedulerTest.java | 9 +- .../apache/kylin/dimension/BooleanDimEnc.java | 5 +- .../org/apache/kylin/dimension/DateDimEnc.java | 3 +- .../kylin/dimension/DictionaryDimEnc.java | 3 +- .../apache/kylin/dimension/FixedLenDimEnc.java | 6 +- .../kylin/dimension/FixedLenHexDimEnc.java | 11 +- .../org/apache/kylin/dimension/IntDimEnc.java | 8 +- .../apache/kylin/dimension/IntegerDimEnc.java | 14 +- .../kylin/dimension/OneMoreByteVLongDimEnc.java | 24 +- .../kylin/measure/BufferedMeasureCodec.java | 6 +- .../kylin/measure/MeasureAggregators.java | 3 +- .../org/apache/kylin/measure/MeasureCodec.java | 6 +- .../apache/kylin/measure/MeasureIngester.java | 12 +- .../org/apache/kylin/measure/MeasureType.java | 16 +- .../kylin/measure/MeasureTypeFactory.java | 21 +- .../kylin/measure/basic/BasicMeasureType.java | 12 +- .../kylin/measure/basic/BigDecimalIngester.java | 3 +- .../BitmapIntersectDistinctCountAggFunc.java | 5 +- .../kylin/measure/bitmap/BitmapMeasureType.java | 20 +- .../kylin/measure/bitmap/BitmapSerializer.java | 6 +- .../measure/bitmap/RoaringBitmapCounter.java | 11 +- .../bitmap/RoaringBitmapCounterFactory.java | 7 +- .../dim/DimCountDistinctMeasureType.java | 3 +- .../ExtendedColumnMeasureType.java | 12 +- .../kylin/measure/hllc/HLLCMeasureType.java | 12 +- .../kylin/measure/hllc/HLLCSerializer.java | 6 +- .../apache/kylin/measure/hllc/HLLCounter.java | 60 +- .../kylin/measure/hllc/HLLCounterOld.java | 5 +- .../measure/hllc/HLLDistinctCountAggFunc.java | 3 +- .../measure/hllc/HyperLogLogPlusTable.java | 846 +- .../measure/percentile/PercentileAggFunc.java | 2 +- .../measure/percentile/PercentileCounter.java | 1 - .../percentile/PercentileMeasureType.java | 6 +- .../kylin/measure/raw/RawMeasureType.java | 12 +- .../apache/kylin/measure/raw/RawSerializer.java | 6 +- .../org/apache/kylin/measure/topn/Counter.java | 4 +- .../kylin/measure/topn/TopNMeasureType.java | 44 +- .../apache/kylin/metadata/MetadataManager.java | 49 +- .../kylin/metadata/badquery/BadQueryEntry.java | 6 +- .../badquery/BadQueryHistoryManager.java | 20 +- .../kylin/metadata/cachesync/Broadcaster.java | 18 +- .../metadata/datatype/BigDecimalSerializer.java | 4 +- .../metadata/datatype/BooleanSerializer.java | 8 +- .../kylin/metadata/datatype/DataType.java | 8 +- .../metadata/datatype/DataTypeSerializer.java | 7 +- .../metadata/datatype/DateTimeSerializer.java | 4 +- .../kylin/metadata/datatype/Int4Serializer.java | 4 +- .../metadata/datatype/Long8Serializer.java | 5 +- .../kylin/metadata/datatype/LongSerializer.java | 4 +- .../filter/BuiltInFunctionTupleFilter.java | 11 +- .../kylin/metadata/filter/CaseTupleFilter.java | 3 +- .../metadata/filter/ColumnTupleFilter.java | 16 +- .../metadata/filter/CompareTupleFilter.java | 17 +- .../filter/FilterOptimizeTransformer.java | 8 +- .../metadata/filter/LogicalTupleFilter.java | 3 +- .../kylin/metadata/filter/TupleFilter.java | 4 +- .../metadata/filter/TupleFilterSerializer.java | 6 +- .../metadata/filter/UDF/MassInTupleFilter.java | 9 +- .../filter/UDF/MassInValueProviderFactory.java | 3 +- .../metadata/filter/function/BuiltInMethod.java | 5 +- .../metadata/filter/function/Functions.java | 3 +- .../kylin/metadata/filter/function/Like.java | 8 +- .../metadata/filter/function/LikeMatchers.java | 3 +- .../apache/kylin/metadata/model/ColumnDesc.java | 6 +- .../kylin/metadata/model/DataModelDesc.java | 23 +- .../metadata/model/ExternalFilterDesc.java | 3 +- .../kylin/metadata/model/FunctionDesc.java | 3 +- .../apache/kylin/metadata/model/ISegment.java | 4 +- .../apache/kylin/metadata/model/JoinDesc.java | 32 +- .../kylin/metadata/model/JoinTableDesc.java | 12 +- .../apache/kylin/metadata/model/JoinsTree.java | 6 +- .../kylin/metadata/model/MeasureDesc.java | 3 +- .../metadata/model/ModelDimensionDesc.java | 4 +- .../kylin/metadata/model/PartitionDesc.java | 71 +- .../kylin/metadata/model/SegmentStatusEnum.java | 2 +- .../apache/kylin/metadata/model/Segments.java | 22 +- .../apache/kylin/metadata/model/TableDesc.java | 8 +- .../kylin/metadata/model/TableExtDesc.java | 6 +- .../kylin/metadata/project/ProjectInstance.java | 6 +- .../kylin/metadata/project/ProjectL2Cache.java | 14 +- .../kylin/metadata/project/ProjectManager.java | 35 +- .../metadata/project/RealizationEntry.java | 6 +- .../kylin/metadata/querymeta/ColumnMeta.java | 6 +- .../metadata/querymeta/ColumnMetaWithType.java | 6 +- .../metadata/querymeta/SelectedColumnMeta.java | 5 +- .../kylin/metadata/querymeta/TableMeta.java | 4 +- .../metadata/querymeta/TableMetaWithType.java | 4 +- .../realization/RealizationRegistry.java | 6 +- .../realization/RealizationStatusEnum.java | 2 +- .../kylin/metadata/realization/SQLDigest.java | 2 +- .../metadata/realization/SQLDigestUtil.java | 6 +- .../metadata/realization/StreamSQLDigest.java | 24 +- .../metadata/streaming/StreamingManager.java | 20 +- .../org/apache/kylin/metadata/tuple/Tuple.java | 3 +- .../java/org/apache/kylin/source/ISource.java | 2 +- .../kylin/source/ISourceMetadataExplorer.java | 6 +- .../org/apache/kylin/source/SourceFactory.java | 2 +- .../apache/kylin/source/SourcePartition.java | 8 +- .../kylin/source/datagen/ColumnGenConfig.java | 28 +- .../kylin/source/datagen/ColumnGenerator.java | 4 +- .../source/datagen/ModelDataGenerator.java | 28 +- .../kylin/source/datagen/TableGenConfig.java | 16 +- .../org/apache/kylin/source/datagen/Util.java | 2 +- .../kylin/dimension/FixedLenHexDimEncTest.java | 5 +- .../kylin/dimension/IntegerDimEncTest.java | 10 +- .../dimension/OneMoreByteVLongDimEncTest.java | 2 + .../measure/AggregatorMemEstimateTest.java | 13 +- .../measure/bitmap/BitmapAggregatorTest.java | 9 +- .../kylin/measure/bitmap/BitmapCounterTest.java | 10 +- .../measure/bitmap/BitmapSerializerTest.java | 14 +- .../kylin/measure/hllc/HLLCMeasureTypeTest.java | 13 +- .../percentile/PercentileCounterTest.java | 2 +- .../kylin/measure/topn/TopNCounterTest.java | 27 +- .../badquery/BadQueryHistoryManagerTest.java | 15 +- .../kylin/metadata/model/DataModelDescTest.java | 9 +- .../DefaultPartitionConditionBuilderTest.java | 18 +- .../kylin/metadata/model/JoinsTreeTest.java | 4 +- .../kylin/source/datagen/DataGenTest.java | 4 +- .../apache/kylin/storage/StorageContext.java | 6 +- .../kylin/storage/adhoc/AdHocRunnerBase.java | 9 +- .../storage/gtrecord/CubeScanRangePlanner.java | 34 +- .../storage/gtrecord/CubeSegmentScanner.java | 16 +- .../storage/gtrecord/CubeTupleConverter.java | 24 +- .../gtrecord/GTCubeStorageQueryBase.java | 55 +- .../gtrecord/GTCubeStorageQueryRequest.java | 3 +- .../gtrecord/PartitionResultIterator.java | 7 +- .../kylin/storage/gtrecord/ScannerWorker.java | 12 +- .../gtrecord/SegmentCubeTupleIterator.java | 9 +- .../gtrecord/SequentialCubeTupleIterator.java | 12 +- .../SortMergedPartitionResultIterator.java | 20 +- .../storage/gtrecord/SortedIteratorMerger.java | 17 +- .../gtrecord/StorageResponseGTScatter.java | 27 +- .../kylin/storage/hybrid/HybridInstance.java | 11 +- .../kylin/storage/hybrid/HybridManager.java | 15 +- .../storage/hybrid/HybridStorageQuery.java | 3 +- .../storage/translate/ColumnValueRange.java | 3 +- .../translate/DerivedFilterTranslator.java | 12 +- .../kylin/storage/translate/HBaseKeyRange.java | 13 +- .../apache/kylin/storage/StorageMockUtils.java | 6 +- .../apache/kylin/storage/cache/EhcacheTest.java | 15 +- .../storage/gtrecord/DictGridTableTest.java | 109 +- .../SortedIteratorMergerWithLimitTest.java | 33 +- .../kylin/engine/mr/BatchCubingJobBuilder.java | 12 +- .../kylin/engine/mr/BatchCubingJobBuilder2.java | 17 +- .../kylin/engine/mr/BatchMergeJobBuilder.java | 9 +- .../kylin/engine/mr/BatchMergeJobBuilder2.java | 6 +- .../kylin/engine/mr/ByteArrayWritable.java | 3 +- .../org/apache/kylin/engine/mr/CubingJob.java | 27 +- .../apache/kylin/engine/mr/DFSFileTable.java | 2 +- .../kylin/engine/mr/DFSFileTableReader.java | 3 +- .../org/apache/kylin/engine/mr/IMROutput2.java | 3 +- .../kylin/engine/mr/JobBuilderSupport.java | 11 +- .../org/apache/kylin/engine/mr/KylinMapper.java | 12 +- .../apache/kylin/engine/mr/KylinReducer.java | 12 +- .../java/org/apache/kylin/engine/mr/MRUtil.java | 3 +- .../kylin/engine/mr/SortedColumnDFSFile.java | 8 +- .../engine/mr/SortedColumnDFSFileReader.java | 7 +- .../engine/mr/common/AbstractHadoopJob.java | 79 +- .../engine/mr/common/BaseCuboidBuilder.java | 19 +- .../kylin/engine/mr/common/BatchConstants.java | 1 + .../kylin/engine/mr/common/CubeStatsReader.java | 29 +- .../kylin/engine/mr/common/CubeStatsWriter.java | 8 +- .../kylin/engine/mr/common/CuboidShardUtil.java | 3 +- .../common/DefaultSslProtocolSocketFactory.java | 9 +- .../kylin/engine/mr/common/HadoopCmdOutput.java | 5 +- .../engine/mr/common/HadoopShellExecutable.java | 6 +- .../engine/mr/common/HadoopStatusChecker.java | 6 +- .../engine/mr/common/JobInfoConverter.java | 4 +- .../engine/mr/common/MapReduceExecutable.java | 6 +- .../kylin/engine/mr/common/NDCuboidBuilder.java | 7 +- .../engine/mr/steps/BaseCuboidMapperBase.java | 12 +- .../engine/mr/steps/CreateDictionaryJob.java | 6 +- .../engine/mr/steps/CubingExecutableUtil.java | 40 +- .../apache/kylin/engine/mr/steps/CuboidJob.java | 6 +- .../kylin/engine/mr/steps/CuboidReducer.java | 3 +- .../mr/steps/FactDistinctColumnsCombiner.java | 6 +- .../engine/mr/steps/FactDistinctColumnsJob.java | 17 +- .../mr/steps/FactDistinctColumnsMapper.java | 20 +- .../mr/steps/FactDistinctColumnsMapperBase.java | 3 +- .../mr/steps/FactDistinctColumnsReducer.java | 37 +- .../engine/mr/steps/HiveToBaseCuboidMapper.java | 2 +- .../kylin/engine/mr/steps/InMemCuboidJob.java | 3 +- .../engine/mr/steps/InMemCuboidMapper.java | 8 +- .../engine/mr/steps/InMemCuboidReducer.java | 3 +- .../mr/steps/MapContextGTRecordWriter.java | 3 +- .../engine/mr/steps/MergeCuboidMapper.java | 16 +- .../engine/mr/steps/MergeDictionaryStep.java | 6 +- .../engine/mr/steps/MergeStatisticsStep.java | 13 +- .../engine/mr/steps/MetadataCleanupJob.java | 16 +- .../kylin/engine/mr/steps/NDCuboidMapper.java | 11 +- .../kylin/engine/mr/steps/ReducerNumSizing.java | 13 +- .../mr/steps/RowKeyDistributionCheckerJob.java | 3 +- .../steps/RowKeyDistributionCheckerMapper.java | 2 +- .../steps/RowKeyDistributionCheckerReducer.java | 3 +- .../engine/mr/steps/SaveStatisticsStep.java | 10 +- .../engine/mr/steps/SelfDefineSortableKey.java | 8 +- .../mr/steps/UpdateCubeInfoAfterBuildStep.java | 3 +- .../mr/steps/UpdateCubeInfoAfterMergeStep.java | 3 +- .../kylin/engine/mr/SortedColumnReaderTest.java | 2 +- .../apache/kylin/engine/mr/TableReaderTest.java | 6 +- .../kylin/engine/mr/steps/CubeReducerTest.java | 27 +- .../engine/mr/steps/MergeCuboidJobTest.java | 3 +- .../engine/mr/steps/MergeCuboidMapperTest.java | 8 +- .../kylin/engine/mr/steps/NDCuboidJobTest.java | 6 +- .../engine/mr/steps/NDCuboidMapperTest.java | 15 +- .../mr/steps/NewCubeSamplingMethodTest.java | 39 +- .../mr/steps/NumberDictionaryForestTest.java | 19 +- .../mr/steps/SelfDefineSortableKeyTest.java | 20 +- .../spark/SparkBatchCubingJobBuilder2.java | 3 +- .../kylin/engine/spark/SparkCountDemo.java | 25 +- .../apache/kylin/engine/spark/SparkCubing.java | 333 +- .../kylin/engine/spark/SparkCubingByLayer.java | 165 +- .../kylin/engine/spark/SparkExecutable.java | 10 +- .../kylin/engine/spark/util/IteratorUtils.java | 3 +- .../spark/cube/BufferedCuboidWriterTest.java | 3 +- .../engine/spark/util/KyroMappingGenerator.java | 17 +- .../main/java/org/apache/kylin/jdbc/Driver.java | 6 +- .../org/apache/kylin/jdbc/IRemoteClient.java | 3 +- .../java/org/apache/kylin/jdbc/KylinClient.java | 32 +- .../org/apache/kylin/jdbc/KylinConnection.java | 12 +- .../org/apache/kylin/jdbc/KylinJdbcFactory.java | 19 +- .../java/org/apache/kylin/jdbc/KylinMeta.java | 53 +- .../kylin/jdbc/KylinPreparedStatement.java | 3 +- .../org/apache/kylin/jdbc/KylinResultSet.java | 3 +- .../org/apache/kylin/jdbc/KylinStatement.java | 3 +- .../apache/kylin/jdbc/json/SQLResponseStub.java | 2 +- .../java/org/apache/kylin/jdbc/DriverTest.java | 10 +- .../java/org/apache/kylin/jdbc/DummyClient.java | 3 +- .../apache/kylin/jdbc/SQLResonseStubTest.java | 8 +- .../kylin/cube/ITDictionaryManagerTest.java | 3 +- .../inmemcubing/ITDoggedCubeBuilderTest.java | 5 +- .../inmemcubing/ITInMemCubeBuilderTest.java | 26 +- .../dict/ITGlobalDictionaryBuilderTest.java | 15 +- .../org/apache/kylin/jdbc/ITJDBCDriverTest.java | 10 +- .../kylin/job/BaseTestDistributedScheduler.java | 10 +- .../kylin/provision/BuildCubeWithEngine.java | 13 +- .../kylin/provision/BuildCubeWithStream.java | 17 +- .../org/apache/kylin/provision/MockKafka.java | 14 +- .../java/org/apache/kylin/query/H2Database.java | 9 +- .../apache/kylin/query/HackedDbUnitAssert.java | 52 +- .../apache/kylin/query/ITCombinationTest.java | 3 +- .../apache/kylin/query/ITKylinQueryTest.java | 12 +- .../apache/kylin/query/ITMassInQueryTest.java | 3 +- .../org/apache/kylin/query/KylinTestBase.java | 31 +- .../hive/ITHiveSourceTableLoaderTest.java | 8 +- .../hbase/ITAclTableMigrationToolTest.java | 9 +- .../storage/hbase/ITHBaseResourceStoreTest.java | 9 +- .../kylin/storage/hbase/ITStorageTest.java | 9 +- .../hbase/ITZookeeperDistributedLockTest.java | 2 +- .../storage/hdfs/ITHDFSResourceStoreTest.java | 1 + .../kylin/storage/hdfs/ITLockManagerTest.java | 32 +- .../java/org/apache/kylin/query/QueryCli.java | 6 +- .../org/apache/kylin/query/QueryDataSource.java | 4 +- .../query/enumerator/LookupTableEnumerator.java | 3 +- .../kylin/query/enumerator/OLAPEnumerator.java | 3 +- .../optrule/AggregateMultipleExpandRule.java | 17 +- .../optrule/AggregateProjectReduceRule.java | 5 +- .../kylin/query/optrule/OLAPAggregateRule.java | 3 +- .../kylin/query/optrule/OLAPFilterRule.java | 3 +- .../kylin/query/optrule/OLAPJoinRule.java | 3 +- .../kylin/query/optrule/OLAPSortRule.java | 4 +- .../kylin/query/optrule/OLAPUnionRule.java | 4 +- .../kylin/query/optrule/OLAPWindowRule.java | 3 +- .../kylin/query/relnode/OLAPAggregateRel.java | 25 +- .../apache/kylin/query/relnode/OLAPContext.java | 5 +- .../kylin/query/relnode/OLAPFilterRel.java | 11 +- .../apache/kylin/query/relnode/OLAPJoinRel.java | 12 +- .../kylin/query/relnode/OLAPLimitRel.java | 3 +- .../kylin/query/relnode/OLAPProjectRel.java | 39 +- .../org/apache/kylin/query/relnode/OLAPRel.java | 5 +- .../apache/kylin/query/relnode/OLAPSortRel.java | 9 +- .../kylin/query/relnode/OLAPTableScan.java | 6 +- .../relnode/OLAPToEnumerableConverter.java | 10 +- .../kylin/query/relnode/OLAPUnionRel.java | 2 +- .../kylin/query/relnode/OLAPWindowRel.java | 15 +- .../apache/kylin/query/routing/QueryRouter.java | 9 +- .../kylin/query/routing/RealizationChooser.java | 6 +- .../apache/kylin/query/routing/RoutingRule.java | 6 +- .../routing/rules/RealizationSortRule.java | 3 +- .../rules/RemoveBlackoutRealizationsRule.java | 4 +- .../apache/kylin/query/schema/OLAPTable.java | 15 +- .../query/util/CognosParenthesesEscape.java | 3 +- .../org/apache/kylin/query/util/QueryUtil.java | 17 +- .../apache/kylin/query/QueryDataSourceTest.java | 6 +- .../query/util/CognosParenthesesEscapeTest.java | 21 +- .../apache/kylin/query/util/QueryUtilTest.java | 4 +- .../kylin/rest/adhoc/AdHocRunnerJdbcImpl.java | 18 +- .../kylin/rest/adhoc/JdbcConnectionFactory.java | 12 +- .../kylin/rest/adhoc/JdbcConnectionPool.java | 5 +- .../apache/kylin/rest/constant/Constant.java | 3 +- .../kylin/rest/controller/AccessController.java | 9 +- .../kylin/rest/controller/BasicController.java | 6 +- .../kylin/rest/controller/CacheController.java | 12 +- .../kylin/rest/controller/CubeController.java | 52 +- .../rest/controller/DiagnosisController.java | 9 +- .../controller/ExternalFilterController.java | 6 +- .../kylin/rest/controller/HybridController.java | 9 +- .../kylin/rest/controller/JobController.java | 9 +- .../kylin/rest/controller/ModelController.java | 11 +- .../rest/controller/ProjectController.java | 14 +- .../kylin/rest/controller/QueryController.java | 7 +- .../rest/controller/StreamingController.java | 26 +- .../kylin/rest/controller/TableController.java | 12 +- .../kylin/rest/controller/UserController.java | 3 +- .../rest/controller2/AccessControllerV2.java | 24 +- .../rest/controller2/AdminControllerV2.java | 18 +- .../rest/controller2/CacheControllerV2.java | 15 +- .../rest/controller2/CubeControllerV2.java | 151 +- .../rest/controller2/CubeDescControllerV2.java | 6 +- .../rest/controller2/DiagnosisControllerV2.java | 21 +- .../rest/controller2/EncodingControllerV2.java | 3 +- .../controller2/ExternalFilterControllerV2.java | 21 +- .../rest/controller2/HybridControllerV2.java | 18 +- .../kylin/rest/controller2/JobControllerV2.java | 39 +- .../rest/controller2/ModelControllerV2.java | 52 +- .../rest/controller2/ModelDescControllerV2.java | 3 +- .../rest/controller2/ProjectControllerV2.java | 29 +- .../rest/controller2/QueryControllerV2.java | 47 +- .../rest/controller2/StreamingControllerV2.java | 39 +- .../rest/controller2/TableControllerV2.java | 47 +- .../rest/controller2/UserControllerV2.java | 9 +- .../rest/exception/BadRequestException.java | 3 +- .../kylin/rest/init/InitialTaskManager.java | 2 +- .../apache/kylin/rest/job/HybridCubeCLI.java | 42 +- .../kylin/rest/job/StorageCleanupJob.java | 33 +- .../apache/kylin/rest/metrics/QueryMetrics.java | 18 +- .../kylin/rest/metrics/QueryMetricsFacade.java | 7 +- .../org/apache/kylin/rest/msg/CnMessage.java | 2 +- .../kylin/rest/request/HiveTableRequestV2.java | 1 + .../kylin/rest/request/JobBuildRequest2.java | 4 +- .../kylin/rest/request/PrepareSqlRequest.java | 2 +- .../kylin/rest/response/ErrorResponse.java | 2 +- .../apache/kylin/rest/response/SQLResponse.java | 9 +- .../kylin/rest/security/AclHBaseStorage.java | 2 +- .../rest/security/AuthoritiesPopulator.java | 3 +- .../kylin/rest/security/CrossDomainFilter.java | 9 +- .../security/KylinAuthenticationProvider.java | 8 +- .../apache/kylin/rest/security/MockHTable.java | 74 +- .../security/PasswordPlaceholderConfigurer.java | 6 +- .../rest/security/RealAclHBaseStorage.java | 3 +- .../rest/security/UnauthorisedEntryPoint.java | 3 +- .../kylin/rest/service/AccessService.java | 6 +- .../apache/kylin/rest/service/AclService.java | 28 +- .../rest/service/AclTableMigrationTool.java | 37 +- .../kylin/rest/service/BadQueryDetector.java | 28 +- .../apache/kylin/rest/service/CacheService.java | 3 +- .../apache/kylin/rest/service/CubeService.java | 69 +- .../kylin/rest/service/DiagnosisService.java | 3 +- .../kylin/rest/service/DomainObjectInfo.java | 1 + .../kylin/rest/service/EncodingService.java | 9 +- .../kylin/rest/service/HybridService.java | 12 +- .../apache/kylin/rest/service/JobService.java | 224 +- .../kylin/rest/service/KafkaConfigService.java | 3 +- .../kylin/rest/service/LegacyAclService.java | 58 +- .../kylin/rest/service/LegacyUserService.java | 12 +- .../apache/kylin/rest/service/ModelService.java | 24 +- .../kylin/rest/service/ProjectService.java | 17 +- .../apache/kylin/rest/service/QueryService.java | 109 +- .../kylin/rest/service/StreamingService.java | 3 +- .../rest/service/TableSchemaUpdateChecker.java | 36 +- .../apache/kylin/rest/service/TableService.java | 15 +- .../rest/service/UserGrantedAuthority.java | 1 + .../org/apache/kylin/rest/service/UserInfo.java | 1 + .../apache/kylin/rest/service/UserService.java | 3 +- .../org/apache/kylin/rest/util/AclUtil.java | 8 +- .../org/apache/kylin/rest/util/AdHocUtil.java | 17 +- .../kylin/rest/util/ControllerSplitter.java | 18 +- .../kylin/rest/util/TableauInterceptor.java | 4 +- .../org/apache/kylin/rest/bean/BeanTest.java | 9 +- .../apache/kylin/rest/bean/BeanValidator.java | 53 +- .../PasswordPlaceHolderConfigurerTest.java | 2 +- .../java/org/apache/kylin/rest/DebugTomcat.java | 14 +- .../rest/controller/AccessControllerTest.java | 17 +- .../rest/controller/CubeControllerTest.java | 6 +- .../rest/controller/ProjectControllerTest.java | 14 +- .../rest/controller/QueryControllerTest.java | 6 +- .../kylin/rest/service/AccessServiceTest.java | 6 +- .../rest/service/BadQueryDetectorTest.java | 3 +- .../kylin/rest/service/CacheServiceTest.java | 57 +- .../kylin/rest/service/CubeServiceTest.java | 2 +- .../kylin/rest/service/ModelServiceTest.java | 9 +- .../kylin/rest/service/ServiceTestBase.java | 7 +- .../kylin/source/hive/BeelineHiveClient.java | 9 +- .../apache/kylin/source/hive/CLIHiveClient.java | 12 +- .../apache/kylin/source/hive/HiveMRInput.java | 27 +- .../org/apache/kylin/source/hive/HiveTable.java | 3 +- .../apache/kylin/source/hive/HiveTableMeta.java | 13 +- .../kylin/source/hive/HiveTableMetaBuilder.java | 5 +- .../kylin/source/hive/HiveTableReader.java | 6 +- .../apache/kylin/source/hive/IHiveClient.java | 4 +- .../cardinality/ColumnCardinalityMapper.java | 2 +- .../cardinality/ColumnCardinalityReducer.java | 3 +- .../cardinality/HiveColumnCardinalityJob.java | 3 +- .../HiveColumnCardinalityUpdateJob.java | 3 +- .../kylin/source/kafka/DefaultTimeParser.java | 4 +- .../kylin/source/kafka/KafkaConfigManager.java | 12 +- .../apache/kylin/source/kafka/KafkaMRInput.java | 37 +- .../apache/kylin/source/kafka/KafkaSource.java | 36 +- .../kylin/source/kafka/StreamingParser.java | 12 +- .../source/kafka/TimedJsonStreamParser.java | 22 +- .../kylin/source/kafka/config/BrokerConfig.java | 6 +- .../source/kafka/config/KafkaClusterConfig.java | 3 +- .../kafka/config/KafkaConsumerProperties.java | 13 +- .../source/kafka/hadoop/KafkaFlatTableJob.java | 5 +- .../source/kafka/hadoop/KafkaInputFormat.java | 12 +- .../kafka/hadoop/KafkaInputRecordReader.java | 16 +- .../source/kafka/hadoop/KafkaInputSplit.java | 4 +- .../kylin/source/kafka/job/MergeOffsetStep.java | 3 +- .../kylin/source/kafka/util/KafkaClient.java | 21 +- .../source/kafka/util/KafkaSampleProducer.java | 12 +- .../source/kafka/TimedJsonStreamParserTest.java | 3 +- .../config/KafkaConsumerPropertiesTest.java | 9 +- .../kylin/storage/hbase/HBaseConnection.java | 13 +- .../kylin/storage/hbase/HBaseResourceStore.java | 30 +- .../kylin/storage/hbase/HBaseStorage.java | 12 +- .../hbase/common/coprocessor/AggrKey.java | 3 +- .../common/coprocessor/AggregationCache.java | 7 +- .../common/coprocessor/CoprocessorFilter.java | 6 +- .../coprocessor/CoprocessorProjector.java | 7 +- .../common/coprocessor/FilterDecorator.java | 8 +- .../hbase/cube/HBaseScannerBenchmark.java | 6 +- .../storage/hbase/cube/SimpleHBaseStore.java | 12 +- .../hbase/cube/v2/CubeHBaseEndpointRPC.java | 57 +- .../storage/hbase/cube/v2/CubeHBaseRPC.java | 22 +- .../storage/hbase/cube/v2/CubeHBaseScanRPC.java | 9 +- .../hbase/cube/v2/ExpectedSizeIterator.java | 7 +- .../hbase/cube/v2/HBaseReadonlyStore.java | 15 +- .../coprocessor/endpoint/CubeVisitService.java | 67 +- .../endpoint/generated/CubeVisitProtos.java | 10764 ++++++++--------- .../storage/hbase/steps/CreateHTableJob.java | 34 +- .../storage/hbase/steps/CubeHTableUtil.java | 9 +- .../storage/hbase/steps/DeprecatedGCStep.java | 5 +- .../storage/hbase/steps/HBaseCuboidWriter.java | 6 +- .../hbase/steps/HBaseMROutput2Transition.java | 19 +- .../kylin/storage/hbase/steps/HBaseMRSteps.java | 36 +- .../hbase/steps/RangeKeyDistributionJob.java | 6 +- .../steps/RangeKeyDistributionReducer.java | 10 +- .../hbase/steps/SequenceFileCuboidWriter.java | 4 +- .../storage/hbase/util/CubeMigrationCLI.java | 59 +- .../hbase/util/CubeMigrationCheckCLI.java | 19 +- .../hbase/util/DeployCoprocessorCLI.java | 35 +- .../hbase/util/ExtendCubeToHybridCLI.java | 24 +- .../hbase/util/GridTableHBaseBenchmark.java | 6 +- .../kylin/storage/hbase/util/HBaseClean.java | 6 +- .../storage/hbase/util/HbaseStreamingInput.java | 3 +- .../hbase/util/HtableAlterMetadataCLI.java | 9 +- .../storage/hbase/util/OrphanHBaseCleanJob.java | 6 +- .../kylin/storage/hbase/util/PingHBaseCLI.java | 6 +- .../storage/hbase/util/PrintHBaseConfig.java | 8 +- .../kylin/storage/hbase/util/Results.java | 6 +- .../kylin/storage/hbase/util/RowCounterCLI.java | 3 +- .../storage/hbase/util/StorageCleanupJob.java | 24 +- .../kylin/storage/hbase/util/TarGZUtil.java | 3 +- .../hbase/util/ZookeeperDistributedLock.java | 15 +- .../storage/hbase/util/ZookeeperJobLock.java | 8 +- .../kylin/storage/hbase/util/ZookeeperUtil.java | 15 +- .../kylin/storage/hdfs/HDFSResourceStore.java | 14 +- .../apache/kylin/storage/hdfs/LockManager.java | 1 + .../apache/kylin/storage/hdfs/ResourceLock.java | 9 +- .../hbase/common/FuzzyValueCombinationTest.java | 6 +- .../hbase/common/HiveJDBCClientTest.java | 3 +- .../TimeConditionLiteralsReplacerTest.java | 3 +- .../common/coprocessor/FilterBaseTest.java | 6 +- .../cube/MeasureTypeOnlyAggrInBaseTest.java | 6 +- .../hbase/steps/CubeHFileMapper2Test.java | 6 +- .../steps/RangeKeyDistributionMapperTest.java | 24 +- .../hbase/steps/RowValueDecoderTest.java | 6 +- .../hbase/steps/SandboxMetastoreCLI.java | 3 +- .../kylin/tool/AbstractInfoExtractor.java | 18 +- .../apache/kylin/tool/AclTableMigrationCLI.java | 3 +- .../apache/kylin/tool/CubeMetaExtractor.java | 66 +- .../org/apache/kylin/tool/CubeMetaIngester.java | 31 +- .../org/apache/kylin/tool/CubeMigrationCLI.java | 53 +- .../kylin/tool/CubeMigrationCheckCLI.java | 16 +- .../org/apache/kylin/tool/DiagnosisInfoCLI.java | 61 +- .../kylin/tool/ExtendCubeToHybridCLI.java | 21 +- .../apache/kylin/tool/HBaseUsageExtractor.java | 14 +- .../apache/kylin/tool/JobDiagnosisInfoCLI.java | 45 +- .../apache/kylin/tool/JobInstanceExtractor.java | 23 +- .../apache/kylin/tool/KylinLogExtractor.java | 7 +- .../apache/kylin/tool/MetadataCleanupJob.java | 23 +- .../apache/kylin/tool/MrJobInfoExtractor.java | 30 +- .../org/apache/kylin/tool/util/ToolUtil.java | 11 +- .../apache/kylin/tool/CubeMetaIngesterTest.java | 14 +- .../apache/kylin/tool/HybridCubeCLITest.java | 18 +- .../apache/kylin/tool/KylinConfigCLITest.java | 4 +- 694 files changed, 11076 insertions(+), 13764 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/assembly/src/test/java/org/apache/kylin/RealizationRegistryTest.java ---------------------------------------------------------------------- diff --git a/assembly/src/test/java/org/apache/kylin/RealizationRegistryTest.java b/assembly/src/test/java/org/apache/kylin/RealizationRegistryTest.java index 57ba53f..11723c8 100644 --- a/assembly/src/test/java/org/apache/kylin/RealizationRegistryTest.java +++ b/assembly/src/test/java/org/apache/kylin/RealizationRegistryTest.java @@ -18,10 +18,6 @@ package org.apache.kylin; -import static org.junit.Assert.assertEquals; - -import java.util.Set; - import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.LocalFileMetadataTestCase; import org.apache.kylin.metadata.realization.RealizationRegistry; @@ -30,6 +26,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.util.Set; + +import static org.junit.Assert.assertEquals; + /** */ public class RealizationRegistryTest extends LocalFileMetadataTestCase { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java ---------------------------------------------------------------------- diff --git a/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java b/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java index cfb61ff..dac6aa9 100644 --- a/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java +++ b/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java @@ -46,8 +46,7 @@ public class DeployLocalMetaToRemoteTest { ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath()); System.setProperty(KylinConfig.KYLIN_CONF, HBaseMetadataTestCase.SANDBOX_TEST_DATA); if (StringUtils.isEmpty(System.getProperty("hdp.version"))) { - throw new RuntimeException( - "No hdp.version set; Please set hdp.version in your jvm option, for example: -Dhdp.version=2.4.0.0-169"); + throw new RuntimeException("No hdp.version set; Please set hdp.version in your jvm option, for example: -Dhdp.version=2.4.0.0-169"); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/assembly/src/test/java/org/apache/kylin/job/DeployUtil.java ---------------------------------------------------------------------- diff --git a/assembly/src/test/java/org/apache/kylin/job/DeployUtil.java b/assembly/src/test/java/org/apache/kylin/job/DeployUtil.java index 61a4d33..077c056 100644 --- a/assembly/src/test/java/org/apache/kylin/job/DeployUtil.java +++ b/assembly/src/test/java/org/apache/kylin/job/DeployUtil.java @@ -153,11 +153,9 @@ public class DeployUtil { deployHiveTables(); } - public static void prepareTestDataForStreamingCube(long startTime, long endTime, int numberOfRecords, - String cubeName, StreamDataLoader streamDataLoader) throws IOException { + public static void prepareTestDataForStreamingCube(long startTime, long endTime, int numberOfRecords, String cubeName, StreamDataLoader streamDataLoader) throws IOException { CubeInstance cubeInstance = CubeManager.getInstance(KylinConfig.getInstanceFromEnv()).getCube(cubeName); - List<String> data = StreamingTableDataGenerator.generate(numberOfRecords, startTime, endTime, - cubeInstance.getRootFactTable()); + List<String> data = StreamingTableDataGenerator.generate(numberOfRecords, startTime, endTime, cubeInstance.getRootFactTable()); //load into kafka streamDataLoader.loadIntoKafka(data); logger.info("Write {} messages into {}", data.size(), streamDataLoader.toString()); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/assembly/src/test/java/org/apache/kylin/job/streaming/Kafka10DataLoader.java ---------------------------------------------------------------------- diff --git a/assembly/src/test/java/org/apache/kylin/job/streaming/Kafka10DataLoader.java b/assembly/src/test/java/org/apache/kylin/job/streaming/Kafka10DataLoader.java index 5a1f6a1..fae81ce 100644 --- a/assembly/src/test/java/org/apache/kylin/job/streaming/Kafka10DataLoader.java +++ b/assembly/src/test/java/org/apache/kylin/job/streaming/Kafka10DataLoader.java @@ -52,20 +52,18 @@ public class Kafka10DataLoader extends StreamDataLoader { public void loadIntoKafka(List<String> messages) { KafkaClusterConfig clusterConfig = kafkaClusterConfigs.get(0); - String brokerList = StringUtils - .join(Collections2.transform(clusterConfig.getBrokerConfigs(), new Function<BrokerConfig, String>() { - @Nullable - @Override - public String apply(BrokerConfig brokerConfig) { - return brokerConfig.getHost() + ":" + brokerConfig.getPort(); - } - }), ","); + String brokerList = StringUtils.join(Collections2.transform(clusterConfig.getBrokerConfigs(), new Function<BrokerConfig, String>() { + @Nullable + @Override + public String apply(BrokerConfig brokerConfig) { + return brokerConfig.getHost() + ":" + brokerConfig.getPort(); + } + }), ","); KafkaProducer producer = getKafkaProducer(brokerList, null); for (int i = 0; i < messages.size(); i++) { - ProducerRecord<String, String> keyedMessage = new ProducerRecord<String, String>(clusterConfig.getTopic(), - String.valueOf(i), messages.get(i)); + ProducerRecord<String, String> keyedMessage = new ProducerRecord<String, String>(clusterConfig.getTopic(), String.valueOf(i), messages.get(i)); producer.send(keyedMessage); } logger.info("sent " + messages.size() + " messages to " + this.toString()); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/assembly/src/test/java/org/apache/kylin/job/streaming/StreamDataLoader.java ---------------------------------------------------------------------- diff --git a/assembly/src/test/java/org/apache/kylin/job/streaming/StreamDataLoader.java b/assembly/src/test/java/org/apache/kylin/job/streaming/StreamDataLoader.java index 52658e2..2f7d54d 100644 --- a/assembly/src/test/java/org/apache/kylin/job/streaming/StreamDataLoader.java +++ b/assembly/src/test/java/org/apache/kylin/job/streaming/StreamDataLoader.java @@ -18,15 +18,14 @@ package org.apache.kylin.job.streaming; -import java.util.List; - import org.apache.kylin.source.kafka.config.KafkaConfig; +import java.util.List; + /** */ public abstract class StreamDataLoader { protected KafkaConfig kafkaConfig; - public StreamDataLoader(KafkaConfig kafkaConfig) { this.kafkaConfig = kafkaConfig; } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/atopcalcite/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindowBridge.java ---------------------------------------------------------------------- diff --git a/atopcalcite/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindowBridge.java b/atopcalcite/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindowBridge.java index 8e2cb62..13a33e3 100644 --- a/atopcalcite/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindowBridge.java +++ b/atopcalcite/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindowBridge.java @@ -18,8 +18,6 @@ package org.apache.calcite.adapter.enumerable; -import java.util.List; - import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelTraitSet; import org.apache.calcite.rel.RelNode; @@ -27,13 +25,15 @@ import org.apache.calcite.rel.core.Window; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rex.RexLiteral; +import java.util.List; + /** * EnumerableWindow cant'be created out of package, here's hack of workaround */ public class EnumerableWindowBridge { public static EnumerableWindow createEnumerableWindow(RelOptCluster cluster, RelTraitSet traits, RelNode child, - List<RexLiteral> constants, RelDataType rowType, List<Window.Group> groups) { + List<RexLiteral> constants, RelDataType rowType, List<Window.Group> groups) { return new EnumerableWindow(cluster, traits, child, constants, rowType, groups); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/atopcalcite/src/main/java/org/apache/calcite/rel/rules/OLAPJoinPushThroughJoinRule.java ---------------------------------------------------------------------- diff --git a/atopcalcite/src/main/java/org/apache/calcite/rel/rules/OLAPJoinPushThroughJoinRule.java b/atopcalcite/src/main/java/org/apache/calcite/rel/rules/OLAPJoinPushThroughJoinRule.java index c3cad47..35f2ae6 100644 --- a/atopcalcite/src/main/java/org/apache/calcite/rel/rules/OLAPJoinPushThroughJoinRule.java +++ b/atopcalcite/src/main/java/org/apache/calcite/rel/rules/OLAPJoinPushThroughJoinRule.java @@ -52,11 +52,9 @@ public class OLAPJoinPushThroughJoinRule extends RelOptRule { * Instance of the rule that works on logical joins only, and pushes to the * right. */ - public static final RelOptRule INSTANCE = new OLAPJoinPushThroughJoinRule("OLAPJoinPushThroughJoinRule", - LogicalJoin.class, RelFactories.LOGICAL_BUILDER); + public static final RelOptRule INSTANCE = new OLAPJoinPushThroughJoinRule("OLAPJoinPushThroughJoinRule", LogicalJoin.class, RelFactories.LOGICAL_BUILDER); - public OLAPJoinPushThroughJoinRule(String description, Class<? extends Join> clazz, - RelBuilderFactory relBuilderFactory) { + public OLAPJoinPushThroughJoinRule(String description, Class<? extends Join> clazz, RelBuilderFactory relBuilderFactory) { super(operand(clazz, operand(clazz, operand(RelNode.class, any()), operand(RelNode.class, null, new Predicate<RelNode>() { @@ -132,27 +130,23 @@ public class OLAPJoinPushThroughJoinRule extends RelOptRule { // .createShiftMapping(aCount + bCount + cCount, 0, 0, aCount, aCount, aCount + bCount, // cCount); - final Mappings.TargetMapping bottomMapping = Mappings.createShiftMapping(aCount + bCount + cCount, 0, 0, aCount, - aCount + cCount, aCount, bCount, aCount, aCount + bCount, cCount); + final Mappings.TargetMapping bottomMapping = Mappings.createShiftMapping(aCount + bCount + cCount, 0, 0, aCount, aCount + cCount, aCount, bCount, aCount, aCount + bCount, cCount); final List<RexNode> newBottomList = new ArrayList<>(); new RexPermuteInputsShuttle(bottomMapping, relA, relC).visitList(nonIntersecting, newBottomList); new RexPermuteInputsShuttle(bottomMapping, relA, relC).visitList(bottomNonIntersecting, newBottomList); final RexBuilder rexBuilder = cluster.getRexBuilder(); RexNode newBottomCondition = RexUtil.composeConjunction(rexBuilder, newBottomList, false); - final Join newBottomJoin = bottomJoin.copy(bottomJoin.getTraitSet(), newBottomCondition, relA, relC, - bottomJoin.getJoinType(), bottomJoin.isSemiJoinDone()); + final Join newBottomJoin = bottomJoin.copy(bottomJoin.getTraitSet(), newBottomCondition, relA, relC, bottomJoin.getJoinType(), bottomJoin.isSemiJoinDone()); // target: | A | C | B | // source: | A | B | C | - final Mappings.TargetMapping topMapping = Mappings.createShiftMapping(aCount + bCount + cCount, 0, 0, aCount, - aCount + cCount, aCount, bCount, aCount, aCount + bCount, cCount); + final Mappings.TargetMapping topMapping = Mappings.createShiftMapping(aCount + bCount + cCount, 0, 0, aCount, aCount + cCount, aCount, bCount, aCount, aCount + bCount, cCount); final List<RexNode> newTopList = new ArrayList<>(); new RexPermuteInputsShuttle(topMapping, newBottomJoin, relB).visitList(intersecting, newTopList); new RexPermuteInputsShuttle(topMapping, newBottomJoin, relB).visitList(bottomIntersecting, newTopList); RexNode newTopCondition = RexUtil.composeConjunction(rexBuilder, newTopList, false); @SuppressWarnings("SuspiciousNameCombination") - final Join newTopJoin = topJoin.copy(topJoin.getTraitSet(), newTopCondition, newBottomJoin, relB, - topJoin.getJoinType(), topJoin.isSemiJoinDone()); + final Join newTopJoin = topJoin.copy(topJoin.getTraitSet(), newTopCondition, newBottomJoin, relB, topJoin.getJoinType(), topJoin.isSemiJoinDone()); assert !Mappings.isIdentity(topMapping); final RelBuilder relBuilder = call.builder(); @@ -165,8 +159,7 @@ public class OLAPJoinPushThroughJoinRule extends RelOptRule { * Splits a condition into conjunctions that do or do not intersect with * a given bit set. */ - static void split(RexNode condition, ImmutableBitSet bitSet, List<RexNode> intersecting, - List<RexNode> nonIntersecting) { + static void split(RexNode condition, ImmutableBitSet bitSet, List<RexNode> intersecting, List<RexNode> nonIntersecting) { for (RexNode node : RelOptUtil.conjunctions(condition)) { ImmutableBitSet inputBitSet = RelOptUtil.InputFinder.bits(node); if (bitSet.intersects(inputBitSet)) { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/atopcalcite/src/main/java/org/apache/calcite/rel/rules/OLAPJoinPushThroughJoinRule2.java ---------------------------------------------------------------------- diff --git a/atopcalcite/src/main/java/org/apache/calcite/rel/rules/OLAPJoinPushThroughJoinRule2.java b/atopcalcite/src/main/java/org/apache/calcite/rel/rules/OLAPJoinPushThroughJoinRule2.java index ad73216..a769cbd 100644 --- a/atopcalcite/src/main/java/org/apache/calcite/rel/rules/OLAPJoinPushThroughJoinRule2.java +++ b/atopcalcite/src/main/java/org/apache/calcite/rel/rules/OLAPJoinPushThroughJoinRule2.java @@ -61,11 +61,9 @@ public class OLAPJoinPushThroughJoinRule2 extends RelOptRule { * Instance of the rule that works on logical joins only, and pushes to the * right. */ - public static final RelOptRule INSTANCE = new OLAPJoinPushThroughJoinRule2("OLAPJoinPushThroughJoinRule2", - LogicalJoin.class, RelFactories.LOGICAL_BUILDER); + public static final RelOptRule INSTANCE = new OLAPJoinPushThroughJoinRule2("OLAPJoinPushThroughJoinRule2", LogicalJoin.class, RelFactories.LOGICAL_BUILDER); - public OLAPJoinPushThroughJoinRule2(String description, Class<? extends Join> clazz, - RelBuilderFactory relBuilderFactory) { + public OLAPJoinPushThroughJoinRule2(String description, Class<? extends Join> clazz, RelBuilderFactory relBuilderFactory) { super(operand(clazz, operand(Project.class, //project is added on top by OLAPJoinPushThroughJoinRule @@ -118,8 +116,7 @@ public class OLAPJoinPushThroughJoinRule2 extends RelOptRule { final ImmutableBitSet bBitSetBelowProject = ImmutableBitSet.range(aCount, aCount + bCount); final ImmutableBitSet bBitSetAboveProject = Mappings.apply(inverseProjectPermu, bBitSetBelowProject); - final Mapping extendedProjectPerm = createAbstractTargetMapping( - Mappings.append(projectPermu, Mappings.createIdentity(cCount))); + final Mapping extendedProjectPerm = createAbstractTargetMapping(Mappings.append(projectPermu, Mappings.createIdentity(cCount))); // becomes // @@ -157,29 +154,23 @@ public class OLAPJoinPushThroughJoinRule2 extends RelOptRule { // target: | A | C | // source: | A | B | C | - final Mappings.TargetMapping tempMapping = Mappings.createShiftMapping(aCount + bCount + cCount, 0, 0, aCount, - aCount + cCount, aCount, bCount, aCount, aCount + bCount, cCount); - final Mappings.TargetMapping thruProjectMapping = Mappings.multiply(extendedProjectPerm, - createAbstractTargetMapping(tempMapping)); + final Mappings.TargetMapping tempMapping = Mappings.createShiftMapping(aCount + bCount + cCount, 0, 0, aCount, aCount + cCount, aCount, bCount, aCount, aCount + bCount, cCount); + final Mappings.TargetMapping thruProjectMapping = Mappings.multiply(extendedProjectPerm, createAbstractTargetMapping(tempMapping)); final List<RexNode> newBottomList = new ArrayList<>(); new RexPermuteInputsShuttle(thruProjectMapping, relA, relC).visitList(nonIntersecting, newBottomList); final RexBuilder rexBuilder = cluster.getRexBuilder(); RexNode newBottomCondition = RexUtil.composeConjunction(rexBuilder, newBottomList, false); - final Join newBottomJoin = bottomJoin.copy(bottomJoin.getTraitSet(), newBottomCondition, relA, relC, - bottomJoin.getJoinType(), bottomJoin.isSemiJoinDone()); + final Join newBottomJoin = bottomJoin.copy(bottomJoin.getTraitSet(), newBottomCondition, relA, relC, bottomJoin.getJoinType(), bottomJoin.isSemiJoinDone()); // target: | A | C | B | // source: | A | B | C | - final Mappings.TargetMapping nonThruProjectMapping = Mappings.createShiftMapping(aCount + bCount + cCount, 0, 0, - aCount, aCount + cCount, aCount, bCount, aCount, aCount + bCount, cCount); + final Mappings.TargetMapping nonThruProjectMapping = Mappings.createShiftMapping(aCount + bCount + cCount, 0, 0, aCount, aCount + cCount, aCount, bCount, aCount, aCount + bCount, cCount); final List<RexNode> newTopList = new ArrayList<>(); new RexPermuteInputsShuttle(thruProjectMapping, newBottomJoin, relB).visitList(intersecting, newTopList); - new RexPermuteInputsShuttle(nonThruProjectMapping, newBottomJoin, relB).visitList(bottomIntersecting, - newTopList); + new RexPermuteInputsShuttle(nonThruProjectMapping, newBottomJoin, relB).visitList(bottomIntersecting, newTopList); RexNode newTopCondition = RexUtil.composeConjunction(rexBuilder, newTopList, false); @SuppressWarnings("SuspiciousNameCombination") - final Join newTopJoin = topJoin.copy(topJoin.getTraitSet(), newTopCondition, newBottomJoin, relB, - topJoin.getJoinType(), topJoin.isSemiJoinDone()); + final Join newTopJoin = topJoin.copy(topJoin.getTraitSet(), newTopCondition, newBottomJoin, relB, topJoin.getJoinType(), topJoin.isSemiJoinDone()); assert !Mappings.isIdentity(thruProjectMapping); final RelBuilder relBuilder = call.builder(); @@ -201,8 +192,7 @@ public class OLAPJoinPushThroughJoinRule2 extends RelOptRule { * Splits a condition into conjunctions that do or do not intersect with * a given bit set. */ - static void split(RexNode condition, ImmutableBitSet bitSet, List<RexNode> intersecting, - List<RexNode> nonIntersecting) { + static void split(RexNode condition, ImmutableBitSet bitSet, List<RexNode> intersecting, List<RexNode> nonIntersecting) { for (RexNode node : RelOptUtil.conjunctions(condition)) { ImmutableBitSet inputBitSet = RelOptUtil.InputFinder.bits(node); if (bitSet.intersects(inputBitSet)) { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/atopcalcite/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java ---------------------------------------------------------------------- diff --git a/atopcalcite/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java b/atopcalcite/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java index f5cfa85..f88157c 100644 --- a/atopcalcite/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java +++ b/atopcalcite/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java @@ -34,10 +34,7 @@ public class RelFieldTrimmer { public RelFieldTrimmer(SqlValidator validator, RelBuilder relBuilder) { } - public RelFieldTrimmer(SqlValidator validator, RelOptCluster cluster, RelFactories.ProjectFactory projectFactory, - RelFactories.FilterFactory filterFactory, RelFactories.JoinFactory joinFactory, - RelFactories.SemiJoinFactory semiJoinFactory, RelFactories.SortFactory sortFactory, - RelFactories.AggregateFactory aggregateFactory, RelFactories.SetOpFactory setOpFactory) { + public RelFieldTrimmer(SqlValidator validator, RelOptCluster cluster, RelFactories.ProjectFactory projectFactory, RelFactories.FilterFactory filterFactory, RelFactories.JoinFactory joinFactory, RelFactories.SemiJoinFactory semiJoinFactory, RelFactories.SortFactory sortFactory, RelFactories.AggregateFactory aggregateFactory, RelFactories.SetOpFactory setOpFactory) { } public RelNode trim(RelNode rootRel) {
