Skip to content

HIVE-27058: Backport of HIVE-24316 #4192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 27, 2023
Merged

HIVE-27058: Backport of HIVE-24316 #4192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d7a414
HIVE-24316. Upgrade ORC from 1.5.6 to 1.5.8 in branch-3.1 (#1616)
dongjoon-hyun Nov 3, 2020
ee1f4f3
Merge remote-tracking branch 'origin/branch-3' into diksha/orc-upgrad…
Diksha628 Apr 11, 2023
a8dacf0
Merge remote-tracking branch 'origin/branch-3' into diksha/orc-upgrad…
Diksha628 Apr 16, 2023
45af7b4
HIVE-24391: Fix FIX TestOrcFile failures in branch-3.1 (Panagiotis Ga…
Nov 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<log4j2.version>2.17.1</log4j2.version>
<postgres.version>42.5.1</postgres.version>
<opencsv.version>2.3</opencsv.version>
<orc.version>1.5.6</orc.version>
<orc.version>1.5.8</orc.version>
<mockito-all.version>1.10.19</mockito-all.version>
<powermock.version>1.7.4</powermock.version>
<mina.version>2.0.0-M5</mina.version>
Expand Down
81 changes: 28 additions & 53 deletions ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,68 +1928,37 @@ private BigRow createRandomRow(long[] intValues, double[] doubleValues,
new MiddleStruct(inner, inner2), list(), map(inner,inner2));
}

private static class MyMemoryManager implements MemoryManager {
final long totalSpace;
double rate;
Path path = null;
long lastAllocation = 0;
int rows = 0;
MemoryManager.Callback callback;

MyMemoryManager(Configuration conf, long totalSpace, double rate) {
this.totalSpace = totalSpace;
this.rate = rate;
}

@Override
public void addWriter(Path path, long requestedAllocation,
MemoryManager.Callback callback) {
this.path = path;
this.lastAllocation = requestedAllocation;
this.callback = callback;
}

@Override
public synchronized void removeWriter(Path path) {
this.path = null;
this.lastAllocation = 0;
}

@Override
public void addedRow(int count) throws IOException {
rows += count;
if (rows >= 100) {
callback.checkMemory(rate);
rows = 0;
}
}
}

@Test
public void testMemoryManagementV11() throws Exception {
OrcConf.ROWS_BETWEEN_CHECKS.setLong(conf, 100);
final long poolSize = 50_000;
ObjectInspector inspector;
synchronized (TestOrcFile.class) {
inspector = ObjectInspectorFactory.getReflectionObjectInspector
(InnerStruct.class,
ObjectInspectorFactory.ObjectInspectorOptions.JAVA);
}
MyMemoryManager memory = new MyMemoryManager(conf, 10000, 0.1);
MemoryManager memoryManager = new MemoryManagerImpl(poolSize);
// set up 10 files that all request the full size.
MemoryManager.Callback ignore = newScale -> false;
for(int f=0; f < 9; ++f) {
memoryManager.addWriter(new Path("file-" + f), poolSize, ignore);
}
Writer writer = OrcFile.createWriter(testFilePath,
OrcFile.writerOptions(conf)
.inspector(inspector)
.compress(CompressionKind.NONE)
.stripeSize(50000)
.bufferSize(100)
.rowIndexStride(0)
.memory(memory)
.memory(memoryManager)
.batchSize(100)
.version(OrcFile.Version.V_0_11));
assertEquals(testFilePath, memory.path);
assertEquals(0.1, ((MemoryManagerImpl) memoryManager).getAllocationScale());
for(int i=0; i < 2500; ++i) {
writer.addRow(new InnerStruct(i*300, Integer.toHexString(10*i)));
}
writer.close();
assertEquals(null, memory.path);
Reader reader = OrcFile.createReader(testFilePath,
OrcFile.readerOptions(conf).filesystem(fs));
int i = 0;
Expand All @@ -2004,29 +1973,35 @@ public void testMemoryManagementV11() throws Exception {

@Test
public void testMemoryManagementV12() throws Exception {
OrcConf.ROWS_BETWEEN_CHECKS.setLong(conf, 100);
final long poolSize = 50_000;
ObjectInspector inspector;
synchronized (TestOrcFile.class) {
inspector = ObjectInspectorFactory.getReflectionObjectInspector
(InnerStruct.class,
ObjectInspectorFactory.ObjectInspectorOptions.JAVA);
}
MyMemoryManager memory = new MyMemoryManager(conf, 10000, 0.1);
MemoryManager memoryManager = new MemoryManagerImpl(poolSize);
// set up 10 files that all request the full size.
MemoryManager.Callback ignore = newScale -> false;
for(int f=0; f < 9; ++f) {
memoryManager.addWriter(new Path("file-" + f), poolSize, ignore);
}
Writer writer = OrcFile.createWriter(testFilePath,
OrcFile.writerOptions(conf)
.inspector(inspector)
.compress(CompressionKind.NONE)
.stripeSize(50000)
.bufferSize(100)
.rowIndexStride(0)
.memory(memory)
.batchSize(100)
.version(OrcFile.Version.V_0_12));
assertEquals(testFilePath, memory.path);
OrcFile.writerOptions(conf)
.inspector(inspector)
.compress(CompressionKind.NONE)
.stripeSize(50000)
.bufferSize(100)
.rowIndexStride(0)
.memory(memoryManager)
.batchSize(100)
.version(OrcFile.Version.V_0_12));
assertEquals(0.1, ((MemoryManagerImpl) memoryManager).getAllocationScale());
for(int i=0; i < 2500; ++i) {
writer.addRow(new InnerStruct(i*300, Integer.toHexString(10*i)));
}
writer.close();
assertEquals(null, memory.path);
Reader reader = OrcFile.createReader(testFilePath,
OrcFile.readerOptions(conf).filesystem(fs));
int i = 0;
Expand Down
40 changes: 7 additions & 33 deletions ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcRawRecordMerger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@
import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants;
import org.apache.hadoop.hive.ql.io.BucketCodec;
import org.apache.orc.CompressionKind;
import org.apache.orc.MemoryManager;
import org.apache.orc.OrcConf;
import org.apache.orc.StripeInformation;
import org.apache.orc.impl.MemoryManagerImpl;
import org.apache.orc.impl.OrcAcidUtils;
import org.junit.Assert;
import org.junit.Rule;
Expand Down Expand Up @@ -1064,6 +1063,7 @@ static String getColumnTypesProperty() {
public void testRecordReaderOldBaseAndDelta() throws Exception {
final int BUCKET = 10;
Configuration conf = new Configuration();
OrcConf.ROWS_BETWEEN_CHECKS.setLong(conf, 2);
OrcOutputFormat of = new OrcOutputFormat();
FileSystem fs = FileSystem.getLocal(conf);
Path root = new Path(tmpDir, "testOldBaseAndDelta").makeQualified(fs);
Expand All @@ -1073,25 +1073,11 @@ public void testRecordReaderOldBaseAndDelta() throws Exception {
inspector = ObjectInspectorFactory.getReflectionObjectInspector
(BigRow.class, ObjectInspectorFactory.ObjectInspectorOptions.JAVA);
}

// write the base
MemoryManager mgr = new MemoryManagerImpl(conf){
int rowsAddedSinceCheck = 0;

@Override
public synchronized void addedRow(int rows) throws IOException {
rowsAddedSinceCheck += rows;
if (rowsAddedSinceCheck >= 2) {
notifyWriters();
rowsAddedSinceCheck = 0;
}
}
};
// make 5 stripes with 2 rows each
Writer writer = OrcFile.createWriter(new Path(root, "0000010_0"),
OrcFile.writerOptions(conf).inspector(inspector).fileSystem(fs)
.blockPadding(false).bufferSize(10000).compress(CompressionKind.NONE)
.stripeSize(1).memory(mgr).batchSize(2).version(OrcFile.Version.V_0_11));
.stripeSize(1).batchSize(2).version(OrcFile.Version.V_0_11));
String[] values= new String[]{"ignore.1", "0.1", "ignore.2", "ignore.3",
"2.0", "2.1", "3.0", "ignore.4", "ignore.5", "ignore.6"};
for(int i=0; i < values.length; ++i) {
Expand Down Expand Up @@ -1195,6 +1181,7 @@ public synchronized void addedRow(int rows) throws IOException {
public void testRecordReaderNewBaseAndDelta() throws Exception {
final int BUCKET = 11;
Configuration conf = new Configuration();
OrcConf.ROWS_BETWEEN_CHECKS.setLong(conf, 2);
OrcOutputFormat of = new OrcOutputFormat();
FileSystem fs = FileSystem.getLocal(conf);
Path root = new Path(tmpDir, "testRecordReaderNewBaseAndDelta").makeQualified(fs);
Expand All @@ -1205,20 +1192,6 @@ public void testRecordReaderNewBaseAndDelta() throws Exception {
(BigRow.class, ObjectInspectorFactory.ObjectInspectorOptions.JAVA);
}

// write the base
MemoryManager mgr = new MemoryManagerImpl(conf){
int rowsAddedSinceCheck = 0;

@Override
public synchronized void addedRow(int rows) throws IOException {
rowsAddedSinceCheck += rows;
if (rowsAddedSinceCheck >= 2) {
notifyWriters();
rowsAddedSinceCheck = 0;
}
}
};

// make 5 stripes with 2 rows each
OrcRecordUpdater.OrcOptions options = (OrcRecordUpdater.OrcOptions)
new OrcRecordUpdater.OrcOptions(conf)
Expand All @@ -1228,8 +1201,9 @@ public synchronized void addedRow(int rows) throws IOException {
final int BUCKET_PROPERTY = BucketCodec.V1.encode(options);

options.orcOptions(OrcFile.writerOptions(conf)
.stripeSize(1).blockPadding(false).compress(CompressionKind.NONE)
.memory(mgr).batchSize(2));
.stripeSize(1).blockPadding(false)
.compress(CompressionKind.NONE)
.batchSize(2));
options.finalDestination(root);
RecordUpdater ru = of.getRecordUpdater(root, options);
String[] values= new String[]{"ignore.1", "0.1", "ignore.2", "ignore.3",
Expand Down