Github user lionelcao commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1105#discussion_r126328139 --- Diff: integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala --- @@ -188,7 +189,7 @@ object CommonUtil { rangeInfo.get.split(",").map(_.trim).foreach( isValid &= validateTypeConvert(partitionerFields(0), _)) } - case "RANGE_INTERVAL" => isValid = false + case "RANGE_INTERVAL" => isValid = rangeIntervalInfo.isDefined --- End diff -- Is there any validate function for range interval info? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at [hidden email] or file a JIRA ticket with INFRA. --- |
In reply to this post by qiuchenjian-2
Github user lionelcao commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1105#discussion_r126328243 --- Diff: core/src/main/java/org/apache/carbondata/core/scan/partition/RangeIntervalPartitioner.java --- @@ -0,0 +1,206 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.carbondata.core.scan.partition; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.metadata.datatype.DataType; +import org.apache.carbondata.core.metadata.schema.PartitionInfo; +import org.apache.carbondata.core.util.CarbonProperties; + +/** + * Range Interval Partitioner + */ + +public class RangeIntervalPartitioner implements Partitioner { + + private int numPartitions; + private RangeIntervalComparator comparator; + private List<Object> boundsList = new ArrayList<>(); + private String intervalType; + private DataType partitionColumnDataType; + + private SimpleDateFormat timestampFormatter = new SimpleDateFormat(CarbonProperties.getInstance() + .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, + CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT)); + + private SimpleDateFormat dateFormatter = new SimpleDateFormat(CarbonProperties.getInstance() + .getProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, + CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT)); + + public RangeIntervalPartitioner(PartitionInfo partitionInfo) { + List<String> values = partitionInfo.getRangeIntervalInfo(); + partitionColumnDataType = partitionInfo.getColumnSchemaList().get(0).getDataType(); + numPartitions = values.size() - 1; + // -1 is just for instead of null + boundsList.add(-1L); + for (int i = 0; i < numPartitions; i++) { + boundsList.add(PartitionUtil.getDataBasedOnDataType(values.get(i), partitionColumnDataType, + timestampFormatter, dateFormatter)); + } + comparator = new RangeIntervalComparator(); + intervalType = values.get(numPartitions); + } + + @Override public int numPartitions() { + String numParStr = CarbonProperties.getInstance().getProperty( + CarbonCommonConstants.MAX_PARTITION_FOR_RANGE_INTERVAL, + CarbonCommonConstants.DEFAULT_MAX_PARTITION_FOR_RANGE_INTERVAL); + return Integer.parseInt(numParStr); + } + + @Override public int getPartition(Object key) { + int partitionIndex = -1; + Object lastBound = boundsList.get(boundsList.size() - 1); + if (key == null) { + return 0; + } else { + for (int i = 1; i <= numPartitions; i++) { + if (comparator.compareTo(key, boundsList.get(i))) { + return i; + } + } + switch (intervalType.toLowerCase()) { + case "year": + partitionIndex = getDynamicPartitionForYear(key, lastBound); + break; + case "month": + partitionIndex = getDynamicPartitionForMonth(key, lastBound); + break; + case "week": + partitionIndex = getDynamicPartitionForWeek(key, lastBound); + break; + case "day": + partitionIndex = getDynamicPartitionForDay(key, lastBound); + break; + case "hour": + partitionIndex = getDynamicPartitionForHour(key, lastBound); + break; + default: + partitionIndex = -1; + } + // if value's partitionId is great than max partition, return 0 for it. + if (partitionIndex >= numPartitions()) { + return 0; + } + return partitionIndex; + } + } + + public int getDynamicPartitionForYear(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.YEAR, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; + } + + public int getDynamicPartitionForMonth(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.MONTH, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; + } + + public int getDynamicPartitionForWeek(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.WEEK_OF_MONTH, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; --- End diff -- this should be partition index --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at [hidden email] or file a JIRA ticket with INFRA. --- |
In reply to this post by qiuchenjian-2
Github user lionelcao commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1105#discussion_r126328220 --- Diff: core/src/main/java/org/apache/carbondata/core/scan/partition/RangeIntervalPartitioner.java --- @@ -0,0 +1,206 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.carbondata.core.scan.partition; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.metadata.datatype.DataType; +import org.apache.carbondata.core.metadata.schema.PartitionInfo; +import org.apache.carbondata.core.util.CarbonProperties; + +/** + * Range Interval Partitioner + */ + +public class RangeIntervalPartitioner implements Partitioner { + + private int numPartitions; + private RangeIntervalComparator comparator; + private List<Object> boundsList = new ArrayList<>(); + private String intervalType; + private DataType partitionColumnDataType; + + private SimpleDateFormat timestampFormatter = new SimpleDateFormat(CarbonProperties.getInstance() + .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, + CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT)); + + private SimpleDateFormat dateFormatter = new SimpleDateFormat(CarbonProperties.getInstance() + .getProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, + CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT)); + + public RangeIntervalPartitioner(PartitionInfo partitionInfo) { + List<String> values = partitionInfo.getRangeIntervalInfo(); + partitionColumnDataType = partitionInfo.getColumnSchemaList().get(0).getDataType(); + numPartitions = values.size() - 1; + // -1 is just for instead of null + boundsList.add(-1L); + for (int i = 0; i < numPartitions; i++) { + boundsList.add(PartitionUtil.getDataBasedOnDataType(values.get(i), partitionColumnDataType, + timestampFormatter, dateFormatter)); + } + comparator = new RangeIntervalComparator(); + intervalType = values.get(numPartitions); + } + + @Override public int numPartitions() { + String numParStr = CarbonProperties.getInstance().getProperty( + CarbonCommonConstants.MAX_PARTITION_FOR_RANGE_INTERVAL, + CarbonCommonConstants.DEFAULT_MAX_PARTITION_FOR_RANGE_INTERVAL); + return Integer.parseInt(numParStr); + } + + @Override public int getPartition(Object key) { + int partitionIndex = -1; + Object lastBound = boundsList.get(boundsList.size() - 1); + if (key == null) { + return 0; + } else { + for (int i = 1; i <= numPartitions; i++) { + if (comparator.compareTo(key, boundsList.get(i))) { + return i; + } + } + switch (intervalType.toLowerCase()) { + case "year": + partitionIndex = getDynamicPartitionForYear(key, lastBound); + break; + case "month": + partitionIndex = getDynamicPartitionForMonth(key, lastBound); + break; + case "week": + partitionIndex = getDynamicPartitionForWeek(key, lastBound); + break; + case "day": + partitionIndex = getDynamicPartitionForDay(key, lastBound); + break; + case "hour": + partitionIndex = getDynamicPartitionForHour(key, lastBound); + break; + default: + partitionIndex = -1; + } + // if value's partitionId is great than max partition, return 0 for it. + if (partitionIndex >= numPartitions()) { + return 0; + } + return partitionIndex; + } + } + + public int getDynamicPartitionForYear(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.YEAR, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; + } + + public int getDynamicPartitionForMonth(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.MONTH, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; + } + + public int getDynamicPartitionForWeek(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.WEEK_OF_MONTH, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; + } + + public int getDynamicPartitionForDay(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.DAY_OF_WEEK, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; + } + + public int getDynamicPartitionForHour(Object key , Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.HOUR_OF_DAY, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; --- End diff -- this should be partition index --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at [hidden email] or file a JIRA ticket with INFRA. --- |
In reply to this post by qiuchenjian-2
Github user lionelcao commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1105#discussion_r126328252 --- Diff: core/src/main/java/org/apache/carbondata/core/scan/partition/RangeIntervalPartitioner.java --- @@ -0,0 +1,206 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.carbondata.core.scan.partition; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.metadata.datatype.DataType; +import org.apache.carbondata.core.metadata.schema.PartitionInfo; +import org.apache.carbondata.core.util.CarbonProperties; + +/** + * Range Interval Partitioner + */ + +public class RangeIntervalPartitioner implements Partitioner { + + private int numPartitions; + private RangeIntervalComparator comparator; + private List<Object> boundsList = new ArrayList<>(); + private String intervalType; + private DataType partitionColumnDataType; + + private SimpleDateFormat timestampFormatter = new SimpleDateFormat(CarbonProperties.getInstance() + .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, + CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT)); + + private SimpleDateFormat dateFormatter = new SimpleDateFormat(CarbonProperties.getInstance() + .getProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, + CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT)); + + public RangeIntervalPartitioner(PartitionInfo partitionInfo) { + List<String> values = partitionInfo.getRangeIntervalInfo(); + partitionColumnDataType = partitionInfo.getColumnSchemaList().get(0).getDataType(); + numPartitions = values.size() - 1; + // -1 is just for instead of null + boundsList.add(-1L); + for (int i = 0; i < numPartitions; i++) { + boundsList.add(PartitionUtil.getDataBasedOnDataType(values.get(i), partitionColumnDataType, + timestampFormatter, dateFormatter)); + } + comparator = new RangeIntervalComparator(); + intervalType = values.get(numPartitions); + } + + @Override public int numPartitions() { + String numParStr = CarbonProperties.getInstance().getProperty( + CarbonCommonConstants.MAX_PARTITION_FOR_RANGE_INTERVAL, + CarbonCommonConstants.DEFAULT_MAX_PARTITION_FOR_RANGE_INTERVAL); + return Integer.parseInt(numParStr); + } + + @Override public int getPartition(Object key) { + int partitionIndex = -1; + Object lastBound = boundsList.get(boundsList.size() - 1); + if (key == null) { + return 0; + } else { + for (int i = 1; i <= numPartitions; i++) { + if (comparator.compareTo(key, boundsList.get(i))) { + return i; + } + } + switch (intervalType.toLowerCase()) { + case "year": + partitionIndex = getDynamicPartitionForYear(key, lastBound); + break; + case "month": + partitionIndex = getDynamicPartitionForMonth(key, lastBound); + break; + case "week": + partitionIndex = getDynamicPartitionForWeek(key, lastBound); + break; + case "day": + partitionIndex = getDynamicPartitionForDay(key, lastBound); + break; + case "hour": + partitionIndex = getDynamicPartitionForHour(key, lastBound); + break; + default: + partitionIndex = -1; + } + // if value's partitionId is great than max partition, return 0 for it. + if (partitionIndex >= numPartitions()) { + return 0; + } + return partitionIndex; + } + } + + public int getDynamicPartitionForYear(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.YEAR, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; + } + + public int getDynamicPartitionForMonth(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.MONTH, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; --- End diff -- this should be partition index --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at [hidden email] or file a JIRA ticket with INFRA. --- |
In reply to this post by qiuchenjian-2
Github user lionelcao commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1105#discussion_r126328264 --- Diff: core/src/main/java/org/apache/carbondata/core/scan/partition/RangeIntervalPartitioner.java --- @@ -0,0 +1,206 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.carbondata.core.scan.partition; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.metadata.datatype.DataType; +import org.apache.carbondata.core.metadata.schema.PartitionInfo; +import org.apache.carbondata.core.util.CarbonProperties; + +/** + * Range Interval Partitioner + */ + +public class RangeIntervalPartitioner implements Partitioner { + + private int numPartitions; + private RangeIntervalComparator comparator; + private List<Object> boundsList = new ArrayList<>(); + private String intervalType; + private DataType partitionColumnDataType; + + private SimpleDateFormat timestampFormatter = new SimpleDateFormat(CarbonProperties.getInstance() + .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, + CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT)); + + private SimpleDateFormat dateFormatter = new SimpleDateFormat(CarbonProperties.getInstance() + .getProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, + CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT)); + + public RangeIntervalPartitioner(PartitionInfo partitionInfo) { + List<String> values = partitionInfo.getRangeIntervalInfo(); + partitionColumnDataType = partitionInfo.getColumnSchemaList().get(0).getDataType(); + numPartitions = values.size() - 1; + // -1 is just for instead of null + boundsList.add(-1L); + for (int i = 0; i < numPartitions; i++) { + boundsList.add(PartitionUtil.getDataBasedOnDataType(values.get(i), partitionColumnDataType, + timestampFormatter, dateFormatter)); + } + comparator = new RangeIntervalComparator(); + intervalType = values.get(numPartitions); + } + + @Override public int numPartitions() { + String numParStr = CarbonProperties.getInstance().getProperty( + CarbonCommonConstants.MAX_PARTITION_FOR_RANGE_INTERVAL, + CarbonCommonConstants.DEFAULT_MAX_PARTITION_FOR_RANGE_INTERVAL); + return Integer.parseInt(numParStr); + } + + @Override public int getPartition(Object key) { + int partitionIndex = -1; + Object lastBound = boundsList.get(boundsList.size() - 1); + if (key == null) { + return 0; + } else { + for (int i = 1; i <= numPartitions; i++) { + if (comparator.compareTo(key, boundsList.get(i))) { + return i; + } + } + switch (intervalType.toLowerCase()) { + case "year": + partitionIndex = getDynamicPartitionForYear(key, lastBound); + break; + case "month": + partitionIndex = getDynamicPartitionForMonth(key, lastBound); + break; + case "week": + partitionIndex = getDynamicPartitionForWeek(key, lastBound); + break; + case "day": + partitionIndex = getDynamicPartitionForDay(key, lastBound); + break; + case "hour": + partitionIndex = getDynamicPartitionForHour(key, lastBound); + break; + default: + partitionIndex = -1; + } + // if value's partitionId is great than max partition, return 0 for it. + if (partitionIndex >= numPartitions()) { + return 0; + } + return partitionIndex; + } + } + + public int getDynamicPartitionForYear(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.YEAR, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; --- End diff -- this should be partition index --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at [hidden email] or file a JIRA ticket with INFRA. --- |
In reply to this post by qiuchenjian-2
Github user lionelcao commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1105#discussion_r126328234 --- Diff: core/src/main/java/org/apache/carbondata/core/scan/partition/RangeIntervalPartitioner.java --- @@ -0,0 +1,206 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.carbondata.core.scan.partition; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.metadata.datatype.DataType; +import org.apache.carbondata.core.metadata.schema.PartitionInfo; +import org.apache.carbondata.core.util.CarbonProperties; + +/** + * Range Interval Partitioner + */ + +public class RangeIntervalPartitioner implements Partitioner { + + private int numPartitions; + private RangeIntervalComparator comparator; + private List<Object> boundsList = new ArrayList<>(); + private String intervalType; + private DataType partitionColumnDataType; + + private SimpleDateFormat timestampFormatter = new SimpleDateFormat(CarbonProperties.getInstance() + .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, + CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT)); + + private SimpleDateFormat dateFormatter = new SimpleDateFormat(CarbonProperties.getInstance() + .getProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, + CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT)); + + public RangeIntervalPartitioner(PartitionInfo partitionInfo) { + List<String> values = partitionInfo.getRangeIntervalInfo(); + partitionColumnDataType = partitionInfo.getColumnSchemaList().get(0).getDataType(); + numPartitions = values.size() - 1; + // -1 is just for instead of null + boundsList.add(-1L); + for (int i = 0; i < numPartitions; i++) { + boundsList.add(PartitionUtil.getDataBasedOnDataType(values.get(i), partitionColumnDataType, + timestampFormatter, dateFormatter)); + } + comparator = new RangeIntervalComparator(); + intervalType = values.get(numPartitions); + } + + @Override public int numPartitions() { + String numParStr = CarbonProperties.getInstance().getProperty( + CarbonCommonConstants.MAX_PARTITION_FOR_RANGE_INTERVAL, + CarbonCommonConstants.DEFAULT_MAX_PARTITION_FOR_RANGE_INTERVAL); + return Integer.parseInt(numParStr); + } + + @Override public int getPartition(Object key) { + int partitionIndex = -1; + Object lastBound = boundsList.get(boundsList.size() - 1); + if (key == null) { + return 0; + } else { + for (int i = 1; i <= numPartitions; i++) { + if (comparator.compareTo(key, boundsList.get(i))) { + return i; + } + } + switch (intervalType.toLowerCase()) { + case "year": + partitionIndex = getDynamicPartitionForYear(key, lastBound); + break; + case "month": + partitionIndex = getDynamicPartitionForMonth(key, lastBound); + break; + case "week": + partitionIndex = getDynamicPartitionForWeek(key, lastBound); + break; + case "day": + partitionIndex = getDynamicPartitionForDay(key, lastBound); + break; + case "hour": + partitionIndex = getDynamicPartitionForHour(key, lastBound); + break; + default: + partitionIndex = -1; + } + // if value's partitionId is great than max partition, return 0 for it. + if (partitionIndex >= numPartitions()) { + return 0; + } + return partitionIndex; + } + } + + public int getDynamicPartitionForYear(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.YEAR, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; + } + + public int getDynamicPartitionForMonth(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.MONTH, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; + } + + public int getDynamicPartitionForWeek(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.WEEK_OF_MONTH, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; + } + + public int getDynamicPartitionForDay(Object key, Object lastBound) { + int partitionId = -1; + Calendar lastCalendar = Calendar.getInstance(); + Calendar keyCal = Calendar.getInstance(); + keyCal.setTimeInMillis((long)key); + lastCalendar.setTimeInMillis((long)lastBound); + while (true) { + lastCalendar.add(Calendar.DAY_OF_WEEK, 1); + boundsList.add(boundsList.size(), lastCalendar.getTimeInMillis()); + ++numPartitions; + if (keyCal.compareTo(lastCalendar) == -1) { + partitionId = numPartitions; + break; + } + } + return partitionId; --- End diff -- this should be partition index --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at [hidden email] or file a JIRA ticket with INFRA. --- |
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:
https://github.com/apache/carbondata/pull/1105 Can one of the admins verify this patch? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at [hidden email] or file a JIRA ticket with INFRA. --- |
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:
https://github.com/apache/carbondata/pull/1105 Build Failed with Spark 2.1.0, Please check CI http://136.243.101.176:8080/job/ApacheCarbonPRBuilder1/44/ --- |
In reply to this post by qiuchenjian-2
Github user ravipesala commented on the issue:
https://github.com/apache/carbondata/pull/1105 SDV Build Fail , Please check CI http://144.76.159.231:8080/job/ApacheSDVTests/1221/ --- |
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:
https://github.com/apache/carbondata/pull/1105 Build Failed with Spark 2.1.0, Please check CI http://136.243.101.176:8080/job/ApacheCarbonPRBuilder1/590/ --- |
In reply to this post by qiuchenjian-2
|
Free forum by Nabble | Edit this page |