You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/08/04 05:46:54 UTC
[13/15] incubator-kylin git commit: KYLIN-922 Enforce same code style
for both intellij and eclipse user
KYLIN-922 Enforce same code style for both intellij and eclipse user
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/40a744be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/40a744be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/40a744be
Branch: refs/heads/0.7-staging
Commit: 40a744be9570b8b492a9126ab9bc115324098cfa
Parents: 07db225
Author: honma <ho...@ebay.com>
Authored: Mon Aug 3 16:12:27 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Tue Aug 4 11:45:54 2015 +0800
----------------------------------------------------------------------
.../adapter/enumerable/EnumerableJoin.java | 228 +-
.../apache/calcite/runtime/SqlFunctions.java | 2559 +++---
.../calcite/sql2rel/SqlToRelConverter.java | 8476 ++++++++----------
.../org/apache/kylin/common/KylinConfig.java | 23 +-
.../kylin/common/debug/BackdoorToggles.java | 10 +-
.../kylin/common/lock/ZookeeperJobLock.java | 4 +-
.../org/apache/kylin/common/mr/KylinMapper.java | 3 +-
.../apache/kylin/common/mr/KylinReducer.java | 2 +-
.../common/persistence/FileResourceStore.java | 11 +-
.../common/persistence/HBaseConnection.java | 3 +-
.../common/persistence/HBaseResourceStore.java | 22 +-
.../kylin/common/persistence/ResourceStore.java | 1 -
.../kylin/common/persistence/ResourceTool.java | 40 +-
.../persistence/RootPersistentEntity.java | 6 +-
.../kylin/common/restclient/Broadcaster.java | 15 +-
.../restclient/CaseInsensitiveStringCache.java | 2 +-
.../org/apache/kylin/common/util/ByteArray.java | 2 -
.../org/apache/kylin/common/util/Bytes.java | 313 +-
.../apache/kylin/common/util/BytesSplitter.java | 3 +-
.../org/apache/kylin/common/util/BytesUtil.java | 8 +-
.../kylin/common/util/CliCommandExecutor.java | 1 -
.../common/util/HBaseRegionSizeCalculator.java | 1 -
.../apache/kylin/common/util/HadoopUtil.java | 4 +-
.../apache/kylin/common/util/HiveClient.java | 5 +-
.../apache/kylin/common/util/MailService.java | 3 +-
.../java/org/apache/kylin/common/util/Pair.java | 42 +-
.../apache/kylin/common/util/PartialSorter.java | 4 +-
.../org/apache/kylin/common/util/SSHClient.java | 1 +
.../apache/kylin/common/util/ThreadUtil.java | 1 -
.../persistence/HBaseResourceStoreTest.java | 5 +-
.../persistence/LocalFileResourceStoreTest.java | 10 +-
.../common/persistence/ResourceToolTest.java | 3 +-
.../kylin/common/restclient/RestClientTest.java | 4 +-
.../kylin/common/util/BasicHadoopTest.java | 6 +-
.../org/apache/kylin/common/util/BasicTest.java | 9 +-
.../apache/kylin/common/util/BytesUtilTest.java | 10 +-
.../common/util/HBaseMetadataTestCase.java | 2 +-
.../common/util/HyperLogLogCounterTest.java | 3 +-
.../common/util/LocalFileMetadataTestCase.java | 3 +-
.../kylin/common/util/PartialSorterTest.java | 9 +-
.../kylin/common/util/RandomSamplerTest.java | 2 +-
.../apache/kylin/common/util/SSHClientTest.java | 2 +-
.../kylin/cube/CubeCapabilityChecker.java | 5 +-
.../org/apache/kylin/cube/CubeDescManager.java | 18 +-
.../org/apache/kylin/cube/CubeDescUpgrader.java | 35 +-
.../apache/kylin/cube/CubeDimensionDeriver.java | 4 +-
.../org/apache/kylin/cube/CubeInstance.java | 4 +-
.../java/org/apache/kylin/cube/CubeManager.java | 31 +-
.../java/org/apache/kylin/cube/CubeSegment.java | 15 +-
.../kylin/cube/cli/DictionaryGeneratorCLI.java | 7 +-
.../kylin/cube/common/RowKeySplitter.java | 3 +-
.../org/apache/kylin/cube/cuboid/Cuboid.java | 1 -
.../kylin/cube/cuboid/CuboidScheduler.java | 1 +
.../cube/estimation/CubeSizeEstimationCLI.java | 2 +-
.../kylin/cube/kv/AbstractRowKeyEncoder.java | 5 +-
.../apache/kylin/cube/kv/RowKeyColumnIO.java | 7 +-
.../org/apache/kylin/cube/kv/RowKeyDecoder.java | 2 +-
.../org/apache/kylin/cube/kv/RowKeyEncoder.java | 1 -
.../apache/kylin/cube/kv/RowValueDecoder.java | 3 +-
.../org/apache/kylin/cube/model/CubeDesc.java | 8 +-
.../apache/kylin/cube/model/DimensionDesc.java | 11 +-
.../kylin/cube/model/HBaseColumnDesc.java | 5 +-
.../kylin/cube/model/HBaseMappingDesc.java | 7 +-
.../apache/kylin/cube/model/HierarchyDesc.java | 3 +-
.../apache/kylin/cube/model/RowKeyColDesc.java | 3 +-
.../org/apache/kylin/cube/model/RowKeyDesc.java | 4 +-
.../kylin/cube/model/v1/CubeInstance.java | 116 +-
.../kylin/cube/model/v1/CubePartitionDesc.java | 5 +-
.../apache/kylin/cube/model/v1/CubeSegment.java | 18 +-
.../kylin/cube/model/v1/DimensionDesc.java | 7 +-
.../kylin/cube/model/v1/ProjectInstance.java | 10 +-
.../model/validation/rule/FunctionRule.java | 7 +-
.../validation/rule/MandatoryColumnRule.java | 1 -
.../model/validation/rule/RowKeyAttrRule.java | 9 +-
.../cube/AggregationGroupSizeRuleTest.java | 8 +-
.../org/apache/kylin/cube/CubeDescTest.java | 18 +-
.../apache/kylin/cube/CubeManagerCacheTest.java | 9 +-
.../org/apache/kylin/cube/CubeManagerTest.java | 3 +-
.../org/apache/kylin/cube/CubeSegmentsTest.java | 21 +-
.../kylin/cube/CubeSizeEstimationCLITest.java | 7 +-
.../kylin/cube/DictionaryManagerTest.java | 12 +-
.../kylin/cube/MandatoryColumnRuleTest.java | 9 +-
.../apache/kylin/cube/RowKeyAttrRuleTest.java | 9 +-
.../kylin/cube/common/BytesSplitterTest.java | 2 +-
.../kylin/cube/common/RowKeySplitterTest.java | 9 +-
.../kylin/cube/cuboid/CombinationTest.java | 2 +-
.../kylin/cube/cuboid/CuboidSchedulerTest.java | 11 +-
.../apache/kylin/cube/cuboid/CuboidTest.java | 8 +-
.../apache/kylin/cube/kv/RowKeyDecoderTest.java | 9 +-
.../apache/kylin/cube/kv/RowKeyEncoderTest.java | 11 +-
.../kylin/cube/kv/RowValueDecoderTest.java | 13 +-
.../kylin/cube/project/ProjectManagerTest.java | 18 +-
.../kylin/metadata/MetadataUpgradeTest.java | 33 +-
.../metadata/measure/MeasureCodecTest.java | 7 +-
.../java/org/apache/kylin/dict/Dictionary.java | 1 -
.../apache/kylin/dict/DictionaryManager.java | 2 +-
.../java/org/apache/kylin/dict/ISegment.java | 4 +-
.../kylin/dict/lookup/FileTableReader.java | 6 +-
.../org/apache/kylin/dict/lookup/HiveTable.java | 4 +-
.../kylin/dict/lookup/LookupBytesTable.java | 3 +-
.../apache/kylin/dict/lookup/LookupTable.java | 7 +-
.../apache/kylin/dict/lookup/ReadableTable.java | 9 +-
.../kylin/dict/lookup/SnapshotManager.java | 4 +-
.../apache/kylin/dict/lookup/SnapshotTable.java | 19 +-
.../kylin/dict/DateStrDictionaryTest.java | 8 +-
.../apache/kylin/dict/HiveTableReaderTest.java | 3 +-
.../org/apache/kylin/dict/LookupTableTest.java | 11 +-
.../apache/kylin/dict/NumberDictionaryTest.java | 5 +-
.../apache/kylin/dict/SnapshotManagerTest.java | 3 +-
.../org/apache/kylin/dict/TableReaderTest.java | 2 +-
.../apache/kylin/dict/TrieDictionaryTest.java | 5 +-
.../kylin/dict/lookup/LookupTableTest.java | 20 +-
.../kylin/invertedindex/IIDescManager.java | 10 +-
.../apache/kylin/invertedindex/IIInstance.java | 22 +-
.../apache/kylin/invertedindex/IIManager.java | 12 +-
.../apache/kylin/invertedindex/IISegment.java | 24 +-
.../invertedindex/index/BitMapContainer.java | 5 +-
.../index/ColumnValueContainer.java | 17 +-
.../index/CompressedValueContainer.java | 4 +-
.../invertedindex/index/RawTableRecord.java | 10 +-
.../kylin/invertedindex/index/ShardingHash.java | 8 +-
.../index/ShardingSliceBuilder.java | 50 +-
.../apache/kylin/invertedindex/index/Slice.java | 3 +-
.../kylin/invertedindex/index/SliceBuilder.java | 184 +-
.../index/TableRecordInfoDigest.java | 271 +-
.../kylin/invertedindex/model/IIDesc.java | 1 -
.../kylin/invertedindex/model/IIDimension.java | 5 +-
.../invertedindex/model/IIKeyValueCodec.java | 450 +-
.../apache/kylin/invertedindex/tools/IICLI.java | 111 +-
.../invertedindex/IIDescManagerTest.java | 12 +-
.../invertedindex/invertedindex/IIDescTest.java | 7 +-
.../invertedindex/IIInstanceTest.java | 11 +-
.../invertedindex/InvertedIndexLocalTest.java | 397 +-
.../main/java/org/apache/kylin/jdbc/Driver.java | 62 +-
.../java/org/apache/kylin/jdbc/KylinClient.java | 4 +-
.../org/apache/kylin/jdbc/KylinConnection.java | 18 +-
.../java/org/apache/kylin/jdbc/KylinMeta.java | 2 +-
.../org/apache/kylin/jdbc/KylinResultSet.java | 12 +-
.../java/org/apache/kylin/jdbc/DriverTest.java | 7 +-
.../java/org/apache/kylin/jdbc/DummyClient.java | 10 +-
.../java/org/apache/kylin/jdbc/DummyDriver.java | 2 -
.../org/apache/kylin/jdbc/DummyJdbcFactory.java | 7 +-
.../apache/kylin/job/AbstractJobBuilder.java | 4 +-
.../apache/kylin/job/CubeMetadataUpgrade.java | 242 +-
.../java/org/apache/kylin/job/JobInstance.java | 107 +-
.../org/apache/kylin/job/JoinedFlatTable.java | 2 +-
.../java/org/apache/kylin/job/cmd/ShellCmd.java | 10 +-
.../apache/kylin/job/cmd/ShellCmdOutput.java | 3 +-
.../kylin/job/common/HadoopCmdOutput.java | 8 +-
.../kylin/job/common/HadoopShellExecutable.java | 9 +-
.../apache/kylin/job/common/HqlExecutable.java | 19 +-
.../kylin/job/common/ShellExecutable.java | 8 +-
.../kylin/job/constant/ExecutableConstants.java | 8 +-
.../org/apache/kylin/job/cube/CubingJob.java | 31 +-
.../apache/kylin/job/cube/CubingJobBuilder.java | 39 +-
.../kylin/job/cube/GarbageCollectionStep.java | 17 +-
.../kylin/job/cube/MergeDictionaryStep.java | 16 +-
.../job/cube/UpdateCubeInfoAfterBuildStep.java | 4 +-
.../job/cube/UpdateCubeInfoAfterMergeStep.java | 14 +-
.../org/apache/kylin/job/dao/ExecutableDao.java | 19 +-
.../kylin/job/dao/ExecutableOutputPO.java | 3 +-
.../org/apache/kylin/job/dao/ExecutablePO.java | 3 +-
.../job/deployment/HbaseConfigPrinterCLI.java | 1 -
.../kylin/job/engine/JobEngineConfig.java | 9 +-
.../kylin/job/execution/AbstractExecutable.java | 21 +-
.../kylin/job/execution/ChainedExecutable.java | 2 +-
.../job/execution/DefaultChainedExecutable.java | 9 +-
.../kylin/job/execution/DefaultOutput.java | 4 +-
.../apache/kylin/job/execution/Executable.java | 4 +-
.../kylin/job/execution/ExecutableState.java | 10 +-
.../kylin/job/execution/ExecuteResult.java | 5 +-
.../kylin/job/hadoop/AbstractHadoopJob.java | 21 +-
.../cardinality/ColumnCardinalityMapper.java | 9 +-
.../cardinality/ColumnCardinalityReducer.java | 8 +-
.../cardinality/HiveColumnCardinalityJob.java | 5 +-
.../HiveColumnCardinalityUpdateJob.java | 1 -
.../kylin/job/hadoop/cube/BaseCuboidJob.java | 2 +-
.../kylin/job/hadoop/cube/BaseCuboidMapper.java | 18 +-
.../kylin/job/hadoop/cube/CubeHFileJob.java | 9 +-
.../kylin/job/hadoop/cube/CubeHFileMapper.java | 12 +-
.../apache/kylin/job/hadoop/cube/CuboidJob.java | 6 +-
.../kylin/job/hadoop/cube/CuboidReducer.java | 13 +-
.../cube/FactDistinctColumnsCombiner.java | 5 +-
.../job/hadoop/cube/FactDistinctColumnsJob.java | 88 +-
.../hadoop/cube/FactDistinctColumnsMapper.java | 3 +-
.../hadoop/cube/FactDistinctColumnsReducer.java | 10 +-
.../kylin/job/hadoop/cube/MergeCuboidJob.java | 3 -
.../job/hadoop/cube/MergeCuboidMapper.java | 3 +-
.../job/hadoop/cube/MetadataCleanupJob.java | 16 +-
.../kylin/job/hadoop/cube/NDCuboidMapper.java | 13 +-
.../job/hadoop/cube/NewBaseCuboidMapper.java | 13 +-
.../hadoop/cube/RangeKeyDistributionJob.java | 7 +-
.../hadoop/cube/RangeKeyDistributionMapper.java | 2 +-
.../cube/RangeKeyDistributionReducer.java | 19 +-
.../cube/RowKeyDistributionCheckerJob.java | 1 -
.../cube/RowKeyDistributionCheckerMapper.java | 7 +-
.../cube/RowKeyDistributionCheckerReducer.java | 1 -
.../job/hadoop/cube/StorageCleanupJob.java | 34 +-
.../job/hadoop/dict/CreateDictionaryJob.java | 1 -
.../kylin/job/hadoop/hbase/BulkLoadJob.java | 4 +-
.../kylin/job/hadoop/hbase/CreateHTableJob.java | 22 +-
.../hadoop/hive/CubeJoinedFlatTableDesc.java | 2 +-
.../job/hadoop/hive/IIJoinedFlatTableDesc.java | 7 +-
.../job/hadoop/invertedindex/IIBulkLoadJob.java | 12 +-
.../hadoop/invertedindex/IICreateHTableJob.java | 10 +-
.../IIDistinctColumnsCombiner.java | 3 +-
.../invertedindex/IIDistinctColumnsJob.java | 5 +-
.../invertedindex/IIDistinctColumnsMapper.java | 3 +-
.../invertedindex/IIDistinctColumnsReducer.java | 3 +-
.../hadoop/invertedindex/IIFlattenHiveJob.java | 10 +-
.../hadoop/invertedindex/InvertedIndexJob.java | 7 +-
.../invertedindex/InvertedIndexMapper.java | 6 +-
.../invertedindex/InvertedIndexPartitioner.java | 2 +-
.../invertedindex/InvertedIndexReducer.java | 2 +-
.../invertedindex/RandomKeyDistributionJob.java | 5 +-
.../RandomKeyDistributionMapper.java | 1 -
.../RandomKeyDistributionReducer.java | 2 -
.../job/impl/threadpool/DefaultContext.java | 9 +-
.../job/impl/threadpool/DefaultScheduler.java | 12 +-
.../apache/kylin/job/invertedindex/IIJob.java | 1 -
.../kylin/job/invertedindex/IIJobBuilder.java | 4 +-
.../kylin/job/manager/ExecutableManager.java | 24 +-
.../apache/kylin/job/tools/CleanHtableCLI.java | 3 +-
.../kylin/job/tools/CubeMigrationCLI.java | 28 +-
.../kylin/job/tools/DeployCoprocessorCLI.java | 14 +-
.../job/tools/GridTableHBaseBenchmark.java | 6 +-
.../kylin/job/tools/HadoopStatusChecker.java | 8 +-
.../kylin/job/tools/HadoopStatusGetter.java | 6 +-
.../kylin/job/tools/HtableAlterMetadataCLI.java | 6 +-
.../kylin/job/tools/LZOSupportnessChecker.java | 4 +-
.../apache/kylin/job/tools/RowCounterCLI.java | 12 +-
.../apache/kylin/job/BaseTestExecutable.java | 1 -
.../kylin/job/BuildCubeWithEngineTest.java | 51 +-
.../apache/kylin/job/BuildIIWithEngineTest.java | 25 +-
.../java/org/apache/kylin/job/DataGenTest.java | 9 +-
.../java/org/apache/kylin/job/DeployUtil.java | 17 +-
.../org/apache/kylin/job/ExportHBaseData.java | 5 +-
.../org/apache/kylin/job/ImportHBaseData.java | 5 +-
.../apache/kylin/job/SampleCubeSetupTest.java | 7 +-
.../kylin/job/dataGen/FactTableGenerator.java | 15 +-
.../org/apache/kylin/job/dataGen/GenConfig.java | 3 +-
.../job/hadoop/cube/BaseCuboidJobTest.java | 5 +-
.../job/hadoop/cube/BaseCuboidMapperTest.java | 14 +-
.../job/hadoop/cube/CubeHFileMapper2Test.java | 13 +-
.../job/hadoop/cube/CubeHFileMapperTest.java | 5 +-
.../kylin/job/hadoop/cube/CubeReducerTest.java | 14 +-
.../job/hadoop/cube/MergeCuboidJobTest.java | 5 +-
.../job/hadoop/cube/MergeCuboidMapperTest.java | 40 +-
.../kylin/job/hadoop/cube/MockupMapContext.java | 1 -
.../kylin/job/hadoop/cube/NDCuboidJobTest.java | 5 +-
.../job/hadoop/cube/NDCuboidMapperTest.java | 11 +-
.../cube/RandomKeyDistributionMapperTest.java | 7 +-
.../cube/RandomKeyDistributionReducerTest.java | 2 +-
.../cube/RangeKeyDistributionJobTest.java | 5 +-
.../cube/RangeKeyDistributionMapperTest.java | 3 +-
.../job/hadoop/hbase/CreateHTableTest.java | 6 +-
.../job/hadoop/hive/JoinedFlatTableTest.java | 13 +-
.../job/impl/threadpool/BaseSchedulerTest.java | 6 +-
.../impl/threadpool/DefaultSchedulerTest.java | 9 +-
.../job/manager/ExecutableManagerTest.java | 20 +-
.../job/tools/ColumnCardinalityJobTest.java | 5 +-
.../job/tools/ColumnCardinalityMapperTest.java | 6 +-
.../job/tools/ColumnCardinalityReducerTest.java | 10 +-
.../kylin/job/tools/CubeMigrationTests.java | 7 +-
.../apache/kylin/metadata/MetadataManager.java | 14 +-
.../kylin/metadata/filter/CaseTupleFilter.java | 3 +-
.../metadata/filter/ExtractTupleFilter.java | 3 +-
.../metadata/filter/LogicalTupleFilter.java | 3 +-
.../kylin/metadata/filter/TupleFilter.java | 3 +-
.../metadata/measure/BigDecimalSerializer.java | 1 -
.../metadata/measure/DoubleSerializer.java | 2 +-
.../kylin/metadata/measure/LongSerializer.java | 3 +-
.../metadata/measure/MeasureAggregators.java | 2 +-
.../kylin/metadata/measure/MeasureCodec.java | 1 -
.../measure/fixedlen/FixedPointLongCodec.java | 7 +-
.../apache/kylin/metadata/model/ColumnDesc.java | 3 +-
.../kylin/metadata/model/DataModelDesc.java | 16 +-
.../apache/kylin/metadata/model/DataType.java | 3 +-
.../kylin/metadata/model/FunctionDesc.java | 6 +-
.../apache/kylin/metadata/model/LookupDesc.java | 2 +-
.../kylin/metadata/model/PartitionDesc.java | 5 +-
.../apache/kylin/metadata/model/TableDesc.java | 18 +-
.../kylin/metadata/project/ProjectInstance.java | 22 +-
.../kylin/metadata/project/ProjectL2Cache.java | 7 +-
.../kylin/metadata/project/ProjectManager.java | 16 +-
.../kylin/metadata/project/ProjectTable.java | 3 +-
.../metadata/project/RealizationEntry.java | 15 +-
.../metadata/realization/IRealization.java | 4 +-
.../realization/IRealizationProvider.java | 1 -
.../realization/RealizationRegistry.java | 17 +-
.../metadata/realization/SQLDigestUtil.java | 13 +-
.../metadata/tool/HiveSourceTableLoader.java | 17 +-
.../metadata/tuple/CompoundTupleIterator.java | 9 +-
.../kylin/metadata/tuple/ITupleIterator.java | 2 +-
.../kylin/metadata/MetadataManagerTest.java | 3 +-
.../kylin/metadata/model/TableDescTest.java | 1 -
.../tool/HiveSourceTableLoaderTest.java | 7 +-
.../metadata/tool/SandboxMetastoreCLI.java | 5 +-
.../metadata/tuple/EmptyTupleIteratorTest.java | 3 +-
.../.settings/org.eclipse.core.resources.prefs | 6 +
monitor/.settings/org.eclipse.jdt.core.prefs | 379 +
monitor/.settings/org.eclipse.jdt.ui.prefs | 7 +
.../apache/kylin/monitor/ApiRequestParser.java | 53 +-
.../java/org/apache/kylin/monitor/Client.java | 21 +-
.../org/apache/kylin/monitor/ConfigUtils.java | 58 +-
.../org/apache/kylin/monitor/DebugClient.java | 9 +-
.../org/apache/kylin/monitor/FileUtils.java | 13 +-
.../apache/kylin/monitor/HiveJdbcClient.java | 39 +-
.../kylin/monitor/MonitorMetaManager.java | 55 +-
.../org/apache/kylin/monitor/QueryParser.java | 45 +-
.../org/apache/kylin/monitor/ParseLogTest.java | 16 +-
.../kylin/query/enumerator/CubeEnumerator.java | 12 +-
.../query/enumerator/LookupTableEnumerator.java | 4 +-
.../kylin/query/optrule/OLAPAggregateRule.java | 2 +-
.../kylin/query/optrule/OLAPFilterRule.java | 2 +-
.../kylin/query/optrule/OLAPLimitRule.java | 2 +-
.../kylin/query/relnode/OLAPAggregateRel.java | 7 +-
.../apache/kylin/query/relnode/OLAPContext.java | 6 +-
.../relnode/OLAPToEnumerableConverter.java | 2 +-
.../apache/kylin/query/routing/QueryRouter.java | 6 +-
.../apache/kylin/query/routing/RoutingRule.java | 10 +-
.../AdjustForWeeklyMatchedRealization.java | 8 +-
.../RoutingRules/RealizationPriorityRule.java | 8 +-
.../RoutingRules/RealizationSortRule.java | 9 +-
.../query/sqlfunc/HLLDistinctCountAggFunc.java | 3 +-
.../kylin/query/test/CombinationTest.java | 3 +-
.../org/apache/kylin/query/test/H2Database.java | 5 +-
.../apache/kylin/query/test/IIQueryTest.java | 1 -
.../apache/kylin/query/test/KylinQueryTest.java | 18 +-
.../apache/kylin/query/test/KylinTestBase.java | 2 +-
.../java/org/apache/kylin/rest/DebugTomcat.java | 20 +-
.../kylin/rest/controller/AccessController.java | 3 +-
.../kylin/rest/controller/AdminController.java | 5 +-
.../kylin/rest/controller/BasicController.java | 7 +-
.../kylin/rest/controller/CacheController.java | 4 +-
.../kylin/rest/controller/CubeController.java | 32 +-
.../rest/controller/CubeDescController.java | 7 +-
.../kylin/rest/controller/JobController.java | 17 +-
.../kylin/rest/controller/ModelController.java | 11 +-
.../rest/controller/PerformanceController.java | 28 +-
.../rest/controller/ProjectController.java | 2 +-
.../kylin/rest/controller/QueryController.java | 30 +-
.../kylin/rest/controller/TableController.java | 32 +-
.../kylin/rest/controller/UserController.java | 3 +-
.../kylin/rest/filter/KylinApiFilter.java | 68 +-
.../apache/kylin/rest/request/CubeRequest.java | 6 +-
.../apache/kylin/rest/request/SQLRequest.java | 3 +-
.../kylin/rest/response/HBaseResponse.java | 12 +-
.../kylin/rest/response/TableDescResponse.java | 3 +-
.../rest/security/AuthoritiesPopulator.java | 3 +-
.../security/PasswordPlaceholderConfigurer.java | 3 +-
.../kylin/rest/service/AccessService.java | 11 +-
.../apache/kylin/rest/service/AclService.java | 6 +-
.../apache/kylin/rest/service/AdminService.java | 7 +-
.../apache/kylin/rest/service/BasicService.java | 45 +-
.../apache/kylin/rest/service/CacheService.java | 9 +-
.../apache/kylin/rest/service/CubeService.java | 27 +-
.../apache/kylin/rest/service/JobService.java | 99 +-
.../kylin/rest/service/PerformService.java | 52 +-
.../kylin/rest/service/ProjectService.java | 11 +-
.../apache/kylin/rest/service/UserService.java | 8 +-
.../org/apache/kylin/rest/util/QueryUtil.java | 6 +-
.../org/apache/kylin/rest/util/Serializer.java | 3 +-
.../org/apache/kylin/jdbc/JDBCDriverTest.java | 32 +-
.../org/apache/kylin/rest/bean/BeanTest.java | 5 +-
.../broadcaster/BroadcasterReceiveServlet.java | 1 +
.../rest/controller/AccessControllerTest.java | 5 +-
.../rest/controller/AdminControllerTest.java | 5 +-
.../rest/controller/BaseControllerTest.java | 5 +-
.../rest/controller/CacheControllerTest.java | 9 +-
.../rest/controller/CubeControllerTest.java | 12 +-
.../rest/controller/JobControllerTest.java | 13 +-
.../rest/controller/ProjectControllerTest.java | 5 +-
.../rest/controller/QueryControllerTest.java | 5 +-
.../rest/controller/TableControllerTest.java | 11 +-
.../kylin/rest/service/AccessServiceTest.java | 8 +-
.../kylin/rest/service/CacheServiceTest.java | 53 +-
.../kylin/rest/service/CubeServiceTest.java | 6 +-
.../kylin/rest/service/JobServiceTest.java | 5 +-
.../kylin/rest/service/QueryServiceTest.java | 5 +-
.../kylin/rest/service/ServiceTestBase.java | 8 +-
.../kylin/storage/StorageEngineFactory.java | 2 +-
.../kylin/storage/hbase/ColumnValueRange.java | 12 +-
.../storage/hbase/CubeSegmentTupleIterator.java | 25 +-
.../kylin/storage/hbase/CubeStorageEngine.java | 49 +-
.../storage/hbase/DerivedFilterTranslator.java | 10 +-
.../storage/hbase/FuzzyValueCombination.java | 3 +-
.../kylin/storage/hbase/HBaseKeyRange.java | 11 +-
.../kylin/storage/hbase/PingHBaseCLI.java | 3 +-
.../hbase/SerializedHBaseTupleIterator.java | 10 +-
.../storage/hbase/coprocessor/AggrKey.java | 12 +-
.../hbase/coprocessor/AggregationCache.java | 5 +-
.../hbase/coprocessor/CoprocessorFilter.java | 10 +-
.../hbase/coprocessor/CoprocessorProjector.java | 10 +-
.../hbase/coprocessor/CoprocessorRowType.java | 4 +-
.../endpoint/EndpointAggregationCache.java | 6 +-
.../endpoint/EndpointTupleIterator.java | 1 -
.../endpoint/HbaseServerKVIterator.java | 12 +-
.../hbase/coprocessor/endpoint/IIEndpoint.java | 23 +-
.../endpoint/SliceBitMapProvider.java | 3 +-
.../observer/AggregateRegionObserver.java | 4 +-
.../observer/AggregationScanner.java | 8 +-
.../observer/ObserverAggregationCache.java | 12 +-
.../observer/ObserverAggregators.java | 6 +-
.../coprocessor/observer/ObserverEnabler.java | 14 +-
.../coprocessor/observer/ObserverTuple.java | 3 +-
.../kylin/storage/hybrid/HybridInstance.java | 17 +-
.../kylin/storage/hybrid/HybridManager.java | 8 +-
.../storage/hybrid/HybridStorageEngine.java | 6 +-
.../org/apache/kylin/storage/tuple/Tuple.java | 8 +-
.../apache/kylin/storage/MiniClusterTest.java | 1 -
.../filter/BitMapFilterEvaluatorTest.java | 20 +-
.../kylin/storage/filter/FilterBaseTest.java | 9 +-
.../storage/filter/FilterEvaluateTest.java | 5 +-
.../kylin/storage/filter/FilterPerfTest.java | 23 +-
.../storage/filter/FilterSerializeTest.java | 5 +-
.../storage/hbase/ColumnValueRangeTest.java | 6 +-
.../hbase/FuzzyValueCombinationTest.java | 8 +-
.../storage/hbase/InvertedIndexHBaseTest.java | 17 +-
.../hbase/coprocessor/RowProjectorTest.java | 13 +-
.../endpoint/EndpointAggregationTest.java | 21 +-
.../endpoint/TableRecordInfoTest.java | 9 +-
.../observer/AggregateRegionObserverTest.java | 25 +-
.../observer/RowAggregatorsTest.java | 2 +-
.../hbase/coprocessor/observer/RowTypeTest.java | 11 +-
.../kylin/storage/hybrid/HybridManagerTest.java | 1 -
.../apache/kylin/storage/test/StorageTest.java | 38 +-
427 files changed, 8785 insertions(+), 9399 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/40a744be/atopcalcite/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoin.java
----------------------------------------------------------------------
diff --git a/atopcalcite/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoin.java b/atopcalcite/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoin.java
index 5de9f1c..a506231 100644
--- a/atopcalcite/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoin.java
+++ b/atopcalcite/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoin.java
@@ -17,6 +17,8 @@
*/
package org.apache.calcite.adapter.enumerable;
+import java.util.Set;
+
import org.apache.calcite.linq4j.tree.BlockBuilder;
import org.apache.calcite.linq4j.tree.Expression;
import org.apache.calcite.linq4j.tree.Expressions;
@@ -38,8 +40,6 @@ import org.apache.calcite.util.Util;
import com.google.common.collect.ImmutableList;
-import java.util.Set;
-
/*
* OVERRIDE POINT:
* - constructor was private instead of protected
@@ -48,160 +48,98 @@ import java.util.Set;
/** Implementation of {@link org.apache.calcite.rel.core.Join} in
* {@link org.apache.calcite.adapter.enumerable.EnumerableConvention enumerable calling convention}. */
public class EnumerableJoin extends EquiJoin implements EnumerableRel {
- /** Creates an EnumerableJoin.
- *
- * <p>Use {@link #create} unless you know what you're doing. */
- public EnumerableJoin(
- RelOptCluster cluster,
- RelTraitSet traits,
- RelNode left,
- RelNode right,
- RexNode condition,
- ImmutableIntList leftKeys,
- ImmutableIntList rightKeys,
- JoinRelType joinType,
- Set<String> variablesStopped)
- throws InvalidRelException {
- super(
- cluster,
- traits,
- left,
- right,
- condition,
- leftKeys,
- rightKeys,
- joinType,
- variablesStopped);
- }
+ /** Creates an EnumerableJoin.
+ *
+ * <p>Use {@link #create} unless you know what you're doing. */
+ public EnumerableJoin(RelOptCluster cluster, RelTraitSet traits, RelNode left, RelNode right, RexNode condition, ImmutableIntList leftKeys, ImmutableIntList rightKeys, JoinRelType joinType, Set<String> variablesStopped) throws InvalidRelException {
+ super(cluster, traits, left, right, condition, leftKeys, rightKeys, joinType, variablesStopped);
+ }
- /** Creates an EnumerableJoin. */
- public static EnumerableJoin create(
- RelNode left,
- RelNode right,
- RexNode condition,
- ImmutableIntList leftKeys,
- ImmutableIntList rightKeys,
- JoinRelType joinType,
- Set<String> variablesStopped)
- throws InvalidRelException {
- final RelOptCluster cluster = left.getCluster();
- final RelTraitSet traitSet =
- cluster.traitSetOf(EnumerableConvention.INSTANCE);
- return new EnumerableJoin(cluster, traitSet, left, right, condition,
- leftKeys, rightKeys, joinType, variablesStopped);
- }
+ /** Creates an EnumerableJoin. */
+ public static EnumerableJoin create(RelNode left, RelNode right, RexNode condition, ImmutableIntList leftKeys, ImmutableIntList rightKeys, JoinRelType joinType, Set<String> variablesStopped) throws InvalidRelException {
+ final RelOptCluster cluster = left.getCluster();
+ final RelTraitSet traitSet = cluster.traitSetOf(EnumerableConvention.INSTANCE);
+ return new EnumerableJoin(cluster, traitSet, left, right, condition, leftKeys, rightKeys, joinType, variablesStopped);
+ }
- @Override public EnumerableJoin copy(RelTraitSet traitSet, RexNode condition,
- RelNode left, RelNode right, JoinRelType joinType,
- boolean semiJoinDone) {
- final JoinInfo joinInfo = JoinInfo.of(left, right, condition);
- assert joinInfo.isEqui();
- try {
- return new EnumerableJoin(getCluster(), traitSet, left, right,
- condition, joinInfo.leftKeys, joinInfo.rightKeys, joinType,
- variablesStopped);
- } catch (InvalidRelException e) {
- // Semantic error not possible. Must be a bug. Convert to
- // internal error.
- throw new AssertionError(e);
+ @Override
+ public EnumerableJoin copy(RelTraitSet traitSet, RexNode condition, RelNode left, RelNode right, JoinRelType joinType, boolean semiJoinDone) {
+ final JoinInfo joinInfo = JoinInfo.of(left, right, condition);
+ assert joinInfo.isEqui();
+ try {
+ return new EnumerableJoin(getCluster(), traitSet, left, right, condition, joinInfo.leftKeys, joinInfo.rightKeys, joinType, variablesStopped);
+ } catch (InvalidRelException e) {
+ // Semantic error not possible. Must be a bug. Convert to
+ // internal error.
+ throw new AssertionError(e);
+ }
}
- }
- @Override public RelOptCost computeSelfCost(RelOptPlanner planner) {
- double rowCount = RelMetadataQuery.getRowCount(this);
+ @Override
+ public RelOptCost computeSelfCost(RelOptPlanner planner) {
+ double rowCount = RelMetadataQuery.getRowCount(this);
- // Joins can be flipped, and for many algorithms, both versions are viable
- // and have the same cost. To make the results stable between versions of
- // the planner, make one of the versions slightly more expensive.
- switch (joinType) {
- case RIGHT:
- rowCount = addEpsilon(rowCount);
- break;
- default:
- if (RelNodes.COMPARATOR.compare(left, right) > 0) {
- rowCount = addEpsilon(rowCount);
- }
- }
+ // Joins can be flipped, and for many algorithms, both versions are viable
+ // and have the same cost. To make the results stable between versions of
+ // the planner, make one of the versions slightly more expensive.
+ switch (joinType) {
+ case RIGHT:
+ rowCount = addEpsilon(rowCount);
+ break;
+ default:
+ if (RelNodes.COMPARATOR.compare(left, right) > 0) {
+ rowCount = addEpsilon(rowCount);
+ }
+ }
- // Cheaper if the smaller number of rows is coming from the LHS.
- // Model this by adding L log L to the cost.
- final double rightRowCount = right.getRows();
- final double leftRowCount = left.getRows();
- if (Double.isInfinite(leftRowCount)) {
- rowCount = leftRowCount;
- } else {
- rowCount += Util.nLogN(leftRowCount);
- }
- if (Double.isInfinite(rightRowCount)) {
- rowCount = rightRowCount;
- } else {
- rowCount += rightRowCount;
+ // Cheaper if the smaller number of rows is coming from the LHS.
+ // Model this by adding L log L to the cost.
+ final double rightRowCount = right.getRows();
+ final double leftRowCount = left.getRows();
+ if (Double.isInfinite(leftRowCount)) {
+ rowCount = leftRowCount;
+ } else {
+ rowCount += Util.nLogN(leftRowCount);
+ }
+ if (Double.isInfinite(rightRowCount)) {
+ rowCount = rightRowCount;
+ } else {
+ rowCount += rightRowCount;
+ }
+ return planner.getCostFactory().makeCost(rowCount, 0, 0);
}
- return planner.getCostFactory().makeCost(rowCount, 0, 0);
- }
- private double addEpsilon(double d) {
- assert d >= 0d;
- final double d0 = d;
- if (d < 10) {
- // For small d, adding 1 would change the value significantly.
- d *= 1.001d;
- if (d != d0) {
+ private double addEpsilon(double d) {
+ assert d >= 0d;
+ final double d0 = d;
+ if (d < 10) {
+ // For small d, adding 1 would change the value significantly.
+ d *= 1.001d;
+ if (d != d0) {
+ return d;
+ }
+ }
+ // For medium d, add 1. Keeps integral values integral.
+ ++d;
+ if (d != d0) {
+ return d;
+ }
+ // For large d, adding 1 might not change the value. Add .1%.
+ // If d is NaN, this still will probably not change the value. That's OK.
+ d *= 1.001d;
return d;
- }
}
- // For medium d, add 1. Keeps integral values integral.
- ++d;
- if (d != d0) {
- return d;
- }
- // For large d, adding 1 might not change the value. Add .1%.
- // If d is NaN, this still will probably not change the value. That's OK.
- d *= 1.001d;
- return d;
- }
- public Result implement(EnumerableRelImplementor implementor, Prefer pref) {
- BlockBuilder builder = new BlockBuilder();
- final Result leftResult =
- implementor.visitChild(this, 0, (EnumerableRel) left, pref);
- Expression leftExpression =
- builder.append(
- "left", leftResult.block);
- final Result rightResult =
- implementor.visitChild(this, 1, (EnumerableRel) right, pref);
- Expression rightExpression =
- builder.append(
- "right", rightResult.block);
- final PhysType physType =
- PhysTypeImpl.of(
- implementor.getTypeFactory(), getRowType(), pref.preferArray());
- final PhysType keyPhysType =
- leftResult.physType.project(
- leftKeys, JavaRowFormat.LIST);
- return implementor.result(
- physType,
- builder.append(
- Expressions.call(
- leftExpression,
- BuiltInMethod.JOIN.method,
- Expressions.list(
- rightExpression,
- leftResult.physType.generateAccessor(leftKeys),
- rightResult.physType.generateAccessor(rightKeys),
- EnumUtils.joinSelector(joinType,
- physType,
- ImmutableList.of(
- leftResult.physType, rightResult.physType)))
- .append(
- Util.first(keyPhysType.comparer(),
- Expressions.constant(null)))
- .append(
- Expressions.constant(joinType.generatesNullsOnLeft()))
- .append(
- Expressions.constant(
- joinType.generatesNullsOnRight())))).toBlock());
- }
+ public Result implement(EnumerableRelImplementor implementor, Prefer pref) {
+ BlockBuilder builder = new BlockBuilder();
+ final Result leftResult = implementor.visitChild(this, 0, (EnumerableRel) left, pref);
+ Expression leftExpression = builder.append("left", leftResult.block);
+ final Result rightResult = implementor.visitChild(this, 1, (EnumerableRel) right, pref);
+ Expression rightExpression = builder.append("right", rightResult.block);
+ final PhysType physType = PhysTypeImpl.of(implementor.getTypeFactory(), getRowType(), pref.preferArray());
+ final PhysType keyPhysType = leftResult.physType.project(leftKeys, JavaRowFormat.LIST);
+ return implementor.result(physType, builder.append(Expressions.call(leftExpression, BuiltInMethod.JOIN.method, Expressions.list(rightExpression, leftResult.physType.generateAccessor(leftKeys), rightResult.physType.generateAccessor(rightKeys), EnumUtils.joinSelector(joinType, physType, ImmutableList.of(leftResult.physType, rightResult.physType))).append(Util.first(keyPhysType.comparer(), Expressions.constant(null))).append(Expressions.constant(joinType.generatesNullsOnLeft())).append(Expressions.constant(joinType.generatesNullsOnRight())))).toBlock());
+ }
}