[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user asfgit closed the pull request at: https://github.com/apache/carbondata/pull/1000 --- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user ravipesala commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r122179178
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
---
@@ -0,0 +1,124 @@
+/*
+ * 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.datastore.page;
+
+import java.math.BigDecimal;
+
+import org.apache.carbondata.core.memory.CarbonUnsafe;
+import org.apache.carbondata.core.memory.MemoryBlock;
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.memory.UnsafeMemoryManager;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+// This extension uses unsafe memory to store page data, for variable
length data type (string,
+// decimal)
+public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
+
+ // memory allocated by Unsafe
+ private MemoryBlock memoryBlock;
+
+ // base address of memoryBlock
+ private Object baseAddress;
+
+ // base offset of memoryBlock
+ private long baseOffset;
+
+ // size of the allocated memory, in bytes
+ private int capacity;
+
+ // default size for each row, grows as needed
+ private static final int DEFAULT_ROW_SIZE = 8;
+
+ private static final double FACTOR = 1.25;
+
+ UnsafeVarLengthColumnPage(DataType dataType, int pageSize) throws
MemoryException {
+super(dataType, pageSize);
+capacity = pageSize * DEFAULT_ROW_SIZE;
+memoryBlock =
UnsafeMemoryManager.allocateMemoryWithRetry((long)(capacity * FACTOR));
+baseAddress = memoryBlock.getBaseObject();
+baseOffset = memoryBlock.getBaseOffset();
+ }
+
+ @Override
+ public void freeMemory() {
+if (memoryBlock != null) {
+ UnsafeMemoryManager.INSTANCE.freeMemory(memoryBlock);
+ memoryBlock = null;
+ baseAddress = null;
+ baseOffset = 0;
+}
+ }
+
+ private void ensureMemory(int requestSize) throws MemoryException {
+if (totalLength + requestSize > capacity) {
+ memoryBlock = UnsafeMemoryManager.reallocateMemoryWithRetry(
+ memoryBlock, (long)((totalLength + requestSize) * FACTOR));
+ baseAddress = memoryBlock.getBaseObject();
+ baseOffset = memoryBlock.getBaseOffset();
+}
+ }
+
+ @Override
+ public void putBytesAtRow(int rowId, byte[] bytes) {
+try {
+ ensureMemory(bytes.length);
+} catch (MemoryException e) {
+ throw new RuntimeException(e);
+}
+
+CarbonUnsafe.unsafe.copyMemory(bytes, CarbonUnsafe.BYTE_ARRAY_OFFSET,
+baseAddress, baseOffset + rowOffset[rowId], bytes.length);
+ }
+
+ @Override
+ public void putBytes(int rowId, byte[] bytes, int offset, int length) {
+CarbonUnsafe.unsafe.copyMemory(bytes, CarbonUnsafe.BYTE_ARRAY_OFFSET +
offset,
+baseAddress, baseOffset + rowOffset[rowId], length);
+ }
+
--- End diff --
yes, i see that. I mean we should do in unsafe
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user jackylk commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r122123190
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
---
@@ -0,0 +1,124 @@
+/*
+ * 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.datastore.page;
+
+import java.math.BigDecimal;
+
+import org.apache.carbondata.core.memory.CarbonUnsafe;
+import org.apache.carbondata.core.memory.MemoryBlock;
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.memory.UnsafeMemoryManager;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+// This extension uses unsafe memory to store page data, for variable
length data type (string,
+// decimal)
+public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
+
+ // memory allocated by Unsafe
+ private MemoryBlock memoryBlock;
+
+ // base address of memoryBlock
+ private Object baseAddress;
+
+ // base offset of memoryBlock
+ private long baseOffset;
+
+ // size of the allocated memory, in bytes
+ private int capacity;
+
+ // default size for each row, grows as needed
+ private static final int DEFAULT_ROW_SIZE = 8;
+
+ private static final double FACTOR = 1.25;
+
+ UnsafeVarLengthColumnPage(DataType dataType, int pageSize) throws
MemoryException {
+super(dataType, pageSize);
+capacity = pageSize * DEFAULT_ROW_SIZE;
+memoryBlock =
UnsafeMemoryManager.allocateMemoryWithRetry((long)(capacity * FACTOR));
+baseAddress = memoryBlock.getBaseObject();
+baseOffset = memoryBlock.getBaseOffset();
+ }
+
+ @Override
+ public void freeMemory() {
+if (memoryBlock != null) {
+ UnsafeMemoryManager.INSTANCE.freeMemory(memoryBlock);
+ memoryBlock = null;
+ baseAddress = null;
+ baseOffset = 0;
+}
+ }
+
+ private void ensureMemory(int requestSize) throws MemoryException {
+if (totalLength + requestSize > capacity) {
+ memoryBlock = UnsafeMemoryManager.reallocateMemoryWithRetry(
+ memoryBlock, (long)((totalLength + requestSize) * FACTOR));
--- End diff --
ok
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user ravipesala commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r122116031
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
---
@@ -0,0 +1,124 @@
+/*
+ * 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.datastore.page;
+
+import java.math.BigDecimal;
+
+import org.apache.carbondata.core.memory.CarbonUnsafe;
+import org.apache.carbondata.core.memory.MemoryBlock;
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.memory.UnsafeMemoryManager;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+// This extension uses unsafe memory to store page data, for variable
length data type (string,
+// decimal)
+public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
+
+ // memory allocated by Unsafe
+ private MemoryBlock memoryBlock;
+
+ // base address of memoryBlock
+ private Object baseAddress;
+
+ // base offset of memoryBlock
+ private long baseOffset;
+
+ // size of the allocated memory, in bytes
+ private int capacity;
+
+ // default size for each row, grows as needed
+ private static final int DEFAULT_ROW_SIZE = 8;
+
+ private static final double FACTOR = 1.25;
+
+ UnsafeVarLengthColumnPage(DataType dataType, int pageSize) throws
MemoryException {
+super(dataType, pageSize);
+capacity = pageSize * DEFAULT_ROW_SIZE;
+memoryBlock =
UnsafeMemoryManager.allocateMemoryWithRetry((long)(capacity * FACTOR));
+baseAddress = memoryBlock.getBaseObject();
+baseOffset = memoryBlock.getBaseOffset();
+ }
+
+ @Override
+ public void freeMemory() {
+if (memoryBlock != null) {
+ UnsafeMemoryManager.INSTANCE.freeMemory(memoryBlock);
+ memoryBlock = null;
+ baseAddress = null;
+ baseOffset = 0;
+}
+ }
+
+ private void ensureMemory(int requestSize) throws MemoryException {
+if (totalLength + requestSize > capacity) {
+ memoryBlock = UnsafeMemoryManager.reallocateMemoryWithRetry(
+ memoryBlock, (long)((totalLength + requestSize) * FACTOR));
+ baseAddress = memoryBlock.getBaseObject();
+ baseOffset = memoryBlock.getBaseOffset();
+}
+ }
+
+ @Override
+ public void putBytesAtRow(int rowId, byte[] bytes) {
+try {
+ ensureMemory(bytes.length);
+} catch (MemoryException e) {
+ throw new RuntimeException(e);
+}
+
+CarbonUnsafe.unsafe.copyMemory(bytes, CarbonUnsafe.BYTE_ARRAY_OFFSET,
+baseAddress, baseOffset + rowOffset[rowId], bytes.length);
+ }
+
+ @Override
+ public void putBytes(int rowId, byte[] bytes, int offset, int length) {
+CarbonUnsafe.unsafe.copyMemory(bytes, CarbonUnsafe.BYTE_ARRAY_OFFSET +
offset,
+baseAddress, baseOffset + rowOffset[rowId], length);
+ }
+
--- End diff --
Even method `public void putBytes(int rowId, byte[] bytes)` also need to be
override here.
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user ravipesala commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r122114396
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
---
@@ -0,0 +1,124 @@
+/*
+ * 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.datastore.page;
+
+import java.math.BigDecimal;
+
+import org.apache.carbondata.core.memory.CarbonUnsafe;
+import org.apache.carbondata.core.memory.MemoryBlock;
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.memory.UnsafeMemoryManager;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+// This extension uses unsafe memory to store page data, for variable
length data type (string,
+// decimal)
+public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
+
+ // memory allocated by Unsafe
+ private MemoryBlock memoryBlock;
+
+ // base address of memoryBlock
+ private Object baseAddress;
+
+ // base offset of memoryBlock
+ private long baseOffset;
+
+ // size of the allocated memory, in bytes
+ private int capacity;
+
+ // default size for each row, grows as needed
+ private static final int DEFAULT_ROW_SIZE = 8;
+
+ private static final double FACTOR = 1.25;
+
+ UnsafeVarLengthColumnPage(DataType dataType, int pageSize) throws
MemoryException {
+super(dataType, pageSize);
+capacity = pageSize * DEFAULT_ROW_SIZE;
+memoryBlock =
UnsafeMemoryManager.allocateMemoryWithRetry((long)(capacity * FACTOR));
+baseAddress = memoryBlock.getBaseObject();
+baseOffset = memoryBlock.getBaseOffset();
+ }
+
+ @Override
+ public void freeMemory() {
+if (memoryBlock != null) {
+ UnsafeMemoryManager.INSTANCE.freeMemory(memoryBlock);
+ memoryBlock = null;
+ baseAddress = null;
+ baseOffset = 0;
+}
+ }
+
+ private void ensureMemory(int requestSize) throws MemoryException {
+if (totalLength + requestSize > capacity) {
+ memoryBlock = UnsafeMemoryManager.reallocateMemoryWithRetry(
+ memoryBlock, (long)((totalLength + requestSize) * FACTOR));
--- End diff --
`capacity` should be updated with `(totalLength + requestSize) * FACTOR`
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user jackylk commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121940029
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/VarLengthColumnPageBase.java
---
@@ -0,0 +1,212 @@
+/*
+ * 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.datastore.page;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+
+import static
org.apache.carbondata.core.metadata.datatype.DataType.DECIMAL;
+
+public abstract class VarLengthColumnPageBase extends ColumnPage {
+
+ // the offset of row whose id is (N + 1) in the unsafe memory
+ // for example, if first two rows are 8 bytes and 4 bytes, then
rowOffset[0] == 8,
+ // and rowOffset[1] == 12
+ int[] rowOffset;
+
+ // the length of bytes added in the page
+ int totolLength;
+
+ VarLengthColumnPageBase(DataType dataType, int pageSize) {
+super(dataType, pageSize);
+ }
+
+ @Override
+ public void setBytePage(byte[] byteData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setShortPage(short[] shortData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setIntPage(int[] intData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setLongPage(long[] longData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setFloatPage(float[] floatData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setDoublePage(double[] doubleData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setByteArrayPage(byte[][] byteArray) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ /**
+ * Create a new column page based on the LV (Length Value) encoded bytes
+ */
+ static ColumnPage newDecimalColumnPage(byte[] lvEncodedBytes) throws
MemoryException {
+// extract length and data, set them to rowOffset and unsafe memory
correspondingly
+int rowId = 0;
+List rowOffset = new ArrayList<>();
+List rowLength = new ArrayList<>();
+int length;
+int offset = 0;
+int nextRowOffset;
+
+// extract Length field in input and calculate total length
+for (offset = 0; offset < lvEncodedBytes.length; offset =
nextRowOffset) {
+ length = (((int)lvEncodedBytes[offset]) << 24) +
(((int)lvEncodedBytes[offset + 1]) << 16) +
--- End diff --
`ByteUtil.toInt` internal is using Unsafe, which it is wrong in this context
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user jackylk commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121938987
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
---
@@ -0,0 +1,150 @@
+/*
+ * 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.datastore.page;
+
+import java.math.BigDecimal;
+
+import org.apache.carbondata.core.memory.CarbonUnsafe;
+import org.apache.carbondata.core.memory.MemoryBlock;
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.memory.UnsafeMemoryManager;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+// This extension uses unsafe memory to store page data, for variable
length data type (string,
+// decimal)
+public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
+
+ // memory allocated by Unsafe
+ private MemoryBlock memoryBlock;
+
+ // base address of memoryBlock
+ private Object baseAddress;
+
+ // base offset of memoryBlock
+ private long baseOffset;
+
+ // size of the allocated memory, in bytes
+ private int capacity;
+
+ // default size for each row, grows as needed
+ private static final int DEFAULT_ROW_SIZE = 8;
+
+ UnsafeVarLengthColumnPage(DataType dataType, int pageSize) throws
MemoryException {
+super(dataType, pageSize);
+capacity = pageSize * DEFAULT_ROW_SIZE;
+memoryBlock = UnsafeMemoryManager.allocateMemoryWithRetry(capacity);
+baseAddress = memoryBlock.getBaseObject();
+baseOffset = memoryBlock.getBaseOffset();
+rowOffset = new int[pageSize];
+totolLength = 0;
+ }
+
+ @Override
+ public void freeMemory() {
+if (memoryBlock != null) {
+ UnsafeMemoryManager.INSTANCE.freeMemory(memoryBlock);
+}
+ }
+
+ private void ensureMemory(int requestSize) throws MemoryException {
+if (totolLength + requestSize > capacity) {
+ memoryBlock =
UnsafeMemoryManager.reallocateMemoryWithRetry(memoryBlock, requestSize);
+}
+ }
+
+ @Override
+ public void putBytes(int rowId, byte[] bytes) {
+int offset;
+if (rowId == 0) {
+ offset = 0;
+} else {
+ offset = rowOffset[rowId - 1];
+}
+
+try {
+ ensureMemory(bytes.length);
+} catch (MemoryException e) {
+ throw new RuntimeException(e);
+}
+
+for (int i = 0; i < bytes.length; i++) {
+ CarbonUnsafe.unsafe.putByte(baseAddress, baseOffset + offset + i,
bytes[i]);
+}
+rowOffset[rowId] = offset + bytes.length + 4;
+totolLength += bytes.length;
+ }
+
+ @Override
+ public void putBytes(int rowId, byte[] bytes, int offset, int length) {
+int currentRowOffset = rowOffset[rowId];
+for (int i = 0; i < length; i++) {
+ CarbonUnsafe.unsafe.putByte(baseAddress, baseOffset +
currentRowOffset + i, bytes[i]);
+}
+ }
+
+ @Override
+ public BigDecimal getDecimal(int rowId) {
+int offset, length;
+if (rowId == 0) {
+ length = rowOffset[rowId];
+ offset = 0;
+} else {
+ length = rowOffset[rowId] - rowOffset[rowId - 1];
+ offset = rowOffset[rowId - 1];
+}
+
+byte[] bytes = new byte[length];
+for (int i = 0; i < length; i++) {
+ bytes[i] = CarbonUnsafe.unsafe.getByte(baseAddress, baseOffset +
offset + i);
+}
+
+return DataTypeUtil.byteToBigDecimal(bytes);
+ }
+
+ @Override
+ public byte[][] getByteArrayPage() {
+byte[][] bytes = new byte[pageSize][];
+for (int rowId = 0; rowId < pageSize; rowId++) {
+ int offset, length;
+ if (rowId == 0) {
+length = rowOffset[rowId] - 4;
+offset = 0;
+ } else {
+
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user ravipesala commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121937358
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/VarLengthColumnPageBase.java
---
@@ -0,0 +1,212 @@
+/*
+ * 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.datastore.page;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+
+import static
org.apache.carbondata.core.metadata.datatype.DataType.DECIMAL;
+
+public abstract class VarLengthColumnPageBase extends ColumnPage {
+
+ // the offset of row whose id is (N + 1) in the unsafe memory
+ // for example, if first two rows are 8 bytes and 4 bytes, then
rowOffset[0] == 8,
+ // and rowOffset[1] == 12
+ int[] rowOffset;
+
+ // the length of bytes added in the page
+ int totolLength;
+
+ VarLengthColumnPageBase(DataType dataType, int pageSize) {
+super(dataType, pageSize);
+ }
+
+ @Override
+ public void setBytePage(byte[] byteData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setShortPage(short[] shortData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setIntPage(int[] intData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setLongPage(long[] longData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setFloatPage(float[] floatData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setDoublePage(double[] doubleData) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ @Override
+ public void setByteArrayPage(byte[][] byteArray) {
+throw new UnsupportedOperationException("invalid data type: " +
dataType);
+ }
+
+ /**
+ * Create a new column page based on the LV (Length Value) encoded bytes
+ */
+ static ColumnPage newDecimalColumnPage(byte[] lvEncodedBytes) throws
MemoryException {
+// extract length and data, set them to rowOffset and unsafe memory
correspondingly
+int rowId = 0;
+List rowOffset = new ArrayList<>();
+List rowLength = new ArrayList<>();
+int length;
+int offset = 0;
+int nextRowOffset;
+
+// extract Length field in input and calculate total length
+for (offset = 0; offset < lvEncodedBytes.length; offset =
nextRowOffset) {
+ length = (((int)lvEncodedBytes[offset]) << 24) +
(((int)lvEncodedBytes[offset + 1]) << 16) +
--- End diff --
why don't use `Byteutil.toInt`
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user ravipesala commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121934452
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
---
@@ -0,0 +1,150 @@
+/*
+ * 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.datastore.page;
+
+import java.math.BigDecimal;
+
+import org.apache.carbondata.core.memory.CarbonUnsafe;
+import org.apache.carbondata.core.memory.MemoryBlock;
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.memory.UnsafeMemoryManager;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+// This extension uses unsafe memory to store page data, for variable
length data type (string,
+// decimal)
+public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
+
+ // memory allocated by Unsafe
+ private MemoryBlock memoryBlock;
+
+ // base address of memoryBlock
+ private Object baseAddress;
+
+ // base offset of memoryBlock
+ private long baseOffset;
+
+ // size of the allocated memory, in bytes
+ private int capacity;
+
+ // default size for each row, grows as needed
+ private static final int DEFAULT_ROW_SIZE = 8;
+
+ UnsafeVarLengthColumnPage(DataType dataType, int pageSize) throws
MemoryException {
+super(dataType, pageSize);
+capacity = pageSize * DEFAULT_ROW_SIZE;
+memoryBlock = UnsafeMemoryManager.allocateMemoryWithRetry(capacity);
+baseAddress = memoryBlock.getBaseObject();
+baseOffset = memoryBlock.getBaseOffset();
+rowOffset = new int[pageSize];
+totolLength = 0;
+ }
+
+ @Override
+ public void freeMemory() {
+if (memoryBlock != null) {
+ UnsafeMemoryManager.INSTANCE.freeMemory(memoryBlock);
+}
+ }
+
+ private void ensureMemory(int requestSize) throws MemoryException {
+if (totolLength + requestSize > capacity) {
+ memoryBlock =
UnsafeMemoryManager.reallocateMemoryWithRetry(memoryBlock, requestSize);
+}
+ }
+
+ @Override
+ public void putBytes(int rowId, byte[] bytes) {
+int offset;
+if (rowId == 0) {
+ offset = 0;
+} else {
+ offset = rowOffset[rowId - 1];
+}
+
+try {
+ ensureMemory(bytes.length);
+} catch (MemoryException e) {
+ throw new RuntimeException(e);
+}
+
+for (int i = 0; i < bytes.length; i++) {
+ CarbonUnsafe.unsafe.putByte(baseAddress, baseOffset + offset + i,
bytes[i]);
+}
+rowOffset[rowId] = offset + bytes.length + 4;
+totolLength += bytes.length;
+ }
+
+ @Override
+ public void putBytes(int rowId, byte[] bytes, int offset, int length) {
+int currentRowOffset = rowOffset[rowId];
+for (int i = 0; i < length; i++) {
+ CarbonUnsafe.unsafe.putByte(baseAddress, baseOffset +
currentRowOffset + i, bytes[i]);
+}
+ }
+
+ @Override
+ public BigDecimal getDecimal(int rowId) {
+int offset, length;
+if (rowId == 0) {
+ length = rowOffset[rowId];
+ offset = 0;
+} else {
+ length = rowOffset[rowId] - rowOffset[rowId - 1];
+ offset = rowOffset[rowId - 1];
+}
+
+byte[] bytes = new byte[length];
+for (int i = 0; i < length; i++) {
+ bytes[i] = CarbonUnsafe.unsafe.getByte(baseAddress, baseOffset +
offset + i);
+}
+
+return DataTypeUtil.byteToBigDecimal(bytes);
+ }
+
+ @Override
+ public byte[][] getByteArrayPage() {
+byte[][] bytes = new byte[pageSize][];
+for (int rowId = 0; rowId < pageSize; rowId++) {
+ int offset, length;
+ if (rowId == 0) {
+length = rowOffset[rowId] - 4;
+offset = 0;
+ } else {
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user ravipesala commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121934356
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
---
@@ -0,0 +1,150 @@
+/*
+ * 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.datastore.page;
+
+import java.math.BigDecimal;
+
+import org.apache.carbondata.core.memory.CarbonUnsafe;
+import org.apache.carbondata.core.memory.MemoryBlock;
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.memory.UnsafeMemoryManager;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+// This extension uses unsafe memory to store page data, for variable
length data type (string,
+// decimal)
+public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
+
+ // memory allocated by Unsafe
+ private MemoryBlock memoryBlock;
+
+ // base address of memoryBlock
+ private Object baseAddress;
+
+ // base offset of memoryBlock
+ private long baseOffset;
+
+ // size of the allocated memory, in bytes
+ private int capacity;
+
+ // default size for each row, grows as needed
+ private static final int DEFAULT_ROW_SIZE = 8;
+
+ UnsafeVarLengthColumnPage(DataType dataType, int pageSize) throws
MemoryException {
+super(dataType, pageSize);
+capacity = pageSize * DEFAULT_ROW_SIZE;
+memoryBlock = UnsafeMemoryManager.allocateMemoryWithRetry(capacity);
+baseAddress = memoryBlock.getBaseObject();
+baseOffset = memoryBlock.getBaseOffset();
+rowOffset = new int[pageSize];
+totolLength = 0;
+ }
+
+ @Override
+ public void freeMemory() {
+if (memoryBlock != null) {
+ UnsafeMemoryManager.INSTANCE.freeMemory(memoryBlock);
+}
+ }
+
+ private void ensureMemory(int requestSize) throws MemoryException {
+if (totolLength + requestSize > capacity) {
+ memoryBlock =
UnsafeMemoryManager.reallocateMemoryWithRetry(memoryBlock, requestSize);
+}
+ }
+
+ @Override
+ public void putBytes(int rowId, byte[] bytes) {
+int offset;
+if (rowId == 0) {
+ offset = 0;
+} else {
+ offset = rowOffset[rowId - 1];
+}
+
+try {
+ ensureMemory(bytes.length);
+} catch (MemoryException e) {
+ throw new RuntimeException(e);
+}
+
+for (int i = 0; i < bytes.length; i++) {
+ CarbonUnsafe.unsafe.putByte(baseAddress, baseOffset + offset + i,
bytes[i]);
--- End diff --
it is inefficient to put data byte by byte, use `copyMemory` method
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user jackylk commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121933673
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
---
@@ -0,0 +1,150 @@
+/*
+ * 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.datastore.page;
+
+import java.math.BigDecimal;
+
+import org.apache.carbondata.core.memory.CarbonUnsafe;
+import org.apache.carbondata.core.memory.MemoryBlock;
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.memory.UnsafeMemoryManager;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+// This extension uses unsafe memory to store page data, for variable
length data type (string,
+// decimal)
+public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
+
+ // memory allocated by Unsafe
+ private MemoryBlock memoryBlock;
+
+ // base address of memoryBlock
+ private Object baseAddress;
+
+ // base offset of memoryBlock
+ private long baseOffset;
+
+ // size of the allocated memory, in bytes
+ private int capacity;
+
+ // default size for each row, grows as needed
+ private static final int DEFAULT_ROW_SIZE = 8;
+
+ UnsafeVarLengthColumnPage(DataType dataType, int pageSize) throws
MemoryException {
+super(dataType, pageSize);
+capacity = pageSize * DEFAULT_ROW_SIZE;
+memoryBlock = UnsafeMemoryManager.allocateMemoryWithRetry(capacity);
+baseAddress = memoryBlock.getBaseObject();
+baseOffset = memoryBlock.getBaseOffset();
+rowOffset = new int[pageSize];
+totolLength = 0;
+ }
+
+ @Override
+ public void freeMemory() {
+if (memoryBlock != null) {
+ UnsafeMemoryManager.INSTANCE.freeMemory(memoryBlock);
+}
+ }
+
+ private void ensureMemory(int requestSize) throws MemoryException {
+if (totolLength + requestSize > capacity) {
+ memoryBlock =
UnsafeMemoryManager.reallocateMemoryWithRetry(memoryBlock, requestSize);
--- End diff --
In C/C++ world, old data should be copied to the reallocated address.
http://en.cppreference.com/w/c/memory/realloc
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user ravipesala commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121932974
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
---
@@ -0,0 +1,150 @@
+/*
+ * 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.datastore.page;
+
+import java.math.BigDecimal;
+
+import org.apache.carbondata.core.memory.CarbonUnsafe;
+import org.apache.carbondata.core.memory.MemoryBlock;
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.memory.UnsafeMemoryManager;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+// This extension uses unsafe memory to store page data, for variable
length data type (string,
+// decimal)
+public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
+
+ // memory allocated by Unsafe
+ private MemoryBlock memoryBlock;
+
+ // base address of memoryBlock
+ private Object baseAddress;
+
+ // base offset of memoryBlock
+ private long baseOffset;
+
+ // size of the allocated memory, in bytes
+ private int capacity;
+
+ // default size for each row, grows as needed
+ private static final int DEFAULT_ROW_SIZE = 8;
+
+ UnsafeVarLengthColumnPage(DataType dataType, int pageSize) throws
MemoryException {
+super(dataType, pageSize);
+capacity = pageSize * DEFAULT_ROW_SIZE;
+memoryBlock = UnsafeMemoryManager.allocateMemoryWithRetry(capacity);
+baseAddress = memoryBlock.getBaseObject();
+baseOffset = memoryBlock.getBaseOffset();
+rowOffset = new int[pageSize];
+totolLength = 0;
+ }
+
+ @Override
+ public void freeMemory() {
+if (memoryBlock != null) {
+ UnsafeMemoryManager.INSTANCE.freeMemory(memoryBlock);
+}
+ }
+
+ private void ensureMemory(int requestSize) throws MemoryException {
+if (totolLength + requestSize > capacity) {
+ memoryBlock =
UnsafeMemoryManager.reallocateMemoryWithRetry(memoryBlock, requestSize);
--- End diff --
how about the data which is stored in old memory block,
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user jackylk commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121930195
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeColumnPage.java
---
@@ -0,0 +1,321 @@
+/*
+ * 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.datastore.page;
+
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+
+import org.apache.carbondata.core.constants.CarbonCommonConstants;
+import org.apache.carbondata.core.memory.CarbonUnsafe;
+import org.apache.carbondata.core.memory.MemoryBlock;
+import org.apache.carbondata.core.memory.MemoryException;
+import org.apache.carbondata.core.memory.UnsafeMemoryManager;
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+// This extension uses unsafe memory to store page data
+public class UnsafeColumnPage extends ColumnPage {
+ private MemoryBlock memoryBlock;
+
+ // base address of memoryBlock
+ private Object baseAddress;
+
+ // base offset of memoryBlock
+ private long baseOffset;
+
+ private static final int byteBits = DataType.BYTE.getSizeBits();
+ private static final int shortBits = DataType.SHORT.getSizeBits();
+ private static final int intBits = DataType.INT.getSizeBits();
+ private static final int longBits = DataType.LONG.getSizeBits();
+ private static final int floatBits = DataType.FLOAT.getSizeBits();
+ private static final int doubleBits = DataType.DOUBLE.getSizeBits();
+
+ UnsafeColumnPage(DataType dataType, int pageSize) throws MemoryException
{
+super(dataType, pageSize);
+switch (dataType) {
+ case BYTE:
+ case SHORT:
+ case INT:
+ case LONG:
+ case FLOAT:
+ case DOUBLE:
+int size = pageSize << dataType.getSizeBits();
+memoryBlock = UnsafeMemoryManager.allocateMemoryWithRetry(size);
+baseAddress = memoryBlock.getBaseObject();
+baseOffset = memoryBlock.getBaseOffset();
+break;
+ case DECIMAL:
+ case STRING:
+byteArrayData = new byte[pageSize][];
--- End diff --
I updated this PR, now all types are unsafe
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user jackylk commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121930114
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/ColumnPage.java ---
@@ -323,15 +340,8 @@ public double getDouble(int rowId) {
return doubleData[rowId];
}
- /**
- * Get decimal value at rowId
- */
- public byte[] getDecimalBytes(int rowId) {
-return byteArrayData[rowId];
- }
-
public BigDecimal getDecimal(int rowId) {
--- End diff --
ok
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user jackylk commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121928358
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/ColumnPage.java ---
@@ -98,56 +117,54 @@ public static ColumnPage newPage(DataType dataType,
int pageSize) {
default:
throw new RuntimeException("Unsupported data dataType: " +
dataType);
}
-instance.stats = new ColumnPageStatsVO(dataType);
-instance.nullBitSet = new BitSet(pageSize);
return instance;
}
protected static ColumnPage newBytePage(byte[] byteData) {
ColumnPage columnPage = new ColumnPage(BYTE, byteData.length);
--- End diff --
ok, I will fix
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user jackylk commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121928413
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/ColumnPage.java ---
@@ -98,56 +117,54 @@ public static ColumnPage newPage(DataType dataType,
int pageSize) {
default:
throw new RuntimeException("Unsupported data dataType: " +
dataType);
}
-instance.stats = new ColumnPageStatsVO(dataType);
-instance.nullBitSet = new BitSet(pageSize);
return instance;
}
protected static ColumnPage newBytePage(byte[] byteData) {
ColumnPage columnPage = new ColumnPage(BYTE, byteData.length);
--- End diff --
ok, it supports, I will fix
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user watermen commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121876896
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/ColumnPage.java ---
@@ -323,15 +340,8 @@ public double getDouble(int rowId) {
return doubleData[rowId];
}
- /**
- * Get decimal value at rowId
- */
- public byte[] getDecimalBytes(int rowId) {
-return byteArrayData[rowId];
- }
-
public BigDecimal getDecimal(int rowId) {
--- End diff --
Add annotation like getDouble
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user watermen commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121875823
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/ColumnPage.java ---
@@ -508,7 +567,7 @@ public static ColumnPage decompress(Compressor
compressor, DataType dataType,
}
// input byte[] is LV encoded, this function can expand it into byte[][]
- private static byte[][] deflatten(byte[] input) {
+ protected static byte[][] deflatten(byte[] input) {
--- End diff --
Agree with erlu.
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user watermen commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121874665
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/ColumnPage.java ---
@@ -98,56 +117,54 @@ public static ColumnPage newPage(DataType dataType,
int pageSize) {
default:
throw new RuntimeException("Unsupported data dataType: " +
dataType);
}
-instance.stats = new ColumnPageStatsVO(dataType);
-instance.nullBitSet = new BitSet(pageSize);
return instance;
}
protected static ColumnPage newBytePage(byte[] byteData) {
ColumnPage columnPage = new ColumnPage(BYTE, byteData.length);
--- End diff --
If don't support, we'd better to add some notes to explain.
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user chenerlu commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121847432
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/ColumnPage.java ---
@@ -508,7 +567,7 @@ public static ColumnPage decompress(Compressor
compressor, DataType dataType,
}
// input byte[] is LV encoded, this function can expand it into byte[][]
- private static byte[][] deflatten(byte[] input) {
+ protected static byte[][] deflatten(byte[] input) {
--- End diff --
Will it be better to move deflatten to ByteUtil which is same with flatten
?
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user chenerlu commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121839529
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/ColumnPage.java ---
@@ -98,56 +117,54 @@ public static ColumnPage newPage(DataType dataType,
int pageSize) {
default:
throw new RuntimeException("Unsupported data dataType: " +
dataType);
}
-instance.stats = new ColumnPageStatsVO(dataType);
-instance.nullBitSet = new BitSet(pageSize);
return instance;
}
protected static ColumnPage newBytePage(byte[] byteData) {
ColumnPage columnPage = new ColumnPage(BYTE, byteData.length);
-columnPage.byteData = byteData;
+columnPage.setBytePage(byteData);
return columnPage;
}
- protected static ColumnPage newShortPage(short[] shortData) {
-ColumnPage columnPage = new ColumnPage(SHORT, shortData.length);
-columnPage.shortData = shortData;
+ private static ColumnPage newShortPage(short[] shortData) {
+ColumnPage columnPage = createPage(SHORT, shortData.length);
+columnPage.setShortPage(shortData);
return columnPage;
}
- protected static ColumnPage newIntPage(int[] intData) {
-ColumnPage columnPage = new ColumnPage(INT, intData.length);
-columnPage.intData = intData;
+ private static ColumnPage newIntPage(int[] intData) {
+ColumnPage columnPage = createPage(INT, intData.length);
+columnPage.setIntPage(intData);
return columnPage;
}
- protected static ColumnPage newLongPage(long[] longData) {
-ColumnPage columnPage = new ColumnPage(LONG, longData.length);
-columnPage.longData = longData;
+ private static ColumnPage newLongPage(long[] longData) {
+ColumnPage columnPage = createPage(LONG, longData.length);
+columnPage.setLongPage(longData);
return columnPage;
}
- protected static ColumnPage newFloatPage(float[] floatData) {
-ColumnPage columnPage = new ColumnPage(FLOAT, floatData.length);
-columnPage.floatData = floatData;
+ private static ColumnPage newFloatPage(float[] floatData) {
+ColumnPage columnPage = createPage(FLOAT, floatData.length);
+columnPage.setFloatPage(floatData);
return columnPage;
}
- protected static ColumnPage newDoublePage(double[] doubleData) {
-ColumnPage columnPage = new ColumnPage(DOUBLE, doubleData.length);
-columnPage.doubleData = doubleData;
+ private static ColumnPage newDoublePage(double[] doubleData) {
+ColumnPage columnPage = createPage(DOUBLE, doubleData.length);
+columnPage.setDoublePage(doubleData);
return columnPage;
}
- protected static ColumnPage newDecimalPage(byte[][] decimalData) {
-ColumnPage columnPage = new ColumnPage(DECIMAL, decimalData.length);
-columnPage.byteArrayData = decimalData;
+ private static ColumnPage newDecimalPage(byte[][] decimalData) {
+ColumnPage columnPage = createPage(DECIMAL, decimalData.length);
+columnPage.setByteArrayPage(decimalData);
return columnPage;
}
- protected static ColumnPage newVarLengthPage(byte[][] stringData) {
-ColumnPage columnPage = new ColumnPage(BYTE_ARRAY, stringData.length);
-columnPage.byteArrayData = stringData;
+ private static ColumnPage newVarLengthPage(byte[][] byteArray) {
+ColumnPage columnPage = new ColumnPage(BYTE_ARRAY, byteArray.length);
--- End diff --
ByteArray does not support unsafeColumnPage ?
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user chenerlu commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121838660
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/ColumnPage.java ---
@@ -98,56 +117,54 @@ public static ColumnPage newPage(DataType dataType,
int pageSize) {
default:
throw new RuntimeException("Unsupported data dataType: " +
dataType);
}
-instance.stats = new ColumnPageStatsVO(dataType);
-instance.nullBitSet = new BitSet(pageSize);
return instance;
}
protected static ColumnPage newBytePage(byte[] byteData) {
ColumnPage columnPage = new ColumnPage(BYTE, byteData.length);
--- End diff --
Byte doe not support unsafeColumnPage ?
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] carbondata pull request #1000: [CARBONDATA-1018] Add unsafe ColumnPage imple...
Github user chenerlu commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1000#discussion_r121838636
--- Diff:
core/src/main/java/org/apache/carbondata/core/datastore/page/ColumnPage.java ---
@@ -98,56 +117,54 @@ public static ColumnPage newPage(DataType dataType,
int pageSize) {
default:
throw new RuntimeException("Unsupported data dataType: " +
dataType);
}
-instance.stats = new ColumnPageStatsVO(dataType);
-instance.nullBitSet = new BitSet(pageSize);
return instance;
}
protected static ColumnPage newBytePage(byte[] byteData) {
ColumnPage columnPage = new ColumnPage(BYTE, byteData.length);
--- End diff --
BytePage does not support unsafeColumnPage ?
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
